@chevre/domain 23.2.0-alpha.31 → 23.2.0-alpha.33

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

@@ -90,11 +90,11 @@ export declare class EventRepo {
          */
         update: boolean;
     }): Promise<{
-        bulkWriteResult: BulkWriteResult;
+        bulkWriteResult?: BulkWriteResult;
         modifiedEvents: {
             id: string;
         }[];
-    } | void>;
+    }>;
     /**
      * イベント部分更新
      */

package/lib/chevre/repo/event.js

@@ -344,15 +344,27 @@ class EventRepo {
             }
             if (bulkWriteOps.length > 0) {
                 const bulkWriteResult = yield this.eventModel.bulkWrite(bulkWriteOps, { ordered: false });
-                // modifiedの場合upsertedIdsに含まれないので、idを検索する
-                const modifiedEvents = yield this.eventModel.find({ $or: queryFilters }, {
-                    _id: 0,
-                    id: { $toString: '$_id' }
-                })
-                    .lean()
-                    .exec();
-                return { bulkWriteResult, modifiedEvents };
+                // update:falseの場合、upsertedIdsのみmodifiedEventsとして返せばよい(2026-01-16~)
+                if (!update) {
+                    // BulkWriteResult -> upsertedIds: { '0': '7iri6p4m54k0r3g' }
+                    return {
+                        bulkWriteResult,
+                        modifiedEvents: Object.values(bulkWriteResult.upsertedIds)
+                            .map((id) => ({ id: String(id) }))
+                    };
+                }
+                else {
+                    // modifiedの場合upsertedIdsに含まれないので、idを検索する
+                    const modifiedEvents = yield this.eventModel.find({ $or: queryFilters }, {
+                        _id: 0,
+                        id: { $toString: '$_id' }
+                    })
+                        .lean()
+                        .exec();
+                    return { bulkWriteResult, modifiedEvents };
+                }
             }
+            return { modifiedEvents: [] };
         });
     }
     /**

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

@@ -21,9 +21,18 @@ interface IUpdateOptions {
  * 施設の入場ゲートリポジトリ
  */
 export declare class EntranceGateRepo {
+    /**
+     * 施設
+     */
     private readonly operator;
     private readonly civicStructureModel;
     constructor(connection: Connection, operater: IOperator);
+    /**
+     * リポジトリの施設をセットする
+     */
+    setOperatorId(params: {
+        id: string;
+    }): void;
     findEntranceGates(params: factory.place.entranceGate.ISearchConditions): Promise<IEntranceGate[]>;
     addEntranceGatesByIdentifierIfNotExist(params: {
         $set: ICreatingEntranceGate;

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

@@ -22,6 +22,12 @@ class EntranceGateRepo {
         this.civicStructureModel = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
         this.operator = operater;
     }
+    /**
+     * リポジトリの施設をセットする
+     */
+    setOperatorId(params) {
+        this.operator.id = params.id;
+    }
     findEntranceGates(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const aggregate = this.civicStructureModel.aggregate([

package/lib/chevre/service/task/onResourceUpdated.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.call = call;
 const factory = require("../../factory");
@@ -24,6 +35,7 @@ const unitPriceInCatalog_1 = require("../../repo/offer/unitPriceInCatalog");
 const offerCatalog_1 = require("../../repo/offerCatalog");
 const offerCatalogItem_1 = require("../../repo/offerCatalogItem");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
+const entranceGate_1 = require("../../repo/place/entranceGate");
 const hasPOS_1 = require("../../repo/place/hasPOS");
 const movieTheater_1 = require("../../repo/place/movieTheater");
 const screeningRoom_1 = require("../../repo/place/screeningRoom");
@@ -48,6 +60,7 @@ function call(data) {
             aggregateOffer: new aggregateOffer_1.AggregateOfferRepo(connection),
             categoryCode: new categoryCode_1.CategoryCodeRepo(connection),
             creativeWork: new creativeWork_1.CreativeWorkRepo(connection),
+            entranceGate: new entranceGate_1.EntranceGateRepo(connection, { id: '' }), // 先の処理で明示的に指定される
             event: new event_1.EventRepo(connection),
             eventSeries: new eventSeries_1.EventSeriesRepo(connection),
             hasPOS: new hasPOS_1.HasPOSRepo(connection, { id: '' }), // 先の処理で明示的に指定される
@@ -124,6 +137,10 @@ function onResourceUpdated(params) {
                     case factory.placeType.ScreeningRoom:
                         yield createInformRoomTasks(params, setting)(repos);
                         break;
+                    // 入場ゲート通知に対応(2026-01-17~)
+                    case factory.placeType.EntranceGate:
+                        yield createInformEntranceGateTasks(params, setting)(repos);
+                        break;
                     case 'AccountTitle':
                         yield createInformAccountTitleTasks({
                             project: { id: params.project.id },
@@ -422,8 +439,7 @@ function createInformMovieTheaterTasks(params, setting) {
         }, [
             'additionalProperty',
             'branchCode',
-            'hasEntranceGate',
-            // 'hasPOS',
+            // 'hasEntranceGate', // migrate to IEntranceGateAsNotification(2026-01-17~)
             'kanaName',
             'name',
             'parentOrganization',
@@ -444,7 +460,10 @@ function createInformMovieTheaterTasks(params, setting) {
         //         containedInPlace: { id: { $eq: movieTheater.id } }
         //     }
         // );
-        const movieTheaters4inform = [Object.assign({}, movieTheater
+        // 入場ゲートを廃止(2026-01-17~)
+        const { hasEntranceGate } = movieTheater, movieTheaterWithoutEntranceGates = __rest(movieTheater, ["hasEntranceGate"]);
+        const movieTheaters4inform = [Object.assign({}, movieTheaterWithoutEntranceGates
+            // ...movieTheater
             // migrate to IRoomAsNotification(2026-01-16~)
             // containsPlace: screeningRooms.map((room) => {
             //     return {
@@ -566,6 +585,64 @@ function createInformRoomTasks(params, setting) {
         }
     });
 }
+// tslint:disable-next-line:max-func-body-length
+function createInformEntranceGateTasks(params, setting) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const informResources = (_a = setting === null || setting === void 0 ? void 0 : setting.onResourceUpdated) === null || _a === void 0 ? void 0 : _a.informResource;
+        if (Array.isArray(params.identifier) && params.identifier.length > 0) {
+            // 入場ゲートを検索
+            repos.entranceGate.setOperatorId({ id: params.containedInPlace.id });
+            const entranceGates = (yield repos.entranceGate.findEntranceGates({
+                project: { id: { $eq: params.project.id } },
+                identifier: { $in: params.identifier }
+            }));
+            const entranceGatesAsNotification = [{
+                    id: params.containedInPlace.id,
+                    typeOf: factory.placeType.MovieTheater,
+                    hasEntranceGate: entranceGates.map((entranceGate) => {
+                        return Object.assign(Object.assign({}, entranceGate), { typeOf: factory.placeType.Place });
+                    })
+                }];
+            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);
+                entranceGatesAsNotification.forEach((entranceGateAsNotification) => {
+                    var _a;
+                    const informActionAttributes = {
+                        object: entranceGateAsNotification,
+                        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.20",
+    "@chevre/factory": "5.4.0-alpha.22",
     "@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.31"
+  "version": "23.2.0-alpha.33"
 }