@chevre/domain 21.2.0-alpha.99 → 21.2.0

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

@@ -97,14 +97,20 @@ export declare class MongoRepository {
         expectsNoContent: boolean;
     }): Promise<factory.event.IEvent<T>[] | void>;
     /**
-     * 特定の追加特性をキーにして、なければ作成する(複数対応)
+     * 特定の追加特性をキーにして、存在しなければ作成する(複数対応)
+     * 存在すれば、eventStatusのみ更新する
      */
     createManyIfNotExist<T extends factory.eventType>(params: {
         attributes: factory.event.IAttributes<T>;
         filter: {
             name: string;
         };
-    }[]): Promise<BulkWriteOpResultObject | void>;
+    }[]): Promise<{
+        bulkWriteResult: BulkWriteOpResultObject;
+        modifiedEvents: {
+            id: string;
+        }[];
+    } | void>;
     /**
      * コンテンツ+バージョンをキーにして、なければ作成する(複数対応)
      */
@@ -179,6 +185,28 @@ export declare class MongoRepository {
         filter: any;
         $unset: any;
     }): Promise<import("mongodb").UpdateResult>;
+    /**
+     * 既存施設コンテンツの最大バージョンを集計する
+     */
+    aggregateScreeningEventMaxVersion(params: {
+        project: {
+            id: {
+                $eq: string;
+            };
+        };
+        workPerformed: {
+            identifier: {
+                $eq: string;
+            };
+        };
+        location: {
+            branchCode: {
+                $in: string[];
+            };
+        };
+    }): Promise<{
+        maxVersion: string;
+    }>;
     aggregateEvent(params: {
         project?: {
             id?: {

package/lib/chevre/repo/event.js

@@ -25,6 +25,7 @@ const uniqid = require("uniqid");
 const factory = require("../factory");
 const event_1 = require("./mongoose/schemas/event");
 const errorHandler_1 = require("../errorHandler");
+const settings_1 = require("../settings");
 exports.PROJECTION_MINIMIZED_EVENT = {
     project: 1,
     _id: 1,
@@ -50,7 +51,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(conditions) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39;
         const andConditions = [{ typeOf: { $eq: conditions.typeOf } }];
         const projectIdEq = (_b = (_a = conditions.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
         if (typeof projectIdEq === 'string') {
@@ -115,18 +116,15 @@ class MongoRepository {
         }
         const locationBranchCodeEq = (_e = (_d = conditions.location) === null || _d === void 0 ? void 0 : _d.branchCode) === null || _e === void 0 ? void 0 : _e.$eq;
         if (typeof locationBranchCodeEq === 'string') {
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            andConditions.push({
-                'location.branchCode': {
-                    $exists: true,
-                    $eq: locationBranchCodeEq
-                }
-            });
+            andConditions.push({ 'location.branchCode': { $exists: true, $eq: locationBranchCodeEq } });
+        }
+        const locationBranchCodeIn = (_g = (_f = conditions.location) === null || _f === void 0 ? void 0 : _f.branchCode) === null || _g === void 0 ? void 0 : _g.$in;
+        if (Array.isArray(locationBranchCodeIn)) {
+            andConditions.push({ 'location.branchCode': { $exists: true, $in: locationBranchCodeIn } });
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
-        const hasOfferCatalogIdEq = (_g = (_f = conditions.hasOfferCatalog) === null || _f === void 0 ? void 0 : _f.id) === null || _g === void 0 ? void 0 : _g.$eq;
+        const hasOfferCatalogIdEq = (_j = (_h = conditions.hasOfferCatalog) === null || _h === void 0 ? void 0 : _h.id) === null || _j === void 0 ? void 0 : _j.$eq;
         if (typeof hasOfferCatalogIdEq === 'string') {
             andConditions.push({
                 'hasOfferCatalog.id': {
@@ -135,7 +133,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyElemMatch = (_h = conditions.additionalProperty) === null || _h === void 0 ? void 0 : _h.$elemMatch;
+        const additionalPropertyElemMatch = (_k = conditions.additionalProperty) === null || _k === void 0 ? void 0 : _k.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
                 additionalProperty: {
@@ -151,7 +149,7 @@ class MongoRepository {
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
                 if (params.offers !== undefined) {
-                    const itemOfferedIdIn4event = (_k = (_j = params.offers.itemOffered) === null || _j === void 0 ? void 0 : _j.id) === null || _k === void 0 ? void 0 : _k.$in;
+                    const itemOfferedIdIn4event = (_m = (_l = params.offers.itemOffered) === null || _l === void 0 ? void 0 : _l.id) === null || _m === void 0 ? void 0 : _m.$in;
                     if (Array.isArray(itemOfferedIdIn4event)) {
                         andConditions.push({
                             'offers.itemOffered.id': {
@@ -201,8 +199,8 @@ class MongoRepository {
                         }
                     }
                 }
-                const sellerMakesOfferElemMatch4event = (_o = (_m = (_l = params.offers) === null || _l === void 0 ? void 0 : _l.seller) === null || _m === void 0 ? void 0 : _m.makesOffer) === null || _o === void 0 ? void 0 : _o.$elemMatch;
-                if (typeof ((_p = sellerMakesOfferElemMatch4event === null || sellerMakesOfferElemMatch4event === void 0 ? void 0 : sellerMakesOfferElemMatch4event['availableAtOrFrom.id']) === null || _p === void 0 ? void 0 : _p.$eq) === 'string') {
+                const sellerMakesOfferElemMatch4event = (_q = (_p = (_o = params.offers) === null || _o === void 0 ? void 0 : _o.seller) === null || _p === void 0 ? void 0 : _p.makesOffer) === null || _q === void 0 ? void 0 : _q.$elemMatch;
+                if (typeof ((_r = sellerMakesOfferElemMatch4event === null || sellerMakesOfferElemMatch4event === void 0 ? void 0 : sellerMakesOfferElemMatch4event['availableAtOrFrom.id']) === null || _r === void 0 ? void 0 : _r.$eq) === 'string') {
                     andConditions.push({
                         'offers.seller.makesOffer': {
                             $exists: true,
@@ -210,7 +208,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const reservationForIdentifierEq = (_u = (_t = (_s = (_r = (_q = params.offers) === null || _q === void 0 ? void 0 : _q.itemOffered) === null || _r === void 0 ? void 0 : _r.serviceOutput) === null || _s === void 0 ? void 0 : _s.reservationFor) === null || _t === void 0 ? void 0 : _t.identifier) === null || _u === void 0 ? void 0 : _u.$eq;
+                const reservationForIdentifierEq = (_w = (_v = (_u = (_t = (_s = params.offers) === null || _s === void 0 ? void 0 : _s.itemOffered) === null || _t === void 0 ? void 0 : _t.serviceOutput) === null || _u === void 0 ? void 0 : _u.reservationFor) === null || _v === void 0 ? void 0 : _v.identifier) === null || _w === void 0 ? void 0 : _w.$eq;
                 if (typeof reservationForIdentifierEq === 'string') {
                     andConditions.push({
                         'offers.itemOffered.serviceOutput.reservationFor.identifier': {
@@ -219,7 +217,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const reservationForArrivalBusStopBranchCodeEq = (_0 = (_z = (_y = (_x = (_w = (_v = params.offers) === null || _v === void 0 ? void 0 : _v.itemOffered) === null || _w === void 0 ? void 0 : _w.serviceOutput) === null || _x === void 0 ? void 0 : _x.reservationFor) === null || _y === void 0 ? void 0 : _y.arrivalBusStop) === null || _z === void 0 ? void 0 : _z.branchCode) === null || _0 === void 0 ? void 0 : _0.$eq;
+                const reservationForArrivalBusStopBranchCodeEq = (_2 = (_1 = (_0 = (_z = (_y = (_x = params.offers) === null || _x === void 0 ? void 0 : _x.itemOffered) === null || _y === void 0 ? void 0 : _y.serviceOutput) === null || _z === void 0 ? void 0 : _z.reservationFor) === null || _0 === void 0 ? void 0 : _0.arrivalBusStop) === null || _1 === void 0 ? void 0 : _1.branchCode) === null || _2 === void 0 ? void 0 : _2.$eq;
                 if (typeof reservationForArrivalBusStopBranchCodeEq === 'string') {
                     andConditions.push({
                         'offers.itemOffered.serviceOutput.reservationFor.arrivalBusStop.branchCode': {
@@ -228,7 +226,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const reservationForDepartureBusStopBranchCodeEq = (_6 = (_5 = (_4 = (_3 = (_2 = (_1 = params.offers) === null || _1 === void 0 ? void 0 : _1.itemOffered) === null || _2 === void 0 ? void 0 : _2.serviceOutput) === null || _3 === void 0 ? void 0 : _3.reservationFor) === null || _4 === void 0 ? void 0 : _4.departureBusStop) === null || _5 === void 0 ? void 0 : _5.branchCode) === null || _6 === void 0 ? void 0 : _6.$eq;
+                const reservationForDepartureBusStopBranchCodeEq = (_8 = (_7 = (_6 = (_5 = (_4 = (_3 = params.offers) === null || _3 === void 0 ? void 0 : _3.itemOffered) === null || _4 === void 0 ? void 0 : _4.serviceOutput) === null || _5 === void 0 ? void 0 : _5.reservationFor) === null || _6 === void 0 ? void 0 : _6.departureBusStop) === null || _7 === void 0 ? void 0 : _7.branchCode) === null || _8 === void 0 ? void 0 : _8.$eq;
                 if (typeof reservationForDepartureBusStopBranchCodeEq === 'string') {
                     andConditions.push({
                         'offers.itemOffered.serviceOutput.reservationFor.departureBusStop.branchCode': {
@@ -262,7 +260,7 @@ class MongoRepository {
                 }
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
-                const superEventLocationIdEq = (_9 = (_8 = (_7 = params.superEvent) === null || _7 === void 0 ? void 0 : _7.location) === null || _8 === void 0 ? void 0 : _8.id) === null || _9 === void 0 ? void 0 : _9.$eq;
+                const superEventLocationIdEq = (_11 = (_10 = (_9 = params.superEvent) === null || _9 === void 0 ? void 0 : _9.location) === null || _10 === void 0 ? void 0 : _10.id) === null || _11 === void 0 ? void 0 : _11.$eq;
                 if (typeof superEventLocationIdEq === 'string') {
                     andConditions.push({
                         'superEvent.location.id': {
@@ -305,7 +303,7 @@ class MongoRepository {
                         });
                     }
                 }
-                const itemOfferedIdIn = (_12 = (_11 = (_10 = params.offers) === null || _10 === void 0 ? void 0 : _10.itemOffered) === null || _11 === void 0 ? void 0 : _11.id) === null || _12 === void 0 ? void 0 : _12.$in;
+                const itemOfferedIdIn = (_14 = (_13 = (_12 = params.offers) === null || _12 === void 0 ? void 0 : _12.itemOffered) === null || _13 === void 0 ? void 0 : _13.id) === null || _14 === void 0 ? void 0 : _14.$in;
                 if (Array.isArray(itemOfferedIdIn)) {
                     andConditions.push({
                         'offers.itemOffered.id': {
@@ -314,7 +312,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const itemOfferedTicketedSeatTypeOfIn = (_17 = (_16 = (_15 = (_14 = (_13 = params.offers) === null || _13 === void 0 ? void 0 : _13.itemOffered) === null || _14 === void 0 ? void 0 : _14.serviceOutput) === null || _15 === void 0 ? void 0 : _15.reservedTicket) === null || _16 === void 0 ? void 0 : _16.ticketedSeat) === null || _17 === void 0 ? void 0 : _17.typeOfs;
+                const itemOfferedTicketedSeatTypeOfIn = (_19 = (_18 = (_17 = (_16 = (_15 = params.offers) === null || _15 === void 0 ? void 0 : _15.itemOffered) === null || _16 === void 0 ? void 0 : _16.serviceOutput) === null || _17 === void 0 ? void 0 : _17.reservedTicket) === null || _18 === void 0 ? void 0 : _18.ticketedSeat) === null || _19 === void 0 ? void 0 : _19.typeOfs;
                 if (Array.isArray(itemOfferedTicketedSeatTypeOfIn)) {
                     andConditions.push({
                         'offers.itemOffered.serviceOutput.reservedTicket.ticketedSeat.typeOf': {
@@ -323,7 +321,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const itemOfferedServiceTypeIdIn = (_20 = (_19 = (_18 = params.offers) === null || _18 === void 0 ? void 0 : _18.itemOffered) === null || _19 === void 0 ? void 0 : _19.serviceType) === null || _20 === void 0 ? void 0 : _20.ids;
+                const itemOfferedServiceTypeIdIn = (_22 = (_21 = (_20 = params.offers) === null || _20 === void 0 ? void 0 : _20.itemOffered) === null || _21 === void 0 ? void 0 : _21.serviceType) === null || _22 === void 0 ? void 0 : _22.ids;
                 if (Array.isArray(itemOfferedServiceTypeIdIn)) {
                     andConditions.push({
                         'offers.itemOffered.serviceType.id': {
@@ -332,8 +330,8 @@ class MongoRepository {
                         }
                     });
                 }
-                const sellerMakesOfferElemMatch = (_23 = (_22 = (_21 = params.offers) === null || _21 === void 0 ? void 0 : _21.seller) === null || _22 === void 0 ? void 0 : _22.makesOffer) === null || _23 === void 0 ? void 0 : _23.$elemMatch;
-                if (typeof ((_24 = sellerMakesOfferElemMatch === null || sellerMakesOfferElemMatch === void 0 ? void 0 : sellerMakesOfferElemMatch['availableAtOrFrom.id']) === null || _24 === void 0 ? void 0 : _24.$eq) === 'string') {
+                const sellerMakesOfferElemMatch = (_25 = (_24 = (_23 = params.offers) === null || _23 === void 0 ? void 0 : _23.seller) === null || _24 === void 0 ? void 0 : _24.makesOffer) === null || _25 === void 0 ? void 0 : _25.$elemMatch;
+                if (typeof ((_26 = sellerMakesOfferElemMatch === null || sellerMakesOfferElemMatch === void 0 ? void 0 : sellerMakesOfferElemMatch['availableAtOrFrom.id']) === null || _26 === void 0 ? void 0 : _26.$eq) === 'string') {
                     andConditions.push({
                         'offers.seller.makesOffer': {
                             $exists: true,
@@ -370,7 +368,7 @@ class MongoRepository {
                         ]
                     });
                 }
-                const locationIdEq = (_26 = (_25 = params.location) === null || _25 === void 0 ? void 0 : _25.id) === null || _26 === void 0 ? void 0 : _26.$eq;
+                const locationIdEq = (_28 = (_27 = params.location) === null || _27 === void 0 ? void 0 : _27.id) === null || _28 === void 0 ? void 0 : _28.$eq;
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
                 if (typeof locationIdEq === 'string') {
@@ -392,7 +390,7 @@ class MongoRepository {
                         });
                     }
                 }
-                const workPerformedIdentifierIn = (_27 = params.workPerformed) === null || _27 === void 0 ? void 0 : _27.identifiers;
+                const workPerformedIdentifierIn = (_29 = params.workPerformed) === null || _29 === void 0 ? void 0 : _29.identifiers;
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
                 if (Array.isArray(workPerformedIdentifierIn)) {
@@ -400,13 +398,13 @@ class MongoRepository {
                         'workPerformed.identifier': { $exists: true, $in: workPerformedIdentifierIn }
                     });
                 }
-                const workPerformedVersionEq = (_29 = (_28 = params.workPerformed) === null || _28 === void 0 ? void 0 : _28.version) === null || _29 === void 0 ? void 0 : _29.$eq;
+                const workPerformedVersionEq = (_31 = (_30 = params.workPerformed) === null || _30 === void 0 ? void 0 : _30.version) === null || _31 === void 0 ? void 0 : _31.$eq;
                 if (typeof workPerformedVersionEq === 'string') {
                     andConditions.push({
                         'workPerformed.version': { $exists: true, $eq: workPerformedVersionEq }
                     });
                 }
-                const videoFormatTypeOfEq = (_31 = (_30 = params.videoFormat) === null || _30 === void 0 ? void 0 : _30.typeOf) === null || _31 === void 0 ? void 0 : _31.$eq;
+                const videoFormatTypeOfEq = (_33 = (_32 = params.videoFormat) === null || _32 === void 0 ? void 0 : _32.typeOf) === null || _33 === void 0 ? void 0 : _33.$eq;
                 if (typeof videoFormatTypeOfEq === 'string') {
                     andConditions.push({
                         'videoFormat.typeOf': {
@@ -415,7 +413,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const videoFormatTypeOfIn = (_33 = (_32 = params.videoFormat) === null || _32 === void 0 ? void 0 : _32.typeOf) === null || _33 === void 0 ? void 0 : _33.$in;
+                const videoFormatTypeOfIn = (_35 = (_34 = params.videoFormat) === null || _34 === void 0 ? void 0 : _34.typeOf) === null || _35 === void 0 ? void 0 : _35.$in;
                 if (Array.isArray(videoFormatTypeOfIn)) {
                     andConditions.push({
                         'videoFormat.typeOf': {
@@ -424,7 +422,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const soundFormatTypeOfEq = (_35 = (_34 = params.soundFormat) === null || _34 === void 0 ? void 0 : _34.typeOf) === null || _35 === void 0 ? void 0 : _35.$eq;
+                const soundFormatTypeOfEq = (_37 = (_36 = params.soundFormat) === null || _36 === void 0 ? void 0 : _36.typeOf) === null || _37 === void 0 ? void 0 : _37.$eq;
                 if (typeof soundFormatTypeOfEq === 'string') {
                     andConditions.push({
                         'soundFormat.typeOf': {
@@ -433,7 +431,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const soundFormatTypeOfIn = (_37 = (_36 = params.soundFormat) === null || _36 === void 0 ? void 0 : _36.typeOf) === null || _37 === void 0 ? void 0 : _37.$in;
+                const soundFormatTypeOfIn = (_39 = (_38 = params.soundFormat) === null || _38 === void 0 ? void 0 : _38.typeOf) === null || _39 === void 0 ? void 0 : _39.$in;
                 if (Array.isArray(soundFormatTypeOfIn)) {
                     andConditions.push({
                         'soundFormat.typeOf': {
@@ -473,11 +471,13 @@ class MongoRepository {
         });
     }
     /**
-     * 特定の追加特性をキーにして、なければ作成する(複数対応)
+     * 特定の追加特性をキーにして、存在しなければ作成する(複数対応)
+     * 存在すれば、eventStatusのみ更新する
      */
     createManyIfNotExist(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const bulkWriteOps = [];
+            const additionalProperties = [];
             if (Array.isArray(params)) {
                 params.forEach((creatingEventParams) => {
                     var _a, _b;
@@ -488,11 +488,12 @@ class MongoRepository {
                     if (typeof additionalPropertyValue !== 'string') {
                         throw new factory.errors.NotFound('additionalProperty.value');
                     }
+                    additionalProperties.push({ name: creatingEventParams.filter.name, value: additionalPropertyValue });
                     const _c = creatingEventParams.attributes, { eventStatus } = _c, setOnInsertFields = __rest(_c, ["eventStatus"]);
                     bulkWriteOps.push({
                         updateOne: {
                             filter: {
-                                typeOf: creatingEventParams.attributes.typeOf,
+                                typeOf: { $eq: creatingEventParams.attributes.typeOf },
                                 // 追加特性をキーにした冪等イベント作成時のfilterにproject.idを追加(2023-04-06~)
                                 'project.id': { $eq: creatingEventParams.attributes.project.id },
                                 // 追加特性をキーに更新
@@ -512,7 +513,21 @@ class MongoRepository {
                 });
             }
             if (bulkWriteOps.length > 0) {
-                return this.eventModel.bulkWrite(bulkWriteOps, { ordered: false });
+                const bulkWriteResult = yield this.eventModel.bulkWrite(bulkWriteOps, { ordered: false });
+                // modifiedの場合upsertedIdsに含まれないので、idを検索する
+                const modifiedEvents = yield this.eventModel.find({
+                    typeOf: { $eq: params[0].attributes.typeOf },
+                    // 追加特性をキーにした冪等イベント作成時のfilterにproject.idを追加(2023-04-06~)
+                    'project.id': { $eq: params[0].attributes.project.id },
+                    // 追加特性をキーに更新
+                    additionalProperty: {
+                        $exists: true,
+                        $in: additionalProperties
+                    }
+                })
+                    .select(['_id'])
+                    .exec();
+                return { bulkWriteResult, modifiedEvents };
             }
         });
     }
@@ -700,7 +715,7 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
             return this.eventModel.countDocuments({ $and: conditions })
-                .setOptions({ maxTimeMS: 10000 })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
@@ -738,7 +753,7 @@ class MongoRepository {
             // console.log(explainResult[0].queryPlanner?.winningPlan?.inputStage?.inputStage?.inputStage);
             // console.log(explainResult);
             // return [];
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
@@ -747,7 +762,7 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
             const query = this.eventModel.distinct('_id', { $and: conditions });
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
@@ -831,6 +846,42 @@ class MongoRepository {
                 .exec();
         });
     }
+    /**
+     * 既存施設コンテンツの最大バージョンを集計する
+     */
+    aggregateScreeningEventMaxVersion(params) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const aggregations = yield this.eventModel.aggregate([
+                {
+                    $match: {
+                        typeOf: { $eq: factory.eventType.ScreeningEventSeries },
+                        'project.id': { $eq: params.project.id.$eq },
+                        'workPerformed.identifier': { $exists: true, $eq: params.workPerformed.identifier.$eq },
+                        'workPerformed.version': { $exists: true },
+                        'location.branchCode': { $exists: true, $in: params.location.branchCode.$in }
+                    }
+                },
+                {
+                    $project: {
+                        workPerformed: '$workPerformed',
+                        version: { $toInt: '$workPerformed.version' }
+                    }
+                },
+                {
+                    $group: {
+                        _id: '$typeOf',
+                        maxVersion: { $max: '$version' }
+                    }
+                }
+            ])
+                .exec();
+            const maxVersion = (aggregations.length > 0)
+                ? String((_a = aggregations.shift()) === null || _a === void 0 ? void 0 : _a.maxVersion)
+                : '0';
+            return { maxVersion };
+        });
+    }
     aggregateEvent(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const statuses = yield Promise.all([

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

@@ -9,6 +9,20 @@ export declare class MongoRepository {
     static CREATE_MONGO_CONDITIONS(params: factory.iam.ISearchConditions): any[];
     count(params: factory.iam.ISearchConditions): Promise<number>;
     search(params: factory.iam.ISearchConditions): Promise<factory.iam.IMember[]>;
+    aggregateRoleNames(params: {
+        project: {
+            id: {
+                $eq: string;
+            };
+        };
+        member: {
+            id: {
+                $eq: string;
+            };
+        };
+    }): Promise<{
+        roleName: string;
+    }[]>;
     findById(params: {
         id: string;
     }): Promise<factory.iam.IMember>;

package/lib/chevre/repo/member.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const factory = require("../factory");
 const member_1 = require("./mongoose/schemas/member");
+const settings_1 = require("../settings");
 /**
  * IAMメンバーリポジトリ
  */
@@ -102,7 +103,7 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
             return this.memberModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-                .setOptions({ maxTimeMS: 10000 })
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec();
         });
     }
@@ -126,11 +127,38 @@ class MongoRepository {
             }
             // const explainResult = await (<any>query).explain();
             // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
     }
+    aggregateRoleNames(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const matchStages = [
+                { $match: { 'project.id': { $eq: params.project.id.$eq } } },
+                { $match: { 'member.id': { $eq: params.member.id.$eq } } }
+            ];
+            const aggregate = this.memberModel.aggregate([
+                // ...(typeof params.sort?.productID === 'number')
+                //     ? [{ $sort: { productID: params.sort.productID } }]
+                //     : [],
+                ...matchStages,
+                {
+                    $unwind: {
+                        path: '$member.hasRole'
+                    }
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        roleName: '$member.hasRole.roleName'
+                    }
+                }
+            ]);
+            return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
     findById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.memberModel.findOne({
@@ -227,7 +255,7 @@ class MongoRepository {
                 query.limit(params.limit)
                     .skip(params.limit * (page - 1));
             }
-            const projectMembers = yield query.setOptions({ maxTimeMS: 10000 })
+            const projectMembers = yield query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
             return projectMembers.map((m) => m.project.id);

package/lib/chevre/repo/merchantReturnPolicy.js

@@ -23,6 +23,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const merchantReturnPolicy_1 = require("./mongoose/schemas/merchantReturnPolicy");
 const factory = require("../factory");
+const settings_1 = require("../settings");
 /**
  * 返品ポリシーリポジトリ
  */
@@ -144,7 +145,7 @@ class MongoRepository {
             if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.identifier) !== undefined) {
                 query.sort({ identifier: params.sort.identifier });
             }
-            return query.setOptions({ maxTimeMS: 10000 })
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });

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

@@ -59,6 +59,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     result?: any;
     expires?: Date | undefined;
     project?: any;
+    seller?: any;
     agent?: any;
     recipient?: any;
     startDate?: Date | undefined;
@@ -68,7 +69,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     tasksExportationStatus?: string | undefined;
     tasksExportedAt?: Date | undefined;
     location?: any;
-    seller?: any;
     tasksExportAction?: any;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     object?: any;
@@ -78,6 +78,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     result?: any;
     expires?: Date | undefined;
     project?: any;
+    seller?: any;
     agent?: any;
     recipient?: any;
     startDate?: Date | undefined;
@@ -87,7 +88,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     tasksExportationStatus?: string | undefined;
     tasksExportedAt?: Date | undefined;
     location?: any;
-    seller?: any;
     tasksExportAction?: any;
 }>> & Omit<import("mongoose").FlatRecord<{
     object?: any;
@@ -97,6 +97,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     result?: any;
     expires?: Date | undefined;
     project?: any;
+    seller?: any;
     agent?: any;
     recipient?: any;
     startDate?: Date | undefined;
@@ -106,7 +107,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     tasksExportationStatus?: string | undefined;
     tasksExportedAt?: Date | undefined;
     location?: any;
-    seller?: any;
     tasksExportAction?: any;
 }> & {
     _id: import("mongoose").Types.ObjectId;

package/lib/chevre/repo/mongoose/schemas/holdReservation.d.ts

@@ -0,0 +1,75 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
+import { Schema } from 'mongoose';
+declare const modelName = "HoldReservation";
+/**
+ * 保留予約スキーマ
+ */
+declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
+    collection: string;
+    id: true;
+    read: string;
+    writeConcern: import("mongodb").WriteConcern;
+    strict: true;
+    strictQuery: false;
+    useNestedStrict: boolean;
+    timestamps: {
+        createdAt: string;
+        updatedAt: string;
+    };
+    toJSON: {
+        getters: false;
+        virtuals: false;
+        minimize: false;
+        versionKey: false;
+    };
+    toObject: {
+        getters: false;
+        virtuals: true;
+        minimize: false;
+        versionKey: false;
+    };
+}, {
+    typeOf: string;
+    project: any;
+    reservationFor: any;
+    reservations: any[];
+    reservationCount: number;
+}, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
+    typeOf: string;
+    project: any;
+    reservationFor: any;
+    reservations: any[];
+    reservationCount: number;
+}>> & Omit<import("mongoose").FlatRecord<{
+    typeOf: string;
+    project: any;
+    reservationFor: any;
+    reservations: any[];
+    reservationCount: number;
+}> & {
+    _id: import("mongoose").Types.ObjectId;
+}, never>>;
+export { modelName, schema };