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

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

@@ -114,7 +114,6 @@ export import IPaymentAgencyTransaction = CreditCardPayment.IPaymentAgencyTransa
  * 取引開始
  */
 export declare function start(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, options: {
-    useCheckByIdentifierIfNotYet: boolean;
     pendingPaymentAgencyTransaction?: CreditCardPayment.IPaymentAgencyTransaction;
     /**
      * 実行者
@@ -132,6 +131,9 @@ export declare function start(params: factory.assetTransaction.pay.IStartParamsW
          */
         id?: string;
     };
+    checkedAction: {
+        id: string;
+    };
 }): IStartOperation<factory.assetTransaction.pay.ITransaction>;
 /**
  * 取引確定

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

@@ -221,9 +221,12 @@ function start(params, options) {
                     : undefined))(repos, settings);
                 break;
             case factory.service.paymentService.PaymentServiceType.MovieTicket:
-                transaction = yield processAuthorizeMovieTicket(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), options.useCheckByIdentifierIfNotYet, {
+                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
+                    purpose: options.purpose,
+                    checkedAction: options.checkedAction
                 })(repos, settings);
                 break;
             default:
@@ -400,9 +403,11 @@ function processAuthorizeCreditCard(params, transaction, paymentServiceId, optio
         // })(repos);
     });
 }
-function processAuthorizeMovieTicket(params, transaction, paymentServiceId, useCheckByIdentifierIfNotYet, options) {
+function processAuthorizeMovieTicket(params, transaction, paymentServiceId, 
+// useCheckByIdentifierIfNotYet: boolean,
+options) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        const { accountsReceivablesByServiceType } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, useCheckByIdentifierIfNotYet, options)(repos, settings);
+        const { accountsReceivablesByServiceType } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, options)(repos, settings);
         // const payActionInObject: factory.assetTransaction.pay.IPayActionInObject = {
         //     actionStatus: payAction.actionStatus,
         //     id: payAction.id,

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

@@ -149,8 +149,10 @@ declare function authorize(params: {
          * アクション失敗時に即時に決済取引を中止するかどうか
          */
         useCancelPayTransactionOnFailed: boolean;
-        useCheckByIdentifierIfNotYet: boolean;
         useUnlockTransactionProcess: boolean;
+        checkedAction: {
+            id: string;
+        };
     };
     sameAs?: {
         /**

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

@@ -412,7 +412,9 @@ 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 } : {}, purpose: { id: transaction.id } }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined))(repos, settings);
+            payTransaction = yield PayTransactionService.start(startParams, Object.assign({ 
+                // useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet,
+                executor: (typeof taskId === 'string') ? { id: taskId } : {}, purpose: { id: transaction.id }, checkedAction: params.options.checkedAction }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined))(repos, settings);
         }
         catch (error) {
             try {

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

@@ -16,7 +16,7 @@ interface IAuthorizeResult {
  * 決済カード承認
  * オーソリサービスが存在するわけではないので、実質着券する
  */
-declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, transaction: factory.assetTransaction.pay.ITransaction, paymentServiceId: string, useCheckByIdentifierIfNotYet: boolean, options: {
+declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, transaction: factory.assetTransaction.pay.ITransaction, paymentServiceId: string, options: {
     /**
      * 実行者
      */
@@ -33,6 +33,9 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
          */
         id?: string;
     };
+    checkedAction: {
+        id: string;
+    };
 }): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;

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

@@ -18,7 +18,9 @@ const validation_1 = require("./validation");
  * 決済カード承認
  * オーソリサービスが存在するわけではないので、実質着券する
  */
