@chevre/domain 25.2.0-alpha.3 → 25.2.0-alpha.31

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

@@ -42,12 +42,20 @@ function findAcceptAction(params) {
                     if (acceptAction.purpose?.id !== params.purpose.id) {
                         throw new factory_1.factory.errors.NotFound('Action');
                     }
-                    const acceptActionWithResult = await repos.acceptPayAction.findById({ id: acceptAction.id, typeOf: factory_1.factory.actionType.AcceptAction }, ['result', 'object'], []);
+                    // result.paymentUrl廃止につき、paymentUrlはrecipeを参照する(2026-07-14~)
+                    // const acceptActionWithResult = await repos.acceptPayAction.findById(
+                    //     { id: acceptAction.id, typeOf: factory.actionType.AcceptAction },
+                    //     ['result', 'object'],
+                    //     []
+                    // ) as Pick<factory.action.accept.pay.IAction, 'result' | 'object'>;
+                    const acceptPayResult = await repos.acceptPayAction.findPaymentUrlById({
+                        project: { id: params.project.id },
+                        id: acceptAction.id
+                    });
                     action = {
                         id: acceptAction.id,
                         actionStatus: acceptAction.actionStatus,
-                        // add object.transactionNumber(2025-08-26~)
-                        object: { transactionNumber: acceptActionWithResult.object.transactionNumber },
+                        object: { transactionNumber: acceptPayResult.paymentMethodId }, // add object.transactionNumber(2025-08-26~)
                         ...(acceptAction.error !== undefined)
                             ? {
                                 error: (Array.isArray(acceptAction.error))
@@ -55,11 +63,11 @@ function findAcceptAction(params) {
                                     : acceptAction.error
                             }
                             : undefined,
-                        ...(acceptActionWithResult?.result !== undefined)
+                        ...(typeof acceptPayResult.paymentUrl === 'string')
                             ? {
                                 result: {
-                                    paymentMethodId: acceptActionWithResult.result.paymentMethodId,
-                                    paymentUrl: acceptActionWithResult.result.paymentUrl
+                                    paymentMethodId: acceptPayResult.paymentMethodId,
+                                    paymentUrl: acceptPayResult.paymentUrl
                                 }
                             }
                             : undefined

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

@@ -6,6 +6,7 @@ import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import type { TaskRepo } from '../../../repo/task';
+import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 interface IInvalidatePaymentUrlRepos {
     accountingReport: AccountingReportRepo;
@@ -16,6 +17,7 @@ interface IInvalidatePaymentUrlRepos {
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     task: TaskRepo;
+    orderInTransaction: OrderInTransactionRepo;
     placeOrder: PlaceOrderRepo;
 }
 /**

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

@@ -25,14 +25,6 @@ function invalidatePaymentUrl(params) {
         // }
         // support multiple accept actions(2025-02-25~)
         let acceptPayActions = await repos.acceptPayAction.findAcceptActionsByPurpose({
-            // project: { id: { $eq: transaction.project.id } },
-            // typeOf: { $eq: factory.actionType.AcceptAction },
-            // // actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] }, // all statuses(2025-02-26~)
-            // purpose: { id: { $in: [transaction.id] } },
-            // object: {
-            //     // transactionNumber: { $eq: paymentMethodIdByPaymentUrl },
-            //     typeOf: { $eq: factory.assetTransactionType.Pay }
-            // }
             project: { id: transaction.project.id },
             purpose: { id: transaction.id },
         }, ['object']);
@@ -43,9 +35,10 @@ function invalidatePaymentUrl(params) {
                 // support OrderCanceled(2025-02-25~)
                 const orderCancelled = params.purpose.result?.order?.orderStatus === factory_1.factory.orderStatus.OrderCancelled;
                 if (!orderCancelled) {
-                    const paymentMethodIdByPaymentUrl = transaction.object.paymentMethods?.paymentMethodId;
-                    if (typeof paymentMethodIdByPaymentUrl === 'string') {
-                        acceptPayActions = acceptPayActions.filter(({ object }) => object.transactionNumber !== paymentMethodIdByPaymentUrl);
+                    // 確定取引の場合、注文に紐づいた決済方法IDは除外しなければいけない
+                    const paymentMethodIdByTransaction = await repos.orderInTransaction.findPaymentMethodId({ id: transaction.id });
+                    if (typeof paymentMethodIdByTransaction === 'string') {
+                        acceptPayActions = acceptPayActions.filter(({ object }) => object.transactionNumber !== paymentMethodIdByTransaction);
                     }
                 }
                 break;
@@ -106,60 +99,5 @@ function invalidatePaymentUrl(params) {
         if (invalidatePaymentUrlTasks.length > 0) {
             await repos.task.saveMany(invalidatePaymentUrlTasks, { emitImmediately: true });
         }
-        // const paymentMethodIdByPaymentUrl = transaction.object.paymentMethods?.paymentMethodId;
-        // if (typeof paymentMethodIdByPaymentUrl === 'string' && paymentMethodIdByPaymentUrl.length > 0) {
-        //     const acceptPayAction = (<Pick<IAcceptPayAction, 'object'>[]>await 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: paymentMethodIdByPaymentUrl },
-        //                 typeOf: { $eq: factory.assetTransactionType.Pay }
-        //             }
-        //         },
-        //         ['object']
-        //     )).shift();
-        //     if (acceptPayAction !== undefined) {
-        //         // const paymentMethodType = transaction.object.paymentMethods?.typeOf;
-        //         const paymentMethodType = acceptPayAction.object.object.paymentMethod.identifier;
-        //         if (typeof paymentMethodType === 'string' && paymentMethodType.length > 0) {
-        //             // chevreで決済URL無効化
-        //             await PayTransactionService.invalidatePaymentUrl({
-        //                 project: transaction.project,
-        //                 typeOf: factory.actionType.RefundAction,
-        //                 agent: {
-        //                     typeOf: transaction.seller.typeOf,
-        //                     name: (typeof transaction.seller.name === 'string')
-        //                         ? transaction.seller.name
-        //                         : String(transaction.seller.name?.ja),
-        //                     id: transaction.seller.id
-        //                 },
-        //                 recipient: {
-        //                     typeOf: transaction.agent.typeOf,
-        //                     id: transaction.agent.id,
-        //                     name: transaction.agent.name
-        //                 },
-        //                 object: [{
-        //                     typeOf: factory.service.paymentService.PaymentServiceType.CreditCard,
-        //                     id: acceptPayAction.object.object.id,
-        //                     paymentMethod: {
-        //                         additionalProperty: [],
-        //                         name: paymentMethodType,
-        //                         typeOf: paymentMethodType,
-        //                         paymentMethodId: paymentMethodIdByPaymentUrl
-        //                     },
-        //                     refundFee: 0
-        //                 }],
-        //                 purpose: { typeOf: transaction.typeOf, id: transaction.id },
-        //                 instrument: [],
-        //                 ...(typeof params.sameAs?.id === 'string') ? { sameAs: params.sameAs } : undefined
-        //             })(repos, settings);
-        //         }
-        //     }
-        // }
     };
 }

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

@@ -7,6 +7,7 @@ import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { EventRepo } from '../../../repo/event';
 import type { EventSeriesRepo } from '../../../repo/eventSeries';
 import type { IssuerRepo } from '../../../repo/issuer';
+import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
@@ -22,6 +23,7 @@ interface IPublishPaymentUrlRepos {
     event: EventRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
+    orderInTransaction: OrderInTransactionRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
@@ -58,5 +60,7 @@ declare function publishPaymentUrl(params: {
      */
     identifier?: string;
     instrument: factory.action.trade.pay.IAcceptedPaymentMethodOfferAsInstrument[];
+}, options: {
+    savePaymentMethodIdInTransaction: boolean;
 }): IPublishPaymentUrlOperation<Pick<PayTransactionService.IPublishPaymentUrlResult, 'paymentMethodId' | 'paymentUrl'>>;
 export { IPublishPaymentUrlRepos, publishPaymentUrl };

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

@@ -41,7 +41,7 @@ const factory_2 = require("./factory");
 /**
  * 外部決済ロケーションを発行する
  */
-function publishPaymentUrl(params) {
+function publishPaymentUrl(params, options) {
     return async (repos, settings) => {
         const { paymentServiceType, purpose, project } = params;
         if (purpose.typeOf !== factory_1.factory.transactionType.PlaceOrder) {
@@ -104,24 +104,10 @@ function publishPaymentUrl(params) {
                 executor: (typeof taskId === 'string') ? { id: taskId } : {} // タスク関連付け(2024-05-22~)
             })(repos, settings);
             // 取引に保管
-            const paymentMethodByPaymentUrl = {
-                // typeOf: params.object.paymentMethod, // discontinue(2024-06-05~)
-                paymentMethodId: result.paymentMethodId
-                // paymentUrl: result.paymentUrl, // migrate to recipe(2024-06-05~)
-                // issuedThrough: {
-                //     id: (typeof startParams.object.id === 'string') ? startParams.object.id : ''
-                // } // migrate to acceptAction(2024-06-05~)
-                // GMO IFを保管(2024-01-01~)
-                // entryTranArgs: result.entryTranArgs, // migrate to recipe(2024-06-05~)
-                // entryTranResult: result.entryTranResult, // migrate to recipe(2024-06-05~)
-                // execTranArgs: result.execTranArgs, // migrate to recipe(2024-06-05~)
-                // execTranResult: result.execTranResult, // migrate to recipe(2024-06-05~)
-                // paymentMethod: startParams.object.paymentMethod // 拡張(2024-01-04~) // migrate to acceptAction(2024-06-05~)
-            };
-            await repos.placeOrder.findByIdAndUpdateInProgress({
+            await repos.orderInTransaction.savePaymentMethodId({
                 id: transaction.id,
-                update: { $set: { 'object.paymentMethods': paymentMethodByPaymentUrl } }
-            });
+                paymentMethod: { paymentMethodId: result.paymentMethodId }
+            }, options);
             return {
                 paymentMethodId: result.paymentMethodId,
                 paymentUrl: result.paymentUrl

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

@@ -7,6 +7,7 @@ import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import type { TaskRepo } from '../../../repo/task';
+import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 /**
  * 決済承認中止
@@ -29,6 +30,7 @@ declare function voidPayTransaction(params: factory.task.IData<factory.taskName.
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     task: TaskRepo;
+    orderInTransaction: OrderInTransactionRepo;
     placeOrder: PlaceOrderRepo;
 }) => Promise<void>;
 export { voidPayTransaction, };

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

@@ -8,29 +8,7 @@ const processVoidPayTransaction_1 = require("./processVoidPayTransaction");
  * タスクから決済承認を取り消す
  */
 function voidPayTransaction(params) {
-    return async (repos
-    // settings: Settings
-    ) => {
-        // 決済承認アクション確認不要(2024-03-12~)
-        // 決済承認アクションを検索
-        // let authorizeActions = <factory.action.authorize.paymentMethod.any.IAction[]>
-        //     await repos.action.searchByPurpose({
-        //         typeOf: factory.actionType.AuthorizeAction,
-        //         purpose: {
-        //             typeOf: params.purpose.typeOf,
-        //             id: params.purpose.id
-        //         }
-        //     });
-        // authorizeActions = authorizeActions.filter(
-        //     (a) => a.object.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment
-        // );
-        // // Chevreを使用した承認を取り消し
-        // const authorizeActionsWithChevre = authorizeActions.filter((a) => {
-        //     return a.instrument?.identifier === factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre;
-        // });
-        // if (authorizeActionsWithChevre.length > 0) {
-        //     await processVoidPayTransaction(params)(repos);
-        // }
+    return async (repos) => {
         await (0, processVoidPayTransaction_1.processVoidPayTransaction)(params)(repos);
         // 決済URL無効化もここで処理
         await (0, invalidatePaymentUrl_1.invalidatePaymentUrl)(params)(repos);

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

@@ -26,7 +26,7 @@ declare function processAuthorizeCreditCard(params: {
     callbackType3ds?: factory.service.paymentService.ICallbackType3ds;
     orderId: string;
     availableChannel: Pick<factory.serviceChannel.IServiceChannelCreditCard, 'credentials' | 'serviceUrl'>;
-    object: factory.assetTransaction.pay.IPaymentMethod;
+    object: factory.assetTransaction.pay.IPaymentMethodWithoutDetail;
     /**
      * 決済URL発行処理かどうか
      */

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

@@ -15,6 +15,9 @@ function processAuthorizeCreditCard(params) {
         // const { cardSeq, memberId } = creditCard as IUnauthorizedCardOfMember; // 会員カード廃止(2026-04-07~)
         const { cardNo, cardPass, expire } = creditCard;
         const { token } = creditCard;
+        if (typeof params.object.amount !== 'number') {
+            throw new factory_1.factory.errors.Argument('object.amount', 'must be number');
+        }
         const retUrl = creditCard?.retUrl;
         // 3DS拡張(2024-01-02~)
         if (params.processPublishPaymentUrl === true && typeof retUrl === 'string' && retUrl.length > 0) {
@@ -32,13 +35,8 @@ function processAuthorizeCreditCard(params) {
             entryTranArgs = {
                 shopId, shopPass, orderId,
                 jobCd: gmo_service_1.GMO.factory.util.JobCd.Auth,
-                amount: (typeof params.object.amount === 'number')
-                    ? params.object.amount
-                    : params.object.amount.value,
-                // siteId: params.availableChannel.credentials?.siteId,
-                // sitePass: params.availableChannel.credentials?.sitePass,
+                amount: params.object.amount,
                 tdFlag: gmo_service_1.GMO.factory.util.TdFlag.Version2,
-                // tdTenantName: '',
                 tds2Type: gmo_service_1.GMO.factory.util.Tds2Type.Error
             };
             entryTranResult = await repos.creditCardService.entryTran(entryTranArgs);
@@ -65,9 +63,7 @@ function processAuthorizeCreditCard(params) {
             entryTranArgs = {
                 shopId, shopPass, orderId,
                 jobCd: gmo_service_1.GMO.factory.util.JobCd.Auth,
-                amount: (typeof params.object.amount === 'number')
-                    ? params.object.amount
-                    : params.object.amount.value,
+                amount: params.object.amount,
                 siteId: params.availableChannel.credentials?.siteId,
                 sitePass: params.availableChannel.credentials?.sitePass
             };

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js

@@ -46,6 +46,7 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onReservationStatusChanged']);
         // const informReservations = settings.onReservationStatusChanged.informReservation;
         const informReservations = setting?.onReservationStatusChanged?.informReservation;
+        const minimizeReservation = setting?.onReservationStatusChanged?.minimizeReservation === true;
         let orderAsAbout;
         if (Array.isArray(reserveAction.instrument)) {
             for (const eachInstrument of reserveAction.instrument) {
@@ -98,16 +99,24 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
             }
             const subReservations4inform = confirmedReservations.map((r) => {
                 const { additionalProperty, additionalTicketText, id, modifiedTime, price, programMembershipUsed, reservedTicket, subReservation, typeOf } = r;
+                let reservedTicket4inform;
+                if (minimizeReservation) {
+                    const { ticketType: _ticketType, ...reservedTicketWithNoTicketType } = reservedTicket;
+                    reservedTicket4inform = reservedTicketWithNoTicketType;
+                }
+                else {
+                    reservedTicket4inform = reservedTicket; // eslint-disable-line @typescript-eslint/no-explicit-any
+                }
                 return {
                     id,
                     typeOf,
-                    reservedTicket,
-                    ...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined,
+                    reservedTicket: reservedTicket4inform,
                     ...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
                     ...(modifiedTime instanceof Date) ? { modifiedTime } : undefined,
-                    ...(price !== undefined) ? { price } : undefined,
-                    ...(programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined,
-                    ...(Array.isArray(subReservation)) ? { subReservation } : undefined
+                    ...(Array.isArray(subReservation)) ? { subReservation } : undefined,
+                    ...(!minimizeReservation && Array.isArray(additionalProperty)) ? { additionalProperty } : undefined, // eslint-disable-line @typescript-eslint/no-explicit-any
+                    ...(!minimizeReservation && price !== undefined) ? { price } : undefined, // eslint-disable-line @typescript-eslint/no-explicit-any
+                    ...(!minimizeReservation && programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined, // eslint-disable-line @typescript-eslint/no-explicit-any
                 };
             });
             if (typeof issuedThrough.id !== 'string') {
@@ -116,7 +125,6 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
             }
             const informObject = {
                 bookingTime,
-                issuedThrough, // subReservationから移行(2024-03-20~)
                 project,
                 provider, // subReservationから移行(2024-03-20~)
                 reservationFor,
@@ -124,8 +132,9 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
                 reservationStatus: factory_1.factory.reservationStatusType.ReservationConfirmed,
                 subReservation: subReservations4inform,
                 typeOf: factory_1.factory.reservationType.ReservationPackage,
-                ...(typeof underName?.typeOf === 'string')
-                    ? { underName: (0, factory_2.optimizeUnderName4inform)({ underName }) }
+                ...(!minimizeReservation) ? { issuedThrough } : undefined, // eslint-disable-line @typescript-eslint/no-explicit-any
+                ...(!minimizeReservation && typeof underName?.typeOf === 'string')
+                    ? { underName: (0, factory_2.optimizeUnderName4inform)({ underName }) } // eslint-disable-line @typescript-eslint/no-explicit-any
                     : undefined
             };
             const informIdentifier = `${factory_1.factory.reservationType.ReservationPackage}:${informObject.reservationNumber}:${informObject.reservationStatus}`;

package/lib/chevre/service/reserve/searchByOrder.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchByOrder = searchByOrder;
-const google_libphonenumber_1 = require("google-libphonenumber");
+const customerTelephone2COATelNum_1 = require("../../factory/customerTelephone2COATelNum");
 const factory_1 = require("../../factory");
 function searchByOrder(params) {
     return async (repos) => {
@@ -42,11 +42,7 @@ function searchByOrder(params) {
                     if (order === undefined) {
                         throw new factory_1.factory.errors.NotFound(factory_1.factory.order.OrderType.Order);
                     }
-                    const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
-                    const phoneNumber = phoneUtil.parse(order.customer.telephone, 'JP');
-                    let telNum = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.NATIONAL);
-                    // COAでは数字のみ受け付けるので数字以外を除去
-                    telNum = telNum.replace(/[^\d]/g, '');
+                    const telNum = (0, customerTelephone2COATelNum_1.customerTelephone2COATelNum)({ telephone: String(order.customer.telephone) });
                     const reservationNumber = (await repos.acceptedOffer.distinctValues({
                         orderNumber: { $in: [params.orderNumber] }
                     }, 'acceptedOffers.itemOffered.reservationNumber')).shift();

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

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 exports.confirmReserveTransaction = confirmReserveTransaction;
 const coa_service_1 = require("@motionpicture/coa-service");
-const google_libphonenumber_1 = require("google-libphonenumber");
 const util_1 = require("util");
+const customerTelephone2COATelNum_1 = require("../../factory/customerTelephone2COATelNum");
 const factory_1 = require("../../factory");
 const confirm_1 = require("../assetTransaction/reserve/confirm");
 const reserveCOA_1 = require("../assetTransaction/reserveCOA");
@@ -71,12 +71,7 @@ function createConfirmObject4COAByOrder(params) {
             && o.offeredThrough?.identifier === factory_1.factory.service.webAPI.Identifier.COA;
     });
     const customer = params.order.customer;
-    // 電話番号のフォーマットを日本人にリーダブルに調整(COAではこのフォーマットで扱うので)
-    const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
-    const phoneNumber = phoneUtil.parse(customer.telephone, 'JP');
-    let telNum = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.NATIONAL);
-    // COAでは数字のみ受け付けるので数字以外を除去
-    telNum = telNum.replace(/[^\d]/g, '');
+    const telNum = (0, customerTelephone2COATelNum_1.customerTelephone2COATelNum)({ telephone: String(customer.telephone) });
     const mailAddr = customer.email;
     if (mailAddr === undefined) {
         throw new factory_1.factory.errors.Argument('order', 'order.customer.email undefined');

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

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const message_1 = require("../../repo/message");
 const order_1 = require("../../repo/order");
 const setting_1 = require("../../repo/setting");
 const integration_1 = require("../../repo/setting/integration");
 const task_1 = require("../../repo/task");
-// import { TransactionRepo } from '../../repo/transaction';
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const onAssetTransactionStatusChanged_1 = require("../order/onAssetTransactionStatusChanged");
 /**
@@ -19,10 +19,10 @@ function call(data) {
         await (0, onAssetTransactionStatusChanged_1.onAssetTransactionStatusChanged)(data)({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
+            message: new message_1.MessageRepo(connection),
             order: new order_1.OrderRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
-            // transaction: new TransactionRepo(connection),
             placeOrder: new placeOrder_1.PlaceOrderRepo(connection)
         }, settings);
     };

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
+const message_1 = require("../../repo/message");
 const order_1 = require("../../repo/order");
 const setting_1 = require("../../repo/setting");
 const integration_1 = require("../../repo/setting/integration");
@@ -16,6 +17,7 @@ function call(data) {
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         await (0, payOrder_1.payOrder)(data)({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
+            message: new message_1.MessageRepo(connection),
             order: new order_1.OrderRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),

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

@@ -6,12 +6,12 @@ const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const authorizeOffer_1 = require("../../repo/action/authorizeOffer");
 const authorizePaymentMethod_1 = require("../../repo/action/authorizePaymentMethod");
+const message_1 = require("../../repo/message");
 const order_1 = require("../../repo/order");
 const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const setting_1 = require("../../repo/setting");
 const integration_1 = require("../../repo/setting/integration");
 const task_1 = require("../../repo/task");
-// import { TransactionRepo } from '../../repo/transaction';
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const placeOrder_2 = require("../order/placeOrder");
 /**
@@ -29,11 +29,11 @@ function call(data) {
             action: new action_1.ActionRepo(connection),
             authorizeOfferAction: new authorizeOffer_1.AuthorizeOfferActionRepo(connection),
             authorizePaymentMethodAction: new authorizePaymentMethod_1.AuthorizePaymentMethodActionRepo(connection),
+            message: new message_1.MessageRepo(connection),
             order: new order_1.OrderRepo(connection),
             orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
-            // transaction: new TransactionRepo(connection),
             placeOrder: new placeOrder_1.PlaceOrderRepo(connection)
         }, settings);
     };

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

@@ -9,7 +9,7 @@ const authorization_1 = require("../../repo/authorization");
 const event_1 = require("../../repo/event");
 const eventSeries_1 = require("../../repo/eventSeries");
 const issuer_1 = require("../../repo/issuer");
-// import { OrderInTransactionRepo } from '../../repo/orderInTransaction';
+const orderInTransaction_1 = require("../../repo/orderInTransaction");
 // import { OrderNumberRepo } from '../../repo/orderNumber';
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
@@ -36,10 +36,14 @@ function call(params) {
         const actionRepo = new acceptPay_1.AcceptPayActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
+            const { savePaymentMethodIdInTransaction, project: _project, ...publishPaymentUrlParams } = params.data;
             await (0, any_1.publishPaymentUrl)({
-                ...params.data,
+                ...publishPaymentUrlParams,
+                project: { id: params.project.id },
                 instrument: (Array.isArray(params.data.instrument)) ? params.data.instrument : [],
                 sameAs: { id: params.id }
+            }, {
+                savePaymentMethodIdInTransaction: savePaymentMethodIdInTransaction === true
             })({
                 acceptPayAction: actionRepo,
                 authorizeInvoiceAction: new authorizeInvoice_1.AuthorizeInvoiceActionRepo(connection),
@@ -48,7 +52,7 @@ function call(params) {
                 event: new event_1.EventRepo(connection),
                 eventSeries: new eventSeries_1.EventSeriesRepo(connection),
                 issuer: new issuer_1.IssuerRepo(connection),
-                // orderInTransaction: new OrderInTransactionRepo(connection),
+                orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
                 // orderNumber: new OrderNumberRepo({ connection }),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const accountingReport_1 = require("../../repo/accountingReport");
-// import { ActionRepo } from '../../repo/action';
 const acceptPay_1 = require("../../repo/action/acceptPay");
 const authorizePaymentMethod_1 = require("../../repo/action/authorizePaymentMethod");
 const assetTransaction_1 = require("../../repo/assetTransaction");
@@ -10,8 +9,8 @@ const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const task_1 = require("../../repo/task");
+const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
-// import { TransactionRepo } from '../../repo/transaction';
 const any_1 = require("../payment/any");
 /**
  * タスク実行関数
@@ -24,7 +23,6 @@ function call(params) {
             sameAs: { id: params.id }
         })({
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
-            // action: new ActionRepo(connection),
             acceptPayAction: new acceptPay_1.AcceptPayActionRepo(connection),
             authorizePaymentMethodAction: new authorizePaymentMethod_1.AuthorizePaymentMethodActionRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
@@ -32,10 +30,8 @@ function call(params) {
             paymentService: new paymentService_1.PaymentServiceRepo(connection),
             paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
             task: new task_1.TaskRepo(connection),
+            orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
             placeOrder: new placeOrder_1.PlaceOrderRepo(connection)
-            // transaction: new TransactionRepo(connection)
-        }
-        // settings
-        );
+        });
     };
 }

package/lib/chevre/service/transaction/deleteTransaction/deletePayTransactionsByPlaceOrder.d.ts

@@ -0,0 +1,15 @@
+import { factory } from '../../../factory';
+import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
+type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction;
+type IAuthorizePaymentAction = factory.action.authorize.paymentMethod.any.IAction;
+export declare function deletePayTransactionsByPlaceOrder(params: {
+    authorizeActions: (IAuthorizeOfferAction | IAuthorizePaymentAction)[];
+    transaction: Pick<factory.transaction.placeOrder.ITransaction, 'project'>;
+}): (repos: {
+    assetTransaction: AssetTransactionRepo;
+}) => Promise<{
+    deletePayTransactionResult: any;
+    deleteRefundResult: any;
+    payTransactionNumbers: string[];
+}>;
+export {};

package/lib/chevre/service/transaction/deleteTransaction/deletePayTransactionsByPlaceOrder.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deletePayTransactionsByPlaceOrder = deletePayTransactionsByPlaceOrder;
+/* eslint-disable @typescript-eslint/no-explicit-any */
+const factory_1 = require("../../../factory");
+function deletePayTransactionsByPlaceOrder(params) {
+    return async (repos) => {
+        let deletePayTransactionResult;
+        let deleteRefundResult;
+        const authorizeActions = params.authorizeActions;
+        // 決済取引番号を抽出
+        const authorizePaymentActions = authorizeActions
+            .filter((a) => {
+            return a.object.typeOf === factory_1.factory.action.authorize.paymentMethod.any.ResultType.Payment
+                && typeof a.object?.paymentMethodId === 'string'
+                && a.object.paymentMethodId.length > 0;
+        });
+        const payTransactionNumbers = authorizePaymentActions.map((a) => String(a.object.paymentMethodId));
+        if (payTransactionNumbers.length > 0) {
+            // 決済取引を削除(プロジェクトでも絞ること)(2022-06-07~)
+            const deleteAssetTransactionsResult = await repos.assetTransaction.deleteByTransactionNumber({
+                project: { id: params.transaction.project.id },
+                transactionNumbers: payTransactionNumbers,
+                typeOf: factory_1.factory.assetTransactionType.Pay
+            });
+            deletePayTransactionResult = {
+                n: deleteAssetTransactionsResult?.n,
+                ok: deleteAssetTransactionsResult?.ok,
+                deletedCount: deleteAssetTransactionsResult?.deletedCount
+            };
+            // 返金取引も削除(2023-05-19~)
+            const refundTransactions = await repos.assetTransaction.search({
+                typeOf: factory_1.factory.assetTransactionType.Refund,
+                object: { paymentMethodId: { $in: payTransactionNumbers } }
+            }, ['transactionNumber'], []);
+            if (refundTransactions.length > 0) {
+                const deleteRefundAssetTransactionsResult = await repos.assetTransaction.deleteByTransactionNumber({
+                    project: { id: params.transaction.project.id },
+                    transactionNumbers: refundTransactions.map(({ transactionNumber }) => transactionNumber),
+                    typeOf: factory_1.factory.assetTransactionType.Refund
+                });
+                deleteRefundResult = {
+                    n: deleteRefundAssetTransactionsResult?.n,
+                    ok: deleteRefundAssetTransactionsResult?.ok,
+                    deletedCount: deleteRefundAssetTransactionsResult?.deletedCount
+                };
+            }
+        }
+        return { deletePayTransactionResult, deleteRefundResult, payTransactionNumbers };
+    };
+}