Grad release 1.14.0

bcgov · Feb 6, 2024 · 3e0d238 · 3e0d238
2 parents 9aa3218 + 720372f
commit 3e0d238
Show file tree

Hide file tree

Showing 24 changed files with 556 additions and 35 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>ca.bc.gov.educ</groupId>
 	<artifactId>educ-grad-student-api</artifactId>
-	<version>1.8.53</version>
+	<version>1.8.54</version>
 	<name>educ-grad-student-api</name>
 	<description>Student Demographics API for GRAD team</description>
 

diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/config/RestErrorHandler.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/config/RestErrorHandler.java
@@ -1,5 +1,6 @@
 package ca.bc.gov.educ.api.gradstudent.config;
 
+import ca.bc.gov.educ.api.gradstudent.exception.EntityNotFoundException;
 import ca.bc.gov.educ.api.gradstudent.util.ApiResponseMessage.MessageTypeEnum;
 import ca.bc.gov.educ.api.gradstudent.util.ApiResponseModel;
 import ca.bc.gov.educ.api.gradstudent.util.GradBusinessRuleException;
@@ -55,7 +56,7 @@ protected ResponseEntity<Object> handleAuthorizationErrors(Exception ex, WebRequ
 		return new ResponseEntity<>(ApiResponseModel.ERROR(null, message), HttpStatus.FORBIDDEN);
 	}
 
-	@ExceptionHandler(value = { GradBusinessRuleException.class })
+	@ExceptionHandler(value = { GradBusinessRuleException.class, EntityNotFoundException.class })
 	protected ResponseEntity<Object> handleGradBusinessException(Exception ex, WebRequest request) {
 		ApiResponseModel<?> response = ApiResponseModel.ERROR(null);
 		validation.ifErrors(response::addErrorMessages);
@@ -64,7 +65,8 @@ protected ResponseEntity<Object> handleGradBusinessException(Exception ex, WebRe
 			response.addMessageItem(ex.getLocalizedMessage(), MessageTypeEnum.ERROR);
 		}
 		validation.clear();
-		return new ResponseEntity<>(response, HttpStatus.UNPROCESSABLE_ENTITY);
+		HttpStatus httpStatus = (ex instanceof EntityNotFoundException) ? HttpStatus.NOT_FOUND : HttpStatus.UNPROCESSABLE_ENTITY;
+		return new ResponseEntity<>(response, httpStatus);
 	}
 
 	@ExceptionHandler(value = { OptimisticEntityLockException.class })

diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/controller/CommonController.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/controller/CommonController.java
@@ -31,7 +31,8 @@ public class CommonController {
 
     private static final Logger logger = LoggerFactory.getLogger(CommonController.class);
 
-    private static final String STATUS_CODE="Status Code";
+    private static final String STATUS_CODE = "Status Code";
+    private static final String BEARER = "Bearer ";
 
     @Autowired
     CommonService commonService;
@@ -276,4 +277,36 @@ public ResponseEntity<List<UUID>> getDeceasedStudentIDs(@RequestBody List<UUID>
         return response.GET(commonService.getDeceasedStudentIDs(studentIds));
     }
 
+    @PostMapping (EducGradStudentApiConstants.GRAD_STUDENT_OPTIONAL_PROGRAMS)
+    @PreAuthorize(PermissionsConstants.UPDATE_GRADUATION_STUDENT_OPTIONAL_PROGRAM)
+    @Operation(summary = "Create Student Optional Grad Program by Student ID", description = "Create Student Optional Grad Program by Student ID", tags = { "Optional Student Graduation Status" })
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK")})
+    public ResponseEntity<GraduationStudentRecord> createStudentGradOptionalProgram(@PathVariable UUID studentID, @RequestBody StudentOptionalProgram gradStudentOptionalProgram, @RequestParam (value = "careerProgramCode", required = false) String careerProgramCode,
+                                                                                    @RequestHeader(name="Authorization") String accessToken) {
+        logger.debug("Create student Optional Grad Program for Student ID: {}", studentID);
+        graduationStatusService.createStudentGradOptionalProgram(studentID, gradStudentOptionalProgram, careerProgramCode);
+        return response.GET(graduationStatusService.getGraduationStatus(studentID, accessToken.replace(BEARER, "")));
+    }
+
+    @PutMapping (EducGradStudentApiConstants.GRAD_STUDENT_OPTIONAL_PROGRAM_UPDATE)
+    @PreAuthorize(PermissionsConstants.UPDATE_GRADUATION_STUDENT_OPTIONAL_PROGRAM)
+    @Operation(summary = "Update Student Optional Grad Program for Student ID", description = "Update Student Optional Grad Program for Student ID", tags = { "Optional Student Graduation Status" })
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK")})
+    public ResponseEntity<GraduationStudentRecord> updateStudentGradOptionalProgram(@PathVariable UUID studentID, @PathVariable UUID optionalProgramID, @RequestBody StudentOptionalProgram gradStudentOptionalProgram,
+                                                                                    @RequestHeader(name="Authorization") String accessToken) {
+        logger.debug("Create student Optional Grad Program for Student ID: {}", studentID);
+        graduationStatusService.updateStudentGradOptionalProgram(studentID, optionalProgramID, gradStudentOptionalProgram);
+        return response.GET(graduationStatusService.getGraduationStatus(studentID, accessToken.replace(BEARER, "")));
+    }
+
+    @DeleteMapping (EducGradStudentApiConstants.GRAD_STUDENT_OPTIONAL_PROGRAM_DELETE)
+    @PreAuthorize(PermissionsConstants.UPDATE_GRADUATION_STUDENT_OPTIONAL_PROGRAM)
+    @Operation(summary = "Delete Student Optional Grad Program by Student ID", description = "Delete Student Optional Grad Program by Student ID", tags = { "Optional Student Graduation Status" })
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK")})
+    public ResponseEntity<GraduationStudentRecord> deleteStudentGradOptionalProgram(@PathVariable UUID studentID, @PathVariable UUID optionalProgramID, @RequestParam (value = "careerProgramCode", required = false) String careerProgramCode,
+                                                                                    @RequestHeader(name="Authorization") String accessToken) {
+        logger.debug("Delete student Optional Program for Student ID: {}", studentID);
+        graduationStatusService.deleteStudentGradOptionalProgram(studentID, optionalProgramID, careerProgramCode);
+        return response.GET(graduationStatusService.getGraduationStatus(studentID, accessToken.replace(BEARER, "")));
+    }
 }
diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/controller/GraduationStatusController.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/controller/GraduationStatusController.java
@@ -6,10 +6,7 @@
 import ca.bc.gov.educ.api.gradstudent.model.entity.GraduationStudentRecordHistoryEntity;
 import ca.bc.gov.educ.api.gradstudent.service.GraduationStatusService;
 import ca.bc.gov.educ.api.gradstudent.service.HistoryService;
-import ca.bc.gov.educ.api.gradstudent.util.EducGradStudentApiConstants;
-import ca.bc.gov.educ.api.gradstudent.util.GradValidation;
-import ca.bc.gov.educ.api.gradstudent.util.PermissionsConstants;
-import ca.bc.gov.educ.api.gradstudent.util.ResponseHelper;
+import ca.bc.gov.educ.api.gradstudent.util.*;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.Operation;
@@ -199,8 +196,6 @@ public ResponseEntity<GraduationStudentRecord> getDataForBatch(@PathVariable Str
         return response.GET(gradStatusService.getDataForBatch(UUID.fromString(studentID),accessToken.replace(BEARER, "")));
     }
 
-
-
     @PostMapping (EducGradStudentApiConstants.GRAD_STUDENT_BY_LIST_CRITERIAS)
     @PreAuthorize(PermissionsConstants.READ_GRADUATION_STUDENT)
     @Operation(summary = "Find Students by multiple criteria", description = "Find Students by multiple criteria", tags = { "Search Student Records" })
@@ -360,6 +355,16 @@ public ResponseEntity<GraduationStudentRecord> saveStudentGradStatusDistribution
         return response.GET(gradRecord);
     }
 
