@chevre/domain 21.26.0 → 21.27.0-alpha.1

package/lib/chevre/service/assetTransaction/reserve/factory.js

@@ -7,6 +7,7 @@ exports.createCancelPendingReservationAction = exports.createPotentialActions =
 const moment = require("moment");
 const factory = require("../../../factory");
 const accountTransactionIdentifier_1 = require("../../../factory/accountTransactionIdentifier");
+const settings_1 = require("../../../settings");
 const price_1 = require("./factory/price");
 function createStartParams(params) {
     var _a;
@@ -349,13 +350,17 @@ function createReservationFor(params) {
 exports.createReservationFor = createReservationFor;
 function optimizeReservationSuperEvent(params) {
     const superEvent = params.superEvent;
-    return Object.assign({ additionalProperty: (Array.isArray(superEvent.additionalProperty))
-            ? superEvent.additionalProperty
-            : [], id: superEvent.id, 
+    return Object.assign(Object.assign({ id: superEvent.id, 
         // kanaName: superEvent.kanaName, // 廃止(2024-01-26~)
         location: superEvent.location, name: superEvent.name, soundFormat: superEvent.soundFormat, typeOf: superEvent.typeOf, videoFormat: superEvent.videoFormat, workPerformed: superEvent.workPerformed }, (superEvent.headline !== undefined)
         ? { headline: superEvent.headline }
-        : undefined);
+        : undefined), (settings_1.USE_OPTIMIZE_RESERVATION)
+        ? {}
+        : {
+            additionalProperty: (Array.isArray(superEvent.additionalProperty))
+                ? superEvent.additionalProperty
+                : []
+        });
 }
 function createIssuedThrough(params) {
     var _a;
@@ -532,11 +537,18 @@ function createPotentialActions(params) {
     };
 }
 exports.createPotentialActions = createPotentialActions;
+/**
+ * 予約のunderName.identifierを決定する
+ */
 function createReservationUnderNameIdentifier(params) {
-    // 予約のunderName.identifierを決定する
+    // 必要最低限の識別子のみ継承する(2024-03-16~)
+    let identifiersFromCustomer = (Array.isArray(params.order.customer.identifier)) ? params.order.customer.identifier : [];
+    if (settings_1.USE_OPTIMIZE_RESERVATION) {
+        identifiersFromCustomer = identifiersFromCustomer.filter(({ name }) => name === 'clientId');
+    }
     return [
         { name: 'orderNumber', value: params.order.orderNumber },
-        ...(Array.isArray(params.order.customer.identifier)) ? params.order.customer.identifier : []
+        ...identifiersFromCustomer
     ];
 }
 function createReservationUnderName(params) {

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

@@ -21,14 +21,15 @@ const getCredentials_1 = require("./getCredentials");
  */
 function checkByIdentifier(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         let purchaseNumberAuthIn;
         let purchaseNumberAuthResult;
+        // movieTickets.typeOfへの依存廃止(2024-03-15~)
         // MovieTicket系統の決済方法タイプは動的
-        const paymentMethodType = (_a = params.movieTickets[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
-        if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('movieTickets.typeOf');
-        }
+        // const paymentMethodType = params.movieTickets[0]?.typeOf;
+        // if (typeof paymentMethodType !== 'string') {
+        //     throw new factory.errors.ArgumentNull('movieTickets.typeOf');
+        // }
         const availableChannel = yield repos.paymentService.findAvailableChannel({
             project: params.screeningEvent.project,
             typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
@@ -77,9 +78,9 @@ function checkByIdentifier(params) {
                 .format('YYYY/MM/DD')
         };
         const mvtkReserveAuthClient = new surfrock.auth.ClientCredentials({
-            domain: String((_b = availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.authorizeServerDomain),
-            clientId: String((_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.clientId),
-            clientSecret: String((_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.clientSecret),
+            domain: String((_a = availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.authorizeServerDomain),
+            clientId: String((_b = availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.clientId),
+            clientSecret: String((_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.clientSecret),
             scopes: [],
             state: ''
         });

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

@@ -34,19 +34,40 @@ var MovieticketReserveRequestErrorMessage;
  * MovieTicket認証
  */
 function checkMovieTicket(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 paymentMethodType = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.paymentMethod.typeOf; // 決済方法区分
-        const paymentServiceId = (_b = params.object[0]) === null || _b === void 0 ? void 0 : _b.id;
-        const movieTickets = (_c = params.object[0]) === null || _c === void 0 ? void 0 : _c.movieTickets;
+        // 不要な属性がリクエストに含まれているのでmovieTicketsを最適化(2024-03-15~)
+        let movieTickets = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.movieTickets;
         if (!Array.isArray(movieTickets)) {
             throw new factory.errors.Argument('object.movieTickets must be an array');
         }
-        const actionAttributes = Object.assign({ project: params.project, typeOf: factory.actionType.CheckAction, agent: params.agent, object: params.object }, (typeof ((_d = params.purpose) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string') ? { purpose: params.purpose } : undefined);
+        movieTickets = movieTickets.map(({ accessCode, category, identifier, serviceOutput }) => {
+            return {
+                accessCode,
+                category,
+                identifier,
+                serviceOutput: { reservationFor: serviceOutput.reservationFor } // 最適化(2024-03-15~)
+            };
+        });
+        const optimizedCheckObject = params.object.map(({ id, typeOf, paymentMethod, seller }) => {
+            return {
+                id,
+                typeOf,
+                paymentMethod: { typeOf: paymentMethod.typeOf },
+                seller,
+                movieTickets
+            };
+        });
+        const paymentMethodType = (_b = optimizedCheckObject[0]) === null || _b === void 0 ? void 0 : _b.paymentMethod.typeOf; // 決済方法区分
+        const paymentServiceId = (_c = optimizedCheckObject[0]) === null || _c === void 0 ? void 0 : _c.id;
+        const actionAttributes = Object.assign({ project: params.project, typeOf: factory.actionType.CheckAction, agent: params.agent, 
+            // object: params.object,
+            object: optimizedCheckObject }, (typeof ((_d = params.purpose) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string') ? { purpose: params.purpose } : undefined);
         const action = yield repos.action.start(actionAttributes);
         let checkResult;
         try {
-            const eventIds = [...new Set(params.object.reduce((a, b) => [
+            const eventIds = [...new Set(optimizedCheckObject.reduce((a, b) => [
                     ...a,
                     ...(Array.isArray(b.movieTickets)) ? b.movieTickets.map((ticket) => ticket.serviceOutput.reservationFor.id) : []
                 ], []))];
@@ -57,7 +78,7 @@ function checkMovieTicket(params) {
             let screeningEvent;
             // イベント取得属性最適化(2023-01-23~)
             screeningEvent = yield repos.event.findMinimizedIndividualEventById({ id: eventIds[0] });
-            const sellerId = (_e = params.object[0]) === null || _e === void 0 ? void 0 : _e.seller.id;
+            const sellerId = (_e = optimizedCheckObject[0]) === null || _e === void 0 ? void 0 : _e.seller.id;
             // const paymentAccepted = seller.paymentAccepted?.some((a) => a.paymentMethodType === paymentMethodType);
             const paymentAccepted = yield repos.paymentAccepted.isAcceptedBySeller({
                 seller: { id: sellerId },

package/lib/chevre/settings.d.ts

@@ -44,6 +44,7 @@ export declare const USE_MINIMIZED_PAY_TASK: boolean;
 export declare const USE_VALIDATE_PROJECT_MAKES_OFFER: 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: 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_CHECK_RESOURCE_TASK = exports.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION = exports.USE_VALIDATE_PROJECT_MAKES_OFFER = exports.USE_MINIMIZED_PAY_TASK = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_INFORM_ORDER_IN_TRANSIT = 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_RESERVATION = exports.USE_CHECK_RESOURCE_TASK = exports.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION = exports.USE_VALIDATE_PROJECT_MAKES_OFFER = exports.USE_MINIMIZED_PAY_TASK = exports.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING = exports.USE_INFORM_ORDER_IN_TRANSIT = 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_MINIMIZED_PAY_TASK = process.env.USE_MINIMIZED_PAY_TASK === '1';
 exports.USE_VALIDATE_PROJECT_MAKES_OFFER = process.env.USE_VALIDATE_PROJECT_MAKES_OFFER === '1';
 exports.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION = process.env.USE_OWNERSHIP_INFO_BY_WEB_APPLICATION === '1';
 exports.USE_CHECK_RESOURCE_TASK = process.env.USE_CHECK_RESOURCE_TASK === '1';
+exports.USE_OPTIMIZE_RESERVATION = process.env.USE_OPTIMIZE_RESERVATION === '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,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.362.0",
+    "@chevre/factory": "4.363.0-alpha.0",
     "@cinerino/sdk": "5.14.0",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.26.0"
+  "version": "21.27.0-alpha.1"
 }