@chevre/domain 21.17.0-alpha.6 → 21.17.0-alpha.8

package/lib/chevre/repo/aggregateOffer.js

@@ -437,14 +437,14 @@ class MongoRepository {
     count(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = MongoRepository.CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params);
-            const [{ offerCount }] = yield this.aggregateOfferModel.aggregate([
+            const result = yield this.aggregateOfferModel.aggregate([
                 ...matchStages,
                 {
                     $count: 'offerCount'
                 }
             ])
                 .exec();
-            return offerCount;
+            return (result.length > 0) ? result[0].offerCount : 0;
         });
     }
     search(params, projection) {

package/lib/chevre/repo/offer.js

@@ -678,7 +678,7 @@ class MongoRepository {
     count(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = MongoRepository.CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params);
-            const [{ offerCount }] = yield this.aggregateOfferModel.aggregate([
+            const result = yield this.aggregateOfferModel.aggregate([
                 {
                     $unwind: { path: '$offers' }
                 },
@@ -688,7 +688,7 @@ class MongoRepository {
                 }
             ])
                 .exec();
-            return offerCount;
+            return (result.length > 0) ? result[0].offerCount : 0;
         });
     }
     search(params, projection) {

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

@@ -47,10 +47,6 @@ export declare class MongoRepository {
         id: string;
         dateSynced: Date;
     }): Promise<void>;
-    /**
-     * 型を統一する
-     */
-    optimizeAll(): Promise<void>;
     updateManyById(params: {
         id: {
             $in: string[];

package/lib/chevre/repo/offerCatalog.js

@@ -176,35 +176,45 @@ class MongoRepository {
                 .exec();
         });
     }
-    /**
-     * 型を統一する
-     */
-    optimizeAll() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let result = yield this.offerCatalogModel.updateMany({ typeOf: { $ne: 'OfferCatalog' } }, { $set: { typeOf: 'OfferCatalog' } })
-                .exec();
-            // tslint:disable-next-line:no-console
-            console.log(result);
-            result = yield this.offerCatalogModel.updateMany({ ticketTypes: { $exists: true } }, {
-                $unset: { ticketTypes: 1 }
-            })
-                .exec();
-            // tslint:disable-next-line:no-console
-            console.log(result);
-            result = yield this.offerCatalogModel.updateMany({ id: { $exists: true } }, {
-                $unset: { id: 1 }
-            })
-                .exec();
-            // tslint:disable-next-line:no-console
-            console.log(result);
-            result = yield this.offerCatalogModel.updateMany({ 'itemOffered.serviceType': { $exists: true } }, {
-                $unset: { 'itemOffered.serviceType': 1 }
-            })
-                .exec();
-            // tslint:disable-next-line:no-console
-            console.log(result);
-        });
-    }
+    // /**
+    //  * 型を統一する
+    //  */
+    // public async optimizeAll(): Promise<void> {
+    //     let result = await this.offerCatalogModel.updateMany(
+    //         { typeOf: { $ne: 'OfferCatalog' } },
+    //         { $set: { typeOf: 'OfferCatalog' } }
+    //     )
+    //         .exec();
+    //     // tslint:disable-next-line:no-console
+    //     console.log(result);
+    //     result = await this.offerCatalogModel.updateMany(
+    //         { ticketTypes: { $exists: true } },
+    //         {
+    //             $unset: { ticketTypes: 1 }
+    //         }
+    //     )
+    //         .exec();
+    //     // tslint:disable-next-line:no-console
+    //     console.log(result);
+    //     result = await this.offerCatalogModel.updateMany(
+    //         { id: { $exists: true } },
+    //         {
+    //             $unset: { id: 1 }
+    //         }
+    //     )
+    //         .exec();
+    //     // tslint:disable-next-line:no-console
+    //     console.log(result);
+    //     result = await this.offerCatalogModel.updateMany(
+    //         { 'itemOffered.serviceType': { $exists: true } },
+    //         {
+    //             $unset: { 'itemOffered.serviceType': 1 }
+    //         }
+    //     )
+    //         .exec();
+    //     // tslint:disable-next-line:no-console
+    //     console.log(result);
+    // }
     updateManyById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!Array.isArray(params.id.$in) || params.id.$in.length === 0) {

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

@@ -27,6 +27,26 @@ export declare class MongoRepository {
         id: string;
         dateSynced: Date;
     }): Promise<void>;
