@chevre/domain 20.14.0 → 21.0.0-alpha.1

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

@@ -1,3 +1,27 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
 /**
@@ -37,5 +61,5 @@ export declare class MongoRepository {
     deleteById(params: {
         id: string;
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
 }

package/lib/chevre/repo/project.js

@@ -17,7 +17,7 @@ const factory = require("../factory");
  */
 class MongoRepository {
     constructor(connection) {
-        this.projectModel = connection.model(project_1.modelName);
+        this.projectModel = connection.model(project_1.modelName, project_1.schema);
     }
     static CREATE_MONGO_CONDITIONS(params) {
         // MongoDB検索条件
@@ -75,6 +75,7 @@ class MongoRepository {
      * プロジェクト検索
      */
     search(conditions, projection) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = MongoRepository.CREATE_MONGO_CONDITIONS(conditions);
             const query = this.projectModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
@@ -85,8 +86,8 @@ class MongoRepository {
             }
             // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
-            if (conditions.sort !== undefined) {
-                query.sort(conditions.sort);
+            if (((_a = conditions.sort) === null || _a === void 0 ? void 0 : _a._id) !== undefined) {
+                query.sort({ _id: conditions.sort._id });
             }
             return query.setOptions({ maxTimeMS: 10000 })
                 .exec()

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

@@ -114,5 +114,5 @@ export declare class MongoRepository {
             $in: string[];
         };
     }): Promise<string[]>;
-    deleteReservedTicketUnderName(): Promise<UpdateWriteOpResult>;
+    deleteReservedTicketUnderName(): Promise<import("mongodb").UpdateResult>;
 }

package/lib/chevre/repo/reservation.js

@@ -857,6 +857,7 @@ class MongoRepository {
      * 予約検索
      */
     search(params, projection) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
             const query = this.reservationModel.find((conditions.length > 0) ? { $and: conditions } : {}, (projection !== undefined && projection !== null)
@@ -873,8 +874,8 @@ class MongoRepository {
             }
             // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
-            if (params.sort !== undefined) {
-                query.sort(params.sort);
+            if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.modifiedTime) !== undefined) {
+                query.sort({ modifiedTime: params.sort.modifiedTime });
             }
             return query.setOptions({ maxTimeMS: 10000 })
                 .exec()
@@ -1165,9 +1166,9 @@ class MongoRepository {
                 .exec()
                 .then((result) => {
                 return {
-                    n: result === null || result === void 0 ? void 0 : result.n,
+                    // n: result?.n,
                     // opTime: result.opTime,
-                    ok: result === null || result === void 0 ? void 0 : result.ok,
+                    // ok: result?.ok,
                     // operationTime,
                     deletedCount: result === null || result === void 0 ? void 0 : result.deletedCount
                 };

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

@@ -1,3 +1,27 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose/types/inferschematype" />
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
 export declare type ISeller = factory.seller.ISeller;
@@ -40,5 +64,5 @@ export declare class MongoRepository {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
 }

package/lib/chevre/repo/seller.js

@@ -168,6 +168,7 @@ class MongoRepository {
      * 販売者検索
      */
     search(conditions, projection) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = MongoRepository.CREATE_MONGO_CONDITIONS(conditions);
             const query = this.organizationModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
@@ -178,8 +179,8 @@ class MongoRepository {
             }
             // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
-            if (conditions.sort !== undefined) {
-                query.sort(conditions.sort);
+            if (((_a = conditions.sort) === null || _a === void 0 ? void 0 : _a.branchCode) !== undefined) {
+                query.sort({ branchCode: conditions.sort.branchCode });
             }
             return query.setOptions({ maxTimeMS: 10000 })
                 .exec()

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

@@ -32,5 +32,5 @@ export declare class MongoRepository {
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;
-    }): Promise<import("mongoose").UpdateWriteOpResult>;
+    }): Promise<import("mongodb").UpdateResult>;
 }

package/lib/chevre/repo/serviceOutput.js

@@ -125,9 +125,9 @@ class MongoRepository {
             }
             // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
-            if (params.sort !== undefined) {
-                query.sort(params.sort);
-            }
+            // if (params.sort !== undefined) {
+            //     query.sort(params.sort);
+            // }
             return query.setOptions({ maxTimeMS: 10000 })
                 .exec()
                 .then((docs) => docs.map((doc) => doc.toObject()));

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

@@ -24,7 +24,9 @@ export declare class MongoRepository {
     readonly taskModel: typeof Model;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.task.ISearchConditions): any[];
-    saveMany(taskAttributes: factory.task.IAttributes<factory.taskName>[]): Promise<any[]>;
+    saveMany(taskAttributes: factory.task.IAttributes<factory.taskName>[]): Promise<{
+        id: string;
+    }[]>;
     createInformTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.TriggerWebhook>): Promise<void>;
     executeOneByName<T extends factory.taskName>(params: {
         name: T;
@@ -58,12 +60,7 @@ export declare class MongoRepository {
     }): Promise<void>;
     deleteByName(params: {
         name: factory.taskName;
-    }): Promise<{
-        ok?: number | undefined;
-        n?: number | undefined;
-    } & {
-        deletedCount?: number | undefined;
-    }>;
+    }): Promise<import("mongodb").DeleteResult>;
     aggregateTask(params: {
         project?: {
             id?: {

package/lib/chevre/repo/task.js

@@ -17,8 +17,8 @@ const task_1 = require("./mongoose/model/task");
  * タスク実行時のソート条件
  */
 const sortOrder4executionOfTasks = {
-    numberOfTried: 1,
-    runsAt: 1 // 実行予定日時の早さ優先
+    numberOfTried: factory.sortType.Ascending,
+    runsAt: factory.sortType.Ascending // 実行予定日時の早さ優先
 };
 /**
  * タスクリポジトリ
@@ -156,7 +156,11 @@ class MongoRepository {
                 if (result.insertedCount !== taskAttributes.length) {
                     throw new factory.errors.ServiceUnavailable('all tasks not saved');
                 }
-                return result.ops;
+                // return result.ops;
+                return Object.values(result.insertedIds)
+                    .map((objectId) => {
+                    return { id: objectId.toHexString() };
+                });
             }
             else {
                 return [];
@@ -301,6 +305,7 @@ class MongoRepository {
      * 検索する
      */
     search(params, projection) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
             const query = this.taskModel.find((conditions.length > 0) ? { $and: conditions } : {}, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
@@ -311,8 +316,8 @@ class MongoRepository {
             }
             // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
-            if (params.sort !== undefined) {
-                query.sort(params.sort);
+            if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.runsAt) !== undefined) {
+                query.sort({ runsAt: params.sort.runsAt });
             }
             return query.setOptions({ maxTimeMS: 10000 })
                 .exec()

package/lib/chevre/repo/transaction.js

@@ -569,6 +569,7 @@ class MongoRepository {
      * 取引を検索する
      */
     search(params) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
             let projection = {};
@@ -598,8 +599,8 @@ class MongoRepository {
             }
             // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
-            if (params.sort !== undefined) {
-                query.sort(params.sort);
+            if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.startDate) !== undefined) {
+                query.sort({ startDate: params.sort.startDate });
             }
             // const explainResult = await (<any>query).explain();
             // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));

package/lib/chevre/service/assetTransaction/cancelReservation.d.ts

@@ -32,4 +32,6 @@ export declare function startAndConfirm(params: factory.assetTransaction.cancelR
  */
 export declare function exportTasksById(params: {
     id: string;
-}): ITaskAndTransactionOperation<factory.task.ITask<factory.taskName>[]>;
+}): ITaskAndTransactionOperation<{
+    id: string;
+}[]>;

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

@@ -46,4 +46,6 @@ export declare function exportTasksById(params: {
      * タスク実行日時バッファ
      */
     runsTasksAfterInSeconds?: number;
-}): ITaskAndTransactionOperation<factory.task.ITask<factory.taskName>[]>;
+}): ITaskAndTransactionOperation<{
+    id: string;
+}[]>;

package/lib/chevre/service/assetTransaction/pay.d.ts

@@ -117,7 +117,9 @@ export declare function exportTasksById(params: {
      * タスク実行日時バッファ
      */
     runsTasksAfterInSeconds?: number;
-}): IExportTasksOperation<factory.task.ITask<factory.taskName>[]>;
+}): IExportTasksOperation<{
+    id: string;
+}[]>;
 /**
  * 決済代行取引参照
  */

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

