diff --git a/.gitignore b/.gitignore index 2bcd3beb..3be6a73c 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,4 @@ signatures *.iml /.project .idea -target -original-signatures -signatures +target \ No newline at end of file diff --git a/api/.gitignore b/api/.gitignore index 0a000ab6..8655d7b6 100644 --- a/api/.gitignore +++ b/api/.gitignore @@ -29,4 +29,6 @@ build/ ### VS Code ### .vscode/ -/src/main/resources/application-local.yaml + +### Local dev ### +**/application-local.yaml diff --git a/api/pom.xml b/api/pom.xml index 9821bf35..c53d3e22 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -7,7 +7,7 @@ ca.bc.gov.educ educ-grad-report-api educ-grad-report-api - 1.8.66 + 1.8.68 Ministry of Education and Child Care REPORT API diff --git a/api/src/main/java/ca/bc/gov/educ/grad/report/dto/BaseModel.java b/api/src/main/java/ca/bc/gov/educ/grad/report/dto/BaseModel.java index b7a84e5a..6858441b 100644 --- a/api/src/main/java/ca/bc/gov/educ/grad/report/dto/BaseModel.java +++ b/api/src/main/java/ca/bc/gov/educ/grad/report/dto/BaseModel.java @@ -2,7 +2,7 @@ import lombok.Data; -import java.sql.Date; +import java.util.Date; @Data public class BaseModel { diff --git a/api/src/main/java/ca/bc/gov/educ/grad/report/dto/GradReportSignatureImage.java b/api/src/main/java/ca/bc/gov/educ/grad/report/dto/GradReportSignatureImage.java index 6a9987f1..46fca7eb 100644 --- a/api/src/main/java/ca/bc/gov/educ/grad/report/dto/GradReportSignatureImage.java +++ b/api/src/main/java/ca/bc/gov/educ/grad/report/dto/GradReportSignatureImage.java @@ -24,6 +24,7 @@ public class GradReportSignatureImage extends BaseModel { private byte[] signatureContent; private String gradReportSignatureCode; private String gradReportSignatureName; + private String gradReportSignatureOrganizationName; private String districtName; @JsonFormat(pattern= ReportApiConstants.DEFAULT_DATE_FORMAT) private Date effectiveDate; diff --git a/api/src/main/java/ca/bc/gov/educ/grad/report/entity/GradReportSignatureImageEntity.java b/api/src/main/java/ca/bc/gov/educ/grad/report/entity/GradReportSignatureImageEntity.java index 2eefc753..67fd0e3f 100644 --- a/api/src/main/java/ca/bc/gov/educ/grad/report/entity/GradReportSignatureImageEntity.java +++ b/api/src/main/java/ca/bc/gov/educ/grad/report/entity/GradReportSignatureImageEntity.java @@ -21,6 +21,9 @@ public class GradReportSignatureImageEntity extends BaseEntity { @Column(name = "DIGITAL_SIGNATURE_CODE", nullable = false) private String gradReportSignatureCode; + @Column(name = "DIGITAL_SIGNATURE_ORGANIZATION_NAME") + private String gradReportSignatureOrganizationName; + @Column(name = "DIGITAL_SIGNATURE_NAME") private String gradReportSignatureName; diff --git a/api/src/main/resources/application.yaml b/api/src/main/resources/application.yaml index fdd0ee2f..dd5c62bd 100644 --- a/api/src/main/resources/application.yaml +++ b/api/src/main/resources/application.yaml @@ -63,6 +63,9 @@ logging: boot: autoconfigure: logging: ${SPRING_BOOT_AUTOCONFIG_LOG_LEVEL} + com: + zaxxer: + hikari: ERROR logback: rollingpolicy: max-history: 1 @@ -80,6 +83,7 @@ server: worker: 128 io: 16 #port: ${HTTP_PORT} + max-http-request-header-size: 20000 #API Documentation springdoc: diff --git a/api/src/main/resources/db/migration/1.0/V1.0.109__DDL-ALTER_TABLE-ADD-DIGITAL_SIGNATURE.sql b/api/src/main/resources/db/migration/1.0/V1.0.109__DDL-ALTER_TABLE-ADD-DIGITAL_SIGNATURE.sql new file mode 100644 index 00000000..8e97f2cf --- /dev/null +++ b/api/src/main/resources/db/migration/1.0/V1.0.109__DDL-ALTER_TABLE-ADD-DIGITAL_SIGNATURE.sql @@ -0,0 +1,2 @@ +ALTER TABLE DIGITAL_SIGNATURE + ADD DIGITAL_SIGNATURE_ORGANIZATION_NAME varchar2(64); \ No newline at end of file diff --git a/api/src/main/resources/db/migration/1.0/V1.0.110__DML-UPDATE_DATA-DIGITAL_SIGNATURE.sql b/api/src/main/resources/db/migration/1.0/V1.0.110__DML-UPDATE_DATA-DIGITAL_SIGNATURE.sql new file mode 100644 index 00000000..cb606b39 --- /dev/null +++ b/api/src/main/resources/db/migration/1.0/V1.0.110__DML-UPDATE_DATA-DIGITAL_SIGNATURE.sql @@ -0,0 +1,66 @@ +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Southeast Kootenay', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='005'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Rocky mountain', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='006'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Kootenay lake', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='008'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Arrow lakes', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='010'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Revelstoke', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='019'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Kootenay-Columbia', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='020'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Vernon', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='022'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Central Okanagan Public Schools SD 23', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='023'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Cariboo-Chilcotin', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='027'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Quesnel', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='028'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Chilliwack', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='033'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Abbotsford', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='034'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Langley', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='035'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Surrey', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='036'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Delta', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='037'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Richmond', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='038'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Vancouver', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='039'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='New Westminster', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='040'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Burnaby', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='041'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Maple ridge', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='042'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Coquitlam', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='043'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='North Vancouver', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='044'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='West Vancouver', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='045'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Sunshine coast', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='046'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Powell river', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='047'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Sea to sky', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='048'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Central coast', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='049'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Haida Gwaii', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='050'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Boundary', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='051'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Prince Rupert', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='052'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Okanagan Similkameen', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='053'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Bulkley valley', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='054'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Prince George', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='057'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Nicola-Similkameen', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='058'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Peace river south', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='059'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Peace river north', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='060'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Greater Victoria', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='061'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Sooke', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='062'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Saanich', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='063'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Gulf islands', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='064'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Okanagan Skaha', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='067'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Nanaimo-Ladysmith', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='068'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Qualicum', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='069'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Pacific rim', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='070'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Comox valley', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='071'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Campbell river', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='072'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Kamloops-Thompson', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='073'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Gold trail', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='074'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Mission', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='075'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Fraser-cascade', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='078'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Cowichan valley', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='079'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Fort nelson', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='081'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Coast mountains', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='082'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='North Okanagan Shuswap', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='083'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Vancouver Island West', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='084'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Vancouver Island North', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='085'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Stikine', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='087'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Nechako lakes', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='091'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Nisga''a', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='092'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Conseil Scolaire Francophone', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='093'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Offshore independent', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='103'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='First Nation Governing Authority', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='FIRST_NATIONS'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='B.C. Ministry of Education and Child Care', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='INDEP'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='B.C. Ministry of Post-Secondary Education and Future Skills', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='MOAE'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='B.C. Ministry of Education and Child Care', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='MOE'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='B.C. Ministry of Education and Child Care', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='MOE_ADM'; \ No newline at end of file diff --git a/api/src/main/resources/db/migration/1.0/V1.0.111__DML-UPDATE_DATA-DIGITAL_SIGNATURE.sql b/api/src/main/resources/db/migration/1.0/V1.0.111__DML-UPDATE_DATA-DIGITAL_SIGNATURE.sql new file mode 100644 index 00000000..0512df6d --- /dev/null +++ b/api/src/main/resources/db/migration/1.0/V1.0.111__DML-UPDATE_DATA-DIGITAL_SIGNATURE.sql @@ -0,0 +1,52 @@ +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Okanagan Skaha', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='067'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Nanaimo-Ladysmith', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='068'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Qualicum', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='069'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Pacific rim', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='070'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Comox valley', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='071'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Campbell river', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='072'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Kamloops-Thompson', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='073'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Gold trail', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='074'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Mission', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='075'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Fraser-cascade', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='078'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Cowichan valley', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='079'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Fort nelson', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='081'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Coast mountains', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='082'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='North Okanagan Shuswap', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='083'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Vancouver Island West', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='084'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Vancouver Island North', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='085'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Stikine', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='087'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Nechako lakes', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='091'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Nisga''a', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='092'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Conseil Scolaire Francophone', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='093'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='Offshore independent', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='103'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='First Nation Governing Authority', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='FIRST_NATIONS'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='B.C. Ministry of Education and Child Care', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='INDEP'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='B.C. Ministry of Post-Secondary Education and Future Skills', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='MOAE'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='B.C. Ministry of Education and Child Care', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='MOE'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_ORGANIZATION_NAME='B.C. Ministry of Education and Child Care', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='MOE_ADM'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Todd Manuel', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='067'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Laura Tait', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='068'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Peter Jory', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='069'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Tim Davie', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='070'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Dr. Jeremy Morrow', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='071'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Geoff Manning', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='072'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Rhonda Nixon', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='073'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Vessy Mochikas', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='074'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Angus Wilson', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='075'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Balan Moorthy', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='078'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Robyn Gray', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='079'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Mark Theobald', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='081'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Aaron Callaghan', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='082'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Donna Kriger', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='083'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Lawrence Tarasoff', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='084'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Christina MacDonald', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='085'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Tracey MacMillan', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='087'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Karla Mitchell', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='091'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Matthew Monkman', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='092'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Pascale Bernier', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='093'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Grant Sheppard', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='103'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME=NULL, UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='FIRST_NATIONS'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Theo Vandeweg', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='INDEP'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Lisa Beare', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='MOAE'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Rachna Singh', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='MOE'; +UPDATE DIGITAL_SIGNATURE SET DIGITAL_SIGNATURE_NAME='Melanie Stewart', UPDATE_USER = 'GRAD_REPORT_API', UPDATE_DATE = SYSTIMESTAMP WHERE DIGITAL_SIGNATURE_CODE='MOE_ADM'; \ No newline at end of file diff --git a/api/src/main/resources/db/migration/1.0/V1.0.112__DML-INSERT_DATA-REPORT_TYPE_CODE.sql b/api/src/main/resources/db/migration/1.0/V1.0.112__DML-INSERT_DATA-REPORT_TYPE_CODE.sql new file mode 100644 index 00000000..12bb7932 --- /dev/null +++ b/api/src/main/resources/db/migration/1.0/V1.0.112__DML-INSERT_DATA-REPORT_TYPE_CODE.sql @@ -0,0 +1,8 @@ +Insert into REPORT_TYPE_CODE (REPORT_TYPE_CODE, LABEL, DESCRIPTION, DISPLAY_ORDER, EFFECTIVE_DATE) +VALUES + ('GRADPRJ','Projected Graduates - Summary Report (MM YYYY to MM YYYY)', 'A list of all current students reported on a graduation program, in grade 12 or AD, who are projected to graduate based on future course registrations or assessment registrations. Produced as part of TVR Batch Run.', 140, to_date('2024-05-01','RR-MM-DD')); + +Insert into REPORT_TYPE_CODE (REPORT_TYPE_CODE, LABEL, DESCRIPTION, DISPLAY_ORDER, EFFECTIVE_DATE) +VALUES + ('GRADPRJARC','Archived Projected Graduates - Summary Report (MM YYYY to MM YYYY)', 'The final list of all current students reported on a graduation program, in grade 12 or AD, who are projected to graduate based on future course registrations or assessment registrations.', 150, to_date('2024-05-01','RR-MM-DD')); + diff --git a/api/src/main/resources/db/migration/1.0/V1.0.113__DML-UPDATE_TABLE-SIGNATURE_BLOCK_TYPE.sql b/api/src/main/resources/db/migration/1.0/V1.0.113__DML-UPDATE_TABLE-SIGNATURE_BLOCK_TYPE.sql new file mode 100644 index 00000000..f2d649b0 --- /dev/null +++ b/api/src/main/resources/db/migration/1.0/V1.0.113__DML-UPDATE_TABLE-SIGNATURE_BLOCK_TYPE.sql @@ -0,0 +1,8 @@ +UPDATE SIGNATURE_BLOCK_TYPE +SET + LABEL = 'Assistant Deputy Minister', + DESCRIPTION = 'Assistant Deputy Minister', + UPDATE_USER = 'GRAD_REPORT_API', + UPDATE_DATE = SYSTIMESTAMP +WHERE + SIGNATURE_BLOCK_TYPE = 'MOE_ADM'; \ No newline at end of file diff --git a/api/src/test/java/ca/bc/gov/educ/grad/report/api/test/controller/StudentReportSignatureImageControllerTest.java b/api/src/test/java/ca/bc/gov/educ/grad/report/api/test/controller/StudentReportSignatureImageControllerTest.java index 1c500056..71f46386 100644 --- a/api/src/test/java/ca/bc/gov/educ/grad/report/api/test/controller/StudentReportSignatureImageControllerTest.java +++ b/api/src/test/java/ca/bc/gov/educ/grad/report/api/test/controller/StudentReportSignatureImageControllerTest.java @@ -98,6 +98,7 @@ public void getSignatureImagesTest() throws Exception { GradReportSignatureImage signatureImage = new GradReportSignatureImage(); signatureImage.setGradReportSignatureCode(signatureCode); signatureImage.setSignatureContent(imageBinary); + signatureImage.setGradReportSignatureOrganizationName("Kootenay"); signatureImage.setSignatureId(UUID.randomUUID()); List signatureImages = new ArrayList(); diff --git a/api/src/test/resources/application.yaml b/api/src/test/resources/application.yaml index e4091fee..8fedc41c 100644 --- a/api/src/test/resources/application.yaml +++ b/api/src/test/resources/application.yaml @@ -72,6 +72,9 @@ logging: boot: autoconfigure: logging: INFO + com: + zaxxer: + hikari: ERROR hibernate: SQL: DEBUG type: