@chevre/domain 23.2.0-alpha.22 → 23.2.0-alpha.23

package/example/src/chevre/place/upsertSeatSectionsByBranchCode.ts

@@ -0,0 +1,56 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+import { chevre } from '../../../../lib/index';
+
+const project = { typeOf: chevre.factory.organizationType.Project, id: String(process.env.PROJECT_ID) };
+const movieTheaterId = '5bfb841d5a78d7948369979a';
+const sellerId = '59d20831e53ebc2b4e774466';
+const roomCode = '10';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const sectionRepo = await chevre.repository.place.Section.createInstance(mongoose.connection);
+
+    let result = await sectionRepo.addSeatSectionsByBranchCodeIfNotExist(
+        [
+            {
+                $set: {
+                    branchCode: 'SAMPLE',
+                    name: { ja: 'sampleNameJa', en: 'from samples' },
+                    additionalProperty: []
+                }
+            }
+        ],
+        {
+            project: { id: project.id },
+            movieTheaterId,
+            parentOrganization: { id: sellerId },
+            roomCode
+        }
+    );
+    console.log(result);
+
+    result = await sectionRepo.updateSeatSectionsByBranchCode(
+        [
+            {
+                $set: {
+                    branchCode: 'SAMPLE',
+                    name: { ja: 'sampleNameJaxxx', en: 'from samples' },
+                    additionalProperty: []
+                }
+            }
+        ],
+        {
+            project: { id: project.id },
+            movieTheaterId,
+            parentOrganization: { id: sellerId },
+            roomCode
+        }
+    );
+    console.log(result);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -1,9 +1,13 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import * as factory from '../../../factory';
-type IDocType = factory.place.screeningRoom.IPlace & {
+type ISeatSection = Pick<factory.place.screeningRoomSection.IPlace, 'additionalProperty' | 'branchCode' | 'name' | 'typeOf'> & {
+    containsPlace?: factory.place.seat.IPlace[];
+};
+type IDocType = Omit<factory.place.screeningRoom.IPlace, 'containsPlace'> & {
     description?: any;
     openingHoursSpecification?: any;
     smokingAllowed?: boolean;
+    containsPlace: ISeatSection[];
 };
 type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;

package/lib/chevre/repo/place/screeningRoom.d.ts

@@ -124,16 +124,22 @@ export declare class ScreeningRoomRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocType> & import("@chevre/factory/lib/place/screeningRoom").IPlace & {
+    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocType> & Omit<import("@chevre/factory/lib/place/screeningRoom").IPlace, "containsPlace"> & {
         description?: any;
         openingHoursSpecification?: any;
         smokingAllowed?: boolean;
+        containsPlace: (Pick<import("@chevre/factory/lib/place/screeningRoomSection").IPlace, "name" | "typeOf" | "additionalProperty" | "branchCode"> & {
+            containsPlace?: factory.place.seat.IPlace[];
+        })[];
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, IDocType> & import("@chevre/factory/lib/place/screeningRoom").IPlace & {
+    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, IDocType> & Omit<import("@chevre/factory/lib/place/screeningRoom").IPlace, "containsPlace"> & {
         description?: any;
         openingHoursSpecification?: any;
         smokingAllowed?: boolean;
+        containsPlace: (Pick<import("@chevre/factory/lib/place/screeningRoomSection").IPlace, "name" | "typeOf" | "additionalProperty" | "branchCode"> & {
+            containsPlace?: factory.place.seat.IPlace[];
+        })[];
     } & {
         _id: import("mongoose").Types.ObjectId;
     }>>;

package/lib/chevre/repo/place/section.d.ts

@@ -1,3 +1,4 @@
+import type { BulkWriteResult } from 'mongodb';
 import type { Connection, PipelineStage } from 'mongoose';
 import * as factory from '../../factory';
 type IScreeningRoomSectionWithoutContainsPlace = Omit<factory.place.screeningRoomSection.IPlace, 'containsPlace'>;
@@ -25,6 +26,17 @@ interface IUpdateSectionResult {
     };
     typeOf: factory.placeType.ScreeningRoom;
 }
+type IUpsertingSeatSection = Pick<factory.place.screeningRoomSection.IPlace, 'additionalProperty' | 'branchCode' | 'name'>;
+interface IUpsertOptions {
+    project: {
+        id: string;
+    };
+    parentOrganization?: {
+        id?: string;
+    };
+    movieTheaterId: string;
+    roomCode: string;
+}
 /**
  * セクションリポジトリ
  */
@@ -39,9 +51,21 @@ export declare class SectionRepo {
      */
     updateSectionByBranchCode(screeningRoomSection: ICreatingSection, $unset: any, options: IUpdateOptions): Promise<IUpdateSectionResult>;
     /**
-     * セクションの座席を上書きする
+     * コードをキーにして冪等追加
+     */
+    addSeatSectionsByBranchCodeIfNotExist(params: {
+        $set: IUpsertingSeatSection;
+    }[], options: IUpsertOptions): Promise<{
+        bulkWriteResult?: BulkWriteResult;
+    }>;
+    /**
+     * コードをキーにして冪等編集
      */
-    overwriteSeats(screeningRoomSection: Pick<factory.place.screeningRoomSection.IPlace, 'branchCode' | 'containsPlace'>, options: IUpdateOptions): Promise<IUpdateSectionResult>;
+    updateSeatSectionsByBranchCode(params: {
+        $set: IUpsertingSeatSection;
+    }[], options: IUpsertOptions): Promise<{
+        bulkWriteResult?: BulkWriteResult;
+    }>;
     migrateSectionIdentifier(screeningRoomSection: {
         project: {
             id: string;

package/lib/chevre/repo/place/section.js

@@ -8,6 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SectionRepo = void 0;
 const factory = require("../../factory");
@@ -192,38 +203,153 @@ class SectionRepo {
         });
     }
     /**
-     * セクションの座席を上書きする
+     * コードをキーにして冪等追加
      */
-    // tslint:disable-next-line:max-func-body-length
-    overwriteSeats(screeningRoomSection, options) {
+    addSeatSectionsByBranchCodeIfNotExist(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { project, parentOrganization, movieTheaterCode, roomCode } = options;
-            const { containsPlace } = screeningRoomSection;
-            if (!Array.isArray(containsPlace)) {
-                throw new factory.errors.ArgumentNull('containsPlace');
+            const { project, parentOrganization, movieTheaterId, roomCode } = options;
+            // ルーム存在確認
+            const roomDoc = yield this.placeModel.findOne(Object.assign({ typeOf: { $eq: factory.placeType.ScreeningRoom }, 'project.id': { $eq: project.id }, 'containedInPlace.id': { $eq: movieTheaterId }, branchCode: { $eq: roomCode } }, (typeof (parentOrganization === null || parentOrganization === void 0 ? void 0 : parentOrganization.id) === 'string')
+                ? { 'parentOrganization.id': { $exists: true, $eq: parentOrganization.id } }
+                : undefined), { _id: 1 })
+                .lean()
+                .exec();
+            if (roomDoc === null) {
+                throw new factory.errors.NotFound(factory.placeType.ScreeningRoom);
             }
-            const doc = yield this.placeModel.findOneAndUpdate(Object.assign({ typeOf: { $eq: factory.placeType.ScreeningRoom }, 'project.id': { $eq: project.id }, 'containedInPlace.branchCode': { $exists: true, $eq: movieTheaterCode }, branchCode: { $eq: roomCode }, 'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode } }, (typeof (parentOrganization === null || parentOrganization === void 0 ? void 0 : parentOrganization.id) === 'string')
+            // console.log('roomDoc:', roomDoc);
+            const bulkWriteOps = [];
+            if (Array.isArray(params)) {
+                params.forEach(({ $set }) => {
+                    var _a, _b;
+                    const { branchCode } = $set, setFields = __rest($set, ["branchCode"]);
+                    const filter = {
+                        typeOf: { $eq: factory.placeType.ScreeningRoom },
+                        'project.id': { $eq: project.id },
+                        _id: { $eq: roomDoc._id },
+                        'containsPlace.branchCode': { $ne: branchCode } // セクションコードが存在しなければ追加する
+                    };
+                    const pushingSeatSection = Object.assign(Object.assign({ typeOf: factory.placeType.ScreeningRoomSection, branchCode }, (typeof ((_a = setFields.name) === null || _a === void 0 ? void 0 : _a.ja) === 'string' || typeof ((_b = setFields.name) === null || _b === void 0 ? void 0 : _b.en) === 'string')
+                        ? { name: setFields.name }
+                        : undefined), (Array.isArray(setFields.additionalProperty)) ? { additionalProperty: setFields.additionalProperty } : undefined);
+                    const update = {
+                        $push: { containsPlace: pushingSeatSection }
+                    };
+                    const updateOne = { filter, update };
+                    bulkWriteOps.push({ updateOne });
+                });
+            }
+            if (bulkWriteOps.length > 0) {
+                const bulkWriteResult = yield this.placeModel.bulkWrite(bulkWriteOps, { ordered: false });
+                return { bulkWriteResult };
+            }
+            return {};
+        });
+    }
+    /**
+     * コードをキーにして冪等編集
+     */
+    updateSeatSectionsByBranchCode(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { project, parentOrganization, movieTheaterId, roomCode } = options;
+            // ルーム存在確認
+            const roomDoc = yield this.placeModel.findOne(Object.assign({ typeOf: { $eq: factory.placeType.ScreeningRoom }, 'project.id': { $eq: project.id }, 'containedInPlace.id': { $eq: movieTheaterId }, branchCode: { $eq: roomCode } }, (typeof (parentOrganization === null || parentOrganization === void 0 ? void 0 : parentOrganization.id) === 'string')
                 ? { 'parentOrganization.id': { $exists: true, $eq: parentOrganization.id } }
-                : undefined), Object.assign({}, (containsPlace.length > 0)
-                ? {
-                    'containsPlace.$[screeningRoomSection].containsPlace': containsPlace.map((p) => {
-                        return Object.assign(Object.assign(Object.assign({ typeOf: p.typeOf, branchCode: p.branchCode }, (p.name !== undefined && p.name !== null) ? { name: p.name } : undefined), (Array.isArray(p.seatingType)) ? { seatingType: p.seatingType } : undefined), (Array.isArray(p.additionalProperty)) ? { additionalProperty: p.additionalProperty } : undefined);
-                    })
-                }
-                : undefined), {
-                new: true,
-                arrayFilters: [
-                    { 'screeningRoomSection.branchCode': screeningRoomSection.branchCode }
-                ],
-                projection: { 'containedInPlace.id': 1, typeOf: 1 }
-            })
+                : undefined), { _id: 1 })
+                .lean()
                 .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(factory.placeType.ScreeningRoomSection);
+            if (roomDoc === null) {
+                throw new factory.errors.NotFound(factory.placeType.ScreeningRoom);
             }
-            return doc.toObject();
+            const bulkWriteOps = [];
+            if (Array.isArray(params)) {
+                params.forEach(({ $set }) => {
+                    const { branchCode } = $set, setFields = __rest($set, ["branchCode"]);
+                    // セクションの存在するドキュメントでフィルター
+                    const filter = {
+                        typeOf: { $eq: factory.placeType.ScreeningRoom },
+                        'project.id': { $eq: project.id },
+                        _id: { $eq: roomDoc._id },
+                        'containsPlace.branchCode': { $eq: branchCode }
+                    };
+                    const update = {
+                        // 限られた属性のみ更新する
+                        $set: Object.assign(Object.assign({}, (setFields.name !== undefined && setFields.name !== null)
+                            ? { 'containsPlace.$[seatSection].name': setFields.name }
+                            : undefined), (Array.isArray(setFields.additionalProperty))
+                            ? { 'containsPlace.$[seatSection].additionalProperty': setFields.additionalProperty }
+                            : undefined)
+                        // $unset: {}
+                    };
+                    const arrayFilters = [
+                        { 'seatSection.branchCode': branchCode }
+                    ];
+                    const updateOne = { filter, update, arrayFilters };
+                    bulkWriteOps.push({ updateOne });
+                });
+            }
+            if (bulkWriteOps.length > 0) {
+                const bulkWriteResult = yield this.placeModel.bulkWrite(bulkWriteOps, { ordered: false });
+                return { bulkWriteResult };
+            }
+            return {};
         });
     }
+    // /**
+    //  * セクションの座席を上書きする
+    //  */
+    // // tslint:disable-next-line:max-func-body-length
+    // public async overwriteSeats(
+    //     screeningRoomSection: Pick<factory.place.screeningRoomSection.IPlace, 'branchCode' | 'containsPlace'>,
+    //     options: IUpdateOptions
+    // ): Promise<IUpdateSectionResult> {
+    //     const { project, parentOrganization, movieTheaterCode, roomCode } = options;
+    //     const { containsPlace } = screeningRoomSection;
+    //     if (!Array.isArray(containsPlace)) {
+    //         throw new factory.errors.ArgumentNull('containsPlace');
+    //     }
+    //     const doc = await this.placeModel.findOneAndUpdate<HydratedDocument<IUpdateSectionResult>>(
+    //         {
+    //             typeOf: { $eq: factory.placeType.ScreeningRoom },
+    //             'project.id': { $eq: project.id },
+    //             'containedInPlace.branchCode': { $exists: true, $eq: movieTheaterCode },
+    //             branchCode: { $eq: roomCode },
+    //             'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode },
+    //             ...(typeof parentOrganization?.id === 'string')
+    //                 ? { 'parentOrganization.id': { $exists: true, $eq: parentOrganization.id } }
+    //                 : undefined
+    //         },
+    //         {
+    //             // 座席リストが1つ以上指定された場合のみ、上書きする
+    //             ...(containsPlace.length > 0)
+    //                 ? {
+    //                     'containsPlace.$[screeningRoomSection].containsPlace':
+    //                         containsPlace.map((p) => {
+    //                             return {
+    //                                 typeOf: p.typeOf,
+    //                                 branchCode: p.branchCode,
+    //                                 ...(p.name !== undefined && p.name !== null) ? { name: p.name } : undefined,
+    //                                 ...(Array.isArray(p.seatingType)) ? { seatingType: p.seatingType } : undefined,
+    //                                 ...(Array.isArray(p.additionalProperty)) ? { additionalProperty: p.additionalProperty } : undefined
+    //                             };
+    //                         })
+    //                 }
+    //                 : undefined
+    //         },
+    //         {
+    //             new: true,
+    //             arrayFilters: [
+    //                 { 'screeningRoomSection.branchCode': screeningRoomSection.branchCode }
+    //             ],
+    //             projection: { 'containedInPlace.id': 1, typeOf: 1 }
+    //         }
+    //     )
+    //         .exec();
+    //     if (doc === null) {
+    //         throw new factory.errors.NotFound(factory.placeType.ScreeningRoomSection);
+    //     }
+    //     return doc.toObject();
+    // }
     // tslint:disable-next-line:max-func-body-length
     migrateSectionIdentifier(screeningRoomSection) {
         return __awaiter(this, void 0, void 0, function* () {

package/package.json

@@ -116,5 +116,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.2.0-alpha.22"
+  "version": "23.2.0-alpha.23"
 }