@chevre/domain 22.6.0 → 22.7.0-alpha.0

package/example/src/chevre/aggregateAllEvents2.ts

@@ -51,7 +51,6 @@ export async function aggregateScreeningEvent() {
                             headerIdentifier: 'xx'
                         },
                         deliverOrderLimit: 1,
-                        transaction: { informUrls: [], confirmedStoragePeriodInDays: 365, canceledStoragePeriodInDays: 365 },
                         abortedTasksWithoutReport: [],
                         coa: { timeout: 1000 },
                         gmo: { timeout: 1000, timeoutBackground: 1000, useFetch: true },

package/example/src/chevre/cleanReservations.ts

@@ -0,0 +1,69 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+// const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const reservationsRepo = await chevre.repository.Reservation.createInstance(mongoose.connection);
+
+    const cursor = reservationsRepo.getCursor(
+        {
+            bookingTime: {
+                $lte: moment()
+                    // tslint:disable-next-line:no-magic-numbers
+                    .add(-365, 'days')
+                    .toDate()
+            },
+            reservationStatus: {
+                $in: [
+                    chevre.factory.reservationStatusType.ReservationCancelled
+                    // chevre.factory.reservationStatusType.ReservationConfirmed
+                ]
+            }
+            // 'project.id': { $eq: project.id },
+            // 'project.id': { $ne: EXCLUDED_PROJECT_ID },
+        },
+        {
+            // paymentMethods: 1,
+            // project: 1,
+            // orderDate: 1
+        }
+    );
+    console.log('docs found');
+
+    let i = 0;
+    let updatedCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const reservation: chevre.factory.reservation.eventReservation.IReservation & {
+            previousReservationStatus: string;
+        } = doc.toObject();
+        console.log(
+            'checking...',
+            reservation.project.id, reservation.id,
+            reservation.previousReservationStatus, reservation.reservationStatus, reservation.bookingTime, i
+        );
+        if (reservation.previousReservationStatus !== chevre.factory.reservationStatusType.ReservationPending) {
+            // throw new Error('invalid previousReservationStatus');
+        } else {
+            await reservationsRepo.deleteByIds({
+                project: { id: reservation.project.id },
+                ids: [reservation.id]
+            });
+            updatedCount += 1;
+        }
+    });
+    console.log(i, 'docs checked');
+    console.log(updatedCount, 'docs updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/createEventBySchedule.ts

@@ -31,7 +31,6 @@ async function main() {
                     headerIdentifier: 'xx'
                 },
                 deliverOrderLimit: 1,
-                transaction: { informUrls: [], confirmedStoragePeriodInDays: 365, canceledStoragePeriodInDays: 365 },
                 abortedTasksWithoutReport: [],
                 coa: { timeout: 1000 },
                 gmo: { timeout: 1000, timeoutBackground: 1000, useFetch: true },

package/example/src/chevre/findSetting.ts

@@ -25,7 +25,7 @@ async function main() {
 
     const settingRepo = await chevre.repository.Setting.createInstance(mongoose.connection);
 
-    const result = await settingRepo.findOne({}, ['useInformResourceTypes']);
+    const result = await settingRepo.findOne({}, ['storage']);
     // tslint:disable-next-line:no-null-keyword
     console.dir(result, { depth: null });
 
@@ -53,17 +53,10 @@ async function main() {
         const updateResult = await settingRepo.updateByProject(
             { project: { id: { $eq: '*' } } },
             {
-                useInformResourceTypes: [
-                    'AccountTitle',
-                    'CategoryCode',
-                    'Movie',
-                    'MovieTheater',
-                    'EventService',
-                    'NoteDigitalDocument',
-                    'POS',
-                    'ScreeningEvent',
-                    'ScreeningEventSeries'
-                ]
+                storage: {
+                    transactionCanceledInDays: 180,
+                    transactionConfirmedInDays: 365
+                }
             }
         );
         console.log('updated', updateResult);

package/lib/chevre/repo/mongoose/schemas/setting.d.ts

@@ -15,6 +15,24 @@ interface IOnReservationStatusChanged {
 interface IOnEventChanged {
     informEvent2agg?: factory.project.IInformParams[];
 }
+interface IOnTransactionStatusChanged {
+    /**
+     * AggService通知先
+     */
+    informTransaction?: factory.project.IInformParams[];
+}
+interface IStorageSettings {
+    /**
+     * 取引保管期間(Confirmed)
+     * default:365
+     */
+    transactionConfirmedInDays?: number;
+    /**
+     * 取引保管期間(Canceled)
+     * default:7
+     */
+    transactionCanceledInDays?: number;
+}
 export interface ISetting {
     defaultSenderEmail?: string;
     onEventChanged?: IOnEventChanged;
@@ -23,10 +41,12 @@ export interface ISetting {
     onResourceUpdated?: {
         informResource?: factory.project.IInformParams[];
     };
+    onTransactionStatusChanged?: IOnTransactionStatusChanged;
     project: {
         id: string;
         typeOf: factory.organizationType.Project;
     };
+    storage?: IStorageSettings;
     useInformResourceTypes?: string[];
     userPoolIdOld?: string;
     userPoolIdNew?: string;

package/lib/chevre/repo/mongoose/schemas/setting.js

@@ -13,6 +13,8 @@ const schemaDefinition = {
     onOrderStatusChanged: mongoose_1.SchemaTypes.Mixed,
     onReservationStatusChanged: mongoose_1.SchemaTypes.Mixed,
     onResourceUpdated: mongoose_1.SchemaTypes.Mixed,
+    onTransactionStatusChanged: mongoose_1.SchemaTypes.Mixed,
+    storage: mongoose_1.SchemaTypes.Mixed,
     useInformResourceTypes: [String],
     userPoolIdOld: String,
     userPoolIdNew: String

package/lib/chevre/repo/setting.d.ts

@@ -46,5 +46,5 @@ export declare class SettingRepo {
                 $eq: string;
             };
         };
-    }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onResourceUpdated' | 'defaultSenderEmail' | 'useInformResourceTypes' | 'userPoolIdNew' | 'userPoolIdOld'>): Promise<import("mongoose").UpdateWriteOpResult>;
+    }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onResourceUpdated' | 'defaultSenderEmail' | 'useInformResourceTypes' | 'userPoolIdNew' | 'userPoolIdOld' | 'storage'>): Promise<import("mongoose").UpdateWriteOpResult>;
 }

package/lib/chevre/repo/setting.js

@@ -49,9 +49,9 @@ class SettingRepo {
     }
     updateByProject(filter, update) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { onEventChanged, onReservationStatusChanged, onResourceUpdated, defaultSenderEmail, useInformResourceTypes, userPoolIdNew, userPoolIdOld } = update;
+            const { onEventChanged, onReservationStatusChanged, onResourceUpdated, defaultSenderEmail, useInformResourceTypes, userPoolIdNew, userPoolIdOld, storage } = update;
             return this.settingModel.updateOne({ 'project.id': { $eq: filter.project.id.$eq } }, {
-                $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (onEventChanged !== undefined) ? { onEventChanged } : undefined), (onReservationStatusChanged !== undefined) ? { onReservationStatusChanged } : undefined), (onResourceUpdated !== undefined) ? { onResourceUpdated } : undefined), (defaultSenderEmail !== undefined) ? { defaultSenderEmail } : undefined), (useInformResourceTypes !== undefined) ? { useInformResourceTypes } : undefined), (userPoolIdNew !== undefined) ? { userPoolIdNew } : undefined), (userPoolIdOld !== undefined) ? { userPoolIdOld } : undefined)
+                $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (onEventChanged !== undefined) ? { onEventChanged } : undefined), (onReservationStatusChanged !== undefined) ? { onReservationStatusChanged } : undefined), (onResourceUpdated !== undefined) ? { onResourceUpdated } : undefined), (defaultSenderEmail !== undefined) ? { defaultSenderEmail } : undefined), (useInformResourceTypes !== undefined) ? { useInformResourceTypes } : undefined), (userPoolIdNew !== undefined) ? { userPoolIdNew } : undefined), (userPoolIdOld !== undefined) ? { userPoolIdOld } : undefined), (storage !== undefined) ? { storage } : undefined)
             })
                 .exec();
         });

