@chevre/domain 23.1.0-alpha.0 → 23.1.0-alpha.1

package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre/requestedProgramMembershipUsed2permit.js

@@ -16,50 +16,13 @@ const factory = require("../../../../../factory");
  */
 function requestedProgramMembershipUsed2permit(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    return (repos
-    // credentials: {
-    //     jwt: JWTCredentials;
-    // }
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
         let programMembershipUsedAsPermit;
         const { programMembershipUsed, placeOrder } = params;
         // discontinue token as fromLocation(ticketTokenへ移行するべき)(2024-12-18~)
         if (typeof programMembershipUsed === 'string') {
             throw new factory.errors.NotImplemented('programMembershipUsed as string not implemented');
-            // トークン化されたメンバーシップがリクエストされた場合、実メンバーシップ情報へ変換する
-            // const { authorizedObject } = await CodeService.verifyToken({
-            //     project: { id: params.project.id },
-            //     agent: { id: params.project.id, typeOf: factory.organizationType.Project },
-            //     token: String(programMembershipUsed)
-            // })(repos);
-            // const permitOwnershipInfo = authorizedObject;
-            // if (Array.isArray(permitOwnershipInfo)) {
-            //     throw new factory.errors.NotImplemented('programMembershipUsed as an array not implemented');
-            // }
-            // if (permitOwnershipInfo.typeOf !== 'OwnershipInfo') {
-            //     throw new factory.errors.Argument('programMembershipUsed', 'must be OwnershipInfo');
-            // }
-            // const typeOfGood = permitOwnershipInfo.typeOfGood;
-            // if (typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
-            //     throw new factory.errors.Argument('programMembershipUsed', 'must be Permit');
-            // }
-            // const issuedThroughTypeOf = typeOfGood.issuedThrough?.typeOf;
-            // if (issuedThroughTypeOf !== factory.product.ProductType.MembershipService) {
-            //     throw new factory.errors.Argument('programMembershipUsed', 'must be issued through MembershipService');
-            // }
-            // if (typeof typeOfGood.issuedThrough?.id !== 'string') {
-            //     throw new factory.errors.NotFound('itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
-            // }
-            // if (issuedThroughTypeOf === factory.product.ProductType.MembershipService) {
-            //     programMembershipUsedAsPermit = {
-            //         identifier: typeOfGood.identifier,
-            //         issuedThrough: { id: typeOfGood.issuedThrough.id, typeOf: issuedThroughTypeOf },
-            //         typeOf: factory.permit.PermitType.Permit
-            //     };
-            // } else {
-            //     throw new factory.errors.Argument('programMembershipUsed', `invalid issuedThrough.typeOf: ${issuedThroughTypeOf}`);
-            // }
         }
         else if ((programMembershipUsed === null || programMembershipUsed === void 0 ? void 0 : programMembershipUsed.typeOf) === 'Ticket') {
             const { ticketToken } = programMembershipUsed;
@@ -81,47 +44,54 @@ function requestedProgramMembershipUsed2permit(params) {
                 if (object.typeOf !== 'OwnershipInfo') {
                     throw new factory.errors.Argument('programMembershipUsed', 'invalid authorization');
                 }
-                // const ownershipInfoId = object.id;
-                // const permitOwnershipInfo = (await repos.ownershipInfo.search({
-                //     limit: 1,
-                //     page: 1,
-                //     project: { id: { $eq: params.project.id } },
-                //     ids: [ownershipInfoId],
-                //     ownedFrom: now,
-                //     ownedThrough: now
-                // })).shift();
-                // if (permitOwnershipInfo === undefined) {
-                //     throw new factory.errors.NotFound('OwnershipInfo');
-                // }
                 // audience検証
                 if ((audience === null || audience === void 0 ? void 0 : audience.typeOf) !== factory.transactionType.PlaceOrder || audience.id !== placeOrder.id) {
                     throw new factory.errors.Argument('programMembershipUsed', 'audience not matched with placeOrder');
                 }
                 const permitOwnershipInfo = object;
-                if (permitOwnershipInfo.typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
-                    throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.typeOf must be Permit');
-                }
-                const issuedThroughTypeOf = (_a = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf;
-                if (issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
-                    programMembershipUsedAsPermit = {
-                        identifier: permitOwnershipInfo.typeOfGood.identifier,
-                        issuedThrough: { typeOf: issuedThroughTypeOf },
-                        typeOf: factory.permit.PermitType.Permit
-                    };
+                const ownedGoodType = (_a = permitOwnershipInfo.typeOfGood) === null || _a === void 0 ? void 0 : _a.typeOf;
+                if (ownedGoodType === factory.permit.PermitType.Permit) {
+                    const issuedThroughTypeOf = (_b = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.typeOf;
+                    if (issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
+                        programMembershipUsedAsPermit = {
+                            identifier: permitOwnershipInfo.typeOfGood.identifier,
+                            issuedThrough: { typeOf: issuedThroughTypeOf },
+                            typeOf: factory.permit.PermitType.Permit
+                        };
+                    }
+                    else if (issuedThroughTypeOf === factory.product.ProductType.MembershipService
+                        || issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.CreditCard) {
+                        if (typeof ((_c = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _c === void 0 ? void 0 : _c.id) !== 'string') {
+                            throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.issuedThrough.id undefined');
+                        }
+                        programMembershipUsedAsPermit = {
+                            identifier: permitOwnershipInfo.typeOfGood.identifier,
+                            issuedThrough: { id: permitOwnershipInfo.typeOfGood.issuedThrough.id, typeOf: issuedThroughTypeOf },
+                            typeOf: factory.permit.PermitType.Permit
+                        };
+                    }
+                    else {
+                        throw new factory.errors.Argument('programMembershipUsed', `invalid issuedThrough.typeOf: ${issuedThroughTypeOf}`);
+                    }
                 }
-                else if (issuedThroughTypeOf === factory.product.ProductType.MembershipService
-                    || issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.CreditCard) {
-                    if (typeof ((_b = permitOwnershipInfo.typeOfGood.issuedThrough) === null || _b === void 0 ? void 0 : _b.id) !== 'string') {
-                        throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.issuedThrough.id undefined');
+                else if (ownedGoodType === factory.service.paymentService.PaymentServiceType.CreditCard) {
+                    // CreditCard決済の場合、決済方法所有権を受け入れる(2025-11-11~)
+                    const paymentServiceId = (_d = permitOwnershipInfo.typeOfGood) === null || _d === void 0 ? void 0 : _d.id;
+                    const paymentMethodId = permitOwnershipInfo.typeOfGood.serviceOutput.paymentMethodId;
+                    if (typeof paymentMethodId !== 'string' || paymentMethodId === '') {
+                        throw new factory.errors.Argument('programMembershipUsed', 'paymentServiceId required');
+                    }
+                    if (typeof paymentMethodId !== 'string' || paymentMethodId === '') {
+                        throw new factory.errors.Argument('programMembershipUsed', 'paymentMethodId required');
                     }
                     programMembershipUsedAsPermit = {
-                        identifier: permitOwnershipInfo.typeOfGood.identifier,
-                        issuedThrough: { id: permitOwnershipInfo.typeOfGood.issuedThrough.id, typeOf: issuedThroughTypeOf },
+                        identifier: paymentMethodId,
+                        issuedThrough: { id: paymentServiceId, typeOf: ownedGoodType },
                         typeOf: factory.permit.PermitType.Permit
                     };
                 }
                 else {
-                    throw new factory.errors.Argument('programMembershipUsed', `invalid issuedThrough.typeOf: ${issuedThroughTypeOf}`);
+                    throw new factory.errors.Argument('programMembershipUsed', 'ownershipInfo.typeOfGood.typeOf must be Permit');
                 }
             }
         }

package/lib/chevre/service/payment/any/authorize/fixTransactionNumber.d.ts

@@ -5,7 +5,6 @@ import type { TicketRepo } from '../../../../repo/ticket';
 import type { ITransactionInProgress, TransactionRepo } from '../../../../repo/transaction';
 import type { TransactionNumberRepo } from '../../../../repo/transactionNumber';
 import * as PayTransactionService from '../../../assetTransaction/pay';
-import { IPermitOrInvoice } from '../verifyTicketTokenAsNeeded';
 interface IFixTransactionNumberRepos {
     action: ActionRepo;
     authorization: AuthorizationRepo;
@@ -28,7 +27,7 @@ declare function fixTransactionNumber(params: {
     transactionNumber: string;
     pendingPaymentAgencyTransaction?: PayTransactionService.IPaymentAgencyTransaction;
     creditCard?: factory.action.authorize.paymentMethod.any.ICreditCard;
-    permitOrInvoice?: IPermitOrInvoice;
+    permitOrInvoice?: never;
     id?: never;
 } | {
     /**

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

@@ -81,6 +81,8 @@ function fixTransactionNumber(params) {
             const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
             transactionNumber = publishTransactionNumberResult.transactionNumber;
         }
-        return Object.assign(Object.assign(Object.assign({ transactionNumber }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined), (creditCard !== undefined) ? { creditCard } : undefined), (permitOrInvoice !== undefined) ? { permitOrInvoice } : undefined);
+        return Object.assign(Object.assign({ transactionNumber }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined), (creditCard !== undefined) ? { creditCard } : undefined
+        // ...(permitOrInvoice !== undefined) ? { permitOrInvoice } : undefined
+        );
     });
 }

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

@@ -34,7 +34,6 @@ export declare function createMovieTicket(params: factory.action.trade.pay.IMovi
 export declare function createAuthorizeResult(params: {
     object: factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails;
     payTransaction: Pick<factory.assetTransaction.pay.ITransaction, 'object'>;
-    permit?: Pick<factory.ownershipInfo.IPermitAsGood, 'identifier'>;
 }): factory.action.authorize.paymentMethod.any.IResult;
 /**
  * 通知対象としてのアクションを最適化

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

@@ -45,24 +45,40 @@ function verifyTicketTokenAsNeeded(params) {
                     }
                     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');
+                        if (typeOfGood.typeOf === factory.permit.PermitType.Permit || typeOfGood.typeOf === 'Invoice') {
+                            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');
+                            }
                         }
-                        // FaceToFace以外の場合、発行サービスIDを検証
-                        if (typeOfGood.issuedThrough.typeOf !== factory.service.paymentService.PaymentServiceType.FaceToFace) {
-                            if (typeOfGood.issuedThrough.id !== issuedThrough.id) {
+                        else if (typeOfGood.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
+                            || typeOfGood.typeOf === factory.service.paymentService.PaymentServiceType.MovieTicket) {
+                            // 決済方法所有権を受け入れる(2025-11-11~)
+                            if (typeOfGood.typeOf !== paymentServiceType) {
+                                throw new factory.errors.Argument('ticketToken', 'paymentServiceType not matched');
+                            }
+                            if (typeOfGood.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' };
+                            permitOrInvoice = { paymentMethodId: typeOfGood.serviceOutput.paymentMethodId, typeOf: 'Invoice' };
                         }
                         else {
-                            throw new factory.errors.Argument('ticketToken', 'must be Permit or Invoice');
+                            throw new factory.errors.Argument('ticketToken', `invalid typeOfGood.typeOf ${typeOfGood.typeOf}`);
                         }
                     }
                     else {

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

@@ -439,7 +439,7 @@ function authorize(params) {
         if (typeof fixTransactionNumberResult.id === 'string') {
             return { id: fixTransactionNumberResult.id };
         }
-        const { transactionNumber, pendingPaymentAgencyTransaction, creditCard, permitOrInvoice } = fixTransactionNumberResult;
+        const { transactionNumber, pendingPaymentAgencyTransaction, creditCard } = fixTransactionNumberResult;
         // let transactionNumber: string | undefined;
         // let pendingPaymentAgencyTransaction: PayTransactionService.IPaymentAgencyTransaction | undefined;
         // let creditCard: factory.action.authorize.paymentMethod.any.ICreditCard | undefined = params.object.creditCard;
@@ -568,7 +568,11 @@ function authorize(params) {
                 throw error;
             }
         }
-        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));
+        const result = (0, factory_1.createAuthorizeResult)({
+            payTransaction,
+            object: authorizeObjectIncludingPaymentMethodDetails
+            // ...(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,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "5.2.0-alpha.5",
-    "@cinerino/sdk": "12.7.0-alpha.1",
+    "@chevre/factory": "5.2.0-alpha.6",
+    "@cinerino/sdk": "12.7.0-alpha.3",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
     "@sendgrid/client": "8.1.4",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.1.0-alpha.0"
+  "version": "23.1.0-alpha.1"
 }