@chevre/domain 21.27.0-alpha.8 → 21.27.0

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

@@ -87,16 +87,8 @@ function checkByIdentifier(params) {
         const authService = new surfrock.service.auth.AuthService({
             endpoint: String(availableChannel.serviceUrl),
             auth: mvtkReserveAuthClient
-        }, { timeout: credentials_1.credentials.movieticketReserve.timeout });
+        }, { timeout: credentials_1.credentials.movieticketReserve.timeoutCheck });
         purchaseNumberAuthResult = yield authService.purchaseNumberAuth(purchaseNumberAuthIn);
-        // 決済カード配列に成形
-        // const movieTickets = purchaseNumberAuthResult2movieTickets({
-        //     screeningEvent: params.screeningEvent,
-        //     paymentMethodType,
-        //     knyknrNoInfoIn,
-        //     purchaseNumberAuthResult
-        // });
-        // return { purchaseNumberAuthIn, purchaseNumberAuthResult, movieTickets };
         return { purchaseNumberAuthIn, purchaseNumberAuthResult };
     });
 }

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

@@ -70,5 +70,5 @@ declare function payMovieTicket(params: factory.task.pay.IPayActionData): IPayOp
 /**
  * MovieTicket着券取消
  */
-declare function refundMovieTicket(params: factory.task.refund.IData): IRefundOperation<factory.action.trade.refund.IAction>;
+declare function refundMovieTicket(params: factory.task.refund.IData): IRefundOperation<void>;
 export { ICheckResult, authorize, checkMovieTicket, payMovieTicket, refundMovieTicket, voidTransaction };

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

@@ -350,6 +350,7 @@ function payActionParams2seatInfoSyncIn(params) {
  * MovieTicket着券取消
  */
 function refundMovieTicket(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
         const paymentMethodId = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.paymentMethod.paymentMethodId;
@@ -371,6 +372,7 @@ function refundMovieTicket(params) {
         let action = yield repos.action.start(params);
         let seatInfoSyncIn;
         let seatInfoSyncResult;
+        let seatInfoSyncResultAsError;
         try {
             seatInfoSyncIn = yield createSeatInfoSyncInOnRefund({
                 project: { id: params.project.id },
@@ -400,7 +402,8 @@ function refundMovieTicket(params) {
                 // 着券取消可能期間超過を認識した上でのあえての返金の場合(注文からしばらく経って返品など)(2024-03-19~)
                 if (error.code === http_status_1.BAD_REQUEST && error.message === MovieticketReserveRequestErrorMessage.CancellationPeriodPassed) {
                     if (params.purpose.typeOf === factory.actionType.ReturnAction) {
-                        seatInfoSyncResult = error;
+                        // seatInfoSyncResult = error;
+                        seatInfoSyncResultAsError = error;
                         throwsError = false;
                     }
                 }
@@ -420,10 +423,16 @@ function refundMovieTicket(params) {
                 throw error;
             }
         }
-        const actionResult = Object.assign(Object.assign({}, (seatInfoSyncIn !== undefined) ? { seatInfoSyncIn } : undefined), (seatInfoSyncResult !== undefined) ? { seatInfoSyncResult } : undefined);
-        action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult }));
+        // アクションとしてはFailedだが後続処理を実行するケースに対応(2024-03-21~)
+        if (seatInfoSyncResultAsError !== undefined) {
+            action = (yield repos.action.giveUpWithObject({ typeOf: action.typeOf, id: action.id, error: seatInfoSyncResultAsError }));
+        }
+        else {
+            const actionResult = Object.assign(Object.assign({}, (seatInfoSyncIn !== undefined) ? { seatInfoSyncIn } : undefined), (seatInfoSyncResult !== undefined) ? { seatInfoSyncResult } : undefined);
+            action = (yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult }));
+        }
         yield (0, onRefund_1.onRefund)(action)(repos);
-        return action;
+        // return action;
     });
 }
 exports.refundMovieTicket = refundMovieTicket;

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

@@ -15,7 +15,7 @@ exports.onReservationCanceled = void 0;
  */
 const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
