Grad release 1.14.0

bcgov · Feb 6, 2024 · 6885117 · 6885117
2 parents 1287be2 + 2a8f524
commit 6885117
Show file tree

Hide file tree

Showing 8 changed files with 419 additions and 21 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>ca.bc.gov.educ</groupId>
 	<artifactId>educ-grad-program-api</artifactId>
-	<version>1.8.28</version>
+	<version>1.8.29</version>
 	<name>educ-grad-program-api</name>
 	<description>Ministry of Education GRAD PROGRAM API</description>
 
@@ -139,10 +139,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
         </dependency>
-        <!--<dependency>
-			<groupId>jakarta.validation</groupId>
-			<artifactId>validation-api</artifactId>
-		</dependency>-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
 		<dependency>
 		    <groupId>org.springframework.boot</groupId>
 		    <artifactId>spring-boot-starter-webflux</artifactId>

diff --git a/api/src/main/java/ca/bc/gov/educ/api/program/model/dto/CareerProgram.java b/api/src/main/java/ca/bc/gov/educ/api/program/model/dto/CareerProgram.java
@@ -1,15 +1,16 @@
 package ca.bc.gov.educ.api.program.model.dto;
 
-import org.springframework.stereotype.Component;
-
 import lombok.Data;
+import org.springframework.stereotype.Component;
 
 @Data
 @Component
 public class CareerProgram {
 
 	private String code;
+	private String name;
 	private String description;
+	private int displayOrder;
 	private String startDate;
 	private String endDate;
 

diff --git a/api/src/main/java/ca/bc/gov/educ/api/program/model/entity/CareerProgramEntity.java b/api/src/main/java/ca/bc/gov/educ/api/program/model/entity/CareerProgramEntity.java
@@ -1,29 +1,34 @@
 package ca.bc.gov.educ.api.program.model.entity;
 
-import java.util.Date;
-
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 @Entity
-@Table(name = "TAB_PRGM")
-public class CareerProgramEntity  {
+@Table(name = "CAREER_PROGRAM_CODE")
+public class CareerProgramEntity extends BaseEntity {
 
 	@Id
-	@Column(name = "PRGM_CODE", nullable = false)
+	@Column(name = "CAREER_PROGRAM_CODE", nullable = false)
     private String code;
-
-	@Column(name = "PRGM_NAME", nullable = true)
+
+	@Column(name = "LABEL", nullable = true)
+	private String name;
+
+	@Column(name = "DESCRIPTION", nullable = true)
     private String description;
 
-	@Column(name = "START_DATE", nullable = true)
+	@Column(name = "DISPLAY_ORDER", nullable = true)
+	private int displayOrder;
+
+	@Column(name = "EFFECTIVE_DATE", nullable = true)
     private Date startDate; 
 
-	@Column(name = "END_DATE", nullable = true)
+	@Column(name = "EXPIRY_DATE", nullable = true)
     private Date endDate;	
 }
diff --git a/api/src/main/java/ca/bc/gov/educ/api/program/service/ProgramService.java b/api/src/main/java/ca/bc/gov/educ/api/program/service/ProgramService.java
@@ -6,6 +6,7 @@
 import ca.bc.gov.educ.api.program.model.transformer.*;
 import ca.bc.gov.educ.api.program.repository.*;
 import ca.bc.gov.educ.api.program.util.GradValidation;
+import jakarta.validation.Valid;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,7 +16,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import jakarta.validation.Valid;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -495,8 +495,7 @@ public List<CareerProgram> getAllCareerProgramCodeList() {
 
 	@Transactional(readOnly = true)
 	public CareerProgram getSpecificCareerProgramCode(String cpc) {
-		Optional<CareerProgramEntity> entity = gradCareerProgramRepository
-				.findById(StringUtils.toRootUpperCase(cpc));
+		Optional<CareerProgramEntity> entity = gradCareerProgramRepository.findById(StringUtils.toRootUpperCase(cpc));
 		if (entity.isPresent()) {
 			return gradCareerProgramTransformer.transformToDTO(entity);
 		} else {

diff --git a/api/src/main/resources/application.yaml b/api/src/main/resources/application.yaml
@@ -16,7 +16,7 @@ spring:
     driver-class: oracle.jdbc.driver.OracleDriver
   jpa:
     show-sql: ${SHOW_SQL_LOGS}
-    database-platform: org.hibernate.dialect.Oracle12cDialect
+    database-platform: org.hibernate.dialect.OracleDialect
     hibernate:
       ddl-auto: none
   mvc:

diff --git a/...rc/main/resources/db/migration/1.0/V1.0.101__DML-UPDATE_DATA-program_requirement_code.sql b/...rc/main/resources/db/migration/1.0/V1.0.101__DML-UPDATE_DATA-program_requirement_code.sql
@@ -0,0 +1,2 @@
+UPDATE PROGRAM_REQUIREMENT_CODE SET NOT_MET_DESC = 'Work Experience Course issue - see 1950''s 506 Rule', UPDATE_USER = USER, UPDATE_DATE = SYSTIMESTAMP WHERE PROGRAM_REQUIREMENT_CODE = '506';
+
diff --git a/api/src/main/resources/db/migration/1.0/V1.0.102__DDL-CREATE_TABLE-career_program_code.sql b/api/src/main/resources/db/migration/1.0/V1.0.102__DDL-CREATE_TABLE-career_program_code.sql
@@ -0,0 +1,20 @@
+-- CAREER_PROGRAM_CODE definition
+
+CREATE TABLE "CAREER_PROGRAM_CODE" (
+    "CAREER_PROGRAM_CODE" VARCHAR2(16),
+    "LABEL" VARCHAR2(50) NOT NULL ENABLE,
+    "DESCRIPTION" VARCHAR2(355) NOT NULL ENABLE,
+    "DISPLAY_ORDER" NUMBER NOT NULL ENABLE,
+    "EFFECTIVE_DATE" DATE NOT NULL ENABLE,
+    "EXPIRY_DATE" DATE,
+    "CREATE_USER" VARCHAR2(32) DEFAULT USER NOT NULL ENABLE,
+    "CREATE_DATE" DATE DEFAULT SYSTIMESTAMP NOT NULL ENABLE,
+    "UPDATE_USER" VARCHAR2(32) DEFAULT USER NOT NULL ENABLE,
+    "UPDATE_DATE" DATE DEFAULT SYSTIMESTAMP NOT NULL ENABLE,
+    CONSTRAINT "CAREER_PROGRAM_CODE_PK" PRIMARY KEY ("CAREER_PROGRAM_CODE")
+         USING INDEX TABLESPACE "API_GRAD_IDX"  ENABLE
+) SEGMENT CREATION IMMEDIATE
+    NOCOMPRESS LOGGING
+    TABLESPACE "API_GRAD_DATA" NO INMEMORY ;
+
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		UPDATE PROGRAM_REQUIREMENT_CODE SET NOT_MET_DESC = 'Work Experience Course issue - see 1950''s 506 Rule', UPDATE_USER = USER, UPDATE_DATE = SYSTIMESTAMP WHERE PROGRAM_REQUIREMENT_CODE = '506';