@chevre/domain 24.0.0-alpha.39 → 24.0.0-alpha.40

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

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

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

@@ -38,13 +38,19 @@ class AcceptPayActionRepo extends actionProcess_1.ActionProcessRepo {
      * 件数はlimitされない
      */
     async findAcceptActionsByPurpose(params, inclusion) {
+        const { actionStatus, limit, page } = params;
         return this.findAnyActions({
             project: { id: { $eq: params.project.id } },
             typeOf: { $eq: factory.actionType.AcceptAction }, // 採用アクション
             purpose: { id: { $in: [params.purpose.id] } },
             object: {
                 typeOf: { $eq: factory.assetTransactionType.Pay } // 対象が決済取引
-            }
+            },
+            ...(typeof actionStatus === 'string')
+                ? { actionStatus: { $in: [actionStatus] } }
+                : undefined,
+            ...(typeof limit === 'number') ? { limit } : undefined,
+            ...(typeof page === 'number') ? { page } : undefined,
         }, inclusion);
         // const andConditions: FilterQuery<IAcceptPayAction>[] = [
         //     { typeOf: { $eq: factory.actionType.AcceptAction } },

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

@@ -14,9 +14,13 @@ type IAvailableActionRecipe = IActionRecipe<Exclude<factory.recipe.RecipeCategor
  */
 export declare class ActionRepo extends ActionProcessRepo<IAction<StartableActionType>, IAvailableActionRecipe> {
     /**
-     * アクション検索
+     * 汎用アクション検索
      */
-    search<T extends StartableActionType>(params: factory.action.ISearchConditions & {}, inclusion: IKeyOfProjection[]): Promise<IAction<T>[]>;
+    findActionsByType<T extends StartableActionType>(params: factory.action.ISearchConditions & {
+        typeOf?: T | {
+            $eq?: T;
+        };
+    }, inclusion: IKeyOfProjection[]): Promise<IAction<T>[]>;
     findPayAction(params: {
         project: {
             id: string;

package/lib/chevre/repo/action.js

@@ -42,9 +42,9 @@ class ActionRepo extends actionProcess_1.ActionProcessRepo {
     //     this.actionRecipeModel = connection.model(recipeModelName, createRecipeSchema());
     // }
     /**
-     * アクション検索
+     * 汎用アクション検索
      */
-    async search(params, inclusion) {
+    async findActionsByType(params, inclusion) {
         return (this.findAnyActions(params, inclusion));
     }
     // /**
@@ -281,7 +281,7 @@ class ActionRepo extends actionProcess_1.ActionProcessRepo {
     //     return doc;
     // }
     async findPayAction(params) {
-        const payActions = await this.search({
+        const payActions = await this.findActionsByType({
             limit: 1,
             page: 1,
             actionStatus: (Array.isArray(params.actionStatus?.$in))

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

@@ -84,11 +84,11 @@ export declare class AggregateOfferRepo {
          */
         productType: factory.product.ProductType;
     }): Promise<{
-        bulkWriteResult: BulkWriteResult;
-        modifiedOffers: {
+        bulkWriteResult?: BulkWriteResult;
+        modifiedOffers?: {
             id: string;
         }[];
-    } | void>;
+    }>;
     /**
      * sskts専用オファー保管
      */

package/lib/chevre/repo/aggregateOffer.js

@@ -707,6 +707,7 @@ class AggregateOfferRepo {
                 .exec();
             return { bulkWriteResult, modifiedOffers };
         }
+        return {};
     }
     /**
      * sskts専用オファー保管

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

@@ -150,7 +150,7 @@ export declare class AssetTransactionRepo {
         expires: {
             $lt: Date;
         };
-    }): Promise<Pick<factory.assetTransaction.ITransaction<factory.assetTransactionType>, 'id' | 'typeOf'> | void>;
+    }): Promise<Pick<factory.assetTransaction.ITransaction<factory.assetTransactionType>, 'id' | 'typeOf'> | undefined>;
     /**
      * 取引を期限切れにする
      */

package/lib/chevre/repo/assetTransaction.js

@@ -740,6 +740,7 @@ class AssetTransactionRepo {
             .exec();
         if (doc === null) {
             // no op
+            return;
         }
         else {
             assetTransaction_2.assetTransactionEventEmitter.emitAssetTransactionStatusChanged({

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

@@ -32,8 +32,8 @@ export declare class CreativeWorkRepo {
             [key in keyof factory.creativeWork.movie.ICreativeWork]?: 1;
         };
     }[]): Promise<{
-        bulkWriteResult: BulkWriteResult;
-    } | void>;
+        bulkWriteResult?: BulkWriteResult;
+    }>;
     /**
      * コンテンツを検索する
      */

package/lib/chevre/repo/creativeWork.js

@@ -247,6 +247,7 @@ class CreativeWorkRepo {
             const bulkWriteResult = await this.creativeWorkModel.bulkWrite(bulkWriteOps, { ordered: false });
             return { bulkWriteResult };
         }
+        return {};
     }
     /**
      * コンテンツを検索する

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

@@ -17,6 +17,6 @@ export declare class CustomerTypeRepo {
     saveManyByCodeValue(params: {
         attributes: ICustomerType;
         upsert?: boolean;
-    }[]): Promise<BulkWriteResult | void>;
+    }[]): Promise<BulkWriteResult | undefined>;
 }
 export {};

package/lib/chevre/repo/customerType.js

@@ -83,6 +83,7 @@ class CustomerTypeRepo {
         if (bulkWriteOps.length > 0) {
             return this.customerTypeModel.bulkWrite(bulkWriteOps, { ordered: false });
         }
+        return;
     }
 }
 exports.CustomerTypeRepo = CustomerTypeRepo;

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

@@ -32,11 +32,11 @@ export declare class EventOfferRepo {
          */
         update: boolean;
     }): Promise<{
-        bulkWriteResult: BulkWriteResult;
-        modifiedProductOffers: {
+        bulkWriteResult?: BulkWriteResult;
+        modifiedProductOffers?: {
             id: string;
         }[];
-    } | void>;
+    }>;
     /**
      * 販売者の提供するイベントオファーを削除する
      */

package/lib/chevre/repo/eventOffer.js

@@ -198,6 +198,7 @@ class EventOfferRepo {
                 .exec();
             return { bulkWriteResult, modifiedProductOffers };
         }
+        return {};
     }
     /**
      * 販売者の提供するイベントオファーを削除する

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

@@ -31,9 +31,9 @@ export declare class EventSellerMakesOfferRepo {
             };
         };
     }[]): Promise<{
-        bulkWriteResult: BulkWriteResult;
-        modifiedEvents: {
+        bulkWriteResult?: BulkWriteResult;
+        modifiedEvents?: {
             id: string;
         }[];
-    } | void>;
+    }>;
 }

package/lib/chevre/repo/eventSellerMakesOffer.js

@@ -124,6 +124,7 @@ class EventSellerMakesOfferRepo {
                 .exec();
             return { bulkWriteResult, modifiedEvents };
         }
+        return {};
     }
 }
 exports.EventSellerMakesOfferRepo = EventSellerMakesOfferRepo;

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

@@ -29,11 +29,11 @@ export declare class NoteRepo {
          */
         update: boolean;
     }): Promise<{
-        bulkWriteResult: BulkWriteResult;
-        modifiedNotes: {
+        bulkWriteResult?: BulkWriteResult;
+        modifiedNotes?: {
             id: string;
         }[];
-    } | void>;
+    }>;
     /**
      * 主題リソースから全メモを削除する
      */

package/lib/chevre/repo/note.js

@@ -234,6 +234,7 @@ class NoteRepo {
                 .exec();
             return { bulkWriteResult, modifiedNotes };
         }
+        return {};
     }
     // /**
     //  * 既知のメモIDリストからメモを削除する

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

@@ -21,7 +21,7 @@ export declare class NoteAboutOrderRepo {
      */
     upsertOrderNoteByIdentifier(params: Pick<INoteAboutOrder, 'about' | 'creator' | 'identifier' | 'project' | 'provider' | 'text' | 'version'>[], options: {
         overwrite: boolean;
-    }): Promise<BulkWriteResult | void>;
+    }): Promise<BulkWriteResult | undefined>;
     updateById(params: {
         id: string;
         attributes: Pick<INoteAboutOrder, 'text' | 'editor'>;

package/lib/chevre/repo/noteAboutOrder.js

@@ -173,6 +173,7 @@ class NoteAboutOrderRepo {
         if (bulkWriteOps.length > 0) {
             return this.noteModel.bulkWrite(bulkWriteOps, { ordered: false });
         }
+        return;
     }
     async updateById(params) {
         const updateFields = {

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

@@ -49,11 +49,11 @@ export declare class OfferCatalogRepo {
          */
         itemListElementType: factory.offerCatalog.IItemListElement['typeOf'];
     }): Promise<{
-        bulkWriteResult: BulkWriteResult;
-        modifiedCatalogs: {
+        bulkWriteResult?: BulkWriteResult;
+        modifiedCatalogs?: {
             id: string;
         }[];
-    } | void>;
+    }>;
     /**
      * 同期日時を更新する
      */

package/lib/chevre/repo/offerCatalog.js

@@ -270,6 +270,7 @@ class OfferCatalogRepo {
                 .exec();
             return { bulkWriteResult, modifiedCatalogs };
         }
+        return {};
     }
     /**
      * 同期日時を更新する

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

@@ -42,11 +42,11 @@ export declare class OfferCatalogItemRepo {
          */
         productType: factory.product.ProductType;
     }): Promise<{
-        bulkWriteResult: BulkWriteResult;
-        modifiedCatalogs: {
+        bulkWriteResult?: BulkWriteResult;
+        modifiedCatalogs?: {
             id: string;
         }[];
-    } | void>;
+    }>;
     /**
      * 同期日時を更新する
      */

package/lib/chevre/repo/offerCatalogItem.js

@@ -223,6 +223,7 @@ class OfferCatalogItemRepo {
                 .exec();
             return { bulkWriteResult, modifiedCatalogs };
         }
+        return {};
     }
     /**
      * 同期日時を更新する

package/lib/chevre/repo/place/seat.d.ts

@@ -47,8 +47,8 @@ export declare class SeatRepo {
     addSeatsByBranchCodeIfNotExist(params: {
         $set: ICreatingSeat;
     }[], options: IUpdateOptions): Promise<{
-        bulkWriteResult: BulkWriteResult;
-    } | void>;
+        bulkWriteResult?: BulkWriteResult;
+    }>;
     /**
      * コードをキーにして冪等編集
      */
@@ -58,8 +58,8 @@ export declare class SeatRepo {
             [key in keyof ICreatingSeat]?: 1;
         };
     }[], options: IUpdateOptions): Promise<{
-        bulkWriteResult: BulkWriteResult;
-    } | void>;
+        bulkWriteResult?: BulkWriteResult;
+    }>;
     updateSeatByBranchCode(seat: ICreatingSeat, $unset: any, options: IUpdateOptions): Promise<IUpdateSeatResult>;
     searchSeats(params: factory.place.seat.ISearchConditions): Promise<factory.place.seat.IPlace[]>;
     projectSeatsByScreeningRoom(params: Pick<factory.place.seat.ISearchConditions, '$projection' | 'additionalProperty' | 'branchCode' | 'seatingType' | 'name' | 'limit' | 'page'> & {
@@ -161,8 +161,8 @@ export declare class SeatRepo {
          */
         branchCode: string;
     }[], options: IUpdateOptions): Promise<{
-        bulkWriteResult: BulkWriteResult;
-    } | void>;
+        bulkWriteResult?: BulkWriteResult;
+    }>;
     deleteSeatByBranchCode(seat: {
         /**
          * 座席コード

package/lib/chevre/repo/place/seat.js

@@ -356,6 +356,7 @@ class SeatRepo {
             const bulkWriteResult = await this.placeModel.bulkWrite(bulkWriteOps, { ordered: false });
             return { bulkWriteResult };
         }
+        return {};
     }
     /**
      * コードをキーにして冪等編集
@@ -432,6 +433,7 @@ class SeatRepo {
             const bulkWriteResult = await this.placeModel.bulkWrite(bulkWriteOps, { ordered: false });
             return { bulkWriteResult };
         }
+        return {};
     }
     async updateSeatByBranchCode(seat, $unset, options) {
         const { project, parentOrganization, movieTheaterCode, roomCode, sectionCode } = options;
@@ -788,6 +790,7 @@ class SeatRepo {
             const bulkWriteResult = await this.placeModel.bulkWrite(bulkWriteOps, { ordered: false });
             return { bulkWriteResult };
         }
+        return {};
     }
     async deleteSeatByBranchCode(seat, options) {
         const { project, parentOrganization, movieTheaterCode, roomCode, sectionCode } = options;

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

@@ -69,11 +69,11 @@ export declare class ProductRepo {
             [key in IUnsetKey]?: 1;
         };
     }[]): Promise<{
-        bulkWriteResult: BulkWriteResult;
-        modifiedProducts: {
+        bulkWriteResult?: BulkWriteResult;
+        modifiedProducts?: {
             id: string;
         }[];
-    } | void>;
+    }>;
     /**
      * プロダクトIDからavailableChannelを取得する
      */

package/lib/chevre/repo/product.js

@@ -338,6 +338,7 @@ class ProductRepo {
                 .exec();
             return { bulkWriteResult, modifiedProducts };
         }
+        return {};
     }
     /**
      * プロダクトIDからavailableChannelを取得する

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

@@ -32,11 +32,11 @@ export declare class ProductOfferRepo {
          */
         update: boolean;
     }): Promise<{
-        bulkWriteResult: BulkWriteResult;
-        modifiedProductOffers: {
+        bulkWriteResult?: BulkWriteResult;
+        modifiedProductOffers?: {
             id: string;
         }[];
-    } | void>;
+    }>;
     /**
      * 販売者の提供するプロダクトオファーを削除する
      */

package/lib/chevre/repo/productOffer.js

@@ -201,6 +201,7 @@ class ProductOfferRepo {
                 .exec();
             return { bulkWriteResult, modifiedProductOffers };
         }
+        return {};
     }
     // public async deleteProductOffersByIds(params: {
     //     project: { id: string };

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

@@ -49,7 +49,7 @@ export declare class ReservationRepo {
         reservationNumber: string;
         underName?: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
         broker?: factory.reservation.IBroker<factory.reservationType>;
-    }): Promise<BulkWriteResult | void>;
+    }): Promise<BulkWriteResult | undefined>;
     /**
      * 予約取消
      */

package/lib/chevre/repo/reservation.js

@@ -918,6 +918,7 @@ class ReservationRepo {
         if (bulkWriteOps.length > 0) {
             return this.reservationModel.bulkWrite(bulkWriteOps, { ordered: false });
         }
+        return;
     }
     /**
      * 予約取消

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

@@ -51,7 +51,7 @@ export declare class SellerMakesOfferRepo {
                 id: string;
             };
         }[];
-    }): Promise<BulkWriteResult | void>;
+    }): Promise<BulkWriteResult | undefined>;
     /**
      * 販売者とアプリケーションに対してオファーが存在すれば削除する
      */
@@ -67,6 +67,6 @@ export declare class SellerMakesOfferRepo {
                 id: string;
             };
         }[];
