@chevre/domain 21.4.0-alpha.8 → 21.4.0

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

@@ -53,13 +53,14 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     };
 }, {
     typeOf: string;
+    project: any;
     additionalProperty: any[];
+    parentOrganization: any;
     containsPlace: any[];
     hasEntranceGate: any[];
     hasPOS: any[];
     name?: any;
     url?: string | undefined;
-    project?: any;
     alternateName?: any;
     description?: any;
     offers?: any;
@@ -72,18 +73,18 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     openingHoursSpecification?: any;
     smokingAllowed?: boolean | undefined;
     sameAs?: string | undefined;
-    parentOrganization?: any;
     openSeatingAllowed?: any;
     amenityFeature?: any;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
     additionalProperty: any[];
+    parentOrganization: any;
     containsPlace: any[];
     hasEntranceGate: any[];
     hasPOS: any[];
     name?: any;
     url?: string | undefined;
-    project?: any;
     alternateName?: any;
     description?: any;
     offers?: any;
@@ -96,18 +97,18 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     openingHoursSpecification?: any;
     smokingAllowed?: boolean | undefined;
     sameAs?: string | undefined;
-    parentOrganization?: any;
     openSeatingAllowed?: any;
     amenityFeature?: any;
 }>> & Omit<import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
     additionalProperty: any[];
+    parentOrganization: any;
     containsPlace: any[];
     hasEntranceGate: any[];
     hasPOS: any[];
     name?: any;
     url?: string | undefined;
-    project?: any;
     alternateName?: any;
     description?: any;
     offers?: any;
@@ -120,7 +121,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     openingHoursSpecification?: any;
     smokingAllowed?: boolean | undefined;
     sameAs?: string | undefined;
