@chevre/domain 22.5.0-alpha.8 → 22.5.0

package/example/src/chevre/upsertProductsByProductId.ts

@@ -64,7 +64,7 @@ async function main() {
                         ja: 'xxx'
                     },
                     hasOfferCatalog: {
-                        id: 'blpc770py',
+                        // id: 'blpc770py',
                         typeOf: 'OfferCatalog',
                         itemListElement: [{ id: 'blpc770py' }]
                     },

package/example/src/createMongooseConnection.ts

@@ -0,0 +1,26 @@
+// tslint:disable:no-console no-magic-numbers
+import * as mongoose from 'mongoose';
+
+setInterval(
+    () => {
+        console.log('default connection:', mongoose.connection.id, mongoose.connection.readyState);
+    },
+    500
+);
+
+setInterval(
+    () => {
+        // mongoose.createConnection(<string>process.env.MONGOLAB_URI, { autoIndex: false })
+        //     .asPromise()
+        //     .then((connection) => {
+        //         console.log('connection created,', connection.id, connection.readyState);
+        //     })
+        //     .catch(console.error);
+        mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false })
+            .then(({ connection }) => {
+                console.log('default connection created,', connection.id, connection.readyState);
+            })
+            .catch(console.error);
+    },
+    500
+);

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

@@ -84,7 +84,7 @@ export declare class ActionRepo {
     /**
      * アクション検索
      */
-    search<T extends factory.actionType>(params: factory.action.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<IAction<T>[]>;
+    search<T extends factory.actionType>(params: factory.action.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IAction<T>[]>;
     /**
      * アクション開始
      */
@@ -376,96 +376,96 @@ export declare class ActionRepo {
         object: any;
         error?: any;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
+        agent: import("@chevre/factory/lib/action").IParticipant;
+        purpose?: import("@chevre/factory/lib/action").IPurpose | undefined;
         typeOf: factory.actionType;
-        amount?: any;
+        potentialActions?: any;
+        instrument?: any;
+        recipient?: import("@chevre/factory/lib/action").IParticipant | undefined;
         location?: any;
-        description?: string | undefined;
         result?: any;
-        toLocation?: any;
-        actionStatus: factory.actionStatusType;
         endDate?: Date | undefined;
-        purpose?: import("@chevre/factory/lib/action").IPurpose | undefined;
-        startDate: Date;
-        agent: import("@chevre/factory/lib/action").IParticipant;
-        instrument?: any;
-        potentialActions?: any;
-        recipient?: import("@chevre/factory/lib/action").IParticipant | undefined;
         sameAs?: import("@chevre/factory/lib/action").ISameAs | undefined;
+        startDate: Date;
+        description?: string | undefined;
+        amount?: any;
         fromLocation?: any;
+        toLocation?: any;
         replacer?: any;
         targetCollection?: any;
         cancelAction?: any;
+        actionStatus: factory.actionStatusType;
     }> & {
         object: any;
         error?: any;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
+        agent: import("@chevre/factory/lib/action").IParticipant;
+        purpose?: import("@chevre/factory/lib/action").IPurpose | undefined;
         typeOf: factory.actionType;
-        amount?: any;
+        potentialActions?: any;
+        instrument?: any;
+        recipient?: import("@chevre/factory/lib/action").IParticipant | undefined;
         location?: any;
-        description?: string | undefined;
         result?: any;
-        toLocation?: any;
-        actionStatus: factory.actionStatusType;
         endDate?: Date | undefined;
-        purpose?: import("@chevre/factory/lib/action").IPurpose | undefined;
-        startDate: Date;
-        agent: import("@chevre/factory/lib/action").IParticipant;
-        instrument?: any;
-        potentialActions?: any;
-        recipient?: import("@chevre/factory/lib/action").IParticipant | undefined;
         sameAs?: import("@chevre/factory/lib/action").ISameAs | undefined;
+        startDate: Date;
+        description?: string | undefined;
+        amount?: any;
         fromLocation?: any;
+        toLocation?: any;
         replacer?: any;
         targetCollection?: any;
         cancelAction?: any;
+        actionStatus: factory.actionStatusType;
     } & {
         _id: import("mongoose").Types.ObjectId;
     }, QueryOptions<import("mongoose").Document<unknown, {}, {
         object: any;
         error?: any;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
+        agent: import("@chevre/factory/lib/action").IParticipant;
+        purpose?: import("@chevre/factory/lib/action").IPurpose | undefined;
         typeOf: factory.actionType;
-        amount?: any;
+        potentialActions?: any;
+        instrument?: any;
+        recipient?: import("@chevre/factory/lib/action").IParticipant | undefined;
         location?: any;
-        description?: string | undefined;
         result?: any;
-        toLocation?: any;
-        actionStatus: factory.actionStatusType;
         endDate?: Date | undefined;
-        purpose?: import("@chevre/factory/lib/action").IPurpose | undefined;
-        startDate: Date;
-        agent: import("@chevre/factory/lib/action").IParticipant;
-        instrument?: any;
-        potentialActions?: any;
-        recipient?: import("@chevre/factory/lib/action").IParticipant | undefined;
         sameAs?: import("@chevre/factory/lib/action").ISameAs | undefined;
+        startDate: Date;
+        description?: string | undefined;
+        amount?: any;
         fromLocation?: any;
+        toLocation?: any;
         replacer?: any;
         targetCollection?: any;
         cancelAction?: any;
+        actionStatus: factory.actionStatusType;
     }> & {
         object: any;
         error?: any;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
+        agent: import("@chevre/factory/lib/action").IParticipant;
+        purpose?: import("@chevre/factory/lib/action").IPurpose | undefined;
         typeOf: factory.actionType;
-        amount?: any;
+        potentialActions?: any;
+        instrument?: any;
+        recipient?: import("@chevre/factory/lib/action").IParticipant | undefined;
         location?: any;
-        description?: string | undefined;
         result?: any;
-        toLocation?: any;
-        actionStatus: factory.actionStatusType;
         endDate?: Date | undefined;
-        purpose?: import("@chevre/factory/lib/action").IPurpose | undefined;
-        startDate: Date;
-        agent: import("@chevre/factory/lib/action").IParticipant;
-        instrument?: any;
-        potentialActions?: any;
-        recipient?: import("@chevre/factory/lib/action").IParticipant | undefined;
         sameAs?: import("@chevre/factory/lib/action").ISameAs | undefined;
+        startDate: Date;
+        description?: string | undefined;
+        amount?: any;
         fromLocation?: any;
+        toLocation?: any;
         replacer?: any;
         targetCollection?: any;
         cancelAction?: any;
+        actionStatus: factory.actionStatusType;
     } & {
         _id: import("mongoose").Types.ObjectId;
     }>>;

package/lib/chevre/repo/action.js

@@ -452,7 +452,7 @@ class ActionRepo {
     /**
      * アクション検索
      */
-    search(params, inclusion, exclusion) {
+    search(params, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = ActionRepo.CREATE_MONGO_CONDITIONS(params);
@@ -461,28 +461,11 @@ class ActionRepo {
                 positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
             else {
-                if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
-                }
+                // 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]))));
-            // 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
-            //     };
-            //     if (Array.isArray(exclusion) && exclusion.length > 0) {
-            //         exclusion.forEach((field) => {
-            //             projection[field] = 0;
-            //         });
-            //     }
-            // }
             const query = this.actionModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
@@ -664,23 +647,6 @@ class ActionRepo {
                 }
             }
             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
-            //     };
-            //     if (Array.isArray(exclusion) && exclusion.length > 0) {
-            //         exclusion.forEach((field) => {
-            //             projection[field] = 0;
-            //         });
-            //     }
-            // }
             const doc = yield this.actionModel.findOne({
                 typeOf: { $eq: params.typeOf },
                 _id: { $eq: params.id }
@@ -705,7 +671,7 @@ class ActionRepo {
                 project: { id: { $eq: params.project.id } },
                 typeOf: { $eq: factory.actionType.PayAction },
                 object: { paymentMethod: { paymentMethodId: { $eq: params.paymentMethodId } } }
-            }, [], []);
+            }, []);
             return payActions.shift();
         });
     }

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

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

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

@@ -24,7 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import { AnyExpression, Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
-type IKeyOfProjection = keyof factory.categoryCode.ICategoryCode | '_id';
+type IKeyOfProjection = keyof factory.categoryCode.ICategoryCode;
 type IUnset = {
     [key in keyof Pick<factory.categoryCode.ICategoryCode, 'additionalProperty' | 'color' | 'image' | 'paymentMethod'>]?: 1;
 };
@@ -35,13 +35,13 @@ export declare class CategoryCodeRepo {
     private readonly categoryCodeModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.categoryCode.ISearchConditions): FilterQuery<factory.categoryCode.ICategoryCode>[];
-    static CREATE_AGGREGATE_PROJECTION(inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): {
+    static CREATE_AGGREGATE_PROJECTION(inclusion: IKeyOfProjection[]): {
         [field: string]: AnyExpression;
     };
     /**
      * 集計検索(publicな属性検索が目的)
      */
-    searchByAggregate(conditions: factory.categoryCode.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<factory.categoryCode.ICategoryCode[]>;
+    searchByAggregate(conditions: factory.categoryCode.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.categoryCode.ICategoryCode[]>;
     /**
      * 検索
      */
@@ -49,11 +49,7 @@ export declare class CategoryCodeRepo {
     /**
      * 空の場合無効
      */
-    inclusion: IKeyOfProjection[], 
-    /**
-     * 空の場合無効
-     */
-    exclusion: IKeyOfProjection[]): Promise<(factory.categoryCode.ICategoryCode & {
+    inclusion: IKeyOfProjection[]): Promise<(factory.categoryCode.ICategoryCode & {
         id: string;
     })[]>;
     save(params: {

package/lib/chevre/repo/categoryCode.js

@@ -144,7 +144,7 @@ class CategoryCodeRepo {
         }
         return andConditions;
     }
-    static CREATE_AGGREGATE_PROJECTION(inclusion, exclusion) {
+    static CREATE_AGGREGATE_PROJECTION(inclusion) {
         let projectStage = {
             _id: 0,
             id: { $toString: '$_id' },
@@ -162,7 +162,7 @@ class CategoryCodeRepo {
             projectStage = { _id: 0 };
             inclusion.forEach((field) => {
                 switch (field) {
-                    case '_id':
+                    // case '_id':
                     case 'id':
                         projectStage.id = { $toString: '$_id' };
                         break;
@@ -171,25 +171,17 @@ class CategoryCodeRepo {
                 }
             });
         }
-        else if (exclusion.length > 0) {
-            exclusion.forEach((field) => {
-                if (typeof projectStage[field] === 'string' || typeof projectStage[field] === 'object') {
-                    // tslint:disable-next-line:no-dynamic-delete
-                    delete projectStage[field];
-                }
-            });
-        }
         return projectStage;
     }
     /**
      * 集計検索(publicな属性検索が目的)
      */
-    searchByAggregate(conditions, inclusion, exclusion) {
+    searchByAggregate(conditions, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = CategoryCodeRepo.CREATE_MONGO_CONDITIONS(conditions)
                 .map((c) => ({ $match: c }));
-            const projectStage = CategoryCodeRepo.CREATE_AGGREGATE_PROJECTION(inclusion, exclusion);
+            const projectStage = CategoryCodeRepo.CREATE_AGGREGATE_PROJECTION(inclusion);
             const sortByCodeValue = (_a = conditions.sort) === null || _a === void 0 ? void 0 : _a.codeValue;
             const aggregate = this.categoryCodeModel.aggregate([
                 ...matchStages,
@@ -215,11 +207,7 @@ class CategoryCodeRepo {
     /**
      * 空の場合無効
      */
-    inclusion, 
-    /**
-     * 空の場合無効
-     */
-    exclusion) {
+    inclusion) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = CategoryCodeRepo.CREATE_MONGO_CONDITIONS(params);
             let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
@@ -227,27 +215,11 @@ class CategoryCodeRepo {
                 positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
             else {
-                if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
-                }
+                // 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]))));
-            // if (Array.isArray(inclusion) && inclusion.length > 0) {
-            //     inclusion.forEach((field) => {
-            //         projection[field] = 1;
-            //     });
-            // } else {
-            //     projection = {
-            //         __v: 0,
-            //         createdAt: 0,
-            //         updatedAt: 0
-            //     };
-            //     if (Array.isArray(exclusion) && exclusion.length > 0) {
-            //         exclusion.forEach((field) => {
-            //             projection[field] = 0;
-            //         });
-            //     }
-            // }
             const query = this.categoryCodeModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;

package/lib/chevre/repo/creativeWork.js

@@ -228,29 +228,10 @@ class CreativeWorkRepo {
     /**
      * コンテンツを検索する
      */
-    projectFields(params, inclusion
-    // exclusion: IKeyOfProjection[]
-    ) {
+    projectFields(params, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = CreativeWorkRepo.CREATE_MONGO_CONDITIONS(params);
-            // 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
-            //     };
-            //     if (Array.isArray(exclusion) && exclusion.length > 0) {
-            //         exclusion.forEach((field) => {
-            //             projection[field] = 0;
-            //         });
-            //     }
-            // }
             let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
             if (Array.isArray(inclusion) && inclusion.length > 0) {
                 positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));

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

@@ -47,7 +47,7 @@ export declare class CustomerRepo {
     /**
      * 顧客検索
      */
-    projectFields(conditions: factory.customer.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<factory.customer.ICustomer[]>;
+    projectFields(conditions: factory.customer.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.customer.ICustomer[]>;
     deleteById(params: {
         id: string;
     }): Promise<void>;

package/lib/chevre/repo/customer.js

@@ -106,7 +106,7 @@ class CustomerRepo {
     /**
      * 顧客検索
      */
-    projectFields(conditions, inclusion, exclusion) {
+    projectFields(conditions, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = CustomerRepo.CREATE_MONGO_CONDITIONS(conditions);
@@ -115,9 +115,9 @@ class CustomerRepo {
                 positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
             else {
-                if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
-                }
+                // 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.customerModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, projection);

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

@@ -71,6 +71,7 @@ interface IAggregateEvent {
 }
 export import IMinimizedIndividualEvent = EventFactory.IMinimizedIndividualEvent;
 type IKeyOfProjection<T extends AvailableEventType> = Exclude<keyof factory.event.IEvent<T>, 'id'> | 'aggregateEntranceGate' | 'aggregateOffer' | 'superEvent.location.id' | 'offers.itemOffered' | 'offers.itemOffered.id';
+type IKeyOfProjection4publicFields<T extends AvailableEventType> = Exclude<keyof factory.event.IEvent<T>, 'id' | 'offers'>;
 /**
  * minimizedEvent検索時のprojection候補
  * add(2024-07-18~)
@@ -115,6 +116,9 @@ export declare class EventRepo {
              */
             branchCode: string;
         };
+        options: {
+            updateOffersSeller: boolean;
+        };
     }): Promise<{
         bulkWriteResult: BulkWriteResult;
         modifiedEvents: {
@@ -161,6 +165,23 @@ export declare class EventRepo {
      * イベントを検索する(inclusion projection)
      */
     projectEventFields<T extends AvailableEventType>(params: ISearchConditions<T>, inclusion: IKeyOfProjection<T>[]): Promise<Omit<factory.event.IEvent<T>, 'aggregateEntranceGate' | 'aggregateOffer'>[]>;
+    /**
+     * apiで公開属性を検索する(2024-10-13~)
+     */
+    aggregatePublicFields<T extends AvailableEventType>(params: ISearchConditions<T>, inclusion: IKeyOfProjection4publicFields<T>[], options: {
+        /**
+         * offersを属性をprojectするかどうか
+         */
+        includeOffers: boolean;
+        /**
+         * offers.seller.makesOfferをprojectするかどうか
+         */
+        includeSellerMakesOffer: boolean;
+        /**
+         * offers.seller.makesOfferをavailableAtOrFromでfilterする
+         */
+        sellerMakesOfferAvailableAtIn?: string[];
+    }): Promise<Omit<factory.event.IEvent<T>, 'aggregateEntranceGate' | 'aggregateOffer'>[]>;
     /**
      * IDのみで検索する
      * projectionなし
@@ -316,32 +337,20 @@ export declare class EventRepo {
     getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<Document<unknown, {}, IDocType> & ((import("@chevre/factory/lib/event/anyEvent").IAttributes & {
         _id: string;
     } & Required<{
-        /**
-         * イベントリポジトリ
-         */
         _id: string;
     }>) | (import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
         _id: string;
         aggregateOffer?: import("@chevre/factory/lib/event/anyEvent").IAggregateOffer | undefined;
     } & Required<{
-        /**
-         * イベントリポジトリ
-         */
         _id: string;
     }>)), import("mongoose").QueryOptions<Document<unknown, {}, IDocType> & ((import("@chevre/factory/lib/event/anyEvent").IAttributes & {
         _id: string;
     } & Required<{
-        /**
-         * イベントリポジトリ
-         */
         _id: string;
     }>) | (import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
         _id: string;
         aggregateOffer?: import("@chevre/factory/lib/event/anyEvent").IAggregateOffer | undefined;
     } & Required<{
-        /**
-         * イベントリポジトリ
-         */
         _id: string;
     }>))>>;
     addAvailableAtOrFrom(params: {