@chevre/domain 20.2.0-alpha.37 → 20.2.0-alpha.39

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

@@ -41,7 +41,7 @@ export declare class MongoRepository {
      */
     findByOrderNumber(params: {
         orderNumber: string;
-    }): Promise<factory.order.IOrder>;
+    }, projection?: any): Promise<factory.order.IOrder>;
     /**
      * 注文番号で削除する
      */

package/lib/chevre/repo/order.js

@@ -769,13 +769,9 @@ class MongoRepository {
     /**
      * 注文番号から注文を取得する
      */
-    findByOrderNumber(params) {
+    findByOrderNumber(params, projection) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.orderModel.findOne({ orderNumber: params.orderNumber }, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
-            })
+            const doc = yield this.orderModel.findOne({ orderNumber: params.orderNumber }, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.orderModel.modelName);

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

@@ -580,7 +580,8 @@ function onReservationsCreated(params) {
         // 集計タスク
         yield OfferService.createAggregateScreeningEventIfNotExist({
             project: params.event.project,
-            reservationFor: { id: params.event.id }
+            reservationFor: { id: params.event.id },
+            force: false
         })({ task: repos.task });
     });
 }

package/lib/chevre/service/event.js

@@ -769,7 +769,7 @@ function updateEvent4ttts(params) {
         }
         // アクション完了
         yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: {} });
-        yield (0, offer_1.onEventChanged)(event)({
+        yield (0, offer_1.onEventChanged)({ event, isNew: false })({
             event: repos.event,
             project: repos.project,
             task: repos.task

package/lib/chevre/service/offer.d.ts

@@ -63,7 +63,10 @@ export declare function searchEventSeatOffersWithPaging(params: {
 /**
  * イベント変更時処理
  */
-export declare function onEventChanged(params: factory.event.IEvent<factory.eventType>): (repos: {
+export declare function onEventChanged(params: {
+    event: factory.event.IEvent<factory.eventType>;
+    isNew: boolean;
+}): (repos: {
     event: EventRepo;
     project: ProjectRepo;
     task: TaskRepo;
@@ -75,6 +78,7 @@ export declare function createAggregateScreeningEventIfNotExist(params: {
     reservationFor: {
         id: string;
     };
+    force: boolean;
 }): (repos: {
     task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/offer.js

@@ -212,43 +212,22 @@ exports.searchEventSeatOffersWithPaging = searchEventSeatOffersWithPaging;
  */
 function onEventChanged(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const changedEvent = params;
+        const changedEvent = params.event;
         // ScreeningEventであれば集計タスク
         if (changedEvent.typeOf === factory.eventType.ScreeningEvent) {
             yield createAggregateScreeningEventIfNotExist({
                 project: changedEvent.project,
-                reservationFor: { id: changedEvent.id }
+                reservationFor: { id: changedEvent.id },
+                // 新規作成の場合は強制的に集計
+                force: params.isNew
             })(repos);
-            // const aggregateTask: factory.task.aggregateScreeningEvent.IAttributes = {
-            //     project: event.project,
-            //     name: factory.taskName.AggregateScreeningEvent,
-            //     status: factory.taskStatus.Ready,
-            //     runsAt: new Date(),
-            //     remainingNumberOfTries: 3,
-            //     numberOfTried: 0,
-            //     executionResults: [],
-            //     data: { id: event.id, typeOf: event.typeOf }
-            // };
-            // await repos.task.save(aggregateTask);
-        }
-        else {
-            // イベント通知タスク
-            // const project = await repos.project.findById({ id: event.project.id });
         }
     });
 }
 exports.onEventChanged = onEventChanged;
 function createAggregateScreeningEventIfNotExist(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // 冗長な作成を避ける
-        const readyAggregateScreeningEventTaskDoc = yield repos.task.taskModel.findOne({
-            'project.id': { $eq: params.project.id },
-            name: { $eq: factory.taskName.AggregateScreeningEvent },
-            status: { $eq: factory.taskStatus.Ready },
-            'data.id': { $exists: true, $eq: params.reservationFor.id }
-        }, { _id: 1 })
-            .exec();
-        if (readyAggregateScreeningEventTaskDoc === null) {
+        if (params.force) {
             const aggregateTask = {
                 project: { id: params.project.id, typeOf: factory.organizationType.Project },
                 name: factory.taskName.AggregateScreeningEvent,
@@ -264,6 +243,32 @@ function createAggregateScreeningEventIfNotExist(params) {
             };
             yield repos.task.save(aggregateTask);
         }
+        else {
+            // 冗長な作成を避ける
+            const readyAggregateScreeningEventTaskDoc = yield repos.task.taskModel.findOne({
+                'project.id': { $eq: params.project.id },
+                name: { $eq: factory.taskName.AggregateScreeningEvent },
+                status: { $eq: factory.taskStatus.Ready },
+                'data.id': { $exists: true, $eq: params.reservationFor.id }
+            }, { _id: 1 })
+                .exec();
+            if (readyAggregateScreeningEventTaskDoc === null) {
+                const aggregateTask = {
+                    project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                    name: factory.taskName.AggregateScreeningEvent,
+                    status: factory.taskStatus.Ready,
+                    runsAt: new Date(),
+                    remainingNumberOfTries: 3,
+                    numberOfTried: 0,
+                    executionResults: [],
+                    data: {
+                        typeOf: factory.eventType.ScreeningEvent,
+                        id: params.reservationFor.id
+                    }
+                };
+                yield repos.task.save(aggregateTask);
+            }
+        }
     });
 }
 exports.createAggregateScreeningEventIfNotExist = createAggregateScreeningEventIfNotExist;

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

@@ -96,7 +96,8 @@ function onReservationCanceled(canceledReservations, useInformReservation) {
             // 冗長な作成を避ける
             yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
                 project,
-                reservationFor: { id: canceledReservations[0].reservationFor.id }
+                reservationFor: { id: canceledReservations[0].reservationFor.id },
+                force: false
             })({ task: repos.task });
         }
     });

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

@@ -116,7 +116,8 @@ function onReservationCheckedIn(params) {
             yield Promise.all(reservationForIds.map((reservationForId) => __awaiter(this, void 0, void 0, function* () {
                 yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
                     project: { id: params.project.id },
-                    reservationFor: { id: reservationForId }
+                    reservationFor: { id: reservationForId },
+                    force: false
                 })({ task: repos.task });
             })));
         }

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

@@ -98,7 +98,8 @@ function onReservationConfirmed(confirmedReservations) {
         if (Array.isArray(confirmedReservations) && confirmedReservations.length > 0) {
             yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
                 project: confirmedReservations[0].project,
-                reservationFor: { id: confirmedReservations[0].reservationFor.id }
+                reservationFor: { id: confirmedReservations[0].reservationFor.id },
+                force: false
             })({ task: repos.task });
             const now = new Date();
             const taskAttributes = [];

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

@@ -134,7 +134,8 @@ function onReservationUsed(action, attendedReservation) {
         // 冗長な作成を避ける
         yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
             project: attendedReservation.project,
-            reservationFor: { id: attendedReservation.reservationFor.id }
+            reservationFor: { id: attendedReservation.reservationFor.id },
+            force: false
         })({ task: repos.task });
     });
 }

package/package.json

@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.2.0-alpha.37"
+  "version": "20.2.0-alpha.39"
 }