Skip to content

Commit 00eb062

Browse files
gquadratigquadrati
committed
generate and use new identity types
1 parent 7f8758e commit 00eb062

22 files changed

+75
-78
lines changed

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"generate": "npm-run-all generate:proxy:* generate:api:* generate:messages:* generate:lollipop-definitions generate:lollipop-first-sign",
3030
"generate:dev-certs": "sh ./scripts/generate-test-certs.sh certs",
3131
"generate:proxy:api-models": "rimraf generated/backend && gen-api-models --api-spec api_backend.yaml --out-dir generated/backend",
32+
"generate:proxy:identity-api-models": "rimraf generated/identity && gen-api-models --api-spec openapi/generated/api_identity.yaml --out-dir generated/identity",
3233
"generate:proxy:api-parameters": "gen-api-models --api-spec api_parameters.yaml --out-dir generated/parameters",
3334
"generate:proxy:notification-models": "rimraf generated/notifications && gen-api-models --api-spec api_notifications.yaml --out-dir generated/notifications",
3435
"generate:messages:notifications": "rimraf generated/messages && gen-api-models --api-spec notification_queue_messages.yaml --out-dir generated/messages",

‎src/__mocks__/user_mock.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { FiscalCode, NonEmptyString } from "@pagopa/ts-commons/lib/strings";
2-
import { EmailAddress } from "../../generated/backend/EmailAddress";
3-
import { InitializedProfile } from "../../generated/backend/InitializedProfile";
2+
import { EmailAddress } from "../../generated/identity/EmailAddress";
3+
import { InitializedProfile } from "../../generated/identity/InitializedProfile";
44
import { SpidLevelEnum } from "../../generated/backend/SpidLevel";
55
import { IsInboxEnabled } from "../../generated/io-profile/IsInboxEnabled";
66
import { IsWebhookEnabled } from "../../generated/io-profile/IsWebhookEnabled";

‎src/controllers/__tests__/cgnController.test.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ import {
22
ResponseSuccessAccepted,
33
ResponseSuccessJson
44
} from "@pagopa/ts-commons/lib/responses";
5-
import { NonEmptyString } from "@pagopa/ts-commons/lib/strings";
6-
import { FiscalCode } from "../../../generated/backend/FiscalCode";
5+
import { NonEmptyString, FiscalCode } from "@pagopa/ts-commons/lib/strings";
76
import mockReq from "../../__mocks__/request";
87
import mockRes from "../../__mocks__/response";
98
import { mockedUser } from "../../__mocks__/user_mock";

‎src/controllers/__tests__/notificationController.test.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/* tslint:disable:no-object-mutation */
22
import { ResponseSuccessJson } from "@pagopa/ts-commons/lib/responses";
3-
import { EmailAddress } from "../../../generated/backend/EmailAddress";
4-
import { FiscalCode } from "../../../generated/backend/FiscalCode";
3+
import { FiscalCode, EmailString } from "@pagopa/ts-commons/lib/strings";
54
import { InstallationID } from "../../../generated/backend/InstallationID";
65
import { PlatformEnum } from "../../../generated/backend/Platform";
76
import { SpidLevelEnum } from "../../../generated/backend/SpidLevel";
@@ -20,7 +19,7 @@ import { mockRedisClientSelector } from "../../__mocks__/redis";
2019

2120
const aFiscalNumber = "GRBGPP87L04L741X" as FiscalCode;
2221
const anInvalidFiscalNumber = "xxx" as FiscalCode;
23-
const anEmailAddress = "garibaldi@example.com" as EmailAddress;
22+
const anEmailAddress = "garibaldi@example.com" as EmailString;
2423
const aValidSpidLevel = SpidLevelEnum["https://www.spid.gov.it/SpidL2"];
2524
const aValidInstallationID =
2625
"550e8400e29b41d4a716446655440000" as InstallationID;

