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

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

@@ -8,6 +8,7 @@ export type IUseReservationAction = factory.action.consume.use.reservation.IActi
  */
 export declare function onReservationUsed(attendedReservation: IAttendedReservation, action: factory.action.consume.use.reservation.IAttributes & {
     id: string;
+    startDate: Date;
 }): (repos: {
     task: TaskRepo;
 }, settings: Settings) => Promise<void>;

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

@@ -28,27 +28,22 @@ function onReservationUsed(attendedReservation, action) {
         const informReservations = settings.onReservationStatusChanged.informReservation;
         const informTaskRunsAt = now;
         // support notification.reservation.IUseAction(2024-11-11~)
+        let action4inform;
         let reservation4inform;
-        if (settings.useNotificationUseAction) {
-            reservation4inform = Object.assign({ typeOf: action.typeOf, project: action.project, id: action.id, object: {
-                    typeOf: attendedReservation.typeOf,
-                    id: attendedReservation.id,
-                    modifiedTime: attendedReservation.modifiedTime,
-                    reservedTicket: { dateUsed: attendedReservation.reservedTicket.dateUsed }
-                } }, (typeof ((_a = action.location) === null || _a === void 0 ? void 0 : _a.identifier) === 'string')
-                ? { location: { identifier: action.location.identifier } }
-                : undefined);
-        }
-        else {
-            reservation4inform = {
-                typeOf: attendedReservation.typeOf,
-                project: attendedReservation.project,
-                id: attendedReservation.id,
-                attended: true,
+        // let reservation4inform: factory.notification.reservation.IReservation4informUsed
+        //     | factory.notification.reservation.IUseAction;
+        const useForTheFirstTime = attendedReservation.reservedTicket.dateUsed !== undefined
+            && moment(action.startDate)
+                .isSame(moment(attendedReservation.reservedTicket.dateUsed), 'milliseconds');
+        reservation4inform = Object.assign({ typeOf: attendedReservation.typeOf, id: attendedReservation.id }, (useForTheFirstTime)
+            ? {
                 modifiedTime: attendedReservation.modifiedTime,
                 reservedTicket: { dateUsed: attendedReservation.reservedTicket.dateUsed }
-            };
-        }
+            }
+            : undefined);
+        action4inform = Object.assign({ typeOf: action.typeOf, project: action.project, id: action.id, object: reservation4inform }, (typeof ((_a = action.location) === null || _a === void 0 ? void 0 : _a.identifier) === 'string')
+            ? { location: { identifier: action.location.identifier } }
+            : undefined);
         const modifiedTimeInMilliseconds = moment(attendedReservation.modifiedTime)
             .valueOf();
         const informIdentifier = `${attendedReservation.typeOf}:${attendedReservation.id}:attended:${modifiedTimeInMilliseconds}`;
@@ -58,7 +53,7 @@ function onReservationUsed(attendedReservation, action) {
                 var _a;
                 const informUrl = String((_a = informReservation.recipient) === null || _a === void 0 ? void 0 : _a.url);
                 const informReservationAttributes = {
-                    object: reservation4inform,
+                    object: action4inform,
                     recipient: {
                         id: '',
                         name: informUrl,

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

@@ -72,7 +72,7 @@ function useReservation(params) {
             throw error;
         }
         yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: {} });
-        yield (0, onReservationUsed_1.onReservationUsed)(attendedReservation, Object.assign(Object.assign({}, actionAttributes), { id: action.id }))({ task: repos.task }, settings);
+        yield (0, onReservationUsed_1.onReservationUsed)(attendedReservation, Object.assign(Object.assign({}, actionAttributes), { id: action.id, startDate: action.startDate }))({ task: repos.task }, settings);
     });
 }
 exports.useReservation = useReservation;

package/lib/chevre/settings.d.ts

@@ -87,7 +87,6 @@ interface IOptions {
     movieticketReserve: ISurfrockSettings;
     useAssetTransactionSyncProcessing: boolean;
     useExperimentalFeature: boolean;
-    useNotificationUseAction?: boolean;
     notification: IWebhookSettings;
 }
 /**
@@ -133,7 +132,6 @@ declare class Settings {
     readonly movieticketReserve: ISurfrockSettings;
     readonly useAssetTransactionSyncProcessing: boolean;
     readonly useExperimentalFeature: boolean;
-    readonly useNotificationUseAction: boolean;
     /**
      * 通知設定
      */

package/lib/chevre/settings.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "AggregationSettings", { enumerable: true, get: f
  */
 class Settings {
     constructor(options) {
-        const { onEventChanged, onOrderStatusChanged, onResourceUpdated, onReservationStatusChanged, userPoolIdOld, userPoolIdNew, abortedTasksWithoutReport, numTryConfirmReserveTransaction, transaction, defaultSenderEmail, deliverOrderLimit, coa, gmo, movieticketReserve, useAssetTransactionSyncProcessing, useExperimentalFeature, useNotificationUseAction, notification } = options;
+        const { onEventChanged, onOrderStatusChanged, onResourceUpdated, onReservationStatusChanged, userPoolIdOld, userPoolIdNew, abortedTasksWithoutReport, numTryConfirmReserveTransaction, transaction, defaultSenderEmail, deliverOrderLimit, coa, gmo, movieticketReserve, useAssetTransactionSyncProcessing, useExperimentalFeature, notification } = options;
         this.onEventChanged = onEventChanged;
         this.onOrderStatusChanged = onOrderStatusChanged;
         this.onResourceUpdated = onResourceUpdated;
@@ -25,7 +25,6 @@ class Settings {
         this.movieticketReserve = movieticketReserve;
         this.useAssetTransactionSyncProcessing = useAssetTransactionSyncProcessing;
         this.useExperimentalFeature = useExperimentalFeature;
-        this.useNotificationUseAction = useNotificationUseAction === true;
         this.notification = notification;
     }
 }

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": "4.389.0",
+    "@chevre/factory": "4.390.0-alpha.0",
     "@cinerino/sdk": "10.17.0",
     "@motionpicture/coa-service": "9.6.0-alpha.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -108,5 +108,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.6.0-alpha.37"
+  "version": "22.6.0-alpha.39"
 }