@chevre/domain 22.11.0-alpha.16 → 22.11.0-alpha.18

package/example/src/chevre/settings/addSettings.ts

@@ -8,18 +8,16 @@ async function main() {
 
     const settingRepo = await chevre.repository.Setting.createInstance(mongoose.connection);
 
-    const setting = await settingRepo.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
-    const useInformReturnAction = (<any>setting)?.onOrderStatusChanged?.useInformReturnAction === true;
-    if (useInformReturnAction) {
-        console.log('already useInformReturnAction:true');
+    const setting = await settingRepo.findOne({ project: { id: { $eq: '*' } } }, ['onTaskStatusChanged']);
+    const onTaskStatusChangedExists = setting?.onTaskStatusChanged !== undefined;
+    if (onTaskStatusChangedExists) {
+        console.log('already exists');
     } else {
         // update
-        await settingRepo.updateByProject4migration(
+        await settingRepo.updateByProject(
             { project: { id: { $eq: '*' } } },
             {
-                $set: {
-                    'onOrderStatusChanged.useInformReturnAction': true
-                }
+                onTaskStatusChanged: {}
             }
         );
         console.log('updated.');

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

@@ -12,8 +12,6 @@ interface IExecuteSettings {
      */
     redisClient?: RedisClientType;
 }
-type IOperationExecute<T> = (settings: IExecuteSettings) => Promise<T>;
-type INextFunction = (task: Pick<factory.task.ITask<factory.taskName>, 'id' | 'remainingNumberOfTries' | 'name' | 'status'>) => IOperationExecute<void>;
 interface IReadyTask {
     id: string;
     name?: factory.taskName;
@@ -45,6 +43,8 @@ interface IExecutedTask {
     expires?: never;
 }
 type IChangedTask = IReadyTask | IRunningTask | IExecutedTask;
+type IOperationExecute<T> = (settings: IExecuteSettings) => Promise<T>;
+type INextFunction = (task: IExecutedTask) => IOperationExecute<void>;
 type IOnTaskStatusChangedListener = (task: IChangedTask, next?: INextFunction) => void;
 /**
  * タスクイベントエミッター

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

@@ -13,6 +13,16 @@ interface IOnReservationStatusChanged {
      */
     informReservation?: factory.project.IInformParams[];
 }
+interface IOnTaskStatusChanged {
+    /**
+     * AggService通知先
+     */
+    informTask?: factory.project.IInformParams[];
+    /**
+     * 分析連携するtaskNameリスト
+     */
+    informTaskNames?: factory.taskName[];
+}
 interface IOnEventChanged {
     informEvent2agg?: factory.project.IInformParams[];
 }
@@ -102,6 +112,7 @@ export interface ISetting {
     onEventChanged?: IOnEventChanged;
     onOrderStatusChanged: IOnOrderStatusChanged;
     onReservationStatusChanged?: IOnReservationStatusChanged;
+    onTaskStatusChanged?: IOnTaskStatusChanged;
     onResourceUpdated?: {
         informResource?: factory.project.IInformParams[];
     };

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

@@ -77,8 +77,8 @@ export declare class SellerRepo {
     }): Promise<void>;
     getCursor(conditions: FilterQuery<factory.seller.ISeller>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, {
         url?: string | undefined;
-        name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
+        name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         typeOf: factory.organizationType.Corporation;
         location?: factory.organization.ILocation | undefined;
         additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
@@ -89,8 +89,8 @@ export declare class SellerRepo {
         paymentAccepted?: factory.seller.IPaymentAccepted[] | undefined;
     }> & {
         url?: string | undefined;
-        name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
+        name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         typeOf: factory.organizationType.Corporation;
         location?: factory.organization.ILocation | undefined;
         additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
@@ -103,8 +103,8 @@ export declare class SellerRepo {
         _id: Types.ObjectId;
     }, QueryOptions<import("mongoose").Document<unknown, {}, {
         url?: string | undefined;
-        name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
+        name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         typeOf: factory.organizationType.Corporation;
         location?: factory.organization.ILocation | undefined;
         additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;
@@ -115,8 +115,8 @@ export declare class SellerRepo {
         paymentAccepted?: factory.seller.IPaymentAccepted[] | undefined;
     }> & {
         url?: string | undefined;
-        name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
+        name: import("@chevre/factory/lib/multilingualString").IMultilingualString;
         typeOf: factory.organizationType.Corporation;
         location?: factory.organization.ILocation | undefined;
         additionalProperty?: import("@chevre/factory/lib/propertyValue").IPropertyValue<string>[] | undefined;

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

@@ -22,16 +22,7 @@ export declare class SettingRepo {
                 $eq: string;
             };
         };
-    }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onResourceUpdated' | 'defaultSenderEmail' | 'useInformResourceTypes' | 'userPoolIdNew' | 'userPoolIdOld' | 'storage' | 'quota' | 'triggerWebhook' | 'waiter'>): Promise<import("mongoose").UpdateWriteOpResult>;
-    updateByProject4migration(filter: {
-        project: {
-            id: {
-                $eq: string;
-            };
-        };
-    }, update: {
-        $set: any;
-    }): Promise<import("mongoose").UpdateWriteOpResult>;
+    }, update: Pick<ISetting, 'onEventChanged' | 'onReservationStatusChanged' | 'onTaskStatusChanged' | 'onResourceUpdated' | 'defaultSenderEmail' | 'useInformResourceTypes' | 'userPoolIdNew' | 'userPoolIdOld' | 'storage' | 'quota' | 'triggerWebhook' | 'waiter'>): Promise<import("mongoose").UpdateWriteOpResult>;
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<ISetting>;
         $unset: any;

package/lib/chevre/repo/setting.js

@@ -49,18 +49,9 @@ class SettingRepo {
     }
     updateByProject(filter, update) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { onEventChanged, onReservationStatusChanged, onResourceUpdated, defaultSenderEmail, useInformResourceTypes, userPoolIdNew, userPoolIdOld, storage, quota, triggerWebhook, waiter } = update;
+            const { onEventChanged, onReservationStatusChanged, onTaskStatusChanged, onResourceUpdated, defaultSenderEmail, useInformResourceTypes, userPoolIdNew, userPoolIdOld, storage, quota, triggerWebhook, waiter } = 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(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), (quota !== undefined) ? { quota } : undefined), (triggerWebhook !== undefined) ? { triggerWebhook } : undefined), (waiter !== undefined) ? { waiter } : undefined)
-            })
-                .exec();
-        });
-    }
-    updateByProject4migration(filter, update) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { $set } = update;
-            return this.settingModel.updateOne({ 'project.id': { $eq: filter.project.id.$eq } }, {
-                $set
+                $set: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (onEventChanged !== undefined) ? { onEventChanged } : undefined), (onReservationStatusChanged !== undefined) ? { onReservationStatusChanged } : undefined), (onTaskStatusChanged !== undefined) ? { onTaskStatusChanged } : 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), (quota !== undefined) ? { quota } : undefined), (triggerWebhook !== undefined) ? { triggerWebhook } : undefined), (waiter !== undefined) ? { waiter } : undefined)
             })
                 .exec();
         });

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

