GRAD2-2822: School Report Regeneration Process - Backend Changes

bcgov · Sep 9, 2024 · 8948a7b · 8948a7b
1 parent 8c99500
commit 8948a7b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/...in/java/ca/bc/gov/educ/api/batchgraduation/reader/RegenerateSchoolReportsPartitioner.java b/...in/java/ca/bc/gov/educ/api/batchgraduation/reader/RegenerateSchoolReportsPartitioner.java
@@ -67,7 +67,7 @@ public Map<String, ExecutionContext> partition(int gridSize) {
         executionContext.put("readCount", 0);
         map.put("partition0", executionContext);
 
-        log.info("Found {} in total running on 1 partitions", finalSchoolDistricts);
+        log.info("Found {} in total running on 1 partitions", finalSchoolDistricts.size());
         return map;
     }
 }
diff --git a/...rc/main/java/ca/bc/gov/educ/api/batchgraduation/reader/RegenerateSchoolReportsReader.java b/...rc/main/java/ca/bc/gov/educ/api/batchgraduation/reader/RegenerateSchoolReportsReader.java
@@ -24,7 +24,7 @@ public List<String> read() throws Exception {
         if(readCount > 0) return null;
         readCount++;
         if(log.isDebugEnabled()) {
-            log.info("Read schools Codes -> {} of {} schools", schools.size(), String.join(",", schools));
+            log.info("Read schools Codes -> {} of {} schools", readCount, schools.size());
         }
         return schools;
     }

diff --git a/api/src/test/java/ca/bc/gov/educ/api/batchgraduation/util/RestUtilsTest.java b/api/src/test/java/ca/bc/gov/educ/api/batchgraduation/util/RestUtilsTest.java
@@ -896,6 +896,24 @@ public void testcreateAndStoreSchoolReports_0() {
         assertNotNull(type);
         assertNotNull(result);
     }
+    @Test
+    public void testcreateAndStoreSchoolReports_WithParams() {
+        final String type = "TVRRUN";
+
+        when(this.webClient.post()).thenReturn(this.requestBodyUriMock);
+        when(this.requestBodyUriMock.uri(String.format(constants.getCreateAndStoreSchoolReports(),type))).thenReturn(this.requestBodyUriMock);
+        when(this.requestBodyUriMock.headers(any(Consumer.class))).thenReturn(this.requestBodyMock);
+        when(this.requestBodyMock.contentType(any())).thenReturn(this.requestBodyMock);
+        when(this.requestBodyMock.body(any(BodyInserter.class))).thenReturn(this.requestHeadersMock);
+        when(this.requestHeadersMock.retrieve()).thenReturn(this.responseMock);
+        when(this.responseMock.bodyToMono(Integer.class)).thenReturn(Mono.just(0));
+
+        mockTokenResponseObject();
+
+        var result = this.restUtils.createAndStoreSchoolReports(Arrays.asList("12345"), type, new DistributionSummaryDTO());
+        assertNotNull(type);
+        assertNotNull(result);
+    }
 
     @Test
     public void testRunGradAlgorithm() {