@chevre/domain 22.6.0-alpha.8 → 22.6.0

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' });

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

@@ -1,11 +1,11 @@
 import * as factory from '../../../../factory';
-import { Settings } from '../../../../settings';
+import type { ISetting } from '../../../../repo/setting';
 type IPotentialSendEmailMessageAction = factory.action.transfer.returnAction.order.IPotentialSendEmailMessageAction;
 export declare function createSendEmailMessaegActionsOnReturn(params: {
     order: Pick<factory.order.IOrder, 'confirmationNumber' | 'identifier' | 'customer' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'>;
     returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
     emailMessageOnOrderReturned?: factory.creativeWork.message.email.ICreativeWork;
-}, settings: Settings): Promise<{
+}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     emailMessagesOnReturn: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
     sendEmailMessaegActionsOnReturn: IPotentialSendEmailMessageAction[];
 }>;

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

@@ -12,7 +12,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSendEmailMessaegActionsOnReturn = void 0;
 const emailMessageBuilder = require("../../../../emailMessageBuilder");
 const factory = require("../../../../factory");
-function createSendEmailMessaegActionsOnReturn(params, settings) {
+function createSendEmailMessaegActionsOnReturn(params, 
+// settings: Settings
+setting) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         const order = params.order;
@@ -32,7 +34,7 @@ function createSendEmailMessaegActionsOnReturn(params, settings) {
                 const emailMessage = yield emailMessageBuilder.createReturnOrderMessage(Object.assign(Object.assign({ order,
                     index }, (sendEmailMessageParams.object !== undefined) ? { email: sendEmailMessageParams.object } : undefined), (params.emailMessageOnOrderReturned !== undefined)
                     ? { emailMessage: params.emailMessageOnOrderReturned }
-                    : undefined), settings);
+                    : undefined), setting);
                 emailMessagesOnReturn.push(emailMessage);
                 return {
                     // project: order.project, // optimize(2024-06-25~)

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

@@ -1,5 +1,5 @@
 import * as factory from '../../../factory';
-import { Settings } from '../../../settings';
+import type { ISetting } from '../../../repo/setting';
 type IReturningOrder4potentialActions = Pick<factory.order.IOrder, 'confirmationNumber' | 'customer' | 'identifier' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'project' | 'seller' | 'typeOf'>;
 declare function createPotentialActions(params: {
     dateReturned: Date;
@@ -7,7 +7,7 @@ declare function createPotentialActions(params: {
     potentialActions?: factory.transaction.returnOrder.IPotentialActionsParams;
     transaction: Pick<factory.transaction.returnOrder.ITransaction, 'agent' | 'object'>;
     emailMessageOnOrderReturned?: factory.creativeWork.message.email.ICreativeWork;
-}, settings: Settings): Promise<{
+}, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     emailMessages: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
     potentialActions: factory.transaction.returnOrder.IPotentialActions;
 }>;

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

@@ -11,10 +11,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPotentialActions = void 0;
 const factory = require("../../../factory");
+// import { Settings } from '../../../settings';
 const returnPaymentMethod_1 = require("./potentialActions/returnPaymentMethod");
 const returnPointAward_1 = require("./potentialActions/returnPointAward");
 const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
-function createPotentialActions(params, settings) {
+function createPotentialActions(params, 
+// settings: Settings
+setting) {
     return __awaiter(this, void 0, void 0, function* () {
         let returnOrderActions = [];
         const emailMessages = [];
@@ -27,12 +30,12 @@ function createPotentialActions(params, settings) {
             }
             const returnOrderActionParams = returnOrderParams === null || returnOrderParams === void 0 ? void 0 : returnOrderParams.find((p) => { var _a; return ((_a = p.object) === null || _a === void 0 ? void 0 : _a.orderNumber) === order.orderNumber; });
             // 決済返却アクション
-            const { emailMessagesOnReturnInvoice, returnPaymentMethodActions } = yield (0, returnPaymentMethod_1.createReturnPaymentMethodActions)(Object.assign(Object.assign(Object.assign({}, params), { order }), (returnOrderActionParams !== undefined) ? { returnOrderActionParams } : undefined), settings);
+            const { emailMessagesOnReturnInvoice, returnPaymentMethodActions } = yield (0, returnPaymentMethod_1.createReturnPaymentMethodActions)(Object.assign(Object.assign(Object.assign({}, params), { order }), (returnOrderActionParams !== undefined) ? { returnOrderActionParams } : undefined), setting);
             emailMessages.push(...emailMessagesOnReturnInvoice);
             // ポイント特典の数だけ、返却アクションを作成
             const returnPointAwardActions = yield (0, returnPointAward_1.createReturnPointAwardActions)(Object.assign(Object.assign({}, params), { order }));
             // 返品後のEメール送信アクション
-            const { emailMessagesOnReturn, sendEmailMessaegActionsOnReturn } = yield (0, sendEmailMessage_1.createSendEmailMessaegActionsOnReturn)(Object.assign(Object.assign(Object.assign({}, params), { order }), (returnOrderActionParams !== undefined) ? { returnOrderActionParams } : undefined), settings);
+            const { emailMessagesOnReturn, sendEmailMessaegActionsOnReturn } = yield (0, sendEmailMessage_1.createSendEmailMessaegActionsOnReturn)(Object.assign(Object.assign(Object.assign({}, params), { order }), (returnOrderActionParams !== undefined) ? { returnOrderActionParams } : undefined), setting);
             emailMessages.push(...emailMessagesOnReturn);
             const potentialActionsOnReturnOrder = {
                 returnPaymentMethod: returnPaymentMethodActions,

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

@@ -10,6 +10,7 @@ import type { OrderRepo } from '../../repo/order';
 import type { ProjectRepo } from '../../repo/project';
 import type { ReservationRepo } from '../../repo/reservation';
 import type { SellerRepo } from '../../repo/seller';
+import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { IStartedTransaction, TransactionRepo } from '../../repo/transaction';
 import { Settings } from '../../settings';
@@ -49,8 +50,9 @@ declare function confirm(params: factory.transaction.returnOrder.IConfirmParams
     emailMessage?: EmailMessageRepo;
     message: MessageRepo;
     order: OrderRepo;
+    setting: SettingRepo;
     transaction: TransactionRepo;
-}, settings: Settings) => Promise<import("@chevre/factory/lib/transaction/returnOrder").IResult | undefined>;
+}) => Promise<import("@chevre/factory/lib/transaction/returnOrder").IResult | undefined>;
 /**
  * 取引のタスクを出力します
  * 複数タスクが生成されます

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

@@ -81,7 +81,9 @@ function saveMessagesIfNeeded(params) {
  * 取引確定
  */
 function confirm(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const transaction = yield repos.transaction.projectFieldsById({ typeOf: factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'agent', 'object', 'result']);
         if (transaction.status === factory.transactionStatusType.Confirmed) {
@@ -124,8 +126,14 @@ function confirm(params) {
             });
             emailMessageOnOrderReturned = 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 result = {};
-        const { emailMessages, potentialActions } = yield (0, potentialActions_1.createPotentialActions)(Object.assign(Object.assign({ dateReturned: params.object.order.dateReturned, orders: returningOrders, transaction: transaction }, (params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined), (emailMessageOnOrderReturned !== undefined) ? { emailMessageOnOrderReturned } : undefined), settings);
+        const { emailMessages, potentialActions } = yield (0, potentialActions_1.createPotentialActions)(Object.assign(Object.assign({ dateReturned: params.object.order.dateReturned, orders: returningOrders, transaction: transaction }, (params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined), (emailMessageOnOrderReturned !== undefined) ? { emailMessageOnOrderReturned } : undefined), 
+        // settings
+        setting);
         // save messages(2024-06-27~)
         yield saveMessagesIfNeeded({
             project: { id: transaction.project.id },

package/lib/chevre/settings.d.ts

@@ -1,17 +1,4 @@
-import * as factory from './factory';
 import { AggregationSettings, ICallableTaskOperation, ICallResult, IOperationExecute } from './settings/aggregation';
-interface IOnOrderStatusChanged {
-    /**
-     * AggService通知先
-     */
-    informOrder?: factory.project.IInformParams[];
-}
-interface IOnReservationStatusChanged {
-    /**
-     * AggService通知先
-     */
-    informReservation?: factory.project.IInformParams[];
-}
 interface IWebhookSettings {
     /**
      * リクエストタイムアウト
@@ -27,19 +14,26 @@ interface IWebhookSettings {
      */
     headerIdentifier?: string;
 }
-interface IOnEventChanged {
-    informEvent?: factory.project.IInformParams[];
-    informEvent2agg?: factory.project.IInformParams[];
+interface ISurfrockSettings {
+    /**
+     * 着券時タイムアウト
+     */
+    timeout: number;
+    /**
+     * 認証時タイムアウト
+     */
+    timeoutCheck: number;
+    /**
+     * 決済と返金の最小間隔(ms)
+     */
+    minIntervalBetweenPayAndRefund: number;
+    /**
+     * surfrockクライアント認証情報保管期限
+     * 0の場合、保管しない
+     */
+    credentialsExpireInSeconds?: number;
 }
 interface IOptions {
-    onOrderStatusChanged: IOnOrderStatusChanged;
-    onEventChanged: IOnEventChanged;
-    onReservationStatusChanged: IOnReservationStatusChanged;
-    onResourceUpdated: {
-        informResource?: factory.project.IInformParams[];
-    };
-    userPoolIdOld: string;
-    userPoolIdNew: string;
     abortedTasksWithoutReport: string[];
     numTryConfirmReserveTransaction: number;
     transaction: {
@@ -55,7 +49,6 @@ interface IOptions {
          */
         canceledStoragePeriodInDays: number;
     };
-    defaultSenderEmail: string;
     deliverOrderLimit: number;
     coa: {
         timeout: number;
@@ -65,37 +58,14 @@ interface IOptions {
         timeoutBackground: number;
         useFetch: boolean;
     };
-    movieticketReserve: {
-        /**
-         * 着券時タイムアウト
-         */
-        timeout: number;
-        /**
-         * 認証時タイムアウト
-         */
-        timeoutCheck: number;
-        /**
-         * 決済と返金の最小間隔(ms)
-         */
-        minIntervalBetweenPayAndRefund: number;
-    };
-    useAssetTransactionSyncProcessing: boolean;
+    movieticketReserve: ISurfrockSettings;
     useExperimentalFeature: boolean;
-    useNotificationCheckedInAsPackage?: boolean;
     notification: IWebhookSettings;
 }
 /**
  * domain settings
  */
 declare class Settings {
-    readonly onOrderStatusChanged: IOnOrderStatusChanged;
-    readonly onEventChanged: IOnEventChanged;
-    readonly onReservationStatusChanged: IOnReservationStatusChanged;
-    readonly onResourceUpdated: {
-        informResource?: factory.project.IInformParams[];
-    };
-    readonly userPoolIdOld: string;
-    readonly userPoolIdNew: string;
     readonly abortedTasksWithoutReport: string[];
     readonly numTryConfirmReserveTransaction: number;
     readonly transaction: {
@@ -114,7 +84,6 @@ declare class Settings {
          */
         canceledStoragePeriodInDays: number;
     };
-    readonly defaultSenderEmail: string;
     readonly deliverOrderLimit: number;
     readonly coa: {
         timeout: number;
@@ -124,23 +93,8 @@ declare class Settings {
         timeoutBackground: number;
         useFetch: boolean;
     };
-    readonly movieticketReserve: {
-        /**
-         * 着券時タイムアウト
-         */
-        timeout: number;
-        /**
-         * 認証時タイムアウト
-         */
-        timeoutCheck: number;
-        /**
-         * 決済と返金の最小間隔(ms)
-         */
-        minIntervalBetweenPayAndRefund: number;
-    };
-    readonly useAssetTransactionSyncProcessing: boolean;
+    readonly movieticketReserve: ISurfrockSettings;
     readonly useExperimentalFeature: boolean;
-    readonly useNotificationCheckedInAsPackage: boolean;
     /**
      * 通知設定
      */

package/lib/chevre/settings.js

@@ -1,4 +1,5 @@
 "use strict";
+// import * as factory from './factory';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Settings = exports.AggregationSettings = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = void 0;
 const aggregation_1 = require("./settings/aggregation");
@@ -8,24 +9,34 @@ Object.defineProperty(exports, "AggregationSettings", { enumerable: true, get: f
  */
 class Settings {
     constructor(options) {
-        const { onEventChanged, onOrderStatusChanged, onResourceUpdated, onReservationStatusChanged, userPoolIdOld, userPoolIdNew, abortedTasksWithoutReport, numTryConfirmReserveTransaction, transaction, defaultSenderEmail, deliverOrderLimit, coa, gmo, movieticketReserve, useAssetTransactionSyncProcessing, useExperimentalFeature, useNotificationCheckedInAsPackage, notification } = options;
-        this.onEventChanged = onEventChanged;
-        this.onOrderStatusChanged = onOrderStatusChanged;
-        this.onResourceUpdated = onResourceUpdated;
-        this.onReservationStatusChanged = onReservationStatusChanged;
-        this.userPoolIdOld = userPoolIdOld;
-        this.userPoolIdNew = userPoolIdNew;
+        const { 
+        // onEventChanged,
+        // onOrderStatusChanged,
+        // onResourceUpdated,
+        // onReservationStatusChanged,
+        // userPoolIdOld,
+        // userPoolIdNew,
+        abortedTasksWithoutReport, numTryConfirmReserveTransaction, transaction, 
+        // defaultSenderEmail,
+        deliverOrderLimit, coa, gmo, movieticketReserve, 
+        // useAssetTransactionSyncProcessing,
+        useExperimentalFeature, notification } = options;
+        // this.onEventChanged = onEventChanged;
+        // this.onOrderStatusChanged = onOrderStatusChanged;
+        // this.onResourceUpdated = onResourceUpdated;
+        // this.onReservationStatusChanged = onReservationStatusChanged;
+        // this.userPoolIdOld = userPoolIdOld;
+        // this.userPoolIdNew = userPoolIdNew;
         this.abortedTasksWithoutReport = abortedTasksWithoutReport;
         this.numTryConfirmReserveTransaction = numTryConfirmReserveTransaction;
         this.transaction = transaction;
-        this.defaultSenderEmail = defaultSenderEmail;
+        // this.defaultSenderEmail = defaultSenderEmail;
         this.deliverOrderLimit = deliverOrderLimit;
         this.coa = coa;
         this.gmo = gmo;
         this.movieticketReserve = movieticketReserve;
-        this.useAssetTransactionSyncProcessing = useAssetTransactionSyncProcessing;
+        // this.useAssetTransactionSyncProcessing = useAssetTransactionSyncProcessing;
         this.useExperimentalFeature = useExperimentalFeature;
-        this.useNotificationCheckedInAsPackage = useNotificationCheckedInAsPackage === true;
         this.notification = notification;
     }
 }

package/package.json

@@ -11,12 +11,12 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.389.0-alpha.6",
-    "@cinerino/sdk": "10.16.0-alpha.7",
-    "@motionpicture/coa-service": "9.5.0",
+    "@chevre/factory": "4.390.0",
+    "@cinerino/sdk": "10.19.0-alpha.0",
+    "@motionpicture/coa-service": "9.6.0-alpha.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
-    "@surfrock/sdk": "1.3.0",
+    "@surfrock/sdk": "1.4.0-alpha.1",
     "cdigit": "2.6.7",
     "debug": "^3.2.7",
     "google-libphonenumber": "^3.2.18",
@@ -108,5 +108,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.6.0-alpha.8"
+  "version": "22.6.0"
 }

package/example/src/chevre/searchAssetTransactions.ts

@@ -1,38 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-
-mongoose.Model.on('index', (...args) => {
-    console.error('******** index event emitted. ********\n', args);
-});
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const indexes = await mongoose.connection.db.collection('assetTransactions')
-        .indexes();
-    // console.log(indexes);
-    console.log(indexes.length, 'indexes found');
-
-    const assetTransactionRepo = await chevre.repository.AssetTransaction.createInstance(mongoose.connection);
-
-    const assetTransactions = await assetTransactionRepo.search<chevre.factory.assetTransactionType.CancelReservation>(
-        {
-            limit: 10,
-            project: { id: { $eq: project.id } },
-            object: { reservationNumber: { $in: ['792955671389309', '439371836213743'] } },
-            typeOf: chevre.factory.assetTransactionType.CancelReservation
-        },
-        ['transactionNumber'],
-        []
-    );
-    console.log('assetTransactions found', assetTransactions);
-    console.log(assetTransactions.length, 'assetTransactions found');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/lib/chevre/service/event/createEvent.d.ts

@@ -1,13 +0,0 @@
-import * as factory from '../../factory';
-import type { ActionRepo } from '../../repo/action';
-import type { EventRepo } from '../../repo/event';
-import type { EventSeriesRepo } from '../../repo/eventSeries';
-import type { MovieTheaterRepo } from '../../repo/place/movieTheater';
-import type { TaskRepo } from '../../repo/task';
-export declare function createEvent(params: factory.task.createEvent.IData): (repos: {
-    action: ActionRepo;
-    event: EventRepo;
-    eventSeries: EventSeriesRepo;
-    movieTheater: MovieTheaterRepo;
-    task: TaskRepo;
-}) => Promise<void>;