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

package/example/src/chevre/searchSellersByAggregate.ts

@@ -0,0 +1,31 @@
+// 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 sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
+
+    const sellers = await sellerRepo.searchByAggregate(
+        {
+            limit: 5,
+            page: 1,
+            sort: { branchCode: chevre.factory.sortType.Descending }
+            // project: { id: { $eq: project.id } }
+            // paymentAccepted: { paymentMethodType: { $eq: 'Cash' } },
+            // hasMerchantReturnPolicy: { applicablePaymentMethod: {} }
+        },
+        [],
+        ['hasMerchantReturnPolicy', 'additionalProperty', 'project', 'name', 'typeOf', 'url', 'telephone']
+    );
+    console.log('sellers found', sellers, sellers[0]?.hasMerchantReturnPolicy);
+    console.log(sellers.length, 'sellers found');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -1,31 +1,45 @@
 // 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);
+// const PROJECT_ID = String(process.env.PROJECT_ID);
 
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const transactionRepo = await chevre.repository.Transaction.createInstance(mongoose.connection);
-
     let updateResult: any;
-    updateResult = await transactionRepo.unsetUnnecessaryFields({
+
+    const sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
+    updateResult = await sellerRepo.unsetUnnecessaryFields({
         filter: {
             // 'project.id': { $eq: PROJECT_ID },
-            typeOf: { $eq: chevre.factory.transactionType.PlaceOrder },
-            status: { $eq: chevre.factory.transactionStatusType.Confirmed },
-            startDate: {
-                $lte: moment('2023-08-16T07:26:00Z')
-                    .toDate()
-            },
-            'object.authorizeActions': { $exists: true }
+            typeOf: { $eq: chevre.factory.organizationType.Corporation },
+            areaServed: { $exists: true }
+        },
+        $unset: { areaServed: 1 }
+    });
+    console.log('unset processed.', updateResult);
+
+    const placeRepo = await chevre.repository.Place.createInstance(mongoose.connection);
+    updateResult = await placeRepo.unsetUnnecessaryFieldsFromMovieTheater({
+        filter: {
+            $and: [
+                { typeOf: { $eq: chevre.factory.placeType.MovieTheater } },
+                {
+                    $or: [
+                        { 'offers.project': { $exists: true } },
+                        { 'offers.priceCurrency': { $exists: true } }
+                    ]
+                }
+            ]
         },
-        $unset: { 'object.authorizeActions': 1 }
+        $unset: {
+            'offers.project': 1,
+            'offers.priceCurrency': 1
+        }
     });
-    console.log('unset processed.', updateResult, 'PROJECT_ID:', PROJECT_ID);
+    console.log('unset processed.', updateResult);
 }
 
 main()

package/lib/chevre/repo/mongoose/schemas/seller.js

@@ -8,12 +8,12 @@ const modelName = 'Seller';
 exports.modelName = modelName;
 const schemaDefinition = {
     additionalProperty: [mongoose_1.SchemaTypes.Mixed],
-    areaServed: [mongoose_1.SchemaTypes.Mixed],
+    // areaServed: [SchemaTypes.Mixed],
     branchCode: String,
     hasMerchantReturnPolicy: [mongoose_1.SchemaTypes.Mixed],
     makesOffer: [mongoose_1.SchemaTypes.Mixed],
     name: mongoose_1.SchemaTypes.Mixed,
-    parentOrganization: mongoose_1.SchemaTypes.Mixed,
+    // parentOrganization: SchemaTypes.Mixed,
     paymentAccepted: [mongoose_1.SchemaTypes.Mixed],
     project: mongoose_1.SchemaTypes.Mixed,
     typeOf: {

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

@@ -283,14 +283,10 @@ export declare class MongoRepository {
         };
         typeOf: factory.placeType.ScreeningRoom;
     }>;
-    unsetContainsPlaceFromMovieTheater(params: {
-        /**
-         * 施設ID
-         */
-        id: string;
-    }): Promise<{
-        id: string;
-    } | undefined>;
+    unsetUnnecessaryFieldsFromMovieTheater(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
     deleteManyByParentOrganizationId(params: {
         project: {
             id: string;

package/lib/chevre/repo/place.js

@@ -1287,23 +1287,10 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    unsetContainsPlaceFromMovieTheater(params) {
+    unsetUnnecessaryFieldsFromMovieTheater(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.placeModel.findOneAndUpdate({
-                _id: { $eq: params.id },
-                typeOf: { $eq: factory.placeType.MovieTheater },
-                'containsPlace.branchCode': { $exists: true }
-            }, {
-                $unset: { containsPlace: 1 }
-            })
-                .select({ _id: 1 })
-                .exec()
-                .then((doc) => {
-                if (doc === null) {
-                    return;
-                }
-                return doc.toObject();
-            });
+            return this.placeModel.updateMany(params.filter, { $unset: params.$unset })
+                .exec();
         });
     }
     deleteManyByParentOrganizationId(params) {

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

@@ -22,9 +22,10 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import { Connection } from 'mongoose';
+import { AnyExpression, Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 export type ISeller = factory.seller.ISeller;
+export type ISellerByAggregate = Pick<ISeller, 'additionalProperty' | 'branchCode' | 'hasMerchantReturnPolicy' | 'id' | 'name' | 'project' | 'telephone' | 'typeOf' | 'url'>;
 export interface IMemberSearchConditions {
     /**
      * 販売者メンバーで絞る場合
@@ -37,17 +38,17 @@ export interface IMemberSearchConditions {
         };
     };
 }
+type IKeyOfProjection = keyof ISeller | '_id';
 /**
  * 販売者リポジトリ
  */
 export declare class MongoRepository {
     private readonly organizationModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(params: factory.seller.ISearchConditions & IMemberSearchConditions): any[];
-    /**
-     * 特定販売者検索
-     * searchに置き換え(2023-07-13~)
-     */
+    static CREATE_MONGO_CONDITIONS(params: factory.seller.ISearchConditions & IMemberSearchConditions): FilterQuery<factory.seller.ISeller>[];
+    static CREATE_AGGREGATE_SELLERS_PROJECTION(inclusion: string[], exclusion: (keyof ISellerByAggregate)[]): {
+        [field: string]: AnyExpression;
+    };
     /**
      * 販売者を保管する
      */
@@ -55,10 +56,14 @@ export declare class MongoRepository {
         id?: string;
         attributes: factory.seller.ISeller;
     }): Promise<ISeller>;
+    /**
+     * 集計検索(publicな属性検索が目的)
+     */
+    searchByAggregate(conditions: factory.seller.ISearchConditions & IMemberSearchConditions, inclusion: (keyof ISellerByAggregate)[], exclusion: (keyof ISellerByAggregate)[]): Promise<ISellerByAggregate[]>;
     /**
      * 販売者検索
      */
-    search(conditions: factory.seller.ISearchConditions & IMemberSearchConditions, inclusion: string[], exclusion: string[]): Promise<ISeller[]>;
+    search(conditions: factory.seller.ISearchConditions & IMemberSearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<ISeller[]>;
     /**
      * 対応決済方法を検索する
      */
@@ -96,5 +101,10 @@ 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.seller.ISeller>, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
 }
+export {};

package/lib/chevre/repo/seller.js

@@ -35,7 +35,6 @@ class MongoRepository {
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
-        // MongoDB検索条件
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
         if (typeof projectIdEq === 'string') {
@@ -143,41 +142,47 @@ class MongoRepository {
         }
         return andConditions;
     }
-    /**
-     * 特定販売者検索
-     * searchに置き換え(2023-07-13~)
-     */
-    // public async findById(
-    //     conditions: {
-    //         id: string;
-    //     },
-    //     inclusion: string[],
-    //     exclusion: string[]
-    // ): Promise<ISeller> {
-    //     let projection: { [key: string]: number } = {};
-    //     if (Array.isArray(inclusion) && inclusion.length > 0) {
-    //         inclusion.forEach((field) => {
-    //             projection[field] = 1;
-    //         });
-    //     } else {
-    //         projection = {
-    //             __v: 0,
-    //             createdAt: 0,
-    //             updatedAt: 0
-    //         };
-    //         if (Array.isArray(exclusion) && exclusion.length > 0) {
-    //             exclusion.forEach((field) => {
-    //                 projection[field] = 0;
-    //             });
-    //         }
-    //     }
-    //     const doc = await this.organizationModel.findOne({ _id: conditions.id }, projection)
-    //         .exec();
-    //     if (doc === null) {
-    //         throw new factory.errors.NotFound(this.organizationModel.modelName);
-    //     }
-    //     return doc.toObject();
-    // }
+    static CREATE_AGGREGATE_SELLERS_PROJECTION(inclusion, exclusion) {
+        const projectStage = {
+            _id: 0,
+            id: { $toString: '$_id' },
+            additionalProperty: '$additionalProperty',
+            branchCode: '$branchCode',
+            hasMerchantReturnPolicy: {
+                $cond: {
+                    if: { $isArray: '$hasMerchantReturnPolicy' },
+                    then: {
+                        $cond: {
+                            if: { $eq: [{ $size: '$hasMerchantReturnPolicy' }, 0] },
+                            then: [],
+                            else: [{
+                                    url: { $first: '$hasMerchantReturnPolicy.url' },
+                                    typeOf: { $first: '$hasMerchantReturnPolicy.typeOf' }
+                                }]
+                        }
+                    },
+                    else: []
+                }
+            },
+            name: '$name',
+            project: '$project',
+            typeOf: '$typeOf',
+            url: '$url',
+            telephone: '$telephone'
+        };
+        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;
+    }
     /**
      * 販売者を保管する
      */
@@ -204,6 +209,33 @@ class MongoRepository {
             return organization;
         });
     }
+    /**
+     * 集計検索(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_SELLERS_PROJECTION(inclusion, exclusion);
+            const sortByBranchCode = (_a = conditions.sort) === null || _a === void 0 ? void 0 : _a.branchCode;
+            const aggregate = this.organizationModel.aggregate([
+                ...matchStages,
+                ...(typeof sortByBranchCode === 'number')
+                    ? [{ $sort: { branchCode: sortByBranchCode } }]
+                    : [],
+                { $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();
+        });
+    }
     /**
      * 販売者検索
      */
@@ -309,5 +341,11 @@ class MongoRepository {
             .sort({ branchCode: factory.sortType.Ascending })
             .cursor();
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.organizationModel.updateMany(params.filter, { $unset: params.$unset })
+                .exec();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

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

package/example/src/chevre/searchSellers.ts

@@ -1,28 +0,0 @@
-// 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 sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
-
-    const sellers = await sellerRepo.search(
-        {
-            project: { id: { $eq: project.id } },
-            paymentAccepted: { paymentMethodType: { $eq: 'Cash' } },
-            hasMerchantReturnPolicy: { applicablePaymentMethod: {} }
-        },
-        ['name'],
-        []
-    );
-    console.log('sellers found', sellers);
-    console.log(sellers.length, 'sellers found');
-}
-
-main()
-    .then()
-    .catch(console.error);