@chevre/domain 25.2.0-alpha.4 → 25.2.0-alpha.41

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/reserve.d.ts

@@ -5,7 +5,7 @@ import { cancelPendingReservation, cancelReservation } from './reserve/cancelRes
 import { checkInReservation } from './reserve/checkInReservation';
 import { confirmReservation } from './reserve/confirmReservation';
 import { findByCode } from './reserve/findByCode';
-import { findReservations } from './reserve/findReservations';
+import { adminFindReservations } from './reserve/adminFindReservations';
 import { searchByOrder } from './reserve/searchByOrder';
 import { verifyToken4reservation } from './reserve/verifyToken4reservation';
-export { cancelPendingReservation, cancelReservation, checkInReservation, confirmReservation, findByCode, findReservations, searchByOrder, verifyToken4reservation };
+export { cancelPendingReservation, cancelReservation, checkInReservation, confirmReservation, findByCode, adminFindReservations, searchByOrder, verifyToken4reservation };

package/lib/chevre/service/reserve.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyToken4reservation = exports.searchByOrder = exports.findReservations = exports.findByCode = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation = void 0;
+exports.verifyToken4reservation = exports.searchByOrder = exports.adminFindReservations = exports.findByCode = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation = void 0;
 /**
  * 予約サービス
  */
@@ -13,8 +13,8 @@ const confirmReservation_1 = require("./reserve/confirmReservation");
 Object.defineProperty(exports, "confirmReservation", { enumerable: true, get: function () { return confirmReservation_1.confirmReservation; } });
 const findByCode_1 = require("./reserve/findByCode");
 Object.defineProperty(exports, "findByCode", { enumerable: true, get: function () { return findByCode_1.findByCode; } });
-const findReservations_1 = require("./reserve/findReservations");
-Object.defineProperty(exports, "findReservations", { enumerable: true, get: function () { return findReservations_1.findReservations; } });
+const adminFindReservations_1 = require("./reserve/adminFindReservations");
+Object.defineProperty(exports, "adminFindReservations", { enumerable: true, get: function () { return adminFindReservations_1.adminFindReservations; } });
 const searchByOrder_1 = require("./reserve/searchByOrder");
 Object.defineProperty(exports, "searchByOrder", { enumerable: true, get: function () { return searchByOrder_1.searchByOrder; } });
 const verifyToken4reservation_1 = require("./reserve/verifyToken4reservation");

package/lib/chevre/service/task/aggregateOffers.d.ts

@@ -1,6 +1,6 @@
 import { factory } from '../../factory';
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.aggregateOffers.IData): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.aggregateOffers.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -15,8 +15,9 @@ const aggregateOffers_1 = require("../aggregation/event/aggregateOffers");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ redisClient, connection }) => {
+        const { data } = params;
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }

package/lib/chevre/service/task/aggregateScreeningEvent.d.ts

@@ -1,6 +1,6 @@
 import { factory } from '../../factory';
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.aggregateScreeningEvent.IData): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.aggregateScreeningEvent.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -49,8 +49,9 @@ const AggregationService = __importStar(require("../aggregation"));
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection, redisClient }) => {
+        const { data } = params;
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }

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

