feat(stoptb): Nikshay ID Generator CSV export and results import

pom.xml

@@ -292,6 +292,12 @@
 			<artifactId>h2</artifactId>
 			<scope>runtime</scope>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-csv -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-csv</artifactId>
+			<version>1.11.0</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<finalName>${project.artifactId}-${project.version}</finalName>

src/main/java/com/iemr/mmu/controller/stoptb/NikshayExportController.java

@@ -0,0 +1,156 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology
+* Integrated EHR (Electronic Health Records) Solution
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute"
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+package com.iemr.mmu.controller.stoptb;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
+
+import com.iemr.mmu.service.stoptb.NikshayExportService;
+import com.iemr.mmu.service.stoptb.NikshayImportService;
+import com.iemr.mmu.service.stoptb.NikshayImportService.ImportSummary;
+import com.iemr.mmu.utils.JwtUtil;
+
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping(value = "/stopTb/nikshay", headers = "Authorization")
+@PreAuthorize("hasRole('NURSE') || hasRole('PHARMACIST') || hasRole('LABTECHNICIAN') || hasRole('DOCTOR') || hasRole('LAB_TECHNICIAN') || hasRole('TC_SPECIALIST') || hasRole('ONCOLOGIST') || hasRole('RADIOLOGIST')")
+public class NikshayExportController {
+	private static final Logger logger = LoggerFactory.getLogger(NikshayExportController.class);
+	private static final DateTimeFormatter DATE_FMT = DateTimeFormatter.ISO_LOCAL_DATE;
+
+	@Autowired
+	private NikshayExportService nikshayExportService;
+
+	@Autowired
+	private NikshayImportService nikshayImportService;
+
+	@Autowired
+	private JwtUtil jwtUtil;
+
+	/** Best-effort — this is only used for a created_by/modified_by audit column,
+	 * never for authorization (the filter chain/PreAuthorize already handled that). */
+	private String currentUsername(HttpServletRequest request) {
+		try {
+			String header = request.getHeader("Authorization");
+			if (header == null) {
+				return "unknown";
+			}
+			String token = header.startsWith("Bearer ") ? header.substring(7) : header;
+			String username = jwtUtil.extractUsername(token);
+			return username != null ? username : "unknown";
+		} catch (Exception e) {
+			return "unknown";
+		}
+	}
+
+	@Operation(summary = "Download a Stop TB camp's beneficiaries as a CSV formatted for the Nikshay ID Generator")
+	@GetMapping(value = "/exportBeneficiariesCsv")
+	public ResponseEntity<?> exportBeneficiariesCsv(@RequestParam("fromDate") String fromDateStr,
+			@RequestParam("toDate") String toDateStr, @RequestParam("vanID") Integer vanID,
+			@RequestParam("servicePointID") Integer servicePointID, HttpServletRequest request) {
+
+		LocalDate fromDate;
+		LocalDate toDate;
+		try {
+			fromDate = LocalDate.parse(fromDateStr, DATE_FMT);
+			toDate = LocalDate.parse(toDateStr, DATE_FMT);
+		} catch (DateTimeParseException e) {
+			return ResponseEntity.badRequest().body("fromDate/toDate must be in YYYY-MM-DD format");
+		}
+		if (toDate.isBefore(fromDate)) {
+			return ResponseEntity.badRequest().body("toDate must be on or after fromDate");
+		}
+		if (vanID == null || servicePointID == null) {
+			return ResponseEntity.badRequest().body("vanID and servicePointID are required");
+		}
+
+		int excludedCount;
+		try {
+			excludedCount = nikshayExportService.countAlreadyGenerated(vanID, servicePointID, fromDate, toDate);
+		} catch (Exception e) {
+			logger.error("Error preparing Nikshay beneficiary export", e);
+			return ResponseEntity.status(500).body("Could not prepare the export");
+		}
+
+		StreamingResponseBody body = outputStream -> {
+			try {
+				nikshayExportService.streamBeneficiariesCsv(vanID, servicePointID, fromDate, toDate, outputStream);
+			} catch (Exception e) {
+				// The HTTP status/headers are already committed by the time streaming
+				// starts, so a mid-stream failure can only be logged, not surfaced
+				// as a clean error response.
+				logger.error("Error streaming Nikshay beneficiary CSV", e);
+			}
+		};
+
+		String filename = "nikshay-beneficiaries-" + fromDate + "-to-" + toDate + ".csv";
+		return ResponseEntity.ok().contentType(MediaType.parseMediaType("text/csv"))
+				.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + filename + "\"")
+				.header("X-Excluded-Existing-Nikshay-Id-Count", String.valueOf(excludedCount)).body(body);
+	}
+
+	@Operation(summary = "Upload the Nikshay ID Generator app's results CSV to write generated Nikshay IDs "
+			+ "back onto the beneficiaries — each row is matched by its own benRegId column, "
+			+ "a pass-through field the export added that the ID Generator app never touches")
+	@PostMapping(value = "/importResultsCsv", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+	public ResponseEntity<?> importResultsCsv(@RequestParam("vanID") Integer vanID,
+			@RequestParam("servicePointID") Integer servicePointID, @RequestParam("visitDate") String visitDateStr,
+			@RequestParam("file") MultipartFile file, HttpServletRequest request) {
+		if (file == null || file.isEmpty()) {
+			return ResponseEntity.badRequest().body("A results CSV file is required");
+		}
+		LocalDate visitDate;
+		try {
+			visitDate = LocalDate.parse(visitDateStr, DATE_FMT);
+		} catch (DateTimeParseException e) {
+			return ResponseEntity.badRequest().body("visitDate must be in YYYY-MM-DD format");
+		}
+		try {
+			ImportSummary summary = nikshayImportService.importResults(vanID, servicePointID, visitDate,
+					file.getInputStream(), currentUsername(request));
+			return ResponseEntity.ok(summary);
+		} catch (IllegalArgumentException e) {
+			return ResponseEntity.badRequest().body(e.getMessage());
+		} catch (Exception e) {
+			logger.error("Error importing Nikshay results CSV", e);
+			return ResponseEntity.status(500).body("Could not import the results file");
+		}
+	}
+}

