@chevre/domain 24.0.0-alpha.8 → 24.0.0-alpha.80

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

@@ -1,67 +1,44 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.voidTransaction = voidTransaction;
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 const refundMovieTicket_1 = require("./refundMovieTicket");
 function voidTransaction(params) {
     return async (repos, settings) => {
         const transaction = params.object;
         const paymentMethodType = transaction.object.paymentMethod?.identifier;
         if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
+            throw new factory_1.factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         // const paymentMethodId = transaction.object.paymentMethod?.paymentMethodId;
         const paymentMethodId = transaction.object.paymentMethodId;
         if (typeof paymentMethodId !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethodId');
+            throw new factory_1.factory.errors.ArgumentNull('object.paymentMethodId');
         }
         // 決済開始時に着券していれば、取消
         // 例えばtimeoutが原因でCompletedActionStatusでない場合、外部サービス側では着券済の可能性もあるので、そこを考慮する
-        const payAction = await repos.action.findPayAction({
+        const payAction = await repos.actions.pay.findPayActionByPaymentMethodId({
             project: { id: transaction.project.id },
             paymentMethodId,
             actionStatus: {
                 $in: [
-                    factory.actionStatusType.ActiveActionStatus,
-                    factory.actionStatusType.CompletedActionStatus,
-                    factory.actionStatusType.FailedActionStatus
+                    factory_1.factory.actionStatusType.ActiveActionStatus,
+                    factory_1.factory.actionStatusType.CompletedActionStatus,
+                    factory_1.factory.actionStatusType.FailedActionStatus
                 ]
             }
         });
         if (payAction !== undefined) {
             const seller = transaction.recipient;
             if (typeof seller?.id !== 'string') {
-                throw new factory.errors.NotFound('payTransaction.recipient');
+                throw new factory_1.factory.errors.NotFound('payTransaction.recipient');
             }
-            if (payAction.purpose.typeOf !== factory.order.OrderType.Order) {
-                throw new factory.errors.Internal(`unexpected payAction.purpose.typeOf ${payAction.purpose.typeOf}`);
+            if (payAction.purpose.typeOf !== factory_1.factory.order.OrderType.Order) {
+                throw new factory_1.factory.errors.Internal(`unexpected payAction.purpose.typeOf ${payAction.purpose.typeOf}`);
             }
             const refundAction = {
                 project: transaction.project,
-                typeOf: factory.actionType.RefundAction,
+                typeOf: factory_1.factory.actionType.RefundAction,
                 object: [{
                         typeOf: transaction.object.typeOf,
                         id: (typeof transaction.object.id === 'string') ? transaction.object.id : '',

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

@@ -1,7 +1,7 @@
 /**
  * 許可証サービス
  */
-import * as factory from '../factory';
+import { factory } from '../factory';
 import type { AccountRepo } from '../repo/account';
 import type { ServiceOutputRepo } from '../repo/serviceOutput';
 /**

package/lib/chevre/service/permit.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.issue = issue;
 exports.activate = activate;
@@ -29,7 +39,7 @@ exports.search = search;
 /**
  * 許可証サービス
  */
-const factory = __importStar(require("../factory"));
+const factory_1 = require("../factory");
 const AccountService = __importStar(require("./account"));
 /**
  * 許可証発行
@@ -37,7 +47,7 @@ const AccountService = __importStar(require("./account"));
 function issue(params) {
     return async (repos) => {
         switch (params.issuedThrough.typeOf) {
-            case factory.product.ProductType.PaymentCard:
+            case factory_1.factory.product.ProductType.PaymentCard: {
                 // 口座開設
                 const openAccountParams = params.serviceOutputs.map((serviceOutput) => {
                     const accountTypeOf = serviceOutput?.paymentAccount?.typeOf;
@@ -46,13 +56,13 @@ function issue(params) {
                     const accountType = serviceOutput?.amount?.currency;
                     const initialBalance = serviceOutput?.amount?.value;
                     if (typeof accountTypeOf !== 'string' || accountTypeOf.length === 0) {
-                        throw new factory.errors.Internal('serviceOutput.paymentAccount.typeOf undefined');
+                        throw new factory_1.factory.errors.Internal('serviceOutput.paymentAccount.typeOf undefined');
                     }
                     if (typeof accountNumber !== 'string' || accountNumber.length === 0) {
-                        throw new factory.errors.Internal('serviceOutput.paymentAccount.accountNumber undefined');
+                        throw new factory_1.factory.errors.Internal('serviceOutput.paymentAccount.accountNumber undefined');
                     }
                     if (typeof accountType !== 'string' || accountType.length === 0) {
-                        throw new factory.errors.Internal('Account currency undefined');
+                        throw new factory_1.factory.errors.Internal('Account currency undefined');
                     }
                     return {
                         project: { id: params.project.id },
@@ -76,6 +86,7 @@ function issue(params) {
                     account: repos.account
                 });
                 break;
+            }
             default:
             // no op
         }
@@ -105,7 +116,7 @@ function search(project, params, projection) {
         };
         const productType = params.issuedThrough?.typeOf?.$eq;
         switch (productType) {
-            case factory.product.ProductType.PaymentCard:
+            case factory_1.factory.product.ProductType.PaymentCard: {
                 const permits = await repos.serviceOutput.search(searchConditions, projection);
                 permitsWithAccountDetail = permits;
                 // 口座詳細取得
@@ -138,6 +149,7 @@ function search(project, params, projection) {
                     });
                 }
                 break;
+            }
             default:
                 permitsWithAccountDetail = await repos.serviceOutput.search(searchConditions, projection);
         }

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

@@ -1,4 +1,4 @@
-import * as factory from '../factory';
+import { factory } from '../factory';
 import type { ActionRepo } from '../repo/action';
 import type { ServiceOutputRepo } from '../repo/serviceOutput';
 import type { TaskRepo } from '../repo/task';

package/lib/chevre/service/product.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -31,7 +8,6 @@ exports.registerService = registerService;
  * プロダクトサービス
  */
 const moment_1 = __importDefault(require("moment"));
-const factory = __importStar(require("../factory"));
 const permit_1 = require("./permit");
 function registerService(params) {
     return async (repos) => {
@@ -75,24 +51,25 @@ function registerService(params) {
 function onRegistered(actionAttributes, __) {
     return async (repos) => {
         const potentialActions = actionAttributes.potentialActions;
-        const now = new Date();
+        // const now = new Date();
         const taskAttributes = [];
         /* istanbul ignore else */
         if (potentialActions !== undefined) {
-            if (Array.isArray(potentialActions.moneyTransfer)) {
-                taskAttributes.push(...potentialActions.moneyTransfer.map((a) => {
-                    return {
-                        project: a.project,
-                        name: factory.taskName.MoneyTransfer,
-                        status: factory.taskStatus.Ready,
-                        runsAt: now,
-                        remainingNumberOfTries: 10,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data: a
-                    };
-                }));
-            }
+            // discontinue(2026-04-18~)
+            // if (Array.isArray(potentialActions.moneyTransfer)) {
+            //     taskAttributes.push(...potentialActions.moneyTransfer.map((a) => {
+            //         return {
+            //             project: a.project,
+            //             name: factory.taskName.MoneyTransfer as factory.taskName.MoneyTransfer,
+            //             status: factory.taskStatus.Ready,
+            //             runsAt: now,
+            //             remainingNumberOfTries: 10,
+            //             numberOfTried: 0,
+            //             executionResults: [],
+            //             data: a
+            //         };
+            //     }));
+            // }
         }
         // タスク保管
         await repos.task.saveMany(taskAttributes, { emitImmediately: true });

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

@@ -1,4 +1,4 @@
-import * as factory from '../../factory';
+import { factory } from '../../factory';
 import type { ActionRepo } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import { OfferRateLimitRepo } from '../../repo/rateLimit/offer';
@@ -36,9 +36,9 @@ declare function processUnlockOfferRateLimit(params: {
     };
     reservation: {
         reservationNumber: string;
-        reservedTicket: factory.reservation.ITicket;
+        reservedTicket: Pick<factory.assetTransaction.reserve.ISubReservationReservedTicket, 'ticketType'>;
     };
-    reservationFor: factory.assetTransaction.reserve.IReservationFor;
+    reservationFor: Pick<factory.assetTransaction.reserve.IReservationFor, 'id' | 'typeOf' | 'startDate'>;
 }): (repos: {
     offerRateLimit: OfferRateLimitRepo;
 }) => Promise<void>;

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

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -33,8 +10,8 @@ exports.processUnlockOfferRateLimit = processUnlockOfferRateLimit;
  * 予約サービス
  */
 const moment_1 = __importDefault(require("moment"));
-const factory = __importStar(require("../../factory"));
-const factory_1 = require("./factory");
+const factory_1 = require("../../factory");
+const factory_2 = require("./factory");
 const onPendingReservationCanceled_1 = require("./potentialActions/onPendingReservationCanceled");
 const onReservationCanceled_1 = require("./potentialActions/onReservationCanceled");
 /**
@@ -65,23 +42,23 @@ function cancelPengindIfNotYet(params) {
         const reserveTransactions = await repos.assetTransaction.search({
             limit: 1,
             page: 1,
-            typeOf: factory.assetTransactionType.Reserve,
+            typeOf: factory_1.factory.assetTransactionType.Reserve,
             ids: [reserveTransactionId]
         });
         const reserveTransaction = reserveTransactions.shift();
         if (reserveTransaction === undefined) {
-            throw new factory.errors.NotFound(factory.assetTransactionType.Reserve);
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.assetTransactionType.Reserve);
         }
         let actionId;
-        const actionAttributes = (0, factory_1.createCancelPendingReservationAction)({ transaction: reserveTransaction });
+        const actionAttributes = (0, factory_2.createCancelPendingReservationAction)({ transaction: reserveTransaction });
         // 冪等性を担保(2023-06-05~)
-        const completedActions = await repos.action.search({
+        const completedActions = await repos.action.findActionsByType({
             limit: 1,
             page: 1,
-            actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
-            typeOf: { $eq: factory.actionType.CancelAction },
+            actionStatus: { $in: [factory_1.factory.actionStatusType.CompletedActionStatus] },
+            typeOf: { $eq: factory_1.factory.actionType.CancelAction },
             object: {
-                typeOf: { $eq: factory.reservationType.ReservationPackage },
+                typeOf: { $eq: factory_1.factory.reservationType.ReservationPackage },
                 reservationNumber: { $eq: reserveTransaction.transactionNumber }
             },
             purpose: {
@@ -100,10 +77,10 @@ function cancelPengindIfNotYet(params) {
                     if (reserveTransaction !== undefined) {
                         const reservationFor = reserveTransaction.object.reservationFor;
                         if (reservationFor === undefined) {
-                            throw new factory.errors.NotFound('transaction.object.reservationFor');
+                            throw new factory_1.factory.errors.NotFound('transaction.object.reservationFor');
                         }
                         // ReservationPackageに対応(2022-12-23~)
-                        if (actionObject.typeOf === factory.reservationType.ReservationPackage) {
+                        if (actionObject.typeOf === factory_1.factory.reservationType.ReservationPackage) {
                             const subReservation = reserveTransaction.object.subReservation;
                             if (Array.isArray(subReservation) && subReservation.length > 0) {
                                 await Promise.all(subReservation.map(async (cancelingSubReservation) => {
@@ -115,9 +92,7 @@ function cancelPengindIfNotYet(params) {
                                             subReservation: cancelingSubReservation.subReservation,
                                             reservationFor: {
                                                 id: String(reservationFor.id),
-                                                startDate: (reservationFor.typeOf === factory.eventType.ScreeningEvent)
-                                                    ? reservationFor.startDate
-                                                    : reservationFor.departureTime
+                                                startDate: reservationFor.startDate
                                             }
                                         },
                                         // holder:取引番号に対応(2023-06-05~)
@@ -140,12 +115,12 @@ function cancelPengindIfNotYet(params) {
                             }
                             else {
                                 // 完全廃止(2023-07-19~)
-                                throw new factory.errors.NotImplemented('disablePendingReservations must be true');
+                                throw new factory_1.factory.errors.NotImplemented('disablePendingReservations must be true');
                             }
                         }
                         else {
                             // 廃止(2022-12-27~)
-                            throw new factory.errors.NotImplemented(`object.typeOf '${actionObject.typeOf}' not implemented`);
+                            throw new factory_1.factory.errors.NotImplemented(`object.typeOf '${actionObject.typeOf}' not implemented`);
                         }
                     }
                 }
@@ -192,21 +167,21 @@ function cancelReservation(actionAttributesList) {
                 let cancelResult;
                 let canceledReservationForId;
                 try {
-                    if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
+                    if (actionAttributes.object.typeOf === factory_1.factory.reservationType.ReservationPackage) {
                         // 予約取引を検索
                         const reserveTransactions = await repos.assetTransaction.search({
                             limit: 1,
                             page: 1,
-                            typeOf: factory.assetTransactionType.Reserve,
+                            typeOf: factory_1.factory.assetTransactionType.Reserve,
                             transactionNumber: { $eq: actionAttributes.object.reservationNumber }
                         });
                         const reserveTransaction = reserveTransactions.shift();
                         if (reserveTransaction === undefined) {
-                            throw new factory.errors.NotFound(factory.assetTransactionType.Reserve);
+                            throw new factory_1.factory.errors.NotFound(factory_1.factory.assetTransactionType.Reserve);
                         }
                         const reservationFor = reserveTransaction.object.reservationFor;
                         if (reservationFor === undefined) {
-                            throw new factory.errors.NotFound('transaction.object.reservationFor');
+                            throw new factory_1.factory.errors.NotFound('transaction.object.reservationFor');
                         }
                         canceledReservationForId = String(reservationFor.id);
                         const subReservation = reserveTransaction.object.subReservation;
@@ -220,9 +195,7 @@ function cancelReservation(actionAttributesList) {
                                         subReservation: cancelingSubReservation.subReservation,
                                         reservationFor: {
                                             id: String(reservationFor.id),
-                                            startDate: (reservationFor.typeOf === factory.eventType.ScreeningEvent)
-                                                ? reservationFor.startDate
-                                                : reservationFor.departureTime
+                                            startDate: reservationFor.startDate
                                         }
                                     },
                                     // holder:取引番号に対応(2023-06-05~)
@@ -248,7 +221,7 @@ function cancelReservation(actionAttributesList) {
                         });
                     }
                     else {
-                        const reservation = await repos.reservation.projectFieldsById({
+                        const reservation = await repos.reservation.findReservationById({
                             id: actionAttributes.object.id,
                             inclusion: ['reservationNumber', 'reservationStatus', 'project', 'reservedTicket', 'subReservation', 'reservationFor']
                         });
@@ -256,7 +229,7 @@ function cancelReservation(actionAttributesList) {
                         const reserveTransactions = await repos.assetTransaction.search({
                             limit: 1,
                             page: 1,
-                            typeOf: factory.assetTransactionType.Reserve,
+                            typeOf: factory_1.factory.assetTransactionType.Reserve,
                             object: { reservations: { id: { $in: [reservation.id] } } }
                         });
                         const reserveTransaction = reserveTransactions.shift();
@@ -280,14 +253,18 @@ function cancelReservation(actionAttributesList) {
                                 expectedHolder
                             })(repos);
                         }
-                        await processUnlockOfferRateLimit({
-                            project: { id: reservation.project.id },
-                            reservation: {
-                                reservationNumber: reservation.reservationNumber,
-                                reservedTicket: reservation.reservedTicket
-                            },
-                            reservationFor: reservation.reservationFor
-                        })(repos);
+                        const subReservationByTransaction = reserveTransaction?.object.subReservation?.find((s) => s.id === reservation.id);
+                        if (subReservationByTransaction !== undefined) {
+                            await processUnlockOfferRateLimit({
+                                project: { id: reservation.project.id },
+                                reservation: {
+                                    reservationNumber: reservation.reservationNumber,
+                                    // reservedTicket: reservation.reservedTicket
+                                    reservedTicket: subReservationByTransaction.reservedTicket
+                                },
+                                reservationFor: reservation.reservationFor
+                            })(repos);
+                        }
                         // 予約をキャンセル状態に変更する
                         await repos.reservation.cancelById({
                             id: reservation.id,
@@ -319,14 +296,15 @@ function cancelReservation(actionAttributesList) {
                 };
                 await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
                 let canceledReservations = [];
-                if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
+                if (actionAttributes.object.typeOf === factory_1.factory.reservationType.ReservationPackage) {
                     const reservationNumber = actionAttributes.object.reservationNumber;
                     if (typeof reservationNumber === 'string' && reservationNumber.length > 0) {
                         // 最新のconfirmedReservationsを検索
-                        canceledReservations = await repos.reservation.projectFields({
+                        canceledReservations = await repos.reservation.findReservations({
                             reservationNumber: { $eq: reservationNumber },
-                            typeOf: factory.reservationType.EventReservation
-                        }, { project: 1, typeOf: 1, modifiedTime: 1, reservationNumber: 1 });
+                            typeOf: factory_1.factory.reservationType.EventReservation
+                        }, { project: 1, typeOf: 1, modifiedTime: 1, reservationNumber: 1 } // 廃止属性の影響なし(2026-03-25~)
+                        );
                         canceledReservations = canceledReservations.map((r) => {
                             // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
                             delete r._id;
@@ -335,7 +313,7 @@ function cancelReservation(actionAttributesList) {
                     }
                 }
                 else {
-                    const canceledReservation = await repos.reservation.projectFieldsById({
+                    const canceledReservation = await repos.reservation.findReservationById({
                         id: actionAttributes.object.id,
                         inclusion: ['project', 'typeOf', 'modifiedTime', 'reservationNumber']
                     });
@@ -425,8 +403,8 @@ function processUnlockSeat(params) {
 function processUnlockOfferRateLimit(params) {
     return async (repos) => {
         const reservation = params.reservation;
-        const scope = reservation.reservedTicket.ticketType.validRateLimit?.scope;
-        const unitInSeconds = reservation.reservedTicket.ticketType.validRateLimit?.unitInSeconds;
+        const scope = reservation.reservedTicket.ticketType?.validRateLimit?.scope;
+        const unitInSeconds = reservation.reservedTicket.ticketType?.validRateLimit?.unitInSeconds;
         if (typeof scope === 'string' && typeof unitInSeconds === 'number') {
             const rateLimitKey = {
                 project: { id: params.project.id },
@@ -439,11 +417,8 @@ function processUnlockOfferRateLimit(params) {
                     }
                 },
                 reservationFor: {
-                    startDate: (params.reservationFor.typeOf === factory.eventType.ScreeningEvent)
-                        ? (0, moment_1.default)(params.reservationFor.startDate)
-                            .toDate()
-                        : (0, moment_1.default)(params.reservationFor.departureTime)
-                            .toDate()
+                    startDate: (0, moment_1.default)(params.reservationFor.startDate)
+                        .toDate()
                 },
                 reservationNumber: reservation.reservationNumber
             };

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

@@ -1,34 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkInReservation = checkInReservation;
 const debug_1 = __importDefault(require("debug"));
-const factory = __importStar(require("../../factory"));
+const factory_1 = require("../../factory");
 const confirmReservation_1 = require("./confirmReservation");
 const onReservationCheckedIn_1 = require("./potentialActions/onReservationCheckedIn");
 const debug = (0, debug_1.default)('chevre-domain:service:reserve:checkInReservation');
@@ -43,11 +20,11 @@ function checkInReservation(params) {
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
             const existingReservationCount = await repos.reservation.count({
                 id: { $in: params.object.ids },
-                typeOf: factory.reservationType.EventReservation
+                typeOf: factory_1.factory.reservationType.EventReservation
             });
             if (existingReservationCount !== params.object.ids.length) {
                 if (params.options.retryOnReservationNotFound === true) {
-                    throw new factory.errors.NotFound(factory.reservationType.EventReservation, `Some reservations dot not exist. ${params.object.ids.join(',')}`);
+                    throw new factory_1.factory.errors.NotFound(factory_1.factory.reservationType.EventReservation, `Some reservations dot not exist. ${params.object.ids.join(',')}`);
                 }
             }
             if (existingReservationCount > 0) {
@@ -60,11 +37,11 @@ function checkInReservation(params) {
             for (const reservationNumber of params.object.reservationNumbers) {
                 const existingReservationCount = await repos.reservation.count({
                     reservationNumber: { $eq: reservationNumber },
-                    typeOf: factory.reservationType.EventReservation
+                    typeOf: factory_1.factory.reservationType.EventReservation
                 });
                 if (existingReservationCount === 0) {
                     if (params.options.retryOnReservationNotFound === true) {
-                        throw new factory.errors.NotFound(factory.reservationType.EventReservation, `Some reservations dot not exist. ${params.object.reservationNumbers.join(',')}`);
+                        throw new factory_1.factory.errors.NotFound(factory_1.factory.reservationType.EventReservation, `Some reservations dot not exist. ${params.object.reservationNumbers.join(',')}`);
                     }
                 }
                 if (existingReservationCount > 0) {
@@ -114,21 +91,21 @@ function reserveIfNotYet(params) {
         let reserveTransactions = [];
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
             reserveTransactions = await repos.assetTransaction.search({
-                typeOf: factory.assetTransactionType.Reserve,
+                typeOf: factory_1.factory.assetTransactionType.Reserve,
                 object: {
                     reservations: { id: { $in: params.object.ids } }
                 },
-                statuses: [factory.transactionStatusType.Confirmed]
+                statuses: [factory_1.factory.transactionStatusType.Confirmed]
             }, ['transactionNumber']);
             debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. ids:', params.object.ids, 'reserveTransactions:', JSON.stringify(reserveTransactions));
         }
         if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
             reserveTransactions = await repos.assetTransaction.search({
-                typeOf: factory.assetTransactionType.Reserve,
+                typeOf: factory_1.factory.assetTransactionType.Reserve,
                 object: {
                     reservationNumber: { $in: params.object.reservationNumbers }
                 },
-                statuses: [factory.transactionStatusType.Confirmed]
+                statuses: [factory_1.factory.transactionStatusType.Confirmed]
             }, ['transactionNumber']);
             debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. reservationNumbers:', params.object.reservationNumbers, 'reserveTransactions:', JSON.stringify(reserveTransactions));
         }

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

@@ -1,4 +1,4 @@
-import * as factory from '../../factory';
+import { factory } from '../../factory';
 import type { ActionRepo } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../repo/authorization';