@chevre/domain 20.2.0-alpha.30 → 20.2.0-alpha.31

package/example/src/chevre/aggregation/aggregateSystem.ts

@@ -23,31 +23,31 @@ async function main() {
     })
         .exec();
 
-    await chevre.service.aggregation.system.aggregateEvent({
+    await chevre.service.aggregation.system.aggregatePayTransaction({
         aggregationDays: AGGREGATE_DAYS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({
         agregation: aggregationRepo,
-        event: eventRepo
+        assetTransaction: assetTransactionRepo
     });
 
-    await chevre.service.aggregation.system.aggregateTask({
+    await chevre.service.aggregation.system.aggregateEvent({
         aggregationDays: AGGREGATE_DAYS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({
         agregation: aggregationRepo,
-        task: taskRepo
+        event: eventRepo
     });
 
-    await chevre.service.aggregation.system.aggregateReserveTransaction({
+    await chevre.service.aggregation.system.aggregateTask({
         aggregationDays: AGGREGATE_DAYS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({
         agregation: aggregationRepo,
-        assetTransaction: assetTransactionRepo
+        task: taskRepo
     });
 
-    await chevre.service.aggregation.system.aggregatePayTransaction({
+    await chevre.service.aggregation.system.aggregateReserveTransaction({
         aggregationDays: AGGREGATE_DAYS,
         excludedProjectId: EXCLUDED_PROJECT_ID
     })({

package/example/src/chevre/searchEvents.ts

@@ -1,5 +1,4 @@
 // tslint:disable:no-console
-import * as moment from 'moment';
 import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';

package/example/src/chevre/updateTransaction.ts

@@ -0,0 +1,38 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const transactionRepo = new chevre.repository.Transaction(mongoose.connection);
+    const transactionId = '63ce4d501c45c2000bdb2f9d';
+    let update = {
+        'object.modifiedTime': new Date()
+    };
+
+    let now = moment();
+    await transactionRepo.findByIdAndUpdate({
+        id: transactionId,
+        update
+    });
+    console.log(moment()
+        .diff(now));
+
+    update = {
+        'object.modifiedTime': new Date()
+    };
+    now = moment();
+    // await transactionRepo.updateById({
+    //     id: transactionId,
+    //     update
+    // });
+    console.log(moment()
+        .diff(now));
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -89,7 +89,7 @@ export declare class MongoRepository {
         authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
         result: factory.transaction.IResult<T>;
         potentialActions: factory.transaction.IPotentialActions<T>;
-    }): Promise<factory.transaction.ITransaction<T>>;
+    }): Promise<void>;
     /**
      * タスク未エクスポートの取引をひとつ取得してエクスポートを開始する
      */
@@ -128,7 +128,7 @@ export declare class MongoRepository {
     cancel<T extends factory.transactionType>(params: {
         typeOf: T;
         id: string;
-    }): Promise<factory.transaction.ITransaction<T>>;
+    }): Promise<void>;
     count<T extends factory.transactionType>(params: factory.transaction.ISearchConditions<T>): Promise<number>;
     /**
      * 取引を検索する
@@ -137,10 +137,15 @@ export declare class MongoRepository {
     /**
      * 特定の取引を更新する(汎用)
      */
-    findByIdAndUpdate<T extends factory.transactionType>(params: {
+    findByIdAndUpdate(params: {
         id: string;
-        update: any;
-    }): Promise<factory.transaction.ITransaction<T>>;
+        update: {
+            $set?: any;
+            $unset?: any;
+            $pull?: any;
+            $push?: any;
+        };
+    }): Promise<void>;
     saveOrderNumberIfNotExist(params: {
         id: string;
         orderNumber: string;

package/lib/chevre/repo/transaction.js

@@ -313,6 +313,8 @@ class MongoRepository {
                 status: factory.transactionStatusType.InProgress
             }, {
                 $set: Object.assign(Object.assign({ 'agent.id': params.agent.id }, (typeof params.agent.name === 'string') ? { 'agent.name': params.agent.name } : undefined), (typeof ((_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.customer) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { 'object.customer': params.object.customer } : undefined)
+            }, {
+                projection: { _id: 1 }
             })
                 .exec();
             if (doc === null) {
@@ -333,6 +335,8 @@ class MongoRepository {
                 $set: {
                     expires: params.expires
                 }
+            }, {
+                projection: { _id: 1 }
             })
                 .exec();
             if (doc === null) {
@@ -353,6 +357,8 @@ class MongoRepository {
                 status: factory.transactionStatusType.InProgress
             }, {
                 $set: Object.assign({}, (typeof ((_a = params.object) === null || _a === void 0 ? void 0 : _a.name) === 'string') ? { 'object.name': params.object.name } : undefined)
+            }, {
+                projection: { _id: 1 }
             })
                 .exec();
             if (doc === null) {
@@ -375,7 +381,10 @@ class MongoRepository {
                 'object.authorizeActions': params.authorizeActions,
                 result: params.result,
                 potentialActions: params.potentialActions // resultを更新
-            }, { new: true })
+            }, {
+                new: true,
+                projection: { _id: 1 }
+            })
                 .exec();
             // NotFoundであれば取引状態確認
             if (doc === null) {
@@ -384,7 +393,7 @@ class MongoRepository {
                 /* istanbul ignore next */
                 if (transaction.status === factory.transactionStatusType.Confirmed) {
                     // すでに確定済の場合
-                    return transaction;
+                    return;
                     // tslint:disable-next-line:no-single-line-block-comment
                     /* istanbul ignore next */
                 }
@@ -402,7 +411,7 @@ class MongoRepository {
                     throw new factory.errors.NotFound(this.transactionModel.modelName);
                 }
             }
-            return doc.toObject();
+            // return doc.toObject();
         });
     }
     /**
@@ -485,7 +494,10 @@ class MongoRepository {
             }, {
                 status: factory.transactionStatusType.Canceled,
                 endDate: endDate
-            }, { new: true })
+            }, {
+                new: true,
+                projection: { _id: 1 }
+            })
                 .exec();
             // NotFoundであれば取引状態確認
             if (doc === null) {
@@ -494,7 +506,7 @@ class MongoRepository {
                 /* istanbul ignore next */
                 if (transaction.status === factory.transactionStatusType.Canceled) {
                     // すでに中止済の場合
-                    return transaction;
+                    return;
                 }
                 else if (transaction.status === factory.transactionStatusType.Expired) {
                     throw new factory.errors.Argument('Transaction id', 'Transaction already expired');
@@ -506,7 +518,7 @@ class MongoRepository {
                     throw new factory.errors.NotFound(this.transactionModel.modelName);
                 }
             }
-            return doc.toObject();
+            // return doc.toObject();
         });
     }
     count(params) {
@@ -542,43 +554,26 @@ class MongoRepository {
                 .then((docs) => docs.map((doc) => doc.toObject()));
         });
     }
-    // public stream<T extends factory.transactionType>(
-    //     params: factory.transaction.ISearchConditions<T>
-    // ): QueryCursor<Document> {
-    //     const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-    //     const query = this.transactionModel.find((conditions.length > 0) ? { $and: conditions } : {})
-    //         .select({ __v: 0, createdAt: 0, updatedAt: 0 });
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (params.limit !== undefined && params.page !== undefined) {
-    //         query.limit(params.limit)
-    //             .skip(params.limit * (params.page - 1));
-    //     }
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (params.sort !== undefined) {
-    //         query.sort(params.sort);
-    //     }
-    //     return query.cursor();
-    // }
     /**
      * 特定の取引を更新する(汎用)
      */
     findByIdAndUpdate(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.transactionModel.findOneAndUpdate({ _id: params.id }, params.update, { new: true })
+            yield this.transactionModel.findOneAndUpdate({ _id: params.id }, params.update, {
+                // new: true,
+                projection: { _id: 1 }
+            })
                 .exec()
                 .then((doc) => {
                 if (doc === null) {
                     throw new factory.errors.ArgumentNull(this.transactionModel.modelName);
                 }
-                return doc.toObject();
             });
         });
     }
     saveOrderNumberIfNotExist(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.transactionModel.findOneAndUpdate({
+            yield this.transactionModel.updateOne({
                 _id: params.id,
                 'object.orderNumber': { $exists: false }
             }, { 'object.orderNumber': params.orderNumber })
@@ -587,7 +582,7 @@ class MongoRepository {
     }
     saveConfirmationNumberIfNotExist(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.transactionModel.findOneAndUpdate({
+            yield this.transactionModel.updateOne({
                 _id: params.id,
                 'object.confirmationNumber': { $exists: false }
             }, { 'object.confirmationNumber': params.confirmationNumber })

package/lib/chevre/service/payment/any.js

@@ -189,7 +189,7 @@ function publishPaymentUrl(params) {
         };
         yield repos.transaction.findByIdAndUpdate({
             id: transaction.id,
-            update: { 'object.paymentMethods': paymentMethodByPaymentUrl }
+            update: { $set: { 'object.paymentMethods': paymentMethodByPaymentUrl } }
         });
         return result;
     });

package/lib/chevre/service/transaction/placeOrderInProgress.js

@@ -68,13 +68,13 @@ exports.start = start;
  */
 function confirm(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         // 確認番号を事前発行
         yield publishConfirmationNumberIfNotExist({
             id: params.id,
             object: { orderDate: params.result.order.orderDate }
         })(repos);
-        let transaction = yield repos.transaction.findById({
+        const transaction = yield repos.transaction.findById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.id
         });
@@ -121,7 +121,7 @@ function confirm(params) {
         });
         // ステータス変更
         try {
-            transaction = yield repos.transaction.confirm({
+            yield repos.transaction.confirm({
                 typeOf: transaction.typeOf,
                 id: transaction.id,
                 authorizeActions: transaction.object.authorizeActions,
@@ -140,10 +140,10 @@ function confirm(params) {
             throw error;
         }
         // 万が一処理が想定通りでない場合orderNumberが存在しない
-        if (typeof ((_b = transaction.result) === null || _b === void 0 ? void 0 : _b.order.typeOf) !== 'string') {
-            throw new factory.errors.ServiceUnavailable('transaction.result not found');
-        }
-        return transaction.result;
+        // if (typeof transaction.result?.order.typeOf !== 'string') {
+        //     throw new factory.errors.ServiceUnavailable('transaction.result not found');
+        // }
+        return result;
     });
 }
 exports.confirm = confirm;

package/lib/chevre/service/transaction/returnOrder.js

@@ -306,7 +306,7 @@ function validateAppliedReturnPolicy(params) {
 function confirm(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        let transaction = yield repos.transaction.findById({ typeOf: factory.transactionType.ReturnOrder, id: params.id });
+        const transaction = yield repos.transaction.findById({ typeOf: factory.transactionType.ReturnOrder, id: params.id });
         if (transaction.status === factory.transactionStatusType.Confirmed) {
             // すでに確定済の場合
             return transaction.result;
@@ -356,14 +356,14 @@ function confirm(params) {
             // useConfirmRefund: params.useConfirmRefund
         });
         // ステータス変更
-        transaction = yield repos.transaction.confirm({
+        yield repos.transaction.confirm({
             typeOf: transaction.typeOf,
             id: transaction.id,
             authorizeActions: [],
             result: result,
             potentialActions: potentialActions
         });
-        return transaction.result;
+        return result;
     });
 }
 exports.confirm = confirm;

package/package.json

@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.2.0-alpha.30"
+  "version": "20.2.0-alpha.31"
 }