src/main/java/com/iemr/mmu/repo/stoptb/NikshayExportRepository.java

@@ -0,0 +1,208 @@
+/*
+* AMRIT – Accessible Medical Records via Integrated Technology
+* Integrated EHR (Electronic Health Records) Solution
+*
+* Copyright (C) "Piramal Swasthya Management and Research Institute"
+*
+* This file is part of AMRIT.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see https://www.gnu.org/licenses/.
+*/
+package com.iemr.mmu.repo.stoptb;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Timestamp;
+import java.time.LocalDate;
+import java.util.function.Consumer;
+
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.PreparedStatementSetter;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Reads Stop TB camp beneficiaries for the Nikshay ID Generator CSV export.
+ *
+ * Joins MMU's own beneficiary/demographic tables with the Stop TB dual-write
+ * tables (tb_stoptb_*) and the relevant master tables, resolving one row per
+ * beneficiary who has a visit in the requested van/service-point/date range.
+ * Beneficiaries that already have a Nikshay ID recorded in
+ * tb_stoptb_diagnostics are excluded from the streamed rows (they don't need
+ * a new one) but are counted separately so callers can report how many were
+ * skipped as already-generated.
+ */
+@Repository
+public class NikshayExportRepository {
+
+	@Autowired
+	private DataSource dataSource;
+
+	private JdbcTemplate getJdbcTemplate() {
+		return new JdbcTemplate(dataSource);
+	}
+
+	/** One camp beneficiary's raw, unmapped source data — Nikshay-vocabulary
+	 * mapping/validation happens in the service layer, not here. benRegId is
+	 * carried into the CSV itself (as a pass-through column the Nikshay ID
+	 * Generator app never touches) so results can be matched back to a
+	 * beneficiary on import without needing any AMRIT-side row tracking. */
+	public record NikshayRawRow(Long benRegId, String firstName, String middleLastName, Integer age, String gender,
+			String phone, String address, String stateName, String districtName, String healthFacility,
+			String village, String pincode, String maritalStatus, String caste, String occupation,
+			String socioeconomicStatus, String chiefComplaint, String hivStatus, Boolean isHivPos) {
+	}
+
+	// Placeholders in order: [1] parkingPlaceID (facility-name join), [2] vanID,
+	// [3] parkingPlaceID (visit filter), [4] fromDate (inclusive), [5] toDate-exclusive-upper-bound.
+	private static final String BASE_SELECT = "SELECT "
+			+ "  b.BeneficiaryRegID AS benRegId, "
+			+ "  b.FirstName AS firstName, "
+			+ "  TRIM(CONCAT(COALESCE(b.MiddleName,''),' ',COALESCE(b.LastName,''))) AS middleLastName, "
+			+ "  TIMESTAMPDIFF(YEAR, b.DOB, CURDATE()) AS age, "
+			+ "  g.GenderName AS gender, "
+			+ "  (SELECT p.PhoneNo FROM i_benphonemap p WHERE p.BenificiaryRegID = b.BeneficiaryRegID "
+			+ "     AND p.Deleted = 0 ORDER BY p.BenPhMapID ASC LIMIT 1) AS phone, "
+			+ "  TRIM(CONCAT_WS(', ', d.AddressLine1, d.AddressLine2, d.AddressLine3, d.AddressLine4, d.AddressLine5)) AS address, "
+			+ "  st.StateName AS stateName, "
+			+ "  dist.DistrictName AS districtName, "
+			+ "  pp.ParkingPlaceName AS healthFacility, "
+			+ "  vill.VillageName AS village, "
+			+ "  COALESCE(d.PinCode, vill.PinCode) AS pincode, "
+			+ "  ms.Status AS maritalStatus, "
+			+ "  c.CommunityType AS caste, "
+			+ "  occ.OccupationType AS occupation, "
+			+ "  inc.IncomeStatus AS socioeconomicStatus, "
+			+ "  (SELECT o.chief_complaint FROM tb_stoptb_general_opd o WHERE o.ben_reg_id = b.BeneficiaryRegID "
+			+ "     AND o.deleted = 0 ORDER BY o.id DESC LIMIT 1) AS chiefComplaint, "
+			+ "  (SELECT ge.hiv_status FROM tb_stoptb_general_examination ge WHERE ge.beneficiary_reg_id = b.BeneficiaryRegID "
+			+ "     AND ge.deleted = 0 ORDER BY ge.id DESC LIMIT 1) AS hivStatus, "
+			+ "  b.IsHIVPos AS isHivPos, "
+			+ "  (SELECT diag.nikshay_id FROM tb_stoptb_diagnostics diag WHERE diag.ben_reg_id = b.BeneficiaryRegID "
+			+ "     AND diag.nikshay_id IS NOT NULL AND diag.deleted = 0 ORDER BY diag.id DESC LIMIT 1) AS existingNikshayId "
+			+ "FROM i_beneficiary b "
+			+ "LEFT JOIN I_bendemographics d ON d.BeneficiaryRegID = b.BeneficiaryRegID "
+			+ "LEFT JOIN m_gender g ON g.GenderID = b.GenderID "
+			+ "LEFT JOIN m_maritalstatus ms ON ms.MaritalStatusID = b.MaritalStatusID "
+			+ "LEFT JOIN m_community c ON c.CommunityID = d.CommunityID "
+			+ "LEFT JOIN m_beneficiaryincomestatus inc ON inc.IncomeStatusID = d.IncomeStatusID "
+			+ "LEFT JOIN m_beneficiaryoccupation occ ON occ.OccupationID = d.OccupationID "
+			+ "LEFT JOIN m_DistrictBranchMapping vill ON vill.DistrictBranchID = d.DistrictBranchID "
+			+ "LEFT JOIN m_parkingplace pp ON pp.ParkingPlaceID = ? "
+			+ "LEFT JOIN m_state st ON st.StateID = pp.StateID "
+			+ "LEFT JOIN m_district dist ON dist.DistrictID = pp.DistrictID "
+			+ "WHERE b.Deleted = 0 "
+			+ "  AND b.BeneficiaryRegID IN ( "
+			+ "    SELECT DISTINCT v.beneficiary_reg_id FROM tb_stoptb_visit v "
+			+ "    WHERE v.vanID = ? AND v.parkingPlaceID = ? AND v.visit_date >= ? AND v.visit_date < ? "
+			+ "  )";
+
+	public int countAlreadyGenerated(Integer vanID, Integer servicePointID, LocalDate fromDate, LocalDate toDate) {
+		String sql = "SELECT COUNT(*) FROM (" + BASE_SELECT + ") t WHERE t.existingNikshayId IS NOT NULL";
+		Integer count = getJdbcTemplate().query(sql, pss(vanID, servicePointID, fromDate, toDate),
+				rs -> rs.next() ? rs.getInt(1) : 0);
+		return count == null ? 0 : count;
+	}
+
+	/** Streams every not-yet-Nikshay-ID'd beneficiary for the camp/date range to
+	 * {@code rowConsumer} one row at a time, without materializing the full
+	 * result set in memory — safe for large date ranges. */
+	public void streamPendingBeneficiaries(Integer vanID, Integer servicePointID, LocalDate fromDate,
+			LocalDate toDate, Consumer<NikshayRawRow> rowConsumer) {
+		String sql = "SELECT * FROM (" + BASE_SELECT + ") t WHERE t.existingNikshayId IS NULL";
+		JdbcTemplate jdbcTemplate = getJdbcTemplate();
+		// MySQL Connector/J-specific: Integer.MIN_VALUE forces true row-by-row
+		// network streaming instead of buffering the whole result set client-side.
+		jdbcTemplate.setFetchSize(Integer.MIN_VALUE);
+		jdbcTemplate.query(sql, pss(vanID, servicePointID, fromDate, toDate),
+				(ResultSet rs) -> rowConsumer.accept(mapRow(rs)));
+	}
+
+	private PreparedStatementSetter pss(Integer vanID, Integer servicePointID, LocalDate fromDate,
+			LocalDate toDate) {
+		return (PreparedStatement ps) -> {
+			ps.setInt(1, servicePointID);
+			ps.setInt(2, vanID);
+			ps.setInt(3, servicePointID);
+			ps.setTimestamp(4, Timestamp.valueOf(fromDate.atStartOfDay()));
+			ps.setTimestamp(5, Timestamp.valueOf(toDate.plusDays(1).atStartOfDay()));
+		};
+	}
+
+	private NikshayRawRow mapRow(ResultSet rs) throws SQLException {
+		return new NikshayRawRow(
+				rs.getObject("benRegId", Long.class),
+				rs.getString("firstName"),
+				rs.getString("middleLastName"),
+				rs.getObject("age", Integer.class),
+				rs.getString("gender"),
+				rs.getString("phone"),
+				rs.getString("address"),
+				rs.getString("stateName"),
+				rs.getString("districtName"),
+				rs.getString("healthFacility"),
+				rs.getString("village"),
+				rs.getString("pincode"),
+				rs.getString("maritalStatus"),
+				rs.getString("caste"),
+				rs.getString("occupation"),
+				rs.getString("socioeconomicStatus"),
+				rs.getString("chiefComplaint"),
+				rs.getString("hivStatus"),
+				rs.getObject("isHivPos", Boolean.class));
+	}
+
+	/** The most recent tb_stoptb_diagnostics row for this beneficiary at this
+	 * van/service point, if any — looked up live at import time (no export-time
+	 * snapshot needed, since the beneficiary is identified directly from the
+	 * results CSV's own benRegId column). Null if none exists yet. */
+	public Long findLatestDiagnosticsId(Long benRegId, Integer vanID, Integer servicePointID) {
+		String sql = "SELECT id FROM tb_stoptb_diagnostics WHERE ben_reg_id = ? AND vanID = ? "
+				+ "AND parkingPlaceID = ? AND deleted = 0 ORDER BY id DESC LIMIT 1";
+		return getJdbcTemplate().query(sql, (ResultSet rs) -> rs.next() ? rs.getLong("id") : null, benRegId, vanID,
+				servicePointID);
+	}
+
+	public void updateNikshayId(Long diagnosticsId, String nikshayId, String modifiedBy) {
+		String sql = "UPDATE tb_stoptb_diagnostics SET nikshay_id = ?, modified_by = ?, "
+				+ "last_mod_date = CURRENT_TIMESTAMP WHERE id = ?";
+		getJdbcTemplate().update(sql, nikshayId, modifiedBy, diagnosticsId);
+	}
+
+	/** Called when a beneficiary had no tb_stoptb_diagnostics row for this camp
+	 * visit yet — creates one to hold the Nikshay ID the portal generated. */
+	public Long insertDiagnosticsWithNikshayId(Long benRegId, Integer vanID, Integer servicePointID,
+			LocalDate visitDate, String nikshayId, String createdBy) {
+		String sql = "INSERT INTO tb_stoptb_diagnostics "
+				+ "(ben_reg_id, vanID, parkingPlaceID, visit_date, nikshay_id, created_by) VALUES (?, ?, ?, ?, ?, ?)";
+		KeyHolder keyHolder = new GeneratedKeyHolder();
+		getJdbcTemplate().update(connection -> {
+			PreparedStatement ps = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
+			ps.setLong(1, benRegId);
+			ps.setInt(2, vanID);
+			ps.setInt(3, servicePointID);
+			ps.setTimestamp(4, Timestamp.valueOf(visitDate.atStartOfDay()));
+			ps.setString(5, nikshayId);
+			ps.setString(6, createdBy);
+			return ps;
+		}, keyHolder);
+		return keyHolder.getKey().longValue();
+	}
+}