@chevre/domain 21.33.0-alpha.17 → 21.33.0-alpha.18

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

@@ -0,0 +1,24 @@
+import * as factory from '../../../factory';
+import type { MongoRepository as ActionRepo } from '../../../repo/action';
+import type { ActionRecipeRepo } from '../../../repo/actionRecipe';
+import type { ITransactionInProgress, MongoRepository as TransactionRepo } from '../../../repo/transaction';
+import * as PayTransactionService from '../../assetTransaction/pay';
+type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail;
+declare function handlePrePublishedPaymentMethodIdOnAuthorizing(params: {
+    object: Pick<IObjectWithoutDetail, 'amount' | 'issuedThrough' | 'paymentMethod'>;
+    prePublishedPaymentMethodId: string;
+    transaction: Pick<ITransactionInProgress<factory.transactionType.PlaceOrder>, 'agent' | 'expires' | 'id' | 'typeOf' | 'project' | 'seller'>;
+}): (repos: {
+    action: ActionRepo;
+    actionRecipe?: ActionRecipeRepo;
+    transaction: TransactionRepo;
+}) => Promise<{
+    authorizeParams?: {
+        paymentMethodByTransaction: factory.transaction.placeOrder.IPaymentMethodByPaymentUrl;
+        pendingPaymentAgencyTransaction: PayTransactionService.IPaymentAgencyTransaction;
+    } | undefined;
+    existingCompletedAuthorizeAction?: {
+        id: string;
+    } | undefined;
+}>;
+export { handlePrePublishedPaymentMethodIdOnAuthorizing };

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

