@chevre/domain 21.15.0-alpha.4 → 21.15.0-alpha.6

package/example/src/chevre/searchCategoryCodesByAggregate.ts

@@ -0,0 +1,32 @@
+// tslint:disable:no-console
+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 categoryCodeRepo = await chevre.repository.CategoryCode.createInstance(mongoose.connection);
+
+    const categoryCodes = await categoryCodeRepo.searchByAggregate(
+        {
+            limit: 100,
+            page: 1,
+            sort: { codeValue: chevre.factory.sortType.Ascending }
+            // id: { $eq: 'xxx' }
+            // project: { id: { $eq: project.id } }
+            // paymentAccepted: { paymentMethodType: { $eq: 'Cash' } },
+            // hasMerchantReturnPolicy: { applicablePaymentMethod: {} }
+        },
+        [],
+        ['project', 'additionalProperty', 'typeOf']
+    );
+    console.log('categoryCodes found', categoryCodes);
+    console.log(categoryCodes.length, 'categoryCodes found');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/searchSellersByAggregate.ts

@@ -10,11 +10,28 @@ async function main() {
 
     const sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
 
-    const sellers = await sellerRepo.searchByAggregate(
+    const sellersByAggregate = await sellerRepo.searchByAggregate(
         {
             limit: 5,
             page: 1,
-            sort: { branchCode: chevre.factory.sortType.Descending }
+            sort: { branchCode: chevre.factory.sortType.Descending },
+            id: { $eq: 'xxx' }
+            // project: { id: { $eq: project.id } }
+            // paymentAccepted: { paymentMethodType: { $eq: 'Cash' } },
+            // hasMerchantReturnPolicy: { applicablePaymentMethod: {} }
+        },
+        [],
+        ['hasMerchantReturnPolicy', 'additionalProperty', 'project', 'name', 'typeOf', 'url', 'telephone']
+    );
+    console.log('sellers found', sellersByAggregate, sellersByAggregate[0]?.hasMerchantReturnPolicy);
+    console.log(sellersByAggregate.length, 'sellers found');
+
+    const sellers = await sellerRepo.search(
+        {
+            limit: 5,
+            page: 1,
+            sort: { branchCode: chevre.factory.sortType.Descending },
+            id: { $eq: 'xxx' }
             // project: { id: { $eq: project.id } }
             // paymentAccepted: { paymentMethodType: { $eq: 'Cash' } },
             // hasMerchantReturnPolicy: { applicablePaymentMethod: {} }

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

@@ -22,7 +22,7 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import type { Connection } from 'mongoose';
+import { AnyExpression, Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 /**
  * 区分リポジトリ
@@ -30,8 +30,15 @@ import * as factory from '../factory';
 export declare class MongoRepository {
     private readonly categoryCodeModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.categoryCode.ISearchConditions): any[];
+    static CREATE_MONGO_CONDITIONS(params: factory.categoryCode.ISearchConditions): FilterQuery<factory.categoryCode.ICategoryCode>[];
+    static CREATE_AGGREGATE_PROJECTION(inclusion: string[], exclusion: (keyof factory.categoryCode.ICategoryCode)[]): {
+        [field: string]: AnyExpression;
+    };
     count(params: factory.categoryCode.ISearchConditions): Promise<number>;
+    /**
+     * 集計検索(publicな属性検索が目的)
+     */
+    searchByAggregate(conditions: factory.categoryCode.ISearchConditions, inclusion: (keyof factory.categoryCode.ICategoryCode)[], exclusion: (keyof factory.categoryCode.ICategoryCode)[]): Promise<factory.categoryCode.ICategoryCode[]>;
     /**
      * 検索
      */
@@ -61,5 +68,5 @@ export declare class MongoRepository {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    getCursor(conditions: FilterQuery<factory.categoryCode.ICategoryCode>, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
 }

package/lib/chevre/repo/categoryCode.js

@@ -21,6 +21,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoRepository = void 0;
+const mongoose_1 = require("mongoose");
 const categoryCode_1 = require("./mongoose/schemas/categoryCode");
 const factory = require("../factory");
 const settings_1 = require("../settings");
@@ -34,7 +35,6 @@ class MongoRepository {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-        // MongoDB検索条件
         const andConditions = [];
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -51,11 +51,13 @@ class MongoRepository {
         }
         const idEq = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$eq;
         if (typeof idEq === 'string') {
-            andConditions.push({ _id: { $eq: idEq } });
+            // andConditions.push({ _id: { $eq: idEq } });
+            andConditions.push({ _id: { $eq: new mongoose_1.Types.ObjectId(idEq) } });
         }
         const idIn = (_b = params.id) === null || _b === void 0 ? void 0 : _b.$in;
         if (Array.isArray(idIn)) {
-            andConditions.push({ _id: { $in: idIn } });
+            // andConditions.push({ _id: { $in: idIn } });
+            andConditions.push({ _id: { $in: idIn.map((id) => new mongoose_1.Types.ObjectId(id)) } });
         }
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
@@ -149,6 +151,33 @@ class MongoRepository {
         }
         return andConditions;
     }
+    static CREATE_AGGREGATE_PROJECTION(inclusion, exclusion) {
+        const projectStage = {
+            _id: 0,
+            // id: { $toString: '$_id' },
+            project: '$project',
+            typeOf: '$typeOf',
+            additionalProperty: '$additionalProperty',
+            color: '$color',
+            image: '$image',
+            codeValue: '$codeValue',
+            // inCodeSet: '$inCodeSet',
+            name: '$name',
+            paymentMethod: '$paymentMethod'
+        };
+        if (inclusion.length > 0) {
+            // no op
+        }
+        else if (exclusion.length > 0) {
+            exclusion.forEach((field) => {
+                if (typeof projectStage[field] === 'string' || typeof projectStage[field] === 'object') {
+                    // tslint:disable-next-line:no-dynamic-delete
+                    delete projectStage[field];
+                }
+            });
+        }
+        return projectStage;
+    }
     count(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
@@ -157,6 +186,33 @@ class MongoRepository {
                 .exec();
         });
     }
+    /**
+     * 集計検索(publicな属性検索が目的)
+     */
+    searchByAggregate(conditions, inclusion, exclusion) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const matchStages = MongoRepository.CREATE_MONGO_CONDITIONS(conditions)
+                .map((c) => ({ $match: c }));
+            const projectStage = MongoRepository.CREATE_AGGREGATE_PROJECTION(inclusion, exclusion);
+            const sortByCodeValue = (_a = conditions.sort) === null || _a === void 0 ? void 0 : _a.codeValue;
+            const aggregate = this.categoryCodeModel.aggregate([
+                ...matchStages,
+                ...(typeof sortByCodeValue === 'number')
+                    ? [{ $sort: { codeValue: sortByCodeValue } }]
+                    : [],
+                { $project: projectStage }
+            ]);
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (typeof conditions.limit === 'number' && conditions.limit > 0) {
+                const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
+                aggregate.limit(conditions.limit * page)
+                    .skip(conditions.limit * (page - 1));
+            }
+            return aggregate.exec();
+        });
+    }
     /**
      * 検索
      */

package/lib/chevre/repo/seller.js

@@ -42,12 +42,14 @@ class MongoRepository {
         }
         const idEq = (_c = params.id) === null || _c === void 0 ? void 0 : _c.$eq;
         if (typeof idEq === 'string') {
-            andConditions.push({ _id: { $eq: idEq } });
+            // andConditions.push({ _id: { $eq: idEq } });
+            andConditions.push({ _id: { $eq: new mongoose_1.Types.ObjectId(idEq) } });
         }
         // メンバー条件追加(2023-07-24~)
         const memberMemberOfIdIn = (_f = (_e = (_d = params.member) === null || _d === void 0 ? void 0 : _d.memberOf) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$in;
         if (Array.isArray(memberMemberOfIdIn)) {
-            andConditions.push({ _id: { $in: memberMemberOfIdIn } });
+            // andConditions.push({ _id: { $in: memberMemberOfIdIn } });
+            andConditions.push({ _id: { $in: memberMemberOfIdIn.map((memberMemberOfId) => new mongoose_1.Types.ObjectId(memberMemberOfId)) } });
         }
         const nameRegex = params.name;
         if (typeof nameRegex === 'string' && nameRegex.length > 0) {

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.15.0-alpha.4"
+  "version": "21.15.0-alpha.6"
 }