@infrab4a/connect-angular 4.0.1 → 4.0.2-beta.0

package/fesm2020/infrab4a-connect-angular.mjs

@@ -1583,7 +1583,7 @@ class CategoryService {
             .find({ filters: { brandCategory: true }, orderBy: { name: 'asc' } })
             .then(({ data }) => data.filter((category) => brands.includes(category.conditions.brand)));
     }
-    async fetchFilterOptions(category, filters) {
+    async fetchFilterOptions(category) {
         return await this.categoryFilterRepository
             .find({ filters: { categoryId: +category.id } })
             .then(({ data }) => data.map((categoryFilter) => categoryFilter.filter));
@@ -1647,42 +1647,41 @@ class UtilHelper {
 }
 
 class NewCategoryStructureAdapter {
-    constructor(categoryRepository, categoryCollectionChildrenRepository) {
+    constructor(categoryRepository) {
         this.categoryRepository = categoryRepository;
-        this.categoryCollectionChildrenRepository = categoryCollectionChildrenRepository;
     }
     async buildProductFilterByCategory(category) {
-        const categoriesIds = (await this.isCollection(category))
-            ? await this.getAllCategoriesIdFromCollection(category)
-            : [...(await this.getAllCategoriesIdFromCategory(category)), category.id.toString()];
-        return { category: { id: { operator: Where.IN, value: categoriesIds } } };
+        const loadedCategory = await this.getCategory(category);
+        if (loadedCategory.isCollection)
+            return { id: { operator: Where.IN, value: loadedCategory.products } };
+        const categoryIds = [...(await this.getAllCategoriesIdFromCategory(category)), category.id.toString()];
+        return {
+            category: {
+                id: {
+                    operator: Where.IN,
+                    value: categoryIds,
+                },
+            },
+        };
     }
     async getAllCategoriesIdFromCategory(category) {
         return this.categoryRepository
             .getChildren(+category.id)
             .then((categories) => categories.map((category) => category.id.toString()));
     }
-    async getAllCategoriesIdFromCollection(category) {
-        return this.categoryCollectionChildrenRepository
-            .find({ filters: { collectionId: +category.id } })
-            .then(({ data }) => data.map((categoryCollection) => categoryCollection.categoryId.toString()));
-    }
-    async isCollection(category) {
-        return !isNil(category.isCollection)
-            ? category.isCollection
-            : this.categoryRepository.get({ id: category.id }).then((category) => category.isCollection);
+    async getCategory(category) {
+        return isNil(category.isCollection) || (category.isCollection && !category.products?.length)
+            ? this.categoryRepository.get({ id: category.id })
+            : category;
     }
 }
-NewCategoryStructureAdapter.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: NewCategoryStructureAdapter, deps: [{ token: 'CategoryRepository' }, { token: 'CategoryCollectionChildrenRepository' }], target: i0.ɵɵFactoryTarget.Injectable });
+NewCategoryStructureAdapter.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: NewCategoryStructureAdapter, deps: [{ token: 'CategoryRepository' }], target: i0.ɵɵFactoryTarget.Injectable });
 NewCategoryStructureAdapter.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: NewCategoryStructureAdapter });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: NewCategoryStructureAdapter, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: ['CategoryRepository']
-                }] }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['CategoryCollectionChildrenRepository']
                 }] }]; } });
 
 class OldCategoryStructureAdapter {
@@ -1706,10 +1705,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                 }] }]; } });
 
 class WishlistService {
-    constructor(wishlistRepository, shop, productRepository, categoryFilterRepository, categoryCollectionChildrenRepository, productIndex) {
+    constructor(wishlistRepository, shop, productRepository, categoryFilterRepository, productIndex) {
         this.wishlistRepository = wishlistRepository;
         this.shop = shop;
-        const categoryStructureAdapter = new NewCategoryStructureAdapter(wishlistRepository, categoryCollectionChildrenRepository);
+        const categoryStructureAdapter = new NewCategoryStructureAdapter(wishlistRepository);
         this.catalogService = new CatalogService(productRepository, categoryStructureAdapter, shop, productIndex);
         this.categoryService = new CategoryService(productRepository, wishlistRepository, categoryFilterRepository, categoryStructureAdapter, shop);
     }
@@ -1780,7 +1779,7 @@ class WishlistService {
         return wishlist;
     }
 }
-WishlistService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: WishlistService, deps: [{ token: 'WishlistRepository' }, { token: DEFAULT_SHOP }, { token: 'ProductRepository' }, { token: 'CategoryFilterRepository' }, { token: 'CategoryCollectionChildrenRepository' }, { token: i1$3.ProductsIndex }], target: i0.ɵɵFactoryTarget.Injectable });
+WishlistService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: WishlistService, deps: [{ token: 'WishlistRepository' }, { token: DEFAULT_SHOP }, { token: 'ProductRepository' }, { token: 'CategoryFilterRepository' }, { token: i1$3.ProductsIndex }], target: i0.ɵɵFactoryTarget.Injectable });
 WishlistService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: WishlistService });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: WishlistService, decorators: [{
             type: Injectable
@@ -1796,9 +1795,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
                 }] }, { type: undefined, decorators: [{
                     type: Inject,
                     args: ['CategoryFilterRepository']
-                }] }, { type: undefined, decorators: [{
-                    type: Inject,
-                    args: ['CategoryCollectionChildrenRepository']
                 }] }, { type: i1$3.ProductsIndex }]; } });
 
 class CheckoutSubscriptionService {