@chevre/domain 26.0.0-alpha.25 → 26.0.0-alpha.26

package/lib/chevre/repository.d.ts

@@ -17,10 +17,12 @@ import type { PayActionRepo } from './repo/action/pay';
 import type { RefundActionRepo } from './repo/action/refund';
 import type { AsyncActionRepo } from './repo/asyncAction';
 import type { AdditionalPropertyRepo } from './repo/additionalProperty';
+import type { AdminAssetTransactionRepo } from './repo/adminAssetTransaction';
 import type { AdminAsyncActionRepo } from './repo/adminAsyncAction';
 import type { AdminScheduledTaskRepo } from './repo/adminScheduledTask';
 import type { AdminTaskRepo } from './repo/adminTask';
 import type { AggregateActionRepo } from './repo/aggregateAction';
+import type { AggregateAssetTransactionRepo } from './repo/aggregateAssetTransaction';
 import type { AggregateOfferRepo } from './repo/aggregateOffer';
 import type { AggregateOrderRepo } from './repo/aggregateOrder';
 import type { AggregateReservationRepo } from './repo/aggregateReservation';
@@ -166,6 +168,10 @@ export type AdditionalProperty = AdditionalPropertyRepo;
 export declare namespace AdditionalProperty {
     function createInstance(...params: ConstructorParameters<typeof AdditionalPropertyRepo>): Promise<AdditionalPropertyRepo>;
 }
+export type AdminAssetTransaction = AdminAssetTransactionRepo;
+export declare namespace AdminAssetTransaction {
+    function createInstance(...params: ConstructorParameters<typeof AdminAssetTransactionRepo>): Promise<AdminAssetTransactionRepo>;
+}
 export type AdminAsyncAction = AdminAsyncActionRepo;
 export declare namespace AdminAsyncAction {
     function createInstance(...params: ConstructorParameters<typeof AdminAsyncActionRepo>): Promise<AdminAsyncActionRepo>;
@@ -190,6 +196,10 @@ export type AggregateTask = AggregateTaskRepo;
 export declare namespace AggregateTask {
     function createInstance(...params: ConstructorParameters<typeof AggregateTaskRepo>): Promise<AggregateTaskRepo>;
 }
+export type AggregateAssetTransaction = AggregateAssetTransactionRepo;
+export declare namespace AggregateAssetTransaction {
+    function createInstance(...params: ConstructorParameters<typeof AggregateAssetTransactionRepo>): Promise<AggregateAssetTransactionRepo>;
+}
 export type AggregateOffer = AggregateOfferRepo;
 export declare namespace AggregateOffer {
     function createInstance(...params: ConstructorParameters<typeof AggregateOfferRepo>): Promise<AggregateOfferRepo>;

package/lib/chevre/repository.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Authorization = exports.CategoryCode = exports.assetTransaction = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AggregateTask = exports.AggregateScheduledTask = exports.AggregateAction = exports.AdminTask = exports.AdminScheduledTask = exports.AdminAsyncAction = exports.AdditionalProperty = exports.action = exports.Action = exports.AccountTitle = exports.AccountingReport = exports.AcceptedOffer = void 0;
-exports.WebSite = exports.rateLimit = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.AsyncAction = exports.TaskDelayed = exports.Task = exports.ScheduledTask = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Person = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = void 0;
+exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Authorization = exports.CategoryCode = exports.assetTransaction = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AggregateAssetTransaction = exports.AggregateTask = exports.AggregateScheduledTask = exports.AggregateAction = exports.AdminTask = exports.AdminScheduledTask = exports.AdminAsyncAction = exports.AdminAssetTransaction = exports.AdditionalProperty = exports.action = exports.Action = exports.AccountTitle = exports.AccountingReport = exports.AcceptedOffer = void 0;
+exports.WebSite = exports.rateLimit = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.AsyncAction = exports.TaskDelayed = exports.Task = exports.ScheduledTask = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Person = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = exports.PaymentService = exports.Passport = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -170,6 +170,17 @@ var AdditionalProperty;
     }
     AdditionalProperty.createInstance = createInstance;
 })(AdditionalProperty || (exports.AdditionalProperty = AdditionalProperty = {}));
