Year End Reports

api/pom.xml

@@ -17,13 +17,15 @@
             src/main/resources/**,
             src/main/java/ca/bc/gov/educ/api/distribution/config/**,
             src/main/java/ca/bc/gov/educ/api/distribution/exception/**,
+            src/main/java/ca/bc/gov/educ/api/distribution/process/**,
             src/main/java/ca/bc/gov/educ/api/distribution/model/**,
             src/main/java/ca/bc/gov/educ/api/distribution/util/**
         </sonar.exclusions>
         <sonar.coverage.exclusions>
             src/main/resources/**,
             src/main/java/ca/bc/gov/educ/api/distribution/config/**,
             src/main/java/ca/bc/gov/educ/api/distribution/exception/**,
+            src/main/java/ca/bc/gov/educ/api/distribution/process/**,
             src/main/java/ca/bc/gov/educ/api/distribution/model/**,
             src/main/java/ca/bc/gov/educ/api/distribution/util/**
         </sonar.coverage.exclusions>
@@ -147,11 +149,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-            <version>1.9.13</version>
-        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -201,22 +198,20 @@
             <artifactId>resilience4j-spring-boot2</artifactId>
             <version>${resilience4j.version}</version>
         </dependency>
-        <!--Grad2-1931-->
-        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310 -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>2.15.2</version>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-csv</artifactId>
-            <version>2.13.0</version>
+            <version>2.13.3</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.0</version>
+            <version>2.13.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.13.3</version>
         </dependency>
         <dependency>
             <groupId>com.opencsv</groupId>

api/src/main/java/ca/bc/gov/educ/api/distribution/config/GradCommonConfig.java

@@ -1,6 +1,10 @@
 package ca.bc.gov.educ.api.distribution.config;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
@@ -16,5 +20,12 @@ public class GradCommonConfig implements WebMvcConfigurer {
 	public void addInterceptors(InterceptorRegistry registry) {
 		registry.addInterceptor(requestInterceptor);
 	}
-
+
+	@Bean
+	ObjectMapper jacksonObjectMapper() {
+		return JsonMapper.builder()
+				.findAndAddModules()
+				.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+				.build();
+	}
 }

api/src/main/java/ca/bc/gov/educ/api/distribution/controller/DistributionController.java

@@ -1,8 +1,9 @@
 package ca.bc.gov.educ.api.distribution.controller;
 
-import ca.bc.gov.educ.api.distribution.model.dto.DistributionPrintRequest;
+import ca.bc.gov.educ.api.distribution.model.dto.DistributionRequest;
 import ca.bc.gov.educ.api.distribution.model.dto.DistributionResponse;
 import ca.bc.gov.educ.api.distribution.service.GradDistributionService;
+import ca.bc.gov.educ.api.distribution.service.PostingDistributionService;
 import ca.bc.gov.educ.api.distribution.util.EducDistributionApiConstants;
 import ca.bc.gov.educ.api.distribution.util.GradValidation;
 import ca.bc.gov.educ.api.distribution.util.PermissionsConstants;
@@ -24,8 +25,6 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Map;
-
 @CrossOrigin
 @RestController
 @RequestMapping(EducDistributionApiConstants.DISTRIBUTION_API_ROOT_MAPPING)
@@ -40,6 +39,9 @@ public class DistributionController {
     @Autowired
     GradDistributionService gradDistributionService;
 
+    @Autowired
+    PostingDistributionService postingDistributionService;
+
     @Autowired
     GradValidation validation;
 
@@ -52,21 +54,21 @@ public class DistributionController {
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK")})
     public ResponseEntity<DistributionResponse> distributeCredentials(
             @PathVariable String runType, @RequestParam(required = false) Long batchId ,@RequestParam(required = false) String activityCode,
-            @RequestParam(required = false) String transmissionType, @RequestBody Map<String, DistributionPrintRequest> mapDist,
+            @RequestParam(required = false) String transmissionType, @RequestBody DistributionRequest distributionRequest,
             @RequestParam(required = false) String localDownload, @RequestHeader(name="Authorization") String accessToken) {
         if (isAsyncDistribution(runType, activityCode)) {
             // non-blocking IO - launching async process to distribute credentials
-            gradDistributionService.asyncDistributeCredentials(runType,batchId,mapDist,activityCode,transmissionType,localDownload,accessToken);
+            gradDistributionService.asyncDistributeCredentials(runType,batchId,distributionRequest,activityCode,transmissionType,localDownload,accessToken);
 
             // return as successful immediately
             DistributionResponse disRes = new DistributionResponse();
-            disRes.setBatchId(batchId.toString());
+            disRes.setBatchId(batchId);
             disRes.setLocalDownload(localDownload);
             disRes.setMergeProcessResponse("Merge Successful and File Uploaded");
             return response.GET(disRes);
         } else {
             // blocking IO - launching sync process to distribute credentials
-            return response.GET(gradDistributionService.distributeCredentials(runType,batchId,mapDist,activityCode,transmissionType,localDownload,accessToken));
+            return response.GET(gradDistributionService.distributeCredentials(runType,batchId,distributionRequest,activityCode,transmissionType,localDownload,accessToken));
         }
     }
 
@@ -81,6 +83,15 @@ public ResponseEntity<byte[]> downloadZipFile(@PathVariable(value = "batchId") L
         return handleBinaryResponse(encoded,MediaType.TEXT_PLAIN,batchId);
     }
 
+    @PostMapping(EducDistributionApiConstants.POST_DISTRIBUTION)
+    @PreAuthorize(PermissionsConstants.GRADUATE_STUDENT)
+    @Operation(summary = "Read Student Reports by Student ID and Report Type", description = "Read Student Reports by Student ID and Report Type", tags = { "Reports" })
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK")})
+    public ResponseEntity<Boolean> postingDistribution(@RequestBody DistributionResponse distributionResponse) {
+        logger.debug("zipBatchDirectory : ");
+        return response.GET(postingDistributionService.postingProcess(distributionResponse));
+    }
+
     private ResponseEntity<byte[]> handleBinaryResponse(byte[] resultBinary, MediaType contentType,Long batchId) {
         ResponseEntity<byte[]> responseEntity;
 

api/src/main/java/ca/bc/gov/educ/api/distribution/exception/ServiceException.java

@@ -0,0 +1,39 @@
+package ca.bc.gov.educ.api.distribution.exception;
+
+import lombok.Data;
+
+@Data
+public class ServiceException extends RuntimeException {
+
+    private int statusCode;
+
+    public ServiceException() {
+        super();
+    }
+
+    public ServiceException(String message) {
+        super(message);
+    }
+
+    public ServiceException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ServiceException(Throwable cause) {
+        super(cause);
+    }
+
+    protected ServiceException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+
+    public ServiceException(String message, int value) {
+        super(message);
+        this.statusCode = value;
+    }
+
+    public ServiceException(String s, int value, Exception e) {
+        super(s, e);
+        this.statusCode = value;
+    }
+}

api/src/main/java/ca/bc/gov/educ/api/distribution/model/dto/DistributionRequest.java

@@ -0,0 +1,16 @@
+package ca.bc.gov.educ.api.distribution.model.dto;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+@Builder
+public class DistributionRequest {
+    private String activityCode;
+    private List<School> schools;
+    private Map<String, DistributionPrintRequest> mapDist;
+    private StudentSearchRequest studentSearchRequest;
+}

api/src/main/java/ca/bc/gov/educ/api/distribution/model/dto/DistributionResponse.java

@@ -2,14 +2,24 @@
 
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 public class DistributionResponse {
     private String transcriptResponse;
     private String yed2Response;
     private String yedrResponse;
     private String yedbResponse;
     private String mergeProcessResponse;
+    private int numberOfPdfs;
+    private String jobStatus;
     //Grad2-1931
-    private String batchId;
+    private Long batchId;
     private String localDownload;
+    private String activityCode;
+    private String transmissionMode;
+    private List<School> schools = new ArrayList<>();
+    private List<School> districts = new ArrayList<>();
+    private StudentSearchRequest studentSearchRequest;
 }

api/src/main/java/ca/bc/gov/educ/api/distribution/model/dto/GraduationStatus.java

@@ -32,6 +32,8 @@ public class GraduationStatus implements Serializable {
     private String graduationMessage = "";
     private String programName = "";
 
+    @JsonDeserialize(using = LocalDateDeserializer.class)
+    @JsonSerialize(using = LocalDateSerializer.class)
     public LocalDate getProgramCompletionDate() {
         return programCompletionDate;
     }

api/src/main/java/ca/bc/gov/educ/api/distribution/model/dto/PaperType.java

@@ -1,6 +1,8 @@
 package ca.bc.gov.educ.api.distribution.model.dto;
 
-public class PaperType {
+import java.io.Serializable;
+
+public class PaperType implements Serializable {
 
     private String code;
 

api/src/main/java/ca/bc/gov/educ/api/distribution/model/dto/ProcessorData.java

@@ -7,7 +7,6 @@
 import org.springframework.stereotype.Component;
 
 import java.util.List;
-import java.util.Map;
 
 @Data
 @Component
@@ -27,5 +26,5 @@ public class ProcessorData {
 	private List<StudentCredentialDistribution> yed2List;
 	private List<StudentCredentialDistribution> yedrList;
 	private List<StudentCredentialDistribution> yedbList;
-	private Map<String,DistributionPrintRequest> mapDistribution;
+	private DistributionRequest distributionRequest;
 }

api/src/main/java/ca/bc/gov/educ/api/distribution/model/dto/ReportData.java

@@ -5,13 +5,12 @@
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import lombok.Data;
-import org.codehaus.jackson.annotate.JsonTypeInfo;
-import org.springframework.stereotype.Component;
-
 import jakarta.xml.bind.annotation.XmlRootElement;
 import jakarta.xml.bind.annotation.XmlSeeAlso;
 import jakarta.xml.bind.annotation.XmlType;
+import lombok.Data;
+import org.springframework.stereotype.Component;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
@@ -31,9 +30,6 @@
 		Certificate.class
 })
 @JsonSerialize()
-//@JsonPropertyOrder(alphabetic = true)
-//@JsonRootName("generateReport")
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
 @JsonSubTypes({
 		@JsonSubTypes.Type(value = Student.class),
 		@JsonSubTypes.Type(value = School.class),

api/src/main/java/ca/bc/gov/educ/api/distribution/model/dto/ReportOptions.java

@@ -1,12 +1,10 @@
 package ca.bc.gov.educ.api.distribution.model.dto;
 
 import lombok.Data;
-import org.codehaus.jackson.annotate.JsonTypeInfo;
 
 import java.io.Serializable;
 
 @Data
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
 public class ReportOptions implements Serializable {
 
 	private boolean cacheReport;

api/src/main/java/ca/bc/gov/educ/api/distribution/model/dto/ReportRequest.java

@@ -2,11 +2,9 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.codehaus.jackson.annotate.JsonTypeInfo;
 
 import java.io.Serializable;
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
 @JsonPropertyOrder({ "options", "data"})
 public class ReportRequest implements Serializable {
 

api/src/main/java/ca/bc/gov/educ/api/distribution/model/dto/School.java

@@ -4,6 +4,7 @@
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Objects;
 
 public class School implements Serializable {
 
@@ -119,4 +120,17 @@ public List<Student> getStudents() {
     public void setStudents(List<Student> students) {
         this.students = students;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        School school = (School) o;
+        return mincode.equals(school.mincode);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(mincode);
+    }
 }

api/src/main/java/ca/bc/gov/educ/api/distribution/model/dto/StudentSearchRequest.java

@@ -0,0 +1,33 @@
+package ca.bc.gov.educ.api.distribution.model.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@Component
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class StudentSearchRequest implements Serializable {
+    private List<String> schoolOfRecords;
+    private List<String> districts;
+    private List<String> schoolCategoryCodes;
+    private List<String> pens;
+    private List<String> programs;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    Date gradDateFrom;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    Date gradDateTo;
+
+    Boolean validateInput;
+    String localDownload;
+}