-const offer_1 = require("../../offer");
+const onEventChanged_1 = require("../../offer/onEventChanged");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
 function onReservationCanceled(
@@ -94,7 +94,7 @@ reservationFor) {
         }
         if (typeof (reservationFor === null || reservationFor === void 0 ? void 0 : reservationFor.id) === 'string') {
             // 冗長な作成を避ける
-            yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
+            yield (0, onEventChanged_1.createAggregateScreeningEventIfNotExist)({
                 project: { id: reservationFor.project.id },
                 reservationFor: [{ id: reservationFor.id }],
                 force: false,

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

@@ -15,7 +15,7 @@ exports.onReservationCheckedIn = void 0;
  */
 const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
-const offer_1 = require("../../offer");
+const onEventChanged_1 = require("../../offer/onEventChanged");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
 // tslint:disable-next-line:max-func-body-length
@@ -118,7 +118,7 @@ function onReservationCheckedIn(params) {
                 // { _id: 1 }
                 );
                 if (existingEvents.length > 0) {
-                    yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
+                    yield (0, onEventChanged_1.createAggregateScreeningEventIfNotExist)({
                         project: { id: params.project.id },
                         reservationFor: [{ id: reservationForId }],
                         force: false,

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

@@ -15,7 +15,7 @@ exports.onReservationConfirmed = exports.onReservationConfirmedByAction = void 0
  */
 const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
-const offer_1 = require("../../offer");
+const onEventChanged_1 = require("../../offer/onEventChanged");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
 /**
@@ -56,7 +56,7 @@ function onReservationConfirmed(confirmedReservations) {
         if (Array.isArray(confirmedReservations) && confirmedReservations.length > 0) {
             // ひとつめの予約からReservationPackageの共有属性を取り出す
             const { issuedThrough, project, provider, reservationFor, reservationNumber, reservationStatus, underName } = confirmedReservations[0];
-            yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
+            yield (0, onEventChanged_1.createAggregateScreeningEventIfNotExist)({
                 project,
                 reservationFor: [{ id: reservationFor.id }],
                 force: false,

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

@@ -15,7 +15,7 @@ exports.onReservationUsed = void 0;
  */
 const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
-const offer_1 = require("../../offer");
+const onEventChanged_1 = require("../../offer/onEventChanged");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
 /**
@@ -96,7 +96,7 @@ function onReservationUsed(attendedReservation) {
             yield repos.task.saveMany(tasks, { emitImmediately: true });
         }
         // 冗長な作成を避ける
-        yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
+        yield (0, onEventChanged_1.createAggregateScreeningEventIfNotExist)({
             project: attendedReservation.project,
             reservationFor: [{ id: attendedReservation.reservationFor.id }],
             force: false,

package/lib/chevre/service/task/aggregateOffers.d.ts

@@ -0,0 +1,7 @@
+import * as factory from '../../factory';
+import { IConnectionSettings } from '../task';
+export type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
+/**
+ * タスク実行関数
+ */
+export declare function call(data: factory.task.aggregateOffers.IData): IOperation<void>;

package/lib/chevre/service/task/aggregateOffers.js

@@ -0,0 +1,47 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.call = void 0;
+const factory = require("../../factory");
+const aggregateReservation_1 = require("../../repo/aggregateReservation");
+const event_1 = require("../../repo/event");
+const offer_1 = require("../../repo/offer");
+const offerCatalog_1 = require("../../repo/offerCatalog");
+const place_1 = require("../../repo/place");
+const product_1 = require("../../repo/product");
+const offer_2 = require("../../repo/rateLimit/offer");
+const reservation_1 = require("../../repo/reservation");
+const stockHolder_1 = require("../../repo/stockHolder");
+const task_1 = require("../../repo/task");
+const aggregateOffers_1 = require("../aggregation/event/aggregateOffers");
+/**
+ * タスク実行関数
+ */
+function call(data) {
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        if (settings.redisClient === undefined) {
+            throw new factory.errors.Argument('settings', 'redisClient required');
+        }
+        yield (0, aggregateOffers_1.aggregateOffers)(data)({
+            aggregateReservation: new aggregateReservation_1.MongoRepository(settings.connection),
+            event: new event_1.MongoRepository(settings.connection),
+            stockHolder: new stockHolder_1.StockHolderRepository(settings.redisClient, settings.connection),
+            offer: new offer_1.MongoRepository(settings.connection),
+            offerCatalog: new offerCatalog_1.MongoRepository(settings.connection),
+            offerRateLimit: new offer_2.RedisRepository(settings.redisClient),
+            place: new place_1.MongoRepository(settings.connection),
+            product: new product_1.MongoRepository(settings.connection),
+            reservation: new reservation_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection)
+        });
+    });
+}
+exports.call = call;

package/lib/chevre/service/task/aggregateScreeningEvent.js

@@ -16,7 +16,6 @@ const offer_1 = require("../../repo/offer");
 const offerCatalog_1 = require("../../repo/offerCatalog");
 const place_1 = require("../../repo/place");
 const product_1 = require("../../repo/product");
-const project_1 = require("../../repo/project");
 const offer_2 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
 const stockHolder_1 = require("../../repo/stockHolder");
@@ -38,7 +37,6 @@ function call(data) {
             offerRateLimit: new offer_2.RedisRepository(settings.redisClient),
             place: new place_1.MongoRepository(settings.connection),
             product: new product_1.MongoRepository(settings.connection),
-            project: new project_1.MongoRepository(settings.connection),
             reservation: new reservation_1.MongoRepository(settings.connection),
             task: new task_1.MongoRepository(settings.connection)
         });

package/lib/chevre/service/task/aggregateUseActionsOnEvent.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const factory = require("../../factory");
 const action_1 = require("../../repo/action");
+const aggregateReservation_1 = require("../../repo/aggregateReservation");
 const event_1 = require("../../repo/event");
 const offer_1 = require("../../repo/offer");
 const offerCatalog_1 = require("../../repo/offerCatalog");
@@ -28,6 +29,7 @@ function call(data) {
         }
         yield AggregationService.event.aggregateUseActionsOnEvent(data)({
             action: new action_1.MongoRepository(settings.connection),
+            aggregateReservation: new aggregateReservation_1.MongoRepository(settings.connection),
             event: new event_1.MongoRepository(settings.connection),
             offer: new offer_1.MongoRepository(settings.connection),
             offerCatalog: new offerCatalog_1.MongoRepository(settings.connection),

package/lib/chevre/service/task/onEventChanged.js

@@ -13,13 +13,13 @@ exports.call = void 0;
 const event_1 = require("../../repo/event");
 const project_1 = require("../../repo/project");
 const task_1 = require("../../repo/task");
-const offer_1 = require("../offer");
+const onEventChanged_1 = require("../offer/onEventChanged");
 /**
  * タスク実行関数
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        yield (0, offer_1.onEventChanged)(data)({
+        yield (0, onEventChanged_1.onEventChanged)(data)({
             event: new event_1.MongoRepository(settings.connection),
             project: new project_1.MongoRepository(settings.connection),
             task: new task_1.MongoRepository(settings.connection)

package/lib/chevre/service/transaction/returnOrder/preStart.js

@@ -287,7 +287,6 @@ function createOrder4returnPolicy(params) {
     };
 }
 const TIMEOUT = 5000;
-// tslint:disable-next-line:max-func-body-length
 function getReturnPolicyByProject(params) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
@@ -342,23 +341,6 @@ function getReturnPolicyByProject(params) {
             return returnPolicy;
         }
         catch (err) {
-            if (err.name === 'TimeoutError') {
-                // tslint:disable-next-line:no-console
-                console.error('getReturnPolicyByProject: Timeout: It took more than 5 seconds to get the result!', err);
-            }
-            else if (err.name === 'AbortError') {
-                // tslint:disable-next-line:no-console
-                console.error('getReturnPolicyByProject: Fetch aborted by user action (browser stop button, closing tab, etc.', err);
-            }
-            else if (err.name === 'TypeError') {
-                // tslint:disable-next-line:no-console
-                console.error('getReturnPolicyByProject: AbortSignal.timeout() method is not supported', err);
-            }
-            else {
-                // A network error, or some other problem.
-                // tslint:disable-next-line:no-console
-                console.error(`getReturnPolicyByProject: Error: type: ${err.name}, message: ${err.message}`, err);
-            }
             throw err;
         }
     });

package/lib/chevre/settings.d.ts

@@ -42,6 +42,7 @@ export declare const USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING: boolean;
 export declare const USE_OWNERSHIP_INFO_BY_WEB_APPLICATION: boolean;
 export declare const USE_CHECK_RESOURCE_TASK: boolean;
 export declare const USE_OPTIMIZE_RESERVATION_EXCEPTIONS: string[];
+export declare const USE_OPTIMIZE_INFORM_EVENT: boolean;
 export declare const MONGO_MAX_TIME_MS: number;
 export declare const MONGO_READ_PREFERENCE: string;
 export declare const MONGO_AUTO_INDEX: boolean;

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.DELIVER_ORDER_LIMIT = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_OPTIMIZE_RESERVATION_EXCEPTIONS = exports.USE_CHECK_RESOURCE_TASK = exports.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_FETCH_API = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.DELIVER_ORDER_LIMIT = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_OPTIMIZE_INFORM_EVENT = exports.USE_OPTIMIZE_RESERVATION_EXCEPTIONS = exports.USE_CHECK_RESOURCE_TASK = exports.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_FETCH_API = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.MAX_NUM_CREDIT_CARD_PAYMENT_METHOD = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
     ? process.env.INFORM_TRANSACTION_URL.split(' ')
@@ -68,6 +68,7 @@ exports.USE_CHECK_RESOURCE_TASK = process.env.USE_CHECK_RESOURCE_TASK === '1';
 exports.USE_OPTIMIZE_RESERVATION_EXCEPTIONS = (typeof process.env.USE_OPTIMIZE_RESERVATION_EXCEPTIONS === 'string')
     ? process.env.USE_OPTIMIZE_RESERVATION_EXCEPTIONS.split(' ')
     : [];
+exports.USE_OPTIMIZE_INFORM_EVENT = process.env.USE_OPTIMIZE_INFORM_EVENT === '1';
 exports.MONGO_MAX_TIME_MS = (typeof process.env.MONGO_MAX_TIME_MS === 'string')
     ? Number(process.env.MONGO_MAX_TIME_MS)
     // tslint:disable-next-line:no-magic-numbers

package/package.json

@@ -10,8 +10,8 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.363.0-alpha.2",
-    "@cinerino/sdk": "5.14.0",
+    "@chevre/factory": "4.364.0",
+    "@cinerino/sdk": "5.15.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.27.0-alpha.8"
+  "version": "21.27.0"
 }