@chevre/domain 21.4.0-alpha.33 → 21.4.0-alpha.34

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

@@ -31,9 +31,11 @@ export declare class MongoRepository {
     private readonly projectModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.project.ISearchConditions): any[];
-    findById(conditions: {
+    findById(params: {
         id: string;
-    }, projection?: any): Promise<factory.project.IProject>;
+        inclusion: string[];
+        exclusion: string[];
+    }): Promise<factory.project.IProject>;
     findAlternateNameById(params: {
         id: string;
     }): Promise<Pick<factory.project.IProject, 'alternateName'>>;

package/lib/chevre/repo/project.js

@@ -52,9 +52,29 @@ class MongoRepository {
         }
         return andConditions;
     }
-    findById(conditions, projection) {
+    findById(params
+    // projection?: any
+    ) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.projectModel.findOne({ _id: conditions.id }, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
+            let projection = {};
+            if (Array.isArray(params.inclusion) && params.inclusion.length > 0) {
+                params.inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(params.exclusion) && params.exclusion.length > 0) {
+                    params.exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
+            const doc = yield this.projectModel.findOne({ _id: { $eq: params.id } }, projection)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.projectModel.modelName);
@@ -64,7 +84,7 @@ class MongoRepository {
     }
     findAlternateNameById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.projectModel.findOne({ _id: params.id }, { alternateName: 1 })
+            const doc = yield this.projectModel.findOne({ _id: { $eq: params.id } }, { alternateName: 1 })
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.projectModel.modelName);

package/lib/chevre/service/aggregation/project.js

@@ -21,7 +21,11 @@ function aggregate(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
         // 集計対象プロジェクト検索
-        const project = yield repos.project.findById(params.project);
+        const project = yield repos.project.findById({
+            id: params.project.id,
+            inclusion: ['_id', 'typeOf'],
+            exclusion: []
+        });
         // 予約集計
         const { aggregateReservation } = yield aggregateReservationOnProject({
             aggregateDate: now,

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

@@ -73,7 +73,11 @@ function validateStartParams(params) {
  */
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const project = yield repos.project.findById({ id: params.project.id });
+        const project = yield repos.project.findById({
+            id: params.project.id,
+            inclusion: ['_id', 'typeOf'],
+            exclusion: []
+        });
         const { reserveTransaction, reservations } = yield validateStartParams(params)(repos);
         const transactionNumber = params.transactionNumber;
         if (typeof transactionNumber !== 'string' || transactionNumber.length === 0) {
@@ -125,7 +129,11 @@ exports.confirm = confirm;
  */
 function startAndConfirm(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const project = yield repos.project.findById({ id: params.project.id });
+        const project = yield repos.project.findById({
+            id: params.project.id,
+            inclusion: ['_id', 'typeOf'],
+            exclusion: []
+        });
         const { reserveTransaction, reservations } = yield validateStartParams(params)(repos);
         const transactionNumber = params.transactionNumber;
         if (typeof transactionNumber !== 'string' || transactionNumber.length === 0) {

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

@@ -25,7 +25,11 @@ const PermitService = require("../permit");
  */
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const project = yield repos.project.findById({ id: params.project.id });
+        const project = yield repos.project.findById({
+            id: params.project.id,
+            inclusion: ['_id', 'typeOf'],
+            exclusion: []
+        });
         // objectはオファー
         let acceptedOffers = params.object;
         if (!Array.isArray(acceptedOffers)) {

package/lib/chevre/service/moneyTransfer.js

@@ -22,7 +22,11 @@ const errorHandler_1 = require("../errorHandler");
  */
 function authorize(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const project = yield repos.project.findById({ id: params.project.id });
+        const project = yield repos.project.findById({
+            id: params.project.id,
+            inclusion: ['_id', 'settings', 'typeOf'],
+            exclusion: []
+        });
         const transaction = yield repos.assetTransaction.findById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id

package/lib/chevre/service/notification.js

@@ -26,7 +26,11 @@ const debug = createDebug('chevre-domain:service');
 function sendEmailMessage(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
-        const project = yield repos.project.findById({ id: params.project.id });
+        const project = yield repos.project.findById({
+            id: params.project.id,
+            inclusion: ['_id', 'settings'],
+            exclusion: []
+        });
         // アクション開始
         const action = yield repos.action.start(params);
         let result = {};

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

@@ -28,7 +28,11 @@ const debug = createDebug('chevre-domain:service:payment');
 function authorize(params, paymentServiceId, searchTrade4accountId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
-        const project = yield repos.project.findById({ id: params.project.id });
+        const project = yield repos.project.findById({
+            id: params.project.id,
+            inclusion: ['settings'],
+            exclusion: []
+        });
         // CreditCard系統の決済方法タイプは動的
         const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.typeOf;
         if (typeof paymentMethodType !== 'string') {

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

@@ -23,7 +23,11 @@ const accountTransactionIdentifier_1 = require("../../factory/accountTransaction
 function authorize(params, paymentServiceId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const project = yield repos.project.findById({ id: params.project.id });
+        const project = yield repos.project.findById({
+            id: params.project.id,
+            inclusion: ['_id', 'typeOf'],
+            exclusion: []
+        });
         const transactionNumber = params.transactionNumber;
         if (typeof transactionNumber !== 'string') {
             throw new factory.errors.ArgumentNull('transactionNumber');

package/lib/chevre/service/transaction/orderProgramMembership/findCreditCard.js

@@ -34,7 +34,11 @@ function findCreditCard(params) {
         //     throw new factory.errors.NotFound('CreditCard');
         // }
         var _a;
-        const project = yield repos.project.findById({ id: params.project.id });
+        const project = yield repos.project.findById({
+            id: params.project.id,
+            inclusion: ['settings'],
+            exclusion: []
+        });
         // const userPoolId: string = params.iss;
         // checkUseMyCreditCards(project);
         let memberId = params.customer.id;

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.4.0-alpha.33"
+  "version": "21.4.0-alpha.34"
 }