@chevre/domain 21.33.0-alpha.20 → 21.33.0-alpha.21

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

@@ -21,6 +21,7 @@ import { IAcceptedOfferMovieTicketUsed } from './pay/potentialActions';
 export interface IStartOperationRepos {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
+    actionRecipe: ActionRecipeRepo;
     event: EventRepo;
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;

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

@@ -10,7 +10,7 @@ declare function handlePrePublishedPaymentMethodIdOnAuthorizing(params: {
     transaction: Pick<ITransactionInProgress<factory.transactionType.PlaceOrder>, 'agent' | 'expires' | 'id' | 'typeOf' | 'project' | 'seller'>;
 }): (repos: {
     action: ActionRepo;
-    actionRecipe?: ActionRecipeRepo;
+    actionRecipe: ActionRecipeRepo;
     transaction: TransactionRepo;
 }) => Promise<{
     authorizeParams?: {

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

@@ -49,7 +49,6 @@ function recipe2paymentAgencyTransaction(actionRecipe) {
 }
 function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
         let pendingPaymentAgencyTransaction;
         let existingCompletedAuthorizeAction;
         // transaction.objectへのアクセス回避(2024-05-30~)
@@ -74,10 +73,10 @@ function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
             }
             debug('acceptPayAction found:', acceptPayAction.id);
             // find recipe(2024-06-02~)
-            const actionRecipe = yield ((_a = repos.actionRecipe) === null || _a === void 0 ? void 0 : _a.findByAction({
+            const actionRecipe = yield repos.actionRecipe.findByAction({
                 project: { id: params.transaction.project.id },
                 recipeFor: { id: acceptPayAction.id }
-            }));
+            });
             debug('actionRecipe found:', actionRecipe === null || actionRecipe === void 0 ? void 0 : actionRecipe.recipeCategory);
             // 検証強化(2024-01-04~)
             validatePaymentMethodByTransaction({

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

@@ -0,0 +1,19 @@
+import * as GMO from '@motionpicture/gmo-service';
+import * as factory from '../../../factory';
+interface IProcessAlterTranResult {
+    searchTradeArgs: GMO.factory.credit.ISearchTradeArgs & GMO.factory.credit.IOptionalSiteArgs;
+    searchTradeResult: GMO.factory.credit.ISearchTradeResult;
+    alterTranArgs?: GMO.factory.credit.IAlterTranArgs & GMO.factory.credit.IOptionalSiteArgs;
+    alterTranResult: GMO.factory.credit.IAlterTranResult;
+}
+declare function processAlterTranResult2recipe(params: {
+    processAlterTranResults: IProcessAlterTranResult[];
+    project: {
+        id: string;
+    };
+    action: {
+        id: string;
+        typeOf: factory.actionType;
+    };
+}): factory.action.trade.pay.IPayCreditCardRecipe;
+export { IProcessAlterTranResult, processAlterTranResult2recipe };

package/lib/chevre/service/payment/creditCard/factory.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processAlterTranResult2recipe = void 0;
+const factory = require("../../../factory");
+function processAlterTranResult2recipe(params) {
+    const { processAlterTranResults, project, action } = params;
+    return {
+        project: { id: project.id, typeOf: factory.organizationType.Project },
+        typeOf: 'Recipe',
+        recipeCategory: factory.recipe.RecipeCategory.payCreditCard,
+        recipeFor: { id: action.id, typeOf: action.typeOf },
+        step: processAlterTranResults.map(({ searchTradeArgs, searchTradeResult, alterTranArgs, alterTranResult }) => {
+            return {
+                typeOf: 'HowToSection',
+                itemListElement: [
+                    {
+                        typeOf: 'HowToStep',
+                        identifier: factory.recipe.StepIdentifier.searchTrade,
+                        itemListElement: [{
+                                typeOf: 'HowToDirection',
+                                beforeMedia: searchTradeArgs,
+                                afterMedia: searchTradeResult
+                                // text: 'entryTran'
+                            }]
+                    },
+                    {
+                        typeOf: 'HowToStep',
+                        identifier: factory.recipe.StepIdentifier.alterTran,
+                        itemListElement: [Object.assign({ typeOf: 'HowToDirection', afterMedia: alterTranResult }, (alterTranArgs !== undefined) ? { beforeMedia: alterTranArgs } : undefined
+                            // text: 'execTran'
+                            )]
+                    }
+                ]
+            };
+        })
+    };
+}
+exports.processAlterTranResult2recipe = processAlterTranResult2recipe;

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

@@ -58,7 +58,7 @@ declare function voidTransaction(params: factory.task.voidPayment.IData): (repos
  */
 declare function payCreditCard(params: factory.task.pay.IPayActionData): (repos: {
     action: ActionRepo;
-    actionRecipe?: ActionRecipeRepo;
+    actionRecipe: ActionRecipeRepo;
     accountingReport: AccountingReportRepo;
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;

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

@@ -21,6 +21,7 @@ const factory = require("../../factory");
 const settings_1 = require("../../settings");
 const onPaid_1 = require("./any/onPaid");
 const onRefund_1 = require("./any/onRefund");
+const factory_1 = require("./creditCard/factory");
 const debug = createDebug('chevre-domain:service:payment');
 /**
  * クレジットカード決済承認
@@ -301,7 +302,7 @@ exports.voidTransaction = voidTransaction;
  */
 function payCreditCard(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         const payObject = params.object;
         // CreditCard系統の決済方法タイプは動的
         const paymentMethodType = payObject[0].paymentMethod.typeOf;
@@ -337,11 +338,11 @@ function payCreditCard(params) {
             })));
             // add recipe(2024-06-03~)
             if (settings_1.USE_EXPERIMENTAL_FEATURE) {
-                yield ((_b = repos.actionRecipe) === null || _b === void 0 ? void 0 : _b.saveOne(processAlterTranResult2recipe({
+                yield repos.actionRecipe.saveOne((0, factory_1.processAlterTranResult2recipe)({
                     processAlterTranResults,
                     project: { id: params.project.id },
                     action: { id: action.id, typeOf: action.typeOf }
-                })));
+                }));
             }
         }
         catch (error) {
@@ -437,42 +438,6 @@ function processAlterTran(params) {
         return { searchTradeArgs, searchTradeResult, alterTranArgs, alterTranResult };
     });
 }
-function processAlterTranResult2recipe(params) {
-    const { processAlterTranResults, project, action } = params;
-    return {
-        project: { id: project.id, typeOf: factory.organizationType.Project },
-        typeOf: 'Recipe',
-        recipeCategory: 'payCreditCard',
-        recipeFor: { id: action.id, typeOf: action.typeOf },
-        step: processAlterTranResults.map(({ searchTradeArgs, searchTradeResult, alterTranArgs, alterTranResult }) => {
-            return {
-                typeOf: 'HowToSection',
-                itemListElement: [
-                    {
-                        typeOf: 'HowToStep',
-                        identifier: 'searchTrade',
-                        itemListElement: [{
-                                typeOf: 'HowToDirection',
-                                beforeMedia: searchTradeArgs,
-                                afterMedia: searchTradeResult
-                                // text: 'entryTran'
-                            }]
-                    },
-                    {
-                        typeOf: 'HowToStep',
-                        identifier: 'alterTran',
-                        itemListElement: [{
-                                typeOf: 'HowToDirection',
-                                beforeMedia: alterTranArgs,
-                                afterMedia: alterTranResult
-                                // text: 'execTran'
-                            }]
-                    }
-                ]
-            };
-        })
-    };
-}
 /**
  * クレジットカード返金
  */

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

@@ -1,7 +1,7 @@
 import * as surfrock from '@surfrock/sdk';
 import * as factory from '../../../factory';
 import { IMinimizedIndividualEvent } from '../../../factory/event';
-export declare function createSeatInfoSyncIn(params: {
+declare function createSeatInfoSyncIn(params: {
     paymentMethodType: string;
     paymentMethodId: string;
     movieTickets: factory.action.trade.pay.IMovieTicket[];
@@ -12,3 +12,19 @@ export declare function createSeatInfoSyncIn(params: {
         stCd: string;
     };
 }): surfrock.factory.service.seat.seatInfoSync.ISeatInfoSyncIn;
+declare function createStartingPayAction(params: factory.task.pay.IPayActionData, seatInfoSyncIn: surfrock.factory.service.seat.seatInfoSync.ISeatInfoSyncIn): factory.action.trade.pay.IAttributes;
+interface IProcessSeatInfoSyncResult {
+    seatInfoSyncIn: factory.action.trade.pay.ISeatInfoSyncIn;
+    seatInfoSyncResult: factory.action.trade.pay.ISeatInfoSyncResult;
+}
+declare function processSeatInfoSyncResult2recipe(params: {
+    processSeatInfoSyncResult: IProcessSeatInfoSyncResult;
+    project: {
+        id: string;
+    };
+    action: {
+        id: string;
+        typeOf: factory.actionType;
+    };
+}): factory.action.trade.pay.IPayMovieTicketRecipe;
+export { createSeatInfoSyncIn, createStartingPayAction, processSeatInfoSyncResult2recipe };

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSeatInfoSyncIn = void 0;
+exports.processSeatInfoSyncResult2recipe = exports.createStartingPayAction = exports.createSeatInfoSyncIn = void 0;
 const surfrock = require("@surfrock/sdk");
 const moment = require("moment-timezone");
 const factory = require("../../../factory");
@@ -73,3 +73,47 @@ function createSeatInfoSyncIn(params) {
     };
 }
 exports.createSeatInfoSyncIn = createSeatInfoSyncIn;
+function createStartingPayAction(params, seatInfoSyncIn) {
+    const instrument = {
+        typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
+        seatInfoSyncIn
+    };
+    return Object.assign(Object.assign({}, params), { object: params.object.map((o) => {
+            const movieTicketsWithMaskedAccessCode = (Array.isArray(o.movieTickets))
+                ? o.movieTickets.map((movieTicket) => {
+                    return Object.assign(Object.assign({}, movieTicket), { accessCode: '****' // accessCodeを隠蔽(2023-02-08~)
+                     });
+                })
+                : [];
+            return Object.assign(Object.assign({}, o), { movieTickets: movieTicketsWithMaskedAccessCode });
+        }), 
+        // アクション開始前にseatInfoSyncInを生成してアクションに保管する
+        instrument });
+}
+exports.createStartingPayAction = createStartingPayAction;
+function processSeatInfoSyncResult2recipe(params) {
+    const { processSeatInfoSyncResult, project, action } = params;
+    const { seatInfoSyncIn, seatInfoSyncResult } = processSeatInfoSyncResult;
+    return {
+        project: { id: project.id, typeOf: factory.organizationType.Project },
+        typeOf: 'Recipe',
+        recipeCategory: factory.recipe.RecipeCategory.payMovieTicket,
+        recipeFor: { id: action.id, typeOf: action.typeOf },
+        step: [{
+                typeOf: 'HowToSection',
+                itemListElement: [
+                    {
+                        typeOf: 'HowToStep',
+                        identifier: factory.recipe.StepIdentifier.seatInfoSync,
+                        itemListElement: [{
+                                typeOf: 'HowToDirection',
+                                beforeMedia: seatInfoSyncIn,
+                                afterMedia: seatInfoSyncResult
+                                // text: 'entryTran'
+                            }]
+                    }
+                ]
+            }]
+    };
+}
+exports.processSeatInfoSyncResult2recipe = processSeatInfoSyncResult2recipe;

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

@@ -1,5 +1,6 @@
 import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
+import type { ActionRecipeRepo } from '../../repo/actionRecipe';
 import type { MongoRepository as EventRepo } from '../../repo/event';
 import type { MongoRepository as PaymentServiceRepo } from '../../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
@@ -17,6 +18,7 @@ interface ICheckOperationRepos {
 type ICheckOperation<T> = (repos: ICheckOperationRepos) => Promise<T>;
 interface IPayOperationRepos {
     action: ActionRepo;
+    actionRecipe: ActionRecipeRepo;
     accountingReport: AccountingReportRepo;
     event: EventRepo;
     paymentAccepted: PaymentAcceptedRepo;
@@ -49,6 +51,7 @@ interface IAuthorizeResult {
  */
 declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, transaction: factory.assetTransaction.pay.ITransaction, paymentServiceId: string, useCheckMovieTicketBeforePay: boolean, useCheckByIdentifierIfNotYet: boolean): (repos: {
     action: ActionRepo;
+    actionRecipe: ActionRecipeRepo;
     accountingReport: AccountingReportRepo;
     event: EventRepo;
     paymentAccepted: PaymentAcceptedRepo;

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

@@ -17,6 +17,7 @@ const surfrock = require("@surfrock/sdk");
 const http_status_1 = require("http-status");
 const credentials_1 = require("../../credentials");
 const factory = require("../../factory");
+const settings_1 = require("../../settings");
 const checkByIdentifier_1 = require("./movieTicket/checkByIdentifier");
 const factory_1 = require("./movieTicket/factory");
 const getCredentials_1 = require("./movieTicket/getCredentials");
@@ -244,22 +245,7 @@ function payMovieTicket(params) {
         const paymentMethodId = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.paymentMethod.paymentMethodId;
         const paymentServiceId = (_b = params.object[0]) === null || _b === void 0 ? void 0 : _b.id;
         const seatInfoSyncIn = yield payActionParams2seatInfoSyncIn(params)(repos);
-        const instrument = {
-            typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
-            seatInfoSyncIn
-        };
-        const startingAction = Object.assign(Object.assign({}, params), { object: params.object.map((o) => {
-                const movieTicketsWithMaskedAccessCode = (Array.isArray(o.movieTickets))
-                    ? o.movieTickets.map((movieTicket) => {
-                        return Object.assign(Object.assign({}, movieTicket), { accessCode: '****' // accessCodeを隠蔽(2023-02-08~)
-                         });
-                    })
-                    : [];
-                return Object.assign(Object.assign({}, o), { movieTickets: movieTicketsWithMaskedAccessCode });
-            }), 
-            // アクション開始前にseatInfoSyncInを生成してアクションに保管する
-            instrument });
-        // アクション開始
+        const startingAction = (0, factory_1.createStartingPayAction)(params, seatInfoSyncIn);
         let action = yield repos.action.start(startingAction);
         let seatInfoSyncResult;
         try {
@@ -267,9 +253,9 @@ function payMovieTicket(params) {
             // その他のアクションとしての振る舞いは実行される必要もある
             const completedPayAction = yield repos.action.findPayAction({ project: { id: params.project.id }, paymentMethodId });
             // すでに決済済であれば、何もしない(決済開始時の着券)
-            if (completedPayAction !== undefined) {
-                seatInfoSyncResult = (_c = completedPayAction.result) === null || _c === void 0 ? void 0 : _c.seatInfoSyncResult;
-                // return payAction;
+            const seatInfoSyncResultFromCompletedAction = (_c = completedPayAction === null || completedPayAction === void 0 ? void 0 : completedPayAction.result) === null || _c === void 0 ? void 0 : _c.seatInfoSyncResult;
+            if (seatInfoSyncResultFromCompletedAction !== undefined) {
+                seatInfoSyncResult = seatInfoSyncResultFromCompletedAction;
             }
             else {
                 const availableChannel = yield repos.paymentService.findAvailableChannel({
@@ -287,6 +273,14 @@ function payMovieTicket(params) {
                 const movieTicketSeatService = new surfrock.service.seat.SeatService({ endpoint: String(availableChannel.serviceUrl), auth: mvtkReserveAuthClient }, { timeout: credentials_1.credentials.movieticketReserve.timeout });
                 seatInfoSyncResult = yield movieTicketSeatService.seatInfoSync(seatInfoSyncIn);
             }
+            // add recipe(2024-06-03~)
+            if (settings_1.USE_EXPERIMENTAL_FEATURE) {
+                yield repos.actionRecipe.saveOne((0, factory_1.processSeatInfoSyncResult2recipe)({
+                    processSeatInfoSyncResult: { seatInfoSyncIn, seatInfoSyncResult },
+                    project: { id: params.project.id },
+                    action: { id: action.id, typeOf: action.typeOf }
+                }));
+            }
         }
         catch (error) {
             let throwsError = true;
@@ -306,12 +300,11 @@ function payMovieTicket(params) {
                 catch (__) {
                     // 失敗したら仕方ない
                 }
-                // error = handleMvtkReserveError(error);
                 throw errors;
             }
         }
-        const actionResult = { seatInfoSyncResult };
-        action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult }));
+        const result = { seatInfoSyncResult };
+        action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result }));
         yield (0, onPaid_1.onPaid)(action)(repos);
         return action;
     });

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

@@ -22,7 +22,7 @@ import * as factory from '../factory';
 export declare function pay(params: factory.task.pay.IData): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
-    actionRecipe?: ActionRecipeRepo;
+    actionRecipe: ActionRecipeRepo;
     accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;
     event: EventRepo;

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.374.0-alpha.0",
-    "@cinerino/sdk": "7.0.0-alpha.12",
+    "@chevre/factory": "4.374.0-alpha.1",
+    "@cinerino/sdk": "7.0.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.33.0-alpha.20"
+  "version": "21.33.0-alpha.21"
 }