@chevre/domain 22.11.0-alpha.11 → 22.11.0-alpha.13

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,6 @@
 import { SendGridCredentials } from '../credentials/sendGrid';
 import type { IExecuteSettings as IMinimumExecuteSettings, INextFunction, IReadyTask, IRunningTask } from '../eventEmitter/task';
 import * as factory from '../factory';
-import type { IExecutableTask, IExecutableTaskKeys, TaskRepo } from '../repo/task';
 import { Settings } from '../settings';
 import { AggregationSettings } from '../settings/aggregation';
 interface ICredentialSettings {
@@ -12,14 +11,7 @@ interface IExecuteSettings extends IMinimumExecuteSettings {
     settings: Settings;
     aggregationSettings?: AggregationSettings;
 }
-interface IExecuteOptions {
-    executeById: boolean;
-    executeByName: boolean;
-}
 type IOperation<T> = (settings: IExecuteSettings) => Promise<T>;
-type IOperationExecute<T> = (settings: IExecuteSettings, options: IExecuteOptions) => Promise<T>;
-type ICallResult = void | Pick<factory.task.IExecutionResult, 'error'>;
-export type ICallableTaskOperation = (task: IExecutableTask<factory.taskName>) => IOperationExecute<ICallResult>;
 /**
  * タスク変更イベントを受けて実行する
  */
@@ -49,18 +41,4 @@ declare function executeOneIfExists(params: {
         $lt: Date;
     };
 }): IOperation<void>;
-/**
- * タスクを実行する
- */
-declare function execute(task: IExecutableTask<factory.taskName>, next?: INextFunction): IOperationExecute<void>;
-/**
- * add(2025-03-13~)
- */
-declare function notifyAbortedTasksByEmail(params: {
-    dateAbortedGte: Date;
-}): (repos: {
-    task: TaskRepo;
-}, settings: Pick<Settings, "abortedTasksWithoutReport">, credentials: {
-    sendGrid: SendGridCredentials;
-}) => Promise<void>;
-export { ICallResult, IExecutableTaskKeys, IOperationExecute, executeById, executeOneIfExists, execute, notifyAbortedTasksByEmail };
+export { executeById, executeOneIfExists };

package/lib/chevre/service/task.js

@@ -11,15 +11,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeById = executeById;
 exports.executeOneIfExists = executeOneIfExists;
-exports.execute = execute;
-exports.notifyAbortedTasksByEmail = notifyAbortedTasksByEmail;
 /**
  * タスクサービス
  */
 const createDebug = require("debug");