+    updateManyById(params: {
+        id: {
+            $in: string[];
+        };
+        $push: {
+            itemListElement: {
+                $each: factory.offerCatalog.IItemListElement[];
+                $slice: number;
+            };
+        };
+        $pull: {
+            itemListElement: {
+                $elemMatch: {
+                    id: {
+                        $in: string[];
+                    };
+                };
+            };
+        };
+    }): Promise<void>;
     count(params: Omit<factory.offerCatalog.ISearchConditions, 'limit' | 'page' | 'sort'>): Promise<number>;
     search(params: factory.offerCatalog.ISearchConditions, projection: IProjection): Promise<IAggregatedOfferCatalog[]>;
     findItemListElementById(params: {

package/lib/chevre/repo/offerCatalogItem.js

@@ -147,6 +147,40 @@ class MongoRepository {
                 .exec();
         });
     }
+    updateManyById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!Array.isArray(params.id.$in) || params.id.$in.length === 0) {
+                return;
+            }
+            const pushItemListElementIds = params.$push.itemListElement.$each.map((element) => element.id);
+            yield this.offerCatalogItemModel.updateMany(Object.assign({ _id: { $in: params.id.$in } }, (pushItemListElementIds.length > 0)
+                // itemListElementのユニークネスを保証する
+                ? {
+                    'itemListElement.id': {
+                        $nin: pushItemListElementIds
+                    }
+                }
+                : undefined), Object.assign(Object.assign({}, (pushItemListElementIds.length > 0)
+                ? {
+                    $push: {
+                        itemListElement: {
+                            $each: params.$push.itemListElement.$each,
+                            $slice: params.$push.itemListElement.$slice
+                        }
+                    }
+                }
+                : undefined), (params.$pull.itemListElement.$elemMatch.id.$in.length > 0)
+                ? {
+                    $pull: {
+                        itemListElement: {
+                            id: { $in: params.$pull.itemListElement.$elemMatch.id.$in }
+                        }
+                    }
+                }
+                : undefined))
+                .exec();
+        });
+    }
     count(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);

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.17.0-alpha.6"
+  "version": "21.17.0-alpha.8"
 }

package/example/src/chevre/optimizeCatalogs.ts

@@ -1,54 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const offerCatalogRepo = await chevre.repository.OfferCatalog.createInstance(mongoose.connection);
-
-    const cursor = offerCatalogRepo.getCursor(
-        {
-            // 'project.id': { $eq: project.id }
-        },
-        {
-            __v: 0,
-            createdAt: 0,
-            updatedAt: 0
-        }
-    );
-    console.log('catalogs found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const { _id, ...offerCatalog } = <chevre.factory.offerCatalog.IOfferCatalog & { _id: string }>doc.toObject();
-
-        let itemListElementTypeOfEqOffer = false;
-        itemListElementTypeOfEqOffer = offerCatalog.itemListElement.every((element) => element.typeOf === chevre.factory.offerType.Offer);
-        if (!itemListElementTypeOfEqOffer) {
-            throw new Error(`itemListElementTypeOfEqOffer: false. ${offerCatalog.project.id} ${offerCatalog.id}`);
-        }
-
-        const itemOfferedKeys = Object.keys(offerCatalog.itemOffered);
-        console.log(itemOfferedKeys);
-        if (itemOfferedKeys.length > 1) {
-            console.log(itemOfferedKeys, offerCatalog.project.id, offerCatalog.id);
-            updateCount += 1;
-        }
-    });
-
-    console.log(i, 'catalogs checked');
-    console.log(updateCount, 'catalogs synced');
-
-    await offerCatalogRepo.optimizeAll();
-    console.log('optmized');
-}
-main()
-    .then()
-    .catch(console.error);