Merge pull request #307 from bcgov/feature/GRAD2-2500

GRAD2-2500: UTG data & graduated student in TRAX are all dropped.

api/src/main/java/ca/bc/gov/educ/api/trax/controller/TraxCommonController.java

@@ -38,21 +38,6 @@ public class TraxCommonController {
     @Autowired
     ResponseHelper response;
 
-    @GetMapping(EducGradTraxApiConstants.GET_TRAX_STUDENT_GRADUATED_BY_PEN_MAPPING)
-    @PreAuthorize(PermissionsConstants.READ_GRAD_TRAX_STUDENT_DATA)
-    @Operation(summary = "Get student is graduated or not from TSW", description = "Find a student graduated or not", tags = { "TSW" })
-    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK"),
-            @ApiResponse(responseCode = "400", description = "BAD REQUEST")})
-    public ResponseEntity<Boolean> getStudentIsGraduatedByPen(@PathVariable String pen) {
-        logger.debug("getTranscriptStudentGraduatedByPen : ");
-        validation.requiredField(pen, "Pen #");
-        if (validation.hasErrors()) {
-            validation.stopOnErrors();
-            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
-        }
-        return response.GET(traxCommonService.isGraduatedStudent(pen));
-    }
-
     @GetMapping(EducGradTraxApiConstants.GET_TRAX_STUDENT_DEMOG_MAPPING)
     @PreAuthorize(PermissionsConstants.READ_GRAD_TRAX_STUDENT_DATA)
     @Operation(summary = "Find Student Demographics from TRAX", description = "Find Student Demographics from TRAX", tags = {"Student"})
@@ -71,14 +56,14 @@ public ResponseEntity<List<Student>> getStudentDemographicsDataFromTrax(@PathVar
     @PreAuthorize(PermissionsConstants.READ_GRAD_TRAX_STUDENT_DATA)
     @Operation(summary = "Find Student Master Record from TRAX", description = "Find Student Master Record from TRAX", tags = {"Student"})
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK"),  @ApiResponse(responseCode = "400", description = "BAD REQUEST")})
-    public ResponseEntity<List<ConvGradStudent>> getStudentMasterDataFromTrax(@PathVariable String pen, @RequestHeader(name="Authorization") String accessToken) {
+    public ResponseEntity<List<ConvGradStudent>> getStudentMasterDataFromTrax(@PathVariable String pen) {
         logger.debug("getStudentMasterDataFromTrax : ");
         validation.requiredField(pen, "Pen #");
         if (validation.hasErrors()) {
             validation.stopOnErrors();
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
-        return response.GET(traxCommonService.getStudentMasterDataFromTrax(pen, accessToken.replace(BEARER, "")));
+        return response.GET(traxCommonService.getStudentMasterDataFromTrax(pen));
     }
 
     @GetMapping(EducGradTraxApiConstants.GET_TRAX_STUDENT_NO_LIST_BY_PAGING_MAPPING)

api/src/main/java/ca/bc/gov/educ/api/trax/model/dto/ConvGradStudent.java

@@ -1,7 +1,6 @@
 package ca.bc.gov.educ.api.trax.model.dto;
 
 import ca.bc.gov.educ.api.trax.constant.ConversionResultType;
-import ca.bc.gov.educ.api.trax.constant.StudentLoadType;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -42,19 +41,8 @@ public class ConvGradStudent {
     // program codes for optional / career program
     private List<String> programCodes;
 
-    // grad-one, grad-two, or ungrad
-    private StudentLoadType studentLoadType;
-    private Date distributionDate;
-    private String transcriptSchoolCategoryCode;
-    private String certificateSchoolCategoryCode;
-    private School transcriptSchool;
-    private School certificateSchool;
-    // tsw
-    private TranscriptStudentDemog transcriptStudentDemog;
-    private List<TranscriptStudentCourse> transcriptStudentCourses;
     // 1950 "AD"
     private boolean adult19Rule;
-    private boolean allowedAdult;
 
     // data conversion status after being processed.
     private ConversionResultType result;