@chevre/domain 21.20.0-alpha.33 → 21.20.0-alpha.35

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

@@ -1,5 +1,12 @@
 import * as factory from '../../../factory';
 import { IAcceptedOfferMovieTicketUsed } from './potentialActions/createPayObjectServiceOutput';
+declare function createPayActions(params: {
+    transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Pay>;
+    potentialActions?: factory.assetTransaction.pay.IPotentialActionsParams;
+    order: Pick<factory.order.IOrder, 'typeOf' | 'confirmationNumber' | 'orderNumber'> & {
+        acceptedOffersMovieTicketUsed: IAcceptedOfferMovieTicketUsed[];
+    };
+}): factory.action.trade.pay.IAttributes[];
 /**
  * 取引のポストアクションを作成する
  */
@@ -10,4 +17,4 @@ declare function createPotentialActions(params: {
         acceptedOffersMovieTicketUsed: IAcceptedOfferMovieTicketUsed[];
     };
 }): factory.assetTransaction.IPotentialActions<factory.assetTransactionType.Pay>;
-export { createPotentialActions, IAcceptedOfferMovieTicketUsed };
+export { createPayActions, createPotentialActions, IAcceptedOfferMovieTicketUsed };

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPotentialActions = void 0;
+exports.createPotentialActions = exports.createPayActions = void 0;
 const factory = require("../../../factory");
 const createPayObjectServiceOutput_1 = require("./potentialActions/createPayObjectServiceOutput");
 function createPayActions(params) {
@@ -28,6 +28,7 @@ function createPayActions(params) {
     }
     return payActions;
 }
+exports.createPayActions = createPayActions;
 // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createPayObject(params) {
     var _a;

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

@@ -17,6 +17,7 @@ import type { MongoRepository as PaymentAcceptedRepo } from '../../repo/sellerPa
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import * as CreditCardPayment from '../payment/creditCard';
 import * as MovieTicketPayment from '../payment/movieTicket';
+import { IAcceptedOfferMovieTicketUsed } from './pay/potentialActions';
 export interface IStartOperationRepos {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
@@ -102,7 +103,26 @@ export declare function start(params: factory.assetTransaction.pay.IStartParamsW
 /**
  * 取引確定
  */
-export declare function confirm(params: factory.assetTransaction.pay.IConfirmParams): IConfirmOperation<void>;
+export declare function confirm(params: factory.assetTransaction.pay.IConfirmParams & {
+    options: {
+        minimizePotentialActions: boolean;
+    };
+}): IConfirmOperation<void>;
+export declare function fixOrderAsPurpose(params: {
+    potentialActions: {
+        pay: {
+            purpose: {
+                confirmationNumber: string;
+                orderNumber: string;
+            };
+        };
+    };
+}, transaction: factory.assetTransaction.pay.ITransaction): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
+    order: OrderRepo;
+}) => Promise<Pick<factory.order.IOrder, "typeOf" | "confirmationNumber" | "orderNumber"> & {
+    acceptedOffersMovieTicketUsed: IAcceptedOfferMovieTicketUsed[];
+}>;
 /**
  * 取引中止
  */

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.searchGMOTrade = exports.exportTasksById = exports.cancel = exports.confirm = exports.start = exports.check = exports.invalidatePaymentUrl = exports.publishPaymentUrl = void 0;
+exports.searchGMOTrade = exports.exportTasksById = exports.cancel = exports.fixOrderAsPurpose = exports.confirm = exports.start = exports.check = exports.invalidatePaymentUrl = exports.publishPaymentUrl = void 0;
 const createDebug = require("debug");
 const moment = require("moment");
 const factory = require("../../factory");
