Merge branch 'refs/heads/main' into feat/DTFS2-7498/fetch-eligibility…

…-critieria-to-display

# Conflicts:
#	dtfs-central-api/src/services/portal/facility-amendment.upsertPortalFacilityAmendmentDraft.service.test.ts
#	gef-ui/test-helpers/mock-amendment.ts
#	libs/common/src/test-helpers/mock-data-backend/portal-facility-amendment.ts
#	libs/common/src/types/mongo-db-models/tfm-facilities.ts

dtfs-central-api/src/services/portal/facility-amendment.upsertPortalFacilityAmendmentDraft.service.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable import/first */
-import { AMENDMENT_STATUS, AMENDMENT_TYPES, AmendmentsEligibilityCriteria, InvalidAuditDetailsError } from '@ukef/dtfs2-common';
+import { PORTAL_AMENDMENT_STATUS, AMENDMENT_TYPES, InvalidAuditDetailsError, AmendmentsEligibilityCriteria } from '@ukef/dtfs2-common';
 
 const mockFindOneUser = jest.fn();
 const mockFindOneFacility = jest.fn();

gef-ui/test-helpers/mock-amendment.ts

@@ -1,4 +1,4 @@
-import { AMENDMENT_STATUS, AMENDMENT_TYPES, AmendmentsEligibilityCriterionWithAnswer, PortalFacilityAmendmentWithUkefId } from '@ukef/dtfs2-common';
+import { PORTAL_AMENDMENT_STATUS, AMENDMENT_TYPES, AmendmentsEligibilityCriterionWithAnswer, PortalFacilityAmendmentWithUkefId } from '@ukef/dtfs2-common';
 import { getUnixTime } from 'date-fns';
 
 export class PortalFacilityAmendmentWithUkefIdMockBuilder {

libs/common/src/test-helpers/mock-data-backend/portal-facility-amendment.ts

@@ -27,7 +27,7 @@ export const aPortalFacilityAmendment = (): PortalFacilityAmendment => ({
   dealId: new ObjectId(),
   createdAt: getUnixTime(new Date()),
   updatedAt: getUnixTime(new Date()),
-  status: AMENDMENT_STATUS.IN_PROGRESS,
+  status: PORTAL_AMENDMENT_STATUS.DRAFT,
   eligibilityCriteria: {
     criteria: [{ id: 1, text: 'item 1', answer: null }],
     version: 1,

libs/common/src/types/mongo-db-models/tfm-facilities.ts

@@ -130,6 +130,7 @@ export type AmendmentsEligibilityCriterionWithAnswer = AmendmentsEligibilityCrit
  */
 export interface PortalFacilityAmendment extends BaseAmendment {
   type: typeof AMENDMENT_TYPES.PORTAL;
+  status: PortalAmendmentStatus;
   eligibilityCriteria: {
     version: number;
     criteria: AmendmentsEligibilityCriterionWithAnswer[];