-function authorize(params, transaction, paymentServiceId, useCheckByIdentifierIfNotYet, options) {
+function authorize(params, transaction, paymentServiceId, 
+// useCheckByIdentifierIfNotYet: boolean,
+options) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         let accountId;
@@ -26,7 +28,7 @@ function authorize(params, transaction, paymentServiceId, useCheckByIdentifierIf
         let accountsReceivablesByServiceType = [];
         try {
             // MovieTicket決済の場合、認証
-            const validateMovieTicketResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId, useCheckByIdentifierIfNotYet, options.purpose)(repos, settings);
+            const validateMovieTicketResult = yield (0, validation_1.validateMovieTicket)(params, paymentServiceId, options.checkedAction, options.purpose)(repos, settings);
             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/validation.d.ts

@@ -7,7 +7,9 @@ import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccep
 import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
-export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, useCheckByIdentifierIfNotYet: boolean, purpose: {
+export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, checkedAction: {
+    id: string;
+}, purpose: {
     /**
      * placeOrder ID
      */

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

@@ -15,7 +15,9 @@ 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, purpose) {
+function validateMovieTicket(params, paymentServiceId, 
+// useCheckByIdentifierIfNotYet: boolean,
+checkedAction, purpose) {
     // tslint:disable-next-line:max-func-body-length
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
@@ -81,7 +83,8 @@ function validateMovieTicket(params, paymentServiceId, useCheckByIdentifierIfNot
             seller: { id: sellerId },
             screeningEvent: screeningEvent,
             paymentServiceId,
-            useCheckByIdentifierIfNotYet,
+            // useCheckByIdentifierIfNotYet,
+            checkedAction,
             purpose
         })(repos, settings);
         const accountsReceivablesByServiceType = [];
@@ -113,34 +116,40 @@ function validateMovieTicket(params, paymentServiceId, useCheckByIdentifierIfNot
 exports.validateMovieTicket = validateMovieTicket;
 function checkByIdentifierIfNotYet(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         let checkResult;
-        if (params.useCheckByIdentifierIfNotYet === true) {
-            // すでにCheckActionが存在すれば認証しない(2023-06-06~)
-            let alreadyCheckedAction;
-            // search from checkMovieTicketTask(2024-06-26~)
-            const placeOrderId = params.purpose.id;
-            if (typeof placeOrderId === 'string') {
-                if (settings.useExperimentalFeature) {
-                    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 } }
-                            }
+        let alreadyCheckedAction; // すでにCheckActionが存在すれば認証しない(2023-06-06~)
+        // search from checkMovieTicketTask(2024-06-26~)
+        const placeOrderId = params.purpose.id;
+        if (typeof placeOrderId === 'string') {
+            if (settings.useExperimentalFeature) {
+                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);
-                }
+                    }
+                });
+                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);
             }
+        }
+        const specifiedCheckedActionId = (_a = params.checkedAction) === null || _a === void 0 ? void 0 : _a.id;
+        if (typeof specifiedCheckedActionId === 'string' && specifiedCheckedActionId !== '') {
+            alreadyCheckedAction = (yield repos.action.search(Object.assign({ limit: 1, page: 1, id: { $in: [specifiedCheckedActionId] }, actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] } }, (typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined), ['id'])).shift();
+            if (alreadyCheckedAction === undefined) {
+                throw new factory.errors.NotFound(factory.actionType.CheckAction);
+            }
+        }
+        else {
             alreadyCheckedAction = (yield repos.action.search(Object.assign({ limit: 1, page: 1, sort: { startDate: factory.sortType.Descending }, typeOf: { $eq: factory.actionType.CheckAction }, actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] }, object: {
                     typeOf: { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket },
                     id: { $eq: params.paymentServiceId },
@@ -152,20 +161,18 @@ function checkByIdentifierIfNotYet(params) {
                     }
                 } }, (typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined), ['id'])).shift();
             debug('alreadyCheckedAction:', JSON.stringify(alreadyCheckedAction), 'placeOrderId:', placeOrderId);
-            if (alreadyCheckedAction !== undefined) {
-                const recipe = yield repos.action.findRecipeByAction({
-                    project: { id: params.screeningEvent.project.id },
-                    recipeFor: { id: alreadyCheckedAction.id }
-                });
-                const directionPurchaseNumberAuth = (_b = (_a = recipe === null || recipe === void 0 ? void 0 : recipe.step[0]) === null || _a === void 0 ? void 0 : _a.itemListElement[0]) === null || _b === void 0 ? void 0 : _b.itemListElement[0];
-                if (directionPurchaseNumberAuth !== undefined) {
-                    debug('alreadyCheckedAction.directionPurchaseNumberAuth found', directionPurchaseNumberAuth.typeOf, 'movieTicketIdentifier:', params.movieTicketIdentifier, 'screeningEvent.id:', params.screeningEvent.id);
-                    const { beforeMedia, afterMedia } = directionPurchaseNumberAuth;
-                    if (beforeMedia !== undefined && afterMedia !== undefined) {
-                        checkResult = { purchaseNumberAuthIn: beforeMedia, purchaseNumberAuthResult: afterMedia };
-                    }
+        }
+        if (alreadyCheckedAction !== undefined) {
+            const recipe = yield repos.action.findRecipeByAction({
+                project: { id: params.screeningEvent.project.id },
+                recipeFor: { id: alreadyCheckedAction.id }
+            });
+            const directionPurchaseNumberAuth = (_c = (_b = recipe === null || recipe === void 0 ? void 0 : recipe.step[0]) === null || _b === void 0 ? void 0 : _b.itemListElement[0]) === null || _c === void 0 ? void 0 : _c.itemListElement[0];
+            if (directionPurchaseNumberAuth !== undefined) {
+                const { beforeMedia, afterMedia } = directionPurchaseNumberAuth;
+                if (beforeMedia !== undefined && afterMedia !== undefined) {
+                    checkResult = { purchaseNumberAuthIn: beforeMedia, purchaseNumberAuthResult: afterMedia };
                 }
-                // checkResult = alreadyCheckedAction.shift()?.result;
             }
         }
         if (checkResult === undefined) {

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": "4.389.0-alpha.22",
-    "@cinerino/sdk": "10.16.0-alpha.9",
+    "@chevre/factory": "4.389.0",
+    "@cinerino/sdk": "10.17.0",
     "@motionpicture/coa-service": "9.6.0-alpha.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.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.35"
+  "version": "22.6.0-alpha.37"
 }