@chevre/domain 22.0.0-alpha.15 → 22.0.0-alpha.17

package/example/src/chevre/searchMinimizedEvent.ts

@@ -19,13 +19,8 @@ async function main() {
             // id: 'blxonxv1m'
         },
         [
-            'project', 'typeOf', 'startDate',
-            // 'superEvent.id',
-            // 'offers.itemOffered',
-            'offers.itemOffered.id',
-            'offers.offeredThrough',
-            'offers.eligibleQuantity',
-            'offers.unacceptedPaymentMethod'
+            'additionalProperty', 'startDate', 'offers.offeredThrough', 'superEvent.workPerformed.identifier',
+            'location.branchCode'
         ]
     );
     // tslint:disable-next-line:no-null-keyword

package/lib/chevre/repo/event.d.ts

@@ -74,7 +74,7 @@ type IKeyOfProjection<T extends factory.eventType> = keyof factory.event.IEvent<
  * minimizedEvent検索時のprojection候補
  * add(2024-07-18~)
  */
-type IKeyOfProjection4minimizedEvent<T extends factory.eventType> = T extends factory.eventType.ScreeningEvent ? keyof IMinimizedIndividualEvent<T> | 'project' | 'typeOf' | 'startDate' | 'superEvent.id' | 'offers.itemOffered' | 'offers.itemOffered.id' | 'offers.offeredThrough' | 'offers.unacceptedPaymentMethod' | 'offers.eligibleQuantity' : T extends factory.eventType.Event ? keyof IMinimizedIndividualEvent<T> | 'project' | 'typeOf' | 'startDate' | 'superEvent.id' | 'offers.itemOffered' | 'offers.itemOffered.id' | 'offers.offeredThrough' | 'offers.unacceptedPaymentMethod' | 'offers.eligibleQuantity' : never;
+type IKeyOfProjection4minimizedEvent<T extends factory.eventType> = T extends factory.eventType.ScreeningEvent ? keyof IMinimizedIndividualEvent<T> | 'superEvent.id' | 'location.branchCode' | 'superEvent.workPerformed.identifier' | 'offers.itemOffered' | 'offers.itemOffered.id' | 'offers.offeredThrough' | 'offers.unacceptedPaymentMethod' | 'offers.eligibleQuantity' : T extends factory.eventType.Event ? keyof IMinimizedIndividualEvent<T> | 'superEvent.id' | 'location.branchCode' | 'superEvent.workPerformed.identifier' | 'offers.itemOffered' | 'offers.itemOffered.id' | 'offers.offeredThrough' | 'offers.unacceptedPaymentMethod' | 'offers.eligibleQuantity' : never;
 type IUnset<T extends factory.eventType> = {
     [key in keyof factory.event.IEvent<T>]?: 1;
 };

package/lib/chevre/service/aggregation/event/aggregateUseActionsOnEvent.js