+    @PutMapping(EducGradStudentApiConstants.GRADUATION_RECORD_HISTORY_BY_BATCH_ID_DISTRIBUTION_RUN)
+    @PreAuthorize(PermissionsConstants.UPDATE_GRADUATION_STUDENT)
+    @Operation(summary = "Save Student Grad Status by Student ID for projected run", description = "Save Student Grad Status by Student ID for projected run", tags = { "Student Graduation Status" })
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK")})
+    public ResponseEntity<ApiResponseModel<Void>> updateStudentGradHistoryStatusDistributionRun(@PathVariable Long batchID, @RequestParam(required = false) String userName) {
+        logger.debug("Save Distribution student Grad history for Student ID");
+        historyService.updateStudentRecordHistoryDistributionRun(batchID, userName);
+        return response.UPDATED(null);
+    }
+
     @GetMapping (EducGradStudentApiConstants.STUDENT_LIST_FOR_SCHOOL_REPORT)
     @PreAuthorize(PermissionsConstants.READ_GRADUATION_STUDENT)
     @Operation(summary = "Get Students For School Report by mincode", description = "Get Students For School Report by mincode", tags = { "Batch Algorithm" })

diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/exception/EntityNotFoundException.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/exception/EntityNotFoundException.java
@@ -1,6 +1,8 @@
 package ca.bc.gov.educ.api.gradstudent.exception;
 