+var AdminAssetTransaction;
+(function (AdminAssetTransaction) {
+    let repo;
+    async function createInstance(...params) {
+        if (repo === undefined) {
+            repo = (await import('./repo/adminAssetTransaction.js')).AdminAssetTransactionRepo;
+        }
+        return new repo(...params);
+    }
+    AdminAssetTransaction.createInstance = createInstance;
+})(AdminAssetTransaction || (exports.AdminAssetTransaction = AdminAssetTransaction = {}));
 var AdminAsyncAction;
 (function (AdminAsyncAction) {
     let repo;
@@ -236,6 +247,17 @@ var AggregateTask;
     }
     AggregateTask.createInstance = createInstance;
 })(AggregateTask || (exports.AggregateTask = AggregateTask = {}));
+var AggregateAssetTransaction;
+(function (AggregateAssetTransaction) {
+    let repo;
+    async function createInstance(...params) {
+        if (repo === undefined) {
+            repo = (await import('./repo/aggregateAssetTransaction.js')).AggregateAssetTransactionRepo;
+        }
+        return new repo(...params);
+    }
+    AggregateAssetTransaction.createInstance = createInstance;
+})(AggregateAssetTransaction || (exports.AggregateAssetTransaction = AggregateAssetTransaction = {}));
 var AggregateOffer;
 (function (AggregateOffer) {
     let repo;

package/lib/chevre/service/aggregation/system.d.ts

@@ -1,10 +1,10 @@
 import type { AggregateActionRepo } from '../../repo/aggregateAction';
+import type { AggregateAssetTransactionRepo } from '../../repo/aggregateAssetTransaction';
 import type { AggregateScheduledTaskRepo } from '../../repo/aggregateScheduledTask';
 import type { AggregateTaskRepo } from '../../repo/aggregateTask';
-import { AggregationRepo } from '../../repo/aggregation';
-import type { AssetTransactionRepo } from '../../repo/assetTransaction';
+import type { AggregationRepo } from '../../repo/aggregation';
 import type { EventRepo } from '../../repo/event';
-import { OrderRepo } from '../../repo/order';
+import type { OrderRepo } from '../../repo/order';
 import type { TransactionRepo } from '../../repo/transaction';
 type AggregateDurationUnit = 'days' | 'hours';
 interface IAggregateParams {
@@ -125,7 +125,7 @@ declare function aggregatePayMovieTicketAction(params: IAggregateParams): (repos
 }>;
 declare function aggregatePayTransaction(params: IAggregateParams): (repos: {
     agregation: AggregationRepo;
-    assetTransaction: AssetTransactionRepo;
+    aggregateAssetTransaction: AggregateAssetTransactionRepo;
 }) => Promise<{
     aggregationCount: number;
     aggregateDuration: string;
@@ -135,7 +135,7 @@ declare function aggregatePayTransaction(params: IAggregateParams): (repos: {
  */
 declare function aggregateReserveTransaction(params: IAggregateParams): (repos: {
     agregation: AggregationRepo;
-    assetTransaction: AssetTransactionRepo;
+    aggregateAssetTransaction: AggregateAssetTransactionRepo;
 }) => Promise<{
     aggregationCount: number;
     aggregateDuration: string;

package/lib/chevre/service/aggregation/system.js

@@ -587,7 +587,7 @@ function aggregatePayTransaction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.assetTransaction.aggregateAssetTransaction({
+            const aggregateResult = await repos.aggregateAssetTransaction.aggregateAssetTransaction({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough,
@@ -632,7 +632,7 @@ function aggregateReserveTransaction(params) {
                 .add(-i, params.aggregateDurationUnit)
                 .endOf(params.aggregateDurationUnit)
                 .toDate();
-            const aggregateResult = await repos.assetTransaction.aggregateAssetTransaction({
+            const aggregateResult = await repos.aggregateAssetTransaction.aggregateAssetTransaction({
                 project: { id: { $ne: params.excludedProjectId } },
                 startFrom,
                 startThrough,

package/lib/chevre/service/assetTransaction/cancelReservation/start.js

@@ -11,30 +11,15 @@ function validateStartParams(params) {
         const sellerId = params.seller?.id;
         // 予約番号で取引存在確認
         if (typeof params.object.reservation?.reservationNumber === 'string') {
-            const transactions = await repos.assetTransaction.search({
+            const transactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 limit: 1,
                 page: 1,
                 typeOf: factory_1.factory.assetTransactionType.Reserve,
                 object: {
-                    reservationNumber: { $eq: params.object.reservation.reservationNumber },
-                    // 販売者検証(2023-08-01~)
-                    ...(typeof sellerId === 'string') ? { provider: { id: { $eq: sellerId } } } : undefined
+                    reservationNumber: { $eq: params.object.reservation.reservationNumber }
                 }
             });
             reserveTransaction = transactions.shift();
-            // ここでReservationConfirmedでない予約をスルーしても、
-            // ReservationRepo.cancel()で冪等性を保証しているのでvalidation不要か(2022-05-12~)
-            // 予約ステータス確認
-            // const unconfirmedReservations = await repos.reservation.search({
-            //     limit: 1,
-            //     page: 1,
-            //     typeOf: factory.reservationType.EventReservation,
-            //     reservationNumber: { $eq: params.object.reservation.reservationNumber },
-            //     reservationStatus: { $ne: factory.reservationStatusType.ReservationConfirmed }
-            // });
-            // if (unconfirmedReservations.length > 0) {
-            //     throw new factory.errors.Argument('object.reservation.reservationNumber', `Reservation ${unconfirmedReservations[0].id} not confirmed`);
-            // }
         }
         // 取引指定が確認できなければ、予約指定を確認
         if (reserveTransaction === undefined) {
@@ -59,6 +44,14 @@ function validateStartParams(params) {
                 reservations = [reservation];
             }
         }
+        else {
+            // 販売者検証(2023-08-01~)
+            if (typeof sellerId === 'string') {
+                if (reserveTransaction.object.provider?.id !== sellerId) {
+                    throw new factory_1.factory.errors.NotFound(factory_1.factory.reservationType.EventReservation);
+                }
+            }
+        }
         if (reserveTransaction === undefined && reservations === undefined) {
             throw new factory_1.factory.errors.Argument('object', 'Transaction or reservation must be specified');
         }

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

@@ -135,12 +135,12 @@ function confirm(params) {
         else {
             throw new factory_1.factory.errors.ArgumentNull('Transaction ID or Transaction Number');
         }
-        const payTransaction = (await repos.assetTransaction.search({
+        const payTransaction = (await repos.assetTransaction.findAssetTransactionsByTypeOf({
             limit: 1,
             page: 1,
             typeOf: factory_1.factory.assetTransactionType.Pay,
             transactionNumber: { $eq: transaction.object.paymentMethodId }
-        }, ['recipient'], [])).shift();
+        }, ['recipient'])).shift();
         if (payTransaction === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.assetTransactionType.Pay);
         }

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

@@ -2,15 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processVoidTransaction4chevre = processVoidTransaction4chevre;
 const factory_1 = require("../../../../factory");
-// import type { TransactionRepo } from '../../../../repo/transaction';
 const reserve_1 = require("../../../assetTransaction/reserve");
 function processVoidTransaction4chevre(params) {
     return async (repos, settings) => {
-        // const transactionNumber = params.action.object.pendingTransaction?.transactionNumber;
         const transactionNumber = params.action.instrument.transactionNumber;
         if (typeof transactionNumber === 'string') {
             // 取引が存在すれば中止
-            const assetTransactions = await repos.assetTransaction.search({
+            const assetTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.action.project.id } },

package/lib/chevre/service/order/onAssetTransactionStatusChanged/isDeliverable.js

@@ -1,9 +1,7 @@
 "use strict";
-// import createDebug from 'debug';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isDeliverable = isDeliverable;
 const factory_1 = require("../../../factory");
-// const debug = createDebug('chevre-domain:service:order');
 function isDeliverable(params) {
     return async (repos) => {
         let allReserveTransactionConfirmed = false;
@@ -15,7 +13,7 @@ function isDeliverable(params) {
             // 注文のreservationNumberを取得
             const reservationNumbers = await repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.itemOffered.reservationNumber');
             if (reservationNumbers.length > 0) {
-                const referencedReserveTransactions = await repos.assetTransaction.search({
+                const referencedReserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                     project: { id: { $eq: params.project.id } },
                     typeOf: factory_1.factory.assetTransactionType.Reserve,
                     transactionNumber: { $in: reservationNumbers }
@@ -27,52 +25,6 @@ function isDeliverable(params) {
             else {
                 allReserveTransactionConfirmed = true;
             }
-            // } else if (params.assetTransactionType === factory.assetTransactionType.MoneyTransfer) {
-            //     allReserveTransactionConfirmed = true;
-            //     allRegisterServiceTransactionConfirmed = true;
-            //     // 注文のMoneyTransferTransaction.transactionNumberを取得
-            //     const moneyTransferTransactionNumbers = await repos.acceptedOffer.distinctValues(
-            //         { orderNumber: { $in: [params.orderNumber] } },
-            //         'acceptedOffers.serialNumber'
-            //     );
-            //     if (moneyTransferTransactionNumbers.length > 0) {
-            //         debug('is deliverable?...', params.orderNumber, 'moneyTransferTransactionNumbers:', moneyTransferTransactionNumbers);
-            //         const referencedMoneyTransferTransactions = await repos.assetTransaction.search(
-            //             {
-            //                 project: { id: { $eq: params.project.id } },
-            //                 typeOf: factory.assetTransactionType.MoneyTransfer,
-            //                 transactionNumber: { $in: moneyTransferTransactionNumbers }
-            //             },
-            //             ['status']
-            //         ) as Pick<factory.assetTransaction.moneyTransfer.ITransaction, 'status'>[];
-            //         allMoneyTransferTransactionConfirmed =
-            //             referencedMoneyTransferTransactions.length === moneyTransferTransactionNumbers.length
-            //             && referencedMoneyTransferTransactions.every(({ status }) => status === factory.transactionStatusType.Confirmed);
-            //     } else {
-            //         allMoneyTransferTransactionConfirmed = true;
-            //     }
-            // } else if (params.assetTransactionType === factory.assetTransactionType.RegisterService) {
-            //     allReserveTransactionConfirmed = true;
-            //     allMoneyTransferTransactionConfirmed = true;
-            //     const registerServiceTransactionNumbers = await repos.acceptedOffer.distinctValues(
-            //         { orderNumber: { $in: [params.orderNumber] } },
-            //         'acceptedOffers.serialNumber'
-            //     );
-            //     if (registerServiceTransactionNumbers.length > 0) {
-            //         const referencedRegisterServiceTransactions = await repos.assetTransaction.search(
-            //             {
-            //                 project: { id: { $eq: params.project.id } },
-            //                 typeOf: factory.assetTransactionType.RegisterService,
-            //                 transactionNumber: { $in: registerServiceTransactionNumbers }
-            //             },
-            //             ['status']
-            //         ) as Pick<factory.assetTransaction.registerService.ITransaction, 'status'>[];
-            //         allRegisterServiceTransactionConfirmed =
-            //             referencedRegisterServiceTransactions.length === registerServiceTransactionNumbers.length
-            //             && referencedRegisterServiceTransactions.every(({ status }) => status === factory.transactionStatusType.Confirmed);
-            //     } else {
-            //         allRegisterServiceTransactionConfirmed = true;
-            //     }
         }
         return allReserveTransactionConfirmed && allMoneyTransferTransactionConfirmed && allRegisterServiceTransactionConfirmed;
     };

package/lib/chevre/service/order/onAssetTransactionStatusChanged/onPayTransactionConfirmed.js

@@ -36,7 +36,7 @@ function onPayTransactionConfirmed(params) {
 }
 function fixPaymentMethodIdentifierIfPossible(params) {
     return async (repos) => {
-        const referencedPayTransactions = await repos.assetTransaction.search({
+        const referencedPayTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
             project: { id: { $eq: params.project.id } },
             typeOf: factory_1.factory.assetTransactionType.Pay,
             statuses: [factory_1.factory.transactionStatusType.Confirmed],
@@ -73,7 +73,7 @@ function isProcessable(params) {
         const paymentMethodIds = order.paymentMethods.filter((invoice) => typeof invoice.paymentMethodId === 'string' && invoice.paymentMethodId.length > 0)
             .map((invoice) => invoice.paymentMethodId);
         if (paymentMethodIds.length > 0) {
-            const referencedPayTransactions = await repos.assetTransaction.search({
+            const referencedPayTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 project: { id: { $eq: params.project.id } },
                 typeOf: factory_1.factory.assetTransactionType.Pay,
                 transactionNumber: { $in: paymentMethodIds }

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

@@ -109,7 +109,7 @@ function processVoidPayTransaction(params) {
                 // 取引が存在すれば中止
                 const transactionNumber = action.object.paymentMethodId;
                 if (typeof transactionNumber === 'string' && transactionNumber.length > 0) {
-                    const payTransaction = (await repos.assetTransaction.search({
+                    const payTransaction = (await repos.assetTransaction.findAssetTransactionsByTypeOf({
                         limit: 1,
                         page: 1,
                         project: { id: { $eq: action.project.id } },

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

@@ -39,7 +39,7 @@ function cancelPengindIfNotYet(params) {
     return async (repos) => {
         const reserveTransactionId = params.purpose.id;
         // 予約取引を検索
-        const reserveTransactions = await repos.assetTransaction.search({
+        const reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
             limit: 1,
             page: 1,
             typeOf: factory_1.factory.assetTransactionType.Reserve,
@@ -169,7 +169,7 @@ function cancelReservation(actionAttributesList) {
                 try {
                     if (actionAttributes.object.typeOf === factory_1.factory.reservationType.ReservationPackage) {
                         // 予約取引を検索
-                        const reserveTransactions = await repos.assetTransaction.search({
+                        const reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                             limit: 1,
                             page: 1,
                             typeOf: factory_1.factory.assetTransactionType.Reserve,
@@ -226,7 +226,7 @@ function cancelReservation(actionAttributesList) {
                             inclusion: ['reservationNumber', 'reservationStatus', 'project', 'reservedTicket', 'subReservation', 'reservationFor']
                         });
                         // 予約取引を検索
-                        const reserveTransactions = await repos.assetTransaction.search({
+                        const reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                             limit: 1,
                             page: 1,
                             typeOf: factory_1.factory.assetTransactionType.Reserve,

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

@@ -90,7 +90,7 @@ function reserveIfNotYet(params) {
     ) => {
         let reserveTransactions = [];
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
-            reserveTransactions = await repos.assetTransaction.search({
+            reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 typeOf: factory_1.factory.assetTransactionType.Reserve,
                 object: {
                     reservations: { id: { $in: params.object.ids } }
@@ -100,7 +100,7 @@ function reserveIfNotYet(params) {
             debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. ids:', params.object.ids, 'reserveTransactions:', JSON.stringify(reserveTransactions));
         }
         if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
-            reserveTransactions = await repos.assetTransaction.search({
+            reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 typeOf: factory_1.factory.assetTransactionType.Reserve,
                 object: {
                     reservationNumber: { $in: params.object.reservationNumbers }

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

@@ -140,7 +140,7 @@ function reserveIfNotYet(
 params, options) {
     return async (repos) => {
         const reservationPackage = params.object;
-        const reserveTransaction = (await repos.assetTransaction.search({
+        const reserveTransaction = (await repos.assetTransaction.findAssetTransactionsByTypeOf({
             limit: 1,
             page: 1,
             typeOf: factory_1.factory.assetTransactionType.Reserve,

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

@@ -112,7 +112,7 @@ function reserveIfNotYet(params) {
     ) => {
         let reserveTransactions = [];
         if (typeof params.object.id === 'string' && params.object.id.length > 0) {
-            reserveTransactions = await repos.assetTransaction.search({
+            reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 typeOf: factory_1.factory.assetTransactionType.Reserve,
                 object: {
                     reservations: { id: { $in: [params.object.id] } }

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

@@ -213,14 +213,14 @@ function createRefundPurpose(params, order) {
 }
 function refundTransactionAlreadyExists(params) {
     return async (repos) => {
-        const refundTransactions = await repos.assetTransaction.search({
+        const refundTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
             typeOf: factory_1.factory.assetTransactionType.Refund,
             statuses: [factory_1.factory.transactionStatusType.Confirmed],
             object: { paymentMethodId: { $eq: params.object.paymentMethodId } }
-        }, ['_id'], []);
+        }, ['_id']);
         return refundTransactions.length > 0;
     };
 }

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

@@ -29,10 +29,10 @@ function deletePayTransactionsByPlaceOrder(params) {
                 deletedCount: deleteAssetTransactionsResult?.deletedCount
             };
             // 返金取引も削除(2023-05-19~)
-            const refundTransactions = await repos.assetTransaction.search({
+            const refundTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 typeOf: factory_1.factory.assetTransactionType.Refund,
                 object: { paymentMethodId: { $in: payTransactionNumbers } }
-            }, ['transactionNumber'], []);
+            }, ['transactionNumber']);
             if (refundTransactions.length > 0) {
                 const deleteRefundAssetTransactionsResult = await repos.assetTransaction.deleteByTransactionNumber({
                     project: { id: params.transaction.project.id },

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

@@ -40,11 +40,11 @@ function deleteReservationsByPlaceOrder(params) {
                 deletedCount: deleteAssetTransactionsResult?.deletedCount
             };
             // 予約番号で予約取消取引を検索
-            const deletingCancelReservationTransactions = await repos.assetTransaction.search({
+            const deletingCancelReservationTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 project: { id: { $eq: params.transaction.project.id } },
                 object: { reservationNumber: { $in: reserveTransactionNumbers } },
                 typeOf: factory_1.factory.assetTransactionType.CancelReservation
-            }, ['transactionNumber'], []);
+            }, ['transactionNumber']);
             if (deletingCancelReservationTransactions.length > 0) {
                 // 予約取消取引も削除(2024-04-18~)
                 const deleteCancelReservationResult = await repos.assetTransaction.deleteByTransactionNumber({

package/lib/chevre/service/transaction/placeOrder/confirm.js

@@ -128,7 +128,7 @@ function confirm(params, options) {
         const payTransactionNumbers = authorizePaymentActions.map((authorizeAction) => authorizeAction.object.paymentMethodId);
         // const payTransactionNumbers = authorizePaymentActions.map(({ instrument }) => instrument.transactionNumber);
         if (payTransactionNumbers.length > 0) {
-            payTransactions = await repos.assetTransaction.search({
+            payTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 typeOf: factory_1.factory.assetTransactionType.Pay,
                 transactionNumber: { $in: payTransactionNumbers }
             }, ['object']);

package/lib/chevre/service/validation/validateOrder.js

@@ -25,11 +25,11 @@ function validateOrder(params) {
         });
         let payTransactions = [];
         if (order.paymentMethods.length > 0) {
-            payTransactions = await repos.assetTransaction.search({
+            payTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 project: { id: { $eq: order.project.id } },
                 typeOf: factory_1.factory.assetTransactionType.Pay,
                 transactionNumber: { $in: order.paymentMethods.map(({ paymentMethodId }) => paymentMethodId) }
-            }, [], []);
+            }, []);
         }
         // 型検証
         if (typeof order.confirmationNumber !== 'string' || order.confirmationNumber.length === 0) {

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "10.3.0-alpha.2",
+    "@chevre/factory": "10.3.0-alpha.3",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "26.0.0-alpha.25"
+  "version": "26.0.0-alpha.26"
 }