@chevre/domain 21.8.0-alpha.53 → 21.8.0-alpha.55

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

@@ -82,12 +82,6 @@ export declare class MongoRepository {
          */
         sortedOfferIds: string[];
     }>;
-    findById(params: {
-        project: {
-            id: string;
-        };
-        id: string;
-    }): Promise<factory.unitPriceOffer.IUnitPriceOffer>;
     findAggregateOfferById(params: {
         project: {
             id: string;

package/lib/chevre/repo/offer.js

@@ -825,21 +825,23 @@ class MongoRepository {
             return { offers, sortedOfferIds };
         });
     }
-    findById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const offers = yield this.search({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: params.project.id } },
-                id: { $eq: params.id }
-            });
-            const unitPriceOffer = offers.shift();
-            if (unitPriceOffer === undefined) {
-                throw new factory.errors.NotFound(factory.offerType.Offer);
-            }
-            return unitPriceOffer;
-        });
-    }
+    // 不要なので廃止(2023-09-11~)
+    // public async findById(params: {
+    //     project: { id: string };
+    //     id: string;
+    // }): Promise<factory.unitPriceOffer.IUnitPriceOffer> {
+    //     const offers = await this.search({
+    //         limit: 1,
+    //         page: 1,
+    //         project: { id: { $eq: params.project.id } },
+    //         id: { $eq: params.id }
+    //     });
+    //     const unitPriceOffer = offers.shift();
+    //     if (unitPriceOffer === undefined) {
+    //         throw new factory.errors.NotFound(factory.offerType.Offer);
+    //     }
+    //     return unitPriceOffer;
+    // }
     findAggregateOfferById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.aggregateOfferModel.findOne({

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

@@ -182,7 +182,7 @@ function addReservations(params) {
         //     await repos.reservation.createMany({ reservationFor, reservations: objectSubReservations });
         // }
         // ストックホルダー処理(stockHolderで残席数を集計しているので必要)
-        yield onReservationsCreated({ event })(repos);
+        yield onReservationsCreated({ event, transaction: { transactionNumber: transaction.transactionNumber } })(repos);
         return { transaction, objectSubReservations, issuedThrough };
     });
 }
@@ -804,7 +804,8 @@ function onReservationsCreated(params) {
         yield OfferService.createAggregateScreeningEventIfNotExist({
             project: params.event.project,
             reservationFor: [{ id: params.event.id }],
-            force: false
+            force: false,
+            identifier: `onReservationsCreated:${params.transaction.transactionNumber}`
         })({ task: repos.task });
     });
 }

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

@@ -71,6 +71,7 @@ export declare function createAggregateScreeningEventIfNotExist(params: {
         id: string;
     }[];
     force: boolean;
+    identifier: string;
 }): (repos: {
     task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/offer.js

@@ -135,7 +135,8 @@ function onEventChanged(params) {
                         return { id };
                     }),
                     // 新規作成の場合は強制的に集計
-                    force: params.isNew
+                    force: params.isNew,
+                    identifier: `onEventChanged`
                 })(repos);
             }
             // 通知タスク作成(2023-06-08~)
@@ -184,9 +185,12 @@ function createAggregateScreeningEventIfNotExist(params) {
         const project = {
             id: params.project.id, typeOf: factory.organizationType.Project
         };
+        const nowInMilliseconds = Date.now();
         if (params.force) {
             aggregateTasks = params.reservationFor.map((reservationFor) => {
+                const taskIdentifier = `${params.project.id}:${factory.taskName.AggregateScreeningEvent}:${reservationFor.id}:${params.identifier}:${nowInMilliseconds}`;
                 return {
+                    identifier: taskIdentifier,
                     project,
                     name: factory.taskName.AggregateScreeningEvent,
                     status: factory.taskStatus.Ready,
@@ -209,7 +213,9 @@ function createAggregateScreeningEventIfNotExist(params) {
                 }, { _id: 1 })
                     .exec();
                 if (readyAggregateScreeningEventTaskDoc === null) {
+                    const taskIdentifier = `${params.project.id}:${factory.taskName.AggregateScreeningEvent}:${reservationFor.id}:${params.identifier}:${nowInMilliseconds}`;
                     aggregateTasks.push({
+                        identifier: taskIdentifier,
                         project,
                         name: factory.taskName.AggregateScreeningEvent,
                         status: factory.taskStatus.Ready,

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

@@ -22,6 +22,12 @@ interface ICheckInReservationParams {
             ids?: string[];
         };
     };
+    purpose: {
+        /**
+         * 承認コード
+         */
+        code: string;
+    };
 }
 export declare function checkInReservation(params: ICheckInReservationParams & {
     reserveIfNotYet: boolean;

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

@@ -58,7 +58,8 @@ function checkInReservation(params) {
                 ids: checkedInReservationIds,
                 reservationFor: params.object.reservationFor
             },
-            now
+            now,
+            purpose: params.purpose
         })({ task: repos.task });
     });
 }

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

@@ -32,6 +32,7 @@ useInformReservation,
  */
 reservationFor) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         if (Array.isArray(canceledReservations) && canceledReservations.length > 0) {
             const now = new Date();
             const project = canceledReservations[0].project;
@@ -96,7 +97,8 @@ reservationFor) {
             yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
                 project: { id: reservationFor.project.id },
                 reservationFor: [{ id: reservationFor.id }],
-                force: false
+                force: false,
+                identifier: `onReservationCanceled:${(_a = canceledReservations === null || canceledReservations === void 0 ? void 0 : canceledReservations[0]) === null || _a === void 0 ? void 0 : _a.reservationNumber}`
             })({ task: repos.task });
         }
     });

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

@@ -20,6 +20,12 @@ export declare function onReservationCheckedIn(params: {
         };
     };
     now: Date;
+    purpose: {
+        /**
+         * 承認コード
+         */
+        code: string;
+    };
 }): (repos: {
     task: TaskRepo;
 }) => Promise<void>;

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

@@ -109,10 +109,12 @@ function onReservationCheckedIn(params) {
         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
+                    force: false,
+                    identifier: `onReservationCheckedIn:${(_b = params.purpose) === null || _b === void 0 ? void 0 : _b.code}`
                 })({ task: repos.task });
             })));
         }

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

@@ -70,7 +70,8 @@ function onReservationConfirmed(confirmedReservations) {
             yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
                 project: confirmedReservations[0].project,
                 reservationFor: [{ id: confirmedReservations[0].reservationFor.id }],
-                force: false
+                force: false,
+                identifier: `onReservationConfirmed:${confirmedReservations[0].reservationNumber}`
             })({ task: repos.task });
             const now = new Date();
             const taskAttributes = [];

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

@@ -99,7 +99,8 @@ function onReservationUsed(action, attendedReservation) {
         yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
             project: attendedReservation.project,
             reservationFor: [{ id: attendedReservation.reservationFor.id }],
-            force: false
+            force: false,
+            identifier: `onReservationUsed:${attendedReservation.id}`
         })({ task: repos.task });
     });
 }

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

@@ -98,7 +98,8 @@ function onAuthorizationCreated(params) {
                 reservationNumbers: reservationNumbers,
                 reservationFor: { ids: reservationForIds }
             },
-            reserveIfNotYet: params.reserveIfNotYet
+            reserveIfNotYet: params.reserveIfNotYet,
+            purpose: { code: params.code }
         })({
             action: repos.action,
             assetTransaction: repos.assetTransaction,

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.53"
+  "version": "21.8.0-alpha.55"
 }