@chevre/domain 24.1.0-alpha.6 → 24.1.0-alpha.60

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

@@ -17,16 +17,18 @@ const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
+const integration_1 = require("../../repo/setting/integration");
 const task_1 = require("../../repo/task");
 const payByTask_1 = require("./payment/payByTask");
 /**
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient, settings }) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
+        const settings = new integration_1.IntegrationSettingRepo({ connection });
         const payActionAttributes = await (0, payByTask_1.payTask2payActionAttributes)({
             ...params.data,
             sameAs: { id: params.id, typeOf: 'Task' } // タスクIDを関連付け(2024-04-20~)
@@ -38,7 +40,7 @@ function call(params) {
             order: new order_1.OrderRepo(connection)
         });
         const paymentServiceId = payActionAttributes.object.at(0)?.id;
-        const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
+        const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
             && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         await (0, payByTask_1.payByTask)(

package/lib/chevre/service/task/payment/invalidatePaymentUrlByTask.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
 import type { PayActionRepo } from '../../../repo/action/pay';
 import type { RefundActionRepo } from '../../../repo/action/refund';

package/lib/chevre/service/task/payment/payByTask.d.ts

@@ -14,7 +14,7 @@ import type { ProjectRepo } from '../../../repo/project';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 interface IPayTask2payActionAttributesRepos {
     checkMovieTicketAction: CheckMovieTicketActionRepo;
     acceptedOffer: AcceptedOfferRepo;

package/lib/chevre/service/task/payment/payByTask.js

@@ -64,20 +64,19 @@ function fixOrderAsPurpose(params, transaction) {
         let acceptedOffersMovieTicketUsed = [];
         const movieTickets = transaction.object.paymentMethod.movieTickets;
         if (Array.isArray(movieTickets) && movieTickets.length > 0) {
-            const reservationForId = movieTickets[0].serviceOutput.reservationFor.id; // イベントIDは決済取引ごとにひとつのみ許可なので、これで問題ない
-            const seatNumbers = movieTickets.map(({ serviceOutput }) => serviceOutput.reservedTicket.ticketedSeat.seatNumber);
+            // const reservationForId = movieTickets[0].serviceOutput.reservationFor.id; // イベントIDは決済取引ごとにひとつのみ許可なので、これで問題ない
+            // const seatNumbers = movieTickets.map(({ serviceOutput }) => serviceOutput.reservedTicket.ticketedSeat.seatNumber);
             acceptedOffersMovieTicketUsed = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
                 orderNumber: { $eq: orderWithoutAcceptedOffers.orderNumber },
                 project: { id: { $eq: transaction.project.id } },
                 acceptedOffers: {
                     itemOffered: {
-                        typeOf: { $in: [factory_1.factory.reservationType.EventReservation] },
-                        // movieTicketsに結合されたイベントID,座席コードで絞る
-                        reservationFor: { id: { $in: [reservationForId] } },
-                        reservedTicket: { ticketedSeat: { seatNumber: { $in: seatNumbers } } }
+                    // movieTicketsに結合されたイベントID,座席コードで絞る
+                    // reservationFor: { id: { $in: [reservationForId] } }, // reservationForによる絞りは廃止(2026-06-04~)
+                    // reservedTicket: { ticketedSeat: { seatNumber: { $in: seatNumbers } } } // 座席番号による絞りは廃止(2026-06-01~)
                     }
                 }
-            }, ['itemOffered', 'priceSpecification']);
+            }, { noName: true });
         }
         return {
             ...orderWithoutAcceptedOffers,

package/lib/chevre/service/task/payment/refundByTask.d.ts

@@ -11,7 +11,7 @@ import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccep
 import type { TaskRepo } from '../../../repo/task';
 import type { TransactionNumberRepo } from '../../../repo/transactionNumber';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 declare function refundByTask(params: factory.task.refund.IData & {
     sameAs?: {
         id: string;

package/lib/chevre/service/task/payment/voidPaymentByTask.d.ts

@@ -11,7 +11,7 @@ import type { ProjectRepo } from '../../../repo/project';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
-import { Settings } from '../../../settings';
+import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 declare function voidPaymentByTask(params: factory.task.voidPayment.IData): (repos: {
     action: ActionRepo;
     actions: {

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

@@ -9,6 +9,7 @@ const authorizePaymentMethod_1 = require("../../repo/action/authorizePaymentMeth
 const order_1 = require("../../repo/order");
 const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const setting_1 = require("../../repo/setting");
+const integration_1 = require("../../repo/setting/integration");
 const task_1 = require("../../repo/task");
 // import { TransactionRepo } from '../../repo/transaction';
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
@@ -17,7 +18,8 @@ const placeOrder_2 = require("../order/placeOrder");
  * タスク実行関数
  */
 function call(data) {
-    return async ({ connection, settings }) => {
+    return async ({ connection }) => {
+        const settings = new integration_1.IntegrationSettingRepo({ connection });
         await (0, placeOrder_2.placeOrder)({
             ...data,
             useOnOrderStatusChanged: true

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

@@ -15,6 +15,7 @@ const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const project_1 = require("../../repo/project");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
+const integration_1 = require("../../repo/setting/integration");
 const ticket_1 = require("../../repo/ticket");
 // import { TransactionRepo } from '../../repo/transaction';
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
@@ -25,7 +26,7 @@ const any_1 = require("../payment/any");
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient, settings }, options) => {
+    return async ({ connection, redisClient }, options) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
@@ -33,6 +34,7 @@ function call(params) {
         if (!options.executeById) {
             return;
         }
+        const settings = new integration_1.IntegrationSettingRepo({ connection });
         const actionRepo = new acceptPay_1.AcceptPayActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {

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

@@ -13,6 +13,7 @@ const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
+const integration_1 = require("../../repo/setting/integration");
 const task_1 = require("../../repo/task");
 const transactionNumber_1 = require("../../repo/transactionNumber");
 const refundByTask_1 = require("./payment/refundByTask");
@@ -20,10 +21,11 @@ const refundByTask_1 = require("./payment/refundByTask");
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient, settings }) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
+        const settings = new integration_1.IntegrationSettingRepo({ connection });
         let data;
         if (params.name === factory_1.factory.taskName.Refund) {
             data = {
@@ -35,7 +37,7 @@ function call(params) {
             data = params;
         }
         const paymentServiceId = data.object.at(0)?.id;
-        const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
+        const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
             && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         await (0, refundByTask_1.refundByTask)(data)({

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

@@ -48,6 +48,7 @@ const assetTransaction_1 = require("../../repo/assetTransaction");
 const project_1 = require("../../repo/project");
 const reservation_1 = require("../../repo/reservation");
 const reserveInterface_1 = require("../../repo/reserveInterface");
+const integration_1 = require("../../repo/setting/integration");
 const transactionNumber_1 = require("../../repo/transactionNumber");
 let coaAuthClientCreated = false;
 let coaAuthClient = new coa_service_1.COA.auth.RefreshToken({
@@ -59,7 +60,7 @@ let coaAuthClient = new coa_service_1.COA.auth.RefreshToken({
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient, settings }) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
@@ -72,10 +73,11 @@ function call(params) {
                 coaAuthClientCreated = true;
             }
         }
+        const settings = new integration_1.IntegrationSettingRepo({ connection });
         const reserveService = new coa_service_1.COA.service.Reserve({
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
-        }, { timeout: settings.coa.timeout });
+        }, { timeout: (await settings.getByKey('coa')).timeoutReserve });
         await returnReserve({
             ...params.data,
             sameAs: { id: params.id }

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

@@ -4,19 +4,21 @@ exports.call = call;
 const action_1 = require("../../repo/action");
 const message_1 = require("../../repo/message");
 const project_1 = require("../../repo/project");
+const integration_1 = require("../../repo/setting/integration");
 const notification_1 = require("../notification");
 /**
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, credentials }) => {
+    return async ({ connection }) => {
         await (0, notification_1.sendEmailMessage)({
             ...params.data.actionAttributes,
             sameAs: { id: params.id } // タスクIDを関連付け(2024-06-25~)
         })({
             action: new action_1.ActionRepo(connection),
             message: new message_1.MessageRepo(connection),
-            project: new project_1.ProjectRepo(connection)
-        }, credentials);
+            project: new project_1.ProjectRepo(connection),
+            integrationSetting: new integration_1.IntegrationSettingRepo({ connection })
+        });
     };
 }

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

@@ -16,6 +16,7 @@ const eventSeries_1 = require("../../repo/eventSeries");
 const movieTheater_1 = require("../../repo/place/movieTheater");
 const screeningRoom_1 = require("../../repo/place/screeningRoom");
 const reserveInterface_1 = require("../../repo/reserveInterface");
+const integration_1 = require("../../repo/setting/integration");
 const saveScreeningEvents_1 = require("../event/saveScreeningEvents");
 const saveScreeningEventSeries_1 = require("../event/saveScreeningEventSeries");
 let coaAuthClient;
@@ -23,7 +24,7 @@ let coaAuthClient;
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient, settings }, options) => {
+    return async ({ connection, redisClient }, options) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
@@ -31,6 +32,7 @@ function call(params) {
         if (!options.executeById) {
             return;
         }
+        const settings = new integration_1.IntegrationSettingRepo({ connection });
         const reserveInterfaceRepo = new reserveInterface_1.ReserveInterfaceRepo(connection);
         const coaAPI = await reserveInterfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
         if (typeof coaAPI?.id !== 'string') {
@@ -60,7 +62,7 @@ function call(params) {
             const masterService = new coa_service_1.COA.service.Master({
                 endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
                 auth: coaAuthClient
-            }, { timeout: settings.coa.timeout });
+            }, { timeout: (await settings.getByKey('coa')).timeoutMaster });
             const { agent, object } = params.data;
             if (object.typeOf === factory_1.factory.eventType.ScreeningEventSeries) {
                 await syncEventSeries({

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

@@ -13,18 +13,20 @@ const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
+const integration_1 = require("../../repo/setting/integration");
 const task_1 = require("../../repo/task");
 const voidPaymentByTask_1 = require("./payment/voidPaymentByTask");
 /**
  * タスク実行関数
  */
 function call(data) {
-    return async ({ connection, redisClient, settings }) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
+        const settings = new integration_1.IntegrationSettingRepo({ connection });
         const paymentServiceId = data.object.object.id;
-        const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
+        const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
             && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         await (0, voidPaymentByTask_1.voidPaymentByTask)(data)({

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

@@ -13,6 +13,7 @@ const offer_1 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
 const reserveInterface_1 = require("../../repo/reserveInterface");
 const setting_1 = require("../../repo/setting");
+const integration_1 = require("../../repo/setting/integration");
 const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
 // import { TransactionRepo } from '../../repo/transaction';
@@ -27,7 +28,7 @@ let coaAuthClient = new coa_service_1.COA.auth.RefreshToken({
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient, settings }, options) => {
+    return async ({ connection, redisClient }, options) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
@@ -47,10 +48,11 @@ function call(params) {
                 coaAuthClientCreated = true;
             }
         }
+        const settings = new integration_1.IntegrationSettingRepo({ connection });
         const reserveService = new coa_service_1.COA.service.Reserve({
             endpoint: coaAuthClient.options.endpoint, // same as authClient(2024-07-17~)
             auth: coaAuthClient
-        }, { timeout: settings.coa.timeout });
+        }, { timeout: (await settings.getByKey('coa')).timeoutReserve });
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
             await (0, voidTransaction_1.voidTransaction)({

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

@@ -1,14 +1,7 @@
-import { SendGridCredentials } from '../credentials/sendGrid';
 import type { IExecuteSettings as IMinimumExecuteSettings, INextFunction, IReadyTask, IRunningTask } from '../eventEmitter/task';
 import { factory } from '../factory';
-import { Settings } from '../settings';
 import type { AggregationSettings } from '../taskSettings';
-interface ICredentialSettings {
-    sendGrid: SendGridCredentials;
-}
 interface IExecuteSettings extends IMinimumExecuteSettings {
-    credentials: ICredentialSettings;
-    settings: Settings;
     aggregationSettings?: AggregationSettings;
 }
 type IOperation<T> = (settings: IExecuteSettings) => Promise<T>;

package/lib/chevre/service/transaction/placeOrder/confirm/factory/result.d.ts

@@ -5,7 +5,6 @@ import { factory } from '../../../../../factory';
 declare function createOrderAsResult(params: {
     orderNumber: string;
     orderDate: Date;
-    orderStatus: factory.orderStatus;
     price: number;
 }): factory.transaction.placeOrder.IOrderAsResult;
 export { createOrderAsResult };

package/lib/chevre/service/transaction/placeOrder/confirm/factory/result.js

@@ -2,30 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOrderAsResult = createOrderAsResult;
 const factory_1 = require("../../../../../factory");
-// import { acceptedOffers2orderedItem } from './result/orderedItem';
 /**
  * 注文取引結果としての注文を生成する
  */
 function createOrderAsResult(params) {
-    const { orderDate, orderNumber, orderStatus, price } = params;
+    const { orderDate, orderNumber, price } = params;
     return {
-        typeOf: factory_1.factory.order.OrderType.Order,
-        price,
-        priceCurrency: factory_1.factory.priceCurrency.JPY,
-        // discounts: discounts, // 廃止(2024-04-16~)
         confirmationNumber: '',
         orderNumber,
-        url: '',
-        orderStatus,
         orderDate,
-        identifier: []
-        // orderedItem: params.orderedItem, // discontinue(2024-06-20~)
-        // paymentMethods: params.paymentMethods, // discontinue(2024-06-20~)
-        // customer, // discontinue(2024-06-20~)
-        // project: params.transaction.project, // discontinue(2024-06-20~)
-        // seller, // discontinue(2024-06-20~)
-        // isGift: params.isGift, // discontinue(2024-06-20~)
-        // ...(typeof name === 'string') ? { name } : undefined, // discontinue(2024-06-20~)
-        // ...(typeof broker?.typeOf === 'string') ? { broker } : undefined // discontinue(2024-06-20~)
+        typeOf: factory_1.factory.order.OrderType.Order,
+        price,
+        priceCurrency: factory_1.factory.priceCurrency.JPY,
+        orderStatus: factory_1.factory.orderStatus.OrderPaymentDue // 注文作成時のステータスとなる
+        // url: '', // discontinue(2026-06-11~)
+        // identifier: [] // discontinue(2026-06-11~)
     };
 }

package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions/sendEmailMessage.d.ts

@@ -1,7 +1,13 @@
 import { factory } from '../../../../../factory';
 import type { ISetting } from '../../../../../repo/setting';
 export declare function createSendEmailMessageActions(params: {
-    order: factory.transaction.placeOrder.IOrderAsResult;
+    order: factory.transaction.placeOrder.IOrderAsResult & {
+        confirmationNumber: string;
+        orderStatus: factory.orderStatus;
+        price: number;
+        priceCurrency: factory.priceCurrency;
+        typeOf: factory.order.OrderType;
+    };
     customer: factory.order.ICustomer;
     seller: factory.order.ISeller;
     paymentMethods: factory.order.IReferencedInvoice[];

package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions/sendEmailMessage.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSendEmailMessageActions = createSendEmailMessageActions;
 const emailMessageBuilder_1 = require("../../../../../emailMessageBuilder");
 const factory_1 = require("../../../../../factory");
-// import { Settings } from '../../../../../settings';
 async function createSendEmailMessageActions(params, 
 // settings: Settings
 setting) {

package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions.d.ts

@@ -4,7 +4,13 @@ import type { ISetting } from '../../../../repo/setting';
  * 取引のポストアクションを作成する
  */
 export declare function createPotentialActions(params: {
-    order: factory.transaction.placeOrder.IOrderAsResult;
+    order: factory.transaction.placeOrder.IOrderAsResult & {
+        confirmationNumber: string;
+        orderStatus: factory.orderStatus.OrderPaymentDue;
+        price: number;
+        priceCurrency: factory.priceCurrency;
+        typeOf: factory.order.OrderType;
+    };
     customer: factory.order.ICustomer;
     seller: factory.order.ISeller;
     paymentMethods: factory.order.IReferencedInvoice[];

package/lib/chevre/service/transaction/placeOrder/confirm/potentialActions.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = createPotentialActions;
-// import { Settings } from '../../../../settings';
 const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
 /**
  * 取引のポストアクションを作成する

package/lib/chevre/service/transaction/placeOrder/confirm/validation/validateInvoiceReferencesOrder.d.ts

@@ -4,5 +4,5 @@ declare function validateInvoiceReferencesOrder(authorizePaymentActions: IAuthor
 /**
  * 受け入れられた興行オファー
  */
-eventReservationAcceptedOffers: factory.order.IAcceptedOffer[]): void;
+eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered'>[]): void;
 export { validateInvoiceReferencesOrder };

package/lib/chevre/service/transaction/placeOrder/confirm/validation/validateMovieTicket.d.ts

@@ -18,4 +18,4 @@ authorizedMovieTickets: IMovieTicket4validate[],
 /**
  * 受け入れられた興行オファー
  */
-eventReservationAcceptedOffers: factory.order.IAcceptedOffer[]): void;
+eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>[]): void;

package/lib/chevre/service/transaction/placeOrder/confirm/validation.d.ts

@@ -5,7 +5,7 @@ export { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizePaymentAction,
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: factory.order.IAcceptedOffer[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer): void;
+export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer): void;
 export type IOrderURLGenerator = (order: factory.order.IOrder) => string;
 /**
  * 注文オファー数検証
@@ -14,7 +14,7 @@ export declare function validateAcceptedOffers(params: {
     result: {
         order: PlaceOrderFactory.IResultOrderParams;
     };
-    acceptedOffers: factory.order.IAcceptedOffer[];
+    acceptedOffers: (Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'offeredThrough' | 'serialNumber'>)[];
 }): void;
 export declare function validateOrderedItem(params: {
     order: Pick<factory.order.IOrder, 'orderedItem'>;
@@ -36,7 +36,9 @@ export declare function validatePaymentMethods(params: {
  * 興行オファー適用条件確認
  */
 export declare function validateEventOffers(params: {
-    order: Pick<factory.transaction.placeOrder.IOrderAsResult, 'price'>;
+    order: {
+        price: number;
+    };
     paymentMethods: factory.order.IReferencedInvoice[];
     authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'instrument' | 'object' | 'result'>[];
 }): void;

package/lib/chevre/service/transaction/placeOrder/confirm.js

@@ -8,7 +8,6 @@ const debug_1 = __importDefault(require("debug"));
 const moment_1 = __importDefault(require("moment"));
 const errorHandler_1 = require("../../../errorHandler");
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const factory_2 = require("../../order/placeOrder/factory");
 const orderedItem_1 = require("../../order/placeOrder/factory/orderedItem");
 const result_1 = require("./confirm/factory/result");
@@ -99,7 +98,10 @@ function confirm(params, options) {
         // authorizeProductOfferActions,
         serialNumbers } = dissolveAuthorizeActions(completedAuthorizeActions);
         // orderInTransactionから検索する(2024-03-04~)
-        const acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersByOrderNumber({ orderNumber: { $eq: orderNumber } }))
+        const acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersWithPriceByOrderNumber({
+            orderNumber,
+            project: { id: transaction.project.id }
+        }))
             .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
         // authorizePaymentActionsからpayTransactionsを参照(2024-06-20~)
         let payTransactions = [];
@@ -116,7 +118,7 @@ function confirm(params, options) {
         // let customer: factory.order.ICustomer = createCustomer({ transaction });
         const customer = await repos.orderInTransaction.findCustomerByOrderNumber({ orderNumber: { $eq: orderNumber } });
         const seller = (0, factory_2.createSeller)({ transaction });
-        const { paymentMethods, result, eventId, reservationIds } = createResult({
+        const { paymentMethods, placingOrder, result, eventId, reservationIds } = createResult({
             ...params,
             orderNumber, transaction,
             acceptPayActions,
@@ -142,7 +144,7 @@ function confirm(params, options) {
             throw new factory_1.factory.errors.NotFound('setting.defaultSenderEmail');
         }
         const { emailMessages, potentialActions } = await (0, potentialActions_1.createPotentialActions)({
-            order: result.order, // createEmailMessageでのorder.acceptedOffersへの依存性を排除したのでこちらでよいはず(2024-02-21~)
+            order: placingOrder, // createEmailMessageでのorder.acceptedOffersへの依存性を排除したのでこちらでよいはず(2024-02-21~)
             customer,
             seller,
             paymentMethods,
@@ -288,7 +290,7 @@ function createResult(params, options) {
         const itemOfferedTypeOf = acceptedOffer.itemOffered.typeOf;
         switch (itemOfferedTypeOf) {
             case factory_1.factory.reservationType.EventReservation:
-                eventReservationAcceptedOffers.push(acceptedOffer);
+                eventReservationAcceptedOffers.push((acceptedOffer));
                 break;
             // case factory.permit.PermitType.Permit:
             //     productAcceptedOffers.push((acceptedOffer as factory.order.IAcceptedOffer<factory.order.IPermit>));
@@ -303,18 +305,7 @@ function createResult(params, options) {
     eventReservationAcceptedOffers, params.payTransactions, params.customer);
     const { paymentMethods, price } = (0, factory_2.createPaymentMethods)({ authorizePaymentActions: params.authorizePaymentActions });
     const orderedItem = (0, orderedItem_1.acceptedOffers2orderedItem)({
-        eventReservationAcceptedOffers,
-        // productAcceptedOffers,
-        // moneyTransferAcceptedOffers
-    });
-    // 注文作成
-    const orderAsResult = (0, result_1.createOrderAsResult)({
-        orderNumber: params.orderNumber,
-        orderDate: params.result.order.orderDate,
-        orderStatus: factory_1.factory.orderStatus.OrderPaymentDue, // 注文作成時のステータスとなる
-        // orderedItem,
-        // paymentMethods,
-        price
+        eventReservationAcceptedOffers
     });
     (0, validation_1.validateEventOffers)({
         order: { price },
@@ -333,14 +324,24 @@ function createResult(params, options) {
     });
     (0, validation_1.validatePaymentMethods)({ order: { paymentMethods } }, options);
     // 確認番号を発行
-    const { confirmationNumber, identifier, url } = createConfirmationNumber({
-        order: orderAsResult,
-        transaction: transaction,
-        result: params.result
+    const { confirmationNumber } = createConfirmationNumber({ transaction });
+    // 注文作成
+    const orderAsResult = (0, result_1.createOrderAsResult)({
+        orderNumber: params.orderNumber,
+        orderDate: params.result.order.orderDate,
+        price
     });
     orderAsResult.confirmationNumber = confirmationNumber;
-    orderAsResult.identifier = identifier;
-    orderAsResult.url = url;
+    // orderAsResult.identifier = identifier; // discontinue(2026-06-11~)
+    // orderAsResult.url = url; // discontinue(2026-06-11~)
+    const placingOrder = {
+        ...orderAsResult,
+        confirmationNumber,
+        typeOf: factory_1.factory.order.OrderType.Order,
+        price,
+        priceCurrency: factory_1.factory.priceCurrency.JPY,
+        orderStatus: factory_1.factory.orderStatus.OrderPaymentDue
+    };
     const authorizeActions = [
         ...params.authorizePaymentActions.map(({ id }) => ({ id })),
         ...params.authorizeEventServiceOfferActions.map(({ id }) => ({ id })),
@@ -356,6 +357,7 @@ function createResult(params, options) {
     }
     return {
         paymentMethods,
+        placingOrder,
         result: {
             order: orderAsResult,
             authorizeActions, // 追加(2024-01-17~)
@@ -441,26 +443,12 @@ function searchAuthorizeActions(params) {
 }
 function createConfirmationNumber(params) {
     const confirmationNumber = params.transaction.object.confirmationNumber;
-    let url = '';
     // 取引に確認番号が保管されていなければ、確認番号を発行
     if (typeof confirmationNumber !== 'string') {
         // 事前に発行済なはずなので、ありえないフロー
         throw new factory_1.factory.errors.Internal('object.confirmationNumber undefined');
     }
-    // URLの指定があれば上書き
-    /* istanbul ignore if */
-    if (typeof params.result.order.url === 'string') {
-        url = params.result.order.url;
-    }
-    else /* istanbul ignore next */ if (typeof params.result.order.url === 'function') {
-        /* istanbul ignore next */
-        url = params.result.order.url(params.order);
-    }
-    // 識別子の指定があれば上書き
-    const identifier = [
-        ...(Array.isArray(params.result.order.identifier)) ? params.result.order.identifier : [],
-        // 取引に指定があれば追加
-        ...(Array.isArray(params.transaction.object.identifier)) ? params.transaction.object.identifier : []
-    ];
-    return { confirmationNumber, url, identifier };
+    return {
+        confirmationNumber,
+    };
 }

package/lib/chevre/service/transaction/placeOrder/exportTasksById.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.exportTasksById = exportTasksById;
 const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../../../factory");
-// import { Settings } from '../../../settings';
 const factory_2 = require("./exportTasks/factory");
 /**
  * 取引のタスクを出力します