@chevre/domain 22.0.0 → 22.1.0-alpha.1

package/example/src/chevre/findAnyEventById.ts

@@ -0,0 +1,24 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+import { chevre } from '../../../lib/index';
+
+const PROJECT_ID = String(process.env.PROJECT_ID);
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const eventRepo: chevre.repository.Event = await chevre.repository.Event.createInstance(mongoose.connection);
+
+    const event = await eventRepo.findAnyEventById<chevre.factory.eventType.ScreeningEvent>({
+        id: { $eq: 'blxonxv1m' },
+        project: { id: { $eq: PROJECT_ID } }
+        // organizer: { id: { $eq: 'xxx' } }
+    });
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(event, { depth: null });
+    console.log('event found');
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -6,5 +6,5 @@ export type IMinimizedIndividualEvent<T extends factory.eventType.ScreeningEvent
  * 興行イベントのsuperEventを作成する
  */
 export declare function minimizeSuperEvent(params: {
-    superEventFromDB: Omit<factory.event.screeningEventSeries.IEvent, 'offers'>;
+    superEventFromDB: Pick<factory.event.screeningEventSeries.IEvent, 'additionalProperty' | 'alternativeHeadline' | 'description' | 'dubLanguage' | 'endDate' | 'headline' | 'id' | 'kanaName' | 'location' | 'name' | 'soundFormat' | 'startDate' | 'subtitleLanguage' | 'typeOf' | 'videoFormat' | 'workPerformed'>;
 }): factory.event.screeningEvent.ISuperEvent;

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

@@ -160,7 +160,26 @@ export declare class EventRepo {
     /**
      * イベントを検索する
      */
-    search<T extends factory.eventType>(params: ISearchConditions<T>, inclusion: IKeyOfProjection<T>[], exclusion: IKeyOfProjection<T>[]): Promise<Omit<factory.event.IEvent<T>, 'aggregateEntranceGate' | 'aggregateOffer'>[]>;
+    search<T extends factory.eventType>(params: ISearchConditions<T>, inclusion: IKeyOfProjection<T>[], exclusion?: IKeyOfProjection<T>[]): Promise<Omit<factory.event.IEvent<T>, 'aggregateEntranceGate' | 'aggregateOffer'>[]>;
+    /**
+     * IDのみで検索する
+     * projectionなし
+     */
+    findAnyEventById<T extends factory.eventType>(params: {
+        id: {
+            $eq: string;
+        };
+        project: {
+            id: {
+                $eq: string;
+            };
+        };
+        organizer?: {
+            id: {
+                $eq: string;
+            };
+        };
+    }): Promise<Omit<factory.event.IEvent<T>, 'aggregateEntranceGate' | 'aggregateOffer'>>;
     searchIds<T extends factory.eventType>(params: ISearchConditions<T>): Promise<string[]>;
     /**
      * 特定イベントから指定フィールドのみ取得する

package/lib/chevre/repo/event.js

@@ -865,6 +865,32 @@ class EventRepo {
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
     }
+    /**
+     * IDのみで検索する
+     * projectionなし
+     */
+    findAnyEventById(params) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.eventModel.findOne(Object.assign({ _id: { $eq: params.id.$eq }, 'project.id': { $eq: params.project.id.$eq } }, (typeof ((_a = params.organizer) === null || _a === void 0 ? void 0 : _a.id.$eq) === 'string')
+                ? { 'organizer.id': { $exists: true, $eq: params.organizer.id.$eq } }
+                : undefined), {
+                __v: 0,
+                createdAt: 0,
+                updatedAt: 0,
+                // DefaultでaggregateEntranceGateを取得しない(2023-01-25~)
+                aggregateEntranceGate: 0,
+                // DefaultでaggregateOfferを取得しない(2023-01-24~)
+                aggregateOffer: 0
+            })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound('Event');
+            }
+            return doc.toObject();
+        });
+    }
     searchIds(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = EventRepo.CREATE_MONGO_CONDITIONS(params);
@@ -929,7 +955,11 @@ class EventRepo {
                 typeOf: factory.eventType.ScreeningEventSeries,
                 id: { $eq: params.superEvent.id },
                 project: { id: { $eq: params.project.id } }
-            }, [], ['offers']);
+            }, [
+                'additionalProperty', 'alternativeHeadline', 'description', 'dubLanguage',
+                'endDate', 'headline', 'kanaName', 'location', 'name',
+                'soundFormat', 'startDate', 'subtitleLanguage', 'typeOf', 'videoFormat', 'workPerformed'
+            ], []);
             const superEventFromDB = superEvents.shift();
             if (superEventFromDB === undefined) {
                 throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);

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