@@ -22,8 +22,8 @@ function aggregateUseActionsOnEvent(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
         // 集計対象イベント検索
-        // イベント取得属性最適化(2023-01-23~)
-        const event = yield repos.event.findMinimizedIndividualEventById(params, []);
+        const event = yield repos.event.findMinimizedIndividualEventById(params, ['offers.itemOffered.id', 'project', 'startDate', 'superEvent', 'typeOf'] // optimize projection(2024-07-19~)
+        );
         // 入場ゲート検索
         const entranceGates = yield findEntranceGates({ event })(repos);
         // 入場ゲートごとの集計

package/lib/chevre/service/aggregation/event/findEventOffers.d.ts

@@ -1,14 +1,18 @@
-import type { IMinimizedIndividualEvent } from '../../../repo/event';
 import type { IUnitPriceOfferFromAggregateOffer, OfferRepo } from '../../../repo/offer';
 import type { OfferCatalogRepo } from '../../../repo/offerCatalog';
 import type { ProductRepo } from '../../../repo/product';
-import * as factory from '../../../factory';
 /**
  * 興行オファー検索
  * NotFoundエラーをハンドリングする
  */
 export declare function findEventOffers(params: {
-    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent> | IMinimizedIndividualEvent<factory.eventType.Event>;
+    event: {
+        offers?: {
+            itemOffered?: {
+                id?: string;
+            };
+        };
+    };
 }): (repos: {
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;

package/lib/chevre/service/offer/event/voidTransaction.d.ts

@@ -9,7 +9,6 @@ import type { ReservationRepo } from '../../../repo/reservation';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 import type { TransactionRepo } from '../../../repo/transaction';
-export import WebAPIIdentifier = factory.service.webAPI.Identifier;
 interface IVoidTransactionRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
@@ -19,13 +18,16 @@ interface IVoidTransactionRepos {
     reservation: ReservationRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
-    reserveService: COA.service.Reserve;
+    /**
+     * COAオファー承認取消の場合必須
+     */
+    reserveService?: COA.service.Reserve;
 }
 /**
  * 興行オファー承認取消(タスクから実行 or apiから実行))
  * 取引中の承認アクション全てについて処理する or 特定の承認アクションについて処理する
  */
-export declare function voidTransaction(params: factory.task.IData<factory.taskName.VoidReserveTransaction> & {
+declare function voidTransaction(params: factory.task.IData<factory.taskName.VoidReserveTransaction> & {
     sameAs?: {
         /**
          * 実行元タスクID
@@ -33,4 +35,4 @@ export declare function voidTransaction(params: factory.task.IData<factory.taskN
         id: string;
     };
 }): (repos: IVoidTransactionRepos, settings: Settings) => Promise<void>;
-export {};
+export { voidTransaction };

package/lib/chevre/service/offer/event/voidTransaction.js

@@ -9,13 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.voidTransaction = exports.WebAPIIdentifier = void 0;
+exports.voidTransaction = void 0;
 const factory = require("../../../factory");
 const any_1 = require("../any");
 const processVoidTransaction4chevre_1 = require("./voidTransaction/processVoidTransaction4chevre");
 const processVoidTransaction4coa_1 = require("./voidTransaction/processVoidTransaction4coa");
 const voidTransactionByActionId_1 = require("./voidTransactionByActionId");
-exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
+var WebAPIIdentifier = factory.service.webAPI.Identifier;
 /**
  * 興行オファー承認取消(タスクから実行 or apiから実行))
  * 取引中の承認アクション全てについて処理する or 特定の承認アクションについて処理する
@@ -75,10 +75,14 @@ function voidTransaction(params) {
         yield Promise.all(authorizeActions.map((action) => __awaiter(this, void 0, void 0, function* () {
             yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
             switch (action.instrument.identifier) {
-                case exports.WebAPIIdentifier.COA:
+                case WebAPIIdentifier.COA:
+                    const { reserveService } = repos;
+                    if (reserveService === undefined) {
+                        throw new factory.errors.Internal('repos.reserveService required');
+                    }
                     yield (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({
                         action: action
-                    })(repos);
+                    })({ reserveService });
                     break;
                 default:
                     yield (0, processVoidTransaction4chevre_1.processVoidTransaction4chevre)({
@@ -146,9 +150,16 @@ function cancelAcceptActions(params) {
             default:
             // no op
         }
+        const { reserveService } = repos;
         yield Promise.all(acceptActions.map((action) => __awaiter(this, void 0, void 0, function* () {
             yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
-            yield (0, processVoidTransaction4coa_1.processVoidTransactionByAcceptAction4coa)({ action })(repos);
+            if (reserveService === undefined) {
+                throw new factory.errors.Internal('repos.reserveService required');
+            }
+            yield (0, processVoidTransaction4coa_1.processVoidTransactionByAcceptAction4coa)({ action })({
+                action: repos.action,
+                reserveService
+            });
         })));
     });
 }

package/lib/chevre/service/offer/event/voidTransactionByActionId.d.ts

@@ -18,7 +18,10 @@ interface IVoidTransactionByActionIdRepos {
     reservation: ReservationRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
-    reserveService: COA.service.Reserve;
+    /**
+     * COAオファー承認取消の場合必須
+     */
+    reserveService?: COA.service.Reserve;
 }
 /**
  * 興行オファー承認取消(apiから実行)

package/lib/chevre/service/offer/event/voidTransactionByActionId.js

@@ -53,9 +53,13 @@ function voidTransactionByActionId(params) {
         }
         switch (action.instrument.identifier) {
             case factory.service.webAPI.Identifier.COA:
+                const { reserveService } = repos;
+                if (reserveService === undefined) {
+                    throw new factory.errors.Internal('repos.reserveService required');
+                }
                 yield (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({
                     action: action
-                })(repos);
+                })({ reserveService });
                 break;
             default:
                 yield (0, processVoidTransaction4chevre_1.processVoidTransaction4chevre)({

package/lib/chevre/service/offer/event.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchOfferCatalogItems = exports.searchOfferCatalogItemAvailability = exports.searchOfferAppliesToMovieTicket = exports.searchEventTicketOffers = exports.voidTransaction = exports.importFromCOA = exports.importCategoryCodesFromCOA = exports.authorize = void 0;
 const authorize_1 = require("./event/authorize");
 Object.defineProperty(exports, "authorize", { enumerable: true, get: function () { return authorize_1.authorize; } });
-// import { cancel } from './event/cancel';
 const importFromCOA_1 = require("./event/importFromCOA");
 Object.defineProperty(exports, "importCategoryCodesFromCOA", { enumerable: true, get: function () { return importFromCOA_1.importCategoryCodesFromCOA; } });
 Object.defineProperty(exports, "importFromCOA", { enumerable: true, get: function () { return importFromCOA_1.importFromCOA; } });

package/lib/chevre/service/payment/movieTicket/checkMovieTicket.js

@@ -53,9 +53,10 @@ function checkMovieTicket(params) {
             if (eventIds.length !== 1) {
                 throw new factory.errors.Argument('movieTickets', 'Number of events must be 1');
             }
-            // イベント取得属性最適化(2023-01-23~)
-            let screeningEvent;
-            screeningEvent = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] }, []);
+            const screeningEvent = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] }, [
+                'typeOf', 'project', 'additionalProperty', 'startDate', 'offers.offeredThrough', 'superEvent.workPerformed.identifier'
+            ] // optimize projection(2024-07-19~)
+            );
             const sellerId = (_f = optimizedCheckObject[0]) === null || _f === void 0 ? void 0 : _f.seller.id;
             const paymentAccepted = yield repos.paymentAccepted.isAcceptedBySeller({
                 seller: { id: sellerId },
@@ -65,10 +66,8 @@ function checkMovieTicket(params) {
                 throw new factory.errors.Argument('transactionId', `payment not accepted [${paymentMethodType}]`);
             }
             processPurchaseNumberAuthResult = yield (0, processPurchaseNumberAuth_1.processPurchaseNumberAuth)({
-                movieTickets: movieTickets,
-                seller: { id: sellerId },
-                screeningEvent: screeningEvent,
-                paymentServiceId
+                movieTickets, screeningEvent, paymentServiceId,
+                seller: { id: sellerId }
             })(repos, settings);
             // add recipe(2024-06-07~)
             recipe = (0, factory_1.processPurchaseNumberAuthResult2checkRecipe)({

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

@@ -1,11 +1,22 @@
 import * as surfrock from '@surfrock/sdk';
 import * as factory from '../../../factory';
 import { IMinimizedIndividualEvent } from '../../../factory/event';
+type IEvent4seatInfoSync = Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id' | 'additionalProperty' | 'startDate'> & {
+    location: Pick<factory.event.event.ILocation, 'branchCode'>;
+    offers: {
+        offeredThrough?: factory.event.screeningEvent.IOfferedThrough | factory.event.screeningEvent.IOffer4COA['offeredThrough'];
+    };
+    superEvent: {
+        workPerformed: {
+            identifier: string;
+        };
+    };
+};
 declare function createSeatInfoSyncIn(params: {
     paymentMethodType: string;
     paymentMethodId: string;
     movieTickets: factory.action.trade.pay.IMovieTicket[];
-    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
+    event: IEvent4seatInfoSync;
     purpose: factory.action.trade.pay.IPurpose;
     credentials: {
         kgygishCd: string;
@@ -50,4 +61,4 @@ declare enum MovieticketReserveRequestErrorMessage {
     ReservationResult19 = "ReservationResult 19",
     CancellationPeriodPassed = "\u5EA7\u5E2D\u4E88\u7D04\u53D6\u6D88\u53EF\u80FD\u671F\u9593\u3092\u904E\u304E\u3066\u3044\u307E\u3059\u3002"
 }
-export { createSeatInfoSyncIn, createStartingPayAction, processPurchaseNumberAuthResult2checkRecipe, processSeatInfoSyncResult2payRecipe, processSeatInfoSyncResult2refundRecipe, MovieticketReserveRequestErrorMessage, IProcessPurchaseNumberAuthResult, IProcessSeatInfoSyncResult, IProcessSeatInfoSyncCancelResult };
+export { createSeatInfoSyncIn, createStartingPayAction, processPurchaseNumberAuthResult2checkRecipe, processSeatInfoSyncResult2payRecipe, processSeatInfoSyncResult2refundRecipe, MovieticketReserveRequestErrorMessage, IEvent4seatInfoSync, IProcessPurchaseNumberAuthResult, IProcessSeatInfoSyncResult, IProcessSeatInfoSyncCancelResult };

package/lib/chevre/service/payment/movieTicket/payMovieTicket.js

@@ -111,8 +111,12 @@ function payActionParams2seatInfoSyncIn(params) {
         if (eventIds.length !== 1) {
             throw new factory.errors.Argument('movieTickets', 'Number of events must be 1');
         }
-        // イベント取得属性最適化(2023-01-23~)
-        const event = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] }, []);
+        const event = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] }, 
+        // optimize projection(2024-07-19~)
+        [
+            'superEvent', 'additionalProperty', 'startDate', 'project',
+            'offers.offeredThrough', 'location.branchCode', 'superEvent.workPerformed.identifier'
+        ]);
         const sellerId = String((_d = params.recipient) === null || _d === void 0 ? void 0 : _d.id);
         // 全購入管理番号のMovieTicketをマージ
         const movieTickets = params.object.reduce((a, b) => [...a, ...(Array.isArray(b.movieTickets)) ? b.movieTickets : []], []);

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

@@ -7,16 +7,22 @@ interface ICheckResult {
     purchaseNumberAuthIn: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthIn;
     purchaseNumberAuthResult: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult;
 }
+type IEvent4checkByIdentifier = Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id' | 'typeOf' | 'project' | 'additionalProperty' | 'startDate'> & {
+    offers: {
+        offeredThrough?: factory.event.screeningEvent.IOfferedThrough | factory.event.screeningEvent.IOffer4COA['offeredThrough'];
+    };
+    superEvent: {
+        workPerformed: {
+            identifier: string;
+        };
+    };
+};
 interface ICheckByIdentifierParams {
     movieTickets: factory.action.check.paymentMethod.movieTicket.IMovieTicket[];
     seller: {
         id: string;
     };
-    screeningEvent: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id' | 'typeOf' | 'project' | 'additionalProperty' | 'superEvent' | 'startDate'> & {
-        offers: {
-            offeredThrough?: factory.event.screeningEvent.IOfferedThrough | factory.event.screeningEvent.IOffer4COA['offeredThrough'];
-        };
-    };
+    screeningEvent: IEvent4checkByIdentifier;
     paymentServiceId: string;
 }
 declare function processPurchaseNumberAuth(params: ICheckByIdentifierParams): (repos: {

package/lib/chevre/service/payment/movieTicket/validation.js

@@ -45,7 +45,9 @@ function validateMovieTicket(params, paymentServiceId, useCheckByIdentifierIfNot
             throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         // イベント取得属性最適化(2023-01-23~)
-        const screeningEvent = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] }, ['typeOf', 'project', 'additionalProperty', 'superEvent', 'startDate', 'offers.offeredThrough'] // optimize(2024-07-18~)
+        const screeningEvent = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] }, [
+            'typeOf', 'project', 'additionalProperty', 'startDate', 'offers.offeredThrough', 'superEvent.workPerformed.identifier'
+        ] // optimize(2024-07-18~)
         );
         // 販売者からムビチケ決済情報取得
         const sellerId = (_c = params.recipient) === null || _c === void 0 ? void 0 : _c.id;

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

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const product_1 = require("../../repo/product");
-const MoneyTransferService = require("../moneyTransfer");
+const moneyTransfer_1 = require("../moneyTransfer");
 /**
  * タスク実行関数
  */
@@ -20,7 +20,7 @@ function call(data) {
     return ({ connection }) => __awaiter(this, void 0, void 0, function* () {
         const assetTransactionRepo = new assetTransaction_1.AssetTransactionRepo(connection);
         const productRepo = new product_1.ProductRepo(connection);
-        yield MoneyTransferService.cancelMoneyTransfer(data)({
+        yield (0, moneyTransfer_1.cancelMoneyTransfer)(data)({
             assetTransaction: assetTransactionRepo,
             product: productRepo
         });

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

@@ -17,7 +17,7 @@ const offer_1 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
 const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
-const ReserveService = require("../reserve");
+const cancelReservation_1 = require("../reserve/cancelReservation");
 /**
  * タスク実行関数
  */
@@ -36,7 +36,7 @@ function call(data) {
         // if (data.actionAttributes.length !== 1) {
         //     throw new factory.errors.Argument('data.actionAttributes', 'data.actionAttributes.length must be 1');
         // }
-        yield ReserveService.cancelPendingReservation(data)({
+        yield (0, cancelReservation_1.cancelPendingReservation)(data)({
             action: actionRepo,
             assetTransaction: assetTransactionRepo,
             stockHolder: stockHolderRepo,

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

@@ -17,7 +17,7 @@ const offer_1 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
 const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
-const ReserveService = require("../reserve");
+const cancelReservation_1 = require("../reserve/cancelReservation");
 /**
  * タスク実行関数
  */
@@ -32,7 +32,7 @@ function call(data) {
         const transactionRepo = new assetTransaction_1.AssetTransactionRepo(connection);
         const stockHolderRepo = new stockHolder_1.StockHolderRepo(redisClient, connection);
         const offerRateLimitRepo = new offer_1.OfferRateLimitRepo(redisClient);
-        yield ReserveService.cancelReservation(data.actionAttributes)({
+        yield (0, cancelReservation_1.cancelReservation)(data.actionAttributes)({
             action: actionRepo,
             reservation: reservationRepo,
             task: taskRepo,

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

@@ -13,13 +13,13 @@ exports.call = void 0;
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const task_1 = require("../../repo/task");
-const MoneyTransferOfferService = require("../offer/moneyTransfer");
+const settleTransaction_1 = require("../offer/moneyTransfer/settleTransaction");
 /**
  * タスク実行関数
  */
 function call(data) {
     return ({ connection }) => __awaiter(this, void 0, void 0, function* () {
-        yield MoneyTransferOfferService.settleTransaction(data)({
+        yield (0, settleTransaction_1.settleTransaction)(data)({
             action: new action_1.ActionRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             task: new task_1.TaskRepo(connection)

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

@@ -15,7 +15,7 @@ const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const task_1 = require("../../repo/task");
-const RegisterServiceTransactionService = require("../assetTransaction/registerService");
+const registerService_1 = require("../assetTransaction/registerService");
 /**
  * タスク実行関数
  */
@@ -56,7 +56,7 @@ function confirmRegisterServiceTransaction(params) {
                 transactionNumber = params.object.transactionNumber;
             }
             if (typeof transactionNumber === 'string') {
-                yield RegisterServiceTransactionService.confirm(Object.assign({ transactionNumber }, (confirmActionAttributes.object.endDate !== undefined)
+                yield (0, registerService_1.confirm)(Object.assign({ transactionNumber }, (confirmActionAttributes.object.endDate !== undefined)
                     ? {
                         endDate: moment(confirmActionAttributes.object.endDate)
                             .toDate()

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

@@ -20,8 +20,8 @@ const assetTransaction_1 = require("../../repo/assetTransaction");
 const order_1 = require("../../repo/order");
 const reservation_1 = require("../../repo/reservation");
 const task_1 = require("../../repo/task");
-const ReserveTransactionService = require("../assetTransaction/reserve");
-const COAReserveService = require("../assetTransaction/reserveCOA");
+const confirm_1 = require("../assetTransaction/reserve/confirm");
+const reserveCOA_1 = require("../assetTransaction/reserveCOA");
 const factory_1 = require("../assetTransaction/reserveCOA/factory");
 /**
  * タスク実行関数
@@ -171,7 +171,7 @@ function confirmReserveTransaction(params, options) {
             switch (object.typeOf) {
                 case factory.assetTransactionType.COAReserveTransaction:
                     // COA本予約
-                    const processConfirmCOAReserveResult = yield COAReserveService.confirm({
+                    const processConfirmCOAReserveResult = yield (0, reserveCOA_1.confirm)({
                         project: { id: confirmActionAttributes.project.id },
                         object: object,
                         purpose: confirmActionAttributes.purpose
@@ -184,7 +184,7 @@ function confirmReserveTransaction(params, options) {
                     break;
                 default:
                     // 予約取引確定
-                    yield ReserveTransactionService.confirm({
+                    yield (0, confirm_1.confirm)({
                         transactionNumber: object.transactionNumber,
                         potentialActions: object.potentialActions
                     })(repos, settings);

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

@@ -22,13 +22,13 @@ const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const task_1 = require("../../repo/task");
-const PaymentService = require("../payment");
+const payment_1 = require("../payment");
 /**
  * タスク実行関数
  */
 function call(params) {
     return ({ connection, settings }) => __awaiter(this, void 0, void 0, function* () {
-        yield PaymentService.pay(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id, typeOf: 'Task' } // タスクIDを関連付け(2024-04-20~)
+        yield (0, payment_1.pay)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id, typeOf: 'Task' } // タスクIDを関連付け(2024-04-20~)
          }))({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),

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

@@ -17,13 +17,13 @@ const order_1 = require("../../repo/order");
 const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
-const OrderService = require("../order");
+const placeOrder_1 = require("../order/placeOrder");
 /**
  * タスク実行関数
  */
 function call(data) {
     return ({ connection, settings }) => __awaiter(this, void 0, void 0, function* () {
-        yield OrderService.placeOrder(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
+        yield (0, placeOrder_1.placeOrder)(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),

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

@@ -21,7 +21,7 @@ const project_1 = require("../../repo/project");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const task_1 = require("../../repo/task");
 const transactionNumber_1 = require("../../repo/transactionNumber");
-const PaymentService = require("../payment");
+const payment_1 = require("../payment");
 /**
  * タスク実行関数
  */
@@ -38,7 +38,7 @@ function call(params) {
         else {
             data = params;
         }
-        yield PaymentService.refund(data)({
+        yield (0, payment_1.refund)(data)({
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
             paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),

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

@@ -13,7 +13,7 @@ exports.call = void 0;
 const action_1 = require("../../repo/action");
 const serviceOutput_1 = require("../../repo/serviceOutput");
 const task_1 = require("../../repo/task");
-const ProductService = require("../product");
+const product_1 = require("../product");
 /**
  * タスク実行関数
  */
@@ -22,7 +22,7 @@ function call(data) {
         const actionRepo = new action_1.ActionRepo(connection);
         const serviceOutputRepo = new serviceOutput_1.ServiceOutputRepo(connection);
         const taskRepo = new task_1.TaskRepo(connection);
-        yield ProductService.registerService(data)({
+        yield (0, product_1.registerService)(data)({
             action: actionRepo,
             serviceOutput: serviceOutputRepo,
             task: taskRepo

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

@@ -14,13 +14,13 @@ const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const reservation_1 = require("../../repo/reservation");
 const task_1 = require("../../repo/task");
-const ReserveService = require("../reserve");
+const confirmReservation_1 = require("../reserve/confirmReservation");
 /**
  * タスク実行関数
  */
 function call(data) {
     return ({ connection, settings }) => __awaiter(this, void 0, void 0, function* () {
-        yield ReserveService.confirmReservation({
+        yield (0, confirmReservation_1.confirmReservation)({
             // actionAttributesList: data.actionAttributes,
             potentialReserveAction: data,
             useOnReservationConfirmed: true,

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

@@ -16,7 +16,7 @@ const assetTransaction_1 = require("../../repo/assetTransaction");
 const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
 const transactionNumber_1 = require("../../repo/transactionNumber");
-const MoneyTransferOfferService = require("../offer/moneyTransfer");
+const returnMoneyTransfer_1 = require("../offer/moneyTransfer/returnMoneyTransfer");
 /**
  * タスク実行関数
  */
@@ -30,7 +30,7 @@ function call(data) {
         const productRepo = new product_1.ProductRepo(connection);
         const projectRepo = new project_1.ProjectRepo(connection);
         const transactionNumberRepo = new transactionNumber_1.TransactionNumberRepo(redisClient);
-        yield MoneyTransferOfferService.returnMoneyTransfer(data)({
+        yield (0, returnMoneyTransfer_1.returnMoneyTransfer)(data)({
             action: actionRepo,
             assetTransaction: assetTransactionRepo,
             product: productRepo,

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

@@ -13,13 +13,13 @@ exports.call = void 0;
 const action_1 = require("../../repo/action");
 const message_1 = require("../../repo/message");
 const project_1 = require("../../repo/project");
-const NotificationService = require("../notification");
+const notification_1 = require("../notification");
 /**
  * タスク実行関数
  */
 function call(params) {
     return ({ connection, credentials }) => __awaiter(this, void 0, void 0, function* () {
-        yield NotificationService.sendEmailMessage(Object.assign(Object.assign({}, params.data.actionAttributes), { sameAs: { id: params.id } // タスクIDを関連付け(2024-06-25~)
+        yield (0, notification_1.sendEmailMessage)(Object.assign(Object.assign({}, params.data.actionAttributes), { sameAs: { id: params.id } // タスクIDを関連付け(2024-06-25~)
          }))({
             action: new action_1.ActionRepo(connection),
             message: new message_1.MessageRepo(connection),

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

@@ -17,14 +17,14 @@ const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
-const OrderService = require("../order");
+const sendOrder_1 = require("../order/sendOrder");
 /**
  * タスク実行関数
  */
 function call(data) {
     return ({ connection, settings }) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        yield OrderService.sendOrder(Object.assign(Object.assign({}, data), { object: Object.assign(Object.assign({}, data.object), { previousOrderStatus: (typeof data.object.previousOrderStatus === 'string')
+        yield (0, sendOrder_1.sendOrder)(Object.assign(Object.assign({}, data), { object: Object.assign(Object.assign({}, data.object), { previousOrderStatus: (typeof data.object.previousOrderStatus === 'string')
                     ? data.object.previousOrderStatus
                     : factory.orderStatus.OrderInTransit, acceptedOffers: (typeof ((_a = data.object.acceptedOffers) === null || _a === void 0 ? void 0 : _a.limit) === 'number')
                     ? data.object.acceptedOffers

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

@@ -13,7 +13,7 @@ exports.call = void 0;
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const transaction_1 = require("../../repo/transaction");
-const MoneyTransferOfferService = require("../offer/moneyTransfer");
+const voidTransaction_1 = require("../offer/moneyTransfer/voidTransaction");
 /**
  * タスク実行関数
  */
@@ -22,7 +22,7 @@ function call(data) {
         const actionRepo = new action_1.ActionRepo(connection);
         const assetTransactionRepo = new assetTransaction_1.AssetTransactionRepo(connection);
         const transactionRepo = new transaction_1.TransactionRepo(connection);
-        yield MoneyTransferOfferService.voidTransaction(data)({
+        yield (0, voidTransaction_1.voidTransaction)(data)({
             action: actionRepo,
             assetTransaction: assetTransactionRepo,
             transaction: transactionRepo

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

@@ -18,13 +18,13 @@ const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
-const AnyPaymentService = require("../payment/any");
+const any_1 = require("../payment/any");
 /**
  * タスク実行関数
  */
 function call(params) {
     return ({ connection, settings }) => __awaiter(this, void 0, void 0, function* () {
-        yield AnyPaymentService.voidPayTransaction(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } }))({
+        yield (0, any_1.voidPayTransaction)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } }))({
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),

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

@@ -18,13 +18,13 @@ const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const task_1 = require("../../repo/task");
-const PaymentService = require("../payment");
+const payment_1 = require("../payment");
 /**
  * タスク実行関数
  */
 function call(data) {
     return ({ connection, settings }) => __awaiter(this, void 0, void 0, function* () {
-        yield PaymentService.voidPayment(data)({
+        yield (0, payment_1.voidPayment)(data)({
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
             paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),

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

@@ -13,7 +13,7 @@ exports.call = void 0;
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const transaction_1 = require("../../repo/transaction");
-const ProductOfferService = require("../offer/product");
+const product_1 = require("../offer/product");
 /**
  * タスク実行関数
  */
@@ -22,7 +22,7 @@ function call(data) {
         const actionRepo = new action_1.ActionRepo(connection);
         const assetTransactionRepo = new assetTransaction_1.AssetTransactionRepo(connection);
         const transactionRepo = new transaction_1.TransactionRepo(connection);
-        yield ProductOfferService.voidTransaction(data)({
+        yield (0, product_1.voidTransaction)(data)({
             action: actionRepo,
             assetTransaction: assetTransactionRepo,
             transaction: transactionRepo

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

@@ -21,7 +21,7 @@ const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
 const transactionProcess_1 = require("../../repo/transactionProcess");
-const event_1 = require("../offer/event");
+const voidTransaction_1 = require("../offer/event/voidTransaction");
 /**
  * タスク実行関数
  */
@@ -47,7 +47,7 @@ function call(params) {
         }, { timeout: settings.coa.timeout });
         const transactionProcessRepo = new transactionProcess_1.TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
-            yield (0, event_1.voidTransaction)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } }))({
+            yield (0, voidTransaction_1.voidTransaction)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } }))({
                 action: new action_1.ActionRepo(connection),
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 stockHolder: new stockHolder_1.StockHolderRepo(redisClient, connection),

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.0.0-alpha.15"
+  "version": "22.0.0-alpha.17"
 }