@chevre/domain 21.20.0-alpha.2 → 21.20.0-alpha.20

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

@@ -10,21 +10,35 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendOrder = void 0;
+const createDebug = require("debug");
 const order_1 = require("../../factory/order");
 const factory_1 = require("../delivery/factory");
 const findPlaceOrderTransaction_1 = require("./findPlaceOrderTransaction");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory = require("../../factory");
+const debug = createDebug('chevre-domain:service:order');
 /**
  * 注文を配送する
  */
 function sendOrder(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b, _c;
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
             throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
+        if (typeof ((_a = params.object.acceptedOffers) === null || _a === void 0 ? void 0 : _a.limit) !== 'number') {
+            throw new factory.errors.Argument('object.acceptedOffers.limit', 'must be number');
+        }
+        if (typeof ((_b = params.object.acceptedOffers) === null || _b === void 0 ? void 0 : _b.page) !== 'number') {
+            throw new factory.errors.Argument('object.acceptedOffers.page', 'must be number');
+        }
+        if (params.object.acceptedOffers.limit <= 0) {
+            throw new factory.errors.Argument('object.acceptedOffers.limit', 'must be greater than 1');
+        }
+        if (params.object.acceptedOffers.page <= 0) {
+            throw new factory.errors.Argument('object.acceptedOffers.page', 'must be greater than 1');
+        }
         try {
             const orderNumber = params.object.orderNumber;
             const confirmationNumber = params.object.confirmationNumber;
@@ -62,9 +76,11 @@ function sendOrder(params) {
                 priceCurrency: order.priceCurrency,
                 orderDate: order.orderDate
             };
+            const { limit, page } = params.object.acceptedOffers;
+            const sendOrderObject = Object.assign(Object.assign({}, simpleOrder), { acceptedOffers: { limit, page } });
             const sendOrderActionAttributes = {
-                agent: (typeof ((_a = params.agent) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.agent : order.project,
-                object: simpleOrder,
+                agent: (typeof ((_c = params.agent) === null || _c === void 0 ? void 0 : _c.typeOf) === 'string') ? params.agent : order.project,
+                object: sendOrderObject,
                 potentialActions: {
                 // sendEmailMessage: undefined
                 },
@@ -74,23 +90,34 @@ function sendOrder(params) {
             };
             const action = yield repos.action.start(sendOrderActionAttributes);
             let ownershipInfos;
+            let allOffersDelivered = false;
             try {
-                // 所有権作成
-                ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({
-                    order: Object.assign(Object.assign({}, order), { acceptedOffers: yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
-                            orderNumber: { $eq: order.orderNumber },
-                            project: { id: { $eq: order.project.id } }
-                        }) })
+                // const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+                //     orderNumber: { $eq: order.orderNumber },
+                //     project: { id: { $eq: order.project.id } }
+                // });
+                const { acceptedOffers, numAcceptedOffers } = yield repos.acceptedOffer.searchSlicedAcceptedOffersByOrderNumber({
+                    $slice: [limit * (page - 1), limit],
+                    orderNumber: { $eq: order.orderNumber },
+                    project: { id: { $eq: order.project.id } }
                 });
+                debug('delivering...', order.orderNumber, acceptedOffers.map((offer) => `${offer.itemOffered.id}`), params.object.acceptedOffers);
+                // 所有権作成
+                ownershipInfos = (0, factory_1.createOwnershipInfosFromOrder)({ order: Object.assign(Object.assign({}, order), { acceptedOffers }) });
                 ownershipInfos = yield Promise.all(ownershipInfos.map((ownershipInfo) => __awaiter(this, void 0, void 0, function* () {
                     return repos.ownershipInfo.createIfNotExistByIdentifier(ownershipInfo);
                 })));
-                order = yield repos.order.changeStatus({
-                    project: { id: order.project.id },
-                    orderNumber,
-                    orderStatus: factory.orderStatus.OrderDelivered,
-                    previousOrderStatus: factory.orderStatus.OrderProcessing
-                });
+                const deliveredCount = limit * page;
+                debug(deliveredCount, 'delivered.', order.orderNumber, params.object.acceptedOffers);
+                if (deliveredCount >= numAcceptedOffers) {
+                    order = yield repos.order.changeStatus({
+                        project: { id: order.project.id },
+                        orderNumber,
+                        orderStatus: factory.orderStatus.OrderDelivered,
+                        previousOrderStatus: params.object.previousOrderStatus
+                    });
+                    allOffersDelivered = true;
+                }
             }
             catch (error) {
                 try {
@@ -102,22 +129,33 @@ function sendOrder(params) {
                 throw error;
             }
             const result = ownershipInfos;
-            yield repos.action.complete({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, result: result });
+            yield repos.action.completeWithVoid({ typeOf: sendOrderActionAttributes.typeOf, id: action.id, result: result });
+            debug('allOffersDelivered?:', allOffersDelivered, order.orderNumber);
             if (params.useOnOrderStatusChanged) {
-                yield (0, onOrderStatusChanged_1.onOrderDelivered)({
-                    order: {
-                        id: order.id,
-                        customer: order.customer,
-                        orderDate: order.orderDate,
-                        orderNumber: order.orderNumber,
-                        project: order.project,
-                        typeOf: order.typeOf,
-                        orderStatus: factory.orderStatus.OrderDelivered
-                    },
-                    placeOrderTransaction
-                })({
-                    task: repos.task
-                });
+                if (allOffersDelivered) {
+                    yield (0, onOrderStatusChanged_1.onOrderDelivered)({
+                        order: {
+                            id: order.id,
+                            customer: order.customer,
+                            orderDate: order.orderDate,
+                            orderNumber: order.orderNumber,
+                            project: order.project,
+                            typeOf: order.typeOf,
+                            orderStatus: factory.orderStatus.OrderDelivered
+                        },
+                        placeOrderTransaction
+                    })({
+                        task: repos.task
+                    });
+                }
+                else {
+                    yield (0, onOrderStatusChanged_1.onOrderDeliveredPartially)({
+                        order: Object.assign(Object.assign({}, order), { acceptedOffers: params.object.acceptedOffers, orderStatus: params.object.previousOrderStatus })
+                        // placeOrderTransaction
+                    })({
+                        task: repos.task
+                    });
+                }
             }
         }
         catch (error) {

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

@@ -10,7 +10,6 @@ import type { MongoRepository as PaymentServiceRepo } from '../../repo/paymentSe
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
 import type { CognitoRepository as PersonRepo } from '../../repo/person';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
-import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../repo/sellerPaymentAccepted';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
@@ -18,7 +17,6 @@ import type { RedisRepository as TransactionNumberRepo } from '../../repo/transa
 import * as PayTransactionService from '../assetTransaction/pay';
 import { onPaymentStatusChanged } from './any/onPaymentStatusChanged';
 import { person2username } from './any/person2username';
-type IAuthorizePaymentAction = factory.action.authorize.paymentMethod.any.IAction;
 /**
  * 決済承認中止
  * タスクから決済承認を取り消す
@@ -30,7 +28,6 @@ declare function voidPayTransaction(params: factory.task.IData<factory.taskName.
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
 }) => Promise<void>;
@@ -41,7 +38,6 @@ declare function invalidatePaymentUrl(params: factory.task.IData<factory.taskNam
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
 }) => Promise<void>;
@@ -53,7 +49,6 @@ declare function processVoidPayTransaction(params: factory.task.IData<factory.ta
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;
-    project: ProjectRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
 }) => Promise<void>;
@@ -67,7 +62,6 @@ interface IAuthorizeRepos {
     paymentServiceProvider: PaymentServiceProviderRepo;
     person: PersonRepo;
     product: ProductRepo;
-    project: ProjectRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
@@ -79,7 +73,6 @@ interface IPublishPaymentUrlRepos {
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     person: PersonRepo;
-    project: ProjectRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
 }
@@ -122,5 +115,10 @@ declare function authorize(params: {
         useCheckByIdentifierIfNotYet: boolean;
         useSearchTrade4accountId: boolean;
     };
-}): IAuthorizeOperation<IAuthorizePaymentAction>;
+}): IAuthorizeOperation<{
+    /**
+     * 承認アクションID
+     */
+    id: string;
+}>;
 export { onPaymentStatusChanged, authorize, invalidatePaymentUrl, voidPayTransaction, person2username, processVoidPayTransaction, publishPaymentUrl };

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

@@ -79,7 +79,11 @@ function invalidatePaymentUrl(params) {
                         : String((_c = transaction.seller.name) === null || _c === void 0 ? void 0 : _c.ja),
                     id: transaction.seller.id
                 },
-                recipient: { typeOf: transaction.agent.typeOf, name: transaction.agent.name },
+                recipient: {
+                    typeOf: transaction.agent.typeOf,
+                    id: transaction.agent.id,
+                    name: transaction.agent.name
+                },
                 object: [{
                         typeOf: factory.service.paymentService.PaymentServiceType.CreditCard,
                         id: (_e = (_d = transaction.object.paymentMethods) === null || _d === void 0 ? void 0 : _d.issuedThrough) === null || _e === void 0 ? void 0 : _e.id,
@@ -193,7 +197,7 @@ function processVoidPayTransaction(params) {
                         }
                     }
                 }
-                yield repos.action.cancel({ typeOf: action.typeOf, id: action.id });
+                yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
             }
             catch (error) {
                 errors.push(error);
@@ -237,7 +241,8 @@ function publishPaymentUrl(params) {
             entryTranArgs: result.entryTranArgs,
             entryTranResult: result.entryTranResult,
             execTranArgs: result.execTranArgs,
-            execTranResult: result.execTranResult
+            execTranResult: result.execTranResult,
+            paymentMethod: startParams.object.paymentMethod // 拡張(2024-01-04~)
         };
         yield repos.transaction.findByIdAndUpdateInProgress({
             id: transaction.id,
@@ -256,16 +261,24 @@ exports.publishPaymentUrl = publishPaymentUrl;
 function authorize(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id });
         const paymentServiceType = params.paymentServiceType;
         // 取引番号生成
         let transactionNumber;
         let pendingPaymentAgencyTransaction;
+        let creditCard = params.object.creditCard;
         // リクエストでpaymentMethodIdを指定された場合、取引に保管されたpaymentMethodIdに一致すればそちらを適用(外部サイト決済対応)
         if (typeof params.object.paymentMethodId === 'string' && params.object.paymentMethodId.length > 0) {
             const paymentMethodByTransaction = transaction.object.paymentMethods;
             if (params.object.paymentMethodId === (paymentMethodByTransaction === null || paymentMethodByTransaction === void 0 ? void 0 : paymentMethodByTransaction.paymentMethodId)) {
+                // 検証強化(2024-01-04~)
+                validatePaymentMethodByTransaction({
+                    object: params.object,
+                    paymentMethodByTransaction
+                });
+                // creditCardを決済URL発行時の情報で上書き(2024-01-08~)
+                creditCard = (_a = 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
@@ -297,11 +310,12 @@ function authorize(params) {
             const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
             transactionNumber = publishTransactionNumberResult.transactionNumber;
         }
+        const authorizeObject = Object.assign(Object.assign(Object.assign({}, params.object), { paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }), (creditCard !== undefined) ? { creditCard } : undefined);
         // 承認アクションを開始する
         const actionAttributes = {
             project: transaction.project,
             typeOf: factory.actionType.AuthorizeAction,
-            object: Object.assign(Object.assign({}, params.object), { paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }),
+            object: authorizeObject,
             agent: {
                 typeOf: transaction.agent.typeOf,
                 id: transaction.agent.id
@@ -315,7 +329,7 @@ function authorize(params) {
                 id: transaction.seller.id,
                 name: (typeof transaction.seller.name === 'string')
                     ? transaction.seller.name
-                    : String((_a = transaction.seller.name) === null || _a === void 0 ? void 0 : _a.ja)
+                    : String((_b = transaction.seller.name) === null || _b === void 0 ? void 0 : _b.ja)
             },
             purpose: { typeOf: transaction.typeOf, id: transaction.id }
         };
@@ -323,12 +337,12 @@ function authorize(params) {
         let payTransaction;
         try {
             const { accountId } = yield validateFromLocation({
-                object: params.object,
+                object: authorizeObject,
                 project: { id: transaction.project.id }
             })({ action: repos.action });
             const startParams = (0, factory_1.creatPayTransactionStartParams)({
                 accountId,
-                object: params.object,
+                object: authorizeObject,
                 paymentServiceType,
                 transaction: transaction,
                 transactionNumber: transactionNumber,
@@ -363,11 +377,33 @@ function authorize(params) {
             throw error;
         }
         // アクションを完了
-        const result = (0, factory_1.createAuthorizeResult)({ payTransaction, object: params.object });
-        return yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
+        const result = (0, factory_1.createAuthorizeResult)({ payTransaction, object: authorizeObject });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+        return { id: action.id };
     });
 }
 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');
+    }
+}
 function validateFromLocation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;

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

@@ -7,8 +7,6 @@ import type { MongoRepository as AccountingReportRepo } from '../../repo/account
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as PaymentServiceRepo } from '../../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
-import type { CognitoRepository as PersonRepo } from '../../repo/person';
-import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../repo/sellerPaymentAccepted';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 interface IPaymentAgencyTransaction {
@@ -28,12 +26,14 @@ type IAuthorizeResult = IPaymentAgencyTransaction & {
 declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, options: {
     searchTrade4accountId: boolean;
     pendingPaymentAgencyTransaction?: IPaymentAgencyTransaction;
+    /**
+     * 決済URL発行処理かどうか
+     */
+    processPublishPaymentUrl: boolean;
 }): (repos: {
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    person: PersonRepo;
-    project: ProjectRepo;
 }) => Promise<IAuthorizeResult>;
 /**
  * クレジットカード決済中止
@@ -42,7 +42,6 @@ declare function voidTransaction(params: factory.task.voidPayment.IData): (repos
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
 }) => Promise<void>;
 /**
  * クレジットカード決済
@@ -53,24 +52,26 @@ declare function payCreditCard(params: factory.task.pay.IData): (repos: {
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
     task: TaskRepo;
 }) => Promise<import("@chevre/factory/lib/action/trade/pay").IAction>;
 /**
  * クレジットカード返金
  */
-declare function refundCreditCard(params: factory.task.refund.IData, requirePayAction: boolean): (repos: {
+declare function refundCreditCard(params: factory.task.refund.IData, options: {
+    requirePayAction: boolean;
+}): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
     task: TaskRepo;
 }) => Promise<import("@chevre/factory/lib/action/trade/refund").IAction>;
 interface IGMOInfo {
     shopId: string;
     shopPass: string;
+    returnUrls3ds: string[];
+    callbackType3ds?: factory.service.paymentService.ICallbackType3ds;
 }
 declare function getGMOInfoFromSeller(params: {
     paymentMethodType: string;