@@ -43,4 +43,6 @@ export declare function exportTasksById(params: {
      * タスク実行日時バッファ
      */
     runsTasksAfterInSeconds?: number;
-}): IExportTasksOperation<factory.task.ITask<factory.taskName>[]>;
+}): IExportTasksOperation<{
+    id: string;
+}[]>;

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

@@ -46,4 +46,6 @@ export declare function cancel(params: {
  */
 export declare function exportTasksById(params: {
     id: string;
-}): IExportTasksOperation<factory.task.ITask<factory.taskName>[]>;
+}): IExportTasksOperation<{
+    id: string;
+}[]>;

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

@@ -111,5 +111,7 @@ export declare function cancel(params: {
  */
 export declare function exportTasksById(params: {
     id: string;
-}): ITaskAndTransactionOperation<factory.task.ITask<factory.taskName>[]>;
+}): ITaskAndTransactionOperation<{
+    id: string;
+}[]>;
 export {};

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

@@ -33,4 +33,6 @@ export declare function exportTasks<T extends factory.assetTransactionType>(para
     project: ProjectRepo;
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
-}) => Promise<(import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/deleteAssetTransaction").ITask | import("@chevre/factory/lib/task/deleteOrder").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/deleteMember").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/orderProgramMembership").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask)[] | undefined>;
+}) => Promise<{
+    id: string;
+}[] | undefined>;