@@ -150,9 +150,6 @@ export declare class TaskRepo {
         id: string;
         remainingNumberOfTries: number;
     }): Promise<UpdateWriteOpResult>;
-    abortOne(params: {
-        intervalInMinutes: number;
-    }): Promise<factory.task.ITask<factory.taskName> | null>;
     abortMany(params: {
         intervalInMinutes: number;
     }): Promise<UpdateWriteOpResult>;
@@ -208,14 +205,14 @@ export declare class TaskRepo {
         count: number;
     }>;
     getCursor(conditions: FilterQuery<factory.task.ITask<factory.taskName>>, projection: ProjectionType<factory.task.ITask<factory.taskName>>): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, {
-        remainingNumberOfTries: number;
-        name: factory.taskName;
-        status: factory.taskStatus;
         alternateName?: string | undefined;
         identifier?: string | undefined;
         description?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
+        name: factory.taskName;
+        status: factory.taskStatus;
         runsAt: Date;
+        remainingNumberOfTries: number;
         lastTriedAt?: Date | undefined;
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
@@ -224,14 +221,14 @@ export declare class TaskRepo {
         dateAborted?: Date | undefined;
         expires?: Date | undefined;
     }> & {
-        remainingNumberOfTries: number;
-        name: factory.taskName;
-        status: factory.taskStatus;
         alternateName?: string | undefined;
         identifier?: string | undefined;
         description?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
+        name: factory.taskName;
+        status: factory.taskStatus;
         runsAt: Date;
+        remainingNumberOfTries: number;
         lastTriedAt?: Date | undefined;
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
@@ -242,14 +239,14 @@ export declare class TaskRepo {
     } & {
         _id: import("mongoose").Types.ObjectId;
     }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, {
-        remainingNumberOfTries: number;
-        name: factory.taskName;
-        status: factory.taskStatus;
         alternateName?: string | undefined;
         identifier?: string | undefined;
         description?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
+        name: factory.taskName;
+        status: factory.taskStatus;
         runsAt: Date;
+        remainingNumberOfTries: number;
         lastTriedAt?: Date | undefined;
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
@@ -258,14 +255,14 @@ export declare class TaskRepo {
         dateAborted?: Date | undefined;
         expires?: Date | undefined;
     }> & {
-        remainingNumberOfTries: number;
-        name: factory.taskName;
-        status: factory.taskStatus;
         alternateName?: string | undefined;
         identifier?: string | undefined;
         description?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
+        name: factory.taskName;
+        status: factory.taskStatus;
         runsAt: Date;
+        remainingNumberOfTries: number;
         lastTriedAt?: Date | undefined;
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];

package/lib/chevre/repo/task.js

@@ -325,36 +325,6 @@ class TaskRepo {
             }
         });
     }
