@chevre/domain 23.2.0-alpha.30 → 23.2.0-alpha.32

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/eventOffer.d.ts

@@ -48,5 +48,13 @@ export declare class EventOfferRepo {
             id: string;
         };
     }): Promise<DeleteResult>;
+    /**
+     * 有効期間を過ぎたイベントオファーを削除する
+     */
+    deleteEventOffersExpired(params: {
+        validThrough: {
+            $lte: Date;
+        };
+    }): Promise<DeleteResult>;
 }
 export {};

package/lib/chevre/repo/eventOffer.js

@@ -187,5 +187,16 @@ class EventOfferRepo {
                 .exec();
         });
     }
+    /**
+     * 有効期間を過ぎたイベントオファーを削除する
+     */
+    deleteEventOffersExpired(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.eventOfferModel.deleteMany({
+                validThrough: { $lte: params.validThrough.$lte }
+            })
+                .exec();
+        });
+    }
 }
 exports.EventOfferRepo = EventOfferRepo;

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

@@ -14,6 +14,7 @@ const action_1 = require("../../repo/action");
 const aggregateOffer_1 = require("../../repo/aggregateOffer");
 const categoryCode_1 = require("../../repo/categoryCode");
 const event_1 = require("../../repo/event");
+const eventOffer_1 = require("../../repo/eventOffer");
 const eventSeries_1 = require("../../repo/eventSeries");
 const member_1 = require("../../repo/member");
 const note_1 = require("../../repo/note");
@@ -39,6 +40,7 @@ function call(params) {
             aggregateOffer: new aggregateOffer_1.AggregateOfferRepo(connection),
             categoryCode: new categoryCode_1.CategoryCodeRepo(connection),
             event: new event_1.EventRepo(connection),
+            eventOffer: new eventOffer_1.EventOfferRepo(connection),
             eventSeries: new eventSeries_1.EventSeriesRepo(connection),
             hasPOS: new hasPOS_1.HasPOSRepo(connection, { id: '' }), // 先の処理で明示的に指定される
             member: new member_1.MemberRepo(connection),

package/lib/chevre/service/task/onResourceUpdated/onResourceDeleted.d.ts

@@ -3,6 +3,7 @@ import type { ActionRepo } from '../../../repo/action';
 import type { AggregateOfferRepo } from '../../../repo/aggregateOffer';
 import type { CategoryCodeRepo } from '../../../repo/categoryCode';
 import type { EventRepo } from '../../../repo/event';
+import type { EventOfferRepo } from '../../../repo/eventOffer';
 import type { EventSeriesRepo } from '../../../repo/eventSeries';
 import type { MemberRepo } from '../../../repo/member';
 import type { NoteRepo } from '../../../repo/note';
@@ -22,6 +23,7 @@ export declare function onResourceDeleted(params: factory.task.onResourceDeleted
     aggregateOffer: AggregateOfferRepo;
     categoryCode: CategoryCodeRepo;
     event: EventRepo;
+    eventOffer: EventOfferRepo;
     eventSeries: EventSeriesRepo;
     hasPOS: HasPOSRepo;
     member: MemberRepo;

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

@@ -283,8 +283,14 @@ function deleteResourcesBySeller(params) {
                     project: { id: params.project.id },
                     offeredBy: { id: sellerId }
                 });
+                // イベントオファー削除(2026-01-16~)
+                const deleteEventOfferResult = yield repos.eventOffer.deleteEventOffersBySeller({
+                    project: { id: params.project.id },
+                    seller: { id: sellerId }
+                });
                 deleteResult = {
                     deleteMemberResult, deletePaymentServiceProviderResult,
+                    deleteEventOfferResult,
                     deleteProductOfferResult,
                     deleteEventResult, deleteEventSeriesResult, deleteScreeningRoomResult, deleteMovieTheaterResult
                 };

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

@@ -438,19 +438,24 @@ function createInformMovieTheaterTasks(params, setting) {
         if (movieTheater === undefined) {
             throw new factory.errors.NotFound(factory.placeType.MovieTheater);
         }
-        // ルームを検索
-        const screeningRooms = yield repos.screeningRoom.findRooms({
-            containedInPlace: { id: { $eq: movieTheater.id } }
-        });
-        const movieTheaters4inform = [Object.assign(Object.assign({}, movieTheater), { containsPlace: screeningRooms.map((room) => {
-                    return {
-                        branchCode: room.branchCode,
-                        name: room.name,
-                        typeOf: factory.placeType.ScreeningRoom,
-                        additionalProperty: room.additionalProperty,
-                        address: room.address
-                    };
-                }) })];
+        // // ルームを検索
+        // const screeningRooms = await repos.screeningRoom.findRooms(
+        //     {
+        //         containedInPlace: { id: { $eq: movieTheater.id } }
+        //     }
+        // );
+        const movieTheaters4inform = [Object.assign({}, movieTheater
+            // migrate to IRoomAsNotification(2026-01-16~)
+            // containsPlace: screeningRooms.map((room) => {
+            //     return {
+            //         branchCode: room.branchCode,
+            //         name: room.name,
+            //         typeOf: factory.placeType.ScreeningRoom,
+            //         additionalProperty: room.additionalProperty,
+            //         address: room.address
+            //     };
+            // })
+            )];
         if (movieTheaters4inform.length > 0) {
             const taskRunsAt = new Date();
             const informTasks = [];
@@ -516,7 +521,8 @@ function createInformRoomTasks(params, setting) {
                     typeOf: factory.placeType.ScreeningRoom,
                     additionalProperty: room.additionalProperty,
                     address: room.address,
-                    containedInPlace: { id: params.containedInPlace.id }
+                    containedInPlace: { id: params.containedInPlace.id },
+                    project: { id: params.project.id }
                 };
             });
             if (rooms4inform.length > 0) {

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.19",
+    "@chevre/factory": "5.4.0-alpha.20",
     "@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.30"
+  "version": "23.2.0-alpha.32"
 }