@infrab4a/connect 4.25.0-beta.8 → 4.25.0

package/index.cjs.js

@@ -5602,6 +5602,17 @@ class CategoryHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGr
         });
         this.productRepository = productRepository;
         this.categoryFilterRepository = categoryFilterRepository;
+        this.reorganizeMostRelevantsProducts = (products, mostRelevantsIds, limit) => {
+            const mostRelevantWithouyStock = products.filter((product) => mostRelevantsIds.includes(product.id) && product.stock.quantity <= 0);
+            const firstProducts = products
+                .filter((product) => mostRelevantsIds.includes(product.id) && product.stock.quantity > 0)
+                .sort((a, b) => mostRelevantsIds.indexOf(a.id) - mostRelevantsIds.indexOf(b.id));
+            const lastProducts = products
+                .filter((product) => !mostRelevantsIds.includes(product.id) && product.stock.quantity > 0)
+                .concat(mostRelevantWithouyStock);
+            const categoryMostRelevants = firstProducts.concat(lastProducts);
+            return limit ? categoryMostRelevants.slice(0, limit) : categoryMostRelevants;
+        };
     }
     async create(params) {
         const { images, mostRelevants, metadatas } = params, data = tslib.__rest(params, ["images", "mostRelevants", "metadatas"]);
@@ -5701,63 +5712,83 @@ class CategoryHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGr
         return homeSections;
     }
     async mountCategory(category, shop, options, optionsCache) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f, _g;
         if (!((_a = category === null || category === void 0 ? void 0 : category.products) === null || _a === void 0 ? void 0 : _a.length))
             return [];
-        const mostRelevants = category.getMostRelevantByShop(shop);
-        const mostRelevantProductsIds = [...new Set(mostRelevants.concat(category.products))];
+        if (((_b = this.cache) === null || _b === void 0 ? void 0 : _b.cacheAdapter) && ((_c = optionsCache === null || optionsCache === void 0 ? void 0 : optionsCache.cache) === null || _c === void 0 ? void 0 : _c.enabled)) {
+            const cacheKey = `${this.model.name.toLowerCase()}:mountCategory:${category.id}:${shop}:${MD5GeneratorHelper.generateMD5(options)}`;
+            const cachedData = await this.cache.cacheAdapter.get(cacheKey);
+            if (cachedData) {
+                this.logger.log(`Dados recuperados do cache: ${cacheKey}`);
+                return JSON.parse(cachedData);
+            }
+        }
+        const fields = [
+            'id',
+            'name',
+            'slug',
+            'images',
+            'miniatures',
+            'price',
+            'fullPrice',
+            'subscriberDiscountPercentage',
+            'subscriberPrice',
+            'stock',
+            'published',
+            'CEST',
+            'EAN',
+            'NCM',
+            'brand',
+            'costPrice',
+            'hasVariants',
+            'isKit',
+            'sku',
+            'rate',
+            'tags',
+            'type',
+            'shoppingCount',
+            'gender',
+            'createdAt',
+        ];
         const products = [];
