@chevre/domain 21.35.0-alpha.31 → 21.35.0-alpha.32

package/lib/chevre/factory/taskIdentifier.d.ts

@@ -0,0 +1,29 @@
+declare function createCheckMovieTicketTaskIdentifier(params: {
+    project: {
+        id: string;
+    };
+    purpose: {
+        /**
+         * placeOrder ID
+         */
+        id: string;
+    };
+    object: {
+        /**
+         * 決済サービスID
+         */
+        id: string;
+        movieTicket: {
+            /**
+             * 決済カード識別子
+             */
+            identifier: string;
+            serviceOutput: {
+                reservationFor: {
+                    id: string;
+                };
+            };
+        };
+    };
+}): string;
+export { createCheckMovieTicketTaskIdentifier };

package/lib/chevre/factory/taskIdentifier.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createCheckMovieTicketTaskIdentifier = void 0;
+const util = require("util");
+const factory = require("../factory");
+function createCheckMovieTicketTaskIdentifier(params) {
+    const { project, purpose, object } = params;
+    return util.format(`%s:%s:%s:%s:%s:%s:%s`, project.id, factory.taskName.CheckMovieTicket, factory.transactionType.PlaceOrder, purpose.id, object.id, object.movieTicket.identifier, object.movieTicket.serviceOutput.reservationFor.id);
+}
+exports.createCheckMovieTicketTaskIdentifier = createCheckMovieTicketTaskIdentifier;

package/lib/chevre/repo/task.d.ts

@@ -64,6 +64,18 @@ export declare class MongoRepository {
     saveMany(taskAttributes: factory.task.IAttributes<factory.taskName>[], options: IOptionOnCreate): Promise<{
         id: string;
     }[]>;
+    /**
+     * タスク識別子から検索する
+     */
+    findByIdentifier(params: {
+        identifier: string;
+        name: factory.taskName;
+        project: {
+            id: string;
+        };
+    }): Promise<{
+        id: string;
+    } | undefined>;
     /**
      * タスク識別子から冪等作成する
      */

package/lib/chevre/repo/task.js

@@ -192,6 +192,23 @@ class MongoRepository {
             }
         });
     }
+    /**
+     * タスク識別子から検索する
+     */
+    findByIdentifier(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.taskModel.findOne({
+                'project.id': { $eq: params.project.id },
+                name: { $eq: params.name },
+                identifier: { $exists: true, $eq: params.identifier }
+            }, { _id: 1 })
+                .exec();
+            if (doc === null) {
+                return;
+            }
+            return { id: doc.id };
+        });
+    }
     /**
      * タスク識別子から冪等作成する
      */

package/lib/chevre/service/assetTransaction/pay.d.ts

@@ -122,6 +122,12 @@ export declare function start(params: factory.assetTransaction.pay.IStartParamsW
          */
         id?: string;
     };
+    purpose: {
+        /**
+         * placeOrder ID
+         */
+        id?: string;
+    };
 }): IStartOperation<factory.assetTransaction.pay.ITransaction>;
 /**
  * 取引確定

package/lib/chevre/service/assetTransaction/pay.js

@@ -221,10 +221,10 @@ function start(params, options) {
                     : undefined))(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.MovieTicket:
-                transaction =
-                    yield processAuthorizeMovieTicket(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), options.useCheckByIdentifierIfNotYet, {
-                        executor: (typeof ((_d = options.executor) === null || _d === void 0 ? void 0 : _d.id) === 'string') ? { id: options.executor.id } : {}
-                    })(repos);
+                transaction = yield processAuthorizeMovieTicket(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), options.useCheckByIdentifierIfNotYet, {
+                    executor: (typeof ((_d = options.executor) === null || _d === void 0 ? void 0 : _d.id) === 'string') ? { id: options.executor.id } : {},
+                    purpose: options.purpose
+                })(repos);
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);

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

@@ -384,7 +384,7 @@ function authorize(params) {
                 location: params.location,
                 order: Object.assign({}, (typeof confirmationNumber === 'string') ? { confirmationNumber } : undefined)
             });
-            payTransaction = yield PayTransactionService.start(startParams, Object.assign({ useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet, executor: (typeof taskId === 'string') ? { id: taskId } : {} }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined))(repos);
+            payTransaction = yield PayTransactionService.start(startParams, Object.assign({ useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet, executor: (typeof taskId === 'string') ? { id: taskId } : {}, purpose: { id: transaction.id } }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined))(repos);
         }
         catch (error) {
             try {

package/lib/chevre/service/payment/movieTicket/authorize.d.ts

@@ -26,6 +26,12 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
          */
         id?: string;
     };
