@chevre/domain 25.2.0-alpha.42 → 25.2.0-alpha.44

package/lib/chevre/eventEmitter/task.d.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';
 import type { Connection } from 'mongoose';
-import type { RedisClientType } from 'redis';
+import type { createClient } from 'redis';
 import { factory } from '../factory';
 interface IExecuteSettings {
     /**
@@ -60,6 +60,7 @@ type IChangedTask = IReadyTask | IRunningTask | IRunningTaskByName | IExecutedTa
 type IOperationExecute<T> = (settings: IExecuteSettings) => Promise<T>;
 type INextFunction = (task: IExecutedTask) => IOperationExecute<void>;
 type IOnTaskStatusChangedListener = (task: IChangedTask, next?: INextFunction) => void;
+type RedisClientType = ReturnType<typeof createClient>;
 /**
  * タスクイベントエミッター
  */

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

@@ -12,7 +12,7 @@ export declare class AggregateOfferRepo {
     constructor(connection: Connection);
     static CREATE_MATCH_STAGE(params: Omit<factory.unitPriceOffer.ISearchConditions, 'limit' | 'page' | 'sort'>): IMatchStage[];
     static CREATE_AGGREGATE_OFFERS_PROJECTION(params: IProjection): Record<string, AnyExpression>;
-    search(params: factory.unitPriceOffer.ISearchConditions, projection?: IProjection): Promise<factory.aggregateOffer.IAggregateOffer[]>;
+    findAggregateOffers(params: factory.unitPriceOffer.ISearchConditions, projection?: IProjection): Promise<Pick<factory.aggregateOffer.IAggregateOffer, 'id' | 'offers' | 'typeOf'>[]>;
     pushIncludedInDataCatalog(params: {
         project: {
             id: string;
@@ -109,15 +109,5 @@ export declare class AggregateOfferRepo {
             };
         };
     }): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
-    countIncludedInDataCatalog(params: {
-        id: {
-            $eq: string;
-        };
-    }): Promise<{
-        includedInDataCatalogCount: number;
-    }[]>;
-    maxIncludedInDataCatalogCount(): Promise<{
-        includedInDataCatalogCount: number;
-    }[]>;
 }
 export {};

package/lib/chevre/repo/aggregateOffer.js

@@ -374,11 +374,11 @@ class AggregateOfferRepo {
             _id: 0,
             id: '$_id',
             typeOf: '$typeOf',
-            project: '$project',
             offers: [{ $first: '$offers' }],
-            highPrice: { $max: '$offers.priceSpecification.price' },
-            lowPrice: { $min: '$offers.priceSpecification.price' },
-            offerCount: { $size: '$offers' }
+            // project: '$project', // discontinue(2026-07-24~)
+            // highPrice: { $max: '$offers.priceSpecification.price' }, // offers.length:1に限定につき廃止(2026-07-24~)
+            // lowPrice: { $min: '$offers.priceSpecification.price' }, // offers.length:1に限定につき廃止(2026-07-24~)
+            // offerCount: { $size: '$offers' } // offers.length:1に限定につき廃止(2026-07-24~)
         };
         const positiveProjectionFields = Object.keys(params)
             .filter((key) => params[key] !== 0);
@@ -389,11 +389,10 @@ class AggregateOfferRepo {
                 _id: 0,
                 id: '$_id',
                 typeOf: '$typeOf',
-                project: '$project',
-                // offers: [{ $first: '$offers' }],
-                highPrice: { $max: '$offers.priceSpecification.price' },
-                lowPrice: { $min: '$offers.priceSpecification.price' },
-                offerCount: { $size: '$offers' }
+                // project: '$project', // discontinue(2026-07-24~)
+                // highPrice: { $max: '$offers.priceSpecification.price' }, // offers.length:1に限定につき廃止(2026-07-24~)
+                // lowPrice: { $min: '$offers.priceSpecification.price' }, // offers.length:1に限定につき廃止(2026-07-24~)
+                // offerCount: { $size: '$offers' } // offers.length:1に限定につき廃止(2026-07-24~)
             };
             const offersProjection = {};
             positiveProjectionFields.forEach((field) => {
@@ -410,7 +409,7 @@ class AggregateOfferRepo {
         }
         return projectStage;
     }
-    async search(params, projection) {
+    async findAggregateOffers(params, projection) {
         const matchStages = AggregateOfferRepo.CREATE_MATCH_STAGE(params);
         const projectStage = AggregateOfferRepo.CREATE_AGGREGATE_OFFERS_PROJECTION({ ...projection });
         const sortByPrice = params.sort?.['priceSpecification.price'];
@@ -436,8 +435,11 @@ class AggregateOfferRepo {
         /* istanbul ignore else */
         if (typeof params.limit === 'number' && params.limit > 0) {
             const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-            aggregate.limit(params.limit * page)
-                .skip(params.limit * (page - 1));
+            // support skip -> limit(2026-07-24~)
+            // aggregate.limit(params.limit * page)
+            //     .skip(params.limit * (page - 1));
+            aggregate.skip(params.limit * (page - 1))
+                .limit(params.limit);
         }
         return aggregate.exec();
     }
@@ -499,25 +501,6 @@ class AggregateOfferRepo {
         }, { projection: { _id: 1 } })
             .exec();
     }
-    // 単価オファー最適化作業における一時的な処理
-    // public async optimizeOffers() {
-    //     return this.aggregateOfferModel.updateMany(
-    //         {
-    //             $or: [
-    //                 { 'offers.id': { $exists: true } },
-    //                 { 'offers.project': { $exists: true } }
-    //             ]
-    //         },
-    //         {
-    //             $set: {},
-    //             $unset: {
-    //                 'offers.0.id': 1,
-    //                 'offers.0.project': 1
-    //             }
-    //         }
-    //     )
-    //         .exec();
-    // }
     getCursor(conditions, projection) {
         return this.aggregateOfferModel.find(conditions, projection)
             .sort({ 'offers.identifier': factory_1.factory.sortType.Ascending })
@@ -530,15 +513,12 @@ class AggregateOfferRepo {
     async save(params) {
         let doc;
         let aggregateOfferId;
-        // const { $unset, ...paramsWithoutUnset } = params;
         const { ...paramsWithoutUnset } = params;
-        // let savedUnitPriceOffer: factory.unitPriceOffer.IUnitPriceOffer;
         if (typeof params.id !== 'string' || params.id.length === 0) {
             const { default: uniqid } = await import('uniqid');
             const newId = uniqid();
             aggregateOfferId = newId;
             // サブオファー最適化(2023-12-22~)
-            // savedUnitPriceOffer = { ...paramsWithoutUnset, id };
             const { id, project, ...savedUnitPriceOffer } = paramsWithoutUnset; // eslint-disable-line @typescript-eslint/no-unused-vars
             const aggregateOffer = {
                 typeOf: factory_1.factory.offerType.AggregateOffer,
@@ -552,18 +532,7 @@ class AggregateOfferRepo {
         }
         else {
             aggregateOfferId = params.id;
-            // const unitPriceOffers = <Pick<factory.unitPriceOffer.IUnitPriceOffer, 'id' | 'identifier' | 'project' | 'typeOf'>[]>
-            //     await this.search(
-            //         {
-            //             limit: 1,
-            //             page: 1,
-            //             project: { id: { $eq: params.project.id } },
-            //             id: { $eq: params.id }
-            //         },
-            //         { identifier: 1, project: 1, typeOf: 1 }
-            //     );
-            // const originalUnitPriceOffer = unitPriceOffers.shift();
-            const aggregateOffers = await this.search({
+            const aggregateOffers = await this.findAggregateOffers({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.project.id } },
@@ -579,26 +548,17 @@ class AggregateOfferRepo {
             // サブオファー最適化(2023-12-22~)
             const subOffer = {
                 ...updateFields,
-                // id: originalUnitPriceOffer.id,
                 identifier: originalUnitPriceOffer.identifier,
-                // project: originalUnitPriceOffer.project,
                 typeOf: originalUnitPriceOffer.typeOf
             };
-            doc = await this.aggregateOfferModel.findOneAndUpdate(
-            // { 'offers.id': params.id },
-            { _id: params.id }, // _idに変更(2023-12-22~)
+            doc = await this.aggregateOfferModel.findOneAndUpdate({ _id: params.id }, // _idに変更(2023-12-22~)
             {
                 $set: {
-                    // 'offers.$[offer]': savedUnitPriceOffer
                     'offers.0': subOffer // _idに変更(2023-12-22~)
                 }
             }, {
                 upsert: false,
                 new: true
-                // _idに変更(2023-12-22~)
-                // arrayFilters: [
-                //     { 'offer.id': { $eq: params.id } }
-                // ]
             })
                 .exec();
         }
@@ -676,7 +636,6 @@ class AggregateOfferRepo {
     async saveManyByIdentifier4sskts(params) {
         const { default: uniqid } = await import('uniqid');
         const insertBulkWriteOps = [];
-        // const updateBulkWriteOps: AnyBulkWriteOperation[] = [];
         if (Array.isArray(params)) {
             params.forEach((p) => {
                 const newOfferId = uniqid();
@@ -710,7 +669,6 @@ class AggregateOfferRepo {
         }
         if (insertBulkWriteOps.length > 0) {
             await this.aggregateOfferModel.bulkWrite(insertBulkWriteOps, { ordered: false });
-            // await this.aggregateOfferModel.bulkWrite(updateBulkWriteOps, { ordered: false });
         }
     }
     /**
@@ -724,13 +682,6 @@ class AggregateOfferRepo {
             'project.id': { $eq: params.project.id },
             'offers.addOn.itemOffered.id': { $exists: true, $in: params.addOn.itemOffered.id.$in }
         };
-        // const updatingOffers = <Pick<factory.unitPriceOffer.IUnitPriceOffer, 'id' | 'identifier'>[]>await this.search(
-        //     {
-        //         project: { id: { $eq: params.project.id } },
-        //         addOn: { itemOffered: { id: { $in: params.addOn.itemOffered.id.$in } } }
-        //     },
-        //     { identifier: 1 }
-        // );
         return this.aggregateOfferModel.updateMany(conditions, {
             $pull: {
                 'offers.$[offer].addOn': {
@@ -743,66 +694,6 @@ class AggregateOfferRepo {
             ]
         })
             .exec();
-        // if (updatingOffers.length > 0) {
-        //     // no op
-        // }
-        // return result;
-    }
-    async countIncludedInDataCatalog(params) {
-        const aggregate = this.aggregateOfferModel.aggregate([
-            {
-                $match: {
-                    _id: { $eq: params.id.$eq }
-                }
-            },
-            {
-                $project: {
-                    _id: 0,
-                    includedInDataCatalogCount: {
-                        $cond: {
-                            if: { $isArray: '$includedInDataCatalog' },
-                            then: { $size: '$includedInDataCatalog' },
-                            else: 0
-                        }
-                    }
-                }
-            }
-        ]);
-        return aggregate.exec();
-    }
-    async maxIncludedInDataCatalogCount() {
-        const aggregate = this.aggregateOfferModel.aggregate([
-            // {
-            //     $match: {
-            //         _id: { $eq: params.id.$eq }
-            //     }
-            // },
-            {
-                $project: {
-                    _id: 0,
-                    includedInDataCatalogCount: {
-                        $cond: {
-                            if: { $isArray: '$includedInDataCatalog' },
-                            then: { $size: '$includedInDataCatalog' },
-                            else: 0
-                        }
-                    }
-                }
-            },
-            {
-                $group: {
-                    _id: null,
-                    maxCount: { $max: '$includedInDataCatalogCount' }
-                }
-            },
-            {
-                $project: {
-                    _id: 0,
-                    maxCount: '$maxCount'
-                }
-            }
-        ]);
-        return aggregate.exec();
     }
 }
 exports.AggregateOfferRepo = AggregateOfferRepo;

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

@@ -1,5 +1,6 @@
-import type { RedisClientType } from 'redis';
+import type { createClient } from 'redis';
 import { AbstractConcurrentLockRepo, ILockParams, IUnlockParams } from './concurrentLockAbstract';
+type RedisClientType = ReturnType<typeof createClient>;
 /**
  * 同時実行ロックリポジトリ
  */
@@ -12,3 +13,4 @@ export declare class ConcurrentLockRepo implements AbstractConcurrentLockRepo {
     lock(params: ILockParams): Promise<void>;
     unlock(params: IUnlockParams): Promise<void>;
 }
+export {};

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

@@ -1,9 +1,10 @@
 import type { COA } from '@motionpicture/coa-service';
-import type { RedisClientType } from 'redis';
+import type { createClient } from 'redis';
 interface IOptions {
     scope: string;
     expireInSeconds: number;
 }
+type RedisClientType = ReturnType<typeof createClient>;
 /**
  * 認証情報リポジトリ
  */

package/lib/chevre/repo/offer/offerInCatalogReadOnly.d.ts

@@ -128,7 +128,7 @@ declare abstract class OfferInCatalogReadOnlyRepo {
          */
         id: string;
     }[]>;
-    abstract count(params: Omit<factory.unitPriceOffer.ISearchConditions, 'limit' | 'page' | 'sort'>): Promise<number>;
+    abstract countUnitPriceOffers(params: Omit<factory.unitPriceOffer.ISearchConditions, 'limit' | 'page' | 'sort'>): Promise<number>;
     abstract findUnitPriceOffers(params: factory.unitPriceOffer.ISearchConditions, projection?: IProjection): Promise<IOfferInCatalog[]>;
 }
 export { KeyOfOffer, IProjection, IOfferInCatalog, IPriceSpecificationConditionsOnSearchWithSortIndex, OfferInCatalogReadOnlyRepo };

package/lib/chevre/repo/offer/unitPriceInCatalog.d.ts

@@ -137,7 +137,7 @@ export declare class OfferRepo implements OfferInCatalogReadOnlyRepo {
         };
         unacceptedPaymentMethod: string[];
     }): Promise<boolean>;
-    count(params: Omit<factory.unitPriceOffer.ISearchConditions, 'limit' | 'page' | 'sort'>): Promise<number>;
+    countUnitPriceOffers(params: Omit<factory.unitPriceOffer.ISearchConditions, 'limit' | 'page' | 'sort'>): Promise<number>;
     findUnitPriceOffers(params: factory.unitPriceOffer.ISearchConditions, projection?: IProjection): Promise<IOfferInCatalog[]>;
     /**
      * サブカタログから集計オファーIDリストを検索する

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

@@ -370,12 +370,13 @@ class OfferRepo {
             .exec();
         return doc !== null;
     }
-    async count(params) {
+    async countUnitPriceOffers(params) {
         const matchStages = aggregateOffer_1.AggregateOfferRepo.CREATE_MATCH_STAGE(params);
         const result = await this.aggregateOfferModel.aggregate([
-            {
-                $unwind: { path: '$offers' }
-            },
+            // // offers.length:1の前提であるため、unwindは不要(2026-07-23~)
+            // {
+            //     $unwind: { path: '$offers' }
+            // },
             ...matchStages,
             {
                 $count: 'offerCount'

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

@@ -1,5 +1,5 @@
 import { JwtPayload } from 'jsonwebtoken';
-import type { RedisClientType } from 'redis';
+import type { createClient } from 'redis';
 import { factory } from '../factory';
 import { IPassportValidator } from '../factory/transaction';
 export type IVerifiedPassport = factory.waiter.passport.IPassport & {
@@ -20,6 +20,7 @@ interface IOptions {
     secret: string;
     passportValidator?: IPassportValidator;
 }
+type RedisClientType = ReturnType<typeof createClient>;
 /**
  * 取引許可証リポジトリ
  */

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

@@ -37,8 +37,8 @@ export declare class PriceSpecificationRepo {
         };
     }): Promise<void>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & (({
-        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
         name?: (string | import("@chevre/factory/lib/chevre/multilingualString").IMultilingualString) | undefined;
+        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
         price: number;
         priceCurrency: factory.priceCurrency;
         typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification;
@@ -53,8 +53,8 @@ export declare class PriceSpecificationRepo {
     } & {
         __v: number;
     }) | ({
-        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
         name?: (string | import("@chevre/factory/lib/chevre/multilingualString").IMultilingualString) | undefined;
+        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
         price: number;
         priceCurrency: factory.priceCurrency;
         typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification;
@@ -70,8 +70,8 @@ export declare class PriceSpecificationRepo {
     } & {
         __v: number;
     })), import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & (({
-        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
         name?: (string | import("@chevre/factory/lib/chevre/multilingualString").IMultilingualString) | undefined;
+        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
         price: number;
         priceCurrency: factory.priceCurrency;
         typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification;
@@ -86,8 +86,8 @@ export declare class PriceSpecificationRepo {
     } & {
         __v: number;
     }) | ({
-        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
         name?: (string | import("@chevre/factory/lib/chevre/multilingualString").IMultilingualString) | undefined;
+        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
         price: number;
         priceCurrency: factory.priceCurrency;
         typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification;

package/lib/chevre/repo/rateLimit/offer.d.ts

@@ -1,5 +1,6 @@
-import { RedisClientType } from 'redis';
+import type { createClient } from 'redis';
 import { factory } from '../../factory';
+type RedisClientType = ReturnType<typeof createClient>;
 /**
  * レート制限キーインターフェース
  */
@@ -34,3 +35,4 @@ export declare class OfferRateLimitRepo {
     unlock(params: IRateLimitKey): Promise<void>;
     getHolder(ratelimitKey: IRateLimitKey): Promise<string | null>;
 }
+export {};

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

@@ -1,4 +1,4 @@
-import type { RedisClientType } from 'redis';
+import type { createClient } from 'redis';
 import { factory } from '../factory';
 interface IProcessKey {
     typeOf: factory.transactionType;
@@ -13,6 +13,7 @@ interface IProcessKey {
 interface IOptions {
     lockExpiresInSeconds: number;
 }
+type RedisClientType = ReturnType<typeof createClient>;
 /**
  * 取引プロセスリポジトリ
  */

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "10.0.0",
+    "@chevre/factory": "10.1.0-alpha.0",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.2.0-alpha.42"
+  "version": "25.2.0-alpha.44"
 }