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

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

@@ -5,6 +5,7 @@ import * as GMO from '@motionpicture/gmo-service';
 import * as factory from '../../factory';
 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 PaymentServiceRepo } from '../../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../repo/sellerPaymentAccepted';
@@ -57,6 +58,7 @@ declare function voidTransaction(params: factory.task.voidPayment.IData): (repos
  */
 declare function payCreditCard(params: factory.task.pay.IPayActionData): (repos: {
     action: ActionRepo;
+    actionRecipe?: ActionRecipeRepo;
     accountingReport: AccountingReportRepo;
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;

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

@@ -18,6 +18,7 @@ const createDebug = require("debug");
 const http_status_1 = require("http-status");
 const credentials_1 = require("../../credentials");
 const factory = require("../../factory");
+const settings_1 = require("../../settings");
 const onPaid_1 = require("./any/onPaid");
 const onRefund_1 = require("./any/onRefund");
 const debug = createDebug('chevre-domain:service:payment');
@@ -300,7 +301,7 @@ exports.voidTransaction = voidTransaction;
  */
 function payCreditCard(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const payObject = params.object;
         // CreditCard系統の決済方法タイプは動的
         const paymentMethodType = payObject[0].paymentMethod.typeOf;
@@ -326,9 +327,22 @@ function payCreditCard(params) {
                 endpoint: String(availableChannel.serviceUrl),
                 useFetch: credentials_1.credentials.gmo.useFetch
             }, { timeout: credentials_1.credentials.gmo.timeout });
+            const processAlterTranResults = [];
             yield Promise.all(payObject.map((paymentMethod) => __awaiter(this, void 0, void 0, function* () {
-                alterTranResults.push(...yield processAlterTran({ shopId, shopPass, availableChannel, paymentMethod })({ creditCardService }));
+                const processAlterTranResult = yield processAlterTran({
+                    shopId, shopPass, availableChannel, paymentMethod
+                })({ creditCardService });
+                alterTranResults.push(processAlterTranResult.alterTranResult);
+                processAlterTranResults.push(processAlterTranResult);
             })));
+            // add recipe(2024-06-03~)
+            if (settings_1.USE_EXPERIMENTAL_FEATURE) {
+                yield ((_b = repos.actionRecipe) === null || _b === void 0 ? void 0 : _b.saveOne(processAlterTranResult2recipe({
+                    processAlterTranResults,
+                    project: { id: params.project.id },
+                    action: { id: action.id, typeOf: action.typeOf }
+                })));
+            }
         }
         catch (error) {
             try {
@@ -352,17 +366,19 @@ exports.payCreditCard = payCreditCard;
 function processAlterTran(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
-        const alterTranResults = [];
+        let alterTranArgs;
+        let alterTranResult;
         const paymentMethod = params.paymentMethod;
         const orderId = paymentMethod.paymentMethod.paymentMethodId;
         // 取引状態参照
-        const searchTradeResult = yield repos.creditCardService.searchTrade({
+        const searchTradeArgs = {
             shopId: params.shopId,
             shopPass: params.shopPass,
             orderId: orderId,
             siteId: (_a = params.availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.siteId,
             sitePass: (_b = params.availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.sitePass
-        });
+        };
+        const searchTradeResult = yield repos.creditCardService.searchTrade(searchTradeArgs);
         const amount = (_c = paymentMethod.paymentMethod.totalPaymentDue) === null || _c === void 0 ? void 0 : _c.value;
         if (typeof amount !== 'number') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.totalPaymentDue?.value');
@@ -372,19 +388,19 @@ function processAlterTran(params) {
             case GMO.utils.util.JobCd.Sales:
                 debug('already in SALES');
                 // すでに即時売上済み
-                alterTranResults.push({
+                alterTranResult = {
                     accessId: searchTradeResult.accessId,
                     accessPass: searchTradeResult.accessPass,
                     forward: searchTradeResult.forward,
                     approve: searchTradeResult.approve,
                     tranId: searchTradeResult.tranId,
                     tranDate: ''
-                });
+                };
                 break;
             case GMO.utils.util.JobCd.Void:
                 // 返品手数料決済の場合を追加(状態が取消であれば即時売上)
                 debug('calling alterTran...');
-                alterTranResults.push(yield repos.creditCardService.alterTran({
+                alterTranArgs = {
                     shopId: params.shopId,
                     shopPass: params.shopPass,
                     accessId: searchTradeResult.accessId,
@@ -394,12 +410,13 @@ function processAlterTran(params) {
                     siteId: (_d = params.availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.siteId,
                     sitePass: (_e = params.availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.sitePass,
                     method: GMO.utils.util.Method.Lump // 再オーソリの場合、支払方法指定は必須
-                }));
+                };
+                alterTranResult = yield repos.creditCardService.alterTran(alterTranArgs);
                 debug('alterTran processed.');
                 break;
             case GMO.utils.util.JobCd.Auth:
                 debug('calling alterTran...');
-                alterTranResults.push(yield repos.creditCardService.alterTran({
+                alterTranArgs = {
                     shopId: params.shopId,
                     shopPass: params.shopPass,
                     accessId: searchTradeResult.accessId,
@@ -408,7 +425,8 @@ function processAlterTran(params) {
                     amount: amount,
                     siteId: (_f = params.availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.siteId,
                     sitePass: (_g = params.availableChannel.credentials) === null || _g === void 0 ? void 0 : _g.sitePass
-                }));
+                };
+                alterTranResult = yield repos.creditCardService.alterTran(alterTranArgs);
                 // 失敗したら取引状態確認してどうこう、という処理も考えうるが、
                 // GMOはapiのコール制限が厳しく、下手にコールするとすぐにクライアントサイドにも影響をあたえてしまう
                 // リトライはタスクの仕組みに含まれているので失敗してもここでは何もしない
@@ -416,9 +434,45 @@ function processAlterTran(params) {
             default:
                 throw new factory.errors.NotImplemented(`jobCd '${searchTradeResult.jobCd}' not implemented`);
         }
-        return alterTranResults;
+        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.d.ts

@@ -4,6 +4,7 @@
 import type { MongoRepository as AcceptedOfferRepo } from '../repo/acceptedOffer';
 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 AssetTransactionRepo } from '../repo/assetTransaction';
 import type { MongoRepository as EventRepo } from '../repo/event';
 import type { MongoRepository as OrderRepo } from '../repo/order';
@@ -21,6 +22,7 @@ import * as factory from '../factory';
 export declare function pay(params: factory.task.pay.IData): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
+    actionRecipe?: ActionRecipeRepo;
     accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;
     event: EventRepo;

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

@@ -13,6 +13,7 @@ exports.call = void 0;
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
+const actionRecipe_1 = require("../../repo/actionRecipe");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
@@ -32,6 +33,7 @@ function call(data) {
             acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             accountingReport: new accountingReport_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
+            actionRecipe: new actionRecipe_1.ActionRecipeRepo(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             event: new event_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),

package/lib/chevre/settings.d.ts

@@ -40,6 +40,7 @@ export declare const USE_CHECK_RESOURCE_TASK: boolean;
 export declare const USE_OPTIMIZE_RESERVATION_EXCEPTIONS: string[];
 export declare const USE_OPTIMIZE_INFORM_EVENT: boolean;
 export declare const USE_VALIDATE_MOVIE_TICKET_BY_TICKET_IDENTIFIER: boolean;
+export declare const USE_EXPERIMENTAL_FEATURE: boolean;
 export declare const MONGO_MAX_TIME_MS: number;
 export declare const MONGO_READ_PREFERENCE: string;
 export declare const MONGO_AUTO_INDEX: boolean;

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.DELIVER_ORDER_LIMIT = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_VALIDATE_MOVIE_TICKET_BY_TICKET_IDENTIFIER = exports.USE_OPTIMIZE_INFORM_EVENT = exports.USE_OPTIMIZE_RESERVATION_EXCEPTIONS = exports.USE_CHECK_RESOURCE_TASK = exports.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_FETCH_API = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.DELIVER_ORDER_LIMIT = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_EXPERIMENTAL_FEATURE = exports.USE_VALIDATE_MOVIE_TICKET_BY_TICKET_IDENTIFIER = exports.USE_OPTIMIZE_INFORM_EVENT = exports.USE_OPTIMIZE_RESERVATION_EXCEPTIONS = exports.USE_CHECK_RESOURCE_TASK = exports.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_FETCH_API = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
     ? process.env.INFORM_TRANSACTION_URL.split(' ')
@@ -63,6 +63,7 @@ exports.USE_OPTIMIZE_RESERVATION_EXCEPTIONS = (typeof process.env.USE_OPTIMIZE_R
     : [];
 exports.USE_OPTIMIZE_INFORM_EVENT = process.env.USE_OPTIMIZE_INFORM_EVENT === '1';
 exports.USE_VALIDATE_MOVIE_TICKET_BY_TICKET_IDENTIFIER = process.env.USE_VALIDATE_MOVIE_TICKET_BY_TICKET_IDENTIFIER === '1';
+exports.USE_EXPERIMENTAL_FEATURE = process.env.USE_EXPERIMENTAL_FEATURE === '1';
 exports.MONGO_MAX_TIME_MS = (typeof process.env.MONGO_MAX_TIME_MS === 'string')
     ? Number(process.env.MONGO_MAX_TIME_MS)
     // tslint:disable-next-line:no-magic-numbers

package/package.json

@@ -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.19"
+  "version": "21.33.0-alpha.20"
 }