@chevre/domain 22.0.0-alpha.8 → 22.0.0

package/lib/chevre/service/assetTransaction.js

@@ -30,7 +30,7 @@ exports.reserve = ReserveTransactionService;
  * ひとつの取引のタスクをエクスポートする
  */
 function exportTasks(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
         const transaction = yield repos.assetTransaction.startExportTasks(Object.assign({ typeOf: params.typeOf, status: params.status, tasksExportAction: {
                 agent: { name: params.tasksExportAction.agent.name }
             } }, (typeof params.id === 'string') ? { id: params.id } : undefined));
@@ -74,7 +74,7 @@ function exportTasks(params) {
                 createdTasks = yield ReserveTransactionService.exportTasksById({
                     id: transaction.id
                     // runsTasksAfterInSeconds: params.runsTasksAfterInSeconds
-                })(repos);
+                })(repos, settings);
                 break;
             default:
         }

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

@@ -1,11 +1,12 @@
-import { Settings } from '../settings';
+import { LINENotifyCredentials } from '../credentials/lineNotify';
+import { SendGridCredentials } from '../credentials/sendGrid';
 import * as factory from '../factory';
 import type { ActionRepo } from '../repo/action';
 import type { MessageRepo } from '../repo/message';
 import type { ProjectRepo } from '../repo/project';
