@chevre/domain 22.9.0-alpha.83 → 22.9.0-alpha.84

package/example/src/chevre/aggregation/{aggregateOrderOfSeat.ts → aggregateOrderOfSeatByRoyalCustomers.ts}

@@ -8,17 +8,29 @@ import { chevre } from '../../../../lib/index';
 const PROJECT_ID = String(process.env.PROJECT_ID);
 // const SCREEN_CODE = '10';
 // const MOVIE_THEATER_CODE = '118';
-// const SCREEN_CODE = '130';
-const SCREEN_CODE = '211';
+const SCREEN_CODE = '130';
+// const SCREEN_CODE = '211';
 const MOVIE_THEATER_CODE = '020';
 const AGGREGATE_PERIOD_IN_MONTHS = 12;
 // tslint:disable-next-line:max-func-body-length
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
+    const aggregateOrderRepo = await chevre.repository.AggregateOrder.createInstance(mongoose.connection);
     const seatRepo = await chevre.repository.place.Seat.createInstance(mongoose.connection);
     const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
 
+    const royalCustomers = await aggregateOrderRepo.searchRoyalCustomers({
+        limit: 300,
+        project: { id: PROJECT_ID },
+        aggregateOrder: { orderCount: { $gte: 12 } }
+    });
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(royalCustomers, { depth: null });
+    console.log(royalCustomers.length, 'royalCustomers found');
+
+    const customerEmails = royalCustomers.map(({ identifier }) => identifier);
+
     const seats = <Pick<chevre.factory.place.seat.IPlace, 'branchCode'>[]>await seatRepo.searchSeats({
         // limit: 50,
         $projection: {
@@ -76,11 +88,12 @@ async function main() {
                     },
                     reservedTicket: { ticketedSeat: { seatNumber: branchCode } }
                 }
-            }
+            },
+            customer: { email: { $in: customerEmails } }
         });
         console.log('aggregateOrder:result', aggregateResult, orderDateGte, orderDateLte, i);
         const diff = process.hrtime(startTime);
-        console.log(`importing chevre took ${diff[0]} seconds and ${diff[1]} nanoseconds.`);
+        console.log(`aggregateOrderOfSeat took ${diff[0]} seconds and ${diff[1]} nanoseconds.`);
 
         const emailCount = (typeof aggregateResult.aggregation.emailCount === 'number')
             ? aggregateResult.aggregation.emailCount

package/example/src/chevre/{countPotentiallyExpired.ts → countPotentiallyExportTasks.ts}

@@ -13,8 +13,8 @@ async function main() {
     const transactionRepo = await chevre.repository.Transaction.createInstance(mongoose.connection);
     const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
 
-    let result = await transactionRepo.countPotentiallyExpired({
-        expires: {
+    let result = await transactionRepo.countPotentiallyExportTasks({
+        endDate: {
             $lt: moment()
                 // tslint:disable-next-line:no-magic-numbers
                 .add(-60, 'seconds')

package/example/src/chevre/migrateIdentities.ts

@@ -0,0 +1,82 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+// const excludedProject = { id: String(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 identityRepo = await chevre.repository.Identity.createInstance(mongoose.connection);
+    const memberRepo = await chevre.repository.Member.createInstance(mongoose.connection);
+
+    const cursor = memberRepo.getCursor(
+        {
+            'member.typeOf': {
+                $in: [
+                    chevre.factory.creativeWorkType.WebApplication
+                ]
+            },
+            'project.id': { $ne: '*' }
+            // _id: { $eq: '5f9a4fed4f3709000abe6415' }
+        },
+        {
+            _id: 1,
+            member: 1,
+            project: 1,
+            typeOf: 1
+        }
+    );
+    console.log('docs found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const iamMember: Pick<
+            chevre.factory.iam.IMember,
+            'member' | 'project' | 'typeOf'
+        > = doc.toObject();
+
+        // console.log(
+        //     'alreadyMigrated?', iamMember.project.id, iamMember.member.id, i);
+        let alreadyMigrated = false;
+        try {
+            const clientId = iamMember.member.id;
+            const existingIdentity = (await identityRepo.projectFields(
+                {
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: iamMember.project.id } },
+                    about: { id: { $eq: clientId } }
+                },
+                ['issuedBy']
+            )).shift();
+            if (existingIdentity !== undefined) {
+                alreadyMigrated = true;
+            }
+        } catch (error) {
+            // no op
+        }
+
+        if (alreadyMigrated) {
+            // console.log(
+            //     'already migrated.', iamMember.project.id, iamMember.member.id, i);
+        } else {
+            const roleNames = iamMember.member.hasRole.map(({ roleName }) => roleName);
+            updateCount += 1;
+            console.log(
+                'updated.', iamMember.project.id, iamMember.member.id, roleNames, i);
+        }
+    });
+
+    console.log(i, 'docs checked');
+    console.log(updateCount, 'docs updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -24,4 +24,15 @@ export declare class AggregateOrderRepo {
     save(filter: Pick<IDocType, 'project' | 'identifier' | 'typeOf'>, update: {
         $set: Pick<IDocType, 'aggregateOrder'>;
     }): Promise<void>;
+    searchRoyalCustomers(params: {
+        limit: number;
+        project: {
+            id: string;
+        };
+        aggregateOrder: {
+            orderCount: {
+                $gte: number;
+            };
+        };
+    }): Promise<Pick<IDocType, 'aggregateOrder' | 'identifier'>[]>;
 }

package/lib/chevre/repo/aggregateOrder.js

@@ -144,5 +144,30 @@ class AggregateOrderRepo {
             }
         });
     }
+    searchRoyalCustomers(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { limit, project, aggregateOrder } = params;
+            const query = this.aggregateOrderModel.find({
+                typeOf: { $eq: factory.personType.Person },
+                'project.id': { $eq: project.id },
+                'aggregateOrder.orderCount': { $exists: true, $gte: aggregateOrder.orderCount.$gte }
+            }, {
+                _id: 0,
+                aggregateOrder: 1,
+                identifier: 1
+            })
+                .sort({ 'aggregateOrder.orderCount': factory.sortType.Descending })
+                .limit(limit);
+            // if (typeof params.limit === 'number' && params.limit > 0) {
+            //     const page: number = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+            //     aggregate.limit(params.limit * page)
+            //         .skip(params.limit * (page - 1));
+            // }
+            return query
+                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .lean()
+                .exec();
+        });
+    }
 }
 exports.AggregateOrderRepo = AggregateOrderRepo;

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