@@ -342,7 +342,7 @@ function saveAuthorizeResult(params) {
  */
 function confirm(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         let transaction;
         // 取引存在確認
         if (typeof params.id === 'string') {
@@ -366,15 +366,41 @@ function confirm(params) {
             if (typeof specifiedPaymentMethodIdentifire === 'string' && specifiedPaymentMethodIdentifire.length > 0) {
                 overwritingPaymentMethodIdentifier = specifiedPaymentMethodIdentifire;
                 transaction.object.paymentMethod.identifier = overwritingPaymentMethodIdentifier;
-                // transaction.object.paymentMethod.typeOf = overwritingPaymentMethodIdentifier;
             }
         }
-        const order = yield fixOrderAsPurpose(params, transaction)(repos);
-        const potentialActions = (0, potentialActions_1.createPotentialActions)({
-            transaction: transaction,
-            potentialActions: params.potentialActions,
-            order
-        });
+        const confirmationNumber = (_e = (_d = (_c = params.potentialActions) === null || _c === void 0 ? void 0 : _c.pay) === null || _d === void 0 ? void 0 : _d.purpose) === null || _e === void 0 ? void 0 : _e.confirmationNumber;
+        const orderNumber = (_h = (_g = (_f = params.potentialActions) === null || _f === void 0 ? void 0 : _f.pay) === null || _g === void 0 ? void 0 : _g.purpose) === null || _h === void 0 ? void 0 : _h.orderNumber;
+        if (typeof confirmationNumber !== 'string' || confirmationNumber.length === 0
+            || typeof orderNumber !== 'string' || orderNumber.length === 0) {
+            throw new factory.errors.ArgumentNull('potentialActions.pay.purpose');
+        }
+        let potentialActions;
+        if (params.options.minimizePotentialActions) {
+            // 注文検証
+            const existingOrders = yield repos.order.search({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: transaction.project.id } },
+                confirmationNumbers: [confirmationNumber],
+                orderNumbers: [orderNumber]
+            }, { orderNumber: 1 });
+            if (existingOrders.length === 0) {
+                throw new factory.errors.NotFound(factory.order.OrderType.Order);
+            }
+            const payActionData4order = {
+                object: { paymentMethod: { paymentMethodId: transaction.transactionNumber } },
+                purpose: { confirmationNumber, orderNumber, typeOf: factory.order.OrderType.Order }
+            };
+            potentialActions = { pay: [payActionData4order] };
+        }
+        else {
+            const order = yield fixOrderAsPurpose({ potentialActions: { pay: { purpose: { confirmationNumber, orderNumber } } } }, transaction)(repos);
+            potentialActions = (0, potentialActions_1.createPotentialActions)({
+                transaction: transaction,
+                potentialActions: params.potentialActions,
+                order
+            });
+        }
         yield repos.assetTransaction.confirm(Object.assign({ typeOf: factory.assetTransactionType.Pay, id: transaction.id, result: {}, potentialActions: potentialActions }, (typeof overwritingPaymentMethodIdentifier === 'string')
             ? { object: { paymentMethod: { identifier: overwritingPaymentMethodIdentifier } } }
             : undefined));
@@ -383,13 +409,9 @@ function confirm(params) {
 exports.confirm = confirm;
 function fixOrderAsPurpose(params, transaction) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
-        const payPurposeConfirmationNumber = (_c = (_b = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.pay) === null || _b === void 0 ? void 0 : _b.purpose) === null || _c === void 0 ? void 0 : _c.confirmationNumber;
-        const payPurposeOrderNumber = (_f = (_e = (_d = params.potentialActions) === null || _d === void 0 ? void 0 : _d.pay) === null || _e === void 0 ? void 0 : _e.purpose) === null || _f === void 0 ? void 0 : _f.orderNumber;
-        if (typeof payPurposeConfirmationNumber !== 'string' || payPurposeConfirmationNumber.length === 0
-            || typeof payPurposeOrderNumber !== 'string' || payPurposeOrderNumber.length === 0) {
-            throw new factory.errors.ArgumentNull('potentialActions.pay.purpose');
-        }
+        var _a;
+        const payPurposeConfirmationNumber = params.potentialActions.pay.purpose.confirmationNumber;
+        const payPurposeOrderNumber = (_a = params.potentialActions.pay.purpose) === null || _a === void 0 ? void 0 : _a.orderNumber;
         const ordersWithoutAcceptedOffers = yield repos.order.search({
             limit: 1,
             page: 1,
@@ -425,6 +447,7 @@ function fixOrderAsPurpose(params, transaction) {
         return Object.assign(Object.assign({}, orderWithoutAcceptedOffers), { acceptedOffersMovieTicketUsed });
     });
 }
+exports.fixOrderAsPurpose = fixOrderAsPurpose;
 /**
  * 取引中止
  */

package/lib/chevre/service/order/confirmPayTransaction.d.ts

@@ -8,7 +8,9 @@ import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
-declare function confirmPayTransaction(data: factory.task.IData<factory.taskName.ConfirmPayTransaction>): (repos: {
+declare function confirmPayTransaction(data: factory.task.IData<factory.taskName.ConfirmPayTransaction>, options: {
+    minimizePotentialActions: boolean;
+}): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;

package/lib/chevre/service/order/confirmPayTransaction.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmPayTransaction = void 0;
 const factory = require("../../factory");
 const PayTransactionService = require("../assetTransaction/pay");
-function confirmPayTransaction(data) {
+function confirmPayTransaction(data, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         // アクション開始
@@ -27,7 +27,7 @@ function confirmPayTransaction(data) {
                                 orderNumber: data.purpose.orderNumber
                             }
                         }
-                    } }, (typeof ((_b = (_a = confirmingTransaction.object) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
+                    }, options }, (typeof ((_b = (_a = confirmingTransaction.object) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
                     ? { object: { paymentMethod: { identifier: confirmingTransaction.object.paymentMethod.identifier } } }
                     : undefined))({
                     acceptedOffer: repos.acceptedOffer,

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

@@ -46,7 +46,7 @@ declare function voidTransaction(params: factory.task.voidPayment.IData): (repos
 /**
  * クレジットカード決済
  */
-declare function payCreditCard(params: factory.task.pay.IData): (repos: {
+declare function payCreditCard(params: factory.task.pay.IPayActionData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     paymentAccepted: PaymentAcceptedRepo;

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

@@ -9,7 +9,7 @@ import type { MongoRepository as TaskRepo } from '../../repo/task';
 declare function voidTransaction(__: factory.task.voidPayment.IData): (___: {
     product: ProductRepo;
 }) => Promise<void>;
-declare function payFaceToFace(params: factory.task.pay.IData): (repos: {
+declare function payFaceToFace(params: factory.task.pay.IPayActionData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     product: ProductRepo;

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

@@ -66,7 +66,7 @@ type IPayAction = factory.action.trade.pay.IAction;
 /**
  * MovieTicket着券
  */
-declare function payMovieTicket(params: factory.task.pay.IData): IPayOperation<IPayAction>;
+declare function payMovieTicket(params: factory.task.pay.IPayActionData): IPayOperation<IPayAction>;
 /**
  * MovieTicket着券取消
  */

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

@@ -16,7 +16,7 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
 declare function voidTransaction(params: factory.task.voidPayment.IData): (repos: {
     product: ProductRepo;
 }) => Promise<void>;
-declare function payPaymentCard(params: factory.task.pay.IData): (repos: {
+declare function payPaymentCard(params: factory.task.pay.IPayActionData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     product: ProductRepo;

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

@@ -1,10 +1,12 @@
 /**
  * 決済サービス
  */
+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 { MongoRepository as AssetTransactionRepo } from '../repo/assetTransaction';
 import type { MongoRepository as EventRepo } from '../repo/event';
+import type { MongoRepository as OrderRepo } from '../repo/order';
 import type { MongoRepository as PaymentServiceRepo } from '../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../repo/paymentServiceProvider';
 import type { MongoRepository as ProductRepo } from '../repo/product';
@@ -17,9 +19,12 @@ import * as factory from '../factory';
  * 決済確定
  */
 export declare function pay(params: factory.task.pay.IData): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
+    assetTransaction: AssetTransactionRepo;
     event: EventRepo;
+    order: OrderRepo;
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;

package/lib/chevre/service/payment.js

@@ -11,29 +11,64 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.refund = exports.voidPayment = exports.pay = void 0;
 const factory = require("../factory");
+const pay_1 = require("./assetTransaction/pay");
+const potentialActions_1 = require("./assetTransaction/pay/potentialActions");
 const CreditCardPaymentService = require("./payment/creditCard");
 const FaceToFacePaymentService = require("./payment/faceToFace");
 const MovieTicketPaymentService = require("./payment/movieTicket");
 const PaymentCardPaymentService = require("./payment/paymentCard");
+function payTask2payActionAttributes(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let transaction;
+        if (typeof params.object.paymentMethod.paymentMethodId === 'string') {
+            transaction = yield repos.assetTransaction.findByTransactionNumber({
+                typeOf: factory.assetTransactionType.Pay,
+                transactionNumber: params.object.paymentMethod.paymentMethodId
+            });
+            if (transaction.status !== factory.transactionStatusType.Confirmed) {
+                throw new factory.errors.Argument('object.paymentMethod.paymentMethodId', `invalid transaction status: ${transaction.transactionNumber} ${transaction.status}`);
+            }
+        }
+        else {
+            throw new factory.errors.ArgumentNull('object.paymentMethod.paymentMethodId');
+        }
+        const order = yield (0, pay_1.fixOrderAsPurpose)({ potentialActions: { pay: { purpose: params.purpose } } }, transaction)(repos);
+        const payActions = (0, potentialActions_1.createPayActions)({
+            transaction: transaction,
+            potentialActions: { pay: { purpose: params.purpose } },
+            order
+        });
+        return payActions[0];
+    });
+}
 /**
  * 決済確定
  */
 function pay(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const paymentServiceType = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
+        let payActionAttributes;
+        if (params.typeOf === factory.actionType.PayAction) {
+            // タスクにPayActionそのものが指定されていればそのまま処理
+            payActionAttributes = params;
+        }
+        else {
+            // 最適化されたタスクに対応(2024-01-19~)
+            payActionAttributes = yield payTask2payActionAttributes(params)(repos);
+        }
+        const paymentServiceType = (_a = payActionAttributes.object[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.FaceToFace:
-                yield FaceToFacePaymentService.payFaceToFace(params)(repos);
+                yield FaceToFacePaymentService.payFaceToFace(payActionAttributes)(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.PaymentCard:
-                yield PaymentCardPaymentService.payPaymentCard(params)(repos);
+                yield PaymentCardPaymentService.payPaymentCard(payActionAttributes)(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                yield CreditCardPaymentService.payCreditCard(params)(repos);
+                yield CreditCardPaymentService.payCreditCard(payActionAttributes)(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.MovieTicket:
-                yield MovieTicketPaymentService.payMovieTicket(params)(repos);
+                yield MovieTicketPaymentService.payMovieTicket(payActionAttributes)(repos);
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);

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

@@ -29,7 +29,7 @@ function call(data) {
         if (settings.redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
-        yield (0, confirmPayTransaction_1.confirmPayTransaction)(data)({
+        yield (0, confirmPayTransaction_1.confirmPayTransaction)(data, { minimizePotentialActions: false })({
             acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),

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

@@ -10,9 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
+const assetTransaction_1 = require("../../repo/assetTransaction");
 const event_1 = require("../../repo/event");
+const order_1 = require("../../repo/order");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
@@ -26,9 +29,12 @@ const PaymentService = require("../payment");
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
         yield PaymentService.pay(data)({
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             accountingReport: new accountingReport_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             event: new event_1.MongoRepository(settings.connection),
+            order: new order_1.MongoRepository(settings.connection),
             paymentAccepted: new sellerPaymentAccepted_1.MongoRepository(settings.connection),
             paymentService: new paymentService_1.MongoRepository(settings.connection),
             paymentServiceProvider: new paymentServiceProvider_1.MongoRepository(settings.connection),

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.352.0-alpha.0",
+    "@chevre/factory": "4.352.0-alpha.1",
     "@cinerino/sdk": "5.9.0-alpha.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.3.0-alpha.0",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.20.0-alpha.33"
+  "version": "21.20.0-alpha.35"
 }