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

package/example/src/chevre/searchOfferCatalogItems.ts

@@ -27,6 +27,15 @@ async function main() {
     console.log(catalogs[0]?.id, typeof catalogs[0]?.id);
     console.log('catalogs found', catalogs.map((catalog) => `${catalog.id} ${catalog.identifier} ${catalog.numberOfItems} ${catalog.itemListElementTypeOf}`));
     console.log(catalogs.length);
+
+    const numCatalogs = await catalogItemRepo.count(
+        {
+            project: { id: { $eq: PROJECT_ID } },
+            itemListElement: { typeOf: { $eq: 'Offer' } }
+            // id: { $in: ['xxx'] }
+        }
+    );
+    console.log('numCatalogs:', numCatalogs);
 }
 
 main()

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

@@ -19,6 +19,7 @@ export declare class MongoRepository {
         id: string;
         dateSynced: Date;
     }): Promise<void>;
+    count(params: Omit<factory.offerCatalog.ISearchConditions, 'limit' | 'page' | 'sort'>): Promise<number>;
     search(params: factory.offerCatalog.ISearchConditions): Promise<IAggregatedOfferCatalog[]>;
     findItemListElementById(params: {
         id: string;

package/lib/chevre/repo/offerCatalogItem.js

@@ -130,6 +130,22 @@ class MongoRepository {
                 .exec();
         });
     }
+    count(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
+            const matchStages = conditions.map((condition) => {
+                return { $match: condition };
+            });
+            const result = yield this.offerCatalogItemModel.aggregate([
+                ...matchStages,
+                {
+                    $count: 'numItems'
+                }
+            ])
+                .exec();
+            return (result.length > 0) ? result[0].numItems : 0;
+        });
+    }
     search(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {

package/lib/chevre/service/task/onResourceUpdated/syncOfferCatalog.js

@@ -19,24 +19,18 @@ function syncOfferCatalog(params) {
         // if (params.ids.length !== 1) {
         //     throw new factory.errors.Argument('id', 'id.length must be 1');
         // }
-        var _a, _b;
+        var _a;
         if (params.isDeleted) {
             for (const offerCatalogId of params.ids) {
-                const offerCatalogs = yield repos.offerCatalog.search({ id: { $in: [offerCatalogId] } });
-                const itemListElementTypeOf = (_a = offerCatalogs.shift()) === null || _a === void 0 ? void 0 : _a.itemListElementTypeOf;
-                switch (itemListElementTypeOf) {
-                    case factory.offerType.Offer:
-                        // カタログを含む全集計オファーからカタログを除外
-                        yield repos.aggregateOffer.pullIncludedInDataCatalog({
-                            project: { id: params.project.id },
-                            $pull: {
-                                includedInDataCatalog: { $elemMatch: { id: { $eq: offerCatalogId } } }
-                            }
-                        });
-                        break;
-                    default:
-                    // no op
-                }
+                // 検索しても存在しない
+                // const offerCatalogs = await repos.offerCatalog.search({ id: { $in: [offerCatalogId] } });
+                // カタログを含む全集計オファーからカタログを除外
+                yield repos.aggregateOffer.pullIncludedInDataCatalog({
+                    project: { id: params.project.id },
+                    $pull: {
+                        includedInDataCatalog: { $elemMatch: { id: { $eq: offerCatalogId } } }
+                    }
+                });
             }
         }
         else {
@@ -48,7 +42,7 @@ function syncOfferCatalog(params) {
                 else {
                     offerCatalogs = yield repos.offerCatalog.search({ id: { $in: [offerCatalogId] } });
                 }
-                const itemListElementTypeOf = (_b = offerCatalogs.shift()) === null || _b === void 0 ? void 0 : _b.itemListElementTypeOf;
+                const itemListElementTypeOf = (_a = offerCatalogs.shift()) === null || _a === void 0 ? void 0 : _a.itemListElementTypeOf;
                 switch (itemListElementTypeOf) {
                     case factory.offerType.Offer:
                         // 集計オファー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.9.0-alpha.6"
+  "version": "21.9.0-alpha.8"
 }