@chevre/domain 24.0.0-alpha.34 → 24.0.0-alpha.35

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

@@ -20,4 +20,13 @@ export declare class AcceptCOAOfferActionRepo extends ActionProcessRepo<IAcceptC
             id: string;
         };
     }, inclusion: IKeyOfProjection[]): Promise<IAcceptCOAOfferAction>;
+    findAcceptCOAOfferActionsByPurpose(params: {
+        /**
+         * 注文取引でフィルター
+         */
+        purpose: {
+            typeOf: factory.transactionType;
+            id: string;
+        };
+    }): Promise<IAcceptCOAOfferAction[]>;
 }

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

@@ -58,5 +58,16 @@ class AcceptCOAOfferActionRepo extends actionProcess_1.ActionProcessRepo {
         }
         return doc;
     }
+    async findAcceptCOAOfferActionsByPurpose(params) {
+        return this.findAnyActionsByPurpose({
+            ...params,
+            typeOf: factory.actionType.AcceptAction,
+            purpose: {
+                typeOf: params.purpose.typeOf,
+                id: params.purpose.id
+            },
+            object: { typeOf: { $eq: factory.offerType.AggregateOffer } }
+        });
+    }
 }
 exports.AcceptCOAOfferActionRepo = AcceptCOAOfferActionRepo;

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

@@ -56,7 +56,7 @@ export declare class ActionProcessRepo<TAction extends IAction<factory.actionTyp
      * アクション取消
      */
     cancelWithVoid(params: {
-        typeOf: factory.actionType.AcceptAction | factory.actionType.AuthorizeAction;
+        typeOf: TAction['typeOf'];
         id: string;
         cancelAction?: Pick<ICancelActionAction, 'agent' | 'sameAs' | 'startTime'>;
     }): Promise<void>;

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

@@ -20,6 +20,21 @@ export declare class AuthorizeOfferActionRepo extends ActionProcessRepo<IAuthori
          */
         ids: string[];
     }): Promise<IAuthorizeOfferActionWithInstrument[]>;
+    findAuthorizeOfferActionsByPurpose(params: {
+        /**
+         * 注文取引でフィルター
+         */
+        purpose: {
+            typeOf: factory.transactionType;
+            id: string;
+        };
+        /**
+         * アクションステータスでフィルター
+         */
+        actionStatus?: {
+            $eq?: factory.actionStatusType.CompletedActionStatus;
+        };
+    }): Promise<IAuthorizeEventServiceOfferAction[]>;
     /**
      * アクション再開
      */

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

@@ -52,6 +52,17 @@ class AuthorizeOfferActionRepo extends actionProcess_1.ActionProcessRepo {
             id: { $in: params.ids }
         }, ['instrument']);
     }
+    async findAuthorizeOfferActionsByPurpose(params) {
+        return this.findAnyActionsByPurpose({
+            ...params,
+            typeOf: factory.actionType.AuthorizeAction,
+            purpose: {
+                typeOf: params.purpose.typeOf,
+                id: params.purpose.id
+            },
+            object: { typeOf: { $eq: factory.action.authorize.offer.eventService.ObjectType.SeatReservation } }
+        });
+    }
     /**
      * アクション再開
      */

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