@@ -75,6 +75,14 @@ export declare class AssetTransactionRepo {
     }): Promise<{
         id: string;
     }>;
+    countPotentiallyExportTasks(params: {
+        endDate: {
+            $lt: Date;
+        };
+        limit?: number;
+    }): Promise<{
+        count: number;
+    }>;
     /**
      * タスク未エクスポートの取引をひとつ取得してエクスポートを開始する
      */
@@ -115,7 +123,7 @@ export declare class AssetTransactionRepo {
             $in: factory.transactionStatusType[];
         };
         limit: number;
-    }): Promise<Pick<import("@chevre/factory/lib/assetTransaction/cancelReservation").ITransaction | import("@chevre/factory/lib/assetTransaction/moneyTransfer").ITransaction | import("@chevre/factory/lib/assetTransaction/pay").ITransaction | import("@chevre/factory/lib/assetTransaction/refund").ITransaction | import("@chevre/factory/lib/assetTransaction/registerService").ITransaction | import("@chevre/factory/lib/assetTransaction/reserve").ITransaction, "id" | "typeOf" | "status">[]>;
+    }): Promise<Pick<import("@chevre/factory/lib/assetTransaction/cancelReservation").ITransaction | import("@chevre/factory/lib/assetTransaction/moneyTransfer").ITransaction | import("@chevre/factory/lib/assetTransaction/pay").ITransaction | import("@chevre/factory/lib/assetTransaction/refund").ITransaction | import("@chevre/factory/lib/assetTransaction/registerService").ITransaction | import("@chevre/factory/lib/assetTransaction/reserve").ITransaction, "id" | "status" | "typeOf">[]>;
     /**
      * set task status exported by transaction id
      * IDでタスクをエクスポート済に変更する

package/lib/chevre/repo/assetTransaction.js

@@ -453,6 +453,35 @@ class AssetTransactionRepo {
             return { id: params.id };
         });
     }
+    countPotentiallyExportTasks(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { endDate, limit } = params;
+            const endDateLt = endDate === null || endDate === void 0 ? void 0 : endDate.$lt;
+            if (!(endDateLt instanceof Date)) {
+                throw new factory.errors.Argument('endDate.$lt', 'must be Date');
+            }
+            const query = this.transactionModel.countDocuments({
+                status: {
+                    $in: [
+                        factory.transactionStatusType.Canceled,
+                        factory.transactionStatusType.Confirmed,
+                        factory.transactionStatusType.Expired
+                    ]
+                },
+                'tasksExportAction.actionStatus': {
+                    $exists: true,
+                    $eq: factory.actionStatusType.PotentialActionStatus
+                },
+                endDate: { $exists: true, $lt: endDateLt }
+            });
+            if (typeof limit === 'number' && limit >= 0) {
+                query.limit(limit);
+            }
+            const count = yield query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+            return { count };
+        });
+    }
     /**
      * タスク未エクスポートの取引をひとつ取得してエクスポートを開始する
      */

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