-    parentOrganization?: any;
     openSeatingAllowed?: any;
     amenityFeature?: any;
 }> & {

package/lib/chevre/repo/mongoose/schemas/place.js

@@ -9,7 +9,15 @@ exports.modelName = modelName;
  * 場所スキーマ
  */
 const schema = new mongoose_1.Schema({
-    project: mongoose_1.SchemaTypes.Mixed,
+    project: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
+    // 必須化(2023-07-14~)
+    parentOrganization: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
     typeOf: {
         type: String,
         required: true
@@ -32,7 +40,6 @@ const schema = new mongoose_1.Schema({
     kanaName: String,
     offers: mongoose_1.SchemaTypes.Mixed,
     additionalProperty: [mongoose_1.SchemaTypes.Mixed],
-    parentOrganization: mongoose_1.SchemaTypes.Mixed,
     // ↓ルームの施設からの分離に伴い属性追加(2023-06-22~)
     openSeatingAllowed: mongoose_1.SchemaTypes.Mixed,
     amenityFeature: mongoose_1.SchemaTypes.Mixed

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

@@ -54,9 +54,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
 }, {
     typeOf: string;
     additionalProperty: any[];
+    provider: any[];
     offers: any[];
     productID: string;
-    provider: any[];
     name?: any;
     project?: any;
     description?: any;
@@ -67,9 +67,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     typeOf: string;
     additionalProperty: any[];
+    provider: any[];
     offers: any[];
     productID: string;
-    provider: any[];
     name?: any;
     project?: any;
     description?: any;
@@ -80,9 +80,9 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
 }>> & Omit<import("mongoose").FlatRecord<{
     typeOf: string;
     additionalProperty: any[];
+    provider: any[];
     offers: any[];
     productID: string;
-    provider: any[];
     name?: any;
     project?: any;
     description?: any;

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

@@ -53,12 +53,13 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     };
 }, {
     typeOf: string;
+    project: any;
     reservationNumber: string;
+    provider: any;
     reservationStatus: string;
     checkedIn: boolean;
     attended: boolean;
     _id?: string | undefined;
-    project?: any;
     broker?: any;
     price?: any;
     priceCurrency?: string | undefined;
@@ -81,12 +82,13 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     previousReservationStatus?: string | undefined;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
     reservationNumber: string;
+    provider: any;
     reservationStatus: string;
     checkedIn: boolean;
     attended: boolean;
     _id?: string | undefined;
-    project?: any;
     broker?: any;
     price?: any;
     priceCurrency?: string | undefined;
@@ -109,12 +111,13 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     previousReservationStatus?: string | undefined;
 }>> & Omit<import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
     reservationNumber: string;
+    provider: any;
     reservationStatus: string;
     checkedIn: boolean;
     attended: boolean;
     _id?: string | undefined;
-    project?: any;
     broker?: any;
     price?: any;
     priceCurrency?: string | undefined;

package/lib/chevre/repo/mongoose/schemas/reservation.js

@@ -9,7 +9,14 @@ exports.modelName = modelName;
  * 予約スキーマ
  */
 const schema = new mongoose_1.Schema({
-    project: mongoose_1.SchemaTypes.Mixed,
+    project: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
+    provider: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
     _id: String,
     typeOf: {
         type: String,
@@ -74,9 +81,8 @@ exports.schema = schema;
 schema.index({ createdAt: 1 }, { name: 'searchByCreatedAt' });
 schema.index({ updatedAt: 1 }, { name: 'searchByUpdatedAt' });
 schema.index({ bookingTime: -1 }, { name: 'searchByBookingTime-v3' });
-schema.index({ 'project.id': 1, bookingTime: -1 }, {
-    name: 'searchByProjectId-v20220721'
-});
+schema.index({ 'project.id': 1, bookingTime: -1 }, { name: 'searchByProjectId-v20220721' });
+schema.index({ 'provider.id': 1, bookingTime: -1 }, { name: 'searchByProviderId' });
 schema.index({ typeOf: 1, bookingTime: -1 }, { name: 'searchByTypeOf-v3' });
 schema.index({ reservationNumber: 1, bookingTime: -1 }, { name: 'searchByReservationNumber-v3' });
 schema.index({ reservationStatus: 1, bookingTime: -1 }, { name: 'searchByReservationStatus-v3' });

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

@@ -39,6 +39,9 @@ export declare class MongoRepository {
      * 注文ステータスを変更する
      */
     changeStatus(params: {
+        project: {
+            id: string;
+        };
         orderNumber: string;
         orderStatus: factory.orderStatus;
         previousOrderStatus: factory.orderStatus;
@@ -47,6 +50,9 @@ export declare class MongoRepository {
      * 注文を返品する
      */
     returnOrder(params: {
+        project: {
+            id: string;
+        };
         orderNumber: string;
         dateReturned: Date;
         returner: factory.order.IReturner;
@@ -55,6 +61,9 @@ export declare class MongoRepository {
      * 変更可能な属性を更新する
      */
     updateChangeableAttributes(params: {
+        project: {
+            id: string;
+        };
         additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
         name?: string;
         orderNumber: string;
@@ -71,10 +80,22 @@ export declare class MongoRepository {
      */
     findByOrderNumber(params: {
         orderNumber: string;
+        project: {
+            id: string;
+        };
+        seller?: {
+            id?: string;
+        };
         inclusion: string[];
         exclusion: string[];
     }): Promise<factory.order.IOrder>;
     findByOrderNumberAndReservationId(params: {
+        project: {
+            id: string;
+        };
+        seller?: {
+            id?: string;
+        };
         orderNumber: string;
         reservationId: string;
     }): Promise<Pick<factory.order.IOrder, 'orderNumber' | 'orderStatus' | 'typeOf'>>;

package/lib/chevre/repo/order.js

@@ -24,34 +24,25 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        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;
+        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;
         const andConditions = [];
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (params.project !== undefined) {
-            if (params.project.id !== undefined && params.project.id !== null) {
-                if (typeof params.project.id.$eq === 'string') {
-                    andConditions.push({
-                        'project.id': {
-                            $eq: params.project.id.$eq
-                        }
-                    });
-                }
-            }
+        const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+        if (typeof projectIdEq === 'string') {
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
         }
-        const additionalPropertyAll = (_a = params.additionalProperty) === null || _a === void 0 ? void 0 : _a.$all;
+        const additionalPropertyAll = (_c = params.additionalProperty) === null || _c === void 0 ? void 0 : _c.$all;
         if (Array.isArray(additionalPropertyAll)) {
             andConditions.push({ additionalProperty: { $exists: true, $all: additionalPropertyAll } });
         }
-        const additionalPropertyIn = (_b = params.additionalProperty) === null || _b === void 0 ? void 0 : _b.$in;
+        const additionalPropertyIn = (_d = params.additionalProperty) === null || _d === void 0 ? void 0 : _d.$in;
         if (Array.isArray(additionalPropertyIn)) {
             andConditions.push({ additionalProperty: { $exists: true, $in: additionalPropertyIn } });
         }
-        const additionalPropertyNin = (_c = params.additionalProperty) === null || _c === void 0 ? void 0 : _c.$nin;
+        const additionalPropertyNin = (_e = params.additionalProperty) === null || _e === void 0 ? void 0 : _e.$nin;
         if (Array.isArray(additionalPropertyNin)) {
             andConditions.push({ additionalProperty: { $nin: additionalPropertyNin } });
         }
-        const additionalPropertyElemMatch = (_d = params.additionalProperty) === null || _d === void 0 ? void 0 : _d.$elemMatch;
+        const additionalPropertyElemMatch = (_f = params.additionalProperty) === null || _f === void 0 ? void 0 : _f.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({ additionalProperty: { $exists: true, $elemMatch: additionalPropertyElemMatch } });
         }
@@ -79,31 +70,22 @@ class MongoRepository {
                 });
             }
         }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (params.seller !== undefined) {
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (params.seller.typeOf !== undefined) {
-                andConditions.push({
-                    'seller.typeOf': {
-                        $exists: true,
-                        $eq: params.seller.typeOf
-                    }
-                });
-            }
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (Array.isArray(params.seller.ids)) {
-                andConditions.push({
-                    'seller.id': {
-                        $exists: true,
-                        $in: params.seller.ids
-                    }
-                });
-            }
+        const providerIdEq = (_h = (_g = params.provider) === null || _g === void 0 ? void 0 : _g.id) === null || _h === void 0 ? void 0 : _h.$eq;
+        if (typeof providerIdEq === 'string') {
+            andConditions.push({ 'seller.id': { $exists: true, $eq: providerIdEq } });
+        }
+        const sellerIdEq = (_k = (_j = params.seller) === null || _j === void 0 ? void 0 : _j.id) === null || _k === void 0 ? void 0 : _k.$eq;
+        if (typeof sellerIdEq === 'string') {
+            andConditions.push({ 'seller.id': { $exists: true, $eq: sellerIdEq } });
+        }
+        const sellerIds = (_l = params.seller) === null || _l === void 0 ? void 0 : _l.ids;
+        if (Array.isArray(sellerIds)) {
+            andConditions.push({ 'seller.id': { $exists: true, $in: sellerIds } });
         }
-        const brokerIdEq = (_f = (_e = params.broker) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$eq;
+        if (typeof ((_m = params.seller) === null || _m === void 0 ? void 0 : _m.typeOf) === 'string') {
+            andConditions.push({ 'seller.typeOf': { $exists: true, $eq: params.seller.typeOf } });
+        }
+        const brokerIdEq = (_p = (_o = params.broker) === null || _o === void 0 ? void 0 : _o.id) === null || _p === void 0 ? void 0 : _p.$eq;
         if (typeof brokerIdEq === 'string') {
             andConditions.push({
                 'broker.id': {
@@ -320,7 +302,7 @@ class MongoRepository {
                 }
             }
         }
-        const nameEq = (_g = params.name) === null || _g === void 0 ? void 0 : _g.$eq;
+        const nameEq = (_q = params.name) === null || _q === void 0 ? void 0 : _q.$eq;
         if (typeof nameEq === 'string') {
             andConditions.push({
                 name: {
@@ -329,7 +311,7 @@ class MongoRepository {
                 }
             });
         }
-        const nameRegex = (_h = params.name) === null || _h === void 0 ? void 0 : _h.$regex;
+        const nameRegex = (_r = params.name) === null || _r === void 0 ? void 0 : _r.$regex;
         if (typeof nameRegex === 'string' && nameRegex.length > 0) {
             andConditions.push({
                 name: {
@@ -362,7 +344,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedIdentifierIn = (_l = (_k = (_j = params.acceptedOffers) === null || _j === void 0 ? void 0 : _j.itemOffered) === null || _k === void 0 ? void 0 : _k.identifier) === null || _l === void 0 ? void 0 : _l.$in;
+        const itemOfferedIdentifierIn = (_u = (_t = (_s = params.acceptedOffers) === null || _s === void 0 ? void 0 : _s.itemOffered) === null || _t === void 0 ? void 0 : _t.identifier) === null || _u === void 0 ? void 0 : _u.$in;
         if (Array.isArray(itemOfferedIdentifierIn)) {
             andConditions.push({
                 'acceptedOffers.itemOffered.identifier': {
@@ -371,7 +353,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedTypeOfIn = (_p = (_o = (_m = params.acceptedOffers) === null || _m === void 0 ? void 0 : _m.itemOffered) === null || _o === void 0 ? void 0 : _o.typeOf) === null || _p === void 0 ? void 0 : _p.$in;
+        const itemOfferedTypeOfIn = (_x = (_w = (_v = params.acceptedOffers) === null || _v === void 0 ? void 0 : _v.itemOffered) === null || _w === void 0 ? void 0 : _w.typeOf) === null || _x === void 0 ? void 0 : _x.$in;
         if (Array.isArray(itemOfferedTypeOfIn)) {
             andConditions.push({
                 'acceptedOffers.itemOffered.typeOf': {
@@ -380,7 +362,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedIssuedThroughTypeOfEq = (_t = (_s = (_r = (_q = params.acceptedOffers) === null || _q === void 0 ? void 0 : _q.itemOffered) === null || _r === void 0 ? void 0 : _r.issuedThrough) === null || _s === void 0 ? void 0 : _s.typeOf) === null || _t === void 0 ? void 0 : _t.$eq;
+        const itemOfferedIssuedThroughTypeOfEq = (_1 = (_0 = (_z = (_y = params.acceptedOffers) === null || _y === void 0 ? void 0 : _y.itemOffered) === null || _z === void 0 ? void 0 : _z.issuedThrough) === null || _0 === void 0 ? void 0 : _0.typeOf) === null || _1 === void 0 ? void 0 : _1.$eq;
         if (typeof itemOfferedIssuedThroughTypeOfEq === 'string') {
             andConditions.push({
                 'acceptedOffers.itemOffered.issuedThrough.typeOf': {
@@ -389,7 +371,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedIssuedThroughIdIn = (_x = (_w = (_v = (_u = params.acceptedOffers) === null || _u === void 0 ? void 0 : _u.itemOffered) === null || _v === void 0 ? void 0 : _v.issuedThrough) === null || _w === void 0 ? void 0 : _w.id) === null || _x === void 0 ? void 0 : _x.$in;
+        const itemOfferedIssuedThroughIdIn = (_5 = (_4 = (_3 = (_2 = params.acceptedOffers) === null || _2 === void 0 ? void 0 : _2.itemOffered) === null || _3 === void 0 ? void 0 : _3.issuedThrough) === null || _4 === void 0 ? void 0 : _4.id) === null || _5 === void 0 ? void 0 : _5.$in;
         if (Array.isArray(itemOfferedIssuedThroughIdIn)) {
             andConditions.push({
                 'acceptedOffers.itemOffered.issuedThrough.id': {
@@ -398,7 +380,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedProgramMembershipUsedIdentifierEq = (_1 = (_0 = (_z = (_y = params.acceptedOffers) === null || _y === void 0 ? void 0 : _y.itemOffered) === null || _z === void 0 ? void 0 : _z.programMembershipUsed) === null || _0 === void 0 ? void 0 : _0.identifier) === null || _1 === void 0 ? void 0 : _1.$eq;
+        const itemOfferedProgramMembershipUsedIdentifierEq = (_9 = (_8 = (_7 = (_6 = params.acceptedOffers) === null || _6 === void 0 ? void 0 : _6.itemOffered) === null || _7 === void 0 ? void 0 : _7.programMembershipUsed) === null || _8 === void 0 ? void 0 : _8.identifier) === null || _9 === void 0 ? void 0 : _9.$eq;
         if (typeof itemOfferedProgramMembershipUsedIdentifierEq === 'string') {
             andConditions.push({
                 'acceptedOffers.itemOffered.programMembershipUsed.identifier': {
@@ -407,7 +389,7 @@ class MongoRepository {
                 }
             });
         }
-        const itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq = (_7 = (_6 = (_5 = (_4 = (_3 = (_2 = params.acceptedOffers) === null || _2 === void 0 ? void 0 : _2.itemOffered) === null || _3 === void 0 ? void 0 : _3.programMembershipUsed) === null || _4 === void 0 ? void 0 : _4.issuedThrough) === null || _5 === void 0 ? void 0 : _5.serviceType) === null || _6 === void 0 ? void 0 : _6.codeValue) === null || _7 === void 0 ? void 0 : _7.$eq;
+        const itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq = (_15 = (_14 = (_13 = (_12 = (_11 = (_10 = params.acceptedOffers) === null || _10 === void 0 ? void 0 : _10.itemOffered) === null || _11 === void 0 ? void 0 : _11.programMembershipUsed) === null || _12 === void 0 ? void 0 : _12.issuedThrough) === null || _13 === void 0 ? void 0 : _13.serviceType) === null || _14 === void 0 ? void 0 : _14.codeValue) === null || _15 === void 0 ? void 0 : _15.$eq;
         if (typeof itemOfferedProgramMembershipUsedIssuedThroughServiceTypeCodeValueEq === 'string') {
             andConditions.push({
                 'acceptedOffers.itemOffered.programMembershipUsed.issuedThrough.serviceType.codeValue': {
@@ -603,7 +585,7 @@ class MongoRepository {
                 });
             }
         }
-        const paymentMethodAdditionalPropertyAll = (_9 = (_8 = params.paymentMethods) === null || _8 === void 0 ? void 0 : _8.additionalProperty) === null || _9 === void 0 ? void 0 : _9.$all;
+        const paymentMethodAdditionalPropertyAll = (_17 = (_16 = params.paymentMethods) === null || _16 === void 0 ? void 0 : _16.additionalProperty) === null || _17 === void 0 ? void 0 : _17.$all;
         if (Array.isArray(paymentMethodAdditionalPropertyAll)) {
             andConditions.push({
                 'paymentMethods.additionalProperty': {
@@ -612,7 +594,7 @@ class MongoRepository {
                 }
             });
         }
-        const paymentMethodAdditionalPropertyIn = (_11 = (_10 = params.paymentMethods) === null || _10 === void 0 ? void 0 : _10.additionalProperty) === null || _11 === void 0 ? void 0 : _11.$in;
+        const paymentMethodAdditionalPropertyIn = (_19 = (_18 = params.paymentMethods) === null || _18 === void 0 ? void 0 : _18.additionalProperty) === null || _19 === void 0 ? void 0 : _19.$in;
         if (Array.isArray(paymentMethodAdditionalPropertyIn)) {
             andConditions.push({
                 'paymentMethods.additionalProperty': {
@@ -696,8 +678,9 @@ class MongoRepository {
     changeStatus(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.orderModel.findOneAndUpdate({
-                orderNumber: params.orderNumber,
-                orderStatus: params.previousOrderStatus
+                orderNumber: { $eq: params.orderNumber },
+                orderStatus: { $eq: params.previousOrderStatus },
+                'project.id': { $eq: params.project.id }
             }, { orderStatus: params.orderStatus }, {
                 new: true,
                 projection: {
@@ -711,6 +694,7 @@ class MongoRepository {
             if (doc === null) {
                 const order = yield this.findByOrderNumber({
                     orderNumber: params.orderNumber,
+                    project: { id: params.project.id },
                     inclusion: [],
                     exclusion: []
                 });
@@ -735,8 +719,9 @@ class MongoRepository {
     returnOrder(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.orderModel.findOneAndUpdate({
-                orderNumber: params.orderNumber,
-                orderStatus: factory.orderStatus.OrderDelivered
+                orderNumber: { $eq: params.orderNumber },
+                orderStatus: { $eq: factory.orderStatus.OrderDelivered },
+                'project.id': { $eq: params.project.id }
             }, {
                 orderStatus: factory.orderStatus.OrderReturned,
                 dateReturned: params.dateReturned,
@@ -754,6 +739,7 @@ class MongoRepository {
             if (doc === null) {
                 const order = yield this.findByOrderNumber({
                     orderNumber: params.orderNumber,
+                    project: { id: params.project.id },
                     inclusion: [],
                     exclusion: []
                 });
@@ -777,7 +763,10 @@ class MongoRepository {
      */
     updateChangeableAttributes(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.orderModel.findOneAndUpdate({ orderNumber: { $eq: params.orderNumber } }, {
+            const doc = yield this.orderModel.findOneAndUpdate({
+                orderNumber: { $eq: params.orderNumber },
+                'project.id': { $eq: params.project.id }
+            }, {
                 $set: Object.assign(Object.assign({}, (Array.isArray(params.additionalProperty)) ? { additionalProperty: params.additionalProperty } : undefined), (typeof params.name === 'string') ? { name: params.name } : undefined)
             }, {
                 new: true,
@@ -844,7 +833,10 @@ class MongoRepository {
                     });
                 }
             }
-            const doc = yield this.orderModel.findOne({ orderNumber: params.orderNumber }, projection)
+            const doc = yield this.orderModel.findOne({
+                orderNumber: { $eq: params.orderNumber },
+                'project.id': { $eq: params.project.id }
+            }, projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.orderModel.modelName);
@@ -853,6 +845,7 @@ class MongoRepository {
         });
     }
     findByOrderNumberAndReservationId(params) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const projection = {
                 orderStatus: 1,
@@ -860,15 +853,14 @@ class MongoRepository {
                 orderNumber: 1,
                 _id: 0
             };
-            const doc = yield this.orderModel.findOne({
-                orderNumber: { $eq: params.orderNumber },
-                acceptedOffers: {
+            const doc = yield this.orderModel.findOne(Object.assign({ orderNumber: { $eq: params.orderNumber }, 'project.id': { $eq: params.project.id }, acceptedOffers: {
                     $elemMatch: {
                         'itemOffered.typeOf': { $in: [factory.reservationType.BusReservation, factory.reservationType.EventReservation] },
                         'itemOffered.id': { $eq: params.reservationId }
                     }
-                }
-            }, projection)
+                } }, (typeof ((_a = params.seller) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+                ? { 'seller.id': { $exists: true, $eq: params.seller.id } }
+                : undefined), projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.orderModel.modelName);