package/lib/chevre/service/transaction/moneyTransfer/exportTasks/factory.d.ts

@@ -1,9 +1,9 @@
+import type { ISetting } from '../../../../repo/setting';
 import * as factory from '../../../../factory';
-import { Settings } from '../../../../settings';
 /**
  * 取引のタスクを作成する
  */
 export declare function createTasks(params: {
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.MoneyTransfer>, 'id' | 'endDate' | 'status' | 'project' | 'startDate' | 'typeOf' | 'object' | 'potentialActions'>;
     runsAt: Date;
-}, settings: Settings): factory.task.IAttributes<factory.taskName>[];
+}, setting: Pick<ISetting, 'storage'> | null): factory.task.IAttributes<factory.taskName>[];

package/lib/chevre/service/transaction/moneyTransfer/exportTasks/factory.js

@@ -3,25 +3,43 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTasks = void 0;
 const moment = require("moment");
 const factory = require("../../../../factory");
+// import { Settings } from '../../../../settings';
 /**
  * 取引のタスクを作成する
  */
 // tslint:disable-next-line:max-func-body-length
-function createTasks(params, settings) {
+function createTasks(params, setting
+// settings: Settings
+) {
+    var _a, _b;
     const taskAttributes = [];
     const transaction = params.transaction;
     const taskRunsAt = params.runsAt;
+    const confirmedStoragePeriodInDays = (_a = setting === null || setting === void 0 ? void 0 : setting.storage) === null || _a === void 0 ? void 0 : _a.transactionConfirmedInDays;
+    const canceledStoragePeriodInDays = (_b = setting === null || setting === void 0 ? void 0 : setting.storage) === null || _b === void 0 ? void 0 : _b.transactionCanceledInDays;
+    if (typeof confirmedStoragePeriodInDays !== 'number') {
+        throw new factory.errors.NotFound('setting.storage.confirmedStoragePeriodInDays');
+    }
+    if (typeof canceledStoragePeriodInDays !== 'number') {
+        throw new factory.errors.NotFound('setting.storage.canceledStoragePeriodInDays');
+    }
     // 取引削除タスクを作成(取引ステータスによってrunsAtを調整)
+    // let deleteAt = moment(transaction.endDate)
+    //     .add(settings.transaction.confirmedStoragePeriodInDays, 'days')
+    //     .toDate();
     let deleteAt = moment(transaction.endDate)
-        .add(settings.transaction.confirmedStoragePeriodInDays, 'days')
+        .add(confirmedStoragePeriodInDays, 'days')
         .toDate();
     switch (transaction.status) {
         case factory.transactionStatusType.Confirmed:
             break;
         case factory.transactionStatusType.Canceled:
         case factory.transactionStatusType.Expired:
+            // deleteAt = moment(transaction.endDate)
+            //     .add(settings.transaction.canceledStoragePeriodInDays, 'days')
+            //     .toDate();
             deleteAt = moment(transaction.endDate)
-                .add(settings.transaction.canceledStoragePeriodInDays, 'days')
+                .add(canceledStoragePeriodInDays, 'days')
                 .toDate();
             break;
         default:

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

@@ -7,11 +7,11 @@ import type { PassportRepo } from '../../repo/passport';
 import type { ProductRepo } from '../../repo/product';
 import type { ProjectRepo } from '../../repo/project';
 import type { SellerRepo } from '../../repo/seller';
+import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { TicketRepo } from '../../repo/ticket';
 import type { IStartedTransaction, TransactionRepo } from '../../repo/transaction';
 import type { TransactionNumberRepo } from '../../repo/transactionNumber';
-import { Settings } from '../../settings';
 import { moneyTransfer as MoneyTransferFactory } from '../../factory/transaction';
 export interface IStartOperationRepos {
     action: ActionRepo;
@@ -30,9 +30,10 @@ export type IStartOperation<T> = (repos: IStartOperationRepos, credentials: {
     jwt: JWTCredentials;
 }) => Promise<T>;
 export type ITaskAndTransactionOperation<T> = (repos: {
+    setting: SettingRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
-}, settings: Settings) => Promise<T>;
+}) => Promise<T>;
 export type IConfirmOperation<T> = (repos: {
     action: ActionRepo;
     transaction: TransactionRepo;

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

@@ -16,6 +16,7 @@ exports.exportTasksById = exports.confirm = exports.start = void 0;
 const moment = require("moment");
 const factory = require("../../factory");
 const order_1 = require("../../factory/order");
+// import { Settings } from '../../settings';
 const factory_1 = require("./moneyTransfer/exportTasks/factory");
 const factory_2 = require("./moneyTransfer/factory");
 const potentialActions_1 = require("./moneyTransfer/potentialActions");
@@ -561,7 +562,9 @@ function searchAuthorizeActions(params) {
  * 取引のタスク出力
  */
 function exportTasksById(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         const transaction = yield repos.transaction.projectFieldsById({
             typeOf: factory.transactionType.MoneyTransfer,
             id: params.id
@@ -573,10 +576,14 @@ function exportTasksById(params) {
                 .add(params.runsTasksAfterInSeconds, 'seconds')
                 .toDate();
         }
+        // search settings
+        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['storage']);
         const taskAttributes = (0, factory_1.createTasks)({
             transaction,
             runsAt: taskRunsAt
-        }, settings);
+        }, setting
+        // settings
+        );
         yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.d.ts

@@ -1,5 +1,5 @@
+import type { ISetting } from '../../../../repo/setting';
 import * as factory from '../../../../factory';
-import { Settings } from '../../../../settings';
 export type IPlaceOrderTransactionAsInformObject = Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'id' | 'typeOf' | 'endDate' | 'project' | 'seller' | 'startDate' | 'status'>;
 /**
  * 取引のタスクを作成する
@@ -7,4 +7,4 @@ export type IPlaceOrderTransactionAsInformObject = Pick<factory.transaction.ITra
 export declare function createTasks(params: {
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'endDate' | 'id' | 'object' | 'project' | 'seller' | 'startDate' | 'status' | 'typeOf'>;
     runsAt: Date;
-}, settings: Settings): factory.task.IAttributes<factory.taskName>[];
+}, setting: Pick<ISetting, 'onTransactionStatusChanged' | 'storage'> | null): factory.task.IAttributes<factory.taskName>[];

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js

@@ -7,12 +7,17 @@ const factory = require("../../../../factory");
  * 取引のタスクを作成する
  */
 // tslint:disable-next-line:max-func-body-length
-function createTasks(params, settings) {
+function createTasks(params, setting
+// settings: Settings
+) {
+    var _a, _b, _c;
     const taskAttributes = [];
     const transaction = params.transaction;
     const taskRunsAt = params.runsAt;
-    const transactionWebhookUrls = (Array.isArray(settings.transaction.informUrls)) ? settings.transaction.informUrls : [];
-    const triggerWebhookTaskAttributes = transactionWebhookUrls.map((webhookUrl) => {
+    // const transactionWebhookUrls = (Array.isArray(settings.transaction.informUrls)) ? settings.transaction.informUrls : [];
+    const informTransaction = (_a = setting === null || setting === void 0 ? void 0 : setting.onTransactionStatusChanged) === null || _a === void 0 ? void 0 : _a.informTransaction;
+    const transactionWebhookUrls = (Array.isArray(informTransaction)) ? informTransaction : [];
+    const triggerWebhookTaskAttributes = transactionWebhookUrls.map(({ recipient }) => {
         const informObject = Object.assign({ id: transaction.id, typeOf: transaction.typeOf, project: transaction.project, seller: transaction.seller, startDate: transaction.startDate, status: transaction.status }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined);
         return {
             project: transaction.project,
@@ -27,26 +32,40 @@ function createTasks(params, settings) {
                 object: informObject,
                 project: transaction.project,
                 recipient: {
-                    id: '',
-                    name: webhookUrl,
+                    id: (typeof (recipient === null || recipient === void 0 ? void 0 : recipient.id) === 'string') ? recipient.id : '',
+                    name: recipient === null || recipient === void 0 ? void 0 : recipient.name,
                     typeOf: factory.creativeWorkType.WebApplication,
-                    url: webhookUrl
+                    url: recipient === null || recipient === void 0 ? void 0 : recipient.url
                 },
                 typeOf: factory.actionType.InformAction
             }
         };
     });
+    const confirmedStoragePeriodInDays = (_b = setting === null || setting === void 0 ? void 0 : setting.storage) === null || _b === void 0 ? void 0 : _b.transactionConfirmedInDays;
+    const canceledStoragePeriodInDays = (_c = setting === null || setting === void 0 ? void 0 : setting.storage) === null || _c === void 0 ? void 0 : _c.transactionCanceledInDays;
+    if (typeof confirmedStoragePeriodInDays !== 'number') {
+        throw new factory.errors.NotFound('setting.storage.confirmedStoragePeriodInDays');
+    }
+    if (typeof canceledStoragePeriodInDays !== 'number') {
+        throw new factory.errors.NotFound('setting.storage.canceledStoragePeriodInDays');
+    }
     // 取引削除タスクを作成(取引ステータスによってrunsAtを調整)
+    // let deleteAt = moment(transaction.endDate)
+    //     .add(settings.transaction.confirmedStoragePeriodInDays, 'days')
+    //     .toDate();
     let deleteAt = moment(transaction.endDate)
-        .add(settings.transaction.confirmedStoragePeriodInDays, 'days')
+        .add(confirmedStoragePeriodInDays, 'days')
         .toDate();
     switch (transaction.status) {
         case factory.transactionStatusType.Confirmed:
             break;
         case factory.transactionStatusType.Canceled:
         case factory.transactionStatusType.Expired:
+            // deleteAt = moment(transaction.endDate)
+            //     .add(settings.transaction.canceledStoragePeriodInDays, 'days')
+            //     .toDate();
             deleteAt = moment(transaction.endDate)
-                .add(settings.transaction.canceledStoragePeriodInDays, 'days')
+                .add(canceledStoragePeriodInDays, 'days')
                 .toDate();
             break;
         default:

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

@@ -1,10 +1,11 @@
+import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 import type { TransactionRepo } from '../../../repo/transaction';
-import { Settings } from '../../../settings';
 type ITaskAndTransactionOperation<T> = (repos: {
+    setting: SettingRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
-}, settings: Settings) => Promise<T>;
+}) => Promise<T>;
 /**
  * 取引のタスクを出力します
  */

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

@@ -12,12 +12,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.exportTasksById = void 0;
 const moment = require("moment");
 const factory = require("../../../factory");
+// import { Settings } from '../../../settings';
 const factory_1 = require("./exportTasks/factory");
 /**
  * 取引のタスクを出力します
  */
 function exportTasksById(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         const transaction = yield repos.transaction.projectFieldsById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.id
@@ -29,10 +32,14 @@ function exportTasksById(params) {
                 .add(params.runsTasksAfterInSeconds, 'seconds')
                 .toDate();
         }
+        // search settings
+        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onTransactionStatusChanged', 'storage']);
         const taskAttributes = (0, factory_1.createTasks)({
             transaction,
             runsAt: taskRunsAt
-        }, settings);
+        }, setting
+        // settings
+        );
         yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }

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

@@ -1,9 +1,9 @@
+import type { ISetting } from '../../../../repo/setting';
 import * as factory from '../../../../factory';
-import { Settings } from '../../../../settings';
 /**
  * 取引のタスクを作成する
  */
 export declare function createTasks(params: {
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.ReturnOrder>, 'endDate' | 'status' | 'id' | 'project' | 'typeOf' | 'startDate' | 'object' | 'potentialActions'>;
     runsAt: Date;
-}, settings: Settings): factory.task.IAttributes<factory.taskName>[];
+}, setting: Pick<ISetting, 'storage'> | null): factory.task.IAttributes<factory.taskName>[];

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

@@ -3,25 +3,43 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTasks = void 0;
 const moment = require("moment");
 const factory = require("../../../../factory");
+// import { Settings } from '../../../../settings';
 /**
  * 取引のタスクを作成する
  */
-function createTasks(params, settings) {
-    var _a;
+// tslint:disable-next-line:max-func-body-length
+function createTasks(params, setting
+// settings: Settings
+) {
+    var _a, _b, _c;
     const taskAttributes = [];
     const transaction = params.transaction;
     const taskRunsAt = params.runsAt;
+    const confirmedStoragePeriodInDays = (_a = setting === null || setting === void 0 ? void 0 : setting.storage) === null || _a === void 0 ? void 0 : _a.transactionConfirmedInDays;
+    const canceledStoragePeriodInDays = (_b = setting === null || setting === void 0 ? void 0 : setting.storage) === null || _b === void 0 ? void 0 : _b.transactionCanceledInDays;
+    if (typeof confirmedStoragePeriodInDays !== 'number') {
+        throw new factory.errors.NotFound('setting.storage.confirmedStoragePeriodInDays');
+    }
+    if (typeof canceledStoragePeriodInDays !== 'number') {
+        throw new factory.errors.NotFound('setting.storage.canceledStoragePeriodInDays');
+    }
     // 取引削除タスクを作成(取引ステータスによってrunsAtを調整)
+    // let deleteAt = moment(transaction.endDate)
+    //     .add(settings.transaction.confirmedStoragePeriodInDays, 'days')
+    //     .toDate();
     let deleteAt = moment(transaction.endDate)
-        .add(settings.transaction.confirmedStoragePeriodInDays, 'days')
+        .add(confirmedStoragePeriodInDays, 'days')
         .toDate();
     switch (transaction.status) {
         case factory.transactionStatusType.Confirmed:
             break;
         case factory.transactionStatusType.Canceled:
         case factory.transactionStatusType.Expired:
+            // deleteAt = moment(transaction.endDate)
+            //     .add(settings.transaction.canceledStoragePeriodInDays, 'days')
+            //     .toDate();
             deleteAt = moment(transaction.endDate)
-                .add(settings.transaction.canceledStoragePeriodInDays, 'days')
+                .add(canceledStoragePeriodInDays, 'days')
                 .toDate();
             break;
         default:
@@ -43,7 +61,7 @@ function createTasks(params, settings) {
     taskAttributes.push(deleteTransactionTask);
     switch (transaction.status) {
         case factory.transactionStatusType.Confirmed:
-            const returnOrderPotentialActions = (_a = transaction.potentialActions) === null || _a === void 0 ? void 0 : _a.returnOrder;
+            const returnOrderPotentialActions = (_c = transaction.potentialActions) === null || _c === void 0 ? void 0 : _c.returnOrder;
             if (Array.isArray(returnOrderPotentialActions)) {
                 // 返品タスク
                 const returnOrderTask = returnOrderPotentialActions.map((r) => {

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

@@ -13,7 +13,6 @@ 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';
 import { preStart } from './returnOrder/preStart';
 interface IStartOperationRepos {
     acceptedOffer: AcceptedOfferRepo;
@@ -29,9 +28,10 @@ interface IStartOperationRepos {
 }
 type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
 type ITaskAndTransactionOperation<T> = (repos: {
+    setting: SettingRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
-}, settings: Settings) => Promise<T>;
+}) => Promise<T>;
 /**
  * 返品取引開始
  */

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

@@ -16,6 +16,7 @@ exports.exportTasksById = exports.confirm = exports.start = exports.preStart = v
 const createDebug = require("debug");
 const moment = require("moment-timezone");
 const factory = require("../../factory");
+// import { Settings } from '../../settings';
 const factory_1 = require("./returnOrder/exportTasks/factory");
 const potentialActions_1 = require("./returnOrder/potentialActions");
 const preStart_1 = require("./returnOrder/preStart");
@@ -155,7 +156,9 @@ exports.confirm = confirm;
  * この関数では、取引のタスクエクスポートステータスは見ません
  */
 function exportTasksById(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         const transaction = yield repos.transaction.projectFieldsById({ typeOf: factory.transactionType.ReturnOrder, id: params.id }, ['typeOf', 'status', 'project', 'endDate', 'startDate', 'object', 'potentialActions']);
         // タスク実行日時バッファの指定があれば調整
         let taskRunsAt = new Date();
@@ -164,10 +167,14 @@ function exportTasksById(params) {
                 .add(params.runsTasksAfterInSeconds, 'seconds')
                 .toDate();
         }
+        // search settings
+        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['storage']);
         const taskAttributes = (0, factory_1.createTasks)({
             transaction,
             runsAt: taskRunsAt
-        }, settings);
+        }, setting
+        // settings
+        );
         yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }

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

@@ -2,13 +2,13 @@ import * as factory from '../factory';
 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 { TaskRepo } from '../repo/task';
 import type { TransactionRepo } from '../repo/transaction';
 import { deleteTransaction } from './transaction/deleteTransaction';
 import * as MoneyTransferTransactionService from './transaction/moneyTransfer';
 import * as PlaceOrderTransactionService from './transaction/placeOrder';
 import * as ReturnOrderTransactionService from './transaction/returnOrder';
-import { Settings } from '../settings';
 export type ITransactionOperation<T> = (repos: {
     transaction: TransactionRepo;
 }) => Promise<T>;
@@ -35,9 +35,10 @@ export declare function updateAgent(params: {
     transaction: TransactionRepo;
 }) => Promise<void>;
 export type IExportTasksOperation<T> = (repos: {
+    setting: SettingRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
-}, settings: Settings) => Promise<T>;
+}) => Promise<T>;
 /**
  * ひとつの取引のタスクをエクスポートする
  */

package/lib/chevre/service/transaction.js

@@ -112,7 +112,9 @@ exports.updateAgent = updateAgent;
  * ひとつの取引のタスクをエクスポートする
  */
 function exportTasks(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // settings: Settings
+    ) => __awaiter(this, void 0, void 0, function* () {
         const transaction = yield repos.transaction.startExportTasks(Object.assign(Object.assign({ status: params.status, tasksExportAction: {
                 agent: { name: params.tasksExportAction.agent.name }
             } }, (params.typeOf !== undefined) ? { typeOf: params.typeOf } : undefined), (typeof params.id === 'string') ? { id: params.id } : undefined));
@@ -124,17 +126,17 @@ function exportTasks(params) {
             case factory.transactionType.MoneyTransfer:
                 yield MoneyTransferTransactionService.exportTasksById(Object.assign({ id: transaction.id }, (typeof params.runsTasksAfterInSeconds === 'number')
                     ? { runsTasksAfterInSeconds: params.runsTasksAfterInSeconds }
-                    : undefined))(repos, settings);
+                    : undefined))(repos);
                 break;
             case factory.transactionType.PlaceOrder:
                 yield PlaceOrderTransactionService.exportTasksById(Object.assign({ id: transaction.id }, (typeof params.runsTasksAfterInSeconds === 'number')
                     ? { runsTasksAfterInSeconds: params.runsTasksAfterInSeconds }
-                    : undefined))(repos, settings);
+                    : undefined))(repos);
                 break;
             case factory.transactionType.ReturnOrder:
                 yield ReturnOrderTransactionService.exportTasksById(Object.assign({ id: transaction.id }, (typeof params.runsTasksAfterInSeconds === 'number')
                     ? { runsTasksAfterInSeconds: params.runsTasksAfterInSeconds }
-                    : undefined))(repos, settings);
+                    : undefined))(repos);
                 break;
             default:
         }

package/lib/chevre/settings.d.ts

@@ -36,19 +36,6 @@ interface ISurfrockSettings {
 interface IOptions {
     abortedTasksWithoutReport: string[];
     numTryConfirmReserveTransaction: number;
-    transaction: {
-        informUrls: string[];
-        /**
-         * 取引保管期間(Confirmed)
-         * default:365
-         */
-        confirmedStoragePeriodInDays: number;
-        /**
-         * 取引保管期間(Canceled)
-         * default:7
-         */
-        canceledStoragePeriodInDays: number;
-    };
     deliverOrderLimit: number;
     coa: {
         timeout: number;
@@ -68,22 +55,6 @@ interface IOptions {
 declare class Settings {
     readonly abortedTasksWithoutReport: string[];
     readonly numTryConfirmReserveTransaction: number;
-    readonly transaction: {
-        /**
-         * 注文取引通知先
-         */
-        informUrls: string[];
-        /**
-         * 取引保管期間(Confirmed)
-         * default:365
-         */
-        confirmedStoragePeriodInDays: number;
-        /**
-         * 取引保管期間(Canceled)
-         * default:7
-         */
-        canceledStoragePeriodInDays: number;
-    };
     readonly deliverOrderLimit: number;
     readonly coa: {
         timeout: number;

package/lib/chevre/settings.js

@@ -1,5 +1,4 @@
 "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");
@@ -9,28 +8,14 @@ Object.defineProperty(exports, "AggregationSettings", { enumerable: true, get: f
  */
 class Settings {
     constructor(options) {
-        const { 
-        // onEventChanged,
-        // onOrderStatusChanged,
-        // onResourceUpdated,
-        // onReservationStatusChanged,
-        // userPoolIdOld,
-        // userPoolIdNew,
-        abortedTasksWithoutReport, numTryConfirmReserveTransaction, transaction, 
-        // defaultSenderEmail,
+        const { abortedTasksWithoutReport, numTryConfirmReserveTransaction, 
+        // transaction,
         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.transaction = transaction;
         this.deliverOrderLimit = deliverOrderLimit;
         this.coa = coa;
         this.gmo = gmo;

package/package.json

@@ -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"
+  "version": "22.7.0-alpha.0"
 }