Develop/alex (#219)

* Added missed School report at district level * Fix wrong school report * Fix tests * GRAD2-2261: School Reports for Year-End are not being created for all School Category run types and are not being added to the SCHOOL REPORTS table in GRAD * GRAD2-2261: School Reports for Year-End are not being created for all School Category run types and are not being added to the SCHOOL REPORTS table in GRAD
bcgov · Jul 28, 2023 · aed9cce · aed9cce
1 parent 01798b0
commit aed9cce
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/distribution/process/YearEndMergeProcess.java b/api/src/main/java/ca/bc/gov/educ/api/distribution/process/YearEndMergeProcess.java
@@ -94,10 +94,12 @@ public ProcessorData fire(ProcessorData processorData) {
                     mincodes.add(mincode);
                     numberOfCreatedSchoolReports += createDistrictSchoolYearEndReport(null, null, DISTREP_YE_SC, mincodes);
                     logger.debug("***** Number of School Reports Created {} *****", numberOfCreatedSchoolReports);
+                    /**
                     logger.debug("***** Distribute {} School Reports *****", mincode);
                     numberOfProcessedSchoolReports += processDistrictSchoolDistribution(processorData.getBatchId(), mincodes, null, null, DISTREP_YE_SC, null);
                     logger.debug("***** {} School Report Created*****", mincode);
                     logger.debug("***** Number of distributed School Reports {} *****", numberOfProcessedSchoolReports);
+                     **/
                     numberOfPdfs++;
                 }
 

diff --git a/api/src/main/java/ca/bc/gov/educ/api/distribution/service/PostingDistributionService.java b/api/src/main/java/ca/bc/gov/educ/api/distribution/service/PostingDistributionService.java
@@ -62,7 +62,14 @@ public boolean postingProcess(DistributionResponse distributionResponse) {
                 forAllSchools = false;
                 createDistrictSchoolYearEndReport(null, DISTREP_YE_SD, null, districtCodes);
             }
-            numberOfPdfs += processDistrictSchoolDistribution(batchId, null, DISTREP_YE_SD, null, transmissionMode);
+            if(!mincodes.isEmpty()) {
+                forAllSchools = false;
+                createDistrictSchoolYearEndReport(null, null, DISTREP_YE_SC, mincodes);
+            }
+            if(forAllSchools) {
+                createDistrictSchoolYearEndReport(null, DISTREP_YE_SD, DISTREP_YE_SC);
+            }
+            numberOfPdfs += processDistrictSchoolDistribution(batchId, null, DISTREP_YE_SD, DISTREP_YE_SC, transmissionMode);
         }
         if(NONGRADDIST.equalsIgnoreCase(activityCode)) {
             if(!districtCodes.isEmpty()) {