@chevre/domain 23.2.0-alpha.27 → 23.2.0-alpha.29

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

@@ -50,6 +50,12 @@ export declare class MovieTheaterRepo {
         };
     }[], options: IUpsertOptions): Promise<{
         bulkWriteResult?: BulkWriteResult;
+        /**
+         * 追加あるいは編集された施設
+         */
+        modifiedMovieTheaters: {
+            id: string;
+        }[];
     }>;
     /**
      * 施設のpublic属性検索

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

@@ -146,6 +146,7 @@ class MovieTheaterRepo {
         return __awaiter(this, void 0, void 0, function* () {
             const { project, sellerId } = options;
             const bulkWriteOps = [];
+            const queryFilters = [];
             if (Array.isArray(params)) {
                 params.forEach(({ $set, $unset }) => {
                     const { branchCode, hasEntranceGate, hasPOS } = $set, // 入場ゲート,POSを決して編集しないように
@@ -175,13 +176,27 @@ class MovieTheaterRepo {
                         upsert: true
                     };
                     bulkWriteOps.push({ updateOne });
+                    queryFilters.push({
+                        typeOf: { $eq: factory.placeType.MovieTheater },
+                        'project.id': { $eq: project.id },
+                        branchCode: { $eq: branchCode },
+                        // プロジェクトとコードでユニークな仕様だが、販売者も指定する -> 異なる販売者でコードが重複すればDuplicateErrorとなる
+                        'parentOrganization.id': { $exists: true, $eq: sellerId }
+                    });
                 });
             }
             if (bulkWriteOps.length > 0) {
                 const bulkWriteResult = yield this.civicStructureModel.bulkWrite(bulkWriteOps, { ordered: false });
-                return { bulkWriteResult };
+                // modifiedの場合upsertedIdsに含まれないので、idを検索する
+                const modifiedMovieTheaters = yield this.civicStructureModel.find({ $or: queryFilters }, {
+                    _id: 0,
+                    id: { $toString: '$_id' }
+                })
+                    .lean()
+                    .exec();
+                return { bulkWriteResult, modifiedMovieTheaters };
             }
-            return {};
+            return { modifiedMovieTheaters: [] };
         });
     }
     /**

package/lib/chevre/service/task/onResourceUpdated/onResourceDeleted.js

@@ -146,9 +146,14 @@ function deleteResourcesByScreeningEventSeries(params) {
 }
 function deleteResourcesByScreeningRoom(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // 現時点で、複数ルーム削除タスクは作成されない
+        const firstBranchCode = params.branchCode.at(0);
+        if (typeof firstBranchCode !== 'string') {
+            throw new factory.errors.ArgumentNull('branchCode');
+        }
         const deleteActionAttributes = {
             agent: { id: params.project.id, typeOf: factory.organizationType.Project },
-            object: { branchCode: params.branchCode, containedInPlace: params.containedInPlace, typeOf: factory.placeType.ScreeningRoom },
+            object: { branchCode: firstBranchCode, containedInPlace: params.containedInPlace, typeOf: factory.placeType.ScreeningRoom },
             project: { id: params.project.id, typeOf: factory.organizationType.Project },
             typeOf: factory.actionType.DeleteAction
         };
@@ -159,7 +164,7 @@ function deleteResourcesByScreeningRoom(params) {
             const deleteScreeningEventResult = yield repos.event.deleteManyEventsByScreeningRoom({
                 project: { id: params.project.id },
                 location: {
-                    branchCode: params.branchCode,
+                    branchCode: firstBranchCode,
                     containedInPlace: { id: params.containedInPlace.id }
                 }
             });

package/lib/chevre/service/task/onResourceUpdated.js

@@ -118,6 +118,10 @@ function onResourceUpdated(params) {
                             typeOf: params.typeOf
                         }, setting)(repos);
                         break;
+                    // ルーム通知に対応(2026-01-16~)
+                    case factory.placeType.ScreeningRoom:
+                        yield createInformRoomTasks(params, setting)(repos);
+                        break;
                     case 'AccountTitle':
                         yield createInformAccountTitleTasks({
                             project: { id: params.project.id },
@@ -488,6 +492,72 @@ function createInformMovieTheaterTasks(params, setting) {
         }
     });
 }
+// tslint:disable-next-line:max-func-body-length
+function createInformRoomTasks(params, setting) {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        // const informResources = settings.onResourceUpdated.informResource;
+        const informResources = (_a = setting === null || setting === void 0 ? void 0 : setting.onResourceUpdated) === null || _a === void 0 ? void 0 : _a.informResource;
+        if (Array.isArray(params.branchCode) && params.branchCode.length > 0) {
+            // ルームを検索
+            const rooms = (yield repos.screeningRoom.findRooms({
+                project: { id: { $eq: params.project.id } },
+                branchCode: { $in: params.branchCode },
+                containedInPlace: { id: { $eq: params.containedInPlace.id } }
+            }));
+            const rooms4inform = rooms.map((room) => {
+                return {
+                    branchCode: room.branchCode,
+                    name: room.name,
+                    typeOf: factory.placeType.ScreeningRoom,
+                    additionalProperty: room.additionalProperty,
+                    address: room.address,
+                    containedInPlace: { id: params.containedInPlace.id }
+                };
+            });
+            if (rooms4inform.length > 0) {
+                const taskRunsAt = new Date();
+                const informTasks = [];
+                informResources === null || informResources === void 0 ? void 0 : informResources.forEach((informResource) => {
+                    var _a;
+                    const informUrl = String((_a = informResource.recipient) === null || _a === void 0 ? void 0 : _a.url);
+                    rooms4inform.forEach((room4inform) => {
+                        var _a;
+                        const informActionAttributes = {
+                            object: room4inform,
+                            recipient: {
+                                id: '',
+                                name: String((_a = informResource.recipient) === null || _a === void 0 ? void 0 : _a.name),
+                                typeOf: factory.creativeWorkType.WebApplication
+                            },
+                            target: {
+                                httpMethod: 'POST',
+                                encodingType: factory.encodingFormat.Application.json,
+                                typeOf: 'EntryPoint',
+                                urlTemplate: informUrl
+                            }
+                        };
+                        informTasks.push({
+                            project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                            name: factory.taskName.TriggerWebhook,
+                            status: factory.taskStatus.Ready,
+                            runsAt: taskRunsAt,
+                            remainingNumberOfTries: 10,
+                            numberOfTried: 0,
+                            executionResults: [],
+                            data: informActionAttributes
+                        });
+                    });
+                });
+                if (informTasks.length > 0) {
+                    yield repos.task.saveMany(informTasks, { emitImmediately: true });
+                }
+            }
+        }
+    });
+}
 function createInformAccountTitleTasks(params, setting) {
     return (repos
     // settings: Settings

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "5.4.0-alpha.16",
+    "@chevre/factory": "5.4.0-alpha.18",
     "@cinerino/sdk": "12.13.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -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.27"
+  "version": "23.2.0-alpha.29"
 }