Tests/controller MMU-API micro services ( Completed . Ready to Merge)

.github/workflows/testcase-coverage.yml

@@ -0,0 +1,44 @@
+name: TestCase Coverage Check
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+
+permissions: {} 
+
+jobs:
+  build_and_check_coverage:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Cache Maven dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-m2-
+
+      - name: Build with Maven
+        run: mvn clean verify
+
+      - name: Run Coverage Check
+        uses: madrapps/jacoco-report@v1.7.2
+        with:
+          paths: target/site/jacoco/jacoco.xml
+          token: ${{ secrets.GITHUB_TOKEN }}
+          min-coverage-overall: 40
+          min-coverage-changed-files: 60
+          title: Code Coverage Report
+          comment-type: pr_comment 

src/main/java/com/iemr/mmu/controller/labtechnician/LabTechnicianController.java

@@ -135,8 +135,11 @@ public String getLabResultForVisitCode(@RequestBody String requestOBJ) {
 		return response.toString();
 	}
 
-	private JsonObject parseJsonRequest(String requestObj) {
-		JsonElement jsonElement = JsonParser.parseString(requestObj);
-		return jsonElement.getAsJsonObject();
-	}
+       private JsonObject parseJsonRequest(String requestObj) {
+	       if (requestObj == null || requestObj.trim().isEmpty() || "null".equals(requestObj.trim())) {
+		       return null;
+	       }
+	       JsonElement jsonElement = JsonParser.parseString(requestObj);
+	       return jsonElement.getAsJsonObject();
+       }
 }

src/main/java/com/iemr/mmu/controller/reports/ReportGateway.java

