From 5b7056a8b1bc8b6cb6868a43532826081c230296 Mon Sep 17 00:00:00 2001 From: Jinil Sung Date: Mon, 29 Jan 2024 13:11:59 -0800 Subject: [PATCH 1/3] GRAD2-1604: task is complete. GRAD2-1604: task is complete. --- .../java/ca/bc/gov/educ/api/trax/model/dto/GradCourse.java | 2 ++ .../bc/gov/educ/api/trax/model/entity/GradCourseEntity.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/ca/bc/gov/educ/api/trax/model/dto/GradCourse.java b/api/src/main/java/ca/bc/gov/educ/api/trax/model/dto/GradCourse.java index 3f2bca8f..2d0f84e8 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/trax/model/dto/GradCourse.java +++ b/api/src/main/java/ca/bc/gov/educ/api/trax/model/dto/GradCourse.java @@ -58,4 +58,6 @@ public class GradCourse { // career life connections private String careerLifeConnections; + // indigenous-focused + private String indigenousFocused; } diff --git a/api/src/main/java/ca/bc/gov/educ/api/trax/model/entity/GradCourseEntity.java b/api/src/main/java/ca/bc/gov/educ/api/trax/model/entity/GradCourseEntity.java index 206ae7f6..c417d03b 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/trax/model/entity/GradCourseEntity.java +++ b/api/src/main/java/ca/bc/gov/educ/api/trax/model/entity/GradCourseEntity.java @@ -12,7 +12,7 @@ @Data @Immutable @Entity -@Where(clause = "GRAD_REQT_YEAR in ('2004','2018','1950','1996','1986')") +@Where(clause = "GRAD_REQT_YEAR in ('2023','2018','2004','1996','1986','1950')") @Table(name = "TAB_GRAD_CRSE") public class GradCourseEntity { @@ -69,4 +69,6 @@ public class GradCourseEntity { private String fineArts; @Column(name = "GRAD_CAREER_LIFE_CONNECTIONS") private String careerLifeConnections; + @Column(name = "GRAD_INDIGENOUS_FOCUSED") + private String indigenousFocused; } From 667d8c822253143eaed608f30508384c33d8aa06 Mon Sep 17 00:00:00 2001 From: Jinil Sung Date: Tue, 30 Jan 2024 11:21:48 -0800 Subject: [PATCH 2/3] GRAD2-2456: task is complete. GRAD2-2456: task is complete. --- .../db/migration/1.0/V1.0.24__DDL-DROP_TABLE-temp_table.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 api/src/main/resources/db/migration/1.0/V1.0.24__DDL-DROP_TABLE-temp_table.sql diff --git a/api/src/main/resources/db/migration/1.0/V1.0.24__DDL-DROP_TABLE-temp_table.sql b/api/src/main/resources/db/migration/1.0/V1.0.24__DDL-DROP_TABLE-temp_table.sql new file mode 100644 index 00000000..09a995da --- /dev/null +++ b/api/src/main/resources/db/migration/1.0/V1.0.24__DDL-DROP_TABLE-temp_table.sql @@ -0,0 +1,2 @@ +-- API_GRAD_TRAX.TMP_STUDENT Drop +DROP TABLE "TMP_STUDENT" CASCADE CONSTRAINTS; From 049fe8ed8cf5ad02bd03e0f93c928fe3d2a65500 Mon Sep 17 00:00:00 2001 From: Kamal Mohammed Date: Wed, 31 Jan 2024 10:05:04 -0700 Subject: [PATCH 3/3] Update pom.xml --- api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/pom.xml b/api/pom.xml index 417c1c2c..3e2e164a 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -6,7 +6,7 @@ ca.bc.gov.educ educ-grad-trax-api - 1.8.48 + 1.8.49 educ-grad-trax-api Ministry of Education GRAD TRAX API