@chevre/domain 25.2.0-alpha.4 → 25.2.0-alpha.41

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

@@ -1,5 +1,4 @@
-import type { BulkWriteResult } from 'mongodb';
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection, FilterQuery, mongo } from 'mongoose';
 import { factory } from '../../factory';
 import { IDocType } from '../mongoose/schemas/civicStructure';
 export type IScreeningRoomFoundByBranchCode = Pick<factory.place.screeningRoom.IPlace, 'typeOf' | 'branchCode' | 'name' | 'containsPlace' | 'seatCount' | 'parentOrganization'>;
@@ -49,7 +48,7 @@ export declare class MovieTheaterRepo {
             [key in keyof IUpsertingMovieTheater]?: 1;
         };
     }[], options: IUpsertOptions): Promise<{
-        bulkWriteResult?: BulkWriteResult;
+        bulkWriteResult?: mongo.BulkWriteResult;
         /**
          * 追加あるいは編集された施設
          */
@@ -86,7 +85,7 @@ export declare class MovieTheaterRepo {
              */
             id: string;
         };
-    }): Promise<import("mongodb").DeleteResult>;
+    }): Promise<mongo.DeleteResult>;
     /**
      * プロジェクトに属する施設を全削除
      */

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

@@ -1,5 +1,4 @@
-import type { BulkWriteResult } from 'mongodb';
-import { Connection, FilterQuery, PipelineStage } from 'mongoose';
+import type { Connection, FilterQuery, PipelineStage, mongo } from 'mongoose';
 import { factory } from '../../factory';
 import { IDocType } from '../mongoose/schemas/place';
 export type IScreeningRoomFoundByBranchCode = Pick<factory.place.screeningRoom.IPlace, 'typeOf' | 'branchCode' | 'name' | 'containsPlace' | 'seatCount' | 'parentOrganization'>;
@@ -66,7 +65,7 @@ export declare class ScreeningRoomRepo {
             [key in keyof IUpsertingRoom]?: 1;
         };
     }[], options: IUpsertOptions): Promise<{
-        bulkWriteResult?: BulkWriteResult;
+        bulkWriteResult?: mongo.BulkWriteResult;
     }>;
     deleteRoomByBranchCode(screeningRoom: {
         /**
@@ -84,7 +83,7 @@ export declare class ScreeningRoomRepo {
              */
             id: string;
         };
-    }): Promise<import("mongodb").DeleteResult>;
+    }): Promise<mongo.DeleteResult>;
     searchScreeningRooms(searchConditions: factory.place.screeningRoom.ISearchConditions): Promise<Omit<factory.place.screeningRoom.IPlace, 'containsPlace' | 'parentOrganization'>[]>;
     findRooms(params: Omit<factory.place.screeningRoom.ISearchConditions, '$projection'>): Promise<Pick<factory.place.screeningRoom.IPlace, 'additionalProperty' | 'address' | 'branchCode' | 'name' | 'openSeatingAllowed' | 'maximumAttendeeCapacity'>[]>;
     /**
@@ -116,7 +115,7 @@ export declare class ScreeningRoomRepo {
              */
             id: string;
         };
-    }): Promise<import("mongodb").DeleteResult>;
+    }): Promise<mongo.DeleteResult>;
     /**
      * プロジェクトに属するルームを全削除
      */

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

@@ -1,5 +1,4 @@
-import type { BulkWriteResult } from 'mongodb';
-import { AnyExpression, Connection, PipelineStage } from 'mongoose';
+import type { AnyExpression, Connection, PipelineStage, mongo } from 'mongoose';
 import { factory } from '../../factory';
 type IMatchStage = PipelineStage.Match;
 type ICreatingSeat = Pick<factory.place.seat.IPlace, 'additionalProperty' | 'branchCode' | 'name' | 'maximumAttendeeCapacity' | 'seatingType'>;