‎src/controllers/__tests__/profileController.test.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,27 @@ import {
66
} from "@pagopa/ts-commons/lib/responses";
77
import * as E from "fp-ts/lib/Either";
88
import { mockedUser } from "../../__mocks__/user_mock";
9-
import { EmailAddress } from "../../../generated/backend/EmailAddress";
9+
import { EmailAddress } from "../../../generated/identity/EmailAddress";
1010
import { ExtendedProfile } from "../../../generated/backend/ExtendedProfile";
11-
import { FiscalCode } from "../../../generated/backend/FiscalCode";
12-
import { IsInboxEnabled } from "../../../generated/backend/IsInboxEnabled";
13-
import { IsWebhookEnabled } from "../../../generated/backend/IsWebhookEnabled";
11+
import { FiscalCode } from "../../../generated/identity/FiscalCode";
12+
import { IsInboxEnabled } from "../../../generated/identity/IsInboxEnabled";
13+
import { IsWebhookEnabled } from "../../../generated/identity/IsWebhookEnabled";
1414
import {
1515
PreferredLanguage,
1616
PreferredLanguageEnum
17-
} from "../../../generated/backend/PreferredLanguage";
18-
import { Profile } from "../../../generated/backend/Profile";
17+
} from "../../../generated/identity/PreferredLanguage";
18+
import { Profile } from "../../../generated/identity/Profile";
1919
import mockReq from "../../__mocks__/request";
2020
import mockRes from "../../__mocks__/response";
2121
import ApiClient from "../../services/apiClientFactory";
2222
import ProfileService from "../../services/profileService";
2323
import { profileMissingErrorResponse } from "../../types/profile";
2424
import ProfileController from "../profileController";
25-
import { ServicePreferencesSettings } from "../../../generated/backend/ServicePreferencesSettings";
26-
import { ServicesPreferencesModeEnum } from "../../../generated/backend/ServicesPreferencesMode";
27-
import { AppVersion } from "../../../generated/backend/AppVersion";
28-
import { PushNotificationsContentTypeEnum } from "../../../generated/backend/PushNotificationsContentType";
29-
import { ReminderStatusEnum } from "../../../generated/backend/ReminderStatus";
25+
import { ServicePreferencesSettings } from "../../../generated/identity/ServicePreferencesSettings";
26+
import { ServicesPreferencesModeEnum } from "../../../generated/identity/ServicesPreferencesMode";
27+
import { AppVersion } from "../../../generated/identity/AppVersion";
28+
import { PushNotificationsContentTypeEnum } from "../../../generated/identity/PushNotificationsContentType";
29+
import { ReminderStatusEnum } from "../../../generated/identity/ReminderStatus";
3030

3131
const aTimestamp = 1518010929530;
3232

‎src/controllers/profileController.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import {
1515
} from "@pagopa/ts-commons/lib/responses";
1616
import * as express from "express";
1717

18-
import { InitializedProfile } from "../../generated/backend/InitializedProfile";
19-
import { Profile } from "../../generated/backend/Profile";
18+
import { InitializedProfile } from "../../generated/identity/InitializedProfile";
19+
import { Profile } from "../../generated/identity/Profile";
2020
import ProfileService from "../services/profileService";
2121
import { profileMissingErrorResponse } from "../types/profile";
2222
import { withUserFromRequest } from "../types/user";