+    purpose: {
+        /**
+         * placeOrder ID
+         */
+        id?: string;
+    };
 }): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;

package/lib/chevre/service/payment/movieTicket/authorize.js

@@ -26,7 +26,7 @@ function authorize(params, transaction, paymentServiceId, useCheckByIdentifierIf
         let accountsReceivablesByServiceType = [];
         try {
             // MovieTicket決済の場合、認証
-            const validateMovieTicketResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId, useCheckByIdentifierIfNotYet)(repos);
+            const validateMovieTicketResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId, useCheckByIdentifierIfNotYet, options.purpose)(repos);
             accountsReceivablesByServiceType = validateMovieTicketResult.accountsReceivablesByServiceType;
             const paymentMethod = transaction.object.paymentMethod;
             const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.identifier);

package/lib/chevre/service/payment/movieTicket/checkMovieTicket.js

@@ -21,11 +21,11 @@ function checkMovieTicket(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f;
         // 不要な属性がリクエストに含まれているのでmovieTicketsを最適化(2024-03-15~)
-        let movieTickets = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.movieTickets;
-        if (!Array.isArray(movieTickets)) {
+        const movieTicketsBeforeOptimize = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.movieTickets;
+        if (!Array.isArray(movieTicketsBeforeOptimize)) {
             throw new factory.errors.Argument('object.movieTickets must be an array');
         }
-        movieTickets = movieTickets.map(({ accessCode, category, identifier, serviceOutput }) => {
+        const movieTickets = movieTicketsBeforeOptimize.map(({ accessCode, category, identifier, serviceOutput }) => {
             return {
                 accessCode, category, identifier,
                 serviceOutput: { reservationFor: serviceOutput.reservationFor } // 最適化(2024-03-15~)

package/lib/chevre/service/payment/movieTicket/validation.d.ts

@@ -1,15 +1,22 @@
-import * as factory from '../../../factory';
 import type { MongoRepository as ActionRepo } from '../../../repo/action';
 import type { MongoRepository as EventRepo } from '../../../repo/event';
 import type { MongoRepository as PaymentServiceRepo } from '../../../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
-export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, useCheckByIdentifierIfNotYet: boolean): (repos: {
+import type { MongoRepository as TaskRepo } from '../../../repo/task';
+import * as factory from '../../../factory';
+export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, useCheckByIdentifierIfNotYet: boolean, purpose: {
+    /**
+     * placeOrder ID
+     */
+    id?: string;
+}): (repos: {
     action: ActionRepo;
     event: EventRepo;
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
+    task: TaskRepo;
 }) => Promise<{
     accountsReceivablesByServiceType: factory.assetTransaction.pay.IAccountsReceivableByServiceType[];
 }>;

package/lib/chevre/service/payment/movieTicket/validation.js

@@ -12,9 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateMovieTicket = void 0;
 const createDebug = require("debug");
 const factory = require("../../../factory");
+const taskIdentifier_1 = require("../../../factory/taskIdentifier");
 const processPurchaseNumberAuth_1 = require("./processPurchaseNumberAuth");
 const debug = createDebug('chevre-domain:service:payment');
-function validateMovieTicket(params, paymentServiceId, useCheckByIdentifierIfNotYet) {
+function validateMovieTicket(params, paymentServiceId, useCheckByIdentifierIfNotYet, purpose) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
@@ -79,7 +80,8 @@ function validateMovieTicket(params, paymentServiceId, useCheckByIdentifierIfNot
             seller: { id: sellerId },
             screeningEvent: screeningEvent,
             paymentServiceId,
-            useCheckByIdentifierIfNotYet
+            useCheckByIdentifierIfNotYet,
+            purpose
         })(repos);
         const accountsReceivablesByServiceType = [];
         // 券種ごとに枚数が足りているか
@@ -114,7 +116,29 @@ function checkByIdentifierIfNotYet(params) {
         let checkResult;
         if (params.useCheckByIdentifierIfNotYet === true) {
             // すでにCheckActionが存在すれば認証しない(2023-06-06~)
-            const alreadyCheckedAction = (yield repos.action.search({
+            let alreadyCheckedAction;
+            // search from checkMovieTicketTask(2024-06-26~)
+            const placeOrderId = params.purpose.id;
+            if (typeof placeOrderId === 'string') {
+                const taskIdentifier = (0, taskIdentifier_1.createCheckMovieTicketTaskIdentifier)({
+                    project: { id: params.screeningEvent.project.id },
+                    purpose: { id: placeOrderId },
+                    object: {
+                        id: params.paymentServiceId,
+                        movieTicket: {
+                            identifier: params.movieTicketIdentifier,
+                            serviceOutput: { reservationFor: { id: params.screeningEvent.id } }
+                        }
+                    }
+                });
+                const existingCheckMovieTicketTask = yield repos.task.findByIdentifier({
+                    project: { id: params.screeningEvent.project.id },
+                    name: factory.taskName.CheckMovieTicket,
+                    identifier: taskIdentifier
+                });
+                debug('existingCheckMovieTicketTask:', JSON.stringify(existingCheckMovieTicketTask), 'placeOrderId:', placeOrderId);
+            }
+            alreadyCheckedAction = (yield repos.action.search({
                 limit: 1,
                 page: 1,
                 sort: { startDate: factory.sortType.Descending },

package/lib/chevre/service.d.ts

@@ -5,6 +5,7 @@ import * as AccountTransactionIdentifierFactory from './factory/accountTransacti
 import * as EventFactory from './factory/event';
 import * as OrderFactory from './factory/order';
 import * as ReservedAgentIdentifireNamesFactory from './factory/reservedAgentIdentifireNames';
+import * as TaskIdentifierFactory from './factory/taskIdentifier';
 import * as TransactionFactory from './factory/transaction';
 import type * as AccountService from './service/account';
 import type * as AccountTransactionService from './service/accountTransaction';
@@ -85,5 +86,6 @@ export declare namespace factory {
     export import event = EventFactory;
     export import order = OrderFactory;
     export import reservedAgentIdentifireNames = ReservedAgentIdentifireNamesFactory;
+    export import taskIdentifier = TaskIdentifierFactory;
     export import transaction = TransactionFactory;
 }

package/lib/chevre/service.js

@@ -17,6 +17,7 @@ const AccountTransactionIdentifierFactory = require("./factory/accountTransactio
 const EventFactory = require("./factory/event");
 const OrderFactory = require("./factory/order");
 const ReservedAgentIdentifireNamesFactory = require("./factory/reservedAgentIdentifireNames");
+const TaskIdentifierFactory = require("./factory/taskIdentifier");
 const TransactionFactory = require("./factory/transaction");
 // import all lazily(2023-10-11~)
 var account;
@@ -264,6 +265,7 @@ var factory;
     // tslint:disable-next-line:no-shadowed-variable
     factory.order = OrderFactory;
     factory.reservedAgentIdentifireNames = ReservedAgentIdentifireNamesFactory;
+    factory.taskIdentifier = TaskIdentifierFactory;
     // tslint:disable-next-line:no-shadowed-variable
     factory.transaction = TransactionFactory;
 })(factory = exports.factory || (exports.factory = {}));

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.375.0-alpha.22",
+    "@chevre/factory": "4.375.0-alpha.23",
     "@cinerino/sdk": "8.0.0-alpha.1",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.35.0-alpha.31"
+  "version": "21.35.0-alpha.32"
 }