package/lib/chevre/service/assetTransaction.js

@@ -39,41 +39,41 @@ function exportTasks(params) {
         if (transaction === null) {
             return;
         }
-        let tasks = [];
+        let createdTasks = [];
         // 失敗してもここでは戻さない(RUNNINGのまま待機)
         switch (transaction.typeOf) {
             case factory.assetTransactionType.CancelReservation:
-                tasks = yield CancelReservationTransactionService.exportTasksById({
+                createdTasks = yield CancelReservationTransactionService.exportTasksById({
                     id: transaction.id
                     // runsTasksAfterInSeconds: params.runsTasksAfterInSeconds
                 })(repos);
                 break;
             case factory.assetTransactionType.MoneyTransfer:
-                tasks = yield MoneyTransferTransactionService.exportTasksById({
+                createdTasks = yield MoneyTransferTransactionService.exportTasksById({
                     id: transaction.id,
                     runsTasksAfterInSeconds: params.runsTasksAfterInSeconds
                 })(repos);
                 break;
             case factory.assetTransactionType.Pay:
-                tasks = yield PayTransactionService.exportTasksById({
+                createdTasks = yield PayTransactionService.exportTasksById({
                     id: transaction.id,
                     runsTasksAfterInSeconds: params.runsTasksAfterInSeconds
                 })(repos);
                 break;
             case factory.assetTransactionType.Refund:
-                tasks = yield RefundTransactionService.exportTasksById({
+                createdTasks = yield RefundTransactionService.exportTasksById({
                     id: transaction.id,
                     runsTasksAfterInSeconds: params.runsTasksAfterInSeconds
                 })(repos);
                 break;
             case factory.assetTransactionType.RegisterService:
-                tasks = yield RegisterServiceTransactionService.exportTasksById({
+                createdTasks = yield RegisterServiceTransactionService.exportTasksById({
                     id: transaction.id
                     // runsTasksAfterInSeconds: params.runsTasksAfterInSeconds
                 })(repos);
                 break;
             case factory.assetTransactionType.Reserve:
-                tasks = yield ReserveTransactionService.exportTasksById({
+                createdTasks = yield ReserveTransactionService.exportTasksById({
                     id: transaction.id
                     // runsTasksAfterInSeconds: params.runsTasksAfterInSeconds
                 })(repos);
@@ -81,7 +81,7 @@ function exportTasks(params) {
             default:
         }
         yield repos.assetTransaction.setTasksExportedById({ id: transaction.id });
-        return tasks;
+        return createdTasks;
     });
 }
 exports.exportTasks = exportTasks;

package/lib/chevre/service/payment/any/onPaid.d.ts

@@ -12,5 +12,7 @@ declare function onPaid(payAction: factory.action.trade.pay.IAction): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     task: TaskRepo;
-}) => Promise<any[]>;
+}) => Promise<{
+    id: string;
+}[]>;
 export { onPaid };

package/lib/chevre/service/payment/any/onRefund.d.ts

@@ -12,5 +12,7 @@ declare function onRefund(refundAction: factory.action.trade.refund.IAction): (r
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     task: TaskRepo;
-}) => Promise<any[]>;
+}) => Promise<{
+    id: string;
+}[]>;
 export { onRefund };

package/lib/chevre/service/reserve/cancelReservation.js

@@ -129,9 +129,11 @@ function cancelPendingReservation(actionAttributesList) {
                 // アクション完了
                 const actionResult = Object.assign({}, (cancelResult !== undefined) ? {
                     cancelResult: {
-                        n: cancelResult.n,
-                        nModified: cancelResult.nModified,
-                        ok: cancelResult.ok
+                        // n: cancelResult.n,
+                        // nModified: cancelResult.nModified,
+                        // ok: cancelResult.ok,
+                        matchedCount: cancelResult.matchedCount,
+                        modifiedCount: cancelResult.modifiedCount
                     }
                 } : undefined
                 // canceledReservationId: canceledReservation?.id
@@ -272,9 +274,11 @@ function cancelReservation(actionAttributesList) {
                 }
                 const actionResult = Object.assign({}, (cancelResult !== undefined) ? {
                     cancelResult: {
-                        n: cancelResult.n,
-                        nModified: cancelResult.nModified,
-                        ok: cancelResult.ok
+                        // n: cancelResult.n,
+                        // nModified: cancelResult.nModified,
+                        // ok: cancelResult.ok
+                        matchedCount: cancelResult.matchedCount,
+                        modifiedCount: cancelResult.modifiedCount
                     }
                 } : undefined
                 // canceledReservationId: canceledReservation?.id

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.309.0",
+    "@chevre/factory": "4.309.1",
     "@cinerino/sdk": "3.153.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -61,7 +61,7 @@
     "csvtojson": "^2.0.10",
     "googleapis": "^85.0.0",
     "mocha": "^5.2.0",
-    "mongoose": "5.13.14",
+    "mongoose": "6.10.4",
     "nock": "^9.6.1",
     "nyc": "^15.1.0",
     "power-assert": "^1.6.1",
@@ -77,7 +77,7 @@
     "typescript": "^4.8.4"
   },
   "peerDependencies": {
-    "mongoose": "^5.5.0",
+    "mongoose": "^6.0.0",
     "redis": "^3.1.2"
   },
   "engines": {
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.14.0"
+  "version": "21.0.0-alpha.1"
 }

package/example/src/chevre/retryTasks.ts

@@ -1,69 +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) };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const taskRepo = new chevre.repository.Task(mongoose.connection);
-
-    const cursor = taskRepo.taskModel.find(
-        {
-            // _id: { $eq: 'xxxx' },
-            'project.id': { $eq: project.id },
-            status: { $in: [chevre.factory.taskStatus.Aborted] },
-            name: { $eq: chevre.factory.taskName.VoidRegisterServiceTransaction },
-            runsAt: {
-                $gt: moment()
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(-2, 'days')
-                    .toDate()
-            }
-        },
-        {
-            // _id: 1,
-        }
-    )
-        // .limit(10)
-        .sort({ runsAt: chevre.factory.sortType.Ascending })
-        .cursor();
-    console.log('tasks found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const task = <chevre.factory.task.ITask<any>>doc.toObject();
-
-        console.log('retrying...', task.id, task.name, task.runsAt, task.project.id);
-        await taskRepo.taskModel.findByIdAndUpdate(
-            task.id,
-            {
-                status: chevre.factory.taskStatus.Ready,
-                remainingNumberOfTries: task.remainingNumberOfTries + 1
-            }
-        )
-            .exec();
-        updateCount += 1;
-    });
-
-    console.log(i, 'tasks checked');
-    console.log(updateCount, 'tasks updated');
-}
-
-main()
-    .then()
-    .catch(console.error);
-// setInterval(
-//     () => {
-//         main()
-//             .then()
-//             .catch(console.error);
-//     },
-//     // tslint:disable-next-line:no-magic-numbers
-//     60000
-// );