@@ -45,7 +44,7 @@ export declare class SeatRepo {
     addSeatsByBranchCodeIfNotExist(params: {
         $set: ICreatingSeat;
     }[], options: IUpdateOptions): Promise<{
-        bulkWriteResult?: BulkWriteResult;
+        bulkWriteResult?: mongo.BulkWriteResult;
     }>;
     /**
      * コードをキーにして冪等編集
@@ -56,7 +55,7 @@ export declare class SeatRepo {
             [key in keyof ICreatingSeat]?: 1;
         };
     }[], options: IUpdateOptions): Promise<{
-        bulkWriteResult?: BulkWriteResult;
+        bulkWriteResult?: mongo.BulkWriteResult;
     }>;
     updateSeatByBranchCode(seat: ICreatingSeat, $unset: any, // eslint-disable-line @typescript-eslint/no-explicit-any
     options: IUpdateOptions): Promise<IUpdateSeatResult>;
@@ -166,7 +165,7 @@ export declare class SeatRepo {
          */
         branchCode: string;
     }[], options: IUpdateOptions): Promise<{
-        bulkWriteResult?: BulkWriteResult;
+        bulkWriteResult?: mongo.BulkWriteResult;
     }>;
     deleteSeatByBranchCode(seat: {
         /**

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

@@ -1,5 +1,4 @@
-import type { BulkWriteResult } from 'mongodb';
-import type { Connection, PipelineStage } from 'mongoose';
+import type { Connection, PipelineStage, mongo } from 'mongoose';
 import { factory } from '../../factory';
 type IScreeningRoomSectionWithoutContainsPlace = Omit<factory.place.screeningRoomSection.IPlace, 'containsPlace'>;
 type ICreatingSection = Pick<factory.place.screeningRoomSection.IPlace, 'additionalProperty' | 'branchCode' | 'name'>;
@@ -57,7 +56,7 @@ export declare class SectionRepo {
     addSeatSectionsByBranchCodeIfNotExist(params: {
         $set: IUpsertingSeatSection;
     }[], options: IUpsertOptions): Promise<{
-        bulkWriteResult?: BulkWriteResult;
+        bulkWriteResult?: mongo.BulkWriteResult;
     }>;
     /**
      * コードをキーにして冪等編集
@@ -65,7 +64,7 @@ export declare class SectionRepo {
     updateSeatSectionsByBranchCode(params: {
         $set: IUpsertingSeatSection;
     }[], options: IUpsertOptions): Promise<{
-        bulkWriteResult?: BulkWriteResult;
+        bulkWriteResult?: mongo.BulkWriteResult;
     }>;
     migrateSectionIdentifier(screeningRoomSection: {
         project: {

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

@@ -1,5 +1,4 @@
-import type { BulkWriteResult } from 'mongodb';
-import { Connection, FilterQuery, Types } from 'mongoose';
+import { Connection, FilterQuery, Types, mongo } from 'mongoose';
 import { factory } from '../factory';
 import { IDocType, IDocTypeAsProduct } from './mongoose/schemas/product';
 type IKeyOfProjection = keyof factory.product.IProduct | 'hasOfferCatalog.id';
@@ -65,7 +64,7 @@ export declare class ProductRepo {
         };
         $unset?: Partial<Record<IUnsetKey, 1>>;
     }[]): Promise<{
-        bulkWriteResult?: BulkWriteResult;
+        bulkWriteResult?: mongo.BulkWriteResult;
         modifiedProducts?: {
             id: string;
         }[];
@@ -80,7 +79,7 @@ export declare class ProductRepo {
         hasOfferCatalog: {
             id: string;
         };
-    }): Promise<import("mongodb").DeleteResult>;
+    }): Promise<mongo.DeleteResult>;
     /**
      * プロジェクト指定で削除する
      */

package/lib/chevre/repo/rateLimit/offer.js

@@ -28,7 +28,6 @@ class OfferRateLimitRepo {
      * ロックする
      * discontinue array params(2025-05-26~)
      */
-    // public async lock(ratelimitKeys: IRateLimitKey[]): Promise<void> {
     async lock(params) {
         const key = OfferRateLimitRepo.createKey(params);
         const value = params.reservationNumber;
@@ -50,18 +49,8 @@ class OfferRateLimitRepo {
         catch (_error) {
             throw new factory_1.factory.errors.RateLimitExceeded('Offer');
         }
-        // const multi = this.redisClient.multi();
-        // multi.setNX(key, value)
-        //     .expire(key, ttl);
-        // const results = await multi.exec();
-        // if (Array.isArray(results) && (results[0] === 1 || (<any>results)[0] === true)) {
-        //     return;
-        // } else {
-        //     throw new factory.errors.RateLimitExceeded('Offer');
-        // }
     }
     // discontinue array params(2025-05-26~)
-    // public async unlock(ratelimitKeys: IRateLimitKey[]): Promise<void> {
     async unlock(params) {
         const key = OfferRateLimitRepo.createKey(params);
         // reimplement using concurrentLockRepo(2025-05-27~)
@@ -69,7 +58,6 @@ class OfferRateLimitRepo {
             about: { identifier: key, typeOf: 'Thing' },
             audience: { identifier: params.reservationNumber, typeOf: 'Audience' }
         });
-        // await this.redisClient.del(key);
     }
     async getHolder(ratelimitKey) {
         const key = OfferRateLimitRepo.createKey(ratelimitKey);

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

@@ -1,5 +1,4 @@
-import type { BulkWriteResult } from 'mongodb';
-import type { Connection, UpdateWriteOpResult } from 'mongoose';
+import type { Connection, UpdateWriteOpResult, mongo } from 'mongoose';
 import { IDocType } from './mongoose/schemas/reservation';
 import { factory } from '../factory';
 export interface IUpdatePartiallyParams {
@@ -77,7 +76,7 @@ export declare class ReservationRepo {
         reservationNumber: string;
         underName?: factory.reservation.IUnderName;
         broker?: factory.reservation.IBroker;
-    }): Promise<BulkWriteResult | undefined>;
+    }): Promise<mongo.BulkWriteResult | undefined>;
     /**
      * 予約取消
      */

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

@@ -1,5 +1,4 @@
-import type { BulkWriteResult } from 'mongodb';
-import { Connection } from 'mongoose';
+import { Connection, mongo } from 'mongoose';
 import { factory } from '../factory';
 type IMakesOffer = Pick<factory.seller.IMakesOffer, 'typeOf' | 'availableAtOrFrom' | 'eligibleTransactionDuration'>;
 type IMakesOfferAsFindResult = IMakesOffer & {
@@ -51,7 +50,7 @@ export declare class SellerMakesOfferRepo {
                 id: string;
             };
         }[];
-    }): Promise<BulkWriteResult | undefined>;
+    }): Promise<mongo.BulkWriteResult | undefined>;
     /**
      * 販売者とアプリケーションに対してオファーが存在すれば削除する
      */
