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.

Sign up for GitHub

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

#270 - Merge Hotfix V2.1.2 to main #4088

Merged
merged 8 commits into from
Dec 12, 2024
Merged

#270 - Merge Hotfix V2.1.2 to main #4088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d81f0f4
#3667 - Bull Scheduler - Ensure Delayed Job (#3995)
andrewsignori-aot Nov 25, 2024
0b0f97f
#4013 - Legacy Restriction Mapping - Migrations and SQL Changes (#4037)
andrewsignori-aot Dec 7, 2024
39031e4
#4041 - Ignore Cancelled Legacy Applications on SIMS Validations and …
dheepak-aot Dec 9, 2024
fafd502
#4013 - Legacy Restriction Mapping - Student Changes (#4049)
andrewsignori-aot Dec 9, 2024
a2ed728
#4052 - Fix the legacy program year totals for program year limits (#…
dheepak-aot Dec 10, 2024
04877ba
#4082 - 2 Disbursement PT Schedules - Correct First Disbursement Dat…
andrewsignori-aot Dec 12, 2024
b4922e4
Merge branch 'hotfix/v2.1.2' into hotfix-v2.1.2-to-main
andrewsignori-aot Dec 12, 2024
356ded9
Added hotfix E2E for the new program year
andrewsignori-aot Dec 12, 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
3 changes: 1 addition & 2 deletions ...s/packages/backend/workflow/src/workflow-definitions/parttime-configure-disbursement.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:zeebe="http://camunda.org/schema/zeebe/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_0uxv5b2" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.25.0" modeler:executionPlatform="Camunda Cloud" modeler:executionPlatformVersion="8.1.0">
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:zeebe="http://camunda.org/schema/zeebe/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_0uxv5b2" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.28.0" modeler:executionPlatform="Camunda Cloud" modeler:executionPlatformVersion="8.1.0">
<bpmn:process id="parttime-configure-disbursement" name="parttime-configure-disbursement" isExecutable="true">
<bpmn:exclusiveGateway id="Gateway_0hiv6nu">
<bpmn:incoming>Flow_16jouca</bpmn:incoming>
Expand Down Expand Up @@ -34,7 +34,6 @@
<zeebe:ioMapping>
<zeebe:output source="=disbursmenentScheduleDate2Potential" target="disbursmenentScheduleDate2" />
<zeebe:output source="=2" target="disbursementScheduleNumber" />
<zeebe:output source="=today()" target="disbursmenentScheduleDate1" />
</zeebe:ioMapping>
</bpmn:extensionElements>
<bpmn:incoming>Flow_1vbepy0</bpmn:incoming>
Expand Down
19 changes: 11 additions & 8 deletions ...2022-2023/parttime-assessment/disbursements/parttime-assessment-disbursements.e2e-spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ describe(`E2E Test Workflow parttime-assessment-${PROGRAM_YEAR}-disbursements`,
// Assert
expect(calculatedAssessment.variables.disbursementSchedules).toStrictEqual([
{
disbursementDate: getISODateOnlyString(addDays(30)),
negotiatedExpiryDate: getISODateOnlyString(addDays(30)),
disbursementDate: configureDisbursementData.offeringStudyStartDate,
negotiatedExpiryDate: configureDisbursementData.offeringStudyStartDate,
disbursements: [
{
awardEligibility: true,
Expand Down Expand Up @@ -193,8 +193,9 @@ describe(`E2E Test Workflow parttime-assessment-${PROGRAM_YEAR}-disbursements`,
calculatedAssessment.variables.disbursementSchedules,
).toStrictEqual([
{
disbursementDate: getISODateOnlyString(getUTCNow()),
negotiatedExpiryDate: getISODateOnlyString(getUTCNow()),
disbursementDate: configureDisbursementData.offeringStudyStartDate,
negotiatedExpiryDate:
configureDisbursementData.offeringStudyStartDate,
disbursements: [
{
awardEligibility: true,
Expand Down Expand Up @@ -313,8 +314,9 @@ describe(`E2E Test Workflow parttime-assessment-${PROGRAM_YEAR}-disbursements`,
calculatedAssessment.variables.disbursementSchedules,
).toStrictEqual([
{
disbursementDate: getISODateOnlyString(addDays(30)),
negotiatedExpiryDate: getISODateOnlyString(addDays(30)),
disbursementDate: configureDisbursementData.offeringStudyStartDate,
negotiatedExpiryDate:
configureDisbursementData.offeringStudyStartDate,
disbursements: [
{
awardEligibility: true,
Expand Down Expand Up @@ -393,8 +395,9 @@ describe(`E2E Test Workflow parttime-assessment-${PROGRAM_YEAR}-disbursements`,
calculatedAssessment.variables.disbursementSchedules,
).toStrictEqual([
{
disbursementDate: getISODateOnlyString(getUTCNow()),
negotiatedExpiryDate: getISODateOnlyString(getUTCNow()),
disbursementDate: configureDisbursementData.offeringStudyStartDate,
negotiatedExpiryDate:
configureDisbursementData.offeringStudyStartDate,
disbursements: [
{
awardEligibility: true,
Expand Down
19 changes: 11 additions & 8 deletions ...2023-2024/parttime-assessment/disbursements/parttime-assessment-disbursements.e2e-spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ describe(`E2E Test Workflow parttime-assessment-${PROGRAM_YEAR}-disbursements`,
// Assert
expect(calculatedAssessment.variables.disbursementSchedules).toStrictEqual([
{
disbursementDate: getISODateOnlyString(addDays(30)),
negotiatedExpiryDate: getISODateOnlyString(addDays(30)),
disbursementDate: configureDisbursementData.offeringStudyStartDate,
negotiatedExpiryDate: configureDisbursementData.offeringStudyStartDate,
disbursements: [
{
awardEligibility: true,
Expand Down Expand Up @@ -193,8 +193,9 @@ describe(`E2E Test Workflow parttime-assessment-${PROGRAM_YEAR}-disbursements`,
calculatedAssessment.variables.disbursementSchedules,
).toStrictEqual([
{
disbursementDate: getISODateOnlyString(getUTCNow()),
negotiatedExpiryDate: getISODateOnlyString(getUTCNow()),
disbursementDate: configureDisbursementData.offeringStudyStartDate,
negotiatedExpiryDate:
configureDisbursementData.offeringStudyStartDate,
disbursements: [
{
awardEligibility: true,
Expand Down Expand Up @@ -313,8 +314,9 @@ describe(`E2E Test Workflow parttime-assessment-${PROGRAM_YEAR}-disbursements`,
calculatedAssessment.variables.disbursementSchedules,
).toStrictEqual([
{
disbursementDate: getISODateOnlyString(addDays(30)),
negotiatedExpiryDate: getISODateOnlyString(addDays(30)),
disbursementDate: configureDisbursementData.offeringStudyStartDate,
negotiatedExpiryDate:
configureDisbursementData.offeringStudyStartDate,
disbursements: [
{
awardEligibility: true,
Expand Down Expand Up @@ -393,8 +395,9 @@ describe(`E2E Test Workflow parttime-assessment-${PROGRAM_YEAR}-disbursements`,
calculatedAssessment.variables.disbursementSchedules,
).toStrictEqual([
{
disbursementDate: getISODateOnlyString(getUTCNow()),
negotiatedExpiryDate: getISODateOnlyString(getUTCNow()),
disbursementDate: configureDisbursementData.offeringStudyStartDate,
negotiatedExpiryDate:
configureDisbursementData.offeringStudyStartDate,
disbursements: [
{
awardEligibility: true,
Expand Down
19 changes: 11 additions & 8 deletions ...2024-2025/parttime-assessment/disbursements/parttime-assessment-disbursements.e2e-spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ describe(`E2E Test Workflow parttime-assessment-${PROGRAM_YEAR}-disbursements`,
// Assert
expect(calculatedAssessment.variables.disbursementSchedules).toStrictEqual([
{
disbursementDate: getISODateOnlyString(addDays(30)),
negotiatedExpiryDate: getISODateOnlyString(addDays(30)),
disbursementDate: configureDisbursementData.offeringStudyStartDate,
negotiatedExpiryDate: configureDisbursementData.offeringStudyStartDate,
disbursements: [
{
awardEligibility: true,
Expand Down Expand Up @@ -193,8 +193,9 @@ describe(`E2E Test Workflow parttime-assessment-${PROGRAM_YEAR}-disbursements`,
calculatedAssessment.variables.disbursementSchedules,
).toStrictEqual([
{
disbursementDate: getISODateOnlyString(getUTCNow()),
negotiatedExpiryDate: getISODateOnlyString(getUTCNow()),
disbursementDate: configureDisbursementData.offeringStudyStartDate,
negotiatedExpiryDate:
configureDisbursementData.offeringStudyStartDate,
disbursements: [
{
awardEligibility: true,
Expand Down Expand Up @@ -313,8 +314,9 @@ describe(`E2E Test Workflow parttime-assessment-${PROGRAM_YEAR}-disbursements`,
calculatedAssessment.variables.disbursementSchedules,
).toStrictEqual([
{
disbursementDate: getISODateOnlyString(addDays(30)),
negotiatedExpiryDate: getISODateOnlyString(addDays(30)),
disbursementDate: configureDisbursementData.offeringStudyStartDate,
negotiatedExpiryDate:
configureDisbursementData.offeringStudyStartDate,
disbursements: [
{
awardEligibility: true,
Expand Down Expand Up @@ -393,8 +395,9 @@ describe(`E2E Test Workflow parttime-assessment-${PROGRAM_YEAR}-disbursements`,
calculatedAssessment.variables.disbursementSchedules,
).toStrictEqual([
{
disbursementDate: getISODateOnlyString(getUTCNow()),
negotiatedExpiryDate: getISODateOnlyString(getUTCNow()),
disbursementDate: configureDisbursementData.offeringStudyStartDate,
negotiatedExpiryDate:
configureDisbursementData.offeringStudyStartDate,
disbursements: [
{
awardEligibility: true,
Expand Down
19 changes: 11 additions & 8 deletions ...2025-2026/parttime-assessment/disbursements/parttime-assessment-disbursements.e2e-spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ describe(`E2E Test Workflow parttime-assessment-${PROGRAM_YEAR}-disbursements`,
// Assert
expect(calculatedAssessment.variables.disbursementSchedules).toStrictEqual([
{
disbursementDate: getISODateOnlyString(addDays(30)),
negotiatedExpiryDate: getISODateOnlyString(addDays(30)),
disbursementDate: configureDisbursementData.offeringStudyStartDate,
negotiatedExpiryDate: configureDisbursementData.offeringStudyStartDate,
disbursements: [
{
awardEligibility: true,
Expand Down Expand Up @@ -193,8 +193,9 @@ describe(`E2E Test Workflow parttime-assessment-${PROGRAM_YEAR}-disbursements`,
calculatedAssessment.variables.disbursementSchedules,
).toStrictEqual([
{
disbursementDate: getISODateOnlyString(getUTCNow()),
negotiatedExpiryDate: getISODateOnlyString(getUTCNow()),
disbursementDate: configureDisbursementData.offeringStudyStartDate,
negotiatedExpiryDate:
configureDisbursementData.offeringStudyStartDate,
disbursements: [
{
awardEligibility: true,
Expand Down Expand Up @@ -313,8 +314,9 @@ describe(`E2E Test Workflow parttime-assessment-${PROGRAM_YEAR}-disbursements`,
calculatedAssessment.variables.disbursementSchedules,
).toStrictEqual([
{
disbursementDate: getISODateOnlyString(addDays(30)),
negotiatedExpiryDate: getISODateOnlyString(addDays(30)),
disbursementDate: configureDisbursementData.offeringStudyStartDate,
negotiatedExpiryDate:
configureDisbursementData.offeringStudyStartDate,
disbursements: [
{
awardEligibility: true,
Expand Down Expand Up @@ -393,8 +395,9 @@ describe(`E2E Test Workflow parttime-assessment-${PROGRAM_YEAR}-disbursements`,
calculatedAssessment.variables.disbursementSchedules,
).toStrictEqual([
{
disbursementDate: getISODateOnlyString(getUTCNow()),
negotiatedExpiryDate: getISODateOnlyString(getUTCNow()),
disbursementDate: configureDisbursementData.offeringStudyStartDate,
negotiatedExpiryDate:
configureDisbursementData.offeringStudyStartDate,
disbursements: [
{
awardEligibility: true,
Expand Down
Loading