@@ -1,4 +1,4 @@
-import { FilterQuery, UpdateQuery } from 'mongoose';
+import { FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 import type { IDocType } from './mongoose/schemas/action';
 import { IAction, IKeyOfProjection, ActionProcessRepo, ICancelActionAction, IActionRecipe } from './action/actionProcess';
@@ -16,7 +16,7 @@ export declare class ActionRepo extends ActionProcessRepo<IAction<StartableActio
     /**
      * アクション検索
      */
-    search<T extends StartableActionType>(params: factory.action.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IAction<T>[]>;
+    search<T extends StartableActionType>(params: factory.action.ISearchConditions & {}, inclusion: IKeyOfProjection[]): Promise<IAction<T>[]>;
     findPayAction(params: {
         project: {
             id: string;
@@ -29,7 +29,7 @@ export declare class ActionRepo extends ActionProcessRepo<IAction<StartableActio
     /**
      * 取引に対するアクションを検索する
      */
-    searchByPurpose<T extends factory.actionType.AcceptAction | factory.actionType.AuthorizeAction>(params: {
+    searchByPurpose<T extends factory.actionType.AuthorizeAction>(params: {
         typeOf?: T;
         purpose: {
             typeOf: factory.transactionType;
@@ -60,14 +60,6 @@ export declare class ActionRepo extends ActionProcessRepo<IAction<StartableActio
             id: string;
         };
     }): Promise<void>;
-    updateById(params: {
-        id: string;
-        update: any;
-    }): Promise<void>;
-    findByIdAndUpdate(params: {
-        id: string;
-        update: UpdateQuery<IAction<factory.actionType>>;
-    }): Promise<void>;
     /**
      * イベントと入場ゲート指定で予約使用アクションを集計する
      * discontinue(2024-12-26~)

package/lib/chevre/repo/action.js

@@ -365,20 +365,33 @@ class ActionRepo extends actionProcess_1.ActionProcessRepo {
     //             }
     //         });
     // }
-    async updateById(params) {
-        await this.actionModel.updateOne({ _id: { $eq: params.id } }, params.update)
-            .exec();
-    }
-    async findByIdAndUpdate(params) {
-        await this.actionModel.findOneAndUpdate({ _id: { $eq: params.id } }, params.update, { projection: { _id: 1 } })
-            .lean()
-            .exec()
-            .then((doc) => {
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.actionModel.modelName);
-            }
-        });
-    }
+    // public async updateById(params: {
+    //     id: string;
+    //     update: any;
+    // }): Promise<void> {
+    //     await this.actionModel.updateOne(
+    //         { _id: { $eq: params.id } },
+    //         params.update
+    //     )
+    //         .exec();
+    // }
+    // public async findByIdAndUpdate(params: {
+    //     id: string;
+    //     update: UpdateQuery<IAction<factory.actionType>>;
+    // }): Promise<void> {
+    //     await this.actionModel.findOneAndUpdate(
+    //         { _id: { $eq: params.id } },
+    //         params.update,
+    //         { projection: { _id: 1 } }
+    //     )
+    //         .lean<{ _id: ObjectId }>()
+    //         .exec()
+    //         .then((doc) => {
+    //             if (doc === null) {
+    //                 throw new factory.errors.NotFound(this.actionModel.modelName);
+    //             }
+    //         });
+    // }
     /**
      * イベントと入場ゲート指定で予約使用アクションを集計する
      * discontinue(2024-12-26~)

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

@@ -13,6 +13,9 @@ import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 interface IVoidTransactionRepos {
+    /**
+     * CancelAction開始で使用される
+     */
     action: ActionRepo;
     acceptCOAOfferAction: AcceptCOAOfferActionRepo;
     authorizeOfferAction: AuthorizeOfferActionRepo;
@@ -44,4 +47,4 @@ declare function voidTransaction(params: factory.task.IData<factory.taskName.Voi
         id: string;
     };
 }): (repos: IVoidTransactionRepos, settings: Settings) => Promise<void>;
-export { voidTransaction };
+export { IVoidTransactionRepos, voidTransaction };

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

@@ -47,13 +47,13 @@ function voidTransaction(params) {
         };
         const transaction = await repos.placeOrder.findPlaceOrderById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status', 'object']);
         // 興行オファー承認アクション検索
-        let authorizeActions = await repos.action.searchByPurpose({
-            typeOf: factory.actionType.AuthorizeAction,
+        let authorizeActions = await repos.authorizeOfferAction.findAuthorizeOfferActionsByPurpose({
+            // typeOf: factory.actionType.AuthorizeAction,
             purpose: {
                 typeOf: params.purpose.typeOf,
                 id: params.purpose.id
             },
-            object: { typeOf: { $eq: factory.action.authorize.offer.eventService.ObjectType.SeatReservation } }
+            // object: { typeOf: { $eq: factory.action.authorize.offer.eventService.ObjectType.SeatReservation } }
         });
         switch (transaction.status) {
             case factory.transactionStatusType.InProgress:
@@ -89,7 +89,7 @@ function voidTransaction(params) {
             }
         }
         await Promise.all(authorizeActions.map(async (action) => {
-            await repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
+            await repos.authorizeOfferAction.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
             switch (action.instrument.typeOf) {
                 // case WebAPIIdentifier.COA:
                 case factory.assetTransactionType.COAReserveTransaction:
@@ -129,23 +129,23 @@ function cancelAcceptActions(params) {
             id: params.purpose.id
         }, ['typeOf', 'status']);
         // 興行オファー承認アクション検索
-        const completedAuthorizeActions = await repos.action.searchByPurpose({
-            typeOf: factory.actionType.AuthorizeAction,
+        const completedAuthorizeActions = await repos.authorizeOfferAction.findAuthorizeOfferActionsByPurpose({
+            // typeOf: factory.actionType.AuthorizeAction,
             purpose: {
                 typeOf: params.purpose.typeOf,
                 id: params.purpose.id
             },
-            object: { typeOf: { $eq: factory.action.authorize.offer.eventService.ObjectType.SeatReservation } },
+            // object: { typeOf: { $eq: factory.action.authorize.offer.eventService.ObjectType.SeatReservation } },
             actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
         });
         // 興行オファー採用アクション検索
-        let acceptActions = await repos.action.searchByPurpose({
-            typeOf: factory.actionType.AcceptAction,
+        let acceptActions = await repos.acceptCOAOfferAction.findAcceptCOAOfferActionsByPurpose({
+            // typeOf: factory.actionType.AcceptAction,
             purpose: {
                 typeOf: params.purpose.typeOf,
                 id: params.purpose.id
             },
-            object: { typeOf: { $eq: factory.offerType.AggregateOffer } }
+            // object: { typeOf: { $eq: factory.offerType.AggregateOffer } }
         });
         switch (transaction.status) {
             case factory.transactionStatusType.InProgress:
@@ -173,7 +173,7 @@ function cancelAcceptActions(params) {
         }
         const { reserveService } = repos;
         await Promise.all(acceptActions.map(async (action) => {
-            await repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
+            await repos.acceptCOAOfferAction.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
             if (reserveService === undefined) {
                 throw new factory.errors.Internal('repos.reserveService required');
             }

package/package.json

@@ -99,5 +99,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.0.0-alpha.34"
+  "version": "24.0.0-alpha.35"
 }