@chevre/domain 21.8.0-alpha.59 → 21.8.0-alpha.60

package/example/src/chevre/searchEvents.ts

@@ -12,15 +12,17 @@ async function main() {
 
     const events = await eventRepo.search(
         {
-            limit: 100,
-            page: 1,
-            sort: { startDate: 1 },
-            typeOf: chevre.factory.eventType.ScreeningEvent,
-            project: { id: { $eq: PROJECT_ID } },
-            id: { $eq: 'al6aff83y' }
+            // limit: 100,
+            // page: 1,
+            // sort: { startDate: 1 },
+            // typeOf: chevre.factory.eventType.ScreeningEvent,
+            // project: { id: { $eq: PROJECT_ID } },
+            id: { $eq: 'al6aff83y' },
+            typeOfIn: [chevre.factory.eventType.Event, chevre.factory.eventType.ScreeningEvent]
         },
         {
-            name: 1
+            _id: 1
+            // name: 1
         }
     );
     console.log(events);

package/lib/chevre/service/reserve/checkInReservation.d.ts

@@ -1,5 +1,6 @@
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
+import { MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
 import { MongoRepository as TaskRepo } from '../../repo/task';
 interface ICheckInReservationParams {
@@ -34,6 +35,7 @@ export declare function checkInReservation(params: ICheckInReservationParams & {
 }): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
+    event: EventRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/reserve/checkInReservation.js

@@ -60,7 +60,7 @@ function checkInReservation(params) {
             },
             now,
             purpose: params.purpose
-        })({ task: repos.task });
+        })({ event: repos.event, task: repos.task });
     });
 }
 exports.checkInReservation = checkInReservation;

package/lib/chevre/service/reserve/potentialActions/onReservationCheckedIn.d.ts

@@ -1,3 +1,4 @@
+import { MongoRepository as EventRepo } from '../../../repo/event';
 import { MongoRepository as TaskRepo } from '../../../repo/task';
 export declare function onReservationCheckedIn(params: {
     project: {
@@ -27,5 +28,6 @@ export declare function onReservationCheckedIn(params: {
         code: string;
     };
 }): (repos: {
+    event: EventRepo;
     task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/reserve/potentialActions/onReservationCheckedIn.js

@@ -107,15 +107,22 @@ function onReservationCheckedIn(params) {
         // 冗長な作成を避ける
         const reservationForIds = (_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.ids;
         if (Array.isArray(reservationForIds)) {
-            // イベント集計タスクを追加
+            // 集計タスクを追加
             yield Promise.all(reservationForIds.map((reservationForId) => __awaiter(this, void 0, void 0, function* () {
                 var _b;
-                yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
-                    project: { id: params.project.id },
-                    reservationFor: [{ id: reservationForId }],
-                    force: false,
-                    identifier: `onReservationCheckedIn:${(_b = params.purpose) === null || _b === void 0 ? void 0 : _b.code}`
-                })({ task: repos.task });
+                // すでにイベントが削除されているケースに備えて、イベント存在検証(2023-09-12~)
+                const existingEvents = yield repos.event.search({
+                    id: { $eq: reservationForId },
+                    typeOfIn: [factory.eventType.Event, factory.eventType.ScreeningEvent] // 指定しないとArgumentNullError
+                }, { _id: 1 });
+                if (existingEvents.length > 0) {
+                    yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
+                        project: { id: params.project.id },
+                        reservationFor: [{ id: reservationForId }],
+                        force: false,
+                        identifier: `onReservationCheckedIn:${(_b = params.purpose) === null || _b === void 0 ? void 0 : _b.code}`
+                    })({ task: repos.task });
+                }
             })));
         }
     });

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

@@ -14,6 +14,7 @@ const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const code_1 = require("../../repo/code");
+const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const reservation_1 = require("../../repo/reservation");
@@ -28,6 +29,7 @@ function call(data) {
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             code: new code_1.MongoRepository(settings.connection),
+            event: new event_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
             ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),
             reservation: new reservation_1.MongoRepository(settings.connection),
@@ -103,6 +105,7 @@ function onAuthorizationCreated(params) {
         })({
             action: repos.action,
             assetTransaction: repos.assetTransaction,
+            event: repos.event,
             reservation: repos.reservation,
             task: repos.task
         });

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.8.0-alpha.59"
+  "version": "21.8.0-alpha.60"
 }