[#IP368] Enable strictNullCheck on tsconfig.json

pagopa · Aug 19, 2021 · bb341f8 · bb341f8
1 parent 7fffcd4
commit bb341f8
Show file tree

Hide file tree

Showing 16 changed files with 107 additions and 53 deletions.
diff --git a/MigrateServicePreferenceFromLegacy/handler.ts b/MigrateServicePreferenceFromLegacy/handler.ts
@@ -57,9 +57,11 @@ export const createServicePreference = (
 });
 
 export const blockedsToServicesPreferences = (
-  blocked: {
-    [x: string]: readonly BlockedInboxOrChannelEnum[];
-  },
+  blocked:
+    | {
+        [x: string]: readonly BlockedInboxOrChannelEnum[];
+      }
+    | undefined,
   fiscalCode: FiscalCode,
   version: NonNegativeInteger
 ) =>

diff --git a/StartEmailValidationProcess/__tests__/handler.test.ts b/StartEmailValidationProcess/__tests__/handler.test.ts
@@ -28,7 +28,13 @@ describe("StartEmailValidationProcessHandler", () => {
   it("should start the orchestrator with the right input and return an accepted response", async () => {
     const profileModelMock = {
       findLastVersionByModelId: jest.fn(() =>
-        taskEither.of(some({ ...aRetrievedProfile, isEmailValidated: false }))
+        taskEither.of(
+          some({
+            ...aRetrievedProfile,
+            isEmailValidated: false,
+            email: "email@example.com"
+          })
+        )
       )
     };
     mockStartNew.mockImplementationOnce(() => Promise.resolve("start"));
@@ -46,7 +52,13 @@ describe("StartEmailValidationProcessHandler", () => {
   it("should not start a new orchestrator if there is an already running orchestrator and return an accepted response", async () => {
     const profileModelMock = {
       findLastVersionByModelId: jest.fn(() =>
-        taskEither.of(some({ ...aRetrievedProfile, isEmailValidated: false }))
+        taskEither.of(
+          some({
+            ...aRetrievedProfile,
+            isEmailValidated: false,
+            email: "email@example.com"
+          })
+        )
       )
     };
 
@@ -82,4 +94,21 @@ describe("StartEmailValidationProcessHandler", () => {
     );
     expect(result.kind).toBe("IResponseErrorValidation");
   });
+
+  it("should not start the orchestrator if the email is missing", async () => {
+    const profileModelMock = {
+      findLastVersionByModelId: jest.fn(() =>
+        taskEither.of(some({ ...aRetrievedProfile, isEmailValidated: false }))
+      )
+    };
+
+    const handler = StartEmailValidationProcessHandler(profileModelMock as any);
+
+    await handler(contextMock as any, aRetrievedProfile.fiscalCode);
+    const result = await handler(
+      contextMock as any,
+      aRetrievedProfile.fiscalCode
+    );
+    expect(result.kind).toBe("IResponseErrorValidation");
+  });
 });
diff --git a/StartEmailValidationProcess/handler.ts b/StartEmailValidationProcess/handler.ts
@@ -89,10 +89,10 @@ export function StartEmailValidationProcessHandler(
 
     const existingProfile = maybeExistingProfile.value;
 
-    if (existingProfile.isEmailValidated === true) {
+    if (existingProfile.isEmailValidated === true || !existingProfile.email) {
       return ResponseErrorValidation(
         "Validation error",
-        "The email is already validated"
+        "The email is missing or already validated"
       );
     }
 

diff --git a/UpdateProfile/__tests__/handler.test.ts b/UpdateProfile/__tests__/handler.test.ts
@@ -466,7 +466,7 @@ describe("UpdateProfileHandler", () => {
       expect(result.value).toEqual(
         expect.objectContaining({
           service_preferences_settings: {
-            mode: autoApiProfileServicePreferencesSettings.mode,
+            mode: (autoApiProfileServicePreferencesSettings as any).mode,
             version: expectedServicePreferencesSettingsVersion
           }
         })
@@ -604,7 +604,8 @@ describe("UpdateProfileHandler", () => {
       isWebhookEnabled,
       expectedIsInboxEnabled,
       expectedIsWebHookEnabled,
-      acceptedTosVersion
+      acceptedTosVersion,
+      _
     ) => {
       const profileModelMock = {
         findLastVersionByModelId: jest.fn(() =>

diff --git a/UpdateProfile/handler.ts b/UpdateProfile/handler.ts
@@ -165,7 +165,7 @@ export function UpdateProfileHandler(
     const profile = apiProfileToProfile(
       profilePayload,
       fiscalCode,
-      emailChanged ? false : existingProfile.isEmailValidated,
+      emailChanged ? false : !!existingProfile.isEmailValidated,
       servicePreferencesSettingsVersion
     );
 

diff --git a/UpsertServicePreferences/handler.ts b/UpsertServicePreferences/handler.ts
@@ -202,7 +202,7 @@ const getFeedOperation = (
  * Return a type safe GetServicePreferences handler.
  */
 export const GetUpsertServicePreferencesHandler = (
-  telemetryClient: ReturnType<typeof initAppInsights>,
+  telemetryClient: ReturnType<typeof initAppInsights> | undefined,
   profileModels: ProfileModel,
   serviceModels: ServiceModel,
   servicePreferencesModel: ServicesPreferencesModel,
@@ -315,7 +315,7 @@ export const GetUpsertServicePreferencesHandler = (
  * Wraps a UpsertServicePreferences handler inside an Express request handler.
  */
 export function UpsertServicePreferences(
-  telemetryClient: ReturnType<typeof initAppInsights>,
+  telemetryClient: ReturnType<typeof initAppInsights> | undefined,
   profileModels: ProfileModel,
   serviceModels: ServiceModel,
   servicePreferencesModel: ServicesPreferencesModel,

diff --git a/UpsertedProfileOrchestrator/__tests__/handler.test.ts b/UpsertedProfileOrchestrator/__tests__/handler.test.ts
@@ -24,6 +24,7 @@ import {
 import { BlockedInboxOrChannelEnum } from "@pagopa/io-functions-commons/dist/generated/definitions/BlockedInboxOrChannel";
 import { readableReport } from "@pagopa/ts-commons/lib/reporters";
 import { consumeGenerator } from "../../utils/durable";
+import { identity } from "fp-ts/lib/function";
 
 const someRetryOptions = new df.RetryOptions(5000, 10);
 // tslint:disable-next-line: no-object-mutation
@@ -203,7 +204,7 @@ describe("UpsertedProfileOrchestrator", () => {
     };
 
     const orchestratorHandler = getUpsertedProfileOrchestratorHandler({
-      notifyOn: fromArray([expectedQueueName]).getOrElseL(undefined),
+      notifyOn: fromArray([expectedQueueName]).fold(undefined, identity),
       sendCashbackMessage: true
     })(contextMockWithDf as any);
 
@@ -310,7 +311,7 @@ describe("UpsertedProfileOrchestrator", () => {
     };
 
     const orchestratorHandler = getUpsertedProfileOrchestratorHandler({
-      notifyOn: fromArray([expectedQueueName]).getOrElseL(undefined),
+      notifyOn: fromArray([expectedQueueName]).fold(undefined, identity),
       sendCashbackMessage: true
     })(contextMockWithDf as any);
 
@@ -421,7 +422,7 @@ describe("UpsertedProfileOrchestrator", () => {
     };
 
     const orchestratorHandler = getUpsertedProfileOrchestratorHandler({
-      notifyOn: fromArray([expectedQueueName]).getOrElseL(undefined),
+      notifyOn: fromArray([expectedQueueName]).fold(undefined, identity),
       sendCashbackMessage: true
     })(contextMockWithDf as any);
 
@@ -532,7 +533,7 @@ describe("UpsertedProfileOrchestrator", () => {
     };
 
     const orchestratorHandler = getUpsertedProfileOrchestratorHandler({
-      notifyOn: fromArray([expectedQueueName]).getOrElseL(undefined),
+      notifyOn: fromArray([expectedQueueName]).fold(undefined, identity),
       sendCashbackMessage: true
     })(contextMockWithDf as any);
 
@@ -650,7 +651,7 @@ describe("UpsertedProfileOrchestrator", () => {
     };
 
     const orchestratorHandler = getUpsertedProfileOrchestratorHandler({
-      notifyOn: fromArray([expectedQueueName]).getOrElseL(undefined),
+      notifyOn: fromArray([expectedQueueName]).fold(undefined, identity),
       sendCashbackMessage: true
     })(contextMockWithDf as any);
 
@@ -768,7 +769,7 @@ describe("UpsertedProfileOrchestrator", () => {
     };
 
     const orchestratorHandler = getUpsertedProfileOrchestratorHandler({
-      notifyOn: fromArray([expectedQueueName]).getOrElseL(undefined),
+      notifyOn: fromArray([expectedQueueName]).fold(undefined, identity),
       sendCashbackMessage: true
     })(contextMockWithDf as any);
 
@@ -891,7 +892,7 @@ describe("UpsertedProfileOrchestrator", () => {
     };
 
     const orchestratorHandler = getUpsertedProfileOrchestratorHandler({
-      notifyOn: fromArray([expectedQueueName]).getOrElseL(undefined),
+      notifyOn: fromArray([expectedQueueName]).fold(undefined, identity),
       sendCashbackMessage: true
     })(contextMockWithDf as any);
 

diff --git a/UpsertedProfileOrchestrator/handler.ts b/UpsertedProfileOrchestrator/handler.ts
@@ -89,12 +89,17 @@ export const getUpsertedProfileOrchestratorHandler = (params: {
       updatedAt
     } = upsertedProfileOrchestratorInput;
 
-    const profileOperation = oldProfile !== undefined ? "UPDATED" : "CREATED";
+    const existsOldProfile = (
+      p: RetrievedProfile | undefined
+    ): p is RetrievedProfile => p !== undefined;
+    const profileOperation = existsOldProfile(oldProfile)
+      ? "UPDATED"
+      : "CREATED";
 
     // Check if the profile email is changed
     const isProfileEmailChanged =
-      profileOperation === "UPDATED" && newProfile.email !== oldProfile.email;
-    if (isProfileEmailChanged) {
+      existsOldProfile(oldProfile) && newProfile.email !== oldProfile.email;
+    if (isProfileEmailChanged && newProfile.email) {
       try {
         const { fiscalCode, email } = newProfile;
 
@@ -151,7 +156,7 @@ export const getUpsertedProfileOrchestratorHandler = (params: {
     // Send welcome messages to the user
     const isInboxEnabled = newProfile.isInboxEnabled === true;
     const hasOldProfileWithInboxDisabled =
-      profileOperation === "UPDATED" && oldProfile.isInboxEnabled === false;
+      existsOldProfile(oldProfile) && oldProfile.isInboxEnabled === false;
 
     const hasJustEnabledInbox =
       isInboxEnabled &&
@@ -191,7 +196,7 @@ export const getUpsertedProfileOrchestratorHandler = (params: {
     }
 
     // Update subscriptions feed
-    if (profileOperation === "CREATED") {
+    if (!existsOldProfile(oldProfile)) {
       // When a profile get created we add an entry to the profile subscriptions
       context.log.verbose(
         `${logPrefix}|Calling UpdateSubscriptionsFeedActivity|OPERATION=SUBSCRIBED`

diff --git a/UpsertedProfileOrchestrator/index.ts b/UpsertedProfileOrchestrator/index.ts
@@ -1,4 +1,5 @@
 import * as df from "durable-functions";
+import { identity } from "fp-ts/lib/function";
 import * as NonEmptyArray from "fp-ts/lib/NonEmptyArray";
 import { getConfigOrThrow } from "../utils/config";
 
@@ -11,7 +12,7 @@ const orchestrator = df.orchestrator(
     notifyOn: config.FF_NEW_USERS_EUCOVIDCERT_ENABLED
       ? NonEmptyArray.fromArray([
           config.EUCOVIDCERT_PROFILE_CREATED_QUEUE_NAME
-        ]).getOrElse(undefined)
+        ]).fold(undefined, identity)
       : undefined,
     sendCashbackMessage: config.IS_CASHBACK_ENABLED
   })

diff --git a/UpsertedProfileOrchestratorV2/__tests__/handler.test.ts b/UpsertedProfileOrchestratorV2/__tests__/handler.test.ts
@@ -24,6 +24,7 @@ import {
 import { BlockedInboxOrChannelEnum } from "@pagopa/io-functions-commons/dist/generated/definitions/BlockedInboxOrChannel";
 import { readableReport } from "@pagopa/ts-commons/lib/reporters";
 import { consumeGenerator } from "../../utils/durable";
+import { identity } from "fp-ts/lib/function";
 
 const someRetryOptions = new df.RetryOptions(5000, 10);
 // tslint:disable-next-line: no-object-mutation
@@ -203,7 +204,7 @@ describe("UpsertedProfileOrchestratorV2", () => {
     };
 
     const orchestratorHandler = getUpsertedProfileOrchestratorHandler({
-      notifyOn: fromArray([expectedQueueName]).getOrElseL(undefined),
+      notifyOn: fromArray([expectedQueueName]).fold(undefined, identity),
       sendCashbackMessage: true
     })(contextMockWithDf as any);
 
@@ -310,7 +311,7 @@ describe("UpsertedProfileOrchestratorV2", () => {
     };
 
     const orchestratorHandler = getUpsertedProfileOrchestratorHandler({
-      notifyOn: fromArray([expectedQueueName]).getOrElseL(undefined),
+      notifyOn: fromArray([expectedQueueName]).fold(undefined, identity),
       sendCashbackMessage: true
     })(contextMockWithDf as any);
 
@@ -421,7 +422,7 @@ describe("UpsertedProfileOrchestratorV2", () => {
     };
 
     const orchestratorHandler = getUpsertedProfileOrchestratorHandler({
-      notifyOn: fromArray([expectedQueueName]).getOrElseL(undefined),
+      notifyOn: fromArray([expectedQueueName]).fold(undefined, identity),
       sendCashbackMessage: true
     })(contextMockWithDf as any);
 
@@ -532,7 +533,7 @@ describe("UpsertedProfileOrchestratorV2", () => {
     };
 
     const orchestratorHandler = getUpsertedProfileOrchestratorHandler({
-      notifyOn: fromArray([expectedQueueName]).getOrElseL(undefined),
+      notifyOn: fromArray([expectedQueueName]).fold(undefined, identity),
       sendCashbackMessage: true
     })(contextMockWithDf as any);
 
@@ -656,7 +657,7 @@ describe("UpsertedProfileOrchestratorV2", () => {
     };
 
     const orchestratorHandler = getUpsertedProfileOrchestratorHandler({
-      notifyOn: fromArray([expectedQueueName]).getOrElseL(undefined),
+      notifyOn: fromArray([expectedQueueName]).fold(undefined, identity),
       sendCashbackMessage: true
     })(contextMockWithDf as any);
 
@@ -711,8 +712,8 @@ describe("UpsertedProfileOrchestratorV2", () => {
       {
         fiscalCode: aFiscalCode,
         settingsVersion:
-          upsertedProfileOrchestratorInput.oldProfile.servicePreferencesSettings
-            .version
+          upsertedProfileOrchestratorInput.oldProfile
+            ?.servicePreferencesSettings.version
       }
     );
 
@@ -802,7 +803,7 @@ describe("UpsertedProfileOrchestratorV2", () => {
     };
 
     const orchestratorHandler = getUpsertedProfileOrchestratorHandler({
-      notifyOn: fromArray([expectedQueueName]).getOrElseL(undefined),
+      notifyOn: fromArray([expectedQueueName]).fold(undefined, identity),
       sendCashbackMessage: true
     })(contextMockWithDf as any);
 
@@ -855,8 +856,8 @@ describe("UpsertedProfileOrchestratorV2", () => {
       {
         fiscalCode: aFiscalCode,
         settingsVersion:
-          upsertedProfileOrchestratorInput.oldProfile.servicePreferencesSettings
-            .version
+          upsertedProfileOrchestratorInput.oldProfile
+            ?.servicePreferencesSettings.version
       }
     );
 
@@ -945,7 +946,7 @@ describe("UpsertedProfileOrchestratorV2", () => {
     };
 
     const orchestratorHandler = getUpsertedProfileOrchestratorHandler({
-      notifyOn: fromArray([expectedQueueName]).getOrElseL(undefined),
+      notifyOn: fromArray([expectedQueueName]).fold(undefined, identity),
       sendCashbackMessage: true
     })(contextMockWithDf as any);
 

diff --git a/UpsertedProfileOrchestratorV2/handler.ts b/UpsertedProfileOrchestratorV2/handler.ts
@@ -88,12 +88,17 @@ export const getUpsertedProfileOrchestratorHandler = (params: {
       updatedAt
     } = upsertedProfileOrchestratorInput;
 
-    const profileOperation = oldProfile !== undefined ? "UPDATED" : "CREATED";
+    const existsOldProfile = (
+      p: RetrievedProfile | undefined
+    ): p is RetrievedProfile => p !== undefined;
+    const profileOperation = existsOldProfile(oldProfile)
+      ? "UPDATED"
+      : "CREATED";
 
     // Check if the profile email is changed
     const isProfileEmailChanged =
-      profileOperation === "UPDATED" && newProfile.email !== oldProfile.email;
-    if (isProfileEmailChanged) {
+      existsOldProfile(oldProfile) && newProfile.email !== oldProfile.email;
+    if (isProfileEmailChanged && newProfile.email) {
       try {
         const { fiscalCode, email } = newProfile;
 
@@ -150,11 +155,11 @@ export const getUpsertedProfileOrchestratorHandler = (params: {
     // Send welcome messages to the user
     const isInboxEnabled = newProfile.isInboxEnabled === true;
     const hasOldProfileWithInboxDisabled =
-      profileOperation === "UPDATED" && oldProfile.isInboxEnabled === false;
+      existsOldProfile(oldProfile) && oldProfile.isInboxEnabled === false;
 
     const hasJustEnabledInbox =
       isInboxEnabled &&
-      (profileOperation === "CREATED" || hasOldProfileWithInboxDisabled);
+      (!existsOldProfile(oldProfile) || hasOldProfileWithInboxDisabled);
 
     context.log.verbose(
       `${logPrefix}|OPERATION=${profileOperation}|INBOX_ENABLED=${isInboxEnabled}|INBOX_JUST_ENABLED=${hasJustEnabledInbox}`
@@ -190,7 +195,7 @@ export const getUpsertedProfileOrchestratorHandler = (params: {
     }
 
     // Update subscriptions feed
-    if (profileOperation === "CREATED") {
+    if (!existsOldProfile(oldProfile)) {
       // When a profile get created we add an entry to the profile subscriptions
       context.log.verbose(
         `${logPrefix}|Calling UpdateSubscriptionsFeedActivity|OPERATION=SUBSCRIBED`