-const moment = require("moment");
-const factory = require("../factory");
-const factory_1 = require("./notification/factory");
+const taskHandler_1 = require("./taskHandler");
 const debug = createDebug('chevre-domain:service:task');
 /**
  * タスク変更イベントを受けて実行する
@@ -42,7 +38,7 @@ function executeById(params, next) {
         }
         // タスクがなければ終了
         if (task !== null) {
-            yield execute(task, (typeof next === 'function') ? next : undefined)(settings, {
+            yield (0, taskHandler_1.executeTask)(task, (typeof next === 'function') ? next : undefined)(settings, {
                 executeById: true,
                 executeByName: false
             });
@@ -70,113 +66,10 @@ function executeOneIfExists(params) {
         }
         // タスクがなければ終了
         if (task !== null) {
-            yield execute(task)(settings, {
+            yield (0, taskHandler_1.executeTask)(task)(settings, {
                 executeById: false,
                 executeByName: (typeof ((_a = params.name) === null || _a === void 0 ? void 0 : _a.$eq) === 'string')
             });
         }
     });
 }
-/**
- * タスクを実行する
- */
-function execute(task, next) {
-    const now = new Date();
-    debug('executing an executableTask...', task, now);
-    return (settings, options) => __awaiter(this, void 0, void 0, function* () {
-        const taskRepo = new (yield Promise.resolve().then(() => require('../repo/task'))).TaskRepo(settings.connection);
-        try {
-            // 期限検証(2024-04-23~)
-            if (task.expires instanceof Date) {
-                const taskExpired = moment(now)
-                    .isAfter(task.expires);
-                if (taskExpired) {
-                    throw new factory.errors.Internal(`task expired [expires:${task.expires}]`);
-                }
-            }
-            // タスク名の関数が定義されていなければ、TypeErrorとなる
-            let callResult;
-            const { call } = yield Promise.resolve(`${`./task/${task.name}`}`).then(s => require(s));
-            switch (task.name) {
-                case factory.taskName.AcceptCOAOffer:
-                case factory.taskName.AggregateOnSystem:
-                case factory.taskName.AuthorizePayment:
-                case factory.taskName.CancelPendingReservation:
-                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.InvalidatePaymentUrl:
-                case factory.taskName.OnAuthorizationCreated:
-                case factory.taskName.Pay:
-                case factory.taskName.PublishPaymentUrl:
-                case factory.taskName.Refund:
-                case factory.taskName.VoidPayTransaction:
-                case factory.taskName.VoidReserveTransaction:
-                case factory.taskName.ConfirmReserveTransaction:
-                case factory.taskName.ReturnPayTransaction:
-                case factory.taskName.ReturnReserveTransaction:
-                case factory.taskName.SendEmailMessage:
-                case factory.taskName.TriggerWebhook:
-                    callResult = yield call(task)(settings, options);
-                    break;
-                default:
-                    yield call(task.data)(settings);
-            }
-            const result = {
-                executedAt: now,
-                endDate: new Date(),
-                // enable overwriting task.executionResults.error on Executed(2024-05-29~)
-                error: ((callResult === null || callResult === void 0 ? void 0 : callResult.error) instanceof Error)
-                    ? Object.assign(Object.assign({}, callResult.error), { message: callResult.error.message }) : ''
-            };
-            yield taskRepo.pushExecutionResultById({
-                id: task.id,
-                status: factory.taskStatus.Executed
-            }, result, (typeof next === 'function') ? next : undefined);
-        }
-        catch (error) {
-            debug('service.task.execute throwed an error. task:', task.name, task.id, 'error:', error === null || error === void 0 ? void 0 : error.name, error === null || error === void 0 ? void 0 : error.message);
-            if (typeof error !== 'object') {
-                error = { message: String(error) };
-            }
-            // 実行結果追加
-            const result = {
-                executedAt: now,
-                endDate: new Date(),
-                error: Object.assign(Object.assign({}, error), { code: error.code, message: error.message, name: error.name, stack: error.stack })
-            };
-            // 失敗してもここではステータスを戻さない(Runningのまま待機)
-            yield taskRepo.pushExecutionResultById({
-                id: task.id,
-                status: task.status
-            }, result, (typeof next === 'function') ? next : undefined);
-        }
-    });
-}
-let notification;
-/**
- * add(2025-03-13~)
- */
-function notifyAbortedTasksByEmail(params) {
-    return (repos, settings, credentials) => __awaiter(this, void 0, void 0, function* () {
-        const { abortedTasksWithoutReport } = settings;
-        const abortedTasks = yield repos.task.projectFields(Object.assign({ status: { $eq: factory.taskStatus.Aborted }, dateAborted: { $gte: params.dateAbortedGte } }, (abortedTasksWithoutReport.length > 0)
-            ? { name: { $nin: abortedTasksWithoutReport } }
-            : undefined), []);
-        if (abortedTasks.length > 0) {
-            if (notification === undefined) {
-                notification = yield Promise.resolve().then(() => require('./notification'));
-            }
-            // 開発者へ報告
-            const message = (0, factory_1.tasks2lineNotify)({ tasks: abortedTasks });
-            const notifyResult = yield notification.notifyByEmail({
-                subject: message.subject, content: message.content,
-                logLevel: 'error'
-            })({}, credentials);
-            debug('notifyResult:', notifyResult);
-        }
-    });
-}

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

@@ -0,0 +1,26 @@
+import { SendGridCredentials } from '../credentials/sendGrid';
+import type { IExecuteSettings as IMinimumExecuteSettings, INextFunction } from '../eventEmitter/task';
+import * as factory from '../factory';
+import type { IExecutableTask, IExecutableTaskKeys } from '../repo/task';
+import { Settings } from '../settings';
+import { AggregationSettings } from '../settings/aggregation';
+interface ICredentialSettings {
+    sendGrid: SendGridCredentials;
+}
+interface IExecuteSettings extends IMinimumExecuteSettings {
+    credentials: ICredentialSettings;
+    settings: Settings;
+    aggregationSettings?: AggregationSettings;
+}
+interface IExecuteOptions {
+    executeById: boolean;
+    executeByName: boolean;
+}
+type IOperationExecute<T> = (settings: IExecuteSettings, options: IExecuteOptions) => Promise<T>;
+type ICallResult = void | Pick<factory.task.IExecutionResult, 'error'>;
+type ICallableTaskOperation = (task: IExecutableTask<factory.taskName>) => IOperationExecute<ICallResult>;
+/**
+ * タスクを実行する
+ */
+declare function executeTask(task: IExecutableTask<factory.taskName>, next?: INextFunction): IOperationExecute<void>;
+export { ICallableTaskOperation, ICallResult, IExecutableTaskKeys, IOperationExecute, executeTask };

package/lib/chevre/service/taskHandler.js

@@ -0,0 +1,98 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeTask = executeTask;
+const createDebug = require("debug");
+const moment = require("moment");
+const factory = require("../factory");
+const debug = createDebug('chevre-domain:service:task');
+/**
+ * タスクを実行する
+ */
+// tslint:disable-next-line:max-func-body-length
+function executeTask(task, next) {
+    const now = new Date();
+    debug('executing an executableTask...', task, now);
+    return (settings, options) => __awaiter(this, void 0, void 0, function* () {
+        const taskRepo = new (yield Promise.resolve().then(() => require('../repo/task'))).TaskRepo(settings.connection);
+        try {
+            // 期限検証(2024-04-23~)
+            if (task.expires instanceof Date) {
+                const taskExpired = moment(now)
+                    .isAfter(task.expires);
+                if (taskExpired) {
+                    throw new factory.errors.Internal(`task expired [expires:${task.expires}]`);
+                }
+            }
+            // タスク名の関数が定義されていなければ、TypeErrorとなる
+            let callResult;
+            const { call } = yield Promise.resolve(`${`./task/${task.name}`}`).then(s => require(s));
+            switch (task.name) {
+                case factory.taskName.AcceptCOAOffer:
+                case factory.taskName.AggregateOnSystem:
+                case factory.taskName.AuthorizePayment:
+                case factory.taskName.CancelPendingReservation:
+                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.InvalidatePaymentUrl:
+                case factory.taskName.OnAuthorizationCreated:
+                case factory.taskName.Pay:
+                case factory.taskName.PublishPaymentUrl:
+                case factory.taskName.Refund:
+                case factory.taskName.VoidPayTransaction:
+                case factory.taskName.VoidReserveTransaction:
+                case factory.taskName.ConfirmReserveTransaction:
+                case factory.taskName.ReturnPayTransaction:
+                case factory.taskName.ReturnReserveTransaction:
+                case factory.taskName.SendEmailMessage:
+                case factory.taskName.TriggerWebhook:
+                    callResult = yield call(task)(settings, options);
+                    break;
+                default:
+                    yield call(task.data)(settings);
+            }
+            const result = {
+                executedAt: now,
+                endDate: new Date(),
+                // enable overwriting task.executionResults.error on Executed(2024-05-29~)
+                error: ((callResult === null || callResult === void 0 ? void 0 : callResult.error) instanceof Error)
+                    ? Object.assign(Object.assign({}, callResult.error), { message: callResult.error.message }) : ''
+            };
+            yield taskRepo.pushExecutionResultById({
+                id: task.id,
+                status: factory.taskStatus.Executed,
+                remainingNumberOfTries: task.remainingNumberOfTries
+            }, result, (typeof next === 'function') ? next : undefined);
+        }
+        catch (error) {
+            debug('service.task.execute throwed an error. task:', task.name, task.id, 'error:', error === null || error === void 0 ? void 0 : error.name, error === null || error === void 0 ? void 0 : error.message);
+            if (typeof error !== 'object') {
+                error = { message: String(error) };
+            }
+            // 実行結果追加
+            const result = {
+                executedAt: now,
+                endDate: new Date(),
+                error: Object.assign(Object.assign({}, error), { code: error.code, message: error.message, name: error.name, stack: error.stack })
+            };
+            // 失敗してもここではステータスを戻さない(Runningのまま待機)
+            yield taskRepo.pushExecutionResultById({
+                id: task.id,
+                status: task.status,
+                remainingNumberOfTries: task.remainingNumberOfTries
+            }, result, (typeof next === 'function') ? next : undefined);
+        }
+    });
+}

package/lib/chevre/settings/aggregation.d.ts

@@ -1,5 +1,5 @@
 import * as factory from '../factory';
-import type { ICallableTaskOperation, ICallResult, IOperationExecute } from '../service/task';
+import type { ICallableTaskOperation, ICallResult, IOperationExecute } from '../service/taskHandler';
 interface IOnOrderStatusChanged {
     informOrder2hub?: factory.project.IInformParams[];
 }

package/package.json

@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.11.0-alpha.11"
+  "version": "22.11.0-alpha.13"
 }

package/example/src/chevre/searchPermissions.ts

@@ -1,46 +0,0 @@
-// 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 memberId = 'xxx';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const memberRepo = await chevre.repository.Member.createInstance(mongoose.connection);
-    const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
-
-    let now: Date;
-
-    now = new Date();
-    const searchPermissionsResult = await (await chevre.service.iam.createService()).searchPermissions({
-        project: { id: PROJECT_ID },
-        member: {
-            id: memberId,
-            memberOf: {
-                id: PROJECT_ID,
-                typeOf: chevre.factory.organizationType.Project
-            }
-        }
-    })({
-        member: memberRepo,
-        role: roleRepo
-    });
-    console.log('time cost:', moment()
-        .diff(now));
-
-    console.log(searchPermissionsResult);
-    console.log(searchPermissionsResult.permissions.length);
-
-    // console.log(aggregateRoleNamesResult);
-    // console.log(aggregateRoleNamesResult.length);
-    // console.log(aggregatePermissionsResult);
-    // console.log(aggregatePermissionsResult.length);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);