@chevre/domain 23.2.0-alpha.61 → 23.2.0-alpha.62

package/lib/chevre/service/payment/any/onRefundActionCompletedOrFailed.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onRefundActionCompletedOrFailed = onRefundActionCompletedOrFailed;
 /**
@@ -21,28 +12,28 @@ const onPaymentStatusChanged_1 = require("./onPaymentStatusChanged");
  */
 function onRefundActionCompletedOrFailed(refundAction) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const aciton4inform = (0, factory_1.optimizeAction4inform)(refundAction);
         const potentialActions = refundAction.potentialActions;
         const now = new Date();
         const taskAttributes = [];
-        const add2report = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.add2report;
+        const add2report = potentialActions?.add2report;
         if (add2report === true) {
             // 同期的に経理レポート連携する(2022-08-27~)
-            yield (0, onPaymentStatusChanged_1.onPaymentStatusChanged)(aciton4inform)(repos);
+            await (0, onPaymentStatusChanged_1.onPaymentStatusChanged)(aciton4inform)(repos);
         }
         // FailedActionStatusに対応(経理レポート連携はするが、通知はしない)(2024-03-21~)
         if (refundAction.actionStatus === factory.actionStatusType.FailedActionStatus) {
             // no op
         }
         else if (refundAction.actionStatus === factory.actionStatusType.CompletedActionStatus) {
-            const informPayment = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.informPayment;
+            const informPayment = potentialActions?.informPayment;
             // 手数料決済があれば処理
             // CreditCardIFのみ(2023-06-29~)
             const firstObject = refundAction.object[0];
-            const paymentServiceType = firstObject === null || firstObject === void 0 ? void 0 : firstObject.typeOf;
+            const paymentServiceType = firstObject?.typeOf;
             if (paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard) {
-                const refundFee = firstObject === null || firstObject === void 0 ? void 0 : firstObject.refundFee;
+                const refundFee = firstObject?.refundFee;
                 if (typeof refundFee === 'number' && refundFee > 0) {
                     // purpose.typeOf:PlaceOrderは外部決済URL無効化における返金アクションのみなので、手数料決済から除外してよい(2024-03-19~)
                     // purpose.typeOf:Orderは決済カード承認時着券の取消なので、手数料決済から除外してよい
@@ -103,11 +94,15 @@ function onRefundActionCompletedOrFailed(refundAction) {
                                 typeOf: factory.order.OrderType.Order
                             };
                         }
-                        data = Object.assign(Object.assign({ 
+                        data = {
                             // optimize(2024-07-01~)
                             // recipient, // discontinue recipient(2025-02-19~)
-                            object: aciton4inform, id, typeOf: factory.actionType.InformAction }, (typeof (purpose === null || purpose === void 0 ? void 0 : purpose.typeOf) === 'string') ? { purpose } : undefined), (typeof (about === null || about === void 0 ? void 0 : about.typeOf) === 'string') ? { about } : undefined // add(2025-02-14~)
-                        );
+                            object: aciton4inform,
+                            id, // add potentialAction(2025-02-05~)
+                            typeOf: factory.actionType.InformAction,
+                            ...(typeof purpose?.typeOf === 'string') ? { purpose } : undefined,
+                            ...(typeof about?.typeOf === 'string') ? { about } : undefined // add(2025-02-14~)
+                        };
                     }
                     else {
                         throw new factory.errors.ArgumentNull('potentialActions.informPayment.id'); // 2025-02-09~
@@ -136,10 +131,10 @@ function onRefundActionCompletedOrFailed(refundAction) {
                 }));
             }
             // タスク保管
-            yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
+            await repos.task.saveMany(taskAttributes, { emitImmediately: true });
         }
         else {
             throw new factory.errors.NotImplemented(`actionStatus ${refundAction.actionStatus} not implemented`);
         }
-    });
+    };
 }

package/lib/chevre/service/payment/any/person2username.js

@@ -1,59 +1,47 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.person2username = person2username;
 const factory = require("../../../factory");
 // import { Settings } from '../../../settings';
 const person_1 = require("../../../repo/person");
 const SSKTS_PROVIDER_NAME = 'SSKTS';
