GRAD2-2490

api/pom.xml

@@ -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>

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;
 

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;	
 }

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 {

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: