@chevre/domain 22.6.0-alpha.9 → 22.6.0

package/lib/chevre/service/payment/movieTicket/validation.js

@@ -15,7 +15,9 @@ const factory = require("../../../factory");
 const taskIdentifier_1 = require("../../../factory/taskIdentifier");
 const processPurchaseNumberAuth_1 = require("./processPurchaseNumberAuth");
 const debug = createDebug('chevre-domain:service:payment');
-function validateMovieTicket(params, paymentServiceId, useCheckByIdentifierIfNotYet, purpose) {
+function validateMovieTicket(params, paymentServiceId, 
+// useCheckByIdentifierIfNotYet: boolean,
+checkedAction, purpose) {
     // tslint:disable-next-line:max-func-body-length
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
@@ -81,7 +83,8 @@ function validateMovieTicket(params, paymentServiceId, useCheckByIdentifierIfNot
             seller: { id: sellerId },
             screeningEvent: screeningEvent,
             paymentServiceId,
-            useCheckByIdentifierIfNotYet,
+            // useCheckByIdentifierIfNotYet,
+            checkedAction,
             purpose
         })(repos, settings);
         const accountsReceivablesByServiceType = [];
@@ -113,34 +116,40 @@ function validateMovieTicket(params, paymentServiceId, useCheckByIdentifierIfNot
 exports.validateMovieTicket = validateMovieTicket;
 function checkByIdentifierIfNotYet(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         let checkResult;
-        if (params.useCheckByIdentifierIfNotYet === true) {
-            // すでにCheckActionが存在すれば認証しない(2023-06-06~)
-            let alreadyCheckedAction;
-            // search from checkMovieTicketTask(2024-06-26~)
-            const placeOrderId = params.purpose.id;
-            if (typeof placeOrderId === 'string') {
-                if (settings.useExperimentalFeature) {
-                    const taskIdentifier = (0, taskIdentifier_1.createCheckMovieTicketTaskIdentifier)({
-                        project: { id: params.screeningEvent.project.id },
-                        purpose: { id: placeOrderId },
-                        object: {
-                            id: params.paymentServiceId,
-                            movieTicket: {
-                                identifier: params.movieTicketIdentifier,
-                                serviceOutput: { reservationFor: { id: params.screeningEvent.id } }
-                            }
+        let alreadyCheckedAction; // すでにCheckActionが存在すれば認証しない(2023-06-06~)
+        // search from checkMovieTicketTask(2024-06-26~)
+        const placeOrderId = params.purpose.id;
+        if (typeof placeOrderId === 'string') {
+            if (settings.useExperimentalFeature) {
+                const taskIdentifier = (0, taskIdentifier_1.createCheckMovieTicketTaskIdentifier)({
+                    project: { id: params.screeningEvent.project.id },
+                    purpose: { id: placeOrderId },
+                    object: {
+                        id: params.paymentServiceId,
+                        movieTicket: {
+                            identifier: params.movieTicketIdentifier,
+                            serviceOutput: { reservationFor: { id: params.screeningEvent.id } }
                         }
-                    });
-                    const existingCheckMovieTicketTask = yield repos.task.findByIdentifier({
-                        project: { id: params.screeningEvent.project.id },
-                        name: factory.taskName.CheckMovieTicket,
-                        identifier: taskIdentifier
-                    });
-                    debug('existingCheckMovieTicketTask:', JSON.stringify(existingCheckMovieTicketTask), 'placeOrderId:', placeOrderId);
-                }
+                    }
+                });
+                const existingCheckMovieTicketTask = yield repos.task.findByIdentifier({
+                    project: { id: params.screeningEvent.project.id },
+                    name: factory.taskName.CheckMovieTicket,
+                    identifier: taskIdentifier
+                });
+                debug('existingCheckMovieTicketTask:', JSON.stringify(existingCheckMovieTicketTask), 'placeOrderId:', placeOrderId);
             }
+        }
+        const specifiedCheckedActionId = (_a = params.checkedAction) === null || _a === void 0 ? void 0 : _a.id;
+        if (typeof specifiedCheckedActionId === 'string' && specifiedCheckedActionId !== '') {
+            alreadyCheckedAction = (yield repos.action.search(Object.assign({ limit: 1, page: 1, id: { $in: [specifiedCheckedActionId] }, actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] } }, (typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined), ['id'])).shift();
+            if (alreadyCheckedAction === undefined) {
+                throw new factory.errors.NotFound(factory.actionType.CheckAction);
+            }
+        }
+        else {
             alreadyCheckedAction = (yield repos.action.search(Object.assign({ limit: 1, page: 1, sort: { startDate: factory.sortType.Descending }, typeOf: { $eq: factory.actionType.CheckAction }, actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] }, object: {
                     typeOf: { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket },
                     id: { $eq: params.paymentServiceId },
@@ -152,20 +161,18 @@ function checkByIdentifierIfNotYet(params) {
                     }
                 } }, (typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined), ['id'])).shift();
             debug('alreadyCheckedAction:', JSON.stringify(alreadyCheckedAction), 'placeOrderId:', placeOrderId);
-            if (alreadyCheckedAction !== undefined) {
-                const recipe = yield repos.action.findRecipeByAction({
-                    project: { id: params.screeningEvent.project.id },
-                    recipeFor: { id: alreadyCheckedAction.id }
-                });
-                const directionPurchaseNumberAuth = (_b = (_a = recipe === null || recipe === void 0 ? void 0 : recipe.step[0]) === null || _a === void 0 ? void 0 : _a.itemListElement[0]) === null || _b === void 0 ? void 0 : _b.itemListElement[0];
-                if (directionPurchaseNumberAuth !== undefined) {
-                    debug('alreadyCheckedAction.directionPurchaseNumberAuth found', directionPurchaseNumberAuth.typeOf, 'movieTicketIdentifier:', params.movieTicketIdentifier, 'screeningEvent.id:', params.screeningEvent.id);
-                    const { beforeMedia, afterMedia } = directionPurchaseNumberAuth;
-                    if (beforeMedia !== undefined && afterMedia !== undefined) {
-                        checkResult = { purchaseNumberAuthIn: beforeMedia, purchaseNumberAuthResult: afterMedia };
-                    }
+        }
+        if (alreadyCheckedAction !== undefined) {
+            const recipe = yield repos.action.findRecipeByAction({
+                project: { id: params.screeningEvent.project.id },
+                recipeFor: { id: alreadyCheckedAction.id }
+            });
+            const directionPurchaseNumberAuth = (_c = (_b = recipe === null || recipe === void 0 ? void 0 : recipe.step[0]) === null || _b === void 0 ? void 0 : _b.itemListElement[0]) === null || _c === void 0 ? void 0 : _c.itemListElement[0];
+            if (directionPurchaseNumberAuth !== undefined) {
+                const { beforeMedia, afterMedia } = directionPurchaseNumberAuth;
+                if (beforeMedia !== undefined && afterMedia !== undefined) {
+                    checkResult = { purchaseNumberAuthIn: beforeMedia, purchaseNumberAuthResult: afterMedia };
                 }
-                // checkResult = alreadyCheckedAction.shift()?.result;
             }
         }
         if (checkResult === undefined) {

package/lib/chevre/service/payment/movieTicket/voidTransaction.d.ts

@@ -1,5 +1,6 @@
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
 import type { ActionRepo } from '../../../repo/action';
+import type { CredentialsRepo } from '../../../repo/credentials';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
@@ -7,6 +8,7 @@ import { Settings } from '../../../settings';
 declare function voidTransaction(params: factory.task.voidPayment.IData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
+    credentials: CredentialsRepo;
     paymentService: PaymentServiceRepo;
     task: TaskRepo;
 }, settings: Settings) => Promise<void>;

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

@@ -5,6 +5,7 @@ import type { AcceptedOfferRepo } from '../repo/acceptedOffer';
 import type { AccountingReportRepo } from '../repo/accountingReport';
 import type { ActionRepo } from '../repo/action';
 import type { AssetTransactionRepo } from '../repo/assetTransaction';
+import type { CredentialsRepo } from '../repo/credentials';
 import type { EventRepo } from '../repo/event';
 import type { OrderRepo } from '../repo/order';
 import type { PaymentServiceRepo } from '../repo/paymentService';
@@ -32,10 +33,7 @@ export declare function fixOrderAsPurpose(params: {
 }) => Promise<Pick<factory.order.IOrder, "typeOf" | "orderNumber" | "confirmationNumber"> & {
     acceptedOffersMovieTicketUsed: IAcceptedOfferMovieTicketUsed[];
 }>;
-/**
- * 決済確定
- */
-export declare function pay(params: factory.task.pay.IData & {
+export declare function payTask2payActionAttributes(params: factory.task.pay.IData & {
     sameAs?: {
         /**
          * 実行元タスクID
@@ -44,10 +42,19 @@ export declare function pay(params: factory.task.pay.IData & {
         typeOf: 'Task';
     };
 }): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
+    assetTransaction: AssetTransactionRepo;
+    order: OrderRepo;
+}) => Promise<factory.action.trade.pay.IAttributes>;
+/**
+ * 決済確定
+ */
+export declare function pay(payActionAttributes: factory.action.trade.pay.IAttributes): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;
+    credentials: CredentialsRepo;
     event: EventRepo;
     order: OrderRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
@@ -60,6 +67,7 @@ export declare function pay(params: factory.task.pay.IData & {
 export declare function voidPayment(params: factory.task.voidPayment.IData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
+    credentials: CredentialsRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
@@ -77,6 +85,7 @@ export declare function refund(params: factory.task.refund.IData & {
 }): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
+    credentials: CredentialsRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;

package/lib/chevre/service/payment.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.refund = exports.voidPayment = exports.pay = exports.fixOrderAsPurpose = void 0;
+exports.refund = exports.voidPayment = exports.pay = exports.payTask2payActionAttributes = exports.fixOrderAsPurpose = void 0;
 const factory = require("../factory");
 const CreditCardPaymentService = require("./payment/creditCard");
 const FaceToFacePaymentService = require("./payment/faceToFace");
@@ -96,21 +96,25 @@ function payTask2payActionAttributes(params) {
         }
     });
 }
+exports.payTask2payActionAttributes = payTask2payActionAttributes;
 /**
  * 決済確定
  */
-function pay(params) {
+function pay(
+// params: factory.task.pay.IData & {
+//     sameAs?: {
+//         /**
+//          * 実行元タスクID
+//          */
+//         id: string;
+//         typeOf: 'Task';
+//     };
+// }
+payActionAttributes) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+        // let payActionAttributes: factory.action.trade.pay.IAttributes;
+        // payActionAttributes = await payTask2payActionAttributes(params)(repos);
         var _a;
-        let payActionAttributes;
-        // if (params.purpose.typeOf === factory.actionType.ReturnAction) {
-        //     // タスクにPayActionそのものが指定されていればそのまま処理
-        //     payActionAttributes = params;
-        // } else {
-        //     // 最適化されたタスクに対応(2024-01-19~)
-        //     payActionAttributes = await payTask2payActionAttributes(params)(repos);
-        // }
-        payActionAttributes = yield payTask2payActionAttributes(params)(repos);
         const paymentServiceType = (_a = payActionAttributes.object[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.FaceToFace:

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

@@ -1,9 +1,9 @@
 import * as factory from '../../factory';
-import { Settings } from '../../settings';
 import type { ActionRepo } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import { OfferRateLimitRepo } from '../../repo/rateLimit/offer';
 import { ReservationRepo } from '../../repo/reservation';
+import type { SettingRepo } from '../../repo/setting';
 import { StockHolderRepo } from '../../repo/stockHolder';
 import type { TaskRepo } from '../../repo/task';
 /**
@@ -15,8 +15,9 @@ declare function cancelPendingReservation(actionAttributes: factory.task.cancelP
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;
+    setting: SettingRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;
 /**
  * 予約をキャンセルする
  */
@@ -25,9 +26,10 @@ declare function cancelReservation(actionAttributesList: factory.action.cancel.r
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;
+    setting: SettingRepo;
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;
 declare function processUnlockOfferRateLimit(params: {
     reservation: {
         reservationNumber: string;

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

@@ -22,7 +22,9 @@ const onReservationCanceled_1 = require("./potentialActions/onReservationCancele
  * 保留予約取消
  */
 function cancelPendingReservation(actionAttributes) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const { reserveTransaction } = yield cancelPengindIfNotYet(actionAttributes)(repos);
         yield (0, onPendingReservationCanceled_1.onPendingReservationCanceled)(
@@ -34,7 +36,7 @@ function cancelPendingReservation(actionAttributes) {
                 id: String((_a = reserveTransaction.object.reservationFor) === null || _a === void 0 ? void 0 : _a.id)
             },
             reservationNumber: reserveTransaction.object.reservationNumber
-        })({ task: repos.task }, settings);
+        })(repos);
     });
 }
 exports.cancelPendingReservation = cancelPendingReservation;
@@ -157,7 +159,9 @@ function cancelPengindIfNotYet(params) {
  */
 function cancelReservation(actionAttributesList) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
         if (actionAttributesList.length > 0) {
             // tslint:disable-next-line:max-func-body-length
@@ -317,7 +321,7 @@ function cancelReservation(actionAttributesList) {
                 {
                     project: { id: actionAttributes.project.id },
                     id: canceledReservationForId
-                })({ task: repos.task }, settings);
+                })(repos);
             })));
         }
     });

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

@@ -1,7 +1,7 @@
-import { Settings } from '../../settings';
 import type { ActionRepo } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { ReservationRepo } from '../../repo/reservation';
+import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 interface ICheckInReservationParams {
     project: {
@@ -28,6 +28,7 @@ export declare function checkInReservation(params: ICheckInReservationParams): (
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     reservation: ReservationRepo;
+    setting: SettingRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;
 export {};

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

@@ -16,12 +16,13 @@ const confirmReservation_1 = require("./confirmReservation");
 const onReservationCheckedIn_1 = require("./potentialActions/onReservationCheckedIn");
 const debug = createDebug('chevre-domain:service:reserve:checkInReservation');
 function checkInReservation(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
-        yield reserveIfNotYet(params)(repos, settings);
+        yield reserveIfNotYet(params)(repos);
         // 発券処理(Array対応)
         let checkedInReservationIds;
+        let checkedInResult;
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
             const existingReservationCount = yield repos.reservation.count({
                 id: { $in: params.object.ids },
@@ -30,7 +31,7 @@ function checkInReservation(params) {
             if (existingReservationCount !== params.object.ids.length) {
                 throw new factory.errors.NotFound(factory.reservationType.EventReservation, `Some reservations dot not exist. ${params.object.ids.join(',')}`);
             }
-            yield repos.reservation.checkInIfNot({ id: { $in: params.object.ids }, now });
+            checkedInResult = yield repos.reservation.checkInIfNot({ id: { $in: params.object.ids }, now });
             checkedInReservationIds = params.object.ids;
         }
         if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
@@ -43,42 +44,38 @@ function checkInReservation(params) {
                     throw new factory.errors.NotFound(factory.reservationType.EventReservation, `Some reservations dot not exist. ${params.object.reservationNumbers.join(',')}`);
                 }
             }
-            yield repos.reservation.checkInIfNot({ reservationNumber: { $in: params.object.reservationNumbers }, now });
-            // support useNotificationCheckedInAsPackage(2024-11-06~)
-            if (!settings.useNotificationCheckedInAsPackage) {
-                // 予約番号リストを予約IDリストに変換
-                checkedInReservationIds = yield repos.reservation.searchIdsByReservationNumber({
-                    reservationNumber: { $in: params.object.reservationNumbers }
-                });
-            }
+            checkedInResult = yield repos.reservation.checkInIfNot({ reservationNumber: { $in: params.object.reservationNumbers }, now });
         }
+        const checkedInForTheFirstTime = typeof (checkedInResult === null || checkedInResult === void 0 ? void 0 : checkedInResult.modifiedCount) === 'number' && checkedInResult.modifiedCount > 0;
         if (Array.isArray(checkedInReservationIds)) {
             yield (0, onReservationCheckedIn_1.onReservationCheckedIn)({
                 project: params.project,
                 object: {
-                    ids: checkedInReservationIds
-                    // reservationFor: params.object.reservationFor
+                    ids: checkedInReservationIds,
+                    reservedTicket: Object.assign({}, (checkedInForTheFirstTime) ? { dateIssued: now } : undefined)
                 },
-                now,
+                // now,
                 purpose: params.purpose
-            })(repos, settings);
+            })(repos);
         }
         else if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
             yield (0, onReservationCheckedIn_1.onReservationCheckedIn)({
                 project: params.project,
                 object: {
-                    reservationNumbers: params.object.reservationNumbers
-                    // reservationFor: params.object.reservationFor
+                    reservationNumbers: params.object.reservationNumbers,
+                    reservedTicket: Object.assign({}, (checkedInForTheFirstTime) ? { dateIssued: now } : undefined)
                 },
-                now,
+                // now,
                 purpose: params.purpose
-            })(repos, settings);
+            })(repos);
         }
     });
 }
 exports.checkInReservation = checkInReservation;
 function reserveIfNotYet(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         let reserveTransactions = [];
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
             reserveTransactions = yield repos.assetTransaction.search({
@@ -106,7 +103,7 @@ function reserveIfNotYet(params) {
                 potentialReserveAction: { object: { reservationNumber: reserveTransaction.transactionNumber } },
                 useOnReservationConfirmed: false,
                 byTask: false
-            })(repos, settings);
+            })(repos);
             debug('confirmReservation processed in reserveIfNotYet. reservationNumber:', reserveTransaction.transactionNumber);
         })));
     });

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

@@ -1,8 +1,8 @@
 import * as factory from '../../factory';
-import { Settings } from '../../settings';
 import type { ActionRepo } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { ReservationRepo } from '../../repo/reservation';
+import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 /**
  * 予約を確定する
@@ -15,8 +15,9 @@ export declare function confirmReservation(params: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     reservation: ReservationRepo;
+    setting: SettingRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;
 type IReserveActionAttributes = Pick<factory.action.reserve.IAttributes, 'agent' | 'object' | 'potentialActions' | 'project' | 'purpose' | 'typeOf'>;
 export declare function reserveTransaction2action(params: {
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;

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

@@ -19,7 +19,9 @@ const debug = createDebug('chevre-domain:service:reserve:confirmReservation');
  * 予約を確定する
  */
 function confirmReservation(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         // await Promise.all(params.actionAttributesList.map(async (potentialReserveAction) => {
         //     const actionAttributes = await reserveIfNotYet(potentialReserveAction, { byTask: params.byTask })(repos);
         //     if (params.useOnReservationConfirmed) {
@@ -49,7 +51,7 @@ function confirmReservation(params) {
                     return r;
                 });
             }
-            yield (0, onReservationConfirmed_1.onReservationConfirmed)(confirmedReservations)({ task: repos.task }, settings);
+            yield (0, onReservationConfirmed_1.onReservationConfirmed)(confirmedReservations)(repos);
         }
     });
 }

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