@@ -0,0 +1,151 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handlePrePublishedPaymentMethodIdOnAuthorizing = void 0;
+const createDebug = require("debug");
+const factory = require("../../../factory");
+const debug = createDebug('chevre-domain:service:payment');
+function recipe2paymentAgencyTransaction(actionRecipe) {
+    var _a;
+    let entryTranArgs;
+    let entryTranResult;
+    let execTranArgs;
+    let execTranResult;
+    if (actionRecipe.recipeCategory !== factory.recipe.RecipeCategory.publishPaymentUrl) {
+        throw new factory.errors.NotFound('', `Recipe with category ${factory.recipe.RecipeCategory.publishPaymentUrl} not found`);
+    }
+    const howToSection = actionRecipe.step;
+    const howToSteps = (_a = howToSection.at(0)) === null || _a === void 0 ? void 0 : _a.itemListElement;
+    if (Array.isArray(howToSteps)) {
+        howToSteps.forEach((howToStep) => {
+            var _a, _b, _c, _d;
+            const stepIdentifier = howToStep.identifier;
+            if (stepIdentifier === factory.recipe.StepIdentifier.entryTran) {
+                entryTranArgs = (_a = howToStep.itemListElement.at(0)) === null || _a === void 0 ? void 0 : _a.beforeMedia;
+                entryTranResult = (_b = howToStep.itemListElement.at(0)) === null || _b === void 0 ? void 0 : _b.afterMedia;
+            }
+            else if (stepIdentifier === factory.recipe.StepIdentifier.execTran) {
+                execTranArgs = (_c = howToStep.itemListElement.at(0)) === null || _c === void 0 ? void 0 : _c.beforeMedia;
+                execTranResult = (_d = howToStep.itemListElement.at(0)) === null || _d === void 0 ? void 0 : _d.afterMedia;
+            }
+            else {
+                throw new factory.errors.NotImplemented(`howToStep.identifier '${stepIdentifier}' not implemented`);
+            }
+        });
+    }
+    if (entryTranArgs === undefined || entryTranResult === undefined
+        || execTranArgs === undefined || execTranResult === undefined) {
+        throw new factory.errors.NotFound(`beforeMedia or afterMedia of actionRecipe`);
+    }
+    return { entryTranArgs, entryTranResult, execTranArgs, execTranResult };
+}
+function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        let pendingPaymentAgencyTransaction;
+        let existingCompletedAuthorizeAction;
+        // transaction.objectへのアクセス回避(2024-05-30~)
+        // const paymentMethodByTransaction = transaction.object.paymentMethods;
+        const paymentMethodByTransaction = yield repos.transaction.findInProgressPaymentMethodId({ id: params.transaction.id });
+        if (params.prePublishedPaymentMethodId === (paymentMethodByTransaction === null || paymentMethodByTransaction === void 0 ? void 0 : paymentMethodByTransaction.paymentMethodId)) {
+            // check existence of acceptAction when authorizing payment(2024-06-01~)
+            const acceptPayAction = (yield repos.action.search({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: params.transaction.project.id } },
+                typeOf: { $eq: factory.actionType.AcceptAction },
+                actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+                purpose: { id: { $in: [params.transaction.id] } },
+                object: {
+                    transactionNumber: { $eq: params.prePublishedPaymentMethodId },
+                    typeOf: { $eq: factory.assetTransactionType.Pay }
+                }
+            }, ['result'], [])).shift();
+            if (acceptPayAction === undefined) {
+                throw new factory.errors.NotFound(factory.actionType.AcceptAction);
+            }
+            debug('acceptPayAction found:', acceptPayAction.id);
+            // find recipe(2024-06-02~)
+            const actionRecipe = yield ((_a = repos.actionRecipe) === null || _a === void 0 ? void 0 : _a.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({
+                object: params.object,
+                paymentMethodByTransaction
+            });
+            // use actionRecipe(2024-06-02~)
+            if (typeof (actionRecipe === null || actionRecipe === void 0 ? void 0 : actionRecipe.recipeCategory) === 'string') {
+                pendingPaymentAgencyTransaction = recipe2paymentAgencyTransaction(actionRecipe);
+                debug('handlePrePublishedPaymentMethodIdOnAuthorizing: pendingPaymentAgencyTransaction from recipe:', JSON.stringify(pendingPaymentAgencyTransaction));
+            }
+            else {
+                const { entryTranArgs, entryTranResult, execTranArgs, execTranResult } = paymentMethodByTransaction;
+                if (entryTranArgs !== undefined && entryTranResult !== undefined
+                    && execTranArgs !== undefined && execTranResult !== undefined) {
+                    pendingPaymentAgencyTransaction = { entryTranArgs, entryTranResult, execTranArgs, execTranResult };
+                }
+            }
+            if (pendingPaymentAgencyTransaction === undefined) {
+                throw new factory.errors.Argument('paymentMethodId', 'pendingPaymentAgencyTransaction not found');
+            }
+            // 既に承認済であれば何もしない(2023-05-15~)
+            const existingCompletedAuthorizeActions = yield repos.action.searchByPurpose({
+                typeOf: factory.actionType.AuthorizeAction,
+                purpose: { id: params.transaction.id, typeOf: params.transaction.typeOf },
+                actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus },
+                object: {
+                    paymentMethodId: { $eq: params.prePublishedPaymentMethodId },
+                    typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment }
+                },
+                sort: { startDate: factory.sortType.Ascending }
+            });
+            existingCompletedAuthorizeAction = existingCompletedAuthorizeActions.shift();
+            if (existingCompletedAuthorizeAction !== undefined) {
+                return { existingCompletedAuthorizeAction: { id: existingCompletedAuthorizeAction.id } };
+            }
+            return {
+                authorizeParams: { pendingPaymentAgencyTransaction, paymentMethodByTransaction }
+            };
+        }
+        else {
+            // 取引にないpaymentMethodIdの指定はクライアントエラー
+            throw new factory.errors.Argument('paymentMethodId', 'invalid paymentMethodId for the transaction');
+        }
+    });
+}
+exports.handlePrePublishedPaymentMethodIdOnAuthorizing = handlePrePublishedPaymentMethodIdOnAuthorizing;
+/**
+ * 注文取引に保管された決済情報を承認しようとしている決済の整合性を検証する
+ */
+function validatePaymentMethodByTransaction(params) {
+    var _a, _b;
+    const paymentServiceIdByObject = params.object.issuedThrough.id;
+    const amountByObject = params.object.amount;
+    const paymentMethodTypeByObject = params.object.paymentMethod;
+    const paymentServiceIdByTransaction = params.paymentMethodByTransaction.issuedThrough.id;
+    const amountByTransaction = (_a = params.paymentMethodByTransaction.paymentMethod) === null || _a === void 0 ? void 0 : _a.amount;
+    const paymentMethodTypeByTransaction = (_b = params.paymentMethodByTransaction.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
+    // 決済サービスID検証
+    if (paymentServiceIdByObject !== paymentServiceIdByTransaction) {
+        throw new factory.errors.Argument('object.issuedThrough.id', 'issuedThrough.id must match the target of the paymentUrl');
+    }
+    // 金額検証
+    if (amountByObject !== amountByTransaction) {
+        throw new factory.errors.Argument('object.amount', 'amount must match the target of the paymentUrl');
+    }
+    // 決済方法区分検証
+    if (paymentMethodTypeByObject !== paymentMethodTypeByTransaction) {
+        throw new factory.errors.Argument('object.paymentMethod', 'paymentMethod must match the target of the paymentUrl');
+    }
+}

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

@@ -1,3 +1,6 @@
+/**
+ * 汎用決済サービス
+ */
 import * as factory from '../../factory';
 import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../../repo/action';

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

@@ -13,17 +13,16 @@ exports.publishPaymentUrl = exports.processVoidPayTransaction = exports.person2u
 /**
  * 汎用決済サービス
  */
-const createDebug = require("debug");
 const factory = require("../../factory");
 const PayTransactionService = require("../assetTransaction/pay");
 const code_1 = require("../code");
 const publishConfirmationNumberIfNotExist_1 = require("../transaction/placeOrderInProgress/publishConfirmationNumberIfNotExist");
 const factory_1 = require("./any/factory");
+const handlePrePublishedPaymentMethodIdOnAuthorizing_1 = require("./any/handlePrePublishedPaymentMethodIdOnAuthorizing");
 const onPaymentStatusChanged_1 = require("./any/onPaymentStatusChanged");
 Object.defineProperty(exports, "onPaymentStatusChanged", { enumerable: true, get: function () { return onPaymentStatusChanged_1.onPaymentStatusChanged; } });
 const person2username_1 = require("./any/person2username");
 Object.defineProperty(exports, "person2username", { enumerable: true, get: function () { return person2username_1.person2username; } });
-const debug = createDebug('chevre-domain:service:payment');
 /**
  * 決済承認中止
  * タスクから決済承認を取り消す
@@ -291,7 +290,7 @@ exports.publishPaymentUrl = publishPaymentUrl;
 function authorize(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         if (params.purpose.typeOf !== factory.transactionType.PlaceOrder) {
             throw new factory.errors.NotImplemented(`purpose.typeOf '${params.purpose.typeOf} not implemented'`);
         }
@@ -315,84 +314,38 @@ function authorize(params) {
         let creditCard = params.object.creditCard;
         // リクエストでpaymentMethodIdを指定された場合、取引に保管されたpaymentMethodIdに一致すればそちらを適用(外部サイト決済対応)
         if (typeof params.object.paymentMethodId === 'string' && params.object.paymentMethodId.length > 0) {
-            // transaction.objectへのアクセス回避(2024-05-30~)
-            // const paymentMethodByTransaction = transaction.object.paymentMethods;
-            const paymentMethodByTransaction = yield repos.transaction.findInProgressPaymentMethodId({ id: params.purpose.id });
-            if (params.object.paymentMethodId === (paymentMethodByTransaction === null || paymentMethodByTransaction === void 0 ? void 0 : paymentMethodByTransaction.paymentMethodId)) {
-                // check existence of acceptAction when authorizing payment(2024-06-01~)
-                const acceptPayAction = (yield repos.action.search({
-                    limit: 1,
-                    page: 1,
-                    project: { id: { $eq: transaction.project.id } },
-                    typeOf: { $eq: factory.actionType.AcceptAction },
-                    actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
-                    purpose: { id: { $in: [transaction.id] } },
-                    object: {
-                        transactionNumber: { $eq: params.object.paymentMethodId },
-                        typeOf: { $eq: factory.assetTransactionType.Pay }
-                    }
-                }, ['result'], [])).shift();
-                if (acceptPayAction === undefined) {
-                    throw new factory.errors.NotFound(factory.actionType.AcceptAction);
-                }
-                debug('acceptPayAction found:', JSON.stringify(acceptPayAction));
-                // find recipe(2024-06-02~)
-                const actionRecipe = yield ((_a = repos.actionRecipe) === null || _a === void 0 ? void 0 : _a.findByAction({
-                    project: { id: transaction.project.id },
-                    recipeFor: { id: acceptPayAction.id }
-                }));
-                debug('actionRecipe found:', JSON.stringify(actionRecipe));
-                // 検証強化(2024-01-04~)
-                validatePaymentMethodByTransaction({
-                    object: params.object,
-                    paymentMethodByTransaction
-                });
+            const { authorizeParams, existingCompletedAuthorizeAction } = yield (0, handlePrePublishedPaymentMethodIdOnAuthorizing_1.handlePrePublishedPaymentMethodIdOnAuthorizing)({
+                object: params.object,
+                prePublishedPaymentMethodId: params.object.paymentMethodId,
+                transaction
+            })(repos);
+            if (existingCompletedAuthorizeAction !== undefined) {
+                return { id: existingCompletedAuthorizeAction.id };
+            }
+            else if (authorizeParams !== undefined) {
                 // creditCardを決済URL発行時の情報で上書き(2024-01-08~)
-                creditCard = (_b = paymentMethodByTransaction.paymentMethod) === null || _b === void 0 ? void 0 : _b.creditCard;
+                creditCard = (_a = authorizeParams.paymentMethodByTransaction.paymentMethod) === null || _a === void 0 ? void 0 : _a.creditCard;
                 transactionNumber = params.object.paymentMethodId;
-                const { entryTranArgs, entryTranResult, execTranArgs, execTranResult } = paymentMethodByTransaction;
-                if (entryTranArgs !== undefined && entryTranResult !== undefined
-                    && execTranArgs !== undefined && execTranResult !== undefined) {
-                    pendingPaymentAgencyTransaction = { entryTranArgs, entryTranResult, execTranArgs, execTranResult };
-                }
-                // 既に承認済であれば何もしない(2023-05-15~)
-                const existingCompletedAuthorizeActions = yield repos.action.searchByPurpose({
-                    typeOf: factory.actionType.AuthorizeAction,
-                    purpose: { id: transaction.id, typeOf: transaction.typeOf },
-                    actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus },
-                    object: {
-                        paymentMethodId: { $eq: transactionNumber },
-                        typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment }
-                    },
-                    sort: { startDate: factory.sortType.Ascending }
-                });
-                const existingCompletedAuthorizeAction = existingCompletedAuthorizeActions.shift();
-                if (existingCompletedAuthorizeAction !== undefined) {
-                    return existingCompletedAuthorizeAction;
-                }
+                pendingPaymentAgencyTransaction = authorizeParams.pendingPaymentAgencyTransaction;
             }
             else {
-                // 取引にないpaymentMethodIdの指定はクライアントエラー
-                throw new factory.errors.Argument('paymentMethodId', 'invalid paymentMethodId for the transaction');
+                throw new factory.errors.NotImplemented('pendingPaymentAgencyTransaction requied on paymentMethodId specified');
             }
         }
+        // 取引番号発行済でなければ発行
         if (typeof transactionNumber !== 'string') {
             const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
             transactionNumber = publishTransactionNumberResult.transactionNumber;
         }
         const movieTickets = (Array.isArray(params.object.movieTickets)) ? params.object.movieTickets.map(factory_1.createMovieTicket) : undefined;
-        const { accountId } = yield fixAccountIdIfPossible({
-            object: params.object,
-            project: { id: transaction.project.id }
-        })(repos);
+        const { accountId } = yield fixAccountIdIfPossible({ object: params.object, project: { id: transaction.project.id } })(repos);
         const authorizeObject = Object.assign(Object.assign(Object.assign(Object.assign({}, params.object), { accountId, paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }), (creditCard !== undefined) ? { creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined);
         // 承認アクションを開始する
-        const taskId = (_c = params.sameAs) === null || _c === void 0 ? void 0 : _c.id;
+        const taskId = (_b = params.sameAs) === null || _b === void 0 ? void 0 : _b.id;
         const actionAttributes = Object.assign({ project: transaction.project, typeOf: factory.actionType.AuthorizeAction, object: authorizeObject, agent: {
                 typeOf: transaction.agent.typeOf,
                 id: transaction.agent.id
             }, instrument: {
-                // typeOf: 'WebAPI',
                 typeOf: factory.assetTransactionType.Pay,
                 identifier: factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre,
                 transactionNumber
@@ -401,10 +354,9 @@ function authorize(params) {
                 id: transaction.seller.id,
                 name: (typeof transaction.seller.name === 'string')
                     ? transaction.seller.name
-                    : String((_d = transaction.seller.name) === null || _d === void 0 ? void 0 : _d.ja)
-            }, purpose: { typeOf: transaction.typeOf, id: transaction.id } }, (typeof taskId === 'string')
-            ? { sameAs: { id: taskId, typeOf: 'Task' } } // タスク関連付け(2024-04-22~)
-            : undefined);
+                    : String((_c = transaction.seller.name) === null || _c === void 0 ? void 0 : _c.ja)
+            }, purpose: { typeOf: transaction.typeOf, id: transaction.id } }, (typeof taskId === 'string') ? { sameAs: { id: taskId, typeOf: 'Task' } } : undefined // タスク関連付け(2024-04-22~)
+        );
         const action = yield repos.action.start(actionAttributes);
         let payTransaction;
         try {
@@ -457,30 +409,6 @@ function authorize(params) {
     });
 }
 exports.authorize = authorize;
-/**
- * 注文取引に保管された決済情報を承認しようとしている決済の整合性を検証する
- */
-function validatePaymentMethodByTransaction(params) {
-    var _a, _b;
-    const paymentServiceIdByObject = params.object.issuedThrough.id;
-    const amountByObject = params.object.amount;
-    const paymentMethodTypeByObject = params.object.paymentMethod;
-    const paymentServiceIdByTransaction = params.paymentMethodByTransaction.issuedThrough.id;
-    const amountByTransaction = (_a = params.paymentMethodByTransaction.paymentMethod) === null || _a === void 0 ? void 0 : _a.amount;
-    const paymentMethodTypeByTransaction = (_b = params.paymentMethodByTransaction.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
-    // 決済サービスID検証
-    if (paymentServiceIdByObject !== paymentServiceIdByTransaction) {
-        throw new factory.errors.Argument('object.issuedThrough.id', 'issuedThrough.id must match the target of the paymentUrl');
-    }
-    // 金額検証
-    if (amountByObject !== amountByTransaction) {
-        throw new factory.errors.Argument('object.amount', 'amount must match the target of the paymentUrl');
-    }
-    // 決済方法区分検証
-    if (paymentMethodTypeByObject !== paymentMethodTypeByTransaction) {
-        throw new factory.errors.Argument('object.paymentMethod', 'paymentMethod must match the target of the paymentUrl');
-    }
-}
 /**
  * 承認しようとしているobjectからaccountIdを決定する
  */

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.17"
+  "version": "21.33.0-alpha.18"
 }