@chevre/domain 22.6.0-alpha.9 → 22.6.0

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

@@ -10,10 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const factory = require("../../factory");
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
 const paymentService_1 = require("../../repo/paymentService");
@@ -27,13 +29,36 @@ const payment_1 = require("../payment");
  * タスク実行関数
  */
 function call(params) {
-    return ({ connection, settings }) => __awaiter(this, void 0, void 0, function* () {
-        yield (0, payment_1.pay)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id, typeOf: 'Task' } // タスクIDを関連付け(2024-04-20~)
+    return ({ connection, redisClient, settings }) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        if (redisClient === undefined) {
+            throw new factory.errors.Argument('settings', 'redisClient required');
+        }
+        let payActionAttributes;
+        payActionAttributes = yield (0, payment_1.payTask2payActionAttributes)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id, typeOf: 'Task' } // タスクIDを関連付け(2024-04-20~)
          }))({
+            acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
+            assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
+            order: new order_1.OrderRepo(connection)
+        });
+        const paymentServiceId = (_a = payActionAttributes.object.at(0)) === null || _a === void 0 ? void 0 : _a.id;
+        const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
+        const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
+            && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
+        yield (0, payment_1.pay)(
+        // {
+        //     ...params.data,
+        //     sameAs: { id: params.id, typeOf: 'Task' } // タスクIDを関連付け(2024-04-20~)
+        // }
+        payActionAttributes)({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
+            credentials: new credentials_1.CredentialsRepo(redisClient, {
+                scope: `${factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,
+                expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0
+            }),
             event: new event_1.EventRepo(connection),
             order: new order_1.OrderRepo(connection),
             paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),

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

@@ -15,6 +15,7 @@ const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const order_1 = require("../../repo/order");
 const orderInTransaction_1 = require("../../repo/orderInTransaction");
+const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
 const placeOrder_1 = require("../order/placeOrder");
@@ -29,6 +30,7 @@ function call(data) {
             action: new action_1.ActionRepo(connection),
             order: new order_1.OrderRepo(connection),
             orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
+            setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
             transaction: new transaction_1.TransactionRepo(connection)
         }, settings);

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

@@ -14,6 +14,7 @@ const factory = require("../../factory");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const credentials_1 = require("../../repo/credentials");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
@@ -27,6 +28,7 @@ const payment_1 = require("../payment");
  */
 function call(params) {
     return ({ connection, redisClient, settings }) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         if (redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
@@ -38,9 +40,17 @@ function call(params) {
         else {
             data = params;
         }
+        const paymentServiceId = (_a = data.object.at(0)) === null || _a === void 0 ? void 0 : _a.id;
+        const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
+        const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
+            && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         yield (0, payment_1.refund)(data)({
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
+            credentials: new credentials_1.CredentialsRepo(redisClient, {
+                scope: `${factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,
+                expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0
+            }),
             paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
             paymentService: new paymentService_1.PaymentServiceRepo(connection),
             paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),

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

@@ -13,13 +13,14 @@ exports.call = void 0;
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const reservation_1 = require("../../repo/reservation");
+const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
 const confirmReservation_1 = require("../reserve/confirmReservation");
 /**
  * タスク実行関数
  */
 function call(data) {
-    return ({ connection, settings }) => __awaiter(this, void 0, void 0, function* () {
+    return ({ connection }) => __awaiter(this, void 0, void 0, function* () {
         yield (0, confirmReservation_1.confirmReservation)({
             // actionAttributesList: data.actionAttributes,
             potentialReserveAction: data,
@@ -29,8 +30,11 @@ function call(data) {
             action: new action_1.ActionRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             reservation: new reservation_1.ReservationRepo(connection),
+            setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection)
-        }, settings);
+        }
+        // settings
+        );
     });
 }
 exports.call = call;

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

@@ -14,6 +14,7 @@ const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const action_1 = require("../../repo/action");
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
+const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
 const returnOrder_1 = require("../order/returnOrder");
@@ -21,15 +22,18 @@ const returnOrder_1 = require("../order/returnOrder");
  * タスク実行関数
  */
 function call(data) {
-    return ({ connection, settings }) => __awaiter(this, void 0, void 0, function* () {
+    return ({ connection }) => __awaiter(this, void 0, void 0, function* () {
         yield (0, returnOrder_1.returnOrder)(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             action: new action_1.ActionRepo(connection),
             order: new order_1.OrderRepo(connection),
             ownershipInfo: new ownershipInfo_1.OwnershipInfoRepo(connection),
+            setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
             transaction: new transaction_1.TransactionRepo(connection)
-        }, settings);
+        }
+        // settings
+        );
     });
 }
 exports.call = call;

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

@@ -1,5 +1,5 @@
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
 import * as factory from '../../factory';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
 /**
  * タスク実行関数
  */

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

@@ -13,25 +13,39 @@ exports.call = void 0;
 const COA = require("@motionpicture/coa-service");
 const moment = require("moment");
 const factory = require("../../factory");
+const CancelReservationTransactionService = require("../assetTransaction/cancelReservation");
+const CancelReservationCOAService = require("../assetTransaction/cancelReservationCOA");
+const factory_1 = require("../assetTransaction/cancelReservationCOA/factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const interface_1 = require("../../repo/interface");
 const project_1 = require("../../repo/project");
 const reservation_1 = require("../../repo/reservation");
 const transactionNumber_1 = require("../../repo/transactionNumber");
-const CancelReservationTransactionService = require("../assetTransaction/cancelReservation");
-const CancelReservationCOAService = require("../assetTransaction/cancelReservationCOA");
-const factory_1 = require("../assetTransaction/cancelReservationCOA/factory");
+let coaAuthClientCreated = false;
+let coaAuthClient = new COA.auth.RefreshToken({
+    endpoint: '',
+    refreshToken: '',
+    useFetch: true
+});
 /**
  * タスク実行関数
  */
 function call(params) {
-    return ({ connection, redisClient, settings, coaAuthClient }) => __awaiter(this, void 0, void 0, function* () {
-        if (coaAuthClient === undefined) {
-            throw new factory.errors.Argument('settings', 'coaAuthClient required');
-        }
+    return ({ connection, redisClient, settings }) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         if (redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
+        if (!coaAuthClientCreated) {
+            const interfaceRepo = new interface_1.InterfaceRepo(connection);
+            const coaAPI = yield interfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
+            const credentials = (_a = coaAPI === null || coaAPI === void 0 ? void 0 : coaAPI.availableChannel) === null || _a === void 0 ? void 0 : _a.credentials;
+            if (typeof (credentials === null || credentials === void 0 ? void 0 : credentials.refreshToken) === 'string') {
+                coaAuthClient = new COA.auth.RefreshToken(credentials);
+                coaAuthClientCreated = true;
+            }
+        }
         const reserveService = new COA.service.Reserve({
             endpoint: coaAuthClient.options.endpoint,
             auth: coaAuthClient

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

@@ -15,6 +15,7 @@ const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const action_1 = require("../../repo/action");
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
+const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
 const sendOrder_1 = require("../order/sendOrder");
@@ -34,6 +35,7 @@ function call(data) {
             action: new action_1.ActionRepo(connection),
             order: new order_1.OrderRepo(connection),
             ownershipInfo: new ownershipInfo_1.OwnershipInfoRepo(connection),
+            setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
             transaction: new transaction_1.TransactionRepo(connection)
         }, settings);

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

@@ -14,21 +14,25 @@ const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const order_1 = require("../../repo/order");
 const reservation_1 = require("../../repo/reservation");
+const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
 const useReservation_1 = require("../reserve/useReservation");
 /**
  * タスク実行関数
  */
 function call(data) {
-    return ({ connection, settings }) => __awaiter(this, void 0, void 0, function* () {
+    return ({ connection }) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         yield (0, useReservation_1.useReservation)(Object.assign(Object.assign({ project: data.project, agent: data.agent, object: data.object }, (typeof ((_a = data.instrument) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { instrument: data.instrument } : undefined), (typeof ((_b = data.location) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { location: data.location } : undefined))({
             action: new action_1.ActionRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             order: new order_1.OrderRepo(connection),
             reservation: new reservation_1.ReservationRepo(connection),
+            setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection)
-        }, settings);
+        }
+        // settings
+        );
     });
 }
 exports.call = call;

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

@@ -10,8 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const factory = require("../../factory");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
+const credentials_1 = require("../../repo/credentials");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
@@ -23,10 +25,21 @@ const payment_1 = require("../payment");
  * タスク実行関数
  */
 function call(data) {
-    return ({ connection, settings }) => __awaiter(this, void 0, void 0, function* () {
+    return ({ connection, redisClient, settings }) => __awaiter(this, void 0, void 0, function* () {
+        if (redisClient === undefined) {
+            throw new factory.errors.Argument('settings', 'redisClient required');
+        }
+        const paymentServiceId = data.object.object.id;
+        const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
+        const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
+            && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         yield (0, payment_1.voidPayment)(data)({
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
+            credentials: new credentials_1.CredentialsRepo(redisClient, {
+                scope: `${factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,
+                expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0
+            }),
             paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
             paymentService: new paymentService_1.PaymentServiceRepo(connection),
             paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),

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

@@ -1,5 +1,5 @@
-import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
 import * as factory from '../../factory';
+import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../task';
 /**
  * タスク実行関数
  */

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

@@ -12,25 +12,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const COA = require("@motionpicture/coa-service");
 const factory = require("../../factory");
+const voidTransaction_1 = require("../offer/event/voidTransaction");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const interface_1 = require("../../repo/interface");
 const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const offer_1 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
+const setting_1 = require("../../repo/setting");
 const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
 const transactionProcess_1 = require("../../repo/transactionProcess");
-const voidTransaction_1 = require("../offer/event/voidTransaction");
+let coaAuthClientCreated = false;
+let coaAuthClient = new COA.auth.RefreshToken({
+    endpoint: '',
+    refreshToken: '',
+    useFetch: true
+});
 /**
  * タスク実行関数
  */
 function call(params) {
-    // export function call(data: factory.task.IData<factory.taskName.VoidReserveTransaction>): IOperationExecute<void> {
-    return ({ connection, redisClient, settings, coaAuthClient }, options) => __awaiter(this, void 0, void 0, function* () {
-        if (coaAuthClient === undefined) {
-            throw new factory.errors.Argument('settings', 'coaAuthClient required');
-        }
+    return ({ connection, redisClient, settings }, options) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         if (redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
@@ -41,6 +46,15 @@ function call(params) {
                 return;
             }
         }
+        if (!coaAuthClientCreated) {
+            const interfaceRepo = new interface_1.InterfaceRepo(connection);
+            const coaAPI = yield interfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
+            const credentials = (_a = coaAPI === null || coaAPI === void 0 ? void 0 : coaAPI.availableChannel) === null || _a === void 0 ? void 0 : _a.credentials;
+            if (typeof (credentials === null || credentials === void 0 ? void 0 : credentials.refreshToken) === 'string') {
+                coaAuthClient = new COA.auth.RefreshToken(credentials);
+                coaAuthClientCreated = true;
+            }
+        }
         const reserveService = new COA.service.Reserve({
             endpoint: coaAuthClient.options.endpoint,
             auth: coaAuthClient
@@ -54,6 +68,7 @@ function call(params) {
                 offerRateLimit: new offer_1.OfferRateLimitRepo(redisClient),
                 orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
                 reservation: new reservation_1.ReservationRepo(connection),
+                setting: new setting_1.SettingRepo(connection),
                 task: new task_1.TaskRepo(connection),
                 transaction: new transaction_1.TransactionRepo(connection),
                 reserveService

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

@@ -1,7 +1,3 @@
-/**
- * タスクサービス
- */
-import type * as COA from '@motionpicture/coa-service';
 import type { Connection } from 'mongoose';
 import type { RedisClientType } from 'redis';
 import { JWTCredentials } from '../credentials/jwt';
@@ -27,7 +23,6 @@ interface IExecuteSettings {
     credentials: ICredentialSettings;
     settings: Settings;
     aggregationSettings?: AggregationSettings;
-    coaAuthClient?: COA.auth.RefreshToken;
 }
 interface IExecuteOptions {
     executeById: boolean;

package/lib/chevre/service/task.js

@@ -10,6 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.notifyAbortedTasks = exports.abort = exports.execute = exports.executeByName = exports.executeById = void 0;
+/**
+ * タスクサービス
+ */
 const createDebug = require("debug");
 const moment = require("moment");
 const factory = require("../factory");
@@ -99,6 +102,9 @@ function execute(task) {
                 case factory.taskName.CheckMovieTicket:
                 case factory.taskName.DeletePerson:
                 case factory.taskName.HandleNotification:
+                case factory.taskName.ImportEventCapacitiesFromCOA:
+                case factory.taskName.ImportEventsFromCOA:
+                case factory.taskName.ImportOffersFromCOA:
                 case factory.taskName.Pay:
                 case factory.taskName.PublishPaymentUrl:
                 case factory.taskName.Refund:

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

@@ -1,5 +1,5 @@
 import * as factory from '../../../../../factory';
-import { Settings } from '../../../../../settings';
+import type { ISetting } from '../../../../../repo/setting';
 export declare function createSendEmailMessageActions(params: {
     order: factory.transaction.placeOrder.IOrderAsResult;
     customer: factory.order.ICustomer;
@@ -7,7 +7,7 @@ export declare function createSendEmailMessageActions(params: {
     paymentMethods: factory.order.IReferencedInvoice[];
     potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
     emailMessage?: factory.creativeWork.message.email.ICreativeWork;
-}, settings: Settings): Promise<{
+}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     emailMessages: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
     sendEmailMessageActions: factory.transaction.placeOrder.IPotentialSendEmailMessageAction[];
 }>;

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

@@ -12,7 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSendEmailMessageActions = void 0;
 const emailMessageBuilder = require("../../../../../emailMessageBuilder");
 const factory = require("../../../../../factory");
-function createSendEmailMessageActions(params, settings) {
+// import { Settings } from '../../../../../settings';
+function createSendEmailMessageActions(params, 
+// settings: Settings
+setting) {
     var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function* () {
         // 注文配送メール送信設定
@@ -30,7 +33,7 @@ function createSendEmailMessageActions(params, settings) {
         if (Array.isArray(sendEmailMessageOnOrderSentParams)) {
             const orderAsCreateEmailParams = Object.assign(Object.assign({}, params.order), { customer: params.customer, seller: params.seller, paymentMethods: params.paymentMethods });
             yield Promise.all(sendEmailMessageOnOrderSentParams.map((s, index) => __awaiter(this, void 0, void 0, function* () {
-                const emailMessage = yield emailMessageBuilder.createSendOrderMessage(Object.assign(Object.assign({ order: orderAsCreateEmailParams, index }, (s.object !== undefined) ? { email: s.object } : undefined), (params.emailMessage !== undefined) ? { emailMessage: params.emailMessage } : undefined), settings);
+                const emailMessage = yield emailMessageBuilder.createSendOrderMessage(Object.assign(Object.assign({ order: orderAsCreateEmailParams, index }, (s.object !== undefined) ? { email: s.object } : undefined), (params.emailMessage !== undefined) ? { emailMessage: params.emailMessage } : undefined), setting);
                 emailMessages.push(emailMessage);
                 // 送信アクション最適化に対応(2024-04-29~)
                 const sendEmailMessageActionObject = {

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

@@ -1,5 +1,5 @@
 import * as factory from '../../../../factory';
-import { Settings } from '../../../../settings';
+import type { ISetting } from '../../../../repo/setting';
 /**
  * 取引のポストアクションを作成する
  */
@@ -10,7 +10,7 @@ export declare function createPotentialActions(params: {
     paymentMethods: factory.order.IReferencedInvoice[];
     potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
     emailMessage?: factory.creativeWork.message.email.ICreativeWork;
-}, settings: Settings): Promise<{
+}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     potentialActions: factory.transaction.placeOrder.IPotentialActions;
     emailMessages: factory.creativeWork.message.email.ICreativeWork[];
 }>;

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

@@ -10,14 +10,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = void 0;
+// import { Settings } from '../../../../settings';
 const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
 /**
  * 取引のポストアクションを作成する
  */
-function createPotentialActions(params, settings) {
+function createPotentialActions(params, 
+// settings: Settings
+setting) {
     return __awaiter(this, void 0, void 0, function* () {
         // 注文処理開始メール送信設定
-        const { emailMessages, sendEmailMessageActions } = yield (0, sendEmailMessage_1.createSendEmailMessageActions)(params, settings);
+        const { emailMessages, sendEmailMessageActions } = yield (0, sendEmailMessage_1.createSendEmailMessageActions)(params, setting);
         // const sendOrderActionAttributes: factory.transaction.placeOrder.IPotentialSendOrderAction = {
         //     potentialActions: { sendEmailMessage: sendEmailMessageActions }
         // };

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

@@ -7,10 +7,10 @@ import type { MessageRepo } from '../../../repo/message';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { ProjectRepo } from '../../../repo/project';
+import type { SettingRepo } from '../../../repo/setting';
 import type { TransactionRepo } from '../../../repo/transaction';
 import * as factory from '../../../factory';
 import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
-import { Settings } from '../../../settings';
 interface IConfirmOperationRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
@@ -22,8 +22,9 @@ interface IConfirmOperationRepos {
     orderInTransaction: OrderInTransactionRepo;
     orderNumber: OrderNumberRepo;
     confirmationNumber: ConfirmationNumberRepo;
+    setting: SettingRepo;
 }
-type IConfirmOperation<T> = (repos: IConfirmOperationRepos, settings: Settings) => Promise<T>;
+type IConfirmOperation<T> = (repos: IConfirmOperationRepos) => Promise<T>;
 interface IConfirmOptions {
     /**
      * 確定レスポンスに予約IDを含めるかどうか(ttts対応)

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

@@ -15,6 +15,7 @@ const moment = require("moment");
 const errorHandler_1 = require("../../../errorHandler");
 const factory = require("../../../factory");
 const availableProductTypes_1 = require("../../../factory/availableProductTypes");
+// import { Settings } from '../../../settings';
 const factory_1 = require("../../order/placeOrder/factory");
 const orderedItem_1 = require("../../order/placeOrder/factory/orderedItem");
 const result_1 = require("./confirm/factory/result");
@@ -51,7 +52,9 @@ function processTransactionNotInProgress(transaction) {
  */
 function confirm(params, options) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         // 確認番号を事前発行
         yield (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({
@@ -125,10 +128,16 @@ function confirm(params, options) {
             emailMessageOnOrderSent = searchEmailMessagesResult.shift();
         }
         // ポストアクションを作成
+        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
+        if (typeof (setting === null || setting === void 0 ? void 0 : setting.defaultSenderEmail) !== 'string') {
+            throw new factory.errors.NotFound('setting.defaultSenderEmail');
+        }
         const { emailMessages, potentialActions } = yield (0, potentialActions_1.createPotentialActions)(Object.assign(Object.assign({ order: result.order, // createEmailMessageでのorder.acceptedOffersへの依存性を排除したのでこちらでよいはず(2024-02-21~)
             customer,
             seller,
-            paymentMethods }, (params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined), (emailMessageOnOrderSent !== undefined) ? { emailMessage: emailMessageOnOrderSent } : undefined), settings);
+            paymentMethods }, (params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined), (emailMessageOnOrderSent !== undefined) ? { emailMessage: emailMessageOnOrderSent } : undefined), 
+        // settings
+        setting);
         // メッセージ保管(2024-04-28~)
         yield saveMessagesIfNeeded({
             project: { id: transaction.project.id },

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.d.ts

@@ -1,10 +1,10 @@
 import * as factory from '../../../../factory';
-import { Settings } from '../../../../settings';
+import type { ISetting } from '../../../../repo/setting';
 export declare function createReturnPaymentMethodActions(params: {
     order: Pick<factory.order.IOrder, 'confirmationNumber' | 'identifier' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'>;
     returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
     transaction: Pick<factory.transaction.returnOrder.ITransaction, 'object'>;
-}, settings: Settings): Promise<{
+}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     emailMessagesOnReturnInvoice: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
     returnPaymentMethodActions: factory.action.transfer.returnAction.order.IPotentialReturnInvoiceAction[];
 }>;

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.js

@@ -23,7 +23,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createReturnPaymentMethodActions = void 0;
 const emailMessageBuilder = require("../../../../emailMessageBuilder");
 const factory = require("../../../../factory");
-function createReturnInvoicePotentialActions(params, settings) {
+// import { Settings } from '../../../../settings';
+function createReturnInvoicePotentialActions(params, 
+// settings: Settings
+setting) {
     var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function* () {
         const order = params.order;
@@ -49,7 +52,7 @@ function createReturnInvoicePotentialActions(params, settings) {
                 order,
                 email: emailCustomization,
                 paymentMethodId: params.paymentMethod.paymentMethodId
-            }, settings);
+            }, setting);
             emailMessagesOnReturnEachPaymentMethodId.push(emailMessage);
             sendEmailMessageOnRefund.push({
                 // project: order.project, // discontinue(2024-06-26~)
@@ -77,7 +80,9 @@ function createReturnInvoicePotentialActions(params, settings) {
         };
     });
 }
-function createReturnPaymentMethodActions(params, settings) {
+function createReturnPaymentMethodActions(params, 
+// settings: Settings
+setting) {
     return __awaiter(this, void 0, void 0, function* () {
         const emailMessagesOnReturnInvoice = [];
         const potentialReturnInvoiceActions = [];
@@ -102,7 +107,7 @@ function createReturnPaymentMethodActions(params, settings) {
                     .map((referencedInvoice) => __awaiter(this, void 0, void 0, function* () {
                     const { emailMessagesOnReturnEachPaymentMethodId, potentialActionsOnRefund } = yield createReturnInvoicePotentialActions(Object.assign({ paymentMethod: { paymentMethodId: referencedInvoice.paymentMethodId }, order: params.order }, (params.returnOrderActionParams !== undefined)
                         ? { returnOrderActionParams: params.returnOrderActionParams }
-                        : undefined), settings);
+                        : undefined), setting);
                     emailMessagesOnReturnInvoice.push(...emailMessagesOnReturnEachPaymentMethodId);
                     const { paymentStatus } = referencedInvoice, referencedInvoiceAsObject = __rest(referencedInvoice, ["paymentStatus"]);
                     const object = Object.assign(Object.assign({}, referencedInvoiceAsObject), { typeOf: 'Invoice' });
@@ -124,7 +129,7 @@ function createReturnPaymentMethodActions(params, settings) {
                 }))));
         }
         // 決済カード決済について
-        const { emailMessagesOnReturnMovieTicket, returnMovieTicketActions } = yield createReturnPaymentMethodIssuedThroughMovieTicketActions(params, settings);
+        const { emailMessagesOnReturnMovieTicket, returnMovieTicketActions } = yield createReturnPaymentMethodIssuedThroughMovieTicketActions(params, setting);
         emailMessagesOnReturnInvoice.push(...emailMessagesOnReturnMovieTicket);
         potentialReturnInvoiceActions.push(...returnMovieTicketActions);
         return { emailMessagesOnReturnInvoice, returnPaymentMethodActions: potentialReturnInvoiceActions };
@@ -134,7 +139,9 @@ exports.createReturnPaymentMethodActions = createReturnPaymentMethodActions;
 /**
  * 決済カード決済の返却アクションを生成する
  */
-function createReturnPaymentMethodIssuedThroughMovieTicketActions(params, settings) {
+function createReturnPaymentMethodIssuedThroughMovieTicketActions(params, 
+// settings: Settings
+setting) {
     return __awaiter(this, void 0, void 0, function* () {
         const returnFeesMovieTicketByTransaction = params.transaction.object.returnPolicy.returnFeesMovieTicket;
         const emailMessagesOnReturnMovieTicket = [];
@@ -175,7 +182,7 @@ function createReturnPaymentMethodIssuedThroughMovieTicketActions(params, settin
             .map((referencedInvoice) => __awaiter(this, void 0, void 0, function* () {
             const { emailMessagesOnReturnEachPaymentMethodId, potentialActionsOnRefund } = yield createReturnInvoicePotentialActions(Object.assign({ paymentMethod: { paymentMethodId: referencedInvoice.paymentMethodId }, order: params.order }, (params.returnOrderActionParams !== undefined)
                 ? { returnOrderActionParams: params.returnOrderActionParams }
-                : undefined), settings);
+                : undefined), setting);
             emailMessagesOnReturnMovieTicket.push(...emailMessagesOnReturnEachPaymentMethodId);
             const { paymentStatus } = referencedInvoice, referencedInvoiceAsObject = __rest(referencedInvoice, ["paymentStatus"]);
             const object = Object.assign(Object.assign({}, referencedInvoiceAsObject), { typeOf: 'Invoice' });