@@ -1,8 +1,8 @@
 /**
  * 保留予約取消時アクション
  */
+import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-import { Settings } from '../../../settings';
 export declare function onPendingReservationCanceled(params: {
     project: {
         id: string;
@@ -15,5 +15,6 @@ export declare function onPendingReservationCanceled(params: {
     };
     reservationNumber: string;
 }): (repos: {
+    setting: SettingRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;

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

@@ -11,13 +11,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onPendingReservationCanceled = void 0;
 const factory = require("../../../factory");
+// import { Settings } from '../../../settings';
 const factory_1 = require("../factory");
 function onPendingReservationCanceled(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const { reservationFor, reservationNumber } = params;
         // create AggregateScreeningEvent task -> migrate to agg(2024-10-29~)
+        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onReservationStatusChanged']);
         // inform(2024-10-25~)
-        const informReservations = settings.onReservationStatusChanged.informReservation;
+        // const informReservations = settings.onReservationStatusChanged.informReservation;
+        const informReservations = (_a = setting === null || setting === void 0 ? void 0 : setting.onReservationStatusChanged) === null || _a === void 0 ? void 0 : _a.informReservation;
         const now = new Date();
         const taskAttributes = [];
         const informObject = {

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

@@ -2,8 +2,8 @@
  * 予約取消時アクション
  */
 import * as factory from '../../../factory';
+import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-import { Settings } from '../../../settings';
 export type ICanceledEventReservation = Pick<factory.reservation.IReservation<factory.reservationType.EventReservation>, 'project' | 'id' | 'typeOf' | 'modifiedTime' | 'reservationNumber'>;
 export type ICanceledBusReservation = Pick<factory.reservation.IReservation<factory.reservationType.BusReservation>, 'project' | 'id' | 'typeOf' | 'modifiedTime' | 'reservationNumber'>;
 export declare function onReservationCanceled(
@@ -20,5 +20,6 @@ reservationFor: {
     };
     id: string;
 }): (repos: {
+    setting: SettingRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;

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

@@ -14,6 +14,7 @@ exports.onReservationCanceled = void 0;
  * 予約取消時アクション
  */
 const factory = require("../../../factory");
+// import { Settings } from '../../../settings';
 const factory_1 = require("../factory");
 // tslint:disable-next-line:max-func-body-length
 function onReservationCanceled(
@@ -26,8 +27,13 @@ canceledReservations,
  * 集計対象イベント
  */
 reservationFor) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        const informReservations = settings.onReservationStatusChanged.informReservation;
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onReservationStatusChanged']);
+        // const informReservations = settings.onReservationStatusChanged.informReservation;
+        const informReservations = (_a = setting === null || setting === void 0 ? void 0 : setting.onReservationStatusChanged) === null || _a === void 0 ? void 0 : _a.informReservation;
         if (Array.isArray(canceledReservations) && canceledReservations.length > 0) {
             const now = new Date();
             const project = canceledReservations[0].project;

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

@@ -1,6 +1,6 @@
 import type { ReservationRepo } from '../../../repo/reservation';
+import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-import { Settings } from '../../../settings';
 export declare function onReservationCheckedIn(params: {
     project: {
         id: string;
@@ -14,8 +14,10 @@ export declare function onReservationCheckedIn(params: {
          * 予約番号で発券
          */
         reservationNumbers?: string[];
+        reservedTicket: {
+            dateIssued?: Date;
+        };
     };
-    now: Date;
     purpose: {
         /**
          * 承認コード
@@ -24,5 +26,6 @@ export declare function onReservationCheckedIn(params: {
     };
 }): (repos: {
     reservation: ReservationRepo;
+    setting: SettingRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;

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

@@ -15,19 +15,20 @@ exports.onReservationCheckedIn = void 0;
  */
 const factory = require("../../../factory");
 const factory_1 = require("../factory");
-// tslint:disable-next-line:max-func-body-length
 function onReservationCheckedIn(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        const { dateIssued } = params.object.reservedTicket;
+        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onReservationStatusChanged']);
         const tasks = [];
         const project = { id: params.project.id, typeOf: factory.organizationType.Project };
-        const informReservations = settings.onReservationStatusChanged.informReservation;
+        const informReservations = (_a = setting === null || setting === void 0 ? void 0 : setting.onReservationStatusChanged) === null || _a === void 0 ? void 0 : _a.informReservation;
         let reservations4inform = [];
-        const ticketToken = (_a = params.purpose) === null || _a === void 0 ? void 0 : _a.code;
+        const ticketToken = (_b = params.purpose) === null || _b === void 0 ? void 0 : _b.code;
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
             reservations4inform = params.object.ids.map((reservationId, index) => {
-                return Object.assign({ typeOf: factory.reservationType.EventReservation, project, id: reservationId, checkedIn: true, modifiedTime: params.now }, (index === 0 && typeof ticketToken === 'string') ? { reservedTicket: { ticketToken } } : undefined);
+                return Object.assign(Object.assign({ typeOf: factory.reservationType.EventReservation, project, id: reservationId, checkedIn: true }, (dateIssued instanceof Date) ? { modifiedTime: dateIssued } : undefined), (index === 0 && typeof ticketToken === 'string') ? { reservedTicket: { ticketToken } } : undefined);
             });
         }
         if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
@@ -36,12 +37,12 @@ function onReservationCheckedIn(params) {
                 const subReservationIds = yield repos.reservation.searchIdsByReservationNumber({
                     reservationNumber: { $in: [reservationNumber] }
                 });
-                return Object.assign({ typeOf: factory.reservationType.ReservationPackage, project,
-                    reservationNumber, checkedIn: true, modifiedTime: params.now, subReservation: subReservationIds.map((id) => ({ id })) }, (index === 0 && typeof ticketToken === 'string') ? { reservedTicket: { ticketToken } } : undefined);
+                return Object.assign(Object.assign({ typeOf: factory.reservationType.ReservationPackage, project,
+                    reservationNumber, checkedIn: true, subReservation: subReservationIds.map((id) => ({ id })) }, (dateIssued instanceof Date) ? { modifiedTime: dateIssued } : undefined), (index === 0 && typeof ticketToken === 'string') ? { reservedTicket: { ticketToken } } : undefined);
             })));
         }
         if (reservations4inform.length > 0) {
-            const informTaskRunsAt = params.now;
+            const informTaskRunsAt = new Date();
             // inform galobally
             if (Array.isArray(informReservations)) {
                 informReservations.forEach((informReservation) => {

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

@@ -2,8 +2,8 @@
  * 予約確定時アクション
  */
 import * as factory from '../../../factory';
+import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-import { Settings } from '../../../settings';
 type IEventReservation = factory.reservation.IReservation<factory.reservationType.EventReservation>;
 /**
  * 予約確定後のアクション
@@ -12,6 +12,7 @@ export declare function onReservationConfirmedByAction(actionAttributes: Pick<fa
     task: TaskRepo;
 }) => Promise<void>;
 export declare function onReservationConfirmed(confirmedReservations: IEventReservation[]): (repos: {
+    setting: SettingRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;
 export {};