diff --git a/scripts/generate-api-models.sh b/scripts/generate-api-models.sh index de1efc70..92d46153 100755 --- a/scripts/generate-api-models.sh +++ b/scripts/generate-api-models.sh @@ -36,7 +36,7 @@ declare -a noParams=( declare -a noStrict=( "./generated/definitions/fci https://raw.githubusercontent.com/pagopa/io-backend/$IO_BACKEND_VERSION/api_io_sign.yaml" - "./generated/definitions/idpay https://raw.githubusercontent.com/pagopa/cstar-securehub-infra-api-spec/refs/tags/v2.47.6/src/idpay/apim/api/idpay_appio_full/openapi.appio.full.yml" + "./generated/definitions/idpay https://raw.githubusercontent.com/pagopa/cstar-securehub-infra-api-spec/refs/tags/v3.10.2/src/idpay/apim/api/idpay_appio_full/openapi.appio.full.yml" "./generated/definitions/services https://raw.githubusercontent.com/pagopa/io-services-cms/io-services-app-backend@$IO_SERVICES_APP_BACKEND/apps/app-backend/api/external.yaml" ) diff --git a/src/payloads/features/idpay/check-prerequisites.ts b/src/payloads/features/idpay/check-prerequisites.ts index 9678ca64..499af98c 100644 --- a/src/payloads/features/idpay/check-prerequisites.ts +++ b/src/payloads/features/idpay/check-prerequisites.ts @@ -69,15 +69,18 @@ const familyUnityOnlyAutomatedCriteria: ReadonlyArray = [ const criterionArray: ReadonlyArray = [ { description: "Criterion 1", - subDescription: "Subtitle criterion 1" + subDescription: "Subtitle criterion 1", + value: "Value criterion 1" }, { description: "Criterion 2", - subDescription: "Subtitle criterion 2" + subDescription: "Subtitle criterion 2", + value: "Value criterion 2" }, { description: "Criterion 3", - subDescription: "Subtitle criterion 3" + subDescription: "Subtitle criterion 3", + value: "Value criterion 3" } ]; const selfDeclarationMulti: ReadonlyArray = [ @@ -131,6 +134,18 @@ const checkPrerequisites: { selfDeclarationCriteria: [...selfDeclarationMulti, ...selfDeclarationBool] } }, + [IDPayInitiativeID.OK_INVITED]: { + beneficiaryRule: { + automatedCriteria, + selfDeclarationCriteria: [...selfDeclarationMulti, ...selfDeclarationBool] + } + }, + [IDPayInitiativeID.OK_NO_PREREQUISITES]: { + beneficiaryRule: { + automatedCriteria: [], + selfDeclarationCriteria: [] + } + }, [IDPayInitiativeID.OK_GUIDONIA]: { beneficiaryRule: { automatedCriteria, @@ -184,15 +199,18 @@ const checkPrerequisites: { { description: "Sì, inferiore a 25.000€", subDescription: - "Hai diritto fino a 200€. Verificheremo questa informazione con INPS" + "Hai diritto fino a 200€. Verificheremo questa informazione con INPS", + value: "0" }, { description: "Sì, uguale o superiore a 25.000€", - subDescription: "Hai diritto fino a 100€" + subDescription: "Hai diritto fino a 100€", + value: "1" }, { description: "Non ho un ISEE o preferisco non rispondere", - subDescription: "Hai diritto fino a 100€" + subDescription: "Hai diritto fino a 100€", + value: "2" } ] }, diff --git a/src/payloads/features/idpay/get-timeline.ts b/src/payloads/features/idpay/get-timeline.ts index d414edf3..6278c78f 100644 --- a/src/payloads/features/idpay/get-timeline.ts +++ b/src/payloads/features/idpay/get-timeline.ts @@ -17,7 +17,8 @@ export const getTimelineResponse = ( const totalElements = timeline.length; const totalPages = Math.ceil(totalElements / pageSize); - const startIndex = (pageNo - 1) * pageSize; + // It should start from 0, but pageNo is 1-based, so we need to subtract 1 but backend change it on prod + const startIndex = pageNo * pageSize; const endIndex = startIndex + pageSize; const operationList = _.slice(timeline, startIndex, endIndex);