@@ -67,6 +66,6 @@ export declare class SellerMakesOfferRepo {
                 id: string;
             };
         }[];
-    }): Promise<BulkWriteResult | undefined>;
+    }): Promise<mongo.BulkWriteResult | undefined>;
 }
 export {};

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

@@ -16,7 +16,7 @@ export declare class StockHolderRepo implements AbstractStockHolderRepo {
     /**
      * 座席をロックする
      */
-    lock(lockKey: ILockKey & {}): Promise<void>;
+    lock(lockKey: ILockKey): Promise<void>;
     /**
      * 座席ロックを解除する
      */

package/lib/chevre/repo/stockHolder.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StockHolderRepo = void 0;
-// import type { RedisClientType } from 'redis';
 const factory_1 = require("../factory");
 const pendingReservation_1 = require("./pendingReservation");
 const SEARCH_OFFERS_MAX_LENGTH = 100;
@@ -9,36 +8,11 @@ const SEARCH_OFFERS_MAX_LENGTH = 100;
  * 保留予約リポジトリ
  */
 class StockHolderRepo {
-    // public static KEY_PREFIX_NEW: string = 'stockHolder';
-    // private readonly redisClient: RedisClientType | undefined;
     pendingReservationRepo;
     constructor(params) {
         const { connection } = params;
-        // this.redisClient = redisClient;
         this.pendingReservationRepo = new pendingReservation_1.PendingReservationRepo(connection);
     }
-    // private static offer2field(params: IOffer, hasTicketedSeat: boolean) {
-    //     if (hasTicketedSeat) {
-    //         return `${params.seatSection}:${params.seatNumber}`;
-    //     } else {
-    //         // 予約IDをfieldにする場合
-    //         const serviceOutputId = params.itemOffered?.serviceOutput?.id;
-    //         if (typeof serviceOutputId === 'string') {
-    //             return serviceOutputId;
-    //         } else {
-    //             throw new factory.errors.Internal('offer2field requires itemOffered.serviceOutput.id');
-    //         }
-    //     }
-    // }
-    // private static createKey(params: {
-    //     eventId: string;
-    //     startDate: Date;
-    // }): string {
-    //     if (!(params.startDate instanceof Date)) {
-    //         throw new factory.errors.Argument('startDate', 'must be Date');
-    //     }
-    //     return `${StockHolderRepo.KEY_PREFIX_NEW}:${params.eventId}`;
-    // }
     /**
      * 座席をロックする(maxキャパシティチェック有)
      */
@@ -54,16 +28,6 @@ class StockHolderRepo {
         }
         else {
             throw new factory_1.factory.errors.NotImplemented('useRedis discontinued.');
-            // if (this.redisClient === undefined) {
-            //     throw new factory.errors.Internal('redisClient required');
-            // }
-            // const key = StockHolderRepo.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
-            // await this.redisClient.watch(key);
-            // const hashCount = await this.redisClient.hLen(key);
-            // if (hashCount + lockKey.offers.length > maximum) {
-            //     throw new factory.errors.Argument('Event', 'maximumAttendeeCapacity exceeded');
-            // }
-            // await this.lock(lockKey);
         }
     }
     /**
@@ -79,59 +43,11 @@ class StockHolderRepo {
             startDate: lockKey.startDate,
             hasTicketedSeat: lockKey.hasTicketedSeat
         });
-        // const key = StockHolderRepo.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
-        // await this.checkIfConflicted({ key, eventId: lockKey.eventId, useMongoose });
         if (useMongoose) {
             return this.pendingReservationRepo.lock(lockKey);
         }
         else {
             throw new factory_1.factory.errors.NotImplemented('useRedis discontinued.');
-            // if (this.redisClient === undefined) {
-            //     throw new factory.errors.Internal('redisClient required');
-            // }
-            // const value = lockKey.holder;
-            // const multi = this.redisClient.multi();
-            // const fields = lockKey.offers.map((offer) => StockHolderRepo.offer2field(offer, lockKey.hasTicketedSeat));
-            // // check uniqueness(2025-04-20~)
-            // const uniqueFields = [...new Set(fields)];
-            // if (uniqueFields.length !== fields.length) {
-            //     throw new factory.errors.Argument('offers', 'offers must be unique');
-            // }
-            // fields.forEach((field) => {
-            //     multi.hSetNX(key, field, value);
-            // });
-            // const results = await multi.expireAt(
-            //     key,
-            //     moment(lockKey.expires)
-            //         .unix()
-            // )
-            //     .exec();
-            // const lockedFields: string[] = [];
-            // if (Array.isArray(results)) {
-            //     results.slice(0, fields.length)
-            //         .forEach((r, index) => {
-            //             if (r === 1 || (<any>r) === true) {
-            //                 lockedFields.push(fields[index]);
-            //             }
-            //         });
-            // }
-            // const lockedAll = lockedFields.length === fields.length;
-            // // expireAtReplyの検証も追加する(2023-04-19~)
-            // const expiredAll = results.slice(fields.length)
-            //     .every((r) => (r === 1 || (<any>r) === true));
-            // if (!lockedAll || !expiredAll) {
-            //     if (lockedFields.length > 0) {
-            //         // 全て仮押さえできなければ仮押さえできたものは解除
-            //         await this.redisClient.multi()
-            //             .hDel(key, lockedFields)
-            //             .exec();
-            //     }
-            //     if (!lockedAll) {
-            //         throw new factory.errors.AlreadyInUse(factory.reservationType.EventReservation, ['ticketedSeat'], 'Already hold');
-            //     } else {
-            //         throw new factory.errors.Internal('timeout cannot be set unexpectedly');
-            //     }
-            // }
         }
     }
     /**
@@ -144,20 +60,11 @@ class StockHolderRepo {
             startDate: params.startDate,
             hasTicketedSeat: params.hasTicketedSeat
         });
-        // const key = StockHolderRepo.createKey({ eventId: params.eventId, startDate: params.startDate });
-        // await this.checkIfConflicted({ key, eventId: params.eventId, useMongoose });
         if (useMongoose) {
             return this.pendingReservationRepo.unlock(params);
         }
         else {
             throw new factory_1.factory.errors.NotImplemented('useRedis discontinued.');
-            // if (this.redisClient === undefined) {
-            //     throw new factory.errors.Internal('redisClient required');
-            // }
-            // const field = StockHolderRepo.offer2field(params.offer, params.hasTicketedSeat);
-            // await this.redisClient.multi()
-            //     .hDel(key, field)
-            //     .exec();
         }
     }
     /**
@@ -174,16 +81,6 @@ class StockHolderRepo {
         }
         else {
             throw new factory_1.factory.errors.NotImplemented('useRedis discontinued.');
-            // if (this.redisClient === undefined) {
-            //     throw new factory.errors.Internal('redisClient required');
-            // }
-            // const key = StockHolderRepo.createKey({ eventId: params.event.id, startDate: params.event.startDate });
-            // const reply = await this.redisClient.hLen(key);
-            // let fieldCount: number = 0;
-            // if (typeof reply === 'number') {
-            //     fieldCount = Number(reply);
-            // }
-            // return fieldCount;
         }
     }
     /**
@@ -200,12 +97,6 @@ class StockHolderRepo {
         }
         else {
             throw new factory_1.factory.errors.NotImplemented('useRedis discontinued.');
-            // if (this.redisClient === undefined) {
-            //     throw new factory.errors.Internal('redisClient required');
-            // }
-            // const key = StockHolderRepo.createKey({ eventId: params.eventId, startDate: params.startDate });
-            // const field = StockHolderRepo.offer2field(params.offer, params.hasTicketedSeat);
-            // return this.redisClient.hGet(key, field);
         }
     }
     async searchHolders(params) {
@@ -223,32 +114,8 @@ class StockHolderRepo {
         }
         else {
             throw new factory_1.factory.errors.NotImplemented('useRedis discontinued.');
-            // if (this.redisClient === undefined) {
-            //     throw new factory.errors.Internal('redisClient required');
-            // }
-            // const key = StockHolderRepo.createKey({ eventId: params.eventId, startDate: params.startDate });
-            // const fields = params.offers.map((o) => {
-            //     return StockHolderRepo.offer2field(o, params.hasTicketedSeat);
-            // });
-            // // Array reply: list of values associated with the given fields, in the same order as they are requested.
-            // const result = await this.redisClient.hmGet(key, fields);
-            // if (!Array.isArray(result)) {
-            //     throw new factory.errors.Internal(`searchAvailability got non-array: ${typeof result}`);
-            // }
-            // // そのまま返却(2023-04-17~)
-            // return result;
         }
     }
-    // public async checkIfConflicted(params: {
-    //     eventId: string;
-    //     startDate: Date;
-    // }): Promise<void> {
-    //     const redisKeyExists = await this.redisKeyExists(params);
-    //     const mongoDocExists = await this.pendingReservationRepo.docExists(params);
-    //     if (redisKeyExists && mongoDocExists) {
-    //         throw new factory.errors.Internal(`repository conflicted. eventId:${params.eventId}`);
-    //     }
-    // }
     /**
      * 新リポジトリを使用するかどうか
      */
@@ -258,19 +125,6 @@ class StockHolderRepo {
         }
         // always use mongo(2025-08-17~)
         return true;
-        // let useMongoose = false;
-        // const redisKeyExists = await this.redisKeyExists(params);
-        // if (redisKeyExists) {
-        //     useMongoose = false;
-        // } else {
-        //     // redis keyが存在しなければmongo利用
-        //     useMongoose = true;
-        // }
-        // // check confliction for test
-        // if (USE_STOCK_HOLDER_CHECK_CONFLICT) {
-        //     await this.checkIfConflicted(params);
-        // }
-        // return useMongoose;
     }
 }
 exports.StockHolderRepo = StockHolderRepo;

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