@@ -52,8 +52,10 @@ function call(params) {
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
             && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         try {
+            const { instrument: _instrument, project: _project, ...authorizeParams } = params.data;
             await (0, any_1.authorize)({
-                ...params.data,
+                ...authorizeParams,
+                project: { id: params.project.id },
                 instrument: (Array.isArray(params.data.instrument)) ? params.data.instrument : [],
                 sameAs: { id: params.id } // タスクIDを関連付け(2024-04-20~)
             })({

package/lib/chevre/service/task/cancelReservation.d.ts

@@ -1,6 +1,6 @@
 import { factory } from '../../factory';
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.cancelReservation.IData): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.cancelReservation.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -13,8 +13,9 @@ const cancelReservation_1 = require("../reserve/cancelReservation");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection, redisClient }) => {
+        const { data } = params;
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }

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

@@ -15,7 +15,6 @@ const confirmPayTransaction_1 = require("../order/confirmPayTransaction");
  * タスク実行関数
  */
 function call(params) {
-    // export function call(data: factory.task.IData<factory.taskName.ConfirmPayTransaction>): IOperationExecute<void> {
     return async ({ connection }) => {
         await (0, confirmPayTransaction_1.confirmPayTransaction)({
             ...params.data,

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/deleteTransaction.d.ts

@@ -1,6 +1,6 @@
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import { factory } from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.IData<factory.taskName.DeleteTransaction>): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.deleteTransaction.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -49,8 +49,9 @@ const TransactionService = __importStar(require("../transaction"));
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection }) => {
+        const { data } = params;
         await TransactionService.deleteTransaction(data)({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),

package/lib/chevre/service/task/onAssetTransactionStatusChanged.d.ts

@@ -1,6 +1,6 @@
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import { factory } from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.IData<factory.taskName.OnAssetTransactionStatusChanged>): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.onAssetTransactionStatusChanged.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -3,26 +3,27 @@ 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");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection }) => {
+        const { data } = params;
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         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/onEventChanged.d.ts

@@ -1,6 +1,6 @@
 import { factory } from '../../factory';
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.onEventChanged.IData): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.onEventChanged.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -11,8 +11,9 @@ const onEventChanged_1 = require("../offer/onEventChanged");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection }) => {
+        const { data } = params;
         await (0, onEventChanged_1.onEventChanged)(data)({
             event: new event_1.EventRepo(connection),
             eventSeries: new eventSeries_1.EventSeriesRepo(connection),

package/lib/chevre/service/task/onOrderPaymentCompleted.d.ts

@@ -1,6 +1,6 @@
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import { factory } from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.IData<factory.taskName.OnOrderPaymentCompleted>): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.ITask<factory.taskName.OnOrderPaymentCompleted>, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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");
@@ -11,11 +12,13 @@ const payOrder_1 = require("../order/payOrder");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection }) => {
+        const { data } = params;
         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/onResourceUpdated/onAggregateOfferUpdated.js

@@ -11,7 +11,7 @@ function createInformOfferTasks(params, setting) {
         }
         // const informResources = settings.onResourceUpdated.informResource;
         const informResources = setting?.onResourceUpdated?.informResource;
-        const offers = await repos.offer.search({
+        const offers = await repos.offer.findUnitPriceOffers({
             id: { $in: params.ids }
         }, { typeOf: 1, name: 1, priceSpecification: 1, additionalProperty: 1, identifier: 1, project: 1 });
         const offers4inform = offers.map(({ id, typeOf, name, priceSpecification, additionalProperty, identifier, project }) => {

package/lib/chevre/service/task/onResourceUpdated.d.ts

@@ -1,6 +1,6 @@
 import { factory } from '../../factory';
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.onResourceUpdated.IData): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.onResourceUpdated.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -29,8 +29,9 @@ const onOfferCatalogUpdated_1 = require("./onResourceUpdated/onOfferCatalogUpdat
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection }) => {
+        const { data } = params;
         await onResourceUpdated(data)({
             accountTitle: new accountTitle_1.AccountTitleRepo(connection),
             action: new action_1.ActionRepo(connection),

package/lib/chevre/service/task/placeOrder.d.ts

@@ -1,6 +1,6 @@
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import { factory } from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.IData<factory.taskName.PlaceOrder>): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.ITask<factory.taskName.PlaceOrder>, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -1,27 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
+const factory_1 = require("../../factory");
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 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");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection }) => {
+        const { data } = params;
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         await (0, placeOrder_2.placeOrder)({
             ...data,
+            agent: { id: data.project.id, typeOf: factory_1.factory.organizationType.Project },
             useOnOrderStatusChanged: true
         })({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
@@ -29,11 +32,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/refund.d.ts

@@ -1,6 +1,6 @@
-import type { IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import { factory } from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(params: factory.task.refund.IData | Pick<factory.task.refund.ITask, IExecutableTaskKeys>): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.refund.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -26,16 +26,10 @@ function call(params) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
         const settings = new integration_1.IntegrationSettingRepo({ connection });
-        let data;
-        if (params.name === factory_1.factory.taskName.Refund) {
-            data = {
-                ...params.data,
-                sameAs: { id: params.id } // タスクIDを関連付け(2024-04-20~)
-            };
-        }
-        else {
-            data = params;
-        }
+        const data = {
+            ...params.data,
+            sameAs: { id: params.id } // タスクIDを関連付け(2024-04-20~)
+        };
         const paymentServiceId = data.object.at(0)?.id;
         const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''

package/lib/chevre/service/task/reserve.d.ts

@@ -1,6 +1,6 @@
 import { factory } from '../../factory';
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.reserve.IData): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.reserve.ITask, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -11,8 +11,9 @@ const confirmReservation_1 = require("../reserve/confirmReservation");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection }) => {
+        const { data } = params;
         await (0, confirmReservation_1.confirmReservation)({
             // actionAttributesList: data.actionAttributes,
             potentialReserveAction: data, // optimize(2024-07-01~)

package/lib/chevre/service/task/returnOrder.d.ts

@@ -1,6 +1,6 @@
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import { factory } from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.IData<factory.taskName.ReturnOrder>): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.ITask<factory.taskName.ReturnOrder>, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -12,8 +12,9 @@ const returnOrder_2 = require("../order/returnOrder");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection }) => {
+        const { data } = params;
         await (0, returnOrder_2.returnOrder)({
             ...data,
             useOnOrderStatusChanged: true

package/lib/chevre/service/task/sendOrder.d.ts

@@ -1,6 +1,6 @@
-import type { IOperationExecute } from '../taskHandler';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import { factory } from '../../factory';
 /**
  * タスク実行関数
  */
-export declare function call(data: factory.task.IData<factory.taskName.SendOrder>): IOperationExecute<void>;
+export declare function call(params: Pick<factory.task.ITask<factory.taskName.SendOrder>, IExecutableTaskKeys>): IOperationExecute<ICallResult>;

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

@@ -13,8 +13,9 @@ const sendOrder_1 = require("../order/sendOrder");
 /**
  * タスク実行関数
  */
-function call(data) {
+function call(params) {
     return async ({ connection }) => {
+        const { data } = params;
         await (0, sendOrder_1.sendOrder)({
             ...data,
             object: {

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
-        );
+        });
     };
 }