-    }): Promise<BulkWriteResult | void>;
+    }): Promise<BulkWriteResult | undefined>;
 }
 export {};

package/lib/chevre/repo/sellerMakesOffer.js

@@ -112,6 +112,7 @@ class SellerMakesOfferRepo {
         if (bulkWriteOps.length > 0) {
             return this.sellerModel.bulkWrite(bulkWriteOps, { ordered: false });
         }
+        return;
     }
     /**
      * 販売者とアプリケーションに対してオファーが存在すれば削除する
@@ -141,6 +142,7 @@ class SellerMakesOfferRepo {
         if (bulkWriteOps.length > 0) {
             return this.sellerModel.bulkWrite(bulkWriteOps, { ordered: false });
         }
+        return;
     }
 }
 exports.SellerMakesOfferRepo = SellerMakesOfferRepo;

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

@@ -99,7 +99,7 @@ export declare class TransactionRepo {
         expires: {
             $lt: Date;
         };
-    }): Promise<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'> | void>;
+    }): Promise<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'> | undefined>;
     /**
      * 取引を期限切れにする
      */

package/lib/chevre/repo/transaction.js

@@ -850,6 +850,7 @@ class TransactionRepo {
             .exec();
         if (doc === null) {
             // no op
+            return;
         }
         else {
             transaction_1.transactionEventEmitter.emitTransactionStatusChanged({

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

@@ -39,4 +39,4 @@ export declare function exportOneTransactionTasksIfExists(params: {
 }): (repos: {
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
-}) => Promise<Pick<factory.assetTransaction.ITransaction<factory.assetTransactionType>, "id" | "typeOf"> | void>;
+}) => Promise<Pick<factory.assetTransaction.ITransaction<factory.assetTransactionType>, "id" | "typeOf"> | undefined>;

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

@@ -77,7 +77,7 @@ function placeOrder(params) {
             typeOf: factory.actionType.OrderAction
         };
         // 冪等性を担保(2023-05-31~)
-        const completedActions = await repos.action.search({
+        const completedActions = await repos.action.findActionsByType({
             limit: 1,
             page: 1,
             actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },

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

@@ -75,7 +75,7 @@ function cancelPengindIfNotYet(params) {
         let actionId;
         const actionAttributes = (0, factory_1.createCancelPendingReservationAction)({ transaction: reserveTransaction });
         // 冪等性を担保(2023-06-05~)
-        const completedActions = await repos.action.search({
+        const completedActions = await repos.action.findActionsByType({
             limit: 1,
             page: 1,
             actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },

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

@@ -134,7 +134,7 @@ params, options) {
         const actionAttributes = reserveTransaction2action({ transaction: reserveTransaction });
         // 冪等性を担保(2023-05-31~)
         debug('searching completed reserveAction... byTask:', options?.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
-        const completedActions = await repos.action.search({
+        const completedActions = await repos.action.findActionsByType({
             limit: 1,
             page: 1,
             actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },

package/lib/chevre/service/transaction/placeOrder/confirm.d.ts

@@ -1,4 +1,4 @@
-import type { ActionRepo } from '../../../repo/action';
+import type { AcceptPayActionRepo } from '../../../repo/action/acceptPay';
 import type { AuthorizePaymentMethodActionRepo } from '../../../repo/action/authorizePaymentMethod';
 import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
@@ -14,7 +14,8 @@ import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import * as factory from '../../../factory';
 import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
 interface IConfirmOperationRepos {
-    action: ActionRepo;
+    action?: never;
+    acceptPayAction: AcceptPayActionRepo;
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
     authorizeOfferAction: AuthorizeOfferActionRepo;
     assetTransaction: AssetTransactionRepo;

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

@@ -65,6 +65,7 @@ function processTransactionNotInProgress(transaction) {
         else if (transaction.status === factory.transactionStatusType.Canceled) {
             throw new factory.errors.Argument('transactionId', 'Transaction already canceled');
         }
+        return;
     };
 }
 /**
@@ -397,16 +398,26 @@ function createResult(params, options) {
 }
 function searchAcceptPayActions(params) {
     return async (repos) => {
-        let acceptPayActions = await repos.action.search({
-            project: { id: { $eq: params.project.id } },
-            typeOf: { $eq: factory.actionType.AcceptAction },
-            actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+        // let acceptPayActions = <IAcceptPayAction[]>await repos.action.search(
+        //     {
+        //         project: { id: { $eq: params.project.id } },
+        //         typeOf: { $eq: factory.actionType.AcceptAction },
+        //         actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+        //         purpose: {
+        //             id: { $in: [params.id] },
+        //             typeOf: { $in: [factory.transactionType.PlaceOrder] }
+        //         },
+        //         object: {
+        //             typeOf: { $eq: factory.assetTransactionType.Pay }
+        //         }
+        //     },
+        //     ['object', 'endDate', 'result']
+        // );
+        let acceptPayActions = await repos.acceptPayAction.findAcceptActionsByPurpose({
+            project: { id: params.project.id },
+            actionStatus: factory.actionStatusType.CompletedActionStatus,
             purpose: {
-                id: { $in: [params.id] },
-                typeOf: { $in: [factory.transactionType.PlaceOrder] }
-            },
-            object: {
-                typeOf: { $eq: factory.assetTransactionType.Pay }
+                id: params.id
             }
         }, ['object', 'endDate', 'result']);
         // 万が一このプロセス中に他処理が発生してもそれらを無視するように、endDateでフィルタリング

package/lib/chevre/service/transaction.d.ts

@@ -48,4 +48,4 @@ export declare function exportOneTransactionTasksIfExists(params: {
         endDate?: factory.sortType;
         startDate?: factory.sortType;
     };
-}): IExportTasksOperation<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'> | void>;
+}): IExportTasksOperation<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'> | undefined>;

package/package.json

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