@@ -37,21 +37,6 @@ export declare class PlaceOrderRepo {
     }): Promise<(Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, IKeyOfProjection> & {
         id: string;
     })[]>;
-    /**
-     * 進行中取引に保管された採用済決済方法を検索する
-     */
-    findInProgressPaymentMethodId(params: {
-        id: string;
-    }): Promise<factory.transaction.placeOrder.IPaymentMethodByPaymentUrl | undefined>;
-    /**
-     * 取引の確認番号を検索する
-     */
-    findInProgressConfirmationNumberById(params: {
-        id: string;
-        status: {
-            $in: factory.transactionStatusType[];
-        };
-    }): Promise<string | undefined>;
     /**
      * 取引期限変更
      */
@@ -60,28 +45,6 @@ export declare class PlaceOrderRepo {
         id: string;
         expires: Date;
     }): Promise<void>;
-    /**
-     * 取引オブジェクトを更新
-     * 注文名称など
-     */
-    updateObject(params: {
-        typeOf: factory.transactionType.PlaceOrder;
-        id: string;
-        object?: {
-            name?: string;
-        };
-    }): Promise<void>;
-    /**
-     * 特定の進行中取引を更新する(汎用)
-     */
-    findByIdAndUpdateInProgress(params: {
-        id: string;
-        update: {
-            $set?: {
-                'object.paymentMethods'?: factory.transaction.placeOrder.IPaymentMethodByPaymentUrl;
-            };
-        };
-    }): Promise<void>;
     /**
      * 進行中取引のobjectに注文番号を保管する
      */
@@ -91,13 +54,6 @@ export declare class PlaceOrderRepo {
     }): Promise<{
         modifiedCount: number;
     }>;
-    saveConfirmationNumberIfNotExist(params: {
-        id: string;
-        status: {
-            $in: factory.transactionStatusType[];
-        };
-        confirmationNumber: string;
-    }): Promise<void>;
     /**
      * 進行中の注文取引を取得する
      */
@@ -125,9 +81,10 @@ export declare class PlaceOrderRepo {
         object: {
             orderDate: Date;
             orderNumber: string;
+            confirmationNumber: string;
         };
         result: factory.transaction.IResult<factory.transactionType.PlaceOrder>;
-        potentialActions: factory.transaction.IPotentialActions<factory.transactionType.PlaceOrder>;
+        potentialActions?: factory.transaction.IPotentialActions<factory.transactionType.PlaceOrder>;
     }): Promise<void>;
     /**
      * 取引を中止する