@chevre/domain 24.0.0-alpha.9 → 24.0.0

package/lib/chevre/service/aggregation/event/aggregateOffers.d.ts

@@ -7,7 +7,7 @@ import type { ProductRepo } from '../../../repo/product';
 import { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { ReservationRepo } from '../../../repo/reservation';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
-import * as factory from '../../../factory';
+import { factory } from '../../../factory';
 type IAggregateOffersOperation<T> = (repos: {
     aggregateReservation: AggregateReservationRepo;
     event: EventRepo;

package/lib/chevre/service/aggregation/event/aggregateOffers.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 };
 };
@@ -29,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.aggregateOffers = aggregateOffers;
 const debug_1 = __importDefault(require("debug"));
 const moment_timezone_1 = __importDefault(require("moment-timezone"));
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 const findEventOffers_1 = require("./findEventOffers");
 const debug = (0, debug_1.default)('chevre-domain:service:aggregation');
 /**
@@ -68,11 +45,11 @@ function aggregateOffersByEvent(params) {
         const event = params.event;
         // 施設取得は冗長なので、ルーム検索に変更(2023-01-30~)
         let movieTheaterId;
-        if (params.event.typeOf === factory.eventType.ScreeningEvent) {
+        if (params.event.typeOf === factory_1.factory.eventType.ScreeningEvent) {
             movieTheaterId = params.event.superEvent.location.id;
         }
         else {
-            throw new factory.errors.NotImplemented(`typeOf: ${params.event.typeOf}`);
+            throw new factory_1.factory.errors.NotImplemented(`typeOf: ${params.event.typeOf}`);
         }
         const screeningRoom = await repos.screeningRoom.findScreeningRoomsByBranchCode({
             project: { id: event.project.id },
@@ -138,7 +115,7 @@ function aggregateOfferByEvent(params) {
             });
         }
         return {
-            typeOf: factory.offerType.AggregateOffer,
+            typeOf: factory_1.factory.offerType.AggregateOffer,
             aggregateDate: params.aggregateDate,
             offerCount: offersIncludedInAggregateReservation.length,
             offers: offersWithAggregateReservation
@@ -150,7 +127,7 @@ function aggregateReservationByOffer(params) {
         let reservationCount4offer;
         // let attendeeCount4offer: number | undefined;
         // let checkInCount4offer: number | undefined;
-        const reservationType = factory.reservationType.EventReservation;
+        const reservationType = factory_1.factory.reservationType.EventReservation;
         const offerIdsWithSameCategory = params.availableOffers.filter(({ category }) => {
             return typeof category?.codeValue === 'string' && category.codeValue === params.offer.category?.codeValue;
         })
@@ -159,7 +136,7 @@ function aggregateReservationByOffer(params) {
             reservationCount4offer = await repos.reservation.count({
                 typeOf: reservationType,
                 reservationFor: { id: { $eq: params.event.id } },
-                reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
+                reservationStatuses: [factory_1.factory.reservationStatusType.ReservationConfirmed],
                 // オファーカテゴリーごとに集計する(2024-11-10~)
                 // reservedTicket: { ticketType: { ids: [<string>params.offer.id] } }
                 reservedTicket: { ticketType: { ids: offerIdsWithSameCategory } }

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.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 };
 };
@@ -32,7 +9,7 @@ exports.aggregateScreeningEvent = aggregateScreeningEvent;
  */
 const debug_1 = __importDefault(require("debug"));
 const moment_timezone_1 = __importDefault(require("moment-timezone"));
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 // import { Settings } from '../../../settings';
 const findEventOffers_1 = require("./findEventOffers");
 const debug = (0, debug_1.default)('chevre-domain:service:aggregation');
@@ -52,7 +29,7 @@ function aggregateScreeningEvent(params) {
         });
         const useOfferRateLimit = project.settings?.useOfferRateLimit === true;
         let useAggregateOffer = false;
