@chevre/domain 21.0.0-alpha.7 → 21.0.0-alpha.9

package/lib/chevre/repo/transaction.js

@@ -9,17 +9,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MongoRepository = exports.modelName = void 0;
+exports.MongoRepository = void 0;
 const moment = require("moment");
 const factory = require("../factory");
-const transaction_1 = require("./mongoose/model/transaction");
-Object.defineProperty(exports, "modelName", { enumerable: true, get: function () { return transaction_1.modelName; } });
+const onIndexCreated_1 = require("./mongoose/onIndexCreated");
+const transaction_1 = require("./mongoose/schemas/transaction");
 /**
  * 取引リポジトリ
  */
 class MongoRepository {
     constructor(connection) {
         this.transactionModel = connection.model(transaction_1.modelName, transaction_1.schema);
+        if (connection.get('autoIndex') === true) {
+            this.transactionModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
+        }
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
@@ -592,8 +595,8 @@ class MongoRepository {
             }
             const query = this.transactionModel.find((conditions.length > 0) ? { $and: conditions } : {})
                 .select(projection);
-            if (typeof params.limit === 'number') {
-                const page = (typeof params.page === 'number') ? params.page : 1;
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
                 query.limit(params.limit)
                     .skip(params.limit * (page - 1));
             }

package/lib/chevre/repo/trip.js

@@ -22,13 +22,17 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
 const factory = require("../factory");
-const trip_1 = require("./mongoose/model/trip");
+const onIndexCreated_1 = require("./mongoose/onIndexCreated");
+const trip_1 = require("./mongoose/schemas/trip");
 /**
  * トリップリポジトリ
  */
 class MongoRepository {
     constructor(connection) {
         this.tripModel = connection.model(trip_1.modelName, trip_1.schema);
+        if (connection.get('autoIndex') === true) {
+            this.tripModel.on(onIndexCreated_1.INDEX_EVENT, onIndexCreated_1.onIndexCreated);
+        }
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(conditions) {
@@ -175,8 +179,8 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
             const query = this.tripModel.find({ $and: conditions }, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
-            if (typeof params.limit === 'number') {
-                const page = (typeof params.page === 'number') ? params.page : 1;
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
                 query.limit(params.limit)
                     .skip(params.limit * (page - 1));
             }

package/lib/chevre/service/accountTransaction/deposit.js

@@ -45,11 +45,6 @@ function start(params) {
             transaction = yield repos.accountTransaction.startByIdentifier(startParams);
         }
         catch (error) {
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore next */
-            if (error.name === 'MongoError') {
-                // no op
-            }
             throw error;
         }
         const pendingTransaction = {

package/lib/chevre/service/accountTransaction/transfer.js

@@ -70,11 +70,6 @@ function start(params) {
             transaction = yield repos.accountTransaction.startByIdentifier(startParams);
         }
         catch (error) {
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore next */
-            if (error.name === 'MongoError') {
-                // no op
-            }
             throw error;
         }
         const pendingTransaction = {

package/lib/chevre/service/accountTransaction/withdraw.js

@@ -52,11 +52,6 @@ function start(params) {
             transaction = yield repos.accountTransaction.startByIdentifier(startParams);
         }
         catch (error) {
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore next */
-            if (error.name === 'MongoError') {
-                // no op
-            }
             throw error;
         }
         const pendingTransaction = {

package/lib/chevre/service/assetTransaction/moneyTransfer.js

@@ -87,11 +87,6 @@ function start(params) {
             // });
         }
         catch (error) {
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore next */
-            if (error.name === 'MongoError') {
-                // no op
-            }
             throw error;
         }
         return transaction;

package/lib/chevre/service/assetTransaction/refund.js

@@ -68,11 +68,6 @@ function start(params) {
             }
         }
         catch (error) {
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore next */
-            if (error.name === 'MongoError') {
-                // no op
-            }
             throw error;
         }
         return transaction;

package/lib/chevre/service/assetTransaction/registerService.js

@@ -71,11 +71,6 @@ function start(params) {
             transaction = yield repos.assetTransaction.start(startParams);
         }
         catch (error) {
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore next */
-            if (error.name === 'MongoError') {
-                // no op
-            }
             throw error;
         }
         // 必要あれば在庫確認など

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

@@ -61,11 +61,6 @@ function start(params) {
             transaction = yield repos.assetTransaction.start(startParams);
         }
         catch (error) {
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore next */
-            if (error.name === 'MongoError') {
-                // no op
-            }
             throw error;
         }
         // 指定があれば予約追加
@@ -160,11 +155,6 @@ function addReservations(params) {
                     yield (0, cancelReservation_1.processUnlockOfferRateLimit)({ reservation, reservationFor })(repos);
                 })));
             }
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore next */
-            if (error.name === 'MongoError') {
-                // no op
-            }
             throw error;
         }
         // 座席指定でも座席ロック

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

@@ -48,11 +48,6 @@ function start(params) {
             yield authorizePaymentCard({ transaction })(repos);
         }
         catch (error) {
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore next */
-            if (error.name === 'MongoError') {
-                // no op
-            }
             throw error;
         }
         return transaction;

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

@@ -57,7 +57,7 @@ function start(params) {
             transaction = yield repos.transaction.start(startParams);
         }
         catch (error) {
-            if (error.name === 'MongoError') {
+            if ((0, errorHandler_1.isMongoError)(error)) {
                 // no op
             }
             throw error;
@@ -132,7 +132,7 @@ function confirm(params) {
             });
         }
         catch (error) {
-            if (error.name === 'MongoError') {
+            if ((0, errorHandler_1.isMongoError)(error)) {
                 // 万が一同一注文番号で確定しようとすると、MongoDBでE11000 duplicate key errorが発生する
                 // message: 'E11000 duplicate key error collection: prodttts.transactions index:result.order.orderNumber_1 dup key:...',
                 if (error.code === errorHandler_1.MongoErrorCode.DuplicateKey) {

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

@@ -81,7 +81,7 @@ function start(params) {
             returnOrderTransaction = yield repos.transaction.start(returnOrderAttributes);
         }
         catch (error) {
-            if (error.name === 'MongoError') {
+            if ((0, errorHandler_1.isMongoError)(error)) {
                 // 同一取引に対して返品取引を作成しようとすると、MongoDBでE11000 duplicate key errorが発生する
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */

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": "21.0.0-alpha.7"
+  "version": "21.0.0-alpha.9"
 }