‎src/controllers/servicesController.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import {
1414
import * as express from "express";
1515

1616
import { PathTraversalSafePathParam } from "../../generated/backend/PathTraversalSafePathParam";
17-
import { ServicePreference } from "../../generated/backend/ServicePreference";
18-
import { UpsertServicePreference } from "../../generated/backend/UpsertServicePreference";
17+
import { ServicePreference } from "../../generated/identity/ServicePreference";
18+
import { UpsertServicePreference } from "../../generated/identity/UpsertServicePreference";
1919
import { withUserFromRequest } from "../../src/types/user";
2020
import { withValidatedOrValidationError } from "../../src/utils/responses";
2121
import FunctionsAppService from "../services/functionAppService";

‎src/controllers/userDataProcessingController.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import {
1414
} from "@pagopa/ts-commons/lib/responses";
1515
import * as express from "express";
1616

17-
import { UserDataProcessing } from "../../generated/backend/UserDataProcessing";
18-
import { UserDataProcessingChoice } from "../../generated/backend/UserDataProcessingChoice";
19-
import { UserDataProcessingChoiceRequest } from "../../generated/backend/UserDataProcessingChoiceRequest";
17+
import { UserDataProcessing } from "../../generated/identity/UserDataProcessing";
18+
import { UserDataProcessingChoice } from "../../generated/identity/UserDataProcessingChoice";
19+
import { UserDataProcessingChoiceRequest } from "../../generated/identity/UserDataProcessingChoiceRequest";
2020
import UserDataProcessingService from "../../src/services/userDataProcessingService";
2121
import { withUserFromRequest } from "../types/user";
2222
import { withValidatedOrValidationError } from "../utils/responses";

‎src/services/__tests__/notificationService.test.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import * as E from "fp-ts/lib/Either";
44

55
import { NonEmptyString } from "@pagopa/ts-commons/lib/strings";
6+
import { FiscalCode } from "@pagopa/ts-commons/lib/strings";
67

7-
import { FiscalCode } from "../../../generated/backend/FiscalCode";
88
import { MessageBodyMarkdown } from "../../../generated/backend/MessageBodyMarkdown";
99
import { MessageSubject } from "../../../generated/backend/MessageSubject";
1010
import { PlatformEnum } from "../../../generated/backend/Platform";
@@ -87,7 +87,7 @@ describe("NotificationService#createOrUpdateInstallation", () => {
8787
});
8888

8989
it("should submit a correct installation to the Queue Storage, Apple platform", async () => {
90-
mockSendMessage.mockImplementation(_ => Promise.resolve());
90+
mockSendMessage.mockImplementation((_) => Promise.resolve());
9191

9292
const service = new NotificationService("", "");
9393

@@ -107,7 +107,7 @@ describe("NotificationService#createOrUpdateInstallation", () => {
107107
});
108108

109109
it("should submit a correct installation to the Queue Storage, Google platform", async () => {
110-
mockSendMessage.mockImplementation(_ => Promise.resolve());
110+
mockSendMessage.mockImplementation((_) => Promise.resolve());
111111

112112
const service = new NotificationService("", "");
113113

@@ -127,7 +127,7 @@ describe("NotificationService#createOrUpdateInstallation", () => {
127127
});
128128

129129
it("should fail if the Queue Storage fails on createOrUpdateInstallation", async () => {
130-
mockSendMessage.mockImplementation(_ => Promise.reject(genericError));
130+
mockSendMessage.mockImplementation((_) => Promise.reject(genericError));
131131

132132
const service = new NotificationService("", "");
133133

@@ -153,7 +153,7 @@ describe("NotificationService#notify", () => {
153153
});
154154

155155
it("should submit a notification to the Queue Storage", async () => {
156-
mockSendMessage.mockImplementation(_ => Promise.resolve());
156+
mockSendMessage.mockImplementation((_) => Promise.resolve());
157157
const service = new NotificationService("", "");
158158

159159
const res = await service.notify(aValidNotification, aNotificationSubject);
@@ -171,7 +171,7 @@ describe("NotificationService#notify", () => {
171171
});
172172

173173
it("should write organization name in title, if notificationTitle parameter is empty", async () => {
174-
mockSendMessage.mockImplementation(_ => Promise.resolve());
174+
mockSendMessage.mockImplementation((_) => Promise.resolve());
175175
const service = new NotificationService("", "");
176176

177177
const res = await service.notify(aValidNotification, aNotificationSubject);
@@ -189,7 +189,7 @@ describe("NotificationService#notify", () => {
189189
pipe(
190190
decodedMessage,
191191
NotifyMessage.decode,
192-
E.map(m =>
192+
E.map((m) =>
193193
expect(m).toEqual({
194194
installationId: toFiscalCodeHash(
195195
aValidNotification.message.fiscal_code
@@ -202,12 +202,12 @@ describe("NotificationService#notify", () => {
202202
}
203203
})
204204
),
205-
E.mapLeft(_ => fail("Cannot decode NotifyMessage"))
205+
E.mapLeft((_) => fail("Cannot decode NotifyMessage"))
206206
);
207207
});
208208

209209
it("should write notificationTitle in title, if notificationTitle not empty", async () => {
210-
mockSendMessage.mockImplementation(_ => Promise.resolve());
210+
mockSendMessage.mockImplementation((_) => Promise.resolve());
211211
const service = new NotificationService("", "");
212212

213213
const res = await service.notify(
@@ -229,7 +229,7 @@ describe("NotificationService#notify", () => {
229229
pipe(
230230
decodedMessage,
231231
NotifyMessage.decode,
232-
E.map(m =>
232+
E.map((m) =>
233233
expect(m).toEqual({
234234
installationId: toFiscalCodeHash(
235235
aValidNotification.message.fiscal_code
@@ -242,12 +242,12 @@ describe("NotificationService#notify", () => {
242242
}
243243
})
244244
),
245-
E.mapLeft(_ => fail("Cannot decode NotifyMessage"))
245+
E.mapLeft((_) => fail("Cannot decode NotifyMessage"))
246246
);
247247
});
248248

249249
it("should fail if the Queue Storage fails on notify", async () => {
250-
mockSendMessage.mockImplementation(_ => Promise.reject(genericError));
250+
mockSendMessage.mockImplementation((_) => Promise.reject(genericError));
251251

252252
const service = new NotificationService("", "");
253253

@@ -277,7 +277,7 @@ describe("NotificationService#deleteInstallation", () => {
277277
};
278278

279279
it("should submit a delete installation message to the Queue Storage", async () => {
280-
mockSendMessage.mockImplementation(_ => Promise.resolve());
280+
mockSendMessage.mockImplementation((_) => Promise.resolve());
281281
const service = new NotificationService("", "");
282282

283283
const res = await service.deleteInstallation(aFiscalCode);
@@ -294,7 +294,7 @@ describe("NotificationService#deleteInstallation", () => {
294294
});
295295

296296
it("should fail if the Queue Storage fails on deleteInstallation", async () => {
297-
mockSendMessage.mockImplementation(_ => Promise.reject(genericError));
297+
mockSendMessage.mockImplementation((_) => Promise.reject(genericError));
298298
const service = new NotificationService("", "");
299299

300300
const res = await service.deleteInstallation(aFiscalCode);

‎src/services/__tests__/profileService.test.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import * as t from "io-ts";
2-
import { IsInboxEnabled } from "../../../generated/backend/IsInboxEnabled";
3-
import { IsWebhookEnabled } from "../../../generated/backend/IsWebhookEnabled";
2+
import { IsInboxEnabled } from "../../../generated/identity/IsInboxEnabled";
3+
import { IsWebhookEnabled } from "../../../generated/identity/IsWebhookEnabled";
44
import {
55
PreferredLanguage,
66
PreferredLanguageEnum
7-
} from "../../../generated/backend/PreferredLanguage";
8-
import { PushNotificationsContentTypeEnum } from "../../../generated/backend/PushNotificationsContentType";
9-
import { ReminderStatusEnum } from "../../../generated/backend/ReminderStatus";
10-
import { ServicePreferencesSettings } from "../../../generated/backend/ServicePreferencesSettings";
11-
import { ServicesPreferencesModeEnum } from "../../../generated/backend/ServicesPreferencesMode";
7+
} from "../../../generated/identity/PreferredLanguage";
8+
import { PushNotificationsContentTypeEnum } from "../../../generated/identity/PushNotificationsContentType";
9+
import { ReminderStatusEnum } from "../../../generated/identity/ReminderStatus";
10+
import { ServicePreferencesSettings } from "../../../generated/identity/ServicePreferencesSettings";
11+
import { ServicesPreferencesModeEnum } from "../../../generated/identity/ServicesPreferencesMode";
1212
import { AppVersion } from "../../../generated/io-profile/AppVersion";
1313
import { ExtendedProfile as ExtendedProfileApi } from "../../../generated/io-profile/ExtendedProfile";
1414
import { NewProfile } from "../../../generated/io-profile/NewProfile";
@@ -24,7 +24,7 @@ import {
2424
} from "../../__mocks__/user_mock";
2525
import ApiClientFactory from "../apiClientFactory";
2626
import ProfileService from "../profileService";
27-
import { Profile } from "../../../generated/backend/Profile";
27+
import { Profile } from "../../../generated/identity/Profile";
2828
import { UpdateProfileParams } from "../../../generated/io-profile/UpdateProfileParams";
2929

3030
const aValidAPIEmail = anEmailAddress;

0 commit comments

Comments
 (0)