-    // public async createConfirmReserveTransactionTaskIfNotExist(
-    //     params: factory.task.IAttributes<factory.taskName.ConfirmReserveTransaction>,
-    //     options: IOptionOnCreate
-    // ): Promise<void> {
-    //     const createdTask = await this.taskModel.findOneAndUpdate(
-    //         {
-    //             'project.id': { $eq: params.project.id },
-    //             name: { $eq: params.name },
-    //             'data.object.transactionNumber': {
-    //                 $exists: true,
-    //                 $eq: String(params.data.object.transactionNumber)
-    //             },
-    //             'data.purpose.orderNumber': {
-    //                 $exists: true,
-    //                 $eq: String(params.data.purpose.orderNumber)
-    //             }
-    //         },
-    //         { $setOnInsert: params },
-    //         { new: true, upsert: true }
-    //     )
-    //         .select({ _id: 1 })
-    //         .exec();
-    //     if (options.emitImmediately) {
-    //         taskEventEmitter.emitTaskStatusChanged({
-    //             id: createdTask.id,
-    //             name: params.name,
-    //             status: factory.taskStatus.Ready
-    //         });
-    //     }
-    // }
     createOnAssetTransactionStatusChangedTaskIfNotExist(
     // resolve uniqueness of identifier(2025-03-27~)
     params, options) {
@@ -687,34 +657,42 @@ class TaskRepo {
                 .exec();
         });
     }