@@ -25,7 +25,7 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 type IOrderWithoutAcceptedOffers = factory.order.IOrder;
-type IKeyOfProjection = keyof IOrderWithoutAcceptedOffers | '_id';
+type IKeyOfProjection = Extract<keyof IOrderWithoutAcceptedOffers, 'broker' | 'confirmationNumber' | 'customer' | 'dateReturned' | 'identifier' | 'name' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'previousOrderStatus' | 'price' | 'priceCurrency' | 'project' | 'returner' | 'seller' | 'typeOf' | 'url'> | 'paymentMethods.accountId' | 'paymentMethods.name' | 'paymentMethods.paymentMethod' | 'paymentMethods.paymentMethodId' | 'paymentMethods.totalPaymentDue' | 'paymentMethods.additionalProperty' | 'paymentMethods.issuedThrough';
 export type IReturnedOrder = Pick<IOrderWithoutAcceptedOffers, 'project' | 'typeOf' | 'orderNumber' | 'dateReturned' | 'id' | 'customer' | 'returner' | 'seller' | 'price' | 'priceCurrency' | 'orderDate'> & {
     id: string;
 };
@@ -155,6 +155,9 @@ export declare class OrderRepo {
         inclusion: {
             [key in IKeyOfProjection]?: 1;
         };
+        /**
+         * @deprecated use inclusion
+         */
         exclusion: {
             [key in IKeyOfProjection]?: 0;
         };

package/lib/chevre/repo/order.js

@@ -14,6 +14,15 @@ const factory = require("../factory");
 const order_1 = require("./mongoose/schemas/order");
 const errorHandler_1 = require("../errorHandler");
 const settings_1 = require("../settings");
+/**
+ * ドキュメント検索時に指定可能なprojectionフィールドを厳密に定義する
+ */
+const AVAILABLE_PROJECT_FIELDS = [
+    'broker', 'confirmationNumber', 'customer', 'dateReturned', 'identifier', 'name', 'orderDate', 'orderNumber', 'orderStatus', 'orderedItem',
+    'paymentMethods', 'previousOrderStatus', 'price', 'priceCurrency', 'project', 'returner', 'seller', 'typeOf', 'url',
+    'paymentMethods.accountId', 'paymentMethods.additionalProperty', 'paymentMethods.issuedThrough', 'paymentMethods.name', 'paymentMethods.paymentMethod',
+    'paymentMethods.paymentMethodId', 'paymentMethods.totalPaymentDue'
+];
 /**
  * 注文リポジトリ
  */
@@ -31,22 +40,6 @@ class OrderRepo {
         if (typeof projectIdEq === 'string') {
             andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
-        // const additionalPropertyAll = params.additionalProperty?.$all; // 廃止(2024-04-12~)
-        // if (Array.isArray(additionalPropertyAll)) {
-        //     andConditions.push({ additionalProperty: { $exists: true, $all: additionalPropertyAll } });
-        // }
-        // const additionalPropertyIn = params.additionalProperty?.$in; // 廃止(2024-04-12~)
-        // if (Array.isArray(additionalPropertyIn)) {
-        //     andConditions.push({ additionalProperty: { $exists: true, $in: additionalPropertyIn } });
-        // }
-        // const additionalPropertyNin = params.additionalProperty?.$nin; // 廃止(2024-04-12~)
-        // if (Array.isArray(additionalPropertyNin)) {
-        //     andConditions.push({ additionalProperty: { $nin: additionalPropertyNin } });
-        // }
-        // const additionalPropertyElemMatch = params.additionalProperty?.$elemMatch; // 廃止(2024-04-12~)
-        // if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
-        //     andConditions.push({ additionalProperty: { $exists: true, $elemMatch: additionalPropertyElemMatch } });
-        // }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         if (params.identifier !== undefined) {
@@ -83,10 +76,6 @@ class OrderRepo {
         if (Array.isArray(sellerIds)) {
             andConditions.push({ 'seller.id': { $exists: true, $in: sellerIds } });
         }
-        // 不要なので廃止(2023-09-11~)
-        // if (typeof params.seller?.typeOf === 'string') {
-        //     andConditions.push({ 'seller.typeOf': { $exists: true, $eq: params.seller.typeOf } });
-        // }
         const brokerIdEq = (_j = (_h = params.broker) === null || _h === void 0 ? void 0 : _h.id) === null || _j === void 0 ? void 0 : _j.$eq;
         if (typeof brokerIdEq === 'string') {
             andConditions.push({
@@ -768,26 +757,33 @@ class OrderRepo {
      */
     returnOrder(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { dateReturned, returner, orderNumber, project } = params;
             const doc = yield this.orderModel.findOneAndUpdate({
-                orderNumber: { $eq: params.orderNumber },
+                orderNumber: { $eq: orderNumber },
                 orderStatus: { $eq: factory.orderStatus.OrderDelivered },
-                'project.id': { $eq: params.project.id },
+                'project.id': { $eq: project.id },
                 typeOf: { $eq: factory.order.OrderType.Order }
             }, {
-                previousOrderStatus: factory.orderStatus.OrderDelivered,
-                orderStatus: factory.orderStatus.OrderReturned,
-                dateReturned: params.dateReturned,
-                returner: params.returner
+                $set: {
+                    previousOrderStatus: factory.orderStatus.OrderDelivered,
+                    orderStatus: factory.orderStatus.OrderReturned,
+                    dateReturned,
+                    returner
+                }
             }, {
                 new: true,
                 projection: {
-                    _id: 1, project: 1, typeOf: 1, orderNumber: 1, dateReturned: 1,
+                    _id: 0,
+                    id: { $toString: '$_id' },
+                    // _id: 1,
+                    project: 1, typeOf: 1, orderNumber: 1, dateReturned: 1,
                     customer: 1, returner: 1, seller: 1, price: 1, priceCurrency: 1, orderDate: 1 // optimize(2023-12-07~)
                     // __v: 0,
                     // createdAt: 0,
                     // updatedAt: 0
                 }
             })
+                .lean() // lean(2024-07-30~)
                 .exec();
             // NotFoundであれば状態確認
             if (doc === null) {
@@ -795,7 +791,7 @@ class OrderRepo {
                     orderNumber: params.orderNumber,
                     project: { id: params.project.id },
                     inclusion: [
-                        'project', 'typeOf', 'orderNumber', 'dateReturned', 'id',
+                        'project', 'typeOf', 'orderNumber', 'dateReturned',
                         'customer', 'returner', 'seller', 'price', 'priceCurrency', 'orderDate'
                     ]
                 });
@@ -811,7 +807,8 @@ class OrderRepo {
                     throw new factory.errors.Argument('orderNumber', `Order ${order.orderNumber} already changed -> ${order.orderStatus}`);
                 }
             }
-            return doc.toObject();
+            return doc;
+            // return doc.toObject();
         });
     }
     /**
@@ -820,19 +817,21 @@ class OrderRepo {
     updateChangeableAttributes(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const updatedAt = new Date();
+            const { orderNumber, project, name } = params;
             const doc = yield this.orderModel.findOneAndUpdate({
-                orderNumber: { $eq: params.orderNumber },
-                'project.id': { $eq: params.project.id },
+                orderNumber: { $eq: orderNumber },
+                'project.id': { $eq: project.id },
                 typeOf: { $eq: factory.order.OrderType.Order }
             }, {
-                $set: Object.assign({}, (typeof params.name === 'string') ? { name: params.name } : undefined)
+                $set: Object.assign({}, (typeof name === 'string') ? { name } : undefined)
             }, {
-                new: true,
+                new: false,
                 projection: {
                     _id: 1
                     // updatedAt: 1 // discontinue(2024-06-17~)
                 }
             })
+                .lean() // lean(2024-07-30~)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.orderModel.modelName);
@@ -864,6 +863,7 @@ class OrderRepo {
                     _id: 1
                 }
             })
+                .lean() // lean(2024-07-30~)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.orderModel.modelName);
@@ -879,7 +879,10 @@ class OrderRepo {
             };
             if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
                 params.inclusion.forEach((field) => {
-                    if (String(field) !== 'acceptedOffers' && field !== '_id' && field !== 'id') {
+                    // if (String(field) !== 'acceptedOffers' && field !== '_id' && field !== 'id') {
+                    //     projection[field] = 1;
+                    // }
+                    if (AVAILABLE_PROJECT_FIELDS.includes(field)) {
                         projection[field] = 1;
                     }
                 });
@@ -887,12 +890,6 @@ class OrderRepo {
             else {
                 // discontinue(2024-07-25~)
                 throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
-                // projection = {
-                //     __v: 0,
-                //     createdAt: 0,
-                //     updatedAt: 0,
-                //     acceptedOffers: 0
-                // };
             }
             const doc = yield this.orderModel.findOne({
                 _id: { $eq: params.id },
@@ -920,7 +917,10 @@ class OrderRepo {
             };
             if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
                 params.inclusion.forEach((field) => {
-                    if (String(field) !== 'acceptedOffers' && field !== '_id' && field !== 'id') {
+                    // if (String(field) !== 'acceptedOffers' && field !== '_id' && field !== 'id') {
+                    //     projection[field] = 1;
+                    // }
+                    if (AVAILABLE_PROJECT_FIELDS.includes(field)) {
                         projection[field] = 1;
                     }
                 });
@@ -928,12 +928,6 @@ class OrderRepo {
             else {
                 // discontinue(2024-07-25~)
                 throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
-                // projection = {
-                //     __v: 0,
-                //     createdAt: 0,
-                //     updatedAt: 0,
-                //     acceptedOffers: 0 // defaultで除外(2023-12-08~)
-                // };
             }
             const doc = yield this.orderModel.findOne({
                 orderNumber: { $eq: params.orderNumber },
@@ -1008,10 +1002,14 @@ class OrderRepo {
             let projectStage = {};
             const positiveProjectionFields = (inclusion !== undefined && inclusion !== null)
                 ? Object.keys(inclusion)
-                    .filter((key) => inclusion[key] === 1
-                    && key !== 'acceptedOffers' // defaultで隠蔽(2023-12-06~)
-                    && key !== '_id'
-                    && key !== 'id')
+                    .filter((key) => {
+                    // return inclusion[<IKeyOfProjection>key] === 1
+                    //     && key !== 'acceptedOffers' // defaultで隠蔽(2023-12-06~)
+                    //     && key !== '_id'
+                    //     && key !== 'id';
+                    return inclusion[key] === 1
+                        && AVAILABLE_PROJECT_FIELDS.includes(key);
+                })
                 : [];
             if (Array.isArray(positiveProjectionFields) && positiveProjectionFields.length > 0) {
                 useInclusionProjection = true;

package/lib/chevre/service/offer/onEventChanged.js

@@ -132,9 +132,13 @@ function createInformTasks(params) {
             const eventsFromDB = yield repos.event.search({
                 id: { $in: params.ids },
                 typeOf: params.typeOf
-            }, [], [
-                'aggregateEntranceGate', 'aggregateOffer', 'aggregateReservation',
-                'remainingAttendeeCapacity', 'checkInCount', 'attendeeCount'
+            }, [
+                'project', 'organizer', 'typeOf', 'name', 'doorTime', 'endDate',
+                'eventStatus', 'location', 'startDate', 'additionalProperty'
+            ], // inclusion(2024-07-30~)
+            [
+            // 'aggregateEntranceGate', 'aggregateOffer', 'aggregateReservation',
+            // 'remainingAttendeeCapacity', 'checkInCount', 'attendeeCount'
             ]);
             // 最適化(2024-03-26~)
             events4inform = eventsFromDB.map(({ project, organizer, typeOf, name, doorTime, endDate, eventStatus, location, startDate, id, additionalProperty }) => {
@@ -148,9 +152,13 @@ function createInformTasks(params) {
             const screeningEvents4inform = yield repos.event.search({
                 id: { $in: params.ids },
                 typeOf: params.typeOf
-            }, [], [
-                'aggregateEntranceGate', 'aggregateOffer', 'aggregateReservation',
-                'remainingAttendeeCapacity', 'checkInCount', 'attendeeCount'
+            }, [
+                'project', 'organizer', 'typeOf', 'name', 'doorTime', 'endDate',
+                'eventStatus', 'location', 'startDate', 'superEvent', 'offers', 'additionalProperty'
+            ], // inclusion(2024-07-30~)
+            [
+            // 'aggregateEntranceGate', 'aggregateOffer', 'aggregateReservation',
+            // 'remainingAttendeeCapacity', 'checkInCount', 'attendeeCount'
             ]);
             // 最適化(2024-03-22~)
             events4inform = screeningEvents4inform.map(({ project, organizer, typeOf, name, doorTime, endDate, eventStatus, location, startDate, superEvent, offers, id, additionalProperty }) => {
@@ -182,7 +190,14 @@ function createInformTasks(params) {
             const screeningEventSeries4inform = yield repos.event.search({
                 id: { $in: params.ids },
                 typeOf: params.typeOf
-            }, [], ['offers']);
+            }, [
+                'project', 'organizer', 'typeOf', 'name', 'location', 'videoFormat', 'soundFormat', 'workPerformed', 'kanaName', 'eventStatus',
+                'endDate', 'startDate', 'additionalProperty', 'subtitleLanguage', 'dubLanguage',
+                'alternativeHeadline', 'description', 'duration', 'headline'
+            ], // inclusion(2024-07-30~)
+            [
+            // 'offers'
+            ]);
             // 最適化(2024-03-25~)
             events4inform = screeningEventSeries4inform.map(({ project, organizer, typeOf, name, location, id, videoFormat, soundFormat, workPerformed, kanaName, eventStatus, endDate, startDate, additionalProperty, subtitleLanguage, dubLanguage, alternativeHeadline, description, duration, headline }) => {
                 return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ project, organizer, typeOf, name, location, id, videoFormat, soundFormat, workPerformed, kanaName, eventStatus }, (endDate !== undefined) ? { endDate } : undefined), (startDate !== undefined) ? { startDate } : undefined), (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (subtitleLanguage !== undefined) ? {} : undefined), (dubLanguage !== undefined) ? { dubLanguage } : undefined), (alternativeHeadline !== undefined) ? { alternativeHeadline } : undefined), (description !== undefined) ? { description } : undefined), (typeof duration === 'string') ? { duration } : undefined), (headline !== undefined) ? { headline } : undefined);

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

@@ -30,7 +30,7 @@ function returnOrder(params) {
             orderNumber,
             project: { id: params.project.id },
             inclusion: [
-                'project', 'typeOf', 'orderNumber', 'dateReturned', 'id',
+                'project', 'typeOf', 'orderNumber', 'dateReturned',
                 'customer', 'returner', 'seller', 'price', 'priceCurrency', 'orderDate', 'orderStatus'
             ]
         });

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

@@ -51,7 +51,7 @@ function sendOrder(params) {
             let order = yield repos.order.projectFieldsByOrderNumber({
                 orderNumber,
                 project: { id: params.project.id },
-                inclusion: ['confirmationNumber', 'project', 'typeOf', 'seller', 'orderNumber', 'price', 'priceCurrency', 'orderDate', 'customer', '_id']
+                inclusion: ['confirmationNumber', 'project', 'typeOf', 'seller', 'orderNumber', 'price', 'priceCurrency', 'orderDate', 'customer']
             });
             // プロジェクト条件検証
             if (order.project.id !== params.project.id) {

package/lib/chevre/service/reserve/potentialActions/onReservationCheckedIn.js

@@ -113,9 +113,7 @@ function onReservationCheckedIn(params) {
                 const existingEvents = yield repos.event.search({
                     id: { $eq: reservationForId },
                     typeOfIn: [factory.eventType.Event, factory.eventType.ScreeningEvent] // 指定しないとArgumentNullError
-                }, ['_id'], []
-                // { _id: 1 }
-                );
+                }, ['typeOf'], []);
                 if (existingEvents.length > 0) {
                     yield (0, onEventChanged_1.createAggregateScreeningEventIfNotExist)({
                         project: { id: params.project.id },

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.0.0"
+  "version": "22.1.0-alpha.1"
 }