@chevre/domain 26.0.0-alpha.43 → 26.0.0-alpha.44

package/lib/chevre/repo/action/acceptPay.d.ts

@@ -19,8 +19,8 @@ export declare class AcceptPayActionRepo extends ActionProcessRepo<IAcceptPayAct
             id: string;
         };
         actionStatus?: factory.actionStatusType.CompletedActionStatus;
-        limit?: number;
-        page?: number;
+        limit?: never;
+        page?: never;
     }, inclusion: IKeyOfProjection[]): Promise<IAcceptPayAction[]>;
     /**
      * 決済取引番号から完了済の決済採用アクションを参照する

package/lib/chevre/repo/action/acceptPay.js

@@ -19,7 +19,7 @@ class AcceptPayActionRepo extends actionProcess_1.ActionProcessRepo {
      * 件数はlimitされない
      */
     async findAcceptActionsByPurpose(params, inclusion) {
-        const { actionStatus, limit, page } = params;
+        const { actionStatus } = params;
         return this.findAnyActions({
             project: { id: { $eq: params.project.id } },
             typeOf: { $eq: factory_1.factory.actionType.AcceptAction }, // 採用アクション
@@ -30,8 +30,8 @@ class AcceptPayActionRepo extends actionProcess_1.ActionProcessRepo {
             ...(typeof actionStatus === 'string')
                 ? { actionStatus: { $in: [actionStatus] } }
                 : undefined,
-            ...(typeof limit === 'number') ? { limit } : undefined,
-            ...(typeof page === 'number') ? { page } : undefined,
+            // ...(typeof limit === 'number') ? { limit } : undefined,
+            // ...(typeof page === 'number') ? { page } : undefined,
         }, inclusion);
     }
     /**

package/lib/chevre/repo/action/anyAction/actionProcess.d.ts

@@ -1,4 +1,4 @@
-import { Connection } from 'mongoose';
+import { Connection, FilterQuery } from 'mongoose';
 import { factory } from '../../../factory';
 import { IModel as IActionModel, IDocType } from '../../mongoose/schemas/action';
 import { ActionRecipeRepo, IActionRecipe, IRecipeAsActionAttributes } from './actionRecipe';
@@ -33,7 +33,7 @@ export declare class ActionProcessRepo<TAction extends IAction<factory.actionTyp
     protected constructor(params: {
         connection: Connection;
     }, options: IOptions);
-    static CREATE_MONGO_CONDITIONS(params: factory.action.ISearchConditions): any[];
+    static CREATE_MONGO_CONDITIONS(params: factory.action.ISearchConditions): FilterQuery<IDocType>[];
     /**
      * アクション開始
      */
@@ -64,7 +64,7 @@ export declare class ActionProcessRepo<TAction extends IAction<factory.actionTyp
         error: Error | Error[] | unknown;
         recipe?: IRecipeAsActionAttributes<TActionRecipe['recipeCategory']>;
     }): Promise<void>;
-    findById(params: {
+    findAnyActionById(params: {
         typeOf: TAction['typeOf'];
         id: string;
     }, inclusion?: IKeyOfProjection[], exclusion?: IKeyOfProjection[]): Promise<TAction>;

package/lib/chevre/repo/action/anyAction/actionProcess.js

@@ -42,7 +42,7 @@ class ActionProcessRepo extends actionRecipe_1.ActionRecipeRepo {
         this.options = options;
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        const andConditions = []; // eslint-disable-line @typescript-eslint/no-explicit-any
+        const andConditions = [];
         const idIn = params.id?.$in;
         if (Array.isArray(idIn)) {
             andConditions.push({ _id: { $in: idIn } });
@@ -259,16 +259,6 @@ class ActionProcessRepo extends actionRecipe_1.ActionRecipeRepo {
                 }
             });
         }
-        // 承認アクションのobject.event廃止につき検索条件も廃止(2026-07-04~)
-        // const objectEventIdIn = params.object?.event?.id?.$in;
-        // if (Array.isArray(objectEventIdIn)) {
-        //     andConditions.push({
-        //         'object.event.id': {
-        //             $exists: true,
-        //             $in: objectEventIdIn
-        //         }
-        //     });
-        // }
         const objectTransactionNumberEq = params.object?.transactionNumber?.$eq;
         if (typeof objectTransactionNumberEq === 'string') {
             andConditions.push({ 'object.transactionNumber': { $exists: true, $eq: objectTransactionNumberEq } });
@@ -309,60 +299,6 @@ class ActionProcessRepo extends actionRecipe_1.ActionRecipeRepo {
                 startDate: { $lte: startDateLte }
             });
         }
