Grad release 1.12.0

bcgov · Jan 15, 2024 · c70bb98 · c70bb98
2 parents 6b44c39 + bf4999f
commit c70bb98
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 40 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-graduation-api</artifactId>
-    <version>1.8.41</version>
+    <version>1.8.42</version>
     <name>educ-grad-student-graduation-api</name>
     <description>Ministry of Education GRAD STUDENT GRADUATION API</description>
 

diff --git a/api/src/main/java/ca/bc/gov/educ/api/studentgraduation/model/dto/TranscriptMessage.java b/api/src/main/java/ca/bc/gov/educ/api/studentgraduation/model/dto/TranscriptMessage.java
@@ -1,18 +1,15 @@
 package ca.bc.gov.educ.api.studentgraduation.model.dto;
 
-import java.util.UUID;
-
-import org.springframework.stereotype.Component;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.stereotype.Component;
 
-import jakarta.persistence.Column;
+import java.util.UUID;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Component
-public class TranscriptMessage extends BaseModel{
+public class TranscriptMessage extends BaseModel {
 
 	private UUID transcriptMessageID; 
 	private String programCode; 
@@ -21,7 +18,7 @@ public class TranscriptMessage extends BaseModel{
 	private String gradDateMessage;
 	private String honourNote;
 	private String adIBProgramMessage;
-	private String programCadre;
+	private String frenchImmersionMessage;
 	private String careerProgramMessage;
 	private String gradProjectedMessage;
 	private String honourProjectedNote;
@@ -37,7 +34,7 @@ public String toString() {
 				", gradDateMessage='" + gradDateMessage + '\'' +
 				", honourNote='" + honourNote + '\'' +
 				", adIBProgramMessage='" + adIBProgramMessage + '\'' +
-				", programCadre='" + programCadre + '\'' +
+				", frenchImmersionMessage='" + frenchImmersionMessage + '\'' +
 				", careerProgramMessage='" + careerProgramMessage + '\'' +
 				", gradProjectedMessage='" + gradProjectedMessage + '\'' +
 				", honourProjectedNote='" + honourProjectedNote + '\'' +

diff --git a/.../main/java/ca/bc/gov/educ/api/studentgraduation/model/entity/TranscriptMessageEntity.java b/.../main/java/ca/bc/gov/educ/api/studentgraduation/model/entity/TranscriptMessageEntity.java
@@ -1,16 +1,14 @@
 package ca.bc.gov.educ.api.studentgraduation.model.entity;
 
-import java.util.UUID;
-
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-
-import org.hibernate.annotations.Immutable;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.Immutable;
+
+import java.util.UUID;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -41,8 +39,8 @@ public class TranscriptMessageEntity extends BaseEntity {
 	@Column(name = "AD_IB_PROGRAM_MESSAGE", nullable = false)
     private String adIBProgramMessage;
 
-	@Column(name = "PROGRAM_CADRE", nullable = false)
-    private String programCadre;
+	@Column(name = "FRENCH_IMMERSION_MESSAGE", nullable = false)
+    private String frenchImmersionMessage;
 
 	@Column(name = "CAREER_PROGRAM_MESSAGE", nullable = false)
     private String careerProgramMessage;

diff --git a/.../ca/bc/gov/educ/api/studentgraduation/model/transformer/TranscriptMessageTransformer.java b/.../ca/bc/gov/educ/api/studentgraduation/model/transformer/TranscriptMessageTransformer.java
@@ -1,15 +1,14 @@
 package ca.bc.gov.educ.api.studentgraduation.model.transformer;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
+import ca.bc.gov.educ.api.studentgraduation.model.dto.TranscriptMessage;
+import ca.bc.gov.educ.api.studentgraduation.model.entity.TranscriptMessageEntity;
 import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import ca.bc.gov.educ.api.studentgraduation.model.dto.TranscriptMessage;
-import ca.bc.gov.educ.api.studentgraduation.model.entity.TranscriptMessageEntity;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 
 
 @Component
@@ -27,13 +26,13 @@ public TranscriptMessage transformToDTO ( Optional<TranscriptMessageEntity> tran
         if (transcriptMessageEntity.isPresent())
             cae = transcriptMessageEntity.get();
 
-        return modelMapper.map(cae, TranscriptMessage.class);
+        return transformToDTO(cae);
     }
 
 	public List<TranscriptMessage> transformToDTO (Iterable<TranscriptMessageEntity> gradMessagingEntities ) {
 		List<TranscriptMessage> gradMessagingList = new ArrayList<>();
         for (TranscriptMessageEntity gradMessagingEntity : gradMessagingEntities) {
-        	TranscriptMessage gradMessaging = modelMapper.map(gradMessagingEntity, TranscriptMessage.class);            
+        	TranscriptMessage gradMessaging = transformToDTO(gradMessagingEntity);
         	gradMessagingList.add(gradMessaging);
         }
         return gradMessagingList;

diff --git a/api/src/main/resources/db/migration/1.0/V1.0.84__DDL-RENAME_COLUMN-TranscriptMessage.sql b/api/src/main/resources/db/migration/1.0/V1.0.84__DDL-RENAME_COLUMN-TranscriptMessage.sql
@@ -0,0 +1,5 @@
+ALTER TABLE TRANSCRIPT_MESSAGE RENAME COLUMN PROGRAM_CADRE to FRENCH_IMMERSION_MESSAGE ;
+
+
+
+
diff --git a/api/src/main/resources/db/migration/1.0/V1.0.85__DML-UPDATE_DATA-TRANSCRIPT_MESSAGE.sql b/api/src/main/resources/db/migration/1.0/V1.0.85__DML-UPDATE_DATA-TRANSCRIPT_MESSAGE.sql
@@ -0,0 +1,3 @@
+UPDATE TRANSCRIPT_MESSAGE
+SET FRENCH_IMMERSION_MESSAGE  = ''
+WHERE GRADUATION_PROGRAM_CODE LIKE '%-PF' AND MESSAGE_TYPE_CODE = 'GRADUATED';
diff --git a/...java/ca/bc/gov/educ/api/studentgraduation/controller/TranscriptMessageControllerTest.java b/...java/ca/bc/gov/educ/api/studentgraduation/controller/TranscriptMessageControllerTest.java
@@ -1,21 +1,20 @@
 package ca.bc.gov.educ.api.studentgraduation.controller;
 
-import java.sql.Date;
-import java.util.ArrayList;
-import java.util.List;
-
+import ca.bc.gov.educ.api.studentgraduation.model.dto.TranscriptMessage;
+import ca.bc.gov.educ.api.studentgraduation.service.TranscriptMessageService;
+import ca.bc.gov.educ.api.studentgraduation.util.GradValidation;
+import ca.bc.gov.educ.api.studentgraduation.util.MessageHelper;
+import ca.bc.gov.educ.api.studentgraduation.util.ResponseHelper;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import ca.bc.gov.educ.api.studentgraduation.model.dto.TranscriptMessage;
-import ca.bc.gov.educ.api.studentgraduation.service.TranscriptMessageService;
-import ca.bc.gov.educ.api.studentgraduation.util.GradValidation;
-import ca.bc.gov.educ.api.studentgraduation.util.MessageHelper;
-import ca.bc.gov.educ.api.studentgraduation.util.ResponseHelper;
+import java.sql.Date;
+import java.util.ArrayList;
+import java.util.List;
 
 
 @ExtendWith(MockitoExtension.class)
@@ -47,7 +46,7 @@ public void testGetAllMessagingCodeList() {
 		obj.setGradDateMessage("GD");
 		obj.setHonourNote("Y");
 		obj.setGradMainMessage("abcd");
-		obj.setProgramCadre("PR");
+		obj.setFrenchImmersionMessage("PR");
 		obj.setCreateUser("GRADUATION");
 		obj.setUpdateUser("GRADUATION");
 		obj.setCreateDate(new Date(System.currentTimeMillis()));
@@ -61,7 +60,7 @@ public void testGetAllMessagingCodeList() {
 		obj.setGradDateMessage("GD");
 		obj.setHonourNote("Y");
 		obj.setGradMainMessage("abcd");
-		obj.setProgramCadre("PR");
+		obj.setFrenchImmersionMessage("PR");
 		obj.setCreateUser("GRADUATION");
 		obj.setUpdateUser("GRADUATION");
 		obj.setCreateDate(new Date(System.currentTimeMillis()));
@@ -84,7 +83,7 @@ public void testGetSpecificMessagingCode() {
 		obj.setGradDateMessage("GD");
 		obj.setHonourNote("Y");
 		obj.setGradMainMessage("abcd");
-		obj.setProgramCadre("PR");
+		obj.setFrenchImmersionMessage("PR");
 		obj.setCreateUser("GRADUATION");
 		obj.setUpdateUser("GRADUATION");
 		obj.setCreateDate(new Date(System.currentTimeMillis()));

diff --git a/.../test/java/ca/bc/gov/educ/api/studentgraduation/service/TranscriptMessageServiceTest.java b/.../test/java/ca/bc/gov/educ/api/studentgraduation/service/TranscriptMessageServiceTest.java
@@ -52,7 +52,7 @@ public void testGetAllMessagingCodeList() {
 		obj.setGradDateMessage("GD");
 		obj.setHonourNote("Y");
 		obj.setGradMainMessage("abcd");
-		obj.setProgramCadre("PR");
+		obj.setFrenchImmersionMessage("PR");
 		obj.setCreateUser("GRADUATION");
 		obj.setUpdateUser("GRADUATION");
 		obj.setCreateDate(new Date(System.currentTimeMillis()));
@@ -67,7 +67,7 @@ public void testGetAllMessagingCodeList() {
 		obj.setGradDateMessage("GD");
 		obj.setHonourNote("Y");
 		obj.setGradMainMessage("abcd");
-		obj.setProgramCadre("PR");
+		obj.setFrenchImmersionMessage("PR");
 		obj.setCreateUser("GRADUATION");
 		obj.setUpdateUser("GRADUATION");
 		obj.setCreateDate(new Date(System.currentTimeMillis()));
@@ -89,7 +89,7 @@ public void testGetSpecificTranscriptMessageCode() {
 		obj.setGradDateMessage("GD");
 		obj.setHonourNote("Y");
 		obj.setGradMainMessage("abcd");
-		obj.setProgramCadre("PR");
+		obj.setFrenchImmersionMessage("PR");
 		obj.setCreateUser("GRADUATION");
 		obj.setUpdateUser("GRADUATION");
 		obj.setCreateDate(new Date(System.currentTimeMillis()));
@@ -103,7 +103,7 @@ public void testGetSpecificTranscriptMessageCode() {
 		objEntity.setGradDateMessage("GD");
 		objEntity.setHonourNote("Y");
 		objEntity.setGradMainMessage("abcd");
-		objEntity.setProgramCadre("PR");
+		objEntity.setFrenchImmersionMessage("PR");
 		objEntity.setCreateUser("GRADUATION");
 		objEntity.setUpdateUser("GRADUATION");
 		objEntity.setCreateDate(new Date(System.currentTimeMillis()));