@chevre/domain 22.5.0-alpha.9 → 22.5.0

package/lib/chevre/repo/product.js

@@ -174,9 +174,7 @@ class ProductRepo {
     /**
      * プロダクトを検索する
      */
-    projectFields(conditions, inclusion
-    // exclusion: IKeyOfProjection[] // discontinue(2024-09-28~)
-    ) {
+    projectFields(conditions, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = ProductRepo.CREATE_MONGO_CONDITIONS(conditions);
@@ -186,9 +184,6 @@ class ProductRepo {
             }
             else {
                 throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
-                // if (Array.isArray(exclusion) && exclusion.length > 0) {
-                //     positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
-                // }
             }
             const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
             const query = this.productModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, projection);

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

@@ -36,7 +36,6 @@ export declare class ProjectRepo {
     findById(params: {
         id: string;
         inclusion: IKeyOfProjection[];
-        exclusion: IKeyOfProjection[];
     }): Promise<factory.project.IProject>;
     findAlternateNameById(params: {
         id: string;
@@ -44,7 +43,7 @@ export declare class ProjectRepo {
     /**
      * プロジェクト検索
      */
-    projectFields(conditions: factory.project.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<factory.project.IProject[]>;
+    projectFields(conditions: factory.project.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.project.IProject[]>;
     createById(params: factory.project.IProject): Promise<Pick<factory.project.IProject, 'id'>>;
     updateById(params: {
         id: string;
@@ -61,6 +60,13 @@ export declare class ProjectRepo {
             useEventServiceAsProduct?: boolean;
         };
     }): Promise<void>;
+    updateMakesOfferById(params: {
+        id: string;
+        makesOffer: factory.project.IMakesOffer[];
+    }): Promise<void>;
+    activateOptionalAggregationSettings(params: {
+        id: string;
+    }): Promise<void>;
     updateAggregateReservation(params: {
         id: string;
         aggregateReservation?: any;

package/lib/chevre/repo/project.js

@@ -69,7 +69,7 @@ class ProjectRepo {
                 limit: 1,
                 page: 1,
                 id: { $eq: params.id }
-            }, params.inclusion, params.exclusion)).shift();
+            }, params.inclusion)).shift();
             if (project === undefined) {
                 throw new factory.errors.NotFound(this.projectModel.modelName);
             }
@@ -90,7 +90,7 @@ class ProjectRepo {
     /**
      * プロジェクト検索
      */
-    projectFields(conditions, inclusion, exclusion) {
+    projectFields(conditions, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = ProjectRepo.CREATE_MONGO_CONDITIONS(conditions);
@@ -99,31 +99,10 @@ class ProjectRepo {
                 positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
             else {
-                if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
-                }
+                // discontinue(2024-10-09~)
+                throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
             }
             const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
-            // let projection: { [key: string]: number } = {};
-            // if (Array.isArray(inclusion) && inclusion.length > 0) {
-            //     inclusion.forEach((field) => {
-            //         if (String(field) !== 'makesOffer') {
-            //             projection[field] = 1;
-            //         }
-            //     });
-            // } else {
-            //     projection = {
-            //         __v: 0,
-            //         createdAt: 0,
-            //         updatedAt: 0,
-            //         makesOffer: 0
-            //     };
-            //     if (Array.isArray(exclusion) && exclusion.length > 0) {
-            //         exclusion.forEach((field) => {
-            //             projection[field] = 0;
-            //         });
-            //     }
-            // }
             const query = this.projectModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, projection);
             if (typeof conditions.limit === 'number' && conditions.limit > 0) {
                 const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
@@ -161,7 +140,7 @@ class ProjectRepo {
                 hasMerchantReturnPolicy = Object.assign({ sameAs: params.hasMerchantReturnPolicy.sameAs, typeOf: 'MerchantReturnPolicy' }, (typeof params.hasMerchantReturnPolicy.identifier === 'string')
                     ? { identifier: params.hasMerchantReturnPolicy.identifier } : undefined);
             }
-            yield this.projectModel.findOneAndUpdate({ _id: params.id }, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ updatedAt: new Date() }, (typeof params.alternateName === 'string' && params.alternateName.length > 0)
+            yield this.projectModel.findOneAndUpdate({ _id: { $eq: params.id } }, Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (typeof params.alternateName === 'string' && params.alternateName.length > 0)
                 ? { alternateName: params.alternateName }
                 : undefined), (typeof params.name === 'string' && params.name.length > 0) ? { name: params.name } : undefined), (typeof params.logo === 'string' && params.logo.length > 0) ? { logo: params.logo } : undefined), (typeof ((_d = (_c = (_b = params.settings) === null || _b === void 0 ? void 0 : _b.sendEmailMessage) === null || _c === void 0 ? void 0 : _c.sender) === null || _d === void 0 ? void 0 : _d.email) === 'string')
                 ? {
@@ -181,6 +160,26 @@ class ProjectRepo {
                 .exec();
         });
     }
+    updateMakesOfferById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.projectModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
+                $set: { makesOffer: params.makesOffer }
+            }, { projection: { _id: 1 } })
+                .exec();
+        });
+    }
+    activateOptionalAggregationSettings(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.projectModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
+                $set: {
+                    'settings.useAggregateEntranceGate': true,
+                    'settings.useAggregateOffer': true,
+                    'settings.useOfferRateLimit': true
+                }
+            }, { projection: { _id: 1 } })
+                .exec();
+        });
+    }
     updateAggregateReservation(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.projectModel.findOneAndUpdate({ _id: { $eq: params.id } }, {

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

@@ -1,6 +1,8 @@
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
-type IMakesOffer = factory.project.IMakesOffer;
+type IMakesOffer = Pick<factory.project.IMakesOffer, 'eligibleCustomerType' | 'typeOf'> & {
+    availableAtOrFrom: Pick<factory.offer.IAvailableAtOrFrom, 'id'>;
+};
 /**
  * プロジェクト提供オファーリポジトリ
  */

package/lib/chevre/repo/projectMakesOffer.js

@@ -69,7 +69,8 @@ class ProjectMakesOfferRepo {
             }
             const creatingMakesOffer = {
                 typeOf: factory.offerType.Offer,
-                availableAtOrFrom: [{ id: params.availableAtOrFrom.id }]
+                // availableAtOrFrom: [{ id: params.availableAtOrFrom.id }]
+                availableAtOrFrom: { id: params.availableAtOrFrom.id } // support non-array(2024-10-22~)
             };
             doc = yield this.projectModel.findOneAndUpdate({
                 _id: { $eq: params.offeredBy.id },
@@ -87,7 +88,9 @@ class ProjectMakesOfferRepo {
     }
     updateOne(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const updatingMakesOffer = Object.assign({ typeOf: factory.offerType.Offer, availableAtOrFrom: [{ id: params.availableAtOrFrom.id }] }, (Array.isArray(params.eligibleCustomerType))
+            const updatingMakesOffer = Object.assign({ typeOf: factory.offerType.Offer, 
+                // availableAtOrFrom: [{ id: params.availableAtOrFrom.id }],
+                availableAtOrFrom: { id: params.availableAtOrFrom.id } }, (Array.isArray(params.eligibleCustomerType))
                 ? {
                     eligibleCustomerType: params.eligibleCustomerType.map(({ codeValue }) => ({
                         codeValue,

package/lib/chevre/repo/role.js

@@ -44,13 +44,6 @@ class RoleRepo {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = RoleRepo.CREATE_MONGO_CONDITIONS(params);
             const positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
-            // if (Array.isArray(inclusion) && inclusion.length > 0) {
-            //     positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
-            // } else {
-            //     if (Array.isArray(exclusion) && exclusion.length > 0) {
-            //         positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
-            //     }
-            // }
             const projection = Object.assign({ _id: 0 }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
             const query = this.roleModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
             if (typeof params.limit === 'number' && params.limit > 0) {

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

@@ -33,7 +33,9 @@ interface IUnset {
         [key: string]: 1;
     };
 }
-type ISellerByAggregate = Pick<ISellerWithId, 'additionalProperty' | 'branchCode' | 'hasMerchantReturnPolicy' | 'id' | 'name' | 'project' | 'telephone' | 'typeOf' | 'url'>;
+type ISellerByAggregate = Pick<ISellerWithId, 'additionalProperty' | 'branchCode' | 'id' | 'name' | 'project' | 'telephone' | 'typeOf' | 'url'> & {
+    hasMerchantReturnPolicy?: Pick<factory.seller.ISellerMerchantReturnPolicy, 'typeOf' | 'url'>[];
+};
 interface IMemberSearchConditions {
     /**
      * 販売者メンバーで絞る場合
@@ -56,7 +58,7 @@ export declare class SellerRepo {
     private readonly sellerModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.seller.ISearchConditions & IMemberSearchConditions): FilterQuery<factory.seller.ISeller>[];
-    static CREATE_AGGREGATE_SELLERS_PROJECTION(inclusion: string[], exclusion: (keyof ISellerByAggregate)[]): {
+    static CREATE_AGGREGATE_SELLERS_PROJECTION(exclusion: (keyof ISellerByAggregate)[]): {
         [field: string]: AnyExpression;
     };
     /**
@@ -71,11 +73,11 @@ export declare class SellerRepo {
     /**
      * 集計検索(publicな属性検索が目的)
      */
-    searchByAggregate(conditions: factory.seller.ISearchConditions & IMemberSearchConditions, inclusion: (keyof ISellerByAggregate)[], exclusion: (keyof ISellerByAggregate)[]): Promise<ISellerByAggregate[]>;
+    searchByAggregate(conditions: factory.seller.ISearchConditions & IMemberSearchConditions, exclusion: (keyof ISellerByAggregate)[]): Promise<ISellerByAggregate[]>;
     /**
      * 販売者検索
      */
-    projectFields(conditions: factory.seller.ISearchConditions & IMemberSearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<ISellerWithId[]>;
+    projectFields(conditions: factory.seller.ISearchConditions & IMemberSearchConditions, inclusion: IKeyOfProjection[]): Promise<ISellerWithId[]>;
     /**
      * 販売者を削除する
      */
@@ -102,24 +104,24 @@ export declare class SellerRepo {
         project: Pick<factory.project.IProject, "id" | "typeOf">;
         name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         typeOf: factory.organizationType.Corporation;
-        additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
         location?: import("@chevre/factory/lib/place").IPlace | undefined;
-        telephone?: string | undefined;
         hasMerchantReturnPolicy?: factory.seller.IHasMerchantReturnPolicy | undefined;
-        branchCode: string;
         makesOffer?: factory.seller.IMakesOffer[] | undefined;
+        additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
+        telephone?: string | undefined;
+        branchCode: string;
         paymentAccepted?: factory.seller.IPaymentAccepted[] | undefined;
     }> & {
         url?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
         name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         typeOf: factory.organizationType.Corporation;
-        additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
         location?: import("@chevre/factory/lib/place").IPlace | undefined;
-        telephone?: string | undefined;
         hasMerchantReturnPolicy?: factory.seller.IHasMerchantReturnPolicy | undefined;
-        branchCode: string;
         makesOffer?: factory.seller.IMakesOffer[] | undefined;
+        additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
+        telephone?: string | undefined;
+        branchCode: string;
         paymentAccepted?: factory.seller.IPaymentAccepted[] | undefined;
     } & {
         _id: Types.ObjectId;
@@ -128,24 +130,24 @@ export declare class SellerRepo {
         project: Pick<factory.project.IProject, "id" | "typeOf">;
         name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         typeOf: factory.organizationType.Corporation;
-        additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
         location?: import("@chevre/factory/lib/place").IPlace | undefined;
-        telephone?: string | undefined;
         hasMerchantReturnPolicy?: factory.seller.IHasMerchantReturnPolicy | undefined;
-        branchCode: string;
         makesOffer?: factory.seller.IMakesOffer[] | undefined;
+        additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
+        telephone?: string | undefined;
+        branchCode: string;
         paymentAccepted?: factory.seller.IPaymentAccepted[] | undefined;
     }> & {
         url?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
         name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         typeOf: factory.organizationType.Corporation;
-        additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
         location?: import("@chevre/factory/lib/place").IPlace | undefined;
-        telephone?: string | undefined;
         hasMerchantReturnPolicy?: factory.seller.IHasMerchantReturnPolicy | undefined;
-        branchCode: string;
         makesOffer?: factory.seller.IMakesOffer[] | undefined;
+        additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
+        telephone?: string | undefined;
+        branchCode: string;
         paymentAccepted?: factory.seller.IPaymentAccepted[] | undefined;
     } & {
         _id: Types.ObjectId;

package/lib/chevre/repo/seller.js

@@ -157,7 +157,9 @@ class SellerRepo {
         }
         return andConditions;
     }
-    static CREATE_AGGREGATE_SELLERS_PROJECTION(inclusion, exclusion) {
+    static CREATE_AGGREGATE_SELLERS_PROJECTION(
+    // inclusion: string[], // discontinue(2024-10-20~)
+    exclusion) {
         const projectStage = {
             _id: 0,
             id: { $toString: '$_id' },
@@ -185,10 +187,10 @@ class SellerRepo {
             url: '$url',
             telephone: '$telephone'
         };
-        if (inclusion.length > 0) {
-            // no op
-        }
-        else if (exclusion.length > 0) {
+        // if (inclusion.length > 0) {
+        //     // no op
+        // } else
+        if (exclusion.length > 0) {
             exclusion.forEach((field) => {
                 if (typeof projectStage[field] === 'string' || typeof projectStage[field] === 'object') {
                     // tslint:disable-next-line:no-dynamic-delete
@@ -247,12 +249,14 @@ class SellerRepo {
     /**
      * 集計検索(publicな属性検索が目的)
      */
-    searchByAggregate(conditions, inclusion, exclusion) {
+    searchByAggregate(conditions, 
+    // inclusion: (keyof ISellerByAggregate)[], // discontinue(2024-10-20~)
+    exclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = SellerRepo.CREATE_MONGO_CONDITIONS(conditions)
                 .map((c) => ({ $match: c }));
-            const projectStage = SellerRepo.CREATE_AGGREGATE_SELLERS_PROJECTION(inclusion, exclusion);
+            const projectStage = SellerRepo.CREATE_AGGREGATE_SELLERS_PROJECTION(exclusion);
             const sortByBranchCode = (_a = conditions.sort) === null || _a === void 0 ? void 0 : _a.branchCode;
             const aggregate = this.sellerModel.aggregate([
                 ...matchStages,
@@ -274,7 +278,7 @@ class SellerRepo {
     /**
      * 販売者検索
      */
-    projectFields(conditions, inclusion, exclusion) {
+    projectFields(conditions, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = SellerRepo.CREATE_MONGO_CONDITIONS(conditions);
@@ -283,37 +287,15 @@ class SellerRepo {
                 positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
             else {
-                if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
-                }
+                // discontinue(2024-10-19~)
             }
             const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
-            // let projection: { [key: string]: number } = {};
-            // if (Array.isArray(inclusion) && inclusion.length > 0) {
-            //     inclusion.forEach((field) => {
-            //         projection[field] = 1;
-            //     });
-            // } else {
-            //     projection = {
-            //         __v: 0,
-            //         createdAt: 0,
-            //         updatedAt: 0,
-            //         paymentAccepted: 0 // 除外(2023-12-01~)
-            //     };
-            //     if (Array.isArray(exclusion) && exclusion.length > 0) {
-            //         exclusion.forEach((field) => {
-            //             projection[field] = 0;
-            //         });
-            //     }
-            // }
             const query = this.sellerModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, projection);
             if (typeof conditions.limit === 'number' && conditions.limit > 0) {
                 const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
                 query.limit(conditions.limit)
                     .skip(conditions.limit * (page - 1));
             }
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
             if (((_a = conditions.sort) === null || _a === void 0 ? void 0 : _a.branchCode) !== undefined) {
                 query.sort({ branchCode: conditions.sort.branchCode });
             }

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

@@ -184,11 +184,9 @@ export declare class TaskRepo {
         };
     }): Promise<number>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, {
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
         identifier?: string | undefined;
+        project: Pick<factory.project.IProject, "id" | "typeOf">;
         name: factory.taskName;
-        expires?: Date | undefined;
-        data: any;
         status: factory.taskStatus;
         runsAt: Date;
         remainingNumberOfTries: number;
@@ -196,13 +194,13 @@ export declare class TaskRepo {
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
         executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
+        data: any;
         dateAborted?: Date | undefined;
+        expires?: Date | undefined;
     }> & {
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
         identifier?: string | undefined;
+        project: Pick<factory.project.IProject, "id" | "typeOf">;
         name: factory.taskName;
-        expires?: Date | undefined;
-        data: any;
         status: factory.taskStatus;
         runsAt: Date;
         remainingNumberOfTries: number;
@@ -210,15 +208,15 @@ export declare class TaskRepo {
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
         executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
+        data: any;
         dateAborted?: Date | undefined;
+        expires?: Date | undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, {
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
         identifier?: string | undefined;
+        project: Pick<factory.project.IProject, "id" | "typeOf">;
         name: factory.taskName;
-        expires?: Date | undefined;
-        data: any;
         status: factory.taskStatus;
         runsAt: Date;
         remainingNumberOfTries: number;
@@ -226,13 +224,13 @@ export declare class TaskRepo {
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
         executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
+        data: any;
         dateAborted?: Date | undefined;
+        expires?: Date | undefined;
     }> & {
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
         identifier?: string | undefined;
+        project: Pick<factory.project.IProject, "id" | "typeOf">;
         name: factory.taskName;
-        expires?: Date | undefined;
-        data: any;
         status: factory.taskStatus;
         runsAt: Date;
         remainingNumberOfTries: number;
@@ -240,7 +238,9 @@ export declare class TaskRepo {
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
         executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
+        data: any;
         dateAborted?: Date | undefined;
+        expires?: Date | undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     }>>;

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

@@ -158,7 +158,7 @@ export declare class TransactionRepo {
         status: {
             $in: factory.transactionStatusType[];
         };
-    }): Promise<Pick<import("@chevre/factory/lib/transaction/moneyTransfer").ITransaction | import("@chevre/factory/lib/transaction/placeOrder").ITransaction | import("@chevre/factory/lib/transaction/returnOrder").ITransaction, "id" | "typeOf" | "status">[]>;
+    }): Promise<Pick<import("@chevre/factory/lib/transaction/moneyTransfer").ITransaction | import("@chevre/factory/lib/transaction/placeOrder").ITransaction | import("@chevre/factory/lib/transaction/returnOrder").ITransaction, "id" | "status" | "typeOf">[]>;
     /**
      * set task status exported by transaction id
      * IDでタスクをエクスポート済に変更する

package/lib/chevre/repository.d.ts

@@ -20,6 +20,7 @@ import type { CustomerRepo } from './repo/customer';
 import type { CustomerTypeRepo } from './repo/customerType';
 import type { EmailMessageRepo } from './repo/emailMessage';
 import type { EventRepo } from './repo/event';
+import type { EventSellerMakesOfferRepo } from './repo/eventSellerMakesOffer';
 import type { EventSeriesRepo } from './repo/eventSeries';
 import type { MemberRepo } from './repo/member';
 import type { MerchantReturnPolicyRepo } from './repo/merchantReturnPolicy';
@@ -147,6 +148,10 @@ export type Event = EventRepo;
 export declare namespace Event {
     function createInstance(...params: ConstructorParameters<typeof EventRepo>): Promise<EventRepo>;
 }
+export type EventSellerMakesOffer = EventSellerMakesOfferRepo;
+export declare namespace EventSellerMakesOffer {
+    function createInstance(...params: ConstructorParameters<typeof EventSellerMakesOfferRepo>): Promise<EventSellerMakesOfferRepo>;
+}
 export type EventSeries = EventSeriesRepo;
 export declare namespace EventSeries {
     function createInstance(...params: ConstructorParameters<typeof EventSeriesRepo>): Promise<EventSeriesRepo>;

package/lib/chevre/repository.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SellerPaymentAccepted = exports.Seller = exports.Role = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.Product = exports.PriceSpecification = exports.place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.Note = exports.Message = exports.MerchantReturnPolicy = exports.Member = exports.EventSeries = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
-exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = void 0;
+exports.Seller = exports.Role = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.Product = exports.PriceSpecification = exports.place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.Note = exports.Message = exports.MerchantReturnPolicy = exports.Member = exports.EventSeries = exports.EventSellerMakesOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
+exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerPaymentAccepted = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -271,6 +271,19 @@ var Event;
     }
     Event.createInstance = createInstance;
 })(Event = exports.Event || (exports.Event = {}));
+var EventSellerMakesOffer;
+(function (EventSellerMakesOffer) {
+    let repo;
+    function createInstance(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (repo === undefined) {
+                repo = (yield Promise.resolve().then(() => require('./repo/eventSellerMakesOffer'))).EventSellerMakesOfferRepo;
+            }
+            return new repo(...params);
+        });
+    }
+    EventSellerMakesOffer.createInstance = createInstance;
+})(EventSellerMakesOffer = exports.EventSellerMakesOffer || (exports.EventSellerMakesOffer = {}));
 var EventSeries;
 (function (EventSeries) {
     let repo;

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.d.ts

@@ -1,14 +1,13 @@
-import { EventRepo, IMinimizedIndividualEvent } from '../../../repo/event';
+import { EventRepo } from '../../../repo/event';
 import type { OfferRepo } from '../../../repo/offer';
 import type { OfferCatalogRepo } from '../../../repo/offerCatalog';
 import { ScreeningRoomRepo } from '../../../repo/place/screeningRoom';
 import type { ProductRepo } from '../../../repo/product';
+import type { ProjectRepo } from '../../../repo/project';
 import { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { ReservationRepo } from '../../../repo/reservation';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
-import * as factory from '../../../factory';
-import { Settings } from '../../../settings';
 export interface IAggregateScreeningEventRepos {
     event: EventRepo;
     stockHolder: StockHolderRepo;
@@ -17,27 +16,14 @@ export interface IAggregateScreeningEventRepos {
     offerRateLimit: OfferRateLimitRepo;
     screeningRoom: ScreeningRoomRepo;
     product: ProductRepo;
+    project: ProjectRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
 }
-export type IAggregateScreeningEventOperation<T> = (repos: IAggregateScreeningEventRepos, settings: Settings) => Promise<T>;
-type IEvet4aggregate = Pick<IMinimizedIndividualEvent<factory.eventType.Event>, 'id' | 'location' | 'project' | 'startDate' | 'typeOf'> & {
-    offers?: Pick<factory.event.event.IOffer, 'itemOffered'>;
-} | Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id' | 'location' | 'project' | 'startDate' | 'typeOf'> & {
-    offers?: Pick<factory.event.screeningEvent.IOffer, 'itemOffered'> | Pick<factory.event.screeningEvent.IOffer4COA, 'itemOffered'>;
-    superEvent: {
-        location: {
-            id: string;
-        };
-    };
-};
+export type IAggregateScreeningEventOperation<T> = (repos: IAggregateScreeningEventRepos) => Promise<T>;
 /**
  * イベントデータをID指定で集計する
  */
 export declare function aggregateScreeningEvent(params: {
     id: string;
 }): IAggregateScreeningEventOperation<void>;
-export declare function aggregateByEvent(params: {
-    event: IEvet4aggregate;
-}): IAggregateScreeningEventOperation<void>;
-export {};

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -9,25 +9,36 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aggregateByEvent = exports.aggregateScreeningEvent = void 0;
+exports.aggregateScreeningEvent = void 0;
 /**
  * イベントの予約集計サービス
  */
 const createDebug = require("debug");
 const moment = require("moment-timezone");
 const factory = require("../../../factory");
+// import { Settings } from '../../../settings';
 const findEventOffers_1 = require("./findEventOffers");
 const debug = createDebug('chevre-domain:service:aggregation');
 /**
  * イベントデータをID指定で集計する
  */
 function aggregateScreeningEvent(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         // 集計対象イベント検索
         const event = yield repos.event.projectEventFieldsById({ id: params.id }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.location.id', 'offers.itemOffered']);
+        // プロジェクト設定検索
+        const project = yield repos.project.findById({
+            id: event.project.id,
+            inclusion: ['settings']
+        });
+        const useAggregateOffer = ((_a = project.settings) === null || _a === void 0 ? void 0 : _a.useAggregateOffer) === true;
+        const useOfferRateLimit = ((_b = project.settings) === null || _b === void 0 ? void 0 : _b.useOfferRateLimit) === true;
         let aggregatingEvents = [event];
-        // プロジェクト限定(2023-02-22~)
-        if (settings.useOfferRateLimitProjects.includes(event.project.id)) {
+        // dependent on project settings(2024-10-29~)
+        if (useOfferRateLimit) {
             const availableOffers = yield (0, findEventOffers_1.findEventOffers)({ event })(repos);
             const offerRateLimitExists = availableOffers.some((o) => { var _a; return typeof ((_a = o.validRateLimit) === null || _a === void 0 ? void 0 : _a.scope) === 'string'; });
             if (offerRateLimitExists) {
@@ -70,13 +81,15 @@ function aggregateScreeningEvent(params) {
         }
         debug(aggregatingEvents.length, 'aggregatingEvents found', aggregatingEvents.map((e) => e.id));
         for (const aggregatingEvent of aggregatingEvents) {
-            yield aggregateByEvent({ event: aggregatingEvent })(repos, settings);
+            yield aggregateByEvent({ event: aggregatingEvent }, { useAggregateOffer })(repos);
         }
     });
 }
 exports.aggregateScreeningEvent = aggregateScreeningEvent;
-function aggregateByEvent(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+function aggregateByEvent(params, options) {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const now = new Date();
         const event = params.event;
@@ -117,18 +130,20 @@ function aggregateByEvent(params) {
         debug('update:', update);
         // 保管
         yield repos.event.updateAggregationById({ id: event.id }, update);
-        yield onAggregated({ event })({
+        yield onAggregated({ event }, options)({
             task: repos.task
-        }, settings);
+        }
+        // settings
+        );
     });
 }
-exports.aggregateByEvent = aggregateByEvent;
 /**
  * 集計後アクション
  */
-function onAggregated(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        if (settings.useAggregateOfferProjects.includes(params.event.project.id)) {
+function onAggregated(params, options) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // dependent on project settings(2024-10-29~)
+        if (options.useAggregateOffer) {
             // AggregateOffersタスクへ移行(2024-03-25~)
             const aggregateOffersTaskAttributes = {
                 project: params.event.project,