-public class EntityNotFoundException extends Exception {
+import ca.bc.gov.educ.api.gradstudent.util.GradBusinessRuleException;
+
+public class EntityNotFoundException extends GradBusinessRuleException {
 
 
     public EntityNotFoundException() {
@@ -11,11 +13,4 @@ public EntityNotFoundException(String message) {
         super(message);
     }
 
-    public EntityNotFoundException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public EntityNotFoundException(Throwable cause) {
-        super(cause);
-    }
 }
diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/GraduationStudentRecord.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/GraduationStudentRecord.java
@@ -14,7 +14,7 @@
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Component
-public class GraduationStudentRecord extends BaseModel{
+public class GraduationStudentRecord extends BaseModel {
 
     private String studentGradData;
     private String pen;
@@ -44,5 +44,6 @@ public class GraduationStudentRecord extends BaseModel{
     private Date adultStartDate;
 
     private List<StudentCareerProgram> careerPrograms;
+    private List<StudentOptionalProgram> optionalPrograms;
     private List<GradRequirement> nonGradReasons;
 }
diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/StudentOptionalProgram.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/model/dto/StudentOptionalProgram.java
@@ -9,7 +9,7 @@
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Component
-public class StudentOptionalProgram extends BaseModel{
+public class StudentOptionalProgram extends BaseModel {
 
 	private UUID id;
     private String pen;

diff --git a/...src/main/java/ca/bc/gov/educ/api/gradstudent/model/entity/StudentCareerProgramEntity.java b/...src/main/java/ca/bc/gov/educ/api/gradstudent/model/entity/StudentCareerProgramEntity.java
@@ -1,12 +1,10 @@
 package ca.bc.gov.educ.api.gradstudent.model.entity;
 
+import jakarta.persistence.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.GenericGenerator;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
 import java.util.UUID;
 
 @Data
@@ -16,6 +14,11 @@
 public class StudentCareerProgramEntity extends BaseEntity {
 
 	@Id
+	@GeneratedValue(generator = "UUID")
+	@GenericGenerator(
+			name = "UUID",
+			strategy = "org.hibernate.id.UUIDGenerator"
+	)
 	@Column(name = "STUDENT_CAREER_PROGRAM_ID", nullable = false)
     private UUID id;
 

diff --git a/...a/ca/bc/gov/educ/api/gradstudent/repository/GraduationStudentRecordHistoryRepository.java b/...a/ca/bc/gov/educ/api/gradstudent/repository/GraduationStudentRecordHistoryRepository.java
@@ -1,12 +1,16 @@
 package ca.bc.gov.educ.api.gradstudent.repository;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import ca.bc.gov.educ.api.gradstudent.model.entity.GraduationStudentRecordHistoryEntity;
@@ -18,4 +22,9 @@ public interface GraduationStudentRecordHistoryRepository extends JpaRepository<
 	List<GraduationStudentRecordHistoryEntity> findByStudentID(UUID studentID);
     Page<GraduationStudentRecordHistoryEntity> findByBatchId(Long batchId, Pageable paging);
     void deleteByStudentID(UUID studentID);
+
+    @Modifying
+    @Query(value="update GRADUATION_STUDENT_RECORD_HISTORY set UPDATE_USER = :updateUser, UPDATE_DATE = :updateDate where BATCH_ID = :batchId", nativeQuery=true)
+    void updateGradStudentUpdateUser(@Param(value = "batchId") Long batchId, @Param(value = "updateUser") String updateUser, @Param(value = "updateDate") LocalDateTime updateDate);
+
 }
diff --git a/...ain/java/ca/bc/gov/educ/api/gradstudent/repository/GraduationStudentRecordRepository.java b/...ain/java/ca/bc/gov/educ/api/gradstudent/repository/GraduationStudentRecordRepository.java
@@ -79,4 +79,8 @@ void updateStudentGuidPenXrefRecord(
 
 	@Query("select c.studentID from GraduationStudentRecordEntity c where c.studentStatus = :statusCode and c.studentID in :studentIDList")
 	List<UUID> filterGivenStudentsByStatusCode(@Param("studentIDList") List<UUID> studentIDs, @Param("statusCode") String statusCode);
+
+	@Modifying
+	@Query("update GraduationStudentRecordEntity e set e.recalculateGradStatus = :recalculateGradStatus, e.recalculateProjectedGrad = :recalculateProjectedGrad where e.studentID = :studentGuid")
+	void updateGradStudentRecalculationFlags(@Param(value = "studentGuid") UUID studentGuid, @Param(value = "recalculateGradStatus") String recalculateGradStatus, @Param(value = "recalculateProjectedGrad") String recalculateProjectedGrad);
 }
diff --git a/...c/main/java/ca/bc/gov/educ/api/gradstudent/repository/StudentCareerProgramRepository.java b/...c/main/java/ca/bc/gov/educ/api/gradstudent/repository/StudentCareerProgramRepository.java
@@ -22,4 +22,6 @@ public interface StudentCareerProgramRepository extends JpaRepository<StudentCar
 	List<StudentCareerProgramEntity> existsByCareerProgramCode(String cpCode);
 
 	void deleteByStudentID(UUID studentID);
+
+	void deleteStudentCareerProgramEntityByStudentIDAndCareerProgramCode(UUID studentGuid, String careerProgramCode);
 }
diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/service/DataConversionService.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/service/DataConversionService.java
@@ -273,10 +273,20 @@ private GraduationStudentRecordEntity handleNewGraduationStatus(GraduationStuden
     private void populateOngoingUpdateFields(List<OngoingUpdateFieldDTO> fields, GraduationStudentRecordEntity targetObject, String accessToken) {
         fields.forEach(f -> {
             if (f.getName() == FieldName.GRAD_PROGRAM) {
-                String newProgram = (String) f.getValue();
+                String newProgram = getStringValue(f.getValue());
                 String currentProgram = targetObject.getProgram();
                 handleStudentAchievements(currentProgram, newProgram, targetObject, accessToken);
                 resetAdultStartDate(currentProgram, newProgram, targetObject);
+            } else if (f.getName() == FieldName.STUDENT_STATUS) {
+                String newStatus = getStringValue(f.getValue());
+                if ("MER".equals(newStatus)) {
+                    targetObject.setStudentGradData(null);
+                    targetObject.setStudentProjectedGradData(null);
+                    targetObject.setRecalculateGradStatus(null);
+                    targetObject.setRecalculateProjectedGrad(null);
+                    log.info(" {} ==> {}: Delete Student Achievements.", targetObject.getStudentStatus(), newStatus);
+                    graduationStatusService.deleteStudentAchievements(targetObject.getStudentID(), accessToken);
+                }
             }
             populate(f, targetObject);
         });