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

#3622 - Rough Reshape of FT Assessment and DMN #3772

Merged
merged 16 commits into from
Oct 16, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
adjusted e2e tests
lewischen-aot committed Oct 8, 2024
commit 9f794fa5122695cdfeb0d817f96b1c8de752898d
Original file line number Diff line number Diff line change
@@ -35,18 +35,17 @@ describe(`E2E Test Workflow fulltime-assessment-${PROGRAM_YEAR}.`, () => {
livingAllowance: 1672,
totalAssessedCost: 27672,
totalFamilyIncome: 40000,
totalFederalAward: 7654.615630769231,
totalFederalAward: 5600,
otherAllowableCost: 0,
transportationCost: 0,
transportationCost: null,
secondResidenceCost: 0,
totalAssessmentNeed: 55049.19807692308,
booksAndSuppliesCost: 5000,
totalProvincialAward: 11037.417692307692,
booksAndSuppliesCost: 3000,
totalProvincialAward: 1760,
alimonyOrChildSupport: 0,
federalAssessmentNeed: 26000,
federalAssessmentNeed: 50535.653846153844,
exceptionalEducationCost:
assessmentConsolidatedData.offeringExceptionalExpenses,
provincialAssessmentNeed: 27593.544230769232,
provincialAssessmentNeed: 50673.54423076923,
parentAssessedContribution: null,
partnerAssessedContribution: null,
studentTotalFederalContribution: 216.34615384615384,
@@ -79,10 +78,14 @@ describe(`E2E Test Workflow fulltime-assessment-${PROGRAM_YEAR}.`, () => {
expect(
calculatedAssessment.variables.calculatedDataTotalMSOLAllowance,
).toBe(
expectedAssessmentData.livingAllowance * expectedAssessmentData.weeks,
calculatedAssessment.variables.calculatedDataStudentMSOLAllowance *
expectedAssessmentData.weeks,
);
expect(calculatedAssessment.variables.calculatedDataTotalCosts).toBe(
expectedAssessmentData.totalAssessedCost,
calculatedAssessment.variables.offeringExceptionalExpenses +
calculatedAssessment.variables.calculatedDataTotalTutionCost +
calculatedAssessment.variables.calculatedDataTotalNonEducationalCost +
calculatedAssessment.variables.calculatedDataTotalBookCost,
);
expect(calculatedAssessment.variables.calculatedDataTotalFamilyIncome).toBe(
expectedAssessmentData.totalFamilyIncome,
@@ -99,9 +102,6 @@ describe(`E2E Test Workflow fulltime-assessment-${PROGRAM_YEAR}.`, () => {
expect(
calculatedAssessment.variables.calculatedDataTotalSecondResidence,
).toBe(expectedAssessmentData.secondResidenceCost);
expect(calculatedAssessment.variables.caclulatedDataTotalAssessedNeed).toBe(
expectedAssessmentData.totalAssessmentNeed,
);
expect(calculatedAssessment.variables.calculatedDataTotalBookCost).toBe(
expectedAssessmentData.booksAndSuppliesCost,
);
Original file line number Diff line number Diff line change
@@ -23,20 +23,19 @@ describe(`E2E Test Workflow fulltime-assessment-${PROGRAM_YEAR}.`, () => {
assessmentConsolidatedData.offeringMandatoryFees,
childcareCost: 0,
livingAllowance: 1672,
totalAssessedCost: 27672,
totalAssessedCost: 50752,
totalFamilyIncome: 40000,
totalFederalAward: 7654.615630769231,
totalFederalAward: 3360,
otherAllowableCost: 0,
transportationCost: 0,
transportationCost: null,
secondResidenceCost: 0,
totalAssessmentNeed: 55049.19807692308,
booksAndSuppliesCost: 5000,
totalProvincialAward: 11037.417692307692,
booksAndSuppliesCost: 3000,
totalProvincialAward: 1760,
alimonyOrChildSupport: 0,
federalAssessmentNeed: 26000,
federalAssessmentNeed: 50535.653846153844,
exceptionalEducationCost:
assessmentConsolidatedData.offeringExceptionalExpenses,
provincialAssessmentNeed: 27593.544230769232,
provincialAssessmentNeed: 50673.54423076923,
parentAssessedContribution: null,
partnerAssessedContribution: null,
studentTotalFederalContribution: 216.34615384615384,
@@ -62,7 +61,8 @@ describe(`E2E Test Workflow fulltime-assessment-${PROGRAM_YEAR}.`, () => {
expect(
calculatedAssessment.variables.calculatedDataTotalMSOLAllowance,
).toBe(
expectedAssessmentData.livingAllowance * expectedAssessmentData.weeks,
calculatedAssessment.variables.calculatedDataStudentMSOLAllowance *
expectedAssessmentData.weeks,
);
expect(calculatedAssessment.variables.calculatedDataTotalCosts).toBe(
expectedAssessmentData.totalAssessedCost,
@@ -82,9 +82,6 @@ describe(`E2E Test Workflow fulltime-assessment-${PROGRAM_YEAR}.`, () => {
expect(
calculatedAssessment.variables.calculatedDataTotalSecondResidence,
).toBe(expectedAssessmentData.secondResidenceCost);
expect(calculatedAssessment.variables.caclulatedDataTotalAssessedNeed).toBe(
expectedAssessmentData.totalAssessmentNeed,
);
expect(calculatedAssessment.variables.calculatedDataTotalBookCost).toBe(
expectedAssessmentData.booksAndSuppliesCost,
);
Original file line number Diff line number Diff line change
@@ -22,25 +22,24 @@ describe(`E2E Test Workflow fulltime-assessment-${PROGRAM_YEAR}.`, () => {
assessmentConsolidatedData.offeringActualTuitionCosts +
assessmentConsolidatedData.offeringMandatoryFees,
childcareCost: 0,
livingAllowance: 1672,
totalAssessedCost: 27672,
livingAllowance: 7088,
totalAssessedCost: 31088,
totalFamilyIncome: 40000,
totalFederalAward: 7654.615630769231,
totalFederalAward: 4800,
otherAllowableCost: 0,
transportationCost: 0,
transportationCost: null,
secondResidenceCost: 0,
totalAssessmentNeed: 55049.19807692308,
booksAndSuppliesCost: 5000,
totalProvincialAward: 11037.417692307692,
booksAndSuppliesCost: 3000,
totalProvincialAward: 3520,
alimonyOrChildSupport: 0,
federalAssessmentNeed: 26000,
federalAssessmentNeed: 30871.653846153848,
exceptionalEducationCost:
assessmentConsolidatedData.offeringExceptionalExpenses,
provincialAssessmentNeed: 27593.544230769232,
provincialAssessmentNeed: 31030.93221153846,
parentAssessedContribution: null,
partnerAssessedContribution: null,
studentTotalFederalContribution: 216.34615384615384,
studentTotalProvincialContribution: 78.45576923076923,
studentTotalProvincialContribution: 57.06778846153846,
};
// Act
const calculatedAssessment = await executeFullTimeAssessmentForProgramYear(
@@ -61,9 +60,7 @@ describe(`E2E Test Workflow fulltime-assessment-${PROGRAM_YEAR}.`, () => {
);
expect(
calculatedAssessment.variables.calculatedDataTotalMSOLAllowance,
).toBe(
expectedAssessmentData.livingAllowance * expectedAssessmentData.weeks,
);
).toBe(expectedAssessmentData.livingAllowance);
expect(calculatedAssessment.variables.calculatedDataTotalCosts).toBe(
expectedAssessmentData.totalAssessedCost,
);
@@ -82,9 +79,6 @@ describe(`E2E Test Workflow fulltime-assessment-${PROGRAM_YEAR}.`, () => {
expect(
calculatedAssessment.variables.calculatedDataTotalSecondResidence,
).toBe(expectedAssessmentData.secondResidenceCost);
expect(calculatedAssessment.variables.caclulatedDataTotalAssessedNeed).toBe(
expectedAssessmentData.totalAssessmentNeed,
);
expect(calculatedAssessment.variables.calculatedDataTotalBookCost).toBe(
expectedAssessmentData.booksAndSuppliesCost,
);
Original file line number Diff line number Diff line change
@@ -217,7 +217,6 @@ export interface AssessmentModel {
otherAllowableCost: number;
transportationCost: number;
secondResidenceCost: number;
totalAssessmentNeed: number;
booksAndSuppliesCost: number;
totalProvincialAward: number;
alimonyOrChildSupport: number;
@@ -244,6 +243,8 @@ export interface CalculatedAssessmentModel {
calculatedDataDaycareCosts11YearsOrUnder: number;
calculatedDataDaycareCosts12YearsOrOver: number;
calculatedDataChildCareCost: number;
calculatedDataStudentMSOLAllowance: number;
calculatedDataTotalNonEducationalCost: number;
calculatedDataTotalChildCareCost: number;
calculatedDataTotalMSOLAllowance: number;
calculatedDataTotalCosts: number;
@@ -273,6 +274,7 @@ export interface CalculatedAssessmentModel {
calculatedDataTaxReturnIncome: number;
calculatedDataCurrentYearIncome: number;
calculatedDataStudentTotalIncome: number;
studentDataTransportationCost: number;

// Common variables used in both full-time and part-time.
// CSGP
@@ -352,6 +354,9 @@ export interface CalculatedAssessmentModel {
dmnFullTimeAwardAllowableLimits?: {
limitAwardCSGFWeeklyRate: number;
};
dmnFullTimeCalculatedDataApplicationtransportationMaximum?: {
limitApplicationTransportation: number;
};
// DMN Part Time Award Family Size Variables
dmnFullTimeAwardFamilySizeVariables?: {
limitAwardCSGFWeeklyPhaseoutRate: number;