@@ -49,7 +49,7 @@ public class ReportGateway {
 
 	@Operation(summary = "Get report")
 	@PostMapping(value = { "/getReport" }, consumes = "application/json", produces = "application/json")
-	public String getReportByReportID(@RequestBody String requestOBJ) {
+	public String getReportByReportID(@RequestBody(required = false) String requestOBJ) {
 		OutputResponse response = new OutputResponse();
 
 		try {
@@ -70,7 +70,7 @@ public String getReportByReportID(@RequestBody String requestOBJ) {
 
 	@Operation(summary = "Get report by report id")
 	@PostMapping(value = { "/getReportNew" }, consumes = "application/json", produces = "application/json")
-	public String getReportByReportID1(@RequestBody String requestOBJ) {
+	public String getReportByReportID1(@RequestBody(required = false) String requestOBJ) {
 		OutputResponse response = new OutputResponse();
 
 		try {

src/main/java/com/iemr/mmu/service/anc/Utility.java

@@ -169,7 +169,7 @@ public static Timestamp combineDateAndTimeToDateTime(String tcDate, String tcTim
 		return tcScheduleDateTime;
 	}
 
-	public static long timeDiff(String fromTime, String toTime) {
+public static Long timeDiff(String fromTime, String toTime) {
 		Long duration = null;
 		if (fromTime != null && toTime != null) {
 			LocalTime fromT = LocalTime.parse(fromTime);

src/main/java/com/iemr/mmu/service/reports/ReportCheckPostImplNew.java

@@ -344,74 +344,61 @@ private String report_PatientVisitInfo(Timestamp fromDate, Timestamp toDate, Int
 			ArrayList<Object[]> RS3 = reportMasterRepo.get_report_SP_PrescribedDrug(fromDate, toDate, psmID, vanID);
 
 			if (RS3 != null && RS3.size() > 0) {
-				for (Report_ModifiedAnc rmANC : report_PatientVisitInfo) {
-					for (Object[] rs3 : RS3) {
-						int count = 1;
-						if (rs3[3].equals(rmANC.getVisitCode()) && rs3[0].equals(rmANC.getBeneficiaryRegId())
-								&& count < 11) {
-							rmANC.setReferredToInstituteID((Integer) rs3[10]);
-							rmANC.setReferredToInstitute((String) rs3[11]);
-							rmANC.setDiagnosisProvided((String) rs3[9]);
-							switch (count) {
-							case 1:
-								rmANC.setDrug_1((String) rs3[4]);
-								rmANC.setDrug_prescribed1((Integer) rs3[6]);
-								break;
-
-							case 2:
-								rmANC.setDrug_2((String) rs3[4]);
-								rmANC.setDrug_prescribed2((Integer) rs3[6]);
-								break;
-
-							case 3:
-								rmANC.setDrug_3((String) rs3[4]);
-								rmANC.setDrug_prescribed3((Integer) rs3[6]);
-								break;
-
-							case 4:
-								rmANC.setDrug_4((String) rs3[4]);
-								rmANC.setDrug_prescribed4((Integer) rs3[6]);
-								break;
-
-							case 5:
-								rmANC.setDrug_5((String) rs3[4]);
-								rmANC.setDrug_prescribed5((Integer) rs3[6]);
-								break;
-
-							case 6:
-								rmANC.setDrug_6((String) rs3[4]);
-								rmANC.setDrug_prescribed6((Integer) rs3[6]);
-								break;
-
-							case 7:
-								rmANC.setDrug_7((String) rs3[4]);
-								rmANC.setDrug_prescribed7((Integer) rs3[6]);
-								break;
-
-							case 8:
-								rmANC.setDrug_8((String) rs3[4]);
-								rmANC.setDrug_prescribed8((Integer) rs3[6]);
-								break;
-
-							case 9:
-								rmANC.setDrug_9((String) rs3[4]);
-								rmANC.setDrug_prescribed9((Integer) rs3[6]);
-								break;
-
-							case 10:
-								rmANC.setDrug_10((String) rs3[4]);
-								rmANC.setDrug_prescribed10((Integer) rs3[6]);
-								break;
-
-							default:
-
-							}
-							count++;
-
-							break;
-						}
-					}
-				}
+				   for (Report_ModifiedAnc rmANC : report_PatientVisitInfo) {
+					   int count = 1;
+					   for (Object[] rs3 : RS3) {
+						   if (rs3[3].equals(rmANC.getVisitCode()) && rs3[0].equals(rmANC.getBeneficiaryRegId()) && count < 11) {
+							   rmANC.setReferredToInstituteID((Integer) rs3[10]);
+							   rmANC.setReferredToInstitute((String) rs3[11]);
+							   rmANC.setDiagnosisProvided((String) rs3[9]);
+							   switch (count) {
+								   case 1:
+									   rmANC.setDrug_1((String) rs3[4]);
+									   rmANC.setDrug_prescribed1((Integer) rs3[6]);
+									   break;
+								   case 2:
+									   rmANC.setDrug_2((String) rs3[4]);
+									   rmANC.setDrug_prescribed2((Integer) rs3[6]);
+									   break;
+								   case 3:
+									   rmANC.setDrug_3((String) rs3[4]);
+									   rmANC.setDrug_prescribed3((Integer) rs3[6]);
+									   break;
+								   case 4:
+									   rmANC.setDrug_4((String) rs3[4]);
+									   rmANC.setDrug_prescribed4((Integer) rs3[6]);
+									   break;
+								   case 5:
+									   rmANC.setDrug_5((String) rs3[4]);
+									   rmANC.setDrug_prescribed5((Integer) rs3[6]);
+									   break;
+								   case 6:
+									   rmANC.setDrug_6((String) rs3[4]);
+									   rmANC.setDrug_prescribed6((Integer) rs3[6]);
+									   break;
+								   case 7:
+									   rmANC.setDrug_7((String) rs3[4]);
+									   rmANC.setDrug_prescribed7((Integer) rs3[6]);
+									   break;
+								   case 8:
+									   rmANC.setDrug_8((String) rs3[4]);
+									   rmANC.setDrug_prescribed8((Integer) rs3[6]);
+									   break;
+								   case 9:
+									   rmANC.setDrug_9((String) rs3[4]);
+									   rmANC.setDrug_prescribed9((Integer) rs3[6]);
+									   break;
+								   case 10:
+									   rmANC.setDrug_10((String) rs3[4]);
+									   rmANC.setDrug_prescribed10((Integer) rs3[6]);
+									   break;
+								   default:
+									   // default case intentionally left blank
+							   }
+							   count++;
+						   }
+					   }
+				   }
 			}
 
 			return OutputMapper.gson().toJson(report_PatientVisitInfo);