@chevre/domain 21.20.0-alpha.28 → 21.20.0-alpha.29

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

@@ -30,6 +30,7 @@ export interface IUseActionCountByOffer {
     _id: string[];
     useActionCount?: number;
 }
+type KeyOfAction = keyof factory.action.IAction<factory.action.IAttributes<factory.actionType, any, any>> | '_id';
 interface IAggregationByStatus {
     actionCount: number;
     avgDuration: number;
@@ -57,7 +58,7 @@ export declare class MongoRepository {
     /**
      * アクション検索
      */
-    search<T extends factory.actionType>(params: factory.action.ISearchConditions, inclusion: string[], exclusion: string[]): Promise<IAction<T>[]>;
+    search<T extends factory.actionType>(params: factory.action.ISearchConditions, inclusion: KeyOfAction[], exclusion: KeyOfAction[]): Promise<IAction<T>[]>;
     /**
      * アクション開始
      */

package/lib/chevre/service/offer/any.d.ts

@@ -10,7 +10,7 @@ interface IAcceptOfferOperationRepos {
     transaction: TransactionRepo;
 }
 type IAcceptOfferOperation<T> = (repos: IAcceptOfferOperationRepos) => Promise<T>;
-type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier>;
+type IAuthorizeEventServiceOfferAction = factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier>;
 export declare function acceptOffer(params: {
     project: {
         id: string;
@@ -24,7 +24,7 @@ export declare function voidAcceptedOffer(params: {
     /**
      * 取消対象の承認アクション
      */
-    authorizeActions: IAuthorizeOfferAction[];
+    authorizeActions: Pick<IAuthorizeEventServiceOfferAction, 'object'>[];
     orderNumber: string;
 }): (repos: {
     orderInTransaction: OrderInTransactionRepo;

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

@@ -13,7 +13,7 @@ exports.placeOrderWithoutTransaction = exports.placeOrder = void 0;
 const createDebug = require("debug");
 const moment = require("moment");
 const order_1 = require("../../factory/order");
-// import { voidAcceptedOffer } from '../offer/any';
+const any_1 = require("../offer/any");
 const createAccountingReportIfNotExist_1 = require("./createAccountingReportIfNotExist");
 const onAssetTransactionStatusChanged_1 = require("./onAssetTransactionStatusChanged");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
@@ -165,22 +165,20 @@ function voidAcceptedOfferIfNecessary(params) {
         if (Array.isArray(authorizeActionsAsResult) && authorizeActionsAsResult.length > 0) {
             const completedAuthorizeActionIds = authorizeActionsAsResult.map(({ id }) => id);
             debug(completedAuthorizeActionIds.length, 'completedAuthorizeActionIds found from transaction', params.purpose.id);
-            const authorizeActions = yield repos.action.searchByPurpose({
+            const authorizeActions = yield repos.action.search({
                 typeOf: factory.actionType.AuthorizeAction,
                 purpose: {
-                    typeOf: factory.transactionType.PlaceOrder,
-                    id: params.purpose.id
+                    typeOf: { $in: [factory.transactionType.PlaceOrder] },
+                    id: { $in: [params.purpose.id] }
                 },
                 object: { typeOf: { $eq: factory.action.authorize.offer.eventService.ObjectType.SeatReservation } },
                 id: { $nin: completedAuthorizeActionIds }
-            });
+            }, ['object'], []);
             debug('processing voidAcceptedOffer', authorizeActions.length, 'authorizeActions...', authorizeActions);
-            // tslint:disable-next-line:no-suspicious-comment
-            // TODO implement
-            // await voidAcceptedOffer({
-            //     authorizeActions,
-            //     orderNumber: params.object.orderNumber
-            // })(repos);
+            yield (0, any_1.voidAcceptedOffer)({
+                authorizeActions,
+                orderNumber: params.object.orderNumber
+            })(repos);
         }
     });
 }

package/package.json

@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.20.0-alpha.28"
+  "version": "21.20.0-alpha.29"
 }