@chevre/domain 22.6.0-alpha.16 → 22.6.0-alpha.18

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

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

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

@@ -19,24 +19,39 @@ const factory_1 = require("../factory");
 /**
  * 予約使用
  */
-function onReservationUsed(attendedReservation) {
+function onReservationUsed(attendedReservation, action) {
     // tslint:disable-next-line:max-func-body-length
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const tasks = [];
         const now = new Date();
         const informReservations = settings.onReservationStatusChanged.informReservation;
         const informTaskRunsAt = now;
-        const reservation4inform = {
-            typeOf: attendedReservation.typeOf,
-            project: attendedReservation.project,
-            id: attendedReservation.id,
-            attended: true,
-            modifiedTime: attendedReservation.modifiedTime,
-            reservedTicket: { dateUsed: attendedReservation.reservedTicket.dateUsed }
-        };
+        // support notification.reservation.IUseAction(2024-11-11~)
+        let reservation4inform;
+        if (settings.useExperimentalFeature) {
+            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,
+                modifiedTime: attendedReservation.modifiedTime,
+                reservedTicket: { dateUsed: attendedReservation.reservedTicket.dateUsed }
+            };
+        }
         const modifiedTimeInMilliseconds = moment(attendedReservation.modifiedTime)
             .valueOf();
-        const informIdentifier = `${attendedReservation.typeOf}:${reservation4inform.id}:attended:${modifiedTimeInMilliseconds}`;
+        const informIdentifier = `${attendedReservation.typeOf}:${attendedReservation.id}:attended:${modifiedTimeInMilliseconds}`;
         // inform galobally
         if (Array.isArray(informReservations)) {
             tasks.push(...informReservations.map((informReservation) => {

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

@@ -22,7 +22,7 @@ const debug = createDebug('chevre-domain:service:reserve:useReservation');
 function useReservation(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
-        const now = new Date();
+        // const now = new Date();
         const reservationId = params.object.id;
         const ticketToken = (_a = params === null || params === void 0 ? void 0 : params.instrument) === null || _a === void 0 ? void 0 : _a.ticketToken;
         // const token = params?.instrument?.token;
@@ -60,7 +60,7 @@ function useReservation(params) {
         let attendedReservation;
         try {
             // 使用日時と同時更新(2023-01-30~)
-            attendedReservation = yield repos.reservation.attendIfNotAttended({ id: reservationId, now });
+            attendedReservation = yield repos.reservation.attendIfNotAttended({ id: reservationId, now: action.startDate });
         }
         catch (error) {
             try {
@@ -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)({ task: repos.task }, settings);
+        yield (0, onReservationUsed_1.onReservationUsed)(attendedReservation, Object.assign(Object.assign({}, actionAttributes), { id: action.id }))({ task: repos.task }, settings);
     });
 }
 exports.useReservation = useReservation;

package/lib/chevre/service/task/createEvent/createEventBySchedule.js

@@ -15,14 +15,7 @@ const moment = require("moment-timezone");
 const factory = require("../../../factory");
 const event_1 = require("../../event");
 const debug = createDebug('chevre-domain:service:task');
-// enum RoleName {
-//     Customer = 'customer',
-//     POS = 'pos'
-// }
-// const AVAILABLE_ROLE_NAMES: string[] = [RoleName.Customer, RoleName.POS];
-function createEvents(schedule
-// createDate?: Date
-) {
+function createEvents(schedule, createDate) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -40,13 +33,12 @@ function createEvents(schedule
         }
         const project = schedule.project;
         // 引数情報取得
-        const targetInfo = getTargetInfoForCreateFromSetting(schedule);
+        const targetInfo = getTargetInfoForCreateFromSetting(schedule, createDate);
         debug(targetInfo.length, 'targetInfos ->', targetInfo);
         // 施設コンテンツ検索
         const screeningEventSeries = (yield repos.eventSeries.projectEventSeriesFields({
             project: { id: { $eq: project.id } },
             id: { $eq: eventSeriesId }
-            // workPerformed: { identifiers: [workPerformedIdentifier] }
         }, [
             'location', 'additionalProperty', 'description', 'endDate', 'headline', 'kanaName', 'name',
             'soundFormat', 'startDate', 'typeOf', 'videoFormat', 'workPerformed'
@@ -228,9 +220,9 @@ function createEvents(schedule
 /**
  * パフォーマンス作成・作成対象情報取得
  */
-function getTargetInfoForCreateFromSetting(settings) {
+function getTargetInfoForCreateFromSetting(settings, createDate) {
     const performanceInfos = [];
-    const { days, duration, noPerformanceTimes, createDate, hours, start, minutes, tours } = settings;
+    const { days, duration, noPerformanceTimes, hours, start, minutes, tours } = settings;
     // 作成対象時間: 9,10,11など
     // const hours: string[] = ['9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22'];
     // 作成開始が今日から何日後か: 30
@@ -295,7 +287,7 @@ function createEventBySchedule(params) {
         if (schedule === null) {
             throw new factory.errors.NotFound('Schedule');
         }
-        yield createEvents(schedule)(repos, settings);
+        yield createEvents(schedule, (params.object.startDate instanceof Date) ? params.object.startDate : new Date())(repos, settings);
     });
 }
 exports.createEventBySchedule = createEventBySchedule;

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.389.0-alpha.11",
-    "@cinerino/sdk": "10.16.0-alpha.7",
+    "@chevre/factory": "4.389.0-alpha.13",
+    "@cinerino/sdk": "10.16.0-alpha.8",
     "@motionpicture/coa-service": "9.5.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.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.16"
+  "version": "22.6.0-alpha.18"
 }