@@ -33,23 +33,23 @@ export declare class IdentityProviderRepo {
         };
     }): Promise<void>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, {
+        identifier: string;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
         typeOf: factory.organizationType.Organization;
-        identifier: string;
     }> & {
+        identifier: string;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
         typeOf: factory.organizationType.Organization;
-        identifier: string;
     } & {
         _id: import("mongoose").Types.ObjectId;
     }, QueryOptions<import("mongoose").Document<unknown, {}, {
+        identifier: string;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
         typeOf: factory.organizationType.Organization;
-        identifier: string;
     }> & {
+        identifier: string;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
         typeOf: factory.organizationType.Organization;
-        identifier: string;
     } & {
         _id: import("mongoose").Types.ObjectId;
     }>>;

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

@@ -193,6 +193,11 @@ export declare class OrderRepo {
                 };
             };
         };
+        customer?: {
+            email?: {
+                $in?: string[];
+            };
+        };
     }): Promise<{
         aggregation: Pick<IAggregation, 'orderCount'> & {
             sumGraceTime?: number;

package/lib/chevre/repo/order.js

@@ -1102,20 +1102,17 @@ class OrderRepo {
     }
     aggregateOrderOfSeat(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             const seatNumber = params.acceptedOffers.itemOffered.reservedTicket.ticketedSeat.seatNumber;
             const screenCode = params.acceptedOffers.itemOffered.reservationFor.location.branchCode;
             const movieTheaterCode = params.acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode;
-            const matchConditions = {
-                orderDate: {
+            const customerEmailIn = (_b = (_a = params.customer) === null || _a === void 0 ? void 0 : _a.email) === null || _b === void 0 ? void 0 : _b.$in;
+            const matchConditions = Object.assign({ orderDate: {
                     $gte: params.orderDate.$gte,
                     $lte: params.orderDate.$lte
-                },
-                typeOf: { $eq: factory.order.OrderType.Order },
-                'project.id': { $eq: params.project.id.$eq },
-                'acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode': { $exists: true, $eq: movieTheaterCode },
-                'acceptedOffers.itemOffered.reservationFor.location.branchCode': { $exists: true, $eq: screenCode },
-                'acceptedOffers.itemOffered.reservedTicket.ticketedSeat.seatNumber': { $exists: true, $eq: seatNumber }
-            };
+                }, typeOf: { $eq: factory.order.OrderType.Order }, 'project.id': { $eq: params.project.id.$eq }, 'acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode': { $exists: true, $eq: movieTheaterCode }, 'acceptedOffers.itemOffered.reservationFor.location.branchCode': { $exists: true, $eq: screenCode }, 'acceptedOffers.itemOffered.reservedTicket.ticketedSeat.seatNumber': { $exists: true, $eq: seatNumber } }, (Array.isArray(customerEmailIn))
+                ? { 'customer.email': { $exists: true, $in: customerEmailIn } }
+                : undefined);
             const aggregations4email = yield this.orderModel.aggregate([
                 { $match: matchConditions },
                 {

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

@@ -24,30 +24,30 @@ export declare class PotentialActionRepo {
     }>;
     projectFields(conditions: factory.potentialAction.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.potentialAction.IPotentialAction[]>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, {
+        identifier: string;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
         typeOf: factory.actionType.InformAction;
         recipient: factory.potentialAction.IInformRecipient;
-        identifier: string;
         target: factory.entryPoint.IEntryPoint;
     }> & {
+        identifier: string;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
         typeOf: factory.actionType.InformAction;
         recipient: factory.potentialAction.IInformRecipient;
-        identifier: string;
         target: factory.entryPoint.IEntryPoint;
     } & {
         _id: import("mongoose").Types.ObjectId;
     }, QueryOptions<import("mongoose").Document<unknown, {}, {
+        identifier: string;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
         typeOf: factory.actionType.InformAction;
         recipient: factory.potentialAction.IInformRecipient;
-        identifier: string;
         target: factory.entryPoint.IEntryPoint;
     }> & {
+        identifier: string;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
         typeOf: factory.actionType.InformAction;
         recipient: factory.potentialAction.IInformRecipient;
-        identifier: string;
         target: factory.entryPoint.IEntryPoint;
     } & {
         _id: import("mongoose").Types.ObjectId;

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

@@ -78,8 +78,8 @@ export declare class SellerRepo {
     getCursor(conditions: FilterQuery<factory.seller.ISeller>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, {
         url?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
-        typeOf: factory.organizationType.Corporation;
         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;
         branchCode: string;
@@ -90,8 +90,8 @@ export declare class SellerRepo {
     }> & {
         url?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
-        typeOf: factory.organizationType.Corporation;
         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;
         branchCode: string;
@@ -104,8 +104,8 @@ export declare class SellerRepo {
     }, QueryOptions<import("mongoose").Document<unknown, {}, {
         url?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
-        typeOf: factory.organizationType.Corporation;
         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;
         branchCode: string;
@@ -116,8 +116,8 @@ export declare class SellerRepo {
     }> & {
         url?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
-        typeOf: factory.organizationType.Corporation;
         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;
         branchCode: string;

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

@@ -225,11 +225,9 @@ export declare class TaskRepo {
         count: number;
     }>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, {
+        identifier?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
-        expires?: Date | undefined;
-        data: import("@chevre/factory/lib/task").IData;
         name: factory.taskName;
-        identifier?: string | undefined;
         status: factory.taskStatus;
         runsAt: Date;
         remainingNumberOfTries: number;
@@ -237,13 +235,13 @@ export declare class TaskRepo {
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
         executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
+        data: import("@chevre/factory/lib/task").IData;
         dateAborted?: Date | undefined;
+        expires?: Date | undefined;
     }> & {
+        identifier?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
-        expires?: Date | undefined;
-        data: import("@chevre/factory/lib/task").IData;
         name: factory.taskName;
-        identifier?: string | undefined;
         status: factory.taskStatus;
         runsAt: Date;
         remainingNumberOfTries: number;
@@ -251,15 +249,15 @@ export declare class TaskRepo {
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
         executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
+        data: import("@chevre/factory/lib/task").IData;
         dateAborted?: Date | undefined;
+        expires?: Date | undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, {
+        identifier?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
-        expires?: Date | undefined;
-        data: import("@chevre/factory/lib/task").IData;
         name: factory.taskName;
-        identifier?: string | undefined;
         status: factory.taskStatus;
         runsAt: Date;
         remainingNumberOfTries: number;
@@ -267,13 +265,13 @@ export declare class TaskRepo {
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
         executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
+        data: import("@chevre/factory/lib/task").IData;
         dateAborted?: Date | undefined;
+        expires?: Date | undefined;
     }> & {
+        identifier?: string | undefined;
         project: Pick<factory.project.IProject, "id" | "typeOf">;
-        expires?: Date | undefined;
-        data: import("@chevre/factory/lib/task").IData;
         name: factory.taskName;
-        identifier?: string | undefined;
         status: factory.taskStatus;
         runsAt: Date;
         remainingNumberOfTries: number;
@@ -281,7 +279,9 @@ export declare class TaskRepo {
         numberOfTried: number;
         executionResults: import("@chevre/factory/lib/task").IExecutionResult[];
         executor?: import("@chevre/factory/lib/task").IExecutor | undefined;
+        data: import("@chevre/factory/lib/task").IData;
         dateAborted?: Date | undefined;
+        expires?: Date | undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     }>>;

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

@@ -107,6 +107,14 @@ export declare class TransactionRepo {
         result: factory.transaction.IResult<T>;
         potentialActions: factory.transaction.IPotentialActions<T>;
     }): Promise<void>;
+    countPotentiallyExportTasks(params: {
+        endDate: {
+            $lt: Date;
+        };
+        limit?: number;
+    }): Promise<{
+        count: number;
+    }>;
     /**
      * タスク未エクスポートの取引をひとつ取得してエクスポートを開始する
      */
@@ -128,18 +136,6 @@ export declare class TransactionRepo {
             startDate?: factory.sortType;
         };
     }): Promise<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'> | null>;
-    findExportableTransaction(params: {
-        status?: {
-            $eq?: factory.transactionStatusType;
-        };
-        endDate: {
-            $lt: Date;
-        };
-        sort?: {
-            endDate?: factory.sortType;
-            startDate?: factory.sortType;
-        };
-    }): Promise<Pick<factory.transaction.ITransaction<factory.transactionType>, 'id' | 'typeOf'> | null>;
     /**
      * tasksExportAction.actionStatusがActiveActionStatusのまま一定時間経過した取引について
      * PotentialActionStatusに変更する
@@ -160,7 +156,7 @@ export declare class TransactionRepo {
             $in: factory.transactionStatusType[];
         };
         limit: number;
-    }): Promise<Pick<import("@chevre/factory/lib/transaction/placeOrder").ITransaction | import("@chevre/factory/lib/transaction/moneyTransfer").ITransaction | import("@chevre/factory/lib/transaction/returnOrder").ITransaction, "id" | "typeOf" | "status">[]>;
+    }): Promise<Pick<import("@chevre/factory/lib/transaction/placeOrder").ITransaction | import("@chevre/factory/lib/transaction/moneyTransfer").ITransaction | import("@chevre/factory/lib/transaction/returnOrder").ITransaction, "id" | "status" | "typeOf">[]>;
     /**
      * set task status exported by transaction id
      * IDでタスクをエクスポート済に変更する

package/lib/chevre/repo/transaction.js

@@ -548,6 +548,35 @@ class TransactionRepo {
             });
         });
     }
+    countPotentiallyExportTasks(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { endDate, limit } = params;
+            const endDateLt = endDate === null || endDate === void 0 ? void 0 : endDate.$lt;
+            if (!(endDateLt instanceof Date)) {
+                throw new factory.errors.Argument('endDate.$lt', 'must be Date');
+            }
+            const query = this.transactionModel.countDocuments({
+                status: {
+                    $in: [
+                        factory.transactionStatusType.Canceled,
+                        factory.transactionStatusType.Confirmed,
+                        factory.transactionStatusType.Expired
+                    ]
+                },
+                'tasksExportAction.actionStatus': {
+                    $exists: true,
+                    $eq: factory.actionStatusType.PotentialActionStatus
+                },
+                endDate: { $exists: true, $lt: endDateLt }
+            });
+            if (typeof limit === 'number' && limit >= 0) {
+                query.limit(limit);
+            }
+            const count = yield query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+            return { count };
+        });
+    }
     /**
      * タスク未エクスポートの取引をひとつ取得してエクスポートを開始する
      */
@@ -603,52 +632,6 @@ class TransactionRepo {
                 .then((doc) => (doc === null) ? null : doc);
         });
     }
-    findExportableTransaction(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
-            const statusEq = (_a = params.status) === null || _a === void 0 ? void 0 : _a.$eq;
-            const endDateLt = (_b = params.endDate) === null || _b === void 0 ? void 0 : _b.$lt;
-            if (typeof statusEq === 'string') {
-                switch (statusEq) {
-                    case factory.transactionStatusType.InProgress:
-                        throw new factory.errors.NotImplemented(`status "${params.status}" not implemented on startExportTasks`);
-                    default:
-                    // no op
-                }
-            }
-            if (!(endDateLt instanceof Date)) {
-                throw new factory.errors.Argument('endDate.$lt', 'must be Date');
-            }
-            const query = this.transactionModel.findOne({
-                status: Object.assign({}, (typeof statusEq === 'string')
-                    ? { $eq: statusEq }
-                    : {
-                        $in: [
-                            factory.transactionStatusType.Canceled,
-                            factory.transactionStatusType.Confirmed,
-                            factory.transactionStatusType.Expired
-                        ]
-                    }),
-                'tasksExportAction.actionStatus': {
-                    $exists: true,
-                    $eq: factory.actionStatusType.PotentialActionStatus
-                },
-                endDate: { $exists: true, $lt: endDateLt }
-            }, {
-                _id: 0,
-                id: { $toString: '$_id' },
-                typeOf: 1
-            });
-            if (typeof ((_c = params.sort) === null || _c === void 0 ? void 0 : _c.endDate) === 'number' || typeof ((_d = params.sort) === null || _d === void 0 ? void 0 : _d.startDate) === 'number') {
-                query.sort(params.sort);
-            }
-            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .lean() // 2024-08-26~
-                .exec()
-                // tslint:disable-next-line:no-null-keyword
-                .then((doc) => (doc === null) ? null : doc);
-        });
-    }
     // discontinue(2025-03-10~)
     // public async reexportTasksByExportAction(params: {
     //     intervalInMinutes: number;

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

@@ -1,4 +1,3 @@
-import { LINENotifyCredentials } from '../credentials/lineNotify';
 import { SendGridCredentials } from '../credentials/sendGrid';
 import * as factory from '../factory';
 import type { ActionRepo } from '../repo/action';
@@ -6,9 +5,6 @@ import type { MessageRepo } from '../repo/message';
 import type { PotentialActionRepo } from '../repo/potentialAction';
 import type { ProjectRepo } from '../repo/project';
 import type { SettingRepo } from '../repo/setting';
-type ILineNotifyOperation<T> = (repos: undefined, credentials: {
-    lineNotify: LINENotifyCredentials;
-}) => Promise<T>;
 /**
  * Eメールメッセージを送信する
  * https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html
@@ -34,13 +30,6 @@ declare function notifyByEmail(params: {
     result: import("@chevre/factory/lib/action/transfer/send/message/email").IResult;
 }>;
 type LineNotifyLogLevel = 'log' | 'error' | 'info';
-declare function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel }: {
-    subject: string;
-    content: string;
-    imageThumbnail?: string;
-    imageFullsize?: string;
-    logLevel: LineNotifyLogLevel;
-}): ILineNotifyOperation<void>;
 declare function triggerWebhook(params: factory.task.IData<factory.taskName.TriggerWebhook> & {
     project: {
         id: string;
@@ -50,4 +39,4 @@ declare function triggerWebhook(params: factory.task.IData<factory.taskName.Trig
     potentialAction: PotentialActionRepo;
     setting: SettingRepo;
 }) => Promise<void>;
-export { lineNotify, notifyByEmail, sendEmailMessage, triggerWebhook };
+export { notifyByEmail, sendEmailMessage, triggerWebhook };

package/lib/chevre/service/notification.js

@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lineNotify = lineNotify;
 exports.notifyByEmail = notifyByEmail;
 exports.sendEmailMessage = sendEmailMessage;
 exports.triggerWebhook = triggerWebhook;
@@ -23,6 +22,12 @@ const http_status_1 = require("http-status");
 const util = require("util");
 const factory = require("../factory");
 const factory_1 = require("./notification/factory");
+// type ILineNotifyOperation<T> = (
+//     repos: undefined,
+//     credentials: {
+//         lineNotify: LINENotifyCredentials;
+//     }
+// ) => Promise<T>;
 function createSendEmailMessageActionAttributes(params) {
     var _a;
     const { agent, object, project, purpose, recipient, typeOf } = params;
@@ -223,72 +228,93 @@ function notifyByEmail(params) {
         return { result };
     });
 }
-const MAX_LINE_NOTIFY_SUBJECT_LENGTH = 100;
-function lineNotify({ subject, content, imageThumbnail, imageFullsize, logLevel }
-// options: {
-//     timeout: number;
-//     useFetchAPI: boolean;
+// const MAX_LINE_NOTIFY_SUBJECT_LENGTH = 100;
+// function lineNotify(
+//     { subject, content, imageThumbnail, imageFullsize, logLevel }: {
+//         subject: string;
+//         content: string;
+//         imageThumbnail?: string;
+//         imageFullsize?: string;
+//         logLevel: LineNotifyLogLevel;
+//     }
+// ): ILineNotifyOperation<void> {
+//     return async (
+//         __: undefined,
+//         credentials: {
+//             lineNotify: LINENotifyCredentials;
+//         }
+//     ) => {
+//         const timeout = 10000;
+//         const LINE_NOTIFY_URL = credentials.lineNotify.url;
+//         if (typeof LINE_NOTIFY_URL !== 'string') {
+//             throw new factory.errors.Internal('Environment variable LINE_NOTIFY_URL not set');
+//         }
+//         let accessToken: string | undefined;
+//         switch (logLevel) {
+//             case 'error':
+//                 accessToken = credentials.lineNotify.accessTokenAlert;
+//                 break;
+//             case 'info':
+//                 accessToken = credentials.lineNotify.accessTokenInfo;
+//                 break;
+//             default:
+//                 accessToken = credentials.lineNotify.accessToken;
+//         }
+//         if (typeof accessToken !== 'string') {
+//             throw new factory.errors.Internal('credentials.lineNotify.accessToken not set');
+//         }
+//         const shortSubject = (subject.length > MAX_LINE_NOTIFY_SUBJECT_LENGTH)
+//             ? `${subject.slice(0, MAX_LINE_NOTIFY_SUBJECT_LENGTH)}...`
+//             : subject;
+//         const message: string = util.format(
+//             '\n%s\n%s\n%s\n%s\n%s\n\n%s',
+//             `[${logLevel}] ${shortSubject}`,
+//             `now:${(new Date()).toISOString()}`,
+//             `pid:${process.pid}`,
+//             `GAE_APPLICATION:${process.env.GAE_APPLICATION}`,
+//             // `GAE_INSTANCE:${process.env.GAE_INSTANCE}`,
+//             `GAE_SERVICE:${process.env.GAE_SERVICE}`,
+//             content
+//         );
+//         try {
+//             const form = new FormData();
+//             form.set('message', message);
+//             if (typeof imageThumbnail === 'string') {
+//                 form.set('imageThumbnail', imageThumbnail);
+//             }
+//             if (typeof imageFullsize === 'string') {
+//                 form.set('imageFullsize', imageFullsize);
+//             }
+//             const res = await fetch(
+//                 LINE_NOTIFY_URL,
+//                 {
+//                     method: 'POST',
+//                     headers: {
+//                         Authorization: `Bearer ${accessToken}`
+//                     },
+//                     body: form,
+//                     ...(typeof timeout === 'number')
+//                         ? { signal: AbortSignal.timeout(timeout) }
+//                         : undefined
+//                 }
+//             );
+//             let body: any;
+//             try {
+//                 body = await res.json();
+//             } catch (error) {
+//                 // no op
+//             }
+//             switch (res.status) {
+//                 case OK:
+//                     break;
+//                 default:
+//                     throw new factory.errors.Internal(`${res.status} ${body?.message}`);
+//             }
+//         } catch (err) {
+//             throw err;
+//         }
+//     };
 // }
-) {
-    return (__, credentials) => __awaiter(this, void 0, void 0, function* () {
-        const timeout = 10000;
-        const LINE_NOTIFY_URL = credentials.lineNotify.url;
-        if (typeof LINE_NOTIFY_URL !== 'string') {
-            throw new factory.errors.Internal('Environment variable LINE_NOTIFY_URL not set');
-        }
-        let accessToken;
-        switch (logLevel) {
-            case 'error':
-                accessToken = credentials.lineNotify.accessTokenAlert;
-                break;
-            case 'info':
-                accessToken = credentials.lineNotify.accessTokenInfo;
-                break;
-            default:
-                accessToken = credentials.lineNotify.accessToken;
-        }
-        if (typeof accessToken !== 'string') {
-            throw new factory.errors.Internal('credentials.lineNotify.accessToken not set');
-        }
-        const shortSubject = (subject.length > MAX_LINE_NOTIFY_SUBJECT_LENGTH)
-            ? `${subject.slice(0, MAX_LINE_NOTIFY_SUBJECT_LENGTH)}...`
-            : subject;
-        const message = util.format('\n%s\n%s\n%s\n%s\n%s\n\n%s', `[${logLevel}] ${shortSubject}`, `now:${(new Date()).toISOString()}`, `pid:${process.pid}`, `GAE_APPLICATION:${process.env.GAE_APPLICATION}`, 
-        // `GAE_INSTANCE:${process.env.GAE_INSTANCE}`,
-        `GAE_SERVICE:${process.env.GAE_SERVICE}`, content);
-        try {
-            const form = new FormData();
-            form.set('message', message);
-            if (typeof imageThumbnail === 'string') {
-                form.set('imageThumbnail', imageThumbnail);
-            }
-            if (typeof imageFullsize === 'string') {
-                form.set('imageFullsize', imageFullsize);
-            }
-            const res = yield fetch(LINE_NOTIFY_URL, Object.assign({ method: 'POST', headers: {
-                    Authorization: `Bearer ${accessToken}`
-                }, body: form }, (typeof timeout === 'number')
-                ? { signal: AbortSignal.timeout(timeout) }
-                : undefined));
-            let body;
-            try {
-                body = yield res.json();
-            }
-            catch (error) {
-                // no op
-            }
-            switch (res.status) {
-                case http_status_1.OK:
-                    break;
-                default:
-                    throw new factory.errors.Internal(`${res.status} ${body === null || body === void 0 ? void 0 : body.message}`);
-            }
-        }
-        catch (err) {
-            throw err;
-        }
-    });
-}
 const USERNAME_ARGUMENT_REQUIRED_MESSAGE = 'Missing required key \'Username\' in params';
 function triggerWebhook(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {

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

@@ -1,9 +1,7 @@
 import type { Connection } from 'mongoose';
 import type { RedisClientType } from 'redis';
-import { LINENotifyCredentials } from '../credentials/lineNotify';
 import { SendGridCredentials } from '../credentials/sendGrid';
 import * as factory from '../factory';
-import type { SettingRepo } from '../repo/setting';
 import type { IExecutableTask, IExecutableTaskKeys, TaskRepo } from '../repo/task';
 import { Settings } from '../settings';
 import { AggregationSettings } from '../settings/aggregation';
@@ -27,12 +25,6 @@ interface IExecuteOptions {
     executeById: boolean;
     executeByName: boolean;
 }
-type TaskOperation<T> = (repos: {
-    setting: SettingRepo;
-    task: TaskRepo;
-}, settings: Settings, credentials: {
-    lineNotify: LINENotifyCredentials;
-}) => Promise<T>;
 type IOperation<T> = (settings: IExecuteSettings) => Promise<T>;
 type IOperationExecute<T> = (settings: IExecuteSettings, options: IExecuteOptions) => Promise<T>;
 type ICallResult = void | Pick<factory.task.IExecutionResult, 'error'>;
@@ -72,9 +64,6 @@ declare function execute(task: IExecutableTask<factory.taskName>): IOperationExe
 /**
  * トライ可能回数が0に達したタスクを実行中止する
  */
-declare function notifyAbortedTasks(params: {
-    dateAbortedGte: Date;
-}): TaskOperation<void>;
 /**
  * add(2025-03-13~)
  */
@@ -85,4 +74,4 @@ declare function notifyAbortedTasksByEmail(params: {
 }, settings: Pick<Settings, "abortedTasksWithoutReport">, credentials: {
     sendGrid: SendGridCredentials;
 }) => Promise<void>;
-export { ICallResult, IExecutableTaskKeys, IOperationExecute, executeById, executeOneIfExists, execute, notifyAbortedTasks, notifyAbortedTasksByEmail };
+export { ICallResult, IExecutableTaskKeys, IOperationExecute, executeById, executeOneIfExists, execute, notifyAbortedTasksByEmail };

package/lib/chevre/service/task.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeById = executeById;
 exports.executeOneIfExists = executeOneIfExists;
 exports.execute = execute;
-exports.notifyAbortedTasks = notifyAbortedTasks;
 exports.notifyAbortedTasksByEmail = notifyAbortedTasksByEmail;
 /**
  * タスクサービス
@@ -199,27 +198,47 @@ let notification;
 //         }
 //     };
 // }
-function notifyAbortedTasks(params) {
-    return (repos, settings, credentials) => __awaiter(this, void 0, void 0, function* () {
-        const { abortedTasksWithoutReport } = settings;
-        const abortedTasks = yield repos.task.projectFields(Object.assign({ statuses: [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 });
-            yield notification.lineNotify({
-                subject: message.subject, content: message.content,
-                logLevel: 'error'
-            }
-            // { timeout, useFetchAPI }
-            )(undefined, credentials);
-        }
-    });
-}
+// function notifyAbortedTasks(params: {
+//     dateAbortedGte: Date;
+// }): TaskOperation<void> {
+//     return async (
+//         repos: {
+//             setting: SettingRepo;
+//             task: TaskRepo;
+//         },
+//         settings: Pick<Settings, 'abortedTasksWithoutReport'>,
+//         credentials: {
+//             lineNotify: LINENotifyCredentials;
+//         }
+//     ) => {
+//         const { abortedTasksWithoutReport } = settings;
+//         const abortedTasks = await repos.task.projectFields(
+//             {
+//                 statuses: [factory.taskStatus.Aborted],
+//                 dateAborted: { $gte: params.dateAbortedGte },
+//                 // 中止を報告しないタスク以外にフィルター
+//                 ...(abortedTasksWithoutReport.length > 0)
+//                     ? { name: { $nin: abortedTasksWithoutReport } }
+//                     : undefined
+//             },
+//             []
+//         );
+//         if (abortedTasks.length > 0) {
+//             if (notification === undefined) {
+//                 notification = await import('./notification');
+//             }
+//             // 開発者へ報告
+//             const message = tasks2lineNotify({ tasks: abortedTasks });
+//             await notification.lineNotify(
+//                 {
+//                     subject: message.subject, content: message.content,
+//                     logLevel: 'error'
+//                 }
+//                 // { timeout, useFetchAPI }
+//             )(undefined, credentials);
+//         }
+//     };
+// }
 /**
  * add(2025-03-13~)
  */

package/package.json

@@ -113,5 +113,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.9.0-alpha.83"
+  "version": "22.9.0-alpha.84"
 }

package/example/src/chevre/migratePaymentServiceChannelIds.ts

@@ -1,107 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-// const excludedProject = { id: String(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 paymentServiceRepo = await chevre.repository.PaymentService.createInstance(mongoose.connection);
-
-    const cursor = paymentServiceRepo.getCursor(
-        {
-            typeOf: {
-                $in: [
-                    chevre.factory.service.paymentService.PaymentServiceType.CreditCard,
-                    chevre.factory.service.paymentService.PaymentServiceType.MovieTicket
-                ]
-            }
-            // _id: { $eq: '5f9a4fed4f3709000abe6415' }
-        },
-        {
-            _id: 1,
-            availableChannel: 1,
-            productID: 1,
-            project: 1,
-            typeOf: 1
-        }
-    );
-    console.log('docs found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const paymentService: Pick<
-            chevre.factory.service.paymentService.IService,
-            'availableChannel' | 'id' | 'productID' | 'project' | 'typeOf'
-        > = doc.toObject();
-
-        console.log(
-            'alreadyMigrated?', paymentService.project.id, paymentService.productID, i);
-        if (typeof paymentService.id !== 'string') {
-            throw new Error('id must be string');
-        }
-
-        let alreadyMigrated = false;
-        try {
-            const channelId = paymentService.availableChannel?.id;
-            if (typeof channelId === 'string' && channelId !== '') {
-                if (paymentService.typeOf === chevre.factory.service.paymentService.PaymentServiceType.CreditCard) {
-                    const existingChannel = await paymentServiceRepo.findAvailableChannelCreditCard({
-                        project: { id: paymentService.project.id },
-                        id: paymentService.id
-                    });
-                    if (typeof existingChannel.id === 'string'
-                        && existingChannel.id === channelId) {
-                        alreadyMigrated = true;
-                    }
-                } else if (paymentService.typeOf === chevre.factory.service.paymentService.PaymentServiceType.MovieTicket) {
-                    const existingChannel = await paymentServiceRepo.findAvailableChannelMovieTicket({
-                        project: { id: paymentService.project.id },
-                        id: paymentService.id
-                    });
-                    if (typeof existingChannel.id === 'string'
-                        && existingChannel.id === channelId) {
-                        alreadyMigrated = true;
-                    }
-                } else {
-                    throw new Error('invalid paymentServiceType');
-                }
-            }
-        } catch (error) {
-            // no op
-        }
-
-        if (alreadyMigrated) {
-            console.log(
-                'already migrated.', paymentService.project.id, paymentService.productID, i);
-        } else {
-            if (paymentService.typeOf === chevre.factory.service.paymentService.PaymentServiceType.CreditCard
-                || paymentService.typeOf === chevre.factory.service.paymentService.PaymentServiceType.MovieTicket) {
-                // await paymentServiceRepo.migrateChannelId({
-                //     project: { id: paymentService.project.id },
-                //     id: paymentService.id,
-                //     typeOf: paymentService.typeOf
-                // });
-                updateCount += 1;
-                console.log(
-                    'updated.',
-                    paymentService.project.id, paymentService.productID, i);
-            } else {
-                throw new Error('invalid paymentServiceType');
-            }
-        }
-    });
-
-    console.log(i, 'docs checked');
-    console.log(updateCount, 'docs updated');
-}
-
-main()
-    .then()
-    .catch(console.error);