@chevre/domain 22.6.0-alpha.33 → 22.6.0-alpha.35

package/lib/chevre/service/payment/any/verifyTicketTokenAsNeeded.d.ts

@@ -1,6 +1,7 @@
 import * as factory from '../../../factory';
 import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { TicketRepo } from '../../../repo/ticket';
+type IPermitOrInvoice = Pick<factory.ownershipInfo.IPermitAsGood, 'identifier' | 'typeOf'> | Pick<factory.invoice.IInvoice, 'paymentMethodId' | 'typeOf'>;
 declare function verifyTicketTokenAsNeeded(params: {
     project: {
         id: string;
@@ -12,6 +13,6 @@ declare function verifyTicketTokenAsNeeded(params: {
     authorization: AuthorizationRepo;
     ticket: TicketRepo;
 }) => Promise<{
-    permit: Pick<factory.ownershipInfo.IPermitAsGood, 'identifier'> | undefined;
+    permitOrInvoice?: IPermitOrInvoice | undefined;
 }>;
 export { verifyTicketTokenAsNeeded };

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

@@ -16,11 +16,12 @@ function verifyTicketTokenAsNeeded(params) {
         var _a, _b;
         const { paymentServiceType, object, project } = params;
         const { issuedThrough, ticketToken } = object;
-        let permit;
+        let permitOrInvoice;
         // メンバーシップチケットが指定された場合、メンバーシップコードへ変換する
         if (typeof ticketToken === 'string' && ticketToken !== '') {
             switch (paymentServiceType) {
                 case factory.service.paymentService.PaymentServiceType.CreditCard:
+                case factory.service.paymentService.PaymentServiceType.MovieTicket:
                 case factory.service.paymentService.PaymentServiceType.FaceToFace:
                     const ticket = (yield repos.ticket.projectFields({
                         limit: 1,
@@ -37,35 +38,43 @@ function verifyTicketTokenAsNeeded(params) {
                         code: ticket.ticketToken
                     });
                     const authorizedObject = validAuthorization.object;
-                    if (authorizedObject.typeOf !== 'OwnershipInfo') {
-                        throw new factory.errors.Argument('ticketToken', 'must be OwnershipInfo');
-                    }
                     // audience検証
                     if (((_a = validAuthorization.audience) === null || _a === void 0 ? void 0 : _a.typeOf) !== factory.transactionType.PlaceOrder
                         || validAuthorization.audience.id !== params.purpose.id) {
                         throw new factory.errors.Argument('ticketToken', 'audience not matched with placeOrder');
                     }
-                    const { typeOfGood } = authorizedObject;
-                    if (typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
-                        throw new factory.errors.Argument('ticketToken', 'must be Permit');
-                    }
-                    if (((_b = typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf) !== paymentServiceType) {
-                        throw new factory.errors.Argument('ticketToken', 'paymentServiceType not matched');
-                    }
-                    // CreditCardの場合、発行サービスIDを検証
-                    if (typeOfGood.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard) {
-                        if (typeOfGood.issuedThrough.id !== issuedThrough.id) {
-                            throw new factory.errors.Argument('ticketToken', 'issuedThrough.id not matched');
+                    if (authorizedObject.typeOf === 'OwnershipInfo') {
+                        const { typeOfGood } = authorizedObject;
+                        if (((_b = typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf) !== paymentServiceType) {
+                            throw new factory.errors.Argument('ticketToken', 'paymentServiceType not matched');
+                        }
+                        // FaceToFace以外の場合、発行サービスIDを検証
+                        if (typeOfGood.issuedThrough.typeOf !== factory.service.paymentService.PaymentServiceType.FaceToFace) {
+                            if (typeOfGood.issuedThrough.id !== issuedThrough.id) {
+                                throw new factory.errors.Argument('ticketToken', 'issuedThrough.id not matched');
+                            }
                         }
+                        if (typeOfGood.typeOf === factory.permit.PermitType.Permit) {
+                            permitOrInvoice = { identifier: typeOfGood.identifier, typeOf: factory.permit.PermitType.Permit };
+                        }
+                        else if (typeOfGood.typeOf === 'Invoice') {
+                            //  support paymentServiceType.MovieTicket(2024-11-23~)
+                            permitOrInvoice = { paymentMethodId: typeOfGood.paymentMethodId, typeOf: 'Invoice' };
+                        }
+                        else {
+                            throw new factory.errors.Argument('ticketToken', 'must be Permit or Invoice');
+                        }
+                    }
+                    else {
+                        throw new factory.errors.Argument('ticketToken', 'must be OwnershipInfo');
                     }
-                    permit = { identifier: typeOfGood.identifier };
                     break;
                 default:
                     // no op
                     throw new factory.errors.NotImplemented(`ticketToken issued through ${paymentServiceType} not implemented`);
             }
         }
-        return { permit };
+        return { permitOrInvoice };
     });
 }
 exports.verifyTicketTokenAsNeeded = verifyTicketTokenAsNeeded;

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

@@ -237,10 +237,12 @@ function publishPaymentUrl(params) {
             // 取引番号生成
             let transactionNumber;
             // support ticketToken(2024-08-21~)
-            const { permit } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({ project, object: params.object, paymentServiceType, purpose })(repos);
-            const paymentMethodIdByPermit = permit === null || permit === void 0 ? void 0 : permit.identifier;
-            if (typeof paymentMethodIdByPermit === 'string') {
-                transactionNumber = paymentMethodIdByPermit;
+            const { permitOrInvoice } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({ project, object: params.object, paymentServiceType, purpose })(repos);
+            if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === factory.permit.PermitType.Permit) {
+                const paymentMethodIdByPermit = permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.identifier;
+                if (typeof paymentMethodIdByPermit === 'string') {
+                    transactionNumber = paymentMethodIdByPermit;
+                }
             }
             if (typeof transactionNumber !== 'string') {
                 const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
@@ -324,15 +326,30 @@ function authorize(params) {
         let pendingPaymentAgencyTransaction;
         let creditCard = params.object.creditCard;
         // ticketTokenを解釈(2024-08-13~)
-        const { permit } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({ project, object: params.object, paymentServiceType, purpose })(repos);
-        const paymentMethodIdByPermit = permit === null || permit === void 0 ? void 0 : permit.identifier;
-        if (typeof paymentMethodIdByPermit === 'string') {
-            transactionNumber = paymentMethodIdByPermit; // メンバーシップ指定の場合、取引番号に適用(2024-08-13~)
+        const { permitOrInvoice } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({ project, object: params.object, paymentServiceType, purpose })(repos);
+        /**
+         * ticketTokenによって指定された決済方法ID
+         */
+        let paymentMethodIdByTicketToken;
+        if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === factory.permit.PermitType.Permit) {
+            paymentMethodIdByTicketToken = permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.identifier;
+            if (typeof paymentMethodIdByTicketToken === 'string') {
+                transactionNumber = paymentMethodIdByTicketToken; // メンバーシップ指定の場合、取引番号に適用(2024-08-13~)
+            }
+        }
+        else if ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === 'Invoice') {
+            // support paymentServiceType.MovieTicket(2024-11-23~)
+            if (typeof (permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.paymentMethodId) === 'string') {
+                paymentMethodIdByTicketToken = permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.paymentMethodId;
+                if (typeof paymentMethodIdByTicketToken === 'string') {
+                    transactionNumber = paymentMethodIdByTicketToken;
+                }
+            }
         }
         // リクエストでpaymentMethodIdを指定された場合、取引に保管されたpaymentMethodIdに一致すればそちらを適用(外部サイト決済対応)
         if (typeof params.object.paymentMethodId === 'string' && params.object.paymentMethodId.length > 0) {
-            if (typeof paymentMethodIdByPermit === 'string') {
-                if (paymentMethodIdByPermit !== params.object.paymentMethodId) {
+            if (typeof paymentMethodIdByTicketToken === 'string') {
+                if (paymentMethodIdByTicketToken !== params.object.paymentMethodId) {
                     throw new factory.errors.Argument('ticketToken', 'not matched with paymentMethodId');
                 }
             }
@@ -429,7 +446,7 @@ function authorize(params) {
                 throw error;
             }
         }
-        const result = (0, factory_1.createAuthorizeResult)(Object.assign({ payTransaction, object: authorizeObjectIncludingPaymentMethodDetails }, (permit !== undefined) ? { permit } : undefined));
+        const result = (0, factory_1.createAuthorizeResult)(Object.assign({ payTransaction, object: authorizeObjectIncludingPaymentMethodDetails }, ((permitOrInvoice === null || permitOrInvoice === void 0 ? void 0 : permitOrInvoice.typeOf) === factory.permit.PermitType.Permit) ? { permit: permitOrInvoice } : undefined));
         yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         return { id: action.id };
     });

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.389.0-alpha.20",
+    "@chevre/factory": "4.389.0-alpha.22",
     "@cinerino/sdk": "10.16.0-alpha.9",
     "@motionpicture/coa-service": "9.6.0-alpha.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -108,5 +108,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.6.0-alpha.33"
+  "version": "22.6.0-alpha.35"
 }