-type ILineNotifyOperation<T> = (repos: {
-    useFetchAPI: boolean;
-}, settings: Settings) => Promise<T>;
+type ILineNotifyOperation<T> = (repos: {}, credentials: {
+    lineNotify: LINENotifyCredentials;
+}) => Promise<T>;
 /**
  * Eメールメッセージを送信する
  * https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html
@@ -18,6 +19,8 @@ declare function sendEmailMessage(params: factory.task.sendEmailMessage.IActionA
     action: ActionRepo;
     message: MessageRepo;
     project: ProjectRepo;
+}, credentials: {
+    sendGrid: SendGridCredentials;
 }) => Promise<void>;
 type LineNotifyLogLevel = 'log' | 'error' | 'info';
 declare function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel }: {
@@ -26,13 +29,18 @@ declare function lineNotify({ subject, content, imageThumbnail, imageFullsize, l
     imageThumbnail?: string;
     imageFullsize?: string;
     logLevel: LineNotifyLogLevel;
+}, options: {
+    timeout: number;
+    useFetchAPI: boolean;
 }): ILineNotifyOperation<void>;
 declare function triggerWebhook(params: factory.task.IData<factory.taskName.TriggerWebhook> & {
     project: {
         id: string;
     };
+}, options: {
+    timeout: number;
+    useFetchAPI: boolean;
 }): (repos: {
     action: ActionRepo;
-    useFetchAPI: boolean;
-}, settings: Settings) => Promise<void>;
+}) => Promise<void>;
 export { lineNotify, sendEmailMessage, triggerWebhook };

package/lib/chevre/service/notification.js

@@ -14,7 +14,6 @@ const sgMail = require("@sendgrid/mail");
 const http_status_1 = require("http-status");
 // import * as request from 'request';
 const util = require("util");
-const credentials_1 = require("../credentials");
 const factory = require("../factory");
 function createSendEmailMessageActionAttributes(params) {
     var _a;
@@ -27,7 +26,7 @@ function createSendEmailMessageActionAttributes(params) {
  */
 function sendEmailMessage(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
         const project = yield repos.project.findById({
             id: params.project.id,
@@ -37,7 +36,7 @@ function sendEmailMessage(params) {
         const action = yield repos.action.start(createSendEmailMessageActionAttributes(params));
         let result = {};
         try {
-            let apiKey = credentials_1.credentials.sendGrid.apiKey;
+            let apiKey = credentials.sendGrid.apiKey;
             // プロジェクト固有のSendGrid設定があれば、そちらを使用
             if (typeof ((_a = project.settings) === null || _a === void 0 ? void 0 : _a.sendgridApiKey) === 'string' && project.settings.sendgridApiKey.length > 0) {
                 apiKey = project.settings.sendgridApiKey;
@@ -124,23 +123,23 @@ function sendEmailMessage(params) {
 }
 exports.sendEmailMessage = sendEmailMessage;
 const MAX_LINE_NOTIFY_SUBJECT_LENGTH = 100;
-function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel }) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const LINE_NOTIFY_URL = credentials_1.credentials.lineNotify.url;
+function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel }, options) {
+    return (__, credentials) => __awaiter(this, void 0, void 0, function* () {
+        const { timeout, useFetchAPI } = options;
+        const LINE_NOTIFY_URL = credentials.lineNotify.url;
         if (typeof LINE_NOTIFY_URL !== 'string') {
             throw new factory.errors.Internal('Environment variable LINE_NOTIFY_URL not set');
         }
         let accessToken;
         switch (logLevel) {
             case 'error':
-                accessToken = credentials_1.credentials.lineNotify.accessTokenAlert;
+                accessToken = credentials.lineNotify.accessTokenAlert;
                 break;
             case 'info':
-                accessToken = credentials_1.credentials.lineNotify.accessTokenInfo;
+                accessToken = credentials.lineNotify.accessTokenInfo;
                 break;
             default:
-                accessToken = credentials_1.credentials.lineNotify.accessToken;
+                accessToken = credentials.lineNotify.accessToken;
         }
         if (typeof accessToken !== 'string') {
             throw new factory.errors.Internal('credentials.lineNotify.accessToken not set');
@@ -151,7 +150,7 @@ function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel
         const message = util.format('\n%s\n%s\n%s\n%s\n%s\n\n%s', `[${logLevel}] ${shortSubject}`, `now:${(new Date()).toISOString()}`, `pid:${process.pid}`, `GAE_APPLICATION:${process.env.GAE_APPLICATION}`, 
         // `GAE_INSTANCE:${process.env.GAE_INSTANCE}`,
         `GAE_SERVICE:${process.env.GAE_SERVICE}`, content);
-        if (repos.useFetchAPI) {
+        if (useFetchAPI) {
             try {
                 const form = new FormData();
                 form.set('message', message);
@@ -163,8 +162,8 @@ function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel
                 }
                 const res = yield fetch(LINE_NOTIFY_URL, Object.assign({ method: 'POST', headers: {
                         Authorization: `Bearer ${accessToken}`
-                    }, body: form }, (typeof ((_a = settings.webhook) === null || _a === void 0 ? void 0 : _a.timeout) === 'number')
-                    ? { signal: AbortSignal.timeout(settings.webhook.timeout) }
+                    }, body: form }, (typeof timeout === 'number')
+                    ? { signal: AbortSignal.timeout(timeout) }
                     : undefined));
                 let body;
                 try {
@@ -193,8 +192,8 @@ exports.lineNotify = lineNotify;
 const USERNAME_ARGUMENT_REQUIRED_MESSAGE = 'Missing required key \'Username\' in params';
 const TRIGGER_WEBHOOK_MAX_RETRY_COUNT = 2;
 const TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = 1000;
-function triggerWebhook(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+function triggerWebhook(params, options) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
         // retryableにする(2023-05-12~)
         let retry = true;
         let numberOfTry = 0;
@@ -208,7 +207,7 @@ function triggerWebhook(params) {
                 if (numberOfTry > 1) {
                     yield sleep(TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS * (numberOfTry - 1));
                 }
-                yield processInformAction(params)(repos, settings);
+                yield processInformAction(params, options)(repos);
                 break;
             }
             catch (error) {
@@ -236,22 +235,23 @@ function createInformActionAttributes(params) {
     const { object, purpose, recipient, project } = params;
     return Object.assign({ agent: { id: project.id, typeOf: factory.organizationType.Project }, object, project: { id: project.id, typeOf: factory.organizationType.Project }, recipient, typeOf: factory.actionType.InformAction }, (typeof (purpose === null || purpose === void 0 ? void 0 : purpose.typeOf) === 'string') ? { purpose } : undefined);
 }
-function processInformAction(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+function processInformAction(params, options) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        const { timeout, useFetchAPI } = options;
         const action = yield repos.action.start(createInformActionAttributes(params));
         let result = {};
         try {
             if (typeof ((_a = params.recipient) === null || _a === void 0 ? void 0 : _a.url) === 'string') {
                 const url = params.recipient.url;
-                if (repos.useFetchAPI) {
+                if (useFetchAPI) {
                     try {
                         const res = yield fetch(url, Object.assign({ method: 'POST', headers: {
                                 'Content-Type': 'application/json'
                             }, body: JSON.stringify({
                                 data: params.object
-                            }) }, (typeof ((_b = settings.webhook) === null || _b === void 0 ? void 0 : _b.timeout) === 'number')
-                            ? { signal: AbortSignal.timeout(settings.webhook.timeout) }
+                            }) }, (typeof timeout === 'number')
+                            ? { signal: AbortSignal.timeout(timeout) }
                             : undefined));
                         let body;
                         try {
@@ -267,7 +267,7 @@ function processInformAction(params) {
                             case http_status_1.NO_CONTENT:
                                 result = {
                                     statusCode: res.status,
-                                    useFetchAPI: repos.useFetchAPI
+                                    useFetchAPI
                                 };
                                 break;
                             default:
@@ -286,7 +286,7 @@ function processInformAction(params) {
         catch (error) {
             let throwsError = true;
             // プロジェクト固有の特別対応
-            if (error.statusCode === http_status_1.INTERNAL_SERVER_ERROR && ((_c = error.body) === null || _c === void 0 ? void 0 : _c.message) === USERNAME_ARGUMENT_REQUIRED_MESSAGE) {
+            if (error.statusCode === http_status_1.INTERNAL_SERVER_ERROR && ((_b = error.body) === null || _b === void 0 ? void 0 : _b.message) === USERNAME_ARGUMENT_REQUIRED_MESSAGE) {
                 throwsError = false;
             }
             if (throwsError) {

package/lib/chevre/service/offer/event/authorize/factory.d.ts

@@ -13,7 +13,7 @@ declare function createReserveTransactionStartParams(params: {
     transactionNumber: string;
 }): factory.assetTransaction.reserve.IStartParamsWithoutDetail;
 declare function createAuthorizeSeatReservationActionAttributes(params: {
-    event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id' | 'typeOf'>;
+    event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id'>;
     instrument: {
         /**
          * 予約取引番号

package/lib/chevre/service/offer/event/authorize/factory.js

@@ -68,7 +68,8 @@ function createAuthorizeSeatReservationActionAttributes(params) {
         //         typeOf: 'WebAPI'
         //     }
         // },
-        typeOf: event.typeOf
+        // typeOf: event.typeOf
+        typeOf: factory.eventType.ScreeningEvent // fix(2024-07-17~)
     };
     const object = {
         typeOf: factory.action.authorize.offer.eventService.ObjectType.SeatReservation,

package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre.d.ts

@@ -19,7 +19,7 @@ import type { TaskRepo } from '../../../../repo/task';
 import type { TicketRepo } from '../../../../repo/ticket';
 declare function processStartReserve4chevre(params: {
     acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer4chevre[];
-    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
+    event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id'>;
     broker?: factory.reservation.IBroker<factory.reservationType>;
     transactionNumber: string;
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'expires' | 'id' | 'project' | 'seller' | 'typeOf'>;

package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre.js

@@ -24,7 +24,10 @@ function processStartReserve4chevre(params, options) {
             acceptedOffers: params.acceptedOffers, event: { id: event.id }, transaction,
             transactionNumber }, (params.broker !== undefined) ? { broker: params.broker } : undefined));
         const startParamObject = yield validateObjectWithoutDetail(startParams)(repos, credentials);
-        const startReserveTransactionResult = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, preSearchedEvent: event, preSearchedTicketOffers: params.ticketOffers, preSearchedUnitPriceOffers: params.unitPriceOffers, availableAtOrFrom: { id: params.availableAtOrFrom.id }, validateEvent: params.validateEvent, validateEventOfferPeriod: params.validateEventOfferPeriod, validateAppliesToMovieTicket: true, 
+        const startReserveTransactionResult = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, 
+            // discontinue preSearchedEvent(2024-07-17~)
+            // preSearchedEvent: event,
+            preSearchedTicketOffers: params.ticketOffers, preSearchedUnitPriceOffers: params.unitPriceOffers, availableAtOrFrom: { id: params.availableAtOrFrom.id }, validateEvent: params.validateEvent, validateEventOfferPeriod: params.validateEventOfferPeriod, validateAppliesToMovieTicket: true, 
             // useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, // discontinue(2024-07-02~)
             stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd }), options)(repos);
         // 予約取引結果から注文オファーを生成する

package/lib/chevre/service/offer/event/authorize.js

@@ -89,16 +89,14 @@ function validateCreateRequest(params) {
         if (typeof ((_b = params.object.reservationFor) === null || _b === void 0 ? void 0 : _b.id) !== 'string' || params.object.reservationFor.id.length === 0) {
             throw new factory.errors.ArgumentNull('object.reservationFor.id');
         }
-        // イベント取得属性最適化(2023-01-23~)
-        // const event = await repos.event.findById<factory.eventType.ScreeningEvent>({ id: params.object.reservationFor.id });
-        const event = yield repos.event.findMinimizedIndividualEventById({
-            id: params.object.reservationFor.id
-        });
-        // let offeredThrough = event.offers?.offeredThrough;
-        // if (offeredThrough === undefined) {
-        //     offeredThrough = { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre };
-        // }
-        // const bookingServiceIdentifire = offeredThrough.identifier;
+        // discontinue preSearchedEvent(2024-07-17~)
+        // const event = await repos.event.findMinimizedIndividualEventById<factory.eventType.ScreeningEvent>({
+        //     id: params.object.reservationFor.id
+        // });
+        const event = {
+            id: params.object.reservationFor.id,
+            typeOf: factory.eventType.ScreeningEvent // ひとまずfix(2024-07-17~)
+        };
         return { transaction, event };
     });
 }
@@ -136,7 +134,7 @@ function validateAcceptedOffers(params) {
             const searchEventTicketOffersResult = yield (0, searchEventTicketOffers_1.searchEventTicketOffers)({
                 // 受け入れたオファーIDだけ取得する(2023-01-26~)
                 ids: offerIds,
-                event: { id: params.event.id },
+                event: { id: params.event.id, typeOf: params.event.typeOf },
                 store: params.store,
                 priceSpecification: {},
                 includedInDataCatalog: { id: '' },

package/lib/chevre/service/offer/event/searchEventTicketOffers.d.ts

@@ -30,6 +30,7 @@ declare function searchEventTicketOffers(params: {
      */
     event: {
         id: string;
+        typeOf: factory.eventType.Event | factory.eventType.ScreeningEvent;
     };
     /**
      * どのアプリケーションに対して

package/lib/chevre/service/offer/event/searchEventTicketOffers.js

@@ -172,7 +172,6 @@ function searchEventTicketOffersByEvent(params) {
             withSortIndex: params.addSortIndex,
             useIncludeInDataCatalog: params.useIncludeInDataCatalog
         })(repos);
-        // 冗長な検索について最適化(2023-03-03~)
         const { soundFormatChargeSpecs, videoFormatChargeSpecs, movieTicketTypeChargeSpecs } = yield searchPriceSpecs4event({
             project: { id: event.project.id },
             soundFormatTypes,
@@ -312,7 +311,13 @@ function checkAvailability(params) {
  */
 function searchEventTicketOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const event = yield repos.event.findMinimizedIndividualEventById({ id: params.event.id });
+        const eventType = params.event.typeOf;
+        // optimize projection(2024-07-17~)
+        const event = yield repos.event.projectFieldsById({ id: params.event.id }, [
+            'project', 'typeOf', 'startDate',
+            'superEvent.id',
+            'offers.itemOffered.id', 'offers.offeredThrough', 'offers.unacceptedPaymentMethod', 'offers.eligibleQuantity'
+        ]);
         let offers;
         let unitPriceOffers;
         const eventOffers = event.offers;
@@ -352,7 +357,8 @@ exports.searchEventTicketOffers = searchEventTicketOffers;
 function searchOfferAppliesToMovieTicket(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
-        const event = yield repos.event.findMinimizedIndividualEventById({ id: params.event.id });
+        // optimize(2024-07-18~)
+        const event = yield repos.event.projectFieldsById({ id: params.event.id }, ['project', 'startDate', 'typeOf', 'superEvent.id', 'offers.itemOffered.id', 'offers.unacceptedPaymentMethod']);
         // let soundFormatTypes: string[] = [];
         let videoFormatTypes = [];
         if (event.typeOf === factory.eventType.ScreeningEvent) {
@@ -430,7 +436,8 @@ function searchOfferCatalogItems(params) {
             throw new factory.errors.Argument('page', 'must be number');
         }
         let offerCatalogItems = [];
-        const event = yield repos.event.findMinimizedIndividualEventById({ id: params.event.id });
+        // optimize(2024-07-18~)
+        const event = yield repos.event.projectFieldsById({ id: params.event.id }, ['offers.itemOffered.id']);
         // 興行設定があれば興行のカタログを参照する
         const eventOffers = event.offers;
         let catalogId;
@@ -499,7 +506,8 @@ function searchOfferCatalogItemAvailability(params) {
             throw new factory.errors.Argument('page', 'must be number');
         }
         let availabilities = [];
-        const event = yield repos.event.findMinimizedIndividualEventById({ id: params.event.id });
+        // optimize(2024-07-18~)
+        const event = yield repos.event.projectFieldsById({ id: params.event.id }, ['project', 'offers.itemOffered.id']);
         // 興行設定があれば興行のカタログを参照する
         const eventOffers = event.offers;
         let catalogId;

package/lib/chevre/service/offer/event/voidTransaction.d.ts

@@ -9,7 +9,6 @@ import type { ReservationRepo } from '../../../repo/reservation';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 import type { TransactionRepo } from '../../../repo/transaction';
-export import WebAPIIdentifier = factory.service.webAPI.Identifier;
 interface IVoidTransactionRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
@@ -19,13 +18,16 @@ interface IVoidTransactionRepos {
     reservation: ReservationRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
-    reserveService: COA.service.Reserve;
+    /**
+     * COAオファー承認取消の場合必須
+     */
+    reserveService?: COA.service.Reserve;
 }
 /**
  * 興行オファー承認取消(タスクから実行 or apiから実行))
  * 取引中の承認アクション全てについて処理する or 特定の承認アクションについて処理する
  */
-export declare function voidTransaction(params: factory.task.IData<factory.taskName.VoidReserveTransaction> & {
+declare function voidTransaction(params: factory.task.IData<factory.taskName.VoidReserveTransaction> & {
     sameAs?: {
         /**
          * 実行元タスクID
@@ -33,4 +35,4 @@ export declare function voidTransaction(params: factory.task.IData<factory.taskN
         id: string;
     };
 }): (repos: IVoidTransactionRepos, settings: Settings) => Promise<void>;
-export {};
+export { voidTransaction };

package/lib/chevre/service/offer/event/voidTransaction.js

@@ -9,13 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.voidTransaction = exports.WebAPIIdentifier = void 0;
+exports.voidTransaction = void 0;
 const factory = require("../../../factory");
 const any_1 = require("../any");
 const processVoidTransaction4chevre_1 = require("./voidTransaction/processVoidTransaction4chevre");
 const processVoidTransaction4coa_1 = require("./voidTransaction/processVoidTransaction4coa");
 const voidTransactionByActionId_1 = require("./voidTransactionByActionId");
-exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
+var WebAPIIdentifier = factory.service.webAPI.Identifier;
 /**
  * 興行オファー承認取消(タスクから実行 or apiから実行))
  * 取引中の承認アクション全てについて処理する or 特定の承認アクションについて処理する
@@ -75,10 +75,14 @@ function voidTransaction(params) {
         yield Promise.all(authorizeActions.map((action) => __awaiter(this, void 0, void 0, function* () {
             yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
             switch (action.instrument.identifier) {
-                case exports.WebAPIIdentifier.COA:
+                case WebAPIIdentifier.COA:
+                    const { reserveService } = repos;
+                    if (reserveService === undefined) {
+                        throw new factory.errors.Internal('repos.reserveService required');
+                    }
                     yield (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({
                         action: action
-                    })(repos);
+                    })({ reserveService });
                     break;
                 default:
                     yield (0, processVoidTransaction4chevre_1.processVoidTransaction4chevre)({
@@ -146,9 +150,16 @@ function cancelAcceptActions(params) {
             default:
             // no op
         }
+        const { reserveService } = repos;
         yield Promise.all(acceptActions.map((action) => __awaiter(this, void 0, void 0, function* () {
             yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
-            yield (0, processVoidTransaction4coa_1.processVoidTransactionByAcceptAction4coa)({ action })(repos);
+            if (reserveService === undefined) {
+                throw new factory.errors.Internal('repos.reserveService required');
+            }
+            yield (0, processVoidTransaction4coa_1.processVoidTransactionByAcceptAction4coa)({ action })({
+                action: repos.action,
+                reserveService
+            });
         })));
     });
 }

package/lib/chevre/service/offer/event/voidTransactionByActionId.d.ts

@@ -18,7 +18,10 @@ interface IVoidTransactionByActionIdRepos {
     reservation: ReservationRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
-    reserveService: COA.service.Reserve;
+    /**
+     * COAオファー承認取消の場合必須
+     */
+    reserveService?: COA.service.Reserve;
 }
 /**
  * 興行オファー承認取消(apiから実行)

package/lib/chevre/service/offer/event/voidTransactionByActionId.js

@@ -53,9 +53,13 @@ function voidTransactionByActionId(params) {
         }
         switch (action.instrument.identifier) {
             case factory.service.webAPI.Identifier.COA:
+                const { reserveService } = repos;
+                if (reserveService === undefined) {
+                    throw new factory.errors.Internal('repos.reserveService required');
+                }
                 yield (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({
                     action: action
-                })(repos);
+                })({ reserveService });
                 break;
             default:
                 yield (0, processVoidTransaction4chevre_1.processVoidTransaction4chevre)({

package/lib/chevre/service/offer/event.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchOfferCatalogItems = exports.searchOfferCatalogItemAvailability = exports.searchOfferAppliesToMovieTicket = exports.searchEventTicketOffers = exports.voidTransaction = exports.importFromCOA = exports.importCategoryCodesFromCOA = exports.authorize = void 0;
 const authorize_1 = require("./event/authorize");
 Object.defineProperty(exports, "authorize", { enumerable: true, get: function () { return authorize_1.authorize; } });
-// import { cancel } from './event/cancel';
 const importFromCOA_1 = require("./event/importFromCOA");
 Object.defineProperty(exports, "importCategoryCodesFromCOA", { enumerable: true, get: function () { return importFromCOA_1.importCategoryCodesFromCOA; } });
 Object.defineProperty(exports, "importFromCOA", { enumerable: true, get: function () { return importFromCOA_1.importFromCOA; } });

package/lib/chevre/service/offer/eventServiceByCOA/authorize.js

@@ -48,9 +48,11 @@ function authorize(params) {
             typeOf: factory.assetTransactionType.COAReserveTransaction
         };
         try {
-            // イベント取得属性最適化(2023-01-23~)
-            screeningEvent =
-                yield repos.event.findMinimizedIndividualEventById({ id: params.object.event.id });
+            screeningEvent = yield repos.event.projectFieldsById({ id: params.object.event.id }, [
+                'coaInfo', 'doorTime', 'endDate', 'location', 'startDate',
+                'superEvent', 'typeOf', 'identifier', 'name'
+            ] // optimize(2024-07-18~)
+            );
             const availablePaymentMethodTypes = yield repos.categoryCode.search({
                 project: { id: { $eq: transaction.project.id } },
                 inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
@@ -92,7 +94,7 @@ function authorize(params) {
         const actionAttributes = (0, factory_1.createAuthorizeSeatReservationActionAttributes)({
             acceptAction: params.object.acceptAction,
             acceptedOffers,
-            event: screeningEvent,
+            event: { id: screeningEvent.id, typeOf: screeningEvent.typeOf },
             transaction,
             pendingTransaction
         });

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js

@@ -72,9 +72,11 @@ function changeOffers(params) {
             return Object.assign(Object.assign({}, offer), { ticketInfo: Object.assign(Object.assign({}, offer.ticketInfo), { spseatAdd1: originalAcceptedOfferBySeatNumber.ticketInfo.spseatAdd1, spseatAdd2: originalAcceptedOfferBySeatNumber.ticketInfo.spseatAdd2, spseatKbn: originalAcceptedOfferBySeatNumber.ticketInfo.spseatKbn }) });
         });
         // イベント取得属性最適化(2023-01-23~)
-        const screeningEvent = yield repos.event.findMinimizedIndividualEventById({
-            id: params.object.event.id
-        });
+        const screeningEvent = yield repos.event.projectFieldsById({ id: params.object.event.id }, [
+            'coaInfo', 'doorTime', 'endDate', 'location', 'startDate',
+            'superEvent', 'typeOf', 'identifier', 'name'
+        ] // optimize(2024-07-18~)
+        );
         const availablePaymentMethodTypes = yield repos.categoryCode.search({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }

package/lib/chevre/service/offer/eventServiceByCOA/factory.d.ts

@@ -7,7 +7,10 @@ export declare function createAuthorizeSeatReservationActionAttributes(params: {
         id: string;
     };
     acceptedOffers: factory.action.authorize.offer.eventService.IAcceptedOffer4COA[];
-    event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id' | 'typeOf'>;
+    event: {
+        id: string;
+        typeOf: factory.eventType.ScreeningEvent;
+    };
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
     pendingTransaction: factory.action.authorize.offer.eventService.ICOAPendingTransaction;
 }): factory.action.authorize.offer.eventService.IAttributes<WebAPIIdentifier.COA>;
@@ -25,7 +28,7 @@ type IResultAcceptedOffer = factory.action.authorize.offer.eventService.IResultA
 export declare function responseBody2acceptedOffers4result(params: {
     responseBody: factory.action.authorize.offer.eventService.IResponseBody<factory.service.webAPI.Identifier.COA>;
     acceptedOffer: factory.action.authorize.offer.eventService.IAcceptedOffer4COA[];
-    event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
+    event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'coaInfo' | 'doorTime' | 'endDate' | 'id' | 'location' | 'startDate' | 'superEvent' | 'typeOf' | 'identifier' | 'name'>;
     seller: Pick<factory.transaction.placeOrder.ISeller, 'typeOf' | 'name'>;
     bookingTime: Date;
     totalPrice: number;

package/lib/chevre/service/offer/factory.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCompoundPriceSpec4event = void 0;
 const factory = require("../../factory");
-const settings_1 = require("../../settings");
 function categoryCodeChargePriceSpec2component(params) {
     var _a;
     return Object.assign({ id: params.id, typeOf: params.typeOf, name: params.name, price: params.price, priceCurrency: params.priceCurrency, valueAddedTaxIncluded: params.valueAddedTaxIncluded, appliesToCategoryCode: params.appliesToCategoryCode }, (typeof ((_a = params.accounting) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { accounting: params.accounting } : undefined);
@@ -77,11 +76,11 @@ function createCompoundPriceSpec4event(params) {
     };
     // 必要な属性のみに限定(2023-02-24~)
     const { acceptedPaymentMethod, name, description, alternateName, color, typeOf, id, availability, category, eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation, priceCurrency, validFrom, validThrough, validRateLimit, additionalProperty, identifier, itemOffered, offerIndex, parentOffer } = params.offer;
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ name, description, alternateName, color, typeOf, id,
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ name, description, alternateName, color, typeOf, id,
         category,
         eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation,
         priceCurrency,
         validFrom, validThrough, validRateLimit, additionalProperty,
-        identifier, itemOffered, addOn: params.addOn, eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification }, (typeof params.availability === 'string') ? { availability: params.availability } : { availability }), (typeof params.sortIndex === 'number') ? { sortIndex: params.sortIndex } : undefined), (typeof offerIndex === 'number') ? { offerIndex } : undefined), (typeof (parentOffer === null || parentOffer === void 0 ? void 0 : parentOffer.id) === 'string') ? { parentOffer: { id: parentOffer.id } } : undefined), (Array.isArray(acceptedPaymentMethod)) ? { acceptedPaymentMethod } : undefined), (!settings_1.USE_OPTIMIZE_TICKET_OFFER) ? {} : undefined);
+        identifier, itemOffered, addOn: params.addOn, eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification }, (typeof params.availability === 'string') ? { availability: params.availability } : { availability }), (typeof params.sortIndex === 'number') ? { sortIndex: params.sortIndex } : undefined), (typeof offerIndex === 'number') ? { offerIndex } : undefined), (typeof (parentOffer === null || parentOffer === void 0 ? void 0 : parentOffer.id) === 'string') ? { parentOffer: { id: parentOffer.id } } : undefined), (Array.isArray(acceptedPaymentMethod)) ? { acceptedPaymentMethod } : undefined);
 }
 exports.createCompoundPriceSpec4event = createCompoundPriceSpec4event;

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

@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onEventChanged = exports.createAggregateScreeningEventIfNotExist = void 0;
 const factory = require("../../factory");
-const settings_1 = require("../../settings");
 /**
  * イベント変更時処理
  */
@@ -156,28 +155,27 @@ function createInformTasks(params) {
             // 最適化(2024-03-22~)
             events4inform = screeningEvents4inform.map(({ project, organizer, typeOf, name, doorTime, endDate, eventStatus, location, startDate, superEvent, offers, id, additionalProperty }) => {
                 var _a;
-                return Object.assign({ project, organizer, typeOf, name, doorTime, endDate,
-                    eventStatus, location, startDate, superEvent, id, additionalProperty }, (settings_1.USE_OPTIMIZE_INFORM_EVENT)
-                    ? {
-                        offers: (((_a = offers.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.COA)
-                            ? {
-                                typeOf: offers.typeOf,
-                                itemOffered: offers.itemOffered
-                            }
-                            : {
-                                typeOf: offers.typeOf,
-                                itemOffered: offers.itemOffered,
-                                seller: {
-                                    id: offers.seller.id,
-                                    typeOf: offers.seller.typeOf,
-                                    // makesOfferを追加(2024-03-26~)
-                                    makesOffer: (Array.isArray(offers.seller.makesOffer))
-                                        ? offers.seller.makesOffer
-                                        : []
-                                }
+                return {
+                    project, organizer, typeOf, name, doorTime, endDate,
+                    eventStatus, location, startDate, superEvent, id, additionalProperty,
+                    offers: (((_a = offers.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.COA)
+                        ? {
+                            typeOf: offers.typeOf,
+                            itemOffered: offers.itemOffered
+                        }
+                        : {
+                            typeOf: offers.typeOf,
+                            itemOffered: offers.itemOffered,
+                            seller: {
+                                id: offers.seller.id,
+                                typeOf: offers.seller.typeOf,
+                                // makesOfferを追加(2024-03-26~)
+                                makesOffer: (Array.isArray(offers.seller.makesOffer))
+                                    ? offers.seller.makesOffer
+                                    : []
                             }
-                    }
-                    : { offers });
+                        }
+                };
             });
         }
         else {