Skip to content

Commit acb693f

Browse files
acuiuliGarma00
andauthored
[IOCOM-1952] substituted payment updater api with pagopa ecommerce api (#312)
* substituted payment updater api with pagopa ecommerce api * remove package-lock.json * fix: adjust openapi file to correctly generate types with pagopa codegen * fixed tests * removed PU openapi and client generation * removed reference to PU * fixed yarn lock * removed PU client * doxker compose fix integration test * fixed testagent container name * fix yarn lock * fixed yarn lock * tests: update integration test env file * better error for testing * small fixes * fixed rptId generation for payment status --------- Co-authored-by: Garma <giovanniarmaleo00@gmail.com>
1 parent 07a56f2 commit acb693f

File tree

13 files changed

+924
-267
lines changed

13 files changed

+924
-267
lines changed

.devops/code-review-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,6 @@ stages:
9595
cd __integrations__
9696
yarn install --frozen-lockfile
9797
sleep 30s
98-
docker exec integrations___testagent_1 yarn test
98+
docker exec fn_services_testagent yarn test
9999
# ^^^ FIXME: reference container using a less arbitrary name
100100
displayName: 'Execute tests'

GetMessage/__tests__/handler.test.ts

Lines changed: 48 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ import {
5959
} from "../../__mocks__/mocks";
6060

6161
import { PaymentStatusEnum } from "../../generated/definitions/PaymentStatus";
62+
import { FaultCodeCategoryEnum, PaymentDuplicatedStatusFaultPaymentProblemJson } from "../../generated/pagopa-ecommerce/PaymentDuplicatedStatusFaultPaymentProblemJson";
63+
import { PaymentDuplicatedStatusFaultEnum } from "../../generated/pagopa-ecommerce/PaymentDuplicatedStatusFault";
64+
import { PartyConfigurationFaultEnum } from "../../generated/pagopa-ecommerce/PartyConfigurationFault";
65+
import { FaultCodeCategoryEnum as faultCode, PartyConfigurationFaultPaymentProblemJson } from "../../generated/pagopa-ecommerce/PartyConfigurationFaultPaymentProblemJson";
6266

6367
// Tests
6468
// -----------------------
@@ -258,27 +262,16 @@ describe("GetMessageHandler", () => {
258262
};
259263
}
260264

261-
const getPaymentUpdaterClientMock = (paid: boolean = false) => ({
262-
getMessagePayment: jest.fn().mockImplementation(() =>
263-
TE.right({
264-
status: 200,
265-
value: {
266-
paid
267-
},
268-
headers: {}
265+
const getPagopaEcommerceClientMock = (status: number = 200, body?: PaymentDuplicatedStatusFaultPaymentProblemJson | PartyConfigurationFaultPaymentProblemJson) => ({
266+
getPaymentRequestInfo: jest.fn().mockImplementation(() =>
267+
TE.right(body ? {
268+
value: body,
269+
status: status
270+
} : {
271+
status: status
269272
})()
270-
)
271-
});
272-
const getBrokenPaymentUpdaterClientMock = (status: number) => ({
273-
getMessagePayment: jest.fn().mockImplementation(() =>
274-
TE.right({
275-
status,
276-
value: {
277-
status
278-
},
279-
headers: {}
280-
})()
281-
)
273+
),
274+
getCarts: jest.fn()
282275
});
283276

284277
it("should respond with a message if requesting user is the sender", async () => {
@@ -297,7 +290,7 @@ describe("GetMessageHandler", () => {
297290
getNotificationStatusModelMock(),
298291
{} as any,
299292
mockMessageReadStatusAuth,
300-
getPaymentUpdaterClientMock()
293+
getPagopaEcommerceClientMock()
301294
);
302295

303296
const result = await getMessageHandler(
@@ -337,7 +330,7 @@ describe("GetMessageHandler", () => {
337330
getNotificationStatusModelMock(),
338331
{} as any,
339332
mockMessageReadStatusAuth,
340-
getPaymentUpdaterClientMock()
333+
getPagopaEcommerceClientMock()
341334
);
342335

343336
const result = await getMessageHandler(
@@ -375,7 +368,7 @@ describe("GetMessageHandler", () => {
375368
getNotificationStatusModelMock(),
376369
{} as any,
377370
mockMessageReadStatusAuth,
378-
getPaymentUpdaterClientMock()
371+
getPagopaEcommerceClientMock()
379372
);
380373

381374
const result = await getMessageHandler(
@@ -419,7 +412,7 @@ describe("GetMessageHandler", () => {
419412
{} as any,
420413
{} as any,
421414
mockMessageReadStatusAuth,
422-
getPaymentUpdaterClientMock()
415+
getPagopaEcommerceClientMock()
423416
);
424417

425418
const result = await getMessageHandler(
@@ -464,7 +457,7 @@ describe("GetMessageHandler", () => {
464457
{} as any,
465458
{} as any,
466459
mockMessageReadStatusAuth,
467-
getPaymentUpdaterClientMock()
460+
getPagopaEcommerceClientMock()
468461
);
469462

470463
const result = await getMessageHandler(
@@ -507,7 +500,7 @@ describe("GetMessageHandler", () => {
507500
{} as any,
508501
{} as any,
509502
mockMessageReadStatusAuth,
510-
getPaymentUpdaterClientMock()
503+
getPagopaEcommerceClientMock()
511504
);
512505

513506
const result = await getMessageHandler(
@@ -547,7 +540,7 @@ describe("GetMessageHandler", () => {
547540
{} as any,
548541
{} as any,
549542
mockMessageReadStatusAuth,
550-
getPaymentUpdaterClientMock()
543+
getPagopaEcommerceClientMock()
551544
);
552545

553546
const result = await getMessageHandler(
@@ -586,7 +579,7 @@ describe("GetMessageHandler", () => {
586579
getNotificationStatusModelMock(),
587580
{} as any,
588581
mockMessageReadStatusAuth,
589-
getPaymentUpdaterClientMock()
582+
getPagopaEcommerceClientMock()
590583
);
591584

592585
const result = await getMessageHandler(
@@ -631,7 +624,7 @@ describe("GetMessageHandler", () => {
631624
{} as any,
632625
{} as any,
633626
mockMessageReadStatusAuth,
634-
getPaymentUpdaterClientMock()
627+
getPagopaEcommerceClientMock()
635628
);
636629

637630
const result = await getMessageHandler(
@@ -681,7 +674,7 @@ describe("GetMessageHandler", () => {
681674
getNotificationStatusModelMock(),
682675
{} as any,
683676
mockMessageReadStatusAuth,
684-
getPaymentUpdaterClientMock()
677+
getPagopaEcommerceClientMock()
685678
);
686679

687680
const result = await getMessageHandler(
@@ -729,7 +722,7 @@ describe("GetMessageHandler", () => {
729722
getNotificationStatusModelMock(),
730723
{} as any,
731724
mockMessageReadStatusAuth,
732-
getPaymentUpdaterClientMock()
725+
getPagopaEcommerceClientMock()
733726
);
734727

735728
const result = await getMessageHandler(
@@ -767,7 +760,7 @@ describe("GetMessageHandler", () => {
767760
getNotificationStatusModelMock(),
768761
{} as any,
769762
mockMessageReadStatusAuth,
770-
getPaymentUpdaterClientMock()
763+
getPagopaEcommerceClientMock()
771764
);
772765

773766
const result = await getMessageHandler(
@@ -850,7 +843,7 @@ describe("GetMessageHandler", () => {
850843
getNotificationStatusModelMock(),
851844
{} as any,
852845
mockMessageReadStatusAuth,
853-
getPaymentUpdaterClientMock()
846+
getPagopaEcommerceClientMock()
854847
);
855848

856849
const result = await getMessageHandler(
@@ -893,7 +886,7 @@ describe("GetMessageHandler", () => {
893886
getNotificationStatusModelMock(),
894887
{} as any,
895888
mockMessageReadStatusAuth,
896-
getPaymentUpdaterClientMock()
889+
getPagopaEcommerceClientMock()
897890
);
898891

899892
const result = await getMessageHandler(
@@ -943,7 +936,7 @@ describe("GetMessageHandler", () => {
943936
getNotificationStatusModelMock(),
944937
{} as any,
945938
mockMessageReadStatusAuth,
946-
getPaymentUpdaterClientMock()
939+
getPagopaEcommerceClientMock()
947940
);
948941

949942
const result = await getMessageHandler(
@@ -994,7 +987,7 @@ describe("GetMessageHandler", () => {
994987
getNotificationStatusModelMock(),
995988
{} as any,
996989
mockMessageReadStatusAuth,
997-
getPaymentUpdaterClientMock()
990+
getPagopaEcommerceClientMock()
998991
);
999992

1000993
const result = await getMessageHandler(
@@ -1048,7 +1041,7 @@ describe("GetMessageHandler", () => {
10481041
getNotificationStatusModelMock(),
10491042
{} as any,
10501043
mockMessageReadStatusAuth,
1051-
getPaymentUpdaterClientMock()
1044+
getPagopaEcommerceClientMock()
10521045
);
10531046

10541047
const result = await getMessageHandler(
@@ -1100,7 +1093,11 @@ describe("GetMessageHandler", () => {
11001093
getNotificationStatusModelMock(),
11011094
{} as any,
11021095
mockMessageReadStatusAuth,
1103-
getPaymentUpdaterClientMock(true)
1096+
getPagopaEcommerceClientMock(409,
1097+
{
1098+
faultCodeCategory: FaultCodeCategoryEnum.PAYMENT_DUPLICATED,
1099+
faultCodeDetail: PaymentDuplicatedStatusFaultEnum.PAA_PAGAMENTO_DUPLICATO
1100+
})
11041101
);
11051102

11061103
const result = await getMessageHandler(
@@ -1152,7 +1149,11 @@ describe("GetMessageHandler", () => {
11521149
getNotificationStatusModelMock(),
11531150
{} as any,
11541151
mockMessageReadStatusAuth,
1155-
getPaymentUpdaterClientMock(true)
1152+
getPagopaEcommerceClientMock(409,
1153+
{
1154+
faultCodeCategory: FaultCodeCategoryEnum.PAYMENT_DUPLICATED,
1155+
faultCodeDetail: PaymentDuplicatedStatusFaultEnum.PAA_PAGAMENTO_DUPLICATO
1156+
})
11561157
);
11571158

11581159
const result = await getMessageHandler(
@@ -1204,7 +1205,7 @@ describe("GetMessageHandler", () => {
12041205
getNotificationStatusModelMock(),
12051206
{} as any,
12061207
mockMessageReadStatusAuth,
1207-
getBrokenPaymentUpdaterClientMock(404)
1208+
getPagopaEcommerceClientMock(404)
12081209
);
12091210

12101211
const result = await getMessageHandler(
@@ -1256,7 +1257,13 @@ describe("GetMessageHandler", () => {
12561257
getNotificationStatusModelMock(),
12571258
{} as any,
12581259
mockMessageReadStatusAuth,
1259-
getBrokenPaymentUpdaterClientMock(503)
1260+
getPagopaEcommerceClientMock(503,
1261+
{
1262+
faultCodeCategory: faultCode.DOMAIN_UNKNOWN,
1263+
faultCodeDetail: PartyConfigurationFaultEnum.PAA_ID_DOMINIO_ERRATO,
1264+
title: "UnexpectedError"
1265+
}
1266+
)
12601267
);
12611268

12621269
const result = await getMessageHandler(
@@ -1277,8 +1284,6 @@ describe("GetMessageHandler", () => {
12771284

12781285
expect(result).toEqual(
12791286
expect.objectContaining({
1280-
detail:
1281-
"Internal server error: Error retrieving Payment Status: Failed to fetch payment status from Payment Updater: 503",
12821287
kind: "IResponseErrorInternal"
12831288
})
12841289
);

0 commit comments

Comments
 (0)