-        // const fromLocationTypeOfIn = params.fromLocation?.typeOf?.$in;
-        // if (Array.isArray(fromLocationTypeOfIn)) {
-        //     andConditions.push({
-        //         'fromLocation.typeOf': {
-        //             $exists: true,
-        //             $in: fromLocationTypeOfIn
-        //         }
-        //     });
-        // }
-        // const fromLocationAccountNumberIn = params.fromLocation?.accountNumber?.$in;
-        // if (Array.isArray(fromLocationAccountNumberIn)) {
-        //     andConditions.push({
-        //         'fromLocation.accountNumber': {
-        //             $exists: true,
-        //             $in: fromLocationAccountNumberIn
-        //         }
-        //     });
-        // }
-        // const fromLocationAccountTypeIn = params.fromLocation?.accountType?.$in;
-        // if (Array.isArray(fromLocationAccountTypeIn)) {
-        //     andConditions.push({
-        //         'fromLocation.accountType': {
-        //             $exists: true,
-        //             $in: fromLocationAccountTypeIn
-        //         }
-        //     });
-        // }
-        // const toLocationTypeOfIn = params.toLocation?.typeOf?.$in;
-        // if (Array.isArray(toLocationTypeOfIn)) {
-        //     andConditions.push({
-        //         'toLocation.typeOf': {
-        //             $exists: true,
-        //             $in: toLocationTypeOfIn
-        //         }
-        //     });
-        // }
-        // const toLocationAccountNumberIn = params.toLocation?.accountNumber?.$in;
-        // if (Array.isArray(toLocationAccountNumberIn)) {
-        //     andConditions.push({
-        //         'toLocation.accountNumber': {
-        //             $exists: true,
-        //             $in: toLocationAccountNumberIn
-        //         }
-        //     });
-        // }
-        // const toLocationAccountTypeIn = params.toLocation?.accountType?.$in;
-        // if (Array.isArray(toLocationAccountTypeIn)) {
-        //     andConditions.push({
-        //         'toLocation.accountType': {
-        //             $exists: true,
-        //             $in: toLocationAccountTypeIn
-        //         }
-        //     });
-        // }
         const purposeTypeOfIn = params.purpose?.typeOf?.$in;
         if (Array.isArray(purposeTypeOfIn)) {
             andConditions.push({
@@ -549,7 +485,7 @@ class ActionProcessRepo extends actionRecipe_1.ActionRecipeRepo {
             throw new factory_1.factory.errors.NotFound(this.actionModel.modelName);
         }
     }
-    async findById(params, inclusion, exclusion) {
+    async findAnyActionById(params, inclusion, exclusion) {
         let positiveProjectionFields = exports.AVAILABLE_PROJECT_FIELDS;
         if (Array.isArray(inclusion) && inclusion.length > 0) {
             positiveProjectionFields = inclusion.filter((key) => exports.AVAILABLE_PROJECT_FIELDS.includes(key));

package/lib/chevre/service/assetTransaction/reserveCOA/cancel.d.ts

@@ -13,8 +13,8 @@ interface ICancelRepos {
 interface ICancelByAcceptActionRepos {
     actions: {
         cancel: CancelActionRepo;
+        acceptCOAOffer: AcceptCOAOfferActionRepo;
     };
-    acceptCOAOfferAction: AcceptCOAOfferActionRepo;
     reserveService: COA.service.Reserve;
     task: TaskRepo;
 }

package/lib/chevre/service/assetTransaction/reserveCOA/cancel.js

@@ -8,7 +8,7 @@ const cancelReservation_1 = require("../../reserveCOA/cancelReservation");
  */
 function cancelByAcceptAction(params, options) {
     return async (repos) => {
-        const recipe = await repos.acceptCOAOfferAction.findRecipeByAction({
+        const recipe = await repos.actions.acceptCOAOffer.findRecipeByAction({
             project: { id: params.action.project.id },
             recipeFor: { id: params.action.id }
         });

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

@@ -13,8 +13,8 @@ declare function processVoidTransaction4coa(params: {
 }): (repos: {
     actions: {
         cancel: CancelActionRepo;
+        acceptCOAOffer: AcceptCOAOfferActionRepo;
     };
-    acceptCOAOfferAction: AcceptCOAOfferActionRepo;
     reserveService: COA.service.Reserve;
     task: TaskRepo;
 }) => Promise<void>;
@@ -28,8 +28,8 @@ declare function processVoidTransactionByAcceptAction4coa(params: {
 }): (repos: {
     actions: {
         cancel: CancelActionRepo;
+        acceptCOAOffer: AcceptCOAOfferActionRepo;
     };
-    acceptCOAOfferAction: AcceptCOAOfferActionRepo;
     reserveService: COA.service.Reserve;
     task: TaskRepo;
 }) => Promise<void>;

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

@@ -13,7 +13,7 @@ function processVoidTransaction4coa(params, options) {
         if (typeof acceptActionId !== 'string') {
             throw new factory_1.factory.errors.NotFound('action.object.id');
         }
-        const acceptAction = await repos.acceptCOAOfferAction.findById({ id: acceptActionId, typeOf: factory_1.factory.actionType.AcceptAction });
+        const acceptAction = await repos.actions.acceptCOAOffer.findAnyActionById({ id: acceptActionId, typeOf: factory_1.factory.actionType.AcceptAction });
         // console.log('processVoidTransaction4coa processing...', params.action.id, params.action.purpose.id, acceptAction);
         await (0, cancel_1.cancelByAcceptAction)({ action: acceptAction }, options)(repos);
     };

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

@@ -18,9 +18,9 @@ interface IVoidTransactionRepos {
      */
     actions: {
         cancel: CancelActionRepo;
+        acceptCOAOffer: AcceptCOAOfferActionRepo;
+        authorizeOffer: AuthorizeOfferActionRepo;
     };
-    acceptCOAOfferAction: AcceptCOAOfferActionRepo;
-    authorizeOfferAction: AuthorizeOfferActionRepo;
     assetTransaction: AssetTransactionRepo;
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;

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

@@ -24,7 +24,7 @@ function voidTransaction(params) {
         };
         const transaction = await repos.placeOrder.findPlaceOrderById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status', 'object']);
         // 興行オファー承認アクション検索
-        let authorizeActions = await repos.authorizeOfferAction.findAuthorizeOfferActionsByPurpose({
+        let authorizeActions = await repos.actions.authorizeOffer.findAuthorizeOfferActionsByPurpose({
             // typeOf: factory.actionType.AuthorizeAction,
             purpose: {
                 typeOf: params.purpose.typeOf,
@@ -79,7 +79,7 @@ function voidTransaction(params) {
                 await repos.orderInTransaction.deleteByIdentifier({ identifier: params.purpose.id });
         }
         await Promise.all(authorizeActions.map(async (action) => {
-            await repos.authorizeOfferAction.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
+            await repos.actions.authorizeOffer.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
             switch (action.instrument.typeOf) {
                 // case WebAPIIdentifier.COA:
                 case factory_1.factory.assetTransactionType.COAReserveTransaction: {
@@ -89,7 +89,6 @@ function voidTransaction(params) {
                     }
                     await (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({ action }, { asyncCancelPendingReservation: true })({
                         actions: repos.actions,
-                        acceptCOAOfferAction: repos.acceptCOAOfferAction,
                         reserveService,
                         task: repos.task
                     });
@@ -121,7 +120,7 @@ function cancelAcceptActions(params) {
             id: params.purpose.id
         }, ['typeOf', 'status']);
         // 興行オファー承認アクション検索
-        const completedAuthorizeActions = await repos.authorizeOfferAction.findAuthorizeOfferActionsByPurpose({
+        const completedAuthorizeActions = await repos.actions.authorizeOffer.findAuthorizeOfferActionsByPurpose({
             // typeOf: factory.actionType.AuthorizeAction,
             purpose: {
                 typeOf: params.purpose.typeOf,
@@ -131,7 +130,7 @@ function cancelAcceptActions(params) {
             actionStatus: { $eq: factory_1.factory.actionStatusType.CompletedActionStatus }
         });
         // 興行オファー採用アクション検索
-        let acceptActions = await repos.acceptCOAOfferAction.findAcceptCOAOfferActionsByPurpose({
+        let acceptActions = await repos.actions.acceptCOAOffer.findAcceptCOAOfferActionsByPurpose({
             // typeOf: factory.actionType.AcceptAction,
             purpose: {
                 typeOf: params.purpose.typeOf,
@@ -166,13 +165,12 @@ function cancelAcceptActions(params) {
         }
         const { reserveService } = repos;
         await Promise.all(acceptActions.map(async (action) => {
-            await repos.acceptCOAOfferAction.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
+            await repos.actions.acceptCOAOffer.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
             if (reserveService === undefined) {
                 throw new factory_1.factory.errors.Internal('repos.reserveService required');
             }
             await (0, processVoidTransaction4coa_1.processVoidTransactionByAcceptAction4coa)({ action }, { asyncCancelPendingReservation: true })({
                 actions: repos.actions,
-                acceptCOAOfferAction: repos.acceptCOAOfferAction,
                 reserveService,
                 task: repos.task
             });

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

@@ -18,9 +18,9 @@ interface IVoidTransactionByActionIdRepos {
      */
     actions: {
         cancel: CancelActionRepo;
+        acceptCOAOffer: AcceptCOAOfferActionRepo;
+        authorizeOffer: AuthorizeOfferActionRepo;
     };
-    acceptCOAOfferAction: AcceptCOAOfferActionRepo;
-    authorizeOfferAction: AuthorizeOfferActionRepo;
     assetTransaction: AssetTransactionRepo;
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;

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

@@ -27,24 +27,13 @@ function voidTransactionByActionId(params) {
         //     throw new factory.errors.Forbidden('Transaction not yours');
         // }
         // const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.purpose.id });
-        const action = await repos.authorizeOfferAction.findById({ typeOf: factory_1.factory.actionType.AuthorizeAction, id: params.id });
+        const action = await repos.actions.authorizeOffer.findAnyActionById({ typeOf: factory_1.factory.actionType.AuthorizeAction, id: params.id });
         if (action.purpose.typeOf !== transaction.typeOf || action.purpose.id !== transaction.id) {
             throw new factory_1.factory.errors.Argument('Transaction', 'Action not found in the transaction');
         }
         // MongoDBでcompleteステータスであるにも関わらず、Chevreでは削除されている、というのが最悪の状況
         // それだけは回避するためにMongoDBを先に変更
-        await repos.authorizeOfferAction.cancelWithVoid({ typeOf: factory_1.factory.actionType.AuthorizeAction, id: params.id, cancelAction });
-        // // add orderInTransaction(2024-01-15~)
-        // // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
-        // // const orderNumberByTransaction = transaction.object.orderNumber;
-        // const orderNumberByTransaction = orderNumber; // transaction.objectへのアクセス回避(2024-05-30~)
-        // if (typeof orderNumberByTransaction === 'string') {
-        //     await voidAcceptedOffer({
-        //         // authorizeActions: [action],
-        //         authorizeActionsWithInstrument: [action],
-        //         orderNumber: orderNumberByTransaction
-        //     })(repos);
-        // }
+        await repos.actions.authorizeOffer.cancelWithVoid({ typeOf: factory_1.factory.actionType.AuthorizeAction, id: params.id, cancelAction });
         await (0, any_1.voidAcceptedOffer)({
             authorizeActionsWithInstrument: [action],
             placeOrderId: params.purpose.id
@@ -57,7 +46,6 @@ function voidTransactionByActionId(params) {
                 }
                 await (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({ action }, { asyncCancelPendingReservation: false })({
                     actions: repos.actions,
-                    acceptCOAOfferAction: repos.acceptCOAOfferAction,
                     reserveService,
                     task: repos.task
                 });

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.js

@@ -130,7 +130,7 @@ function reAcceptOffer(params) {
         // }
         const coaInfo = await findCOAInfo({ id: params.object.event.id, project: { id: transaction.project.id } })(repos);
         // 承認アクション存在検証
-        await repos.authorizeOfferAction.findById({ id: params.potentialActions.id, typeOf: factory_1.factory.actionType.AuthorizeAction }, ['id'], []);
+        await repos.authorizeOfferAction.findAnyActionById({ id: params.potentialActions.id, typeOf: factory_1.factory.actionType.AuthorizeAction }, ['id'], []);
         const actionAttributes = {
             project: transaction.project,
             typeOf: factory_1.factory.actionType.AcceptAction,

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js

@@ -27,7 +27,7 @@ function changeOffers(params) {
         //     throw new factory.errors.NotFound('transaction.object.orderNumber');
         // }
         // 取引内のアクションかどうか確認
-        const authorizeAction = await repos.action.findById({ typeOf: factory_2.factory.actionType.AuthorizeAction, id: params.id });
+        const authorizeAction = await repos.action.findAnyActionById({ typeOf: factory_2.factory.actionType.AuthorizeAction, id: params.id });
         if (authorizeAction.purpose.typeOf !== transaction.typeOf || authorizeAction.purpose.id !== transaction.id) {
             throw new factory_2.factory.errors.Argument('Transaction', 'Action not found in the transaction');
         }

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

@@ -13,7 +13,7 @@ function onPaymentStatusChanged(params) {
             case factory_1.factory.actionType.PayAction: {
                 // アクションリポジトリから実アクションを参照する
                 // そうすることで、通知する情報は最低限で済む
-                const action = await repos.actions.pay.findById({ id: params.id, typeOf: params.typeOf });
+                const action = await repos.actions.pay.findAnyActionById({ id: params.id, typeOf: params.typeOf });
                 const optimizedAction = optimizeAction4report((action));
                 await (0, onPaid_1.onPaid)(optimizedAction, { id: action.project.id })(repos);
                 break;
@@ -21,7 +21,7 @@ function onPaymentStatusChanged(params) {
             case factory_1.factory.actionType.RefundAction: {
                 // アクションリポジトリから実アクションを参照する
                 // そうすることで、通知する情報は最低限で済む
-                const action = await repos.actions.refund.findById({ id: params.id, typeOf: params.typeOf });
+                const action = await repos.actions.refund.findAnyActionById({ id: params.id, typeOf: params.typeOf });
                 const optimizedAction = optimizeAction4report((action));
                 await (0, onRefunded_1.onRefunded)(optimizedAction, { id: action.project.id })(repos);
                 break;

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

@@ -58,7 +58,7 @@ function processVoidPayTransaction(params) {
         // 承認アクションを取得
         let authorizeActions;
         if (typeof params.id === 'string') {
-            const authorizeAction = await repos.authorizePaymentMethodAction.findById({ typeOf: factory_1.factory.actionType.AuthorizeAction, id: params.id });
+            const authorizeAction = await repos.authorizePaymentMethodAction.findAnyActionById({ typeOf: factory_1.factory.actionType.AuthorizeAction, id: params.id });
             // 取引内のアクションかどうか確認
             if (authorizeAction.purpose.typeOf !== transaction.typeOf || authorizeAction.purpose.id !== transaction.id) {
                 throw new factory_1.factory.errors.Argument('Transaction', 'Action not found in the transaction');

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

@@ -18,7 +18,6 @@ let coaAuthClientCreated = false;
 let coaAuthClient = new coa_service_1.COA.auth.RefreshToken({
     endpoint: '', // 使用されないので空文字でok
     refreshToken: '', // 使用されないので空文字でok
-    // useFetch: true
 });
 /**
  * タスク実行関数

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

@@ -24,7 +24,6 @@ let coaAuthClientCreated = false;
 let coaAuthClient = new coa_service_1.COA.auth.RefreshToken({
     endpoint: '', // 使用されないので空文字でok
     refreshToken: '', // 使用されないので空文字でok
-    // useFetch: true
 });
 /**
  * タスク実行関数

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

@@ -54,7 +54,6 @@ let coaAuthClientCreated = false;
 let coaAuthClient = new coa_service_1.COA.auth.RefreshToken({
     endpoint: '', // 使用されないので空文字でok
     refreshToken: '', // 使用されないので空文字でok
-    // useFetch: true
 });
 /**
  * タスク実行関数

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

@@ -21,7 +21,6 @@ let coaAuthClientCreated = false;
 let coaAuthClient = new coa_service_1.COA.auth.RefreshToken({
     endpoint: '', // 使用されないので空文字でok
     refreshToken: '', // 使用されないので空文字でok
-    // useFetch: true
 });
 /**
  * タスク実行関数
@@ -58,9 +57,11 @@ function call(params) {
                 project: { id: params.project.id },
                 sameAs: { id: params.id }
             })({
-                actions: { cancel: new cancel_1.CancelActionRepo(connection) },
-                acceptCOAOfferAction: new acceptCOAOffer_1.AcceptCOAOfferActionRepo(connection),
-                authorizeOfferAction: new authorizeOffer_1.AuthorizeOfferActionRepo(connection),
+                actions: {
+                    cancel: new cancel_1.CancelActionRepo(connection),
+                    acceptCOAOffer: new acceptCOAOffer_1.AcceptCOAOfferActionRepo(connection),
+                    authorizeOffer: new authorizeOffer_1.AuthorizeOfferActionRepo(connection),
+                },
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 stockHolder: new stockHolder_1.StockHolderRepo({ connection }),
                 offerRateLimit: new offer_1.OfferRateLimitRepo(redisClient),

package/package.json

@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "26.0.0-alpha.43"
+  "version": "26.0.0-alpha.44"
 }