@infrab4a/connect-angular 4.3.2 → 4.3.3-beta.3

package/fesm2022/infrab4a-connect-angular.mjs

@@ -1418,14 +1418,17 @@ class CartService {
                 },
             })
                 .then((data) => data.data);
+            console.log('campaigns', campaigns.length);
             if (!campaigns.length)
                 return { ...checkout, lineItems: notGiftItems };
             const elegibleCampaigns = [];
             for (const campaign of campaigns) {
                 const today = new Date().getTime();
+                console.log(campaign.name, campaign.startDate.getTime() <= today, campaign.endDate.getTime() >= today);
                 if (!(campaign.startDate.getTime() <= today) && !(campaign.endDate.getTime() >= today))
                     continue;
                 if (campaign.activeCategory) {
+                    console.log('activeCategory', campaign.activeCategory);
                     const categoriesCampaing = campaign.categories.map((c) => c.id.toString());
                     const categoriesCampaingFullTree = [];
                     for (const id of categoriesCampaing) {
@@ -1451,6 +1454,7 @@ class CartService {
                     }
                 }
             }
+            console.log('elegibleCampaigns', elegibleCampaigns.length, elegibleCampaigns);
             if (!elegibleCampaigns.length)
                 return { ...checkout, lineItems: notGiftItems };
             const campaingnProducts = [];
@@ -1467,6 +1471,7 @@ class CartService {
                 }
                 campaingnProducts.push(elegibleProducts);
             }
+            console.log('campaingnProducts', campaingnProducts.length, campaingnProducts);
             if (!campaingnProducts.length)
                 return { ...checkout, lineItems: notGiftItems };
             const gifts = this.giftToLineItems([].concat(...campaingnProducts));
@@ -1576,11 +1581,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImpor
                 }] }] });
 
 class CatalogService {
-    constructor(productRepository, categoryStructureAdapter, shop, productIndex) {
+    constructor(productRepository, categoryStructureAdapter, shop, productIndex, categoryRepository) {
         this.productRepository = productRepository;
         this.categoryStructureAdapter = categoryStructureAdapter;
         this.shop = shop;
         this.productIndex = productIndex;
+        this.categoryRepository = categoryRepository;
         this.productsByTerm = {};
         this.buildFilterQuery = ({ clubDiscount, brands, prices, gender, tags, rate, customOptions, }) => {
             const filters = {};
@@ -1652,8 +1658,16 @@ class CatalogService {
         }));
     }
     async findCatalog(options, limits) {
-        if (this.hasTerm(options) && options.sort === 'most-relevant')
-            return this.findCatalogByTermAndSortByMostRevelant(options, limits);
+        if (this.hasTerm(options) && options.sort === 'most-relevant') {
+            const productsIds = await this.findCatalogIdsByElasticSearch(options.term);
+            return this.findCatalogAndSortByMostRevelant(productsIds, options, limits);
+        }
+        if (this.hasCategory(options) && options.sort === 'most-relevant') {
+            const productsIds = options.category.products?.length
+                ? options.category.products
+                : await this.categoryRepository.get({ id: options.category.id }).then((categoryFound) => categoryFound.products);
+            return this.findCatalogAndSortByMostRevelant(productsIds, options, limits);
+        }
         const repoParams = {
             filters: {
                 ...(await this.buildMainFilter(options)),
@@ -1681,8 +1695,7 @@ class CatalogService {
                 .search(term, 999, this.shop)
                 .then((data) => ({ id: { operator: Where.IN, value: data.hits.map(({ _source }) => _source.id) } }));
     }
-    async findCatalogByTermAndSortByMostRevelant(options, limits) {
-        const productIds = await this.findCatalogIdsByElasticSearch(options.term);
+    async findCatalogAndSortByMostRevelant(productIds, options, limits) {
         const totalResult = await this.productRepository.findCatalog({
             fields: ['id', 'stock'],
             filters: {
@@ -1728,7 +1741,7 @@ class CatalogService {
             return [...new Set(sorted.map(({ _source }) => _source.id))];
         }));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: CatalogService, deps: [{ token: 'ProductRepository' }, { token: CATEGORY_STRUCTURE }, { token: DEFAULT_SHOP }, { token: i1$2.ProductsIndex }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: CatalogService, deps: [{ token: 'ProductRepository' }, { token: CATEGORY_STRUCTURE }, { token: DEFAULT_SHOP }, { token: i1$2.ProductsIndex }, { token: 'CategoryRepository' }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: CatalogService }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImport: i0, type: CatalogService, decorators: [{
@@ -1742,7 +1755,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.3", ngImpor
                 }] }, { type: i1$2.Shops, decorators: [{
                     type: Inject,
                     args: [DEFAULT_SHOP]
-                }] }, { type: i1$2.ProductsIndex }] });
+                }] }, { type: i1$2.ProductsIndex }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: ['CategoryRepository']
+                }] }] });
 
 class CategoryService {
     constructor(productRepository, categoryRepository, categoryFilterRepository, categoryStructureAdapter, shop) {
@@ -1814,7 +1830,7 @@ class WishlistService {
         this.categoryRepository = categoryRepository;
         this.shop = shop;
         const categoryStructureAdapter = new NewCategoryStructureAdapter(wishlistRepository);
-        this.catalogService = new CatalogService(productRepository, categoryStructureAdapter, shop, productIndex);
+        this.catalogService = new CatalogService(productRepository, categoryStructureAdapter, shop, productIndex, categoryRepository);
         this.categoryService = new CategoryService(productRepository, categoryRepository, categoryFilterRepository, categoryStructureAdapter, shop);
     }
     getCatalogService() {