-        if (event.typeOf === factory.eventType.ScreeningEvent) {
+        if (event.typeOf === factory_1.factory.eventType.ScreeningEvent) {
             const eventSeriesIdsByProject = project.settings?.useAggregateReservation?.eventSeriesIds;
             const eventSeriesIdIncluded = Array.isArray(eventSeriesIdsByProject) && eventSeriesIdsByProject.includes(event.superEvent.id);
             const useAggregateOfferByProject = project.settings?.useAggregateOffer === true;
@@ -72,13 +49,13 @@ function aggregateScreeningEvent(params) {
                     .add(1, 'hour')
                     .add(-1, 'second')
                     .toDate();
-                if (event.typeOf === factory.eventType.ScreeningEvent) {
+                if (event.typeOf === factory_1.factory.eventType.ScreeningEvent) {
                     aggregatingEvents = await repos.event.projectEventFields({
                         limit: 100,
                         page: 1,
                         project: { id: { $eq: event.project.id } },
                         typeOf: event.typeOf,
-                        eventStatuses: [factory.eventStatusType.EventScheduled],
+                        eventStatuses: [factory_1.factory.eventStatusType.EventScheduled],
                         startFrom: startFrom,
                         startThrough: startThrough,
                         location: { branchCode: { $eq: event.location.branchCode } }
@@ -103,11 +80,11 @@ function aggregateByEvent(params, options) {
         const event = params.event;
         // 施設取得は冗長なので、ルーム検索に変更(2023-01-30~)
         let movieTheaterId;
-        if (params.event.typeOf === factory.eventType.ScreeningEvent) {
+        if (params.event.typeOf === factory_1.factory.eventType.ScreeningEvent) {
             movieTheaterId = params.event.superEvent.location.id;
         }
         else {
-            throw new factory.errors.NotImplemented(`typeOf: ${params.event.typeOf}`);
+            throw new factory_1.factory.errors.NotImplemented(`typeOf: ${params.event.typeOf}`);
         }
         const screeningRoom = await repos.screeningRoom.findScreeningRoomsByBranchCode({
             project: { id: event.project.id },
@@ -164,13 +141,13 @@ function onAggregated(params, options) {
             // AggregateOffersタスクへ移行(2024-03-25~)
             const aggregateOffersTaskAttributes = {
                 project: params.event.project,
-                name: factory.taskName.AggregateOffers,
-                status: factory.taskStatus.Ready,
+                name: factory_1.factory.taskName.AggregateOffers,
+                status: factory_1.factory.taskStatus.Ready,
                 runsAt: new Date(),
                 remainingNumberOfTries: 10,
                 numberOfTried: 0,
                 executionResults: [],
-                data: { typeOf: factory.eventType.ScreeningEvent, id: params.event.id }
+                data: { typeOf: factory_1.factory.eventType.ScreeningEvent, id: params.event.id }
             };
             await repos.task.saveMany([aggregateOffersTaskAttributes], { emitImmediately: true });
         }
@@ -183,7 +160,7 @@ function aggregateOfferByEvent(params) {
     return async (repos) => {
         const { offerCount } = await calculateOfferCount({ event: params.event })(repos);
         return {
-            typeOf: factory.offerType.AggregateOffer,
+            typeOf: factory_1.factory.offerType.AggregateOffer,
             aggregateDate: params.aggregateDate,
             offerCount
         };
@@ -202,7 +179,7 @@ function calculateOfferCount(params) {
             // []
             )).shift();
             if (eventService === undefined) {
-                throw new factory.errors.NotFound(factory.product.ProductType.EventService);
+                throw new factory_1.factory.errors.NotFound(factory_1.factory.product.ProductType.EventService);
             }
             // const firstCatalogIdOfProduct = eventService.hasOfferCatalog?.id; // migrate to itemListElement(2024-09-30~)
             const firstCatalogIdOfProduct = eventService.hasOfferCatalog?.itemListElement.at(0)?.id;
@@ -226,11 +203,11 @@ function aggregateReservationByEvent(params) {
         // 収容人数を集計
         let maximumAttendeeCapacity;
         let remainingAttendeeCapacity;
-        const reservationType = factory.reservationType.EventReservation;
+        const reservationType = factory_1.factory.reservationType.EventReservation;
         const reservationCount = await repos.reservation.count({
             typeOf: reservationType,
             reservationFor: { id: { $eq: params.event.id } },
-            reservationStatuses: [factory.reservationStatusType.ReservationConfirmed]
+            reservationStatuses: [factory_1.factory.reservationStatusType.ReservationConfirmed]
         });
         // maximumAttendeeCapacityを決定
         let eventLocationMaximumAttendeeCapacity = params.event.location.maximumAttendeeCapacity;

package/lib/chevre/service/aggregation/event/findEventOffers.js

@@ -1,30 +1,7 @@
 "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.findEventOffers = findEventOffers;
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 /**
  * 興行オファー検索
  * NotFoundエラーをハンドリングする
@@ -44,7 +21,7 @@ function findEventOffers(params) {
                 // []
                 )).shift();
                 if (eventService === undefined) {
-                    throw new factory.errors.NotFound(factory.product.ProductType.EventService);
+                    throw new factory_1.factory.errors.NotFound(factory_1.factory.product.ProductType.EventService);
                 }
                 // const offerCatalogId = eventService.hasOfferCatalog?.id; // migrate to itemListElement(2024-09-30~)
                 const offerCatalogId = eventService.hasOfferCatalog?.itemListElement.at(0)?.id;
@@ -64,13 +41,13 @@ function findEventOffers(params) {
                 }
             }
             else {
-                throw new factory.errors.NotFound('event.offers.itemOffered.id');
+                throw new factory_1.factory.errors.NotFound('event.offers.itemOffered.id');
             }
         }
         catch (error) {
             let throwsError = true;
             // 万が一カタログが見つからない場合に対応
-            if (error instanceof factory.errors.NotFound) {
+            if (error instanceof factory_1.factory.errors.NotFound) {
                 throwsError = false;
             }
             if (throwsError) {

package/lib/chevre/service/aggregation/event/importFromCOA.d.ts

@@ -1,9 +1,9 @@
 /**
  * COAイベント集計サービス
  */
-import type * as COA from '@motionpicture/coa-service';
+import type { COA } from '@motionpicture/coa-service';
 import type { EventRepo } from '../../../repo/event';
-import * as factory from '../../../factory';
+import { factory } from '../../../factory';
 /**
  * イベント席数を更新する
  */

package/lib/chevre/service/aggregation/event/importFromCOA.js

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.importFromCOA = importFromCOA;
 const debug_1 = __importDefault(require("debug"));
 const moment_timezone_1 = __importDefault(require("moment-timezone"));
+const factory_1 = require("../../../factory");
 const saveScreeningEvents_1 = require("../../event/saveScreeningEvents");
+const errorHandler_1 = require("../../../errorHandler");
 const debug = (0, debug_1.default)('chevre-domain:service');
 /**
  * イベント席数を更新する
@@ -25,7 +27,7 @@ function importFromCOA(params) {
                     .format('YYYYMMDD') // COAは日本時間で判断
             });
             debug('countFreeSeatResult:', countFreeSeatResult);
-            const bulkWriteOps = [];
+            const bulkWriteOps = []; // eslint-disable-line @typescript-eslint/no-explicit-any
             if (Array.isArray(countFreeSeatResult.listDate)) {
                 for (const countFreeSeatDate of countFreeSeatResult.listDate) {
                     if (Array.isArray(countFreeSeatDate.listPerformance)) {
@@ -66,14 +68,10 @@ function importFromCOA(params) {
         }
         catch (error) {
             let throwsError = true;
-            if (error.name === 'AbortError') {
+            const handledCOAError = (0, errorHandler_1.handleCOAError)(error);
+            if (handledCOAError instanceof factory_1.factory.errors.GatewayTimeout) {
                 throwsError = false;
             }
-            if (error.name === 'COAServiceError') {
-                if (error.message === 'ESOCKETTIMEDOUT') {
-                    throwsError = false;
-                }
-            }
             if (throwsError) {
                 throw error;
             }

package/lib/chevre/service/aggregation/project.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 };
 };
@@ -32,7 +9,7 @@ exports.aggregate = aggregate;
  */
 const debug_1 = __importDefault(require("debug"));
 const moment_1 = __importDefault(require("moment"));
-const factory = __importStar(require("../../factory"));
+const factory_1 = require("../../factory");
 const debug = (0, debug_1.default)('chevre-domain:service');
 function aggregate(params) {
     return async (repos) => {
@@ -84,20 +61,20 @@ function aggregateReservationOnProject(params) {
             debug('counting...', reservationForConditions);
             reservationCount += await repos.reservation.count({
                 project: { id: { $eq: params.project.id } },
-                typeOf: factory.reservationType.EventReservation,
+                typeOf: factory_1.factory.reservationType.EventReservation,
                 reservationFor: reservationForConditions,
-                reservationStatuses: [factory.reservationStatusType.ReservationConfirmed]
+                reservationStatuses: [factory_1.factory.reservationStatusType.ReservationConfirmed]
             });
             attendeeCount += await repos.reservation.count({
                 project: { id: { $eq: params.project.id } },
-                typeOf: factory.reservationType.EventReservation,
+                typeOf: factory_1.factory.reservationType.EventReservation,
                 reservationFor: reservationForConditions,
                 // reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
                 attended: true
             });
             checkInCount += await repos.reservation.count({
                 project: { id: { $eq: params.project.id } },
-                typeOf: factory.reservationType.EventReservation,
+                typeOf: factory_1.factory.reservationType.EventReservation,
                 reservationFor: reservationForConditions,
                 // reservationStatuses: [factory.reservationStatusType.ReservationConfirmed],
                 checkedIn: true

package/lib/chevre/service/aggregation/system.d.ts

@@ -1,4 +1,4 @@
-import type { ActionRepo } from '../../repo/action';
+import type { AggregateActionRepo } from '../../repo/aggregateAction';
 import { AggregationRepo } from '../../repo/aggregation';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { EventRepo } from '../../repo/event';
@@ -46,7 +46,7 @@ declare function aggregatePlaceOrder(params: IAggregateParams & {
  */
 declare function aggregateAuthorizeEventServiceOfferAction(params: IAggregateParams): (repos: {
     agregation: AggregationRepo;
-    action: ActionRepo;
+    aggregateAction: AggregateActionRepo;
 }) => Promise<{
     aggregationCount: number;
     aggregateDuration: string;
@@ -56,14 +56,14 @@ declare function aggregateAuthorizeEventServiceOfferAction(params: IAggregatePar
  */
 declare function aggregateAuthorizePaymentAction(params: IAggregateParams): (repos: {
     agregation: AggregationRepo;
-    action: ActionRepo;
+    aggregateAction: AggregateActionRepo;
 }) => Promise<{
     aggregationCount: number;
     aggregateDuration: string;
 }>;
 declare function aggregateAuthorizeOrderAction(params: IAggregateParams): (repos: {
     agregation: AggregationRepo;
-    action: ActionRepo;
+    aggregateAction: AggregateActionRepo;
 }) => Promise<{
     aggregationCount: number;
     aggregateDuration: string;
@@ -73,7 +73,7 @@ declare function aggregateAuthorizeOrderAction(params: IAggregateParams): (repos
  */
 declare function aggregateUseAction(params: IAggregateParams): (repos: {
     agregation: AggregationRepo;
-    action: ActionRepo;
+    aggregateAction: AggregateActionRepo;
 }) => Promise<{
     aggregationCount: number;
     aggregateDuration: string;
@@ -83,7 +83,7 @@ declare function aggregateUseAction(params: IAggregateParams): (repos: {
  */
 declare function aggregateReserveAction(params: IAggregateParams): (repos: {
     agregation: AggregationRepo;
-    action: ActionRepo;
+    aggregateAction: AggregateActionRepo;
 }) => Promise<{
     aggregationCount: number;
     aggregateDuration: string;
@@ -93,7 +93,7 @@ declare function aggregateReserveAction(params: IAggregateParams): (repos: {
  */
 declare function aggregateOrderAction(params: IAggregateParams): (repos: {
     agregation: AggregationRepo;
-    action: ActionRepo;
+    aggregateAction: AggregateActionRepo;
 }) => Promise<{
     aggregationCount: number;
     aggregateDuration: string;
@@ -103,21 +103,21 @@ declare function aggregateOrderAction(params: IAggregateParams): (repos: {
  */
 declare function aggregateCancelReservationAction(params: IAggregateParams): (repos: {
     agregation: AggregationRepo;
-    action: ActionRepo;
+    aggregateAction: AggregateActionRepo;
 }) => Promise<{
     aggregationCount: number;
     aggregateDuration: string;
 }>;
 declare function aggregateCheckMovieTicketAction(params: IAggregateParams): (repos: {
     agregation: AggregationRepo;
-    action: ActionRepo;
+    aggregateAction: AggregateActionRepo;
 }) => Promise<{
     aggregationCount: number;
     aggregateDuration: string;
 }>;
 declare function aggregatePayMovieTicketAction(params: IAggregateParams): (repos: {
     agregation: AggregationRepo;
-    action: ActionRepo;
+    aggregateAction: AggregateActionRepo;
 }) => Promise<{
     aggregationCount: number;
     aggregateDuration: string;