@chevre/domain 26.0.0-alpha.6 → 26.0.0-alpha.8

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

@@ -1,12 +1,11 @@
 import type { Connection, UpdateWriteOpResult } from 'mongoose';
 import { INextFunction } from '../eventEmitter/task';
 import { factory } from '../factory';
-import { IModel } from './mongoose/schemas/task';
 /**
  * 旧非同期アクション(tasksコレクションにて管理)リポジトリ
  */
 export declare class AsyncActionLegacyRepo {
-    readonly taskModel: IModel;
+    private readonly taskModel;
     constructor(connection: Connection);
     runImmediately(params: Pick<factory.task.IAttributes<factory.taskName>, 'data' | 'name' | 'project' | 'remainingNumberOfTries' | 'runsAt'> & {
         alternateName?: never;

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

@@ -0,0 +1,19 @@
+import type { Connection, UpdateWriteOpResult } from 'mongoose';
+import { factory } from '../factory';
+import { IModel } from './mongoose/schemas/task';
+/**
+ * 旧予定タスクリポジトリ
+ */
+export declare class ScheduledTaskLegacyRepo {
+    readonly taskModel: IModel;
+    constructor(connection: Connection);
+    /**
+     * $eq:0をAbortedにする(特定のタスクのみ)(これらは中止されてもhubへ通知しない)
+     */
+    abortLegacyTasks(params: {
+        intervalInMinutes: number;
+        name: {
+            $in: factory.taskName[];
+        };
+    }): Promise<UpdateWriteOpResult>;
+}

package/lib/chevre/repo/scheduledTaskLegacy.js

@@ -0,0 +1,42 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ScheduledTaskLegacyRepo = void 0;
+const moment_1 = __importDefault(require("moment"));
+const factory_1 = require("../factory");
+const task_1 = require("./mongoose/schemas/task");
+/**
+ * 旧予定タスクリポジトリ
+ */
+class ScheduledTaskLegacyRepo {
+    taskModel;
+    constructor(connection) {
+        this.taskModel = connection.model(task_1.modelName, (0, task_1.createSchema)());
+    }
+    /**
+     * $eq:0をAbortedにする(特定のタスクのみ)(これらは中止されてもhubへ通知しない)
+     */
+    async abortLegacyTasks(params) {
+        const lastTriedAtShoudBeLessThan = (0, moment_1.default)()
+            .add(-params.intervalInMinutes, 'minutes')
+            .toDate();
+        return this.taskModel.updateMany({
+            status: { $eq: factory_1.factory.taskStatus.Running },
+            lastTriedAt: {
+                $type: 'date',
+                $lt: lastTriedAtShoudBeLessThan
+            },
+            remainingNumberOfTries: { $eq: 0 },
+            name: { $in: params.name.$in }
+        }, {
+            $set: {
+                status: factory_1.factory.taskStatus.Aborted,
+                dateAborted: new Date()
+            }
+        })
+            .exec();
+    }
+}
+exports.ScheduledTaskLegacyRepo = ScheduledTaskLegacyRepo;

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

@@ -117,16 +117,14 @@ export declare class TaskRepo {
     /**
      * Runningのまま一定期間超過し、かつ、remainingNumberOfTries>0のタスクをReadyに変更する
      */
-    retryMany(params: {
+    retryTasks(params: {
+        intervalInMinutes: number;
+    }): Promise<UpdateWriteOpResult>;
+    /**
+     * $lte:0をReadyにする(特定のタスクを除いて) -> Readyにすれば自動的にAbortedになる
+     */
+    retryAbortingTasksByName(params: {
         intervalInMinutes: number;
-        /**
-         * リトライ条件に残り試行回数条件を追加する
-         * 十分に小さい数値を指定すれば、実質残り試行回数に関係なくRunningがReadyに変更されることになる
-         */
-        remainingNumberOfTries: {
-            $gte?: number;
-            $lte?: number;
-        };
         name: {
             $in?: factory.taskName[];
         };
@@ -139,12 +137,6 @@ export declare class TaskRepo {
         id: string;
         remainingNumberOfTries: number;
     }): Promise<UpdateWriteOpResult>;
-    abortMany(params: {
-        intervalInMinutes: number;
-        name: {
-            $in?: factory.taskName[];
-        };
-    }): Promise<UpdateWriteOpResult>;
     /**
      * タスクIDから実行結果とステータスを保管する
      * Abortedの場合、dateAbortedもセットする

package/lib/chevre/repo/task.js

@@ -407,12 +407,12 @@ class TaskRepo {
     /**
      * Runningのまま一定期間超過し、かつ、remainingNumberOfTries>0のタスクをReadyに変更する
      */
-    async retryMany(params) {
+    async retryTasks(params) {
         const lastTriedAtShoudBeLessThan = (0, moment_1.default)()
             .add(-params.intervalInMinutes, 'minutes')
             .toDate();
-        const remainingNumberOfTriesGte = params.remainingNumberOfTries.$gte;
-        const remainingNumberOfTriesLte = params.remainingNumberOfTries.$lte;
+        // const remainingNumberOfTriesGte = params.remainingNumberOfTries.$gte;
+        // const remainingNumberOfTriesLte = params.remainingNumberOfTries.$lte;
         return this.taskModel.updateMany(
         // name: 'retry'のindexと連動しているので、条件の順序などには注意すること
         // @see schemas/task
@@ -422,12 +422,46 @@ class TaskRepo {
                 $type: 'date',
                 $lt: lastTriedAtShoudBeLessThan
             },
-            ...(typeof remainingNumberOfTriesGte === 'number')
-                ? { remainingNumberOfTries: { $gte: remainingNumberOfTriesGte } }
-                : undefined,
-            ...(typeof remainingNumberOfTriesLte === 'number')
-                ? { remainingNumberOfTries: { $lte: remainingNumberOfTriesLte } }
-                : undefined,
+            remainingNumberOfTries: { $gte: 1 },
+            // ...(typeof remainingNumberOfTriesGte === 'number')
+            //     ? { remainingNumberOfTries: { $gte: remainingNumberOfTriesGte } }
+            //     : undefined,
+            // ...(typeof remainingNumberOfTriesLte === 'number')
+            //     ? { remainingNumberOfTries: { $lte: remainingNumberOfTriesLte } }
+            //     : undefined,
+            // ...(Array.isArray(params.name.$in)) ? { name: { $in: params.name.$in } } : undefined
+        }, {
+            $set: {
+                status: factory_1.factory.taskStatus.Ready // 実行前に変更
+            }
+        })
+            .exec();
+    }
+    /**
+     * $lte:0をReadyにする(特定のタスクを除いて) -> Readyにすれば自動的にAbortedになる
+     */
+    async retryAbortingTasksByName(params) {
+        const lastTriedAtShoudBeLessThan = (0, moment_1.default)()
+            .add(-params.intervalInMinutes, 'minutes')
+            .toDate();
+        // const remainingNumberOfTriesGte = params.remainingNumberOfTries.$gte;
+        // const remainingNumberOfTriesLte = params.remainingNumberOfTries.$lte;
+        return this.taskModel.updateMany(
+        // name: 'retry'のindexと連動しているので、条件の順序などには注意すること
+        // @see schemas/task
+        {
+            status: { $eq: factory_1.factory.taskStatus.Running },
+            lastTriedAt: {
+                $type: 'date',
+                $lt: lastTriedAtShoudBeLessThan
+            },
+            remainingNumberOfTries: { $lte: 0 },
+            // ...(typeof remainingNumberOfTriesGte === 'number')
+            //     ? { remainingNumberOfTries: { $gte: remainingNumberOfTriesGte } }
+            //     : undefined,
+            // ...(typeof remainingNumberOfTriesLte === 'number')
+            //     ? { remainingNumberOfTries: { $lte: remainingNumberOfTriesLte } }
+            //     : undefined,
             ...(Array.isArray(params.name.$in)) ? { name: { $in: params.name.$in } } : undefined
         }, {
             $set: {
@@ -454,26 +488,6 @@ class TaskRepo {
         })
             .exec();
     }
-    async abortMany(params) {
-        const lastTriedAtShoudBeLessThan = (0, moment_1.default)()
-            .add(-params.intervalInMinutes, 'minutes')
-            .toDate();
-        return this.taskModel.updateMany({
-            status: { $eq: factory_1.factory.taskStatus.Running },
-            lastTriedAt: {
-                $type: 'date',
-                $lt: lastTriedAtShoudBeLessThan
-            },
-            remainingNumberOfTries: { $eq: 0 },
-            ...(Array.isArray(params.name.$in)) ? { name: { $in: params.name.$in } } : undefined
-        }, {
-            $set: {
-                status: factory_1.factory.taskStatus.Aborted,
-                dateAborted: new Date()
-            }
-        })
-            .exec();
-    }
     /**
      * タスクIDから実行結果とステータスを保管する
      * Abortedの場合、dateAbortedもセットする

package/lib/chevre/repository.d.ts

@@ -93,6 +93,7 @@ import type { RateLimitSettingRepo } from './repo/setting/rateLimit';
 import type { WaiterSettingRepo } from './repo/setting/waiter';
 import type { StockHolderRepo } from './repo/stockHolder';
 import type { ScheduledTaskRepo } from './repo/scheduledTask';
+import type { ScheduledTaskLegacyRepo } from './repo/scheduledTaskLegacy';
 import type { TaskRepo } from './repo/task';
 import type { TicketRepo } from './repo/ticket';
 import type { TransactionRepo } from './repo/transaction';
@@ -498,6 +499,10 @@ export type ScheduledTask = ScheduledTaskRepo;
 export declare namespace ScheduledTask {
     function createInstance(...params: ConstructorParameters<typeof ScheduledTaskRepo>): Promise<ScheduledTaskRepo>;
 }
+export type ScheduledTaskLegacy = ScheduledTaskLegacyRepo;
+export declare namespace ScheduledTaskLegacy {
+    function createInstance(...params: ConstructorParameters<typeof ScheduledTaskLegacyRepo>): Promise<ScheduledTaskLegacyRepo>;
+}
 export type Task = TaskRepo;
 export declare namespace Task {
     function createInstance(...params: ConstructorParameters<typeof TaskRepo>): Promise<TaskRepo>;

package/lib/chevre/repository.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.NoteAboutOrder = exports.Note = exports.MovieTicketType = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Authorization = exports.CategoryCode = exports.assetTransaction = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOrder = exports.AggregateOffer = exports.AggregateTask = exports.AggregateScheduledTask = exports.AggregateAction = exports.AdminTask = exports.AdminScheduledTask = exports.AdminAsyncAction = exports.AdditionalProperty = exports.action = exports.Action = exports.AccountTitle = exports.AccountingReport = exports.AcceptedOffer = void 0;
-exports.WebSite = exports.rateLimit = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.AsyncActionLegacy = exports.AsyncAction = exports.Task = exports.ScheduledTask = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Person = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = void 0;
+exports.WebSite = exports.rateLimit = exports.TransactionProcess = exports.TransactionNumber = exports.transaction = exports.Transaction = exports.Ticket = exports.AsyncActionLegacy = exports.AsyncAction = exports.Task = exports.ScheduledTaskLegacy = exports.ScheduledTask = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.SellerMakesOffer = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductHasOfferCatalog = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = exports.Person = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -1044,6 +1044,17 @@ var ScheduledTask;
     }
     ScheduledTask.createInstance = createInstance;
 })(ScheduledTask || (exports.ScheduledTask = ScheduledTask = {}));
+var ScheduledTaskLegacy;
+(function (ScheduledTaskLegacy) {
+    let repo;
+    async function createInstance(...params) {
+        if (repo === undefined) {
+            repo = (await import('./repo/scheduledTaskLegacy.js')).ScheduledTaskLegacyRepo;
+        }
+        return new repo(...params);
+    }
+    ScheduledTaskLegacy.createInstance = createInstance;
+})(ScheduledTaskLegacy || (exports.ScheduledTaskLegacy = ScheduledTaskLegacy = {}));
 var Task;
 (function (Task) {
     let repo;

package/package.json

@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "26.0.0-alpha.6"
+  "version": "26.0.0-alpha.8"
 }