-        const { data: productsData } = await this.productRepository.findCatalog({
-            filters: {
-                id: { operator: exports.Where.IN, value: mostRelevantProductsIds },
-                published: true,
-            },
-            fields: [
-                'id',
-                'name',
-                'slug',
-                'images',
-                'miniatures',
-                'price',
-                'fullPrice',
-                'subscriberDiscountPercentage',
-                'subscriberPrice',
-                'stock',
-                'published',
-                'CEST',
-                'EAN',
-                'NCM',
-                'brand',
-                'costPrice',
-                'hasVariants',
-                'isKit',
-                'sku',
-                'rate',
-                'tags',
-                'type',
-                'shoppingCount',
-                'gender',
-                'createdAt',
-            ],
-            options: { enableCount: false },
-            orderBy: {
+        const mostRelevantsIds = category.getMostRelevantByShop(shop);
+        if (mostRelevantsIds === null || mostRelevantsIds === void 0 ? void 0 : mostRelevantsIds.length) {
+            const { data: mostRelevants } = await this.productRepository.findCatalog({
+                filters: Object.assign({ id: {
+                        operator: exports.Where.IN,
+                        value: mostRelevantsIds,
+                    }, published: true }, (options.hasStock ? { stock: { quantity: { operator: exports.Where.GT, value: 0 } } } : {})),
+                fields,
+                options: { enableCount: false },
+                orderBy: {
+                    stock: 'desc',
+                    shoppingCount: 'desc',
+                    rate: 'desc',
+                    name: 'asc',
+                },
+            }, shop === exports.Shops.MENSMARKET ? 'male' : 'female', optionsCache);
+            if (mostRelevants.length >= mostRelevantsIds.length) {
+                const result = this.reorganizeMostRelevantsProducts(mostRelevants, mostRelevantsIds, options.limit);
+                if (((_d = this.cache) === null || _d === void 0 ? void 0 : _d.cacheAdapter) && ((_e = optionsCache === null || optionsCache === void 0 ? void 0 : optionsCache.cache) === null || _e === void 0 ? void 0 : _e.enabled))
+                    await this.saveToCache(category, shop, options, optionsCache, result);
+                return result;
+            }
+            products.push(...mostRelevants);
+        }
+        const productIds = category.products.filter((productId) => !mostRelevantsIds.includes(productId));
+        const { data: productsData } = await this.productRepository.findCatalog(Object.assign(Object.assign({ filters: Object.assign({ id: {
+                    operator: exports.Where.IN,
+                    value: productIds,
+                }, published: true }, (options.hasStock ? { stock: { quantity: { operator: exports.Where.GT, value: 0 } } } : {})) }, (options.limit ? { limits: { limit: options.limit } } : {})), { fields, options: { enableCount: false }, orderBy: {
+                stock: 'desc',
                 shoppingCount: 'desc',
                 rate: 'desc',
-                stock: 'desc',
                 name: 'asc',
-            },
-        }, shop === exports.Shops.MENSMARKET ? 'male' : 'female', optionsCache);
-        const mostRelevantWithouyStock = productsData.filter((product) => mostRelevants.includes(product.id) && product.stock.quantity <= 0);
-        const firstProducts = productsData
-            .filter((product) => mostRelevants.includes(product.id) && product.stock.quantity > 0)
-            .sort((a, b) => mostRelevants.indexOf(a.id) - mostRelevants.indexOf(b.id));
-        const lastProducts = productsData
-            .filter((product) => !mostRelevants.includes(product.id) && product.stock.quantity > 0)
-            .concat(mostRelevantWithouyStock);
-        const categoryMostRelevants = firstProducts.concat(lastProducts);
-        const resultFinal = categoryMostRelevants.slice(0, options.limit);
-        products.push(...resultFinal);
-        return products;
+            } }), shop === exports.Shops.MENSMARKET ? 'male' : 'female', optionsCache);
+        const result = this.reorganizeMostRelevantsProducts([...products, ...productsData], mostRelevantsIds, options.limit);
+        if (((_f = this.cache) === null || _f === void 0 ? void 0 : _f.cacheAdapter) && ((_g = optionsCache === null || optionsCache === void 0 ? void 0 : optionsCache.cache) === null || _g === void 0 ? void 0 : _g.enabled))
+            await this.saveToCache(category, shop, options, optionsCache, result);
+        return result;
     }
     async getChildren(parentId, _optionsCache) {
         const { category_tree } = await this.query('category_tree', ['id', 'name', 'parent_id', 'slug', 'reference', 'published', 'shops'], {
@@ -5893,6 +5924,16 @@ class CategoryHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGr
             return filters;
         }
     }
+    async saveToCache(category, shop, options, optionsCache, result) {
+        var _a;
+        const cacheKey = `${this.model.name.toLowerCase()}:mountCategory:${category.id}:${shop}:${MD5GeneratorHelper.generateMD5(options)}`;
+        await this.cache.cacheAdapter.set({
+            key: cacheKey,
+            data: JSON.stringify(result),
+            expirationInSeconds: ((_a = optionsCache === null || optionsCache === void 0 ? void 0 : optionsCache.cache) === null || _a === void 0 ? void 0 : _a.ttl) || this.cache.ttlDefault,
+        });
+        this.logger.log(`Dados salvos no cache: ${cacheKey}`);
+    }
 }
 tslib.__decorate([
     Log(),
@@ -5913,6 +5954,7 @@ tslib.__decorate([
     tslib.__metadata("design:returntype", Promise)
 ], CategoryHasuraGraphQLRepository.prototype, "getCategoriesForHome", null);
 tslib.__decorate([
+    Log(),
     Log(),
     tslib.__metadata("design:type", Function),
     tslib.__metadata("design:paramtypes", [Category, String, Object, Object]),

package/index.esm.js

@@ -5596,6 +5596,17 @@ class CategoryHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGr
         });
         this.productRepository = productRepository;
         this.categoryFilterRepository = categoryFilterRepository;
+        this.reorganizeMostRelevantsProducts = (products, mostRelevantsIds, limit) => {
+            const mostRelevantWithouyStock = products.filter((product) => mostRelevantsIds.includes(product.id) && product.stock.quantity <= 0);
+            const firstProducts = products
+                .filter((product) => mostRelevantsIds.includes(product.id) && product.stock.quantity > 0)
+                .sort((a, b) => mostRelevantsIds.indexOf(a.id) - mostRelevantsIds.indexOf(b.id));
+            const lastProducts = products
+                .filter((product) => !mostRelevantsIds.includes(product.id) && product.stock.quantity > 0)
+                .concat(mostRelevantWithouyStock);
+            const categoryMostRelevants = firstProducts.concat(lastProducts);
+            return limit ? categoryMostRelevants.slice(0, limit) : categoryMostRelevants;
+        };
     }
     async create(params) {
         const { images, mostRelevants, metadatas } = params, data = __rest(params, ["images", "mostRelevants", "metadatas"]);
@@ -5695,63 +5706,83 @@ class CategoryHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGr
         return homeSections;
     }
     async mountCategory(category, shop, options, optionsCache) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f, _g;
         if (!((_a = category === null || category === void 0 ? void 0 : category.products) === null || _a === void 0 ? void 0 : _a.length))
             return [];
-        const mostRelevants = category.getMostRelevantByShop(shop);
-        const mostRelevantProductsIds = [...new Set(mostRelevants.concat(category.products))];
+        if (((_b = this.cache) === null || _b === void 0 ? void 0 : _b.cacheAdapter) && ((_c = optionsCache === null || optionsCache === void 0 ? void 0 : optionsCache.cache) === null || _c === void 0 ? void 0 : _c.enabled)) {
+            const cacheKey = `${this.model.name.toLowerCase()}:mountCategory:${category.id}:${shop}:${MD5GeneratorHelper.generateMD5(options)}`;
+            const cachedData = await this.cache.cacheAdapter.get(cacheKey);
+            if (cachedData) {
+                this.logger.log(`Dados recuperados do cache: ${cacheKey}`);
+                return JSON.parse(cachedData);
+            }
+        }
+        const fields = [
+            'id',
+            'name',
+            'slug',
+            'images',
+            'miniatures',
+            'price',
+            'fullPrice',
+            'subscriberDiscountPercentage',
+            'subscriberPrice',
+            'stock',
+            'published',
+            'CEST',
+            'EAN',
+            'NCM',
+            'brand',
+            'costPrice',
+            'hasVariants',
+            'isKit',
+            'sku',
+            'rate',
+            'tags',
+            'type',
+            'shoppingCount',
+            'gender',
+            'createdAt',
+        ];
         const products = [];
-        const { data: productsData } = await this.productRepository.findCatalog({
-            filters: {
-                id: { operator: Where.IN, value: mostRelevantProductsIds },
-                published: true,
-            },
-            fields: [
-                'id',
-                'name',
-                'slug',
-                'images',
-                'miniatures',
-                'price',
-                'fullPrice',
-                'subscriberDiscountPercentage',
-                'subscriberPrice',
-                'stock',
-                'published',
-                'CEST',
-                'EAN',
-                'NCM',
-                'brand',
-                'costPrice',
-                'hasVariants',
-                'isKit',
-                'sku',
-                'rate',
-                'tags',
-                'type',
-                'shoppingCount',
-                'gender',
-                'createdAt',
-            ],
-            options: { enableCount: false },
-            orderBy: {
+        const mostRelevantsIds = category.getMostRelevantByShop(shop);
+        if (mostRelevantsIds === null || mostRelevantsIds === void 0 ? void 0 : mostRelevantsIds.length) {
+            const { data: mostRelevants } = await this.productRepository.findCatalog({
+                filters: Object.assign({ id: {
+                        operator: Where.IN,
+                        value: mostRelevantsIds,
+                    }, published: true }, (options.hasStock ? { stock: { quantity: { operator: Where.GT, value: 0 } } } : {})),
+                fields,
+                options: { enableCount: false },
+                orderBy: {
+                    stock: 'desc',
+                    shoppingCount: 'desc',
+                    rate: 'desc',
+                    name: 'asc',
+                },
+            }, shop === Shops.MENSMARKET ? 'male' : 'female', optionsCache);
+            if (mostRelevants.length >= mostRelevantsIds.length) {
+                const result = this.reorganizeMostRelevantsProducts(mostRelevants, mostRelevantsIds, options.limit);
+                if (((_d = this.cache) === null || _d === void 0 ? void 0 : _d.cacheAdapter) && ((_e = optionsCache === null || optionsCache === void 0 ? void 0 : optionsCache.cache) === null || _e === void 0 ? void 0 : _e.enabled))
+                    await this.saveToCache(category, shop, options, optionsCache, result);
+                return result;
+            }
+            products.push(...mostRelevants);
+        }
+        const productIds = category.products.filter((productId) => !mostRelevantsIds.includes(productId));
+        const { data: productsData } = await this.productRepository.findCatalog(Object.assign(Object.assign({ filters: Object.assign({ id: {
+                    operator: Where.IN,
+                    value: productIds,
+                }, published: true }, (options.hasStock ? { stock: { quantity: { operator: Where.GT, value: 0 } } } : {})) }, (options.limit ? { limits: { limit: options.limit } } : {})), { fields, options: { enableCount: false }, orderBy: {
+                stock: 'desc',
                 shoppingCount: 'desc',
                 rate: 'desc',
-                stock: 'desc',
                 name: 'asc',
-            },
-        }, shop === Shops.MENSMARKET ? 'male' : 'female', optionsCache);
-        const mostRelevantWithouyStock = productsData.filter((product) => mostRelevants.includes(product.id) && product.stock.quantity <= 0);
-        const firstProducts = productsData
-            .filter((product) => mostRelevants.includes(product.id) && product.stock.quantity > 0)
-            .sort((a, b) => mostRelevants.indexOf(a.id) - mostRelevants.indexOf(b.id));
-        const lastProducts = productsData
-            .filter((product) => !mostRelevants.includes(product.id) && product.stock.quantity > 0)
-            .concat(mostRelevantWithouyStock);
-        const categoryMostRelevants = firstProducts.concat(lastProducts);
-        const resultFinal = categoryMostRelevants.slice(0, options.limit);
-        products.push(...resultFinal);
-        return products;
+            } }), shop === Shops.MENSMARKET ? 'male' : 'female', optionsCache);
+        const result = this.reorganizeMostRelevantsProducts([...products, ...productsData], mostRelevantsIds, options.limit);
+        if (((_f = this.cache) === null || _f === void 0 ? void 0 : _f.cacheAdapter) && ((_g = optionsCache === null || optionsCache === void 0 ? void 0 : optionsCache.cache) === null || _g === void 0 ? void 0 : _g.enabled))
+            await this.saveToCache(category, shop, options, optionsCache, result);
+        return result;
     }
     async getChildren(parentId, _optionsCache) {
         const { category_tree } = await this.query('category_tree', ['id', 'name', 'parent_id', 'slug', 'reference', 'published', 'shops'], {
@@ -5887,6 +5918,16 @@ class CategoryHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGr
             return filters;
         }
     }
+    async saveToCache(category, shop, options, optionsCache, result) {
+        var _a;
+        const cacheKey = `${this.model.name.toLowerCase()}:mountCategory:${category.id}:${shop}:${MD5GeneratorHelper.generateMD5(options)}`;
+        await this.cache.cacheAdapter.set({
+            key: cacheKey,
+            data: JSON.stringify(result),
+            expirationInSeconds: ((_a = optionsCache === null || optionsCache === void 0 ? void 0 : optionsCache.cache) === null || _a === void 0 ? void 0 : _a.ttl) || this.cache.ttlDefault,
+        });
+        this.logger.log(`Dados salvos no cache: ${cacheKey}`);
+    }
 }
 __decorate([
     Log(),
@@ -5907,6 +5948,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], CategoryHasuraGraphQLRepository.prototype, "getCategoriesForHome", null);
 __decorate([
+    Log(),
     Log(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Category, String, Object, Object]),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infrab4a/connect",
-  "version": "4.25.0-beta.8",
+  "version": "4.25.0",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },

package/src/infra/hasura-graphql/repositories/catalog/category-hasura-graphql.repository.d.ts

@@ -42,5 +42,7 @@ export declare class CategoryHasuraGraphQLRepository extends CategoryHasuraGraph
     private updateProducts;
     private updateMetadata;
     private updateFilters;
+    private saveToCache;
+    private reorganizeMostRelevantsProducts;
 }
 export {};