-function person2username(person, cognitoIdentityServiceProvider, setting
+async function person2username(person, cognitoIdentityServiceProvider, setting
 // settings: Settings
 ) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
-        // const USERPOOL_ID_OLD = settings.userPoolIdOld;
-        const USERPOOL_ID_OLD = setting === null || setting === void 0 ? void 0 : setting.userPoolIdOld;
-        if (typeof USERPOOL_ID_OLD !== 'string') {
-            throw new factory.errors.NotFound('setting.userPoolIdOld');
-        }
-        let username = (_a = person.memberOf) === null || _a === void 0 ? void 0 : _a.membershipNumber;
-        // ユーザープールが本家の場合とsskstの場合に対応
-        // 本家にssktsをプロバイダーとしてログインしている場合、追加特性に以下のような値のidentitiesがあるはず
-        // [{"userId":"xxxx","providerName":"SSKTS","providerType":"OIDC"}]
-        const userIdentitiesStr = (_c = (_b = person.additionalProperty) === null || _b === void 0 ? void 0 : _b.find((p) => p.name === 'identities')) === null || _c === void 0 ? void 0 : _c.value;
-        if (typeof userIdentitiesStr === 'string' && userIdentitiesStr.length > 0) {
-            try {
-                const identities = JSON.parse(userIdentitiesStr);
-                if (Array.isArray(identities) && identities.length > 0) {
-                    const providerName = identities[0].providerName;
-                    const userIdByIdentities = identities[0].userId;
-                    if (providerName === SSKTS_PROVIDER_NAME) {
-                        if (typeof userIdByIdentities === 'string' && userIdByIdentities.length > 0) {
-                            const personRepo = new person_1.PersonRepo({
-                                cognitoIdentityServiceProvider,
-                                userPoolId: USERPOOL_ID_OLD
-                            });
-                            // oldUserは必ず存在するはず
-                            const oldUser = yield personRepo.findById({ userId: userIdByIdentities });
-                            username = String((_d = oldUser.memberOf) === null || _d === void 0 ? void 0 : _d.membershipNumber);
-                        }
+    // const USERPOOL_ID_OLD = settings.userPoolIdOld;
+    const USERPOOL_ID_OLD = setting?.userPoolIdOld;
+    if (typeof USERPOOL_ID_OLD !== 'string') {
+        throw new factory.errors.NotFound('setting.userPoolIdOld');
+    }
+    let username = person.memberOf?.membershipNumber;
+    // ユーザープールが本家の場合とsskstの場合に対応
+    // 本家にssktsをプロバイダーとしてログインしている場合、追加特性に以下のような値のidentitiesがあるはず
+    // [{"userId":"xxxx","providerName":"SSKTS","providerType":"OIDC"}]
+    const userIdentitiesStr = person.additionalProperty?.find((p) => p.name === 'identities')?.value;
+    if (typeof userIdentitiesStr === 'string' && userIdentitiesStr.length > 0) {
+        try {
+            const identities = JSON.parse(userIdentitiesStr);
+            if (Array.isArray(identities) && identities.length > 0) {
+                const providerName = identities[0].providerName;
+                const userIdByIdentities = identities[0].userId;
+                if (providerName === SSKTS_PROVIDER_NAME) {
+                    if (typeof userIdByIdentities === 'string' && userIdByIdentities.length > 0) {
+                        const personRepo = new person_1.PersonRepo({
+                            cognitoIdentityServiceProvider,
+                            userPoolId: USERPOOL_ID_OLD
+                        });
+                        // oldUserは必ず存在するはず
+                        const oldUser = await personRepo.findById({ userId: userIdByIdentities });
+                        username = String(oldUser.memberOf?.membershipNumber);
                     }
                 }
             }
-            catch (error) {
-                // tslint:disable-next-line:no-console
-                console.error('person2username throwed', error);
-                throw error;
-            }
         }
-        return username;
-    });
+        catch (error) {
+            // tslint:disable-next-line:no-console
+            console.error('person2username throwed', error);
+            throw error;
+        }
+    }
+    return username;
 }

package/lib/chevre/service/payment/any/publishPaymentUrl/fixTransactionNumberOnPublishPaymentUrl.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fixTransactionNumberOnPublishPaymentUrl = fixTransactionNumberOnPublishPaymentUrl;
 const factory = require("../../../../factory");
@@ -16,40 +7,39 @@ const verifyTicketTokenAsNeeded_1 = require("../verifyTicketTokenAsNeeded");
  * 外部決済ロケーション発行時の取引番号を決定する
  */
 function fixTransactionNumberOnPublishPaymentUrl(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+    return async (repos) => {
         const { paymentServiceType, transaction, object } = params;
         // 取引番号生成
         let transactionNumber;
         let ticketToken;
         // support ticketToken(2024-08-21~)
-        const { verifyPaymentMethodTicketResult } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
+        const { verifyPaymentMethodTicketResult } = await (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
             project: { id: transaction.project.id },
             object,
             paymentServiceType,
             purpose: { id: transaction.id }
         })(repos);
-        if (((_a = verifyPaymentMethodTicketResult === null || verifyPaymentMethodTicketResult === void 0 ? void 0 : verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.permit.PermitType.Permit) {
-            throw new factory.errors.Argument('ticketToken', `typeOfGood.typeOf ${(_b = verifyPaymentMethodTicketResult === null || verifyPaymentMethodTicketResult === void 0 ? void 0 : verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _b === void 0 ? void 0 : _b.typeOf} discontinued`);
+        if (verifyPaymentMethodTicketResult?.invoiceByTicketToken?.typeOf === factory.permit.PermitType.Permit) {
+            throw new factory.errors.Argument('ticketToken', `typeOfGood.typeOf ${verifyPaymentMethodTicketResult?.invoiceByTicketToken?.typeOf} discontinued`);
             // const paymentMethodIdByPermit = permitOrInvoice?.identifier;
             // if (typeof paymentMethodIdByPermit === 'string') {
             //     transactionNumber = paymentMethodIdByPermit;
             // }
         }
-        else if (((_c = verifyPaymentMethodTicketResult === null || verifyPaymentMethodTicketResult === void 0 ? void 0 : verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _c === void 0 ? void 0 : _c.typeOf) === 'Invoice') {
+        else if (verifyPaymentMethodTicketResult?.invoiceByTicketToken?.typeOf === 'Invoice') {
             // support Invoice ticket(2025-11-09~)
-            if (typeof ((_d = verifyPaymentMethodTicketResult.invoiceByTicketToken) === null || _d === void 0 ? void 0 : _d.paymentMethodId) === 'string') {
+            if (typeof verifyPaymentMethodTicketResult.invoiceByTicketToken?.paymentMethodId === 'string') {
                 transactionNumber = verifyPaymentMethodTicketResult.invoiceByTicketToken.paymentMethodId;
                 ticketToken = verifyPaymentMethodTicketResult.ticketToken;
             }
         }
         if (typeof transactionNumber !== 'string') {
-            const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
+            const publishTransactionNumberResult = await repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
             transactionNumber = publishTransactionNumberResult.transactionNumber;
         }
         return {
             transactionNumber,
             ticketToken
         };
-    });
+    };
 }

package/lib/chevre/service/payment/any/verifyTicketTokenAsNeeded.js

@@ -1,21 +1,11 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifyTicketTokenAsNeeded = verifyTicketTokenAsNeeded;
 const factory = require("../../../factory");
 // tslint:disable-next-line:max-func-body-length
 function verifyTicketTokenAsNeeded(params) {
     // tslint:disable-next-line:cyclomatic-complexity
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos) => {
         const { paymentServiceType, object, project } = params;
         const { issuedThrough, ticketToken } = object;
         let verifyPaymentMethodTicketResult;
@@ -25,7 +15,7 @@ function verifyTicketTokenAsNeeded(params) {
                 case factory.service.paymentService.PaymentServiceType.CreditCard:
                 case factory.service.paymentService.PaymentServiceType.MovieTicket:
                 case factory.service.paymentService.PaymentServiceType.FaceToFace:
-                    const ticket = (yield repos.ticket.findTickets({
+                    const ticket = (await repos.ticket.findTickets({
                         limit: 1,
                         page: 1,
                         project: { id: { $eq: project.id } },
@@ -35,13 +25,13 @@ function verifyTicketTokenAsNeeded(params) {
                         throw new factory.errors.NotFound('Ticket');
                     }
                     // 承認を参照
-                    const validAuthorization = yield repos.authorization.findValidOneByCode({
+                    const validAuthorization = await repos.authorization.findValidOneByCode({
                         project: { id: params.project.id },
                         code: ticket.ticketToken
                     });
                     const authorizedObject = validAuthorization.object;
                     // audience検証
-                    if (((_a = validAuthorization.audience) === null || _a === void 0 ? void 0 : _a.typeOf) !== factory.transactionType.PlaceOrder
+                    if (validAuthorization.audience?.typeOf !== factory.transactionType.PlaceOrder
                         || validAuthorization.audience.id !== params.purpose.id) {
                         throw new factory.errors.Argument('ticketToken', 'audience not matched with placeOrder');
                     }
@@ -83,5 +73,5 @@ function verifyTicketTokenAsNeeded(params) {
             }
         }
         return { verifyPaymentMethodTicketResult };
-    });
+    };
 }