@chevre/domain 21.0.0-alpha.13 → 21.0.0-alpha.15

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

@@ -105,6 +105,12 @@ export declare class MongoRepository {
             name: string;
         };
     }[]): Promise<BulkWriteOpResultObject | void>;
+    /**
+     * コンテンツ+バージョンをキーにして、なければ作成する(複数対応)
+     */
+    createScreeningEventSeriesIfNotExistByWorkPerformed(params: {
+        attributes: factory.event.IAttributes<factory.eventType.ScreeningEventSeries>;
+    }[]): Promise<BulkWriteOpResultObject | void>;
     /**
      * イベント部分更新
      */

package/lib/chevre/repo/event.js

@@ -25,6 +25,7 @@ const uniqid = require("uniqid");
 const factory = require("../factory");
 const onIndexCreated_1 = require("./mongoose/onIndexCreated");
 const event_1 = require("./mongoose/schemas/event");
+const errorHandler_1 = require("../errorHandler");
 exports.PROJECTION_MINIMIZED_EVENT = {
     project: 1,
     _id: 1,
@@ -53,7 +54,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;
+        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;
         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') {
@@ -400,13 +401,16 @@ class MongoRepository {
                 /* istanbul ignore else */
                 if (Array.isArray(workPerformedIdentifierIn)) {
                     andConditions.push({
-                        'workPerformed.identifier': {
-                            $exists: true,
-                            $in: workPerformedIdentifierIn
-                        }
+                        '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;
+                if (typeof workPerformedVersionEq === 'string') {
+                    andConditions.push({
+                        'workPerformed.version': { $exists: true, $eq: workPerformedVersionEq }
                     });
                 }
-                const videoFormatTypeOfEq = (_29 = (_28 = params.videoFormat) === null || _28 === void 0 ? void 0 : _28.typeOf) === null || _29 === void 0 ? void 0 : _29.$eq;
+                const videoFormatTypeOfEq = (_31 = (_30 = params.videoFormat) === null || _30 === void 0 ? void 0 : _30.typeOf) === null || _31 === void 0 ? void 0 : _31.$eq;
                 if (typeof videoFormatTypeOfEq === 'string') {
                     andConditions.push({
                         'videoFormat.typeOf': {
@@ -415,7 +419,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const videoFormatTypeOfIn = (_31 = (_30 = params.videoFormat) === null || _30 === void 0 ? void 0 : _30.typeOf) === null || _31 === void 0 ? void 0 : _31.$in;
+                const videoFormatTypeOfIn = (_33 = (_32 = params.videoFormat) === null || _32 === void 0 ? void 0 : _32.typeOf) === null || _33 === void 0 ? void 0 : _33.$in;
                 if (Array.isArray(videoFormatTypeOfIn)) {
                     andConditions.push({
                         'videoFormat.typeOf': {
@@ -424,7 +428,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const soundFormatTypeOfEq = (_33 = (_32 = params.soundFormat) === null || _32 === void 0 ? void 0 : _32.typeOf) === null || _33 === void 0 ? void 0 : _33.$eq;
+                const soundFormatTypeOfEq = (_35 = (_34 = params.soundFormat) === null || _34 === void 0 ? void 0 : _34.typeOf) === null || _35 === void 0 ? void 0 : _35.$eq;
                 if (typeof soundFormatTypeOfEq === 'string') {
                     andConditions.push({
                         'soundFormat.typeOf': {
@@ -433,7 +437,7 @@ class MongoRepository {
                         }
                     });
                 }
-                const soundFormatTypeOfIn = (_35 = (_34 = params.soundFormat) === null || _34 === void 0 ? void 0 : _34.typeOf) === null || _35 === void 0 ? void 0 : _35.$in;
+                const soundFormatTypeOfIn = (_37 = (_36 = params.soundFormat) === null || _36 === void 0 ? void 0 : _36.typeOf) === null || _37 === void 0 ? void 0 : _37.$in;
                 if (Array.isArray(soundFormatTypeOfIn)) {
                     andConditions.push({
                         'soundFormat.typeOf': {
@@ -452,9 +456,20 @@ class MongoRepository {
      */
     createMany(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const docs = yield this.eventModel.insertMany(params.attributes.map((p) => {
-                return Object.assign({ _id: uniqid() }, p);
-            }));
+            let docs;
+            try {
+                docs = yield this.eventModel.insertMany(params.attributes.map((p) => {
+                    return Object.assign({ _id: uniqid() }, p);
+                }));
+            }
+            catch (error) {
+                if ((0, errorHandler_1.isMongoError)(error)) {
+                    if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {
+                        throw new factory.errors.AlreadyInUse(factory.eventType.ScreeningEventSeries, ['workPerformed.version']);
+                    }
+                }
+                throw error;
+            }
             if (params.expectsNoContent) {
                 return;
             }
@@ -482,6 +497,8 @@ class MongoRepository {
                         updateOne: {
                             filter: {
                                 typeOf: creatingEventParams.attributes.typeOf,
+                                // 追加特性をキーにした冪等イベント作成時のfilterにproject.idを追加(2023-04-06~)
+                                'project.id': { $eq: creatingEventParams.attributes.project.id },
                                 // 追加特性をキーに更新
                                 additionalProperty: {
                                     $exists: true,
@@ -503,6 +520,52 @@ class MongoRepository {
             }
         });
     }
+    /**
+     * コンテンツ+バージョンをキーにして、なければ作成する(複数対応)
+     */
+    createScreeningEventSeriesIfNotExistByWorkPerformed(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const bulkWriteOps = [];
+            if (Array.isArray(params)) {
+                params.forEach((creatingEventParams) => {
+                    const version = creatingEventParams.attributes.workPerformed.version;
+                    if (typeof version !== 'string') {
+                        throw new factory.errors.ArgumentNull('workPerformed.version');
+                    }
+                    const setOnInsertFields = creatingEventParams.attributes;
+                    bulkWriteOps.push({
+                        updateOne: {
+                            filter: {
+                                typeOf: creatingEventParams.attributes.typeOf,
+                                'project.id': { $eq: creatingEventParams.attributes.project.id },
+                                'location.branchCode': {
+                                    $exists: true,
+                                    $eq: creatingEventParams.attributes.location.branchCode
+                                },
+                                'workPerformed.identifier': {
+                                    $exists: true,
+                                    $eq: creatingEventParams.attributes.workPerformed.identifier
+                                },
+                                'workPerformed.version': {
+                                    $exists: true,
+                                    $eq: version
+                                }
+                            },
+                            update: {
+                                $setOnInsert: Object.assign(Object.assign({}, setOnInsertFields), { _id: uniqid() })
+                                // 変更可能な属性のみ上書き
+                                // $set: {}
+                            },
+                            upsert: true
+                        }
+                    });
+                });
+            }
+            if (bulkWriteOps.length > 0) {
+                return this.eventModel.bulkWrite(bulkWriteOps, { ordered: false });
+            }
+        });
+    }
     /**
      * イベント部分更新
      */
@@ -529,21 +592,31 @@ class MongoRepository {
     save(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let doc;
-            if (params.id === undefined) {
-                const id = uniqid();
-                doc = yield this.eventModel.create(Object.assign(Object.assign({}, params.attributes), { _id: id }));
+            try {
+                if (params.id === undefined) {
+                    const id = uniqid();
+                    doc = yield this.eventModel.create(Object.assign(Object.assign({}, params.attributes), { _id: id }));
+                }
+                else {
+                    const upsert = params.upsert === true;
+                    // 上書き禁止属性を除外(2022-08-24~)
+                    const _a = params.attributes, { identifier, project, typeOf } = _a, updateFields = __rest(_a, ["identifier", "project", "typeOf"]);
+                    doc = yield this.eventModel.findOneAndUpdate({
+                        _id: params.id,
+                        typeOf: params.attributes.typeOf
+                    }, Object.assign({ $setOnInsert: Object.assign(Object.assign({ typeOf: params.attributes.typeOf }, (params.attributes.project !== undefined)
+                            ? { project: params.attributes.project } : undefined), (params.attributes.identifier !== undefined)
+                            ? { identifier: params.attributes.identifier } : undefined), $set: updateFields }, (params.$unset !== undefined) ? { $unset: params.$unset } : undefined), { upsert, new: true })
+                        .exec();
+                }
             }
-            else {
-                const upsert = params.upsert === true;
-                // 上書き禁止属性を除外(2022-08-24~)
-                const _a = params.attributes, { identifier, project, typeOf } = _a, updateFields = __rest(_a, ["identifier", "project", "typeOf"]);
-                doc = yield this.eventModel.findOneAndUpdate({
-                    _id: params.id,
-                    typeOf: params.attributes.typeOf
-                }, Object.assign({ $setOnInsert: Object.assign(Object.assign({ typeOf: params.attributes.typeOf }, (params.attributes.project !== undefined)
-                        ? { project: params.attributes.project } : undefined), (params.attributes.identifier !== undefined)
-                        ? { identifier: params.attributes.identifier } : undefined), $set: updateFields }, (params.$unset !== undefined) ? { $unset: params.$unset } : undefined), { upsert, new: true })
-                    .exec();
+            catch (error) {
+                if ((0, errorHandler_1.isMongoError)(error)) {
+                    if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {
+                        throw new factory.errors.AlreadyInUse(factory.eventType.ScreeningEventSeries, ['workPerformed.version']);
+                    }
+                }
+                throw error;
             }
             if (doc === null) {
                 throw new factory.errors.NotFound(this.eventModel.modelName);

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.310.0-alpha.0",
+    "@chevre/factory": "4.310.0-alpha.1",
     "@cinerino/sdk": "3.153.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.0.0-alpha.13"
+  "version": "21.0.0-alpha.15"
 }