Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flyway migration + encoding workaround - Test data as of Oct25 #246

Closed
wants to merge 12 commits into from
3 changes: 2 additions & 1 deletion backend/src/report/report.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,15 @@ export class ReportController {
const errorMessage = `Disposition Transaction not found with id ${dtid}`;
throw new HttpException(errorMessage, HttpStatus.INTERNAL_SERVER_ERROR);
});
//
return response;
}

@Get('get-document-data/:document_type_id/:dtid')
getDocumentDataByDocTypeIdAndDtid(@Param('document_type_id') document_type_id: number, @Param('dtid') dtid: number) {
return this.reportService.getDocumentDataByDocTypeIdAndDtid(document_type_id, dtid);
}

//
@Get('get-report-name/:dtid/:tfn/:document_type_id')
getReportNameNew(
@Param('dtid') dtid: number,
Expand Down
4 changes: 4 additions & 0 deletions charts/app/templates/backend/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ spec:
value: "USERS"
- name: FLYWAY_CONNECT_RETRIES
value: "10"
- name: FLYWAY_ENCODING
value: "UTF-8"
- name: FLYWAY_PLACEHOLDER_REPLACEMENT
value: "false"
resources:
limits:
cpu: 400m
Expand Down
5 changes: 5 additions & 0 deletions charts/app/templates/frontend/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ spec:
value: '0'
- name: session_path
value: '/mnt/sessions'
- name: KEYCLOAK_URL
valueFrom:
secretKeyRef:
name: react-app
key: keycloak-url
ports:
- name: http
containerPort: 3000
Expand Down
4 changes: 2 additions & 2 deletions charts/app/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -228,14 +228,14 @@ bitnami-pg:
podSecurityContext:
enabled: false
storage:
size: 400Mi
size: 256Mi
primary:
persistence:
enabled: true
storageClass: netapp-block-standard
accessModes:
- ReadWriteOnce
size: 500Mi
size: 256Mi
containerSecurityContext:
enabled: false
podSecurityContext:
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,25 @@ INSERT INTO public.provision (id,provision_name,free_text,help_text,category,act
(66,'TEMPLATE VARIABLES - NFR- TO OBTAIN SURVEY','','Interim tenure is being issued for survey purposes and/or initial activity. A subsequent tenure will be issued upon completion of the requirements set out in interim tenure. Not to be used for Crown Grants.','DOCUMENT TYPE',true,false,NULL,'BSALL','2023-06-02 15:57:07.279427','2023-06-22 16:19:52.911188'),
(8,'BLANKET SECURITY STATEMENT','According to our records, you are currently covered by a blanket security agreement between the Province and «BLANKET_BOND_NAME». As long as this agreement is in good standing and you continue to be covered by it, you are not required to post security for this «DB_TENURE_TYPE» unless and until you receive further notice from us.','Use this when client is covered by blanket security agreement','OFFER - SECURITY',true,false,NULL,'BSALL','2023-06-02 15:57:07.279427','2023-06-22 17:15:25.058373'),
(111,'ADDITIONAL REQUIREMENTS - IMPROVEMENTS STAT DEC','You must deliver to us a statutory declaration, in the form attached, stating that all improvements on the Land are either owned by you or have been constructed, erected or place on the Land by you. Please sign this declaration in front of a solicitor or notary public.','Use this when a statutory declaration is required regarding ownership of improvements.','ADDITIONAL REQUIREMENTS',true,false,NULL,'BSALL','2023-06-02 15:57:07.364365','2023-06-20 20:34:35.62335'),
(97,'SURVEY - CLIENT - PAYS','«DEADLINE_CONFIRM_SURVEY», you must retain a British Columbia Land Surveyor to prepare a boundary survey of the Land at your expense.
(97,'SURVEY - CLIENT - PAYS','«DEADLINE_CONFIRM_SURVEY», you must retain a British Columbia Land Surveyor to prepare a boundary survey of the Land at your expense.

The survey must be completed and the plan submitted to the Surveyor General on or before «DEADLINE_COMPLETE_SURVEY». If the survey is not completed on or before that date, and that date is not otherwise extended in writing by us we are under no further obligation to issue a «DB_TENURE_TYPE» of the Land to you.','Use when client pays for survey','OFFER SURVEY',true,false,NULL,'LOMILLER','2023-06-02 15:57:07.364365','2023-06-21 21:39:34.632611'),
(11,'INSURANCE REQUIRED - NFR - CERTIFICATE REQUIRED','You must deliver to us the attached Province of British Columbia Certificate of Insurance, signed by your insurance agent, for the insurance required to be maintained under the «DB_TENURE_TYPE». A sample certificate is enclosed.','Use when a Certificate of Insurance is required.','OFFER - INSURANCE',true,false,NULL,'BSALL','2023-06-02 15:57:07.279427','2023-06-22 16:41:47.327374'),
(79,'INSURANCE REQUIRED - NFR OBTAIN SURVEY - CERTIFICATE','You must deliver to us the attached Province of British Columbia Certificate of Insurance, signed by your insurance agent, for the insurance required to be maintained under the «INTERIM_TENURE_TYPE». A sample certificate is enclosed.','Use when a Certificate of Insurance is required.','OFFER - INSURANCE',true,false,NULL,'BSALL','2023-06-02 15:57:07.364365','2023-06-22 16:41:32.284043'),
(47,'SURVEY - MINISTRY PAYS (DEPOSIT REQUIRED) -NFR DELAYED','A boundary survey of the Land will be undertaken by a British Columbia Land Surveyor hired by us.
You must, by «DEADLINE_SURVEY_DEPOSIT», pay to us a deposit of $«DEPOSIT_AMOUNT_SURVEY» (which, if the «DB_TENURE_TYPE» is issued, will be credited against the amounts set out below that you are required to pay). If you choose not to proceed with the «DB_TENURE_TYPE» after the survey has been started, the deposit will be forfeited to the Province as liquidated damages. Please make your cheque or money order payable to the Minister of Finance and deliver it to «DB_ADDRESS_LINE_REGIONAL_OFFICE».
(47,'SURVEY - MINISTRY PAYS (DEPOSIT REQUIRED) -NFR DELAYED','A boundary survey of the Land will be undertaken by a British Columbia Land Surveyor hired by us.

You must, by «DEADLINE_SURVEY_DEPOSIT», pay to us a deposit of $«DEPOSIT_AMOUNT_SURVEY» (which, if the «DB_TENURE_TYPE» is issued, will be credited against the amounts set out below that you are required to pay). If you choose not to proceed with the «DB_TENURE_TYPE» after the survey has been started, the deposit will be forfeited to the Province as liquidated damages. Please make your cheque or money order payable to the Minister of Finance and deliver it to «DB_ADDRESS_LINE_REGIONAL_OFFICE».

If the survey is completed in accordance with the requirements set out above, we will complete the «DB_TENURE_TYPE» documents by inserting the correct legal description for the Land and by inserting the required monies payable. The monies payable are calculated on the basis of the area of the Land at a rate of $«RATE_PER_METRE_SURVEY_DEPOSIT_DELAYED». If the area of the Land exceeds «MAXIMUM_AREA_SURVEY_DEPOSIT_DELAYED», this offer terminates unless we agree with you in writing to proceed with the issuance of the «DB_TENURE_TYPE».','Use to require payment of a deposit where Province is to pay for a survey.','OFFER SURVEY',true,false,NULL,'BSALL','2023-06-02 15:57:07.279427','2023-06-27 15:09:33.645396'),
(77,'BLANKET SECURITY - OBTAIN SURVEY','According to our records, you are currently covered by a blanket security agreement between the Province and «BLANKET_BOND_NAME». As long as this agreement is in good standing and you continue to be covered by it, you are not required to post security for this «INTERIM_TENURE_TYPE» until you receive further notice from us.','Client has a blanket security - we are issuing interim tenure','OFFER - SECURITY',true,false,NULL,'BSALL','2023-06-02 15:57:07.279427','2023-06-22 16:58:36.242497'),
(46,'SURVEY - CLIENT PAYS - NFR DELAYED','«DEADLINE_CONFIRM_SURVEY», you must retain a British Columbia Land Surveyor to prepare a boundary survey of the Land at your expense.
The survey must be completed, and the plan submitted to the Surveyor General on or before «DEADLINE_COMPLETE_SURVEY». If the survey is not completed on or before that date, and that date is not otherwise extended in writing by us we are under no further obligation to issue a «DB_TENURE_TYPE» of the Land to you.
(46,'SURVEY - CLIENT PAYS - NFR DELAYED','«DEADLINE_CONFIRM_SURVEY», you must retain a British Columbia Land Surveyor to prepare a boundary survey of the Land at your expense.

The survey must be completed, and the plan submitted to the Surveyor General on or before «DEADLINE_COMPLETE_SURVEY». If the survey is not completed on or before that date, and that date is not otherwise extended in writing by us we are under no further obligation to issue a «DB_TENURE_TYPE» of the Land to you.

If the survey is completed in accordance with the requirements set out above, we will complete the «DB_TENURE_TYPE» documents by inserting the correct legal description for the Land and by inserting the required monies payable. The monies payable are calculated on the basis of the area of the Land at a rate of $«RATE_PER_METRE». If the area of the Land exceeds «MAXIMUM_AREA», this offer terminates unless we agree with you in writing to proceed with the issuance of the «DB_TENURE_TYPE».','Use when the client pays for survey.','OFFER SURVEY',true,false,NULL,'LOMILLER','2023-06-02 15:57:07.279427','2023-07-20 19:12:59.172236');
INSERT INTO public.provision (id,provision_name,free_text,help_text,category,active_flag,is_deleted,create_userid,update_userid,create_timestamp,update_timestamp) VALUES
(96,'SURVEY DEPOSIT REQUIRED','You must, by «DEADLINE_SURVEY_DEPOSIT», pay to us a deposit of $«DEPOSIT_AMOUNT_SURVEY» (which, if the «DB_TENURE_TYPE» is issued, will be credited against the amounts set out below that you are required to pay).
(96,'SURVEY DEPOSIT REQUIRED','You must, by «DEADLINE_SURVEY_DEPOSIT», pay to us a deposit of $«DEPOSIT_AMOUNT_SURVEY» (which, if the «DB_TENURE_TYPE» is issued, will be credited against the amounts set out below that you are required to pay).

If you choose not to proceed with the «DB_TENURE_TYPE» after the survey has been started, the deposit will be forfeited to the Province as liquidated damages. Please make your cheque or money order payable to the Minister of Finance and deliver it to «DB_ADDRESS_LINE_REGIONAL_OFFICE».','Use to require payment of a deposit where Province is to pay for a survey.','OFFER SURVEY',true,false,NULL,'BSALL','2023-06-02 15:57:07.364365','2023-06-27 20:35:35.371359'),
(101,'DELIVER SECURITY DEPOSIT & SURVEY DEPOSIT','In addition to the deposit referred to in the "Survey" portion of this letter, you must deliver to us a security deposit in the amount of $«SECURITY_AMOUNT» to guarantee the performance of your obligations under the «DB_TENURE_TYPE». Please see attached information regarding acceptable types of security.','Use this where 2 deposits are to be delivered: one for the survey and another for clean-up under the terms of the tenure to be issued','OFFER - SECURITY',true,false,NULL,'BSALL','2023-06-02 15:57:07.364365','2023-06-30 15:22:22.442357'),
(116,'ERIC TEST PROVISION 2','ERIC TEST FREE TEXT','This is a Test Provision for QA purposes','ERIC''S CATEGORY',true,false,'EANDERSO','EANDERSO','2024-04-23 16:01:24.839959','2024-04-23 16:04:06.079752'),
Expand Down
Binary file added migrations/sql/V2.0.0__schema.sql
Binary file not shown.
Binary file added migrations/sql/V2.0.1__data.sql
Binary file not shown.
5 changes: 5 additions & 0 deletions migrations/sql/V2.0.2__encoding_fix.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-- Special brackets aren't making it through pg_dump, this corrects them
UPDATE provision
SET free_text = REPLACE(free_text, '┬½', '«');
UPDATE provision
SET free_text = REPLACE(free_text, '┬╗', '»');
Loading