-    abortOne(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const lastTriedAtShoudBeLessThan = moment()
-                .add(-params.intervalInMinutes, 'minutes')
-                .toDate();
-            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(AVAILABLE_PROJECT_FIELDS.map((key) => ([key, 1]))));
-            const doc = yield this.taskModel.findOneAndUpdate({
-                status: { $eq: factory.taskStatus.Running },
-                lastTriedAt: {
-                    $type: 'date',
-                    $lt: lastTriedAtShoudBeLessThan
-                },
-                remainingNumberOfTries: { $eq: 0 }
-            }, {
-                $set: {
-                    status: factory.taskStatus.Aborted,
-                    dateAborted: new Date()
-                }
-            }, { new: true, projection })
-                .lean() // lean(2024-09-26~)
-                .exec();
-            if (doc === null) {
-                // tslint:disable-next-line:no-null-keyword
-                return null;
-            }
-            return doc;
-        });
-    }
+    // public async abortOne(params: {
+    //     intervalInMinutes: number;
+    // }): Promise<factory.task.ITask<factory.taskName> | null> {
+    //     const lastTriedAtShoudBeLessThan = moment()
+    //         .add(-params.intervalInMinutes, 'minutes')
+    //         .toDate();
+    //     const projection: ProjectionType<factory.task.ITask<factory.taskName>> = {
+    //         _id: 0,
+    //         id: { $toString: '$_id' },
+    //         ...Object.fromEntries<1>(AVAILABLE_PROJECT_FIELDS.map((key) => ([key, 1])))
+    //     };
+    //     const doc = await this.taskModel.findOneAndUpdate(
+    //         {
+    //             status: { $eq: factory.taskStatus.Running },
+    //             lastTriedAt: {
+    //                 $type: 'date',
+    //                 $lt: lastTriedAtShoudBeLessThan
+    //             },
+    //             remainingNumberOfTries: { $eq: 0 }
+    //         },
+    //         {
+    //             $set: {
+    //                 status: factory.taskStatus.Aborted,
+    //                 dateAborted: new Date()
+    //             }
+    //         },
+    //         { new: true, projection }
+    //     )
+    //         .lean<factory.task.ITask<factory.taskName>>()  // lean(2024-09-26~)
+    //         .exec();
+    //     if (doc === null) {
+    //         // tslint:disable-next-line:no-null-keyword
+    //         return null;
+    //     }
+    //     return doc;
+    // }
     abortMany(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const lastTriedAtShoudBeLessThan = moment()

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

@@ -6,6 +6,9 @@ interface IOnOrderStatusChanged {
 interface IOnReservationStatusChanged {
     informReservation2hub?: factory.project.IInformParams[];
 }
+interface IOnTaskStatusChanged {
+    informTask2hub?: factory.project.IInformParams[];
+}
 interface ICallableTask {
     aggregateOnSystem?: ICallableTaskOperation;
     handleNotification?: ICallableTaskOperation;
@@ -17,6 +20,7 @@ interface IOptions {
     callableTask?: ICallableTask;
     onOrderStatusChanged: IOnOrderStatusChanged;
     onReservationStatusChanged: IOnReservationStatusChanged;
+    onTaskStatusChanged: IOnTaskStatusChanged;
 }
 /**
  * aggregation domain settings
@@ -25,6 +29,7 @@ declare class AggregationSettings {
     readonly callableTask?: ICallableTask;
     readonly onOrderStatusChanged: IOnOrderStatusChanged;
     readonly onReservationStatusChanged: IOnReservationStatusChanged;
+    readonly onTaskStatusChanged: IOnTaskStatusChanged;
     constructor(options: IOptions);
 }
 export { ICallableTaskOperation, ICallResult, IOperationExecute, AggregationSettings };

package/lib/chevre/settings/aggregation.js

@@ -6,9 +6,10 @@ exports.AggregationSettings = void 0;
  */
 class AggregationSettings {
     constructor(options) {
-        const { callableTask, onOrderStatusChanged, onReservationStatusChanged } = options;
+        const { callableTask, onOrderStatusChanged, onReservationStatusChanged, onTaskStatusChanged } = options;
         this.onOrderStatusChanged = onOrderStatusChanged;
         this.onReservationStatusChanged = onReservationStatusChanged;
+        this.onTaskStatusChanged = onTaskStatusChanged;
         if (callableTask !== undefined) {
             this.callableTask = callableTask;
         }

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.396.0-alpha.2",
+    "@chevre/factory": "4.396.0-alpha.3",
     "@cinerino/sdk": "11.1.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -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.16"
+  "version": "22.11.0-alpha.18"
 }

package/example/src/chevre/findSetting.ts

@@ -1,79 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const informOrderUrls = (typeof process.env.INFORM_ORDER_URL === 'string')
-    ? process.env.INFORM_ORDER_URL.split(' ')
-    : [];
-// const informReservationUrls = (typeof process.env.INFORM_RESERVATION_URL === 'string')
-//     ? process.env.INFORM_RESERVATION_URL.split(' ')
-//     : [];
-// const informResourceUrls = (typeof process.env.INFORM_RESOURCE_URL === 'string')
-//     ? process.env.INFORM_RESOURCE_URL.split(',')
-//     : [];
-// const informEvent2aggUrls = (typeof process.env.INFORM_EVENT_AGG_URL === 'string')
-//     ? process.env.INFORM_EVENT_AGG_URL.split(' ')
-//     : [];
-// const userPoolIdOld = process.env.USERPOOL_ID_OLD;
-// const userPoolIdNew = process.env.USERPOOL_ID_NEW;
-// const defaultSenderEmail = process.env.DEFAULT_SENDER_EMAIL;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const settingRepo = await chevre.repository.Setting.createInstance(mongoose.connection);
-
-    const result = await settingRepo.findOne({}, ['triggerWebhook', 'waiter']);
-    // tslint:disable-next-line:no-null-keyword
-    console.dir(result, { depth: null });
-
-    if (result === null) {
-        if (informOrderUrls.length > 0) {
-            await settingRepo.saveOne({
-                project: { id: '*', typeOf: chevre.factory.organizationType.Project },
-                onOrderStatusChanged: {
-                    informOrder: informOrderUrls
-                        .filter((url) => url.length > 0)
-                        .map((url) => {
-                            return {
-                                recipient: {
-                                    typeOf: chevre.factory.creativeWorkType.WebApplication,
-                                    name: 'Aggregation Service',
-                                    url
-                                }
-                            };
-                        })
-                }
-            });
-            console.log('saved');
-        }
-    } else {
-        const updateResult = await settingRepo.updateByProject(
-            { project: { id: { $eq: '*' } } },
-            {
-                triggerWebhook: {
-                    timeout: 15000,
-                    useFetchAPI: true,
-                    secretKey: String(process.env.TRIGGER_WEBHOOK_SECRET_KEY),
-                    headerIdentifier: String(process.env.TRIGGER_WEBHOOK_HEADER_IDENTIFIER),
-                    retryCountMax: 2,
-                    retryIntervalInMS: 1000
-                },
-                waiter: {
-                    disabled: process.env.WAITER_DISABLED === '1',
-                    passportUnavailable: process.env.WAITER_PASSPORT_UNAVAILABLE === '1',
-                    passportIssuers: String(process.env.WAITER_PASSPORT_ISSUER)
-                        .split(' '),
-                    secret: String(process.env.WAITER_SECRET)
-                }
-            }
-        );
-        console.log('updated', updateResult);
-    }
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);