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

Backport: mostly Jun 5 regression hotfixes #1751

Merged
merged 19 commits into from
Jun 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
448ded2
Add batching and PG_COPY setting
May 30, 2024
0d67c1c
Merge pull request #1732 from bcgov/feature/ALCS-1843
dhaselhan May 30, 2024
157615b
Merge pull request #1722 from bcgov/develop
trslater Jun 5, 2024
bbbdf06
Automap `wasReleased` to get value in frontend
trslater Jun 5, 2024
cb905a5
Merge pull request #1742 from bcgov/hotfix/ALCS-2018
trslater Jun 5, 2024
ebddd8b
Fix L/FNG submission emails not sending
trslater Jun 5, 2024
be9f32c
Merge pull request #1743 from bcgov/hotfix/ALCS-2023
trslater Jun 6, 2024
c1794ce
Fix Corporate Summary file issue on Parcel Owners table in NOIs/Apps …
Abradat Jun 6, 2024
a0bef28
Fix individual type corporate summary file issue after edit
Abradat Jun 6, 2024
4c3a98d
Merge pull request #1744 from bcgov/hotfix/ALCS-2022
Abradat Jun 6, 2024
806f392
Fix attached document going not applicable after opening and closing …
Abradat Jun 6, 2024
60cf5d2
Merge pull request #1745 from bcgov/hotfix/ALCS-2028
Abradat Jun 6, 2024
5b52807
Create NOI mod cards on NOI board
trslater Jun 6, 2024
484e81d
Merge pull request #1746 from bcgov/hotfix/ALCS-2026
trslater Jun 6, 2024
4f534b8
Fix NOI advanced search "submitted to" date filter not working properly
Abradat Jun 6, 2024
30dd856
Change NOI date submitted filter in advanced search
Abradat Jun 6, 2024
7318a15
Merge pull request #1749 from bcgov/hotfix/ALCS-2025
Abradat Jun 6, 2024
67e2df5
Fix corporate summary not being discarded after changing from organiz…
Abradat Jun 6, 2024
2b22432
Merge pull request #1750 from bcgov/hotfix/ALCS-2022-2
Abradat Jun 6, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export class CreateNoiModificationDialogComponent implements OnInit, OnDestroy {
regionCode: formValues.region!,
localGovernmentUuid: formValues.localGovernment!,
submittedDate: formValues.submittedDate!.valueOf(),
boardCode: 'ceo',
boardCode: 'noi',
modifiesDecisionUuids: formValues.modifiesDecisions!,
description: formValues.description!,
};
Expand Down
2 changes: 1 addition & 1 deletion docs/jobs.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ We receive the parcel data in a GDB from PMBC, this data changes and needs to be
1. Setup Portforwading as necessary to get access to Postgres
1. Truncate the existing parcel_lookup table
1. Run the following command replacing username and password as
necessary: `ogr2ogr -f "PostgreSQL" PG:"host=localhost port=5432 dbname=app user=postgres password=postgres active_schema=alcs" PMBC_export.gdb -nln parcel_lookup`
necessary: `ogr2ogr -f "PostgreSQL" PG:"host=localhost port=5432 dbname=app user=postgres password=postgres active_schema=alcs" PMBC_export.gdb -nln parcel_lookup -gt 10000 --config PG_USE_COPY YES`
1. Be patient, this will import ~2 million rows and will take ~10 minutes

## Running Jobs in Openshift
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,7 @@ export class OwnerDialogComponent {
this.corporateSummary.setValidators([Validators.required]);
} else {
this.organizationName.setValidators([]);
this.corporateSummary.setValidators([]);
this.corporateSummary.reset();
this.files = [];
this.corporateSummary.setValidators([]);
}
this.corporateSummary.updateValueAndValidity();
this.organizationName.updateValueAndValidity();
Expand All @@ -113,6 +111,11 @@ export class OwnerDialogComponent {
}

this.isLoading = true;

if (this.type.value === OWNER_TYPE.INDIVIDUAL) {
this.removeCorporateSummary();
}

let documentUuid;
if (this.pendingFile) {
documentUuid = await this.uploadPendingFile(this.pendingFile);
Expand Down Expand Up @@ -170,9 +173,15 @@ export class OwnerDialogComponent {
if (this.form.valid) {
this.isLoading = true;

if (this.type.value === OWNER_TYPE.INDIVIDUAL) {
this.removeCorporateSummary();
}

let document;
if (this.pendingFile) {
document = await this.uploadPendingFile(this.pendingFile);
} else {
document = this.type.value === OWNER_TYPE.ORGANIZATION ? this.data.existingOwner?.corporateSummary : null;
}

const orgName = this.type.value === OWNER_TYPE.ORGANIZATION ? this.organizationName.getRawValue() : null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@ export class NoticeOfIntentDecisionDto {
@AutoMap(() => String)
decisionMakerName: string | null;

@AutoMap(() => Boolean)
wasReleased: boolean;

@AutoMap(() => Boolean)
isSubjectToConditions: boolean | null;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -285,16 +285,20 @@ export class NoticeOfIntentAdvancedSearchService {
query = query.andWhere(
'noi.date_submitted_to_alc >= :date_submitted_from',
{
date_submitted_from: new Date(searchDto.dateSubmittedFrom),
date_submitted_from: getStartOfDayToPacific(
searchDto.dateSubmittedFrom,
),
},
);
}

if (searchDto.dateSubmittedTo !== undefined) {
query = query.andWhere(
'noi.date_submitted_to_alc <= :date_submitted_to',
'noi.date_submitted_to_alc < :date_submitted_to',
{
date_submitted_to: new Date(searchDto.dateSubmittedTo),
date_submitted_to: getNextDayToPacific(
searchDto.dateSubmittedTo,
),
},
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -266,13 +266,12 @@ export class StatusEmailService {
const toEmails: string[] = [];
if (data.primaryContact && data.primaryContact.email) {
toEmails.push(data.primaryContact.email);

if (data.ccGovernment && data.government?.emails) {
ccEmails.push(...data.government.emails);
}
} else {
if (data.ccGovernment && data.government?.emails) {
toEmails.push(...data.government.emails);
}
} else if (data.government?.emails) {
toEmails.push(...data.government.emails);
}
ccEmails.push(...data.ccEmails);

Expand Down
Loading