@infrab4a/connect 4.25.0-beta.7 → 4.25.0-beta.9

package/index.esm.js

@@ -3598,24 +3598,39 @@ class MD5GeneratorHelper {
     }
 }
 
+class FirestoreCacheKeyGeneratorHelper {
+    static generateGetCacheKey(model, identifiers) {
+        const sortedEntries = Object.entries(identifiers).sort(([keyA], [keyB]) => keyA.localeCompare(keyB));
+        const keyParts = [];
+        for (const [key, value] of sortedEntries) {
+            keyParts.push(`${key}:${value}`);
+        }
+        return `${model.name.toLowerCase()}:get:${keyParts.join(':')}`;
+    }
+    static generateFindCacheKey(model, findParams) {
+        const md5 = MD5GeneratorHelper.generateMD5(findParams);
+        return `${model.name.toLowerCase()}:find:${md5}`;
+    }
+}
+
 const withGetFirestore = (MixinBase) => {
     return class GetFirestore extends MixinBase {
-        async get(identifiers) {
-            var _a, _b, _c, _d, _e, _f;
+        async get(identifiers, options) {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const logger = this.logger.with('get');
             const collectionName = this.buildCollectionPathForGet(identifiers);
             const instance = this.model.toInstance(this.model.identifiersFields.reduce((acc, field) => (Object.assign(Object.assign({}, acc), { [field]: identifiers[field] })), {}));
             const req = { collection: collectionName, data: identifiers };
-            if ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.cacheAdapter) {
-                const cacheKey = CacheKeyGeneratorHelper.generateCacheKeyFromIdentifiers(this.model, identifiers);
+            if (((_a = this.cache) === null || _a === void 0 ? void 0 : _a.cacheAdapter) && ((_b = options === null || options === void 0 ? void 0 : options.cache) === null || _b === void 0 ? void 0 : _b.enabled) !== false) {
+                const cacheKey = FirestoreCacheKeyGeneratorHelper.generateGetCacheKey(this.model, identifiers);
                 const cachedData = await this.cache.cacheAdapter.get(cacheKey);
                 if (cachedData) {
                     logger.log({ req, res: 'Dados recuperados do cache', cacheKey });
-                    return this.model.toInstance(cachedData);
+                    return this.model.toInstance(JSON.parse(cachedData));
                 }
             }
             try {
-                const intercepted = await ((_c = (_b = this.interceptors) === null || _b === void 0 ? void 0 : _b.request) === null || _c === void 0 ? void 0 : _c.call(_b, { instance }));
+                const intercepted = await ((_d = (_c = this.interceptors) === null || _c === void 0 ? void 0 : _c.request) === null || _d === void 0 ? void 0 : _d.call(_c, { instance }));
                 const builded = (intercepted === null || intercepted === void 0 ? void 0 : intercepted.instance) || instance;
                 const docRef = await this.collection(collectionName)
                     .getDoc(Object.values(builded.identifier).shift().toString())
@@ -3623,14 +3638,14 @@ const withGetFirestore = (MixinBase) => {
                 const data = docRef.data();
                 if (isNil(data))
                     throw new NotFoundError(`Document '${collectionName}/${Object.values(identifiers).shift()}' not found`);
-                const res = ((_e = (_d = this.interceptors) === null || _d === void 0 ? void 0 : _d.response) === null || _e === void 0 ? void 0 : _e.call(_d, data, intercepted)) || data;
+                const res = (await ((_f = (_e = this.interceptors) === null || _e === void 0 ? void 0 : _e.response) === null || _f === void 0 ? void 0 : _f.call(_e, data, intercepted))) || data;
                 logger.log({ req, res });
-                if ((_f = this.cache) === null || _f === void 0 ? void 0 : _f.cacheAdapter) {
-                    const cacheKey = CacheKeyGeneratorHelper.generateCacheKeyFromIdentifiers(this.model, identifiers);
+                if (((_g = this.cache) === null || _g === void 0 ? void 0 : _g.cacheAdapter) && ((_h = options === null || options === void 0 ? void 0 : options.cache) === null || _h === void 0 ? void 0 : _h.enabled) !== false) {
+                    const cacheKey = FirestoreCacheKeyGeneratorHelper.generateGetCacheKey(this.model, identifiers);
                     await this.cache.cacheAdapter.set({
                         key: cacheKey,
-                        data: res,
-                        expirationInSeconds: this.cache.ttlDefault,
+                        data: JSON.stringify((res === null || res === void 0 ? void 0 : res.toPlain()) || res),
+                        expirationInSeconds: ((_j = options === null || options === void 0 ? void 0 : options.cache) === null || _j === void 0 ? void 0 : _j.ttl) || this.cache.ttlDefault,
                     });
                     logger.log({ req, message: 'Dados salvos no cache', cacheKey });
                 }
@@ -3723,15 +3738,26 @@ const withFindFirestore = (MixinBase) => {
                 ]);
             };
         }
-        async find(find = {}) {
-            var _a, _b, _c, _d, _e, _f;
+        generateCacheKey(findParams) {
+            return FirestoreCacheKeyGeneratorHelper.generateFindCacheKey(this.model, findParams);
+        }
+        async find(find = {}, options) {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             const logger = this.logger.with('find');
+            if (((_a = this.cache) === null || _a === void 0 ? void 0 : _a.cacheAdapter) && ((_b = options === null || options === void 0 ? void 0 : options.cache) === null || _b === void 0 ? void 0 : _b.enabled) !== false) {
+                const cacheKey = this.generateCacheKey(find);
+                const cachedData = await this.cache.cacheAdapter.get(cacheKey);
+                if (cachedData) {
+                    logger.log(`Dados recuperados do cache: ${cacheKey}`);
+                    return JSON.parse(cachedData);
+                }
+            }
             const collectionName = this.buildCollectionPathForFind(find.filters);
             const collection = this.collection(collectionName);
-            const enableCount = (_b = (_a = find === null || find === void 0 ? void 0 : find.options) === null || _a === void 0 ? void 0 : _a.enableCount) !== null && _b !== void 0 ? _b : true;
+            const enableCount = (_d = (_c = find === null || find === void 0 ? void 0 : find.options) === null || _c === void 0 ? void 0 : _c.enableCount) !== null && _d !== void 0 ? _d : true;
             const req = { collection: collectionName, data: find };
             try {
-                const intercepted = await ((_d = (_c = this.interceptors) === null || _c === void 0 ? void 0 : _c.request) === null || _d === void 0 ? void 0 : _d.call(_c, { find }));
+                const intercepted = await ((_f = (_e = this.interceptors) === null || _e === void 0 ? void 0 : _e.request) === null || _f === void 0 ? void 0 : _f.call(_e, { find }));
                 const { fields, filters, limits, orderBy } = (intercepted === null || intercepted === void 0 ? void 0 : intercepted.find) || find;
                 const queries = this.makeFirestoreWhere(filters || {});
                 const ordination = this.makeFirestoreOrderBy(filters, orderBy);
@@ -3741,10 +3767,19 @@ const withFindFirestore = (MixinBase) => {
                     .getDocs();
                 const data = docs.docs.map((doc) => doc.data());
                 const res = {
-                    data: (await ((_f = (_e = this.interceptors) === null || _e === void 0 ? void 0 : _e.response) === null || _f === void 0 ? void 0 : _f.call(_e, data, intercepted))) || data,
+                    data: (await ((_h = (_g = this.interceptors) === null || _g === void 0 ? void 0 : _g.response) === null || _h === void 0 ? void 0 : _h.call(_g, data, intercepted))) || data,
                     count: enableCount ? this.calculateCount(data, limits) : Infinity,
                 };
                 logger.log({ req, queries, ordination, offsets, res });
+                if (((_j = this.cache) === null || _j === void 0 ? void 0 : _j.cacheAdapter) && ((_k = options === null || options === void 0 ? void 0 : options.cache) === null || _k === void 0 ? void 0 : _k.enabled) !== false) {
+                    const cacheKey = this.generateCacheKey(find);
+                    await this.cache.cacheAdapter.set({
+                        key: cacheKey,
+                        data: JSON.stringify(res),
+                        expirationInSeconds: ((_l = options === null || options === void 0 ? void 0 : options.cache) === null || _l === void 0 ? void 0 : _l.ttl) || this.cache.ttlDefault,
+                    });
+                    logger.log(`Dados salvos no cache: ${cacheKey}`);
+                }
                 return res;
             }
             catch (error) {
@@ -3848,24 +3883,41 @@ const withUpdateFirestore = (MixinBase) => {
         return options === null || options === void 0 ? void 0 : options.value;
     };
     return class UpdateFirestore extends MixinBase {
+        getIdentifiersFromData(data) {
+            const identifiers = {};
+            const model = new this.model();
+            const keyField = model.identifiersFields.shift();
+            const identifierValue = getValueFromParams(data, keyField);
+            identifiers[keyField] = identifierValue;
+            return identifiers;
+        }
+        generateCacheKey(identifiers) {
+            return FirestoreCacheKeyGeneratorHelper.generateGetCacheKey(this.model, identifiers);
+        }
         async update(data) {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             const logger = this.logger.with('update');
             const collectionName = this.buildCollectionPathForUpdate(data);
             const model = new this.model();
             const keyField = model.identifiersFields.shift();
             const req = { collection: collectionName, data };
+            if ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.cacheAdapter) {
+                const identifiers = this.getIdentifiersFromData(data);
+                const cacheKey = this.generateCacheKey(identifiers);
+                await this.cache.cacheAdapter.remove(cacheKey);
+                logger.log(`Cache removido: ${cacheKey}`);
+            }
             try {
                 const identifiers = getValueFromParams(data, keyField);
                 const docRef = this.collection(collectionName).getDoc(identifiers.toString());
                 if (!(await docRef.get()).data())
                     throw new NotFoundError(`Document '${collectionName}/${Object.values(identifiers.toString())}' not found`);
                 const plainFromData = this.model.toInstance(this.paramsToPlain(data));
-                const intercepted = await ((_b = (_a = this.interceptors) === null || _a === void 0 ? void 0 : _a.request) === null || _b === void 0 ? void 0 : _b.call(_a, { instance: plainFromData }));
+                const intercepted = await ((_c = (_b = this.interceptors) === null || _b === void 0 ? void 0 : _b.request) === null || _c === void 0 ? void 0 : _c.call(_b, { instance: plainFromData }));
                 const builded = (intercepted === null || intercepted === void 0 ? void 0 : intercepted.instance) || plainFromData;
                 await docRef.save(builded.toPlain());
                 const docData = await docRef.get();
-                const res = ((_d = (_c = this.interceptors) === null || _c === void 0 ? void 0 : _c.response) === null || _d === void 0 ? void 0 : _d.call(_c, docData.data(), intercepted)) || docData.data();
+                const res = ((_e = (_d = this.interceptors) === null || _d === void 0 ? void 0 : _d.response) === null || _e === void 0 ? void 0 : _e.call(_d, docData.data(), intercepted)) || docData.data();
                 logger.log({ req, res, identifiers });
                 return res;
             }
@@ -3891,17 +3943,25 @@ const withUpdateFirestore = (MixinBase) => {
 
 const withDeleteFirestore = (MixinBase) => {
     return class DeleteFirestore extends MixinBase {
+        generateCacheKey(identifiers) {
+            return FirestoreCacheKeyGeneratorHelper.generateGetCacheKey(this.model, identifiers);
+        }
         async delete(identifiers) {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             const logger = this.logger.with('delete');
             const collectionName = this.buildCollectionPathForRemove(identifiers);
             const instance = this.model.toInstance(this.model.identifiersFields.reduce((acc, field) => (Object.assign(Object.assign({}, acc), { [field]: identifiers[field] })), {}));
             const req = { collection: collectionName, data: identifiers };
+            if ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.cacheAdapter) {
+                const cacheKey = this.generateCacheKey(identifiers);
+                await this.cache.cacheAdapter.remove(cacheKey);
+                logger.log(`Cache removido: ${cacheKey}`);
+            }
             try {
-                const intercepted = await ((_b = (_a = this.interceptors) === null || _a === void 0 ? void 0 : _a.request) === null || _b === void 0 ? void 0 : _b.call(_a, { instance }));
+                const intercepted = await ((_c = (_b = this.interceptors) === null || _b === void 0 ? void 0 : _b.request) === null || _c === void 0 ? void 0 : _c.call(_b, { instance }));
                 const builded = (intercepted === null || intercepted === void 0 ? void 0 : intercepted.instance) || instance;
                 await this.collection(collectionName).getDoc(Object.values(builded.identifier).shift().toString()).delete();
-                await ((_d = (_c = this.interceptors) === null || _c === void 0 ? void 0 : _c.response) === null || _d === void 0 ? void 0 : _d.call(_c, instance, intercepted));
+                await ((_e = (_d = this.interceptors) === null || _d === void 0 ? void 0 : _d.response) === null || _e === void 0 ? void 0 : _e.call(_d, instance, intercepted));
                 logger.log({ req, res: undefined });
             }
             catch (error) {
@@ -4146,12 +4206,13 @@ class SequenceFirestoreRepository extends withCrudFirestore(withHelpers(withFire
 }
 
 class HomeFirestoreRepository extends withCrudFirestore(withHelpers(withFirestore(Base))) {
-    constructor({ firestore, interceptors }) {
+    constructor({ firestore, interceptors, cache, }) {
         super({
             firestore,
             collectionName: 'dms',
             model: Home,
             interceptors,
+            cache,
         });
         this.homeCategoryGroupToPlain = (homeCategoryGroup) => {
             var _a, _b, _c;
@@ -4208,89 +4269,97 @@ class HomeFirestoreRepository extends withCrudFirestore(withHelpers(withFirestor
 }
 
 class ShopMenuFirestoreRepository extends withCrudFirestore(withHelpers(withFirestore(Base))) {
-    constructor({ firestore, interceptors }) {
+    constructor({ firestore, interceptors, cache, }) {
         super({
             firestore,
             collectionName: 'shopMenus',
             model: ShopMenu,
             interceptors,
+            cache,
         });
     }
 }
 
 class ShopSettingsFirestoreRepository extends withCrudFirestore(withHelpers(withFirestore(Base))) {
-    constructor({ firestore, interceptors, }) {
+    constructor({ firestore, interceptors, cache, }) {
         super({
             firestore,
             collectionName: 'shopSettings',
             model: ShopSettings,
             interceptors,
+            cache,
         });
     }
 }
 
 class Buy2WinFirestoreRepository extends withCrudFirestore(withHelpers(withFirestore(Base))) {
-    constructor({ firestore, interceptors }) {
+    constructor({ firestore, interceptors, cache, }) {
         super({
             firestore,
             collectionName: 'buy2win',
             model: Buy2Win,
             interceptors,
+            cache,
         });
     }
 }
 
 class CampaignDashboardFirestoreRepository extends withCrudFirestore(withHelpers(withFirestore(Base))) {
-    constructor({ firestore, interceptors, }) {
+    constructor({ firestore, interceptors, cache, }) {
         super({
             firestore,
             collectionName: 'dashboardCampaignsAuto',
             model: CampaignDashboard,
             interceptors,
+            cache,
         });
     }
 }
 
 class CampaignHashtagFirestoreRepository extends withCrudFirestore(withHelpers(withFirestore(Base))) {
-    constructor({ firestore, interceptors, }) {
+    constructor({ firestore, interceptors, cache, }) {
         super({
             firestore,
             collectionName: 'hashtagCampaignsAuto',
             model: CampaignHashtag,
             interceptors,
+            cache,
         });
     }
 }
 
 class CheckoutFirestoreRepository extends withCrudFirestore(withHelpers(withFirestore(Base))) {
-    constructor({ firestore, interceptors }) {
+    constructor({ firestore, interceptors, cache, }) {
         super({
             firestore,
             collectionName: 'checkouts',
             model: Checkout,
             interceptors,
+            cache,
         });
     }
 }
 
 class CheckoutSubscriptionFirestoreRepository extends withCrudFirestore(withHelpers(withFirestore(Base))) {
-    constructor({ firestore, interceptors, }) {
+    constructor({ firestore, interceptors, cache, }) {
         super({
             firestore,
             collectionName: 'checkoutsSubscription',
             model: CheckoutSubscription,
             interceptors,
+            cache,
         });
     }
 }
 
 class CouponFirestoreRepository extends withCrudFirestore(withHelpers(withFirestore(Base))) {
-    constructor({ firestore, interceptors }) {
+    constructor({ firestore, interceptors, cache, }) {
         super({
             firestore,
             collectionName: 'coupons',
             model: Coupon,
             interceptors,
+            cache,
         });
     }
     buildModelInstance() {
@@ -4313,12 +4382,13 @@ class CouponFirestoreRepository extends withCrudFirestore(withHelpers(withFirest
 }
 
 class OrderFirestoreRepository extends withCrudFirestore(withHelpers(withFirestore(Base))) {
-    constructor({ firestore, interceptors }) {
+    constructor({ firestore, interceptors, cache, }) {
         super({
             firestore,
             collectionName: 'orders',
             model: Order,
             interceptors,
+            cache,
             fields: {
                 status: FirestoreFieldType.String,
             },
@@ -4350,22 +4420,24 @@ class OrderFirestoreRepository extends withCrudFirestore(withHelpers(withFiresto
 }
 
 class LegacyOrderFirestoreRepository extends OrderFirestoreRepository {
-    constructor({ firestore, interceptors }) {
+    constructor({ firestore, interceptors, cache, }) {
         super({
             firestore,
             interceptors,
+            cache,
         });
         this.collectionName = 'legacyOrders';
     }
 }
 
 class OrderBlockedFirestoreRepository extends withCrudFirestore(withHelpers(withFirestore(Base))) {
-    constructor({ firestore, interceptors, }) {
+    constructor({ firestore, interceptors, cache, }) {
         super({
             firestore,
             collectionName: 'paymentBlockedAttempts',
             model: OrderBlocked,
             interceptors,
+            cache,
         });
     }
     async createBlockedOrderOrPayment(checkout, blockType, type, limiteRange, card = null) {
@@ -4397,130 +4469,141 @@ class OrderBlockedFirestoreRepository extends withCrudFirestore(withHelpers(with
 }
 
 class PaymentFirestoreRepository extends withCrudFirestore(withHelpers(withFirestore(Base))) {
-    constructor({ firestore, interceptors }) {
+    constructor({ firestore, interceptors, cache, }) {
         super({
             firestore,
             collectionName: 'payments',
             model: Payment,
             interceptors,
+            cache,
         });
     }
 }
 
 class SubscriptionPlanFirestoreRepository extends withCrudFirestore(withHelpers(withFirestore(Base))) {
-    constructor({ firestore, interceptors, }) {
+    constructor({ firestore, interceptors, cache, }) {
         super({
             firestore,
             collectionName: 'subscriptionPlans',
             model: SubscriptionPlan,
             interceptors,
+            cache,
         });
     }
 }
 
 class LeadFirestoreRepository extends withCrudFirestore(withHelpers(withFirestore(Base))) {
-    constructor({ firestore, interceptors }) {
+    constructor({ firestore, interceptors, cache, }) {
         super({
             firestore,
             collectionName: 'leads',
             model: Lead,
             interceptors,
+            cache,
         });
     }
 }
 
 class SubscriptionEditionFirestoreRepository extends withSubCollection(withCrudFirestore(withHelpers(withFirestore(Base)))) {
-    constructor({ firestore, interceptors }, parentRepository) {
+    constructor({ firestore, interceptors, cache, }, parentRepository) {
         super({
             firestore,
             collectionName: 'editions',
             parentIdField: 'subscriptionId',
             model: Edition,
             interceptors,
+            cache,
         });
         this.parentRepository = parentRepository;
     }
 }
 
 class SubscriptionFirestoreRepository extends withCrudFirestore(withHelpers(withFirestore(Base))) {
-    constructor({ firestore, interceptors, }) {
+    constructor({ firestore, interceptors, cache, }) {
         super({
             firestore,
             collectionName: 'subscription',
             model: Subscription,
             interceptors,
+            cache,
         });
     }
 }
 
 class SubscriptionMaterializationFirestoreRepository extends withCrudFirestore(withHelpers(withFirestore(Base))) {
-    constructor({ firestore, interceptors }) {
+    constructor({ firestore, interceptors, cache, }) {
         super({
             firestore,
             collectionName: 'subscriptionMaterialization',
             model: SubscriptionMaterialization,
             interceptors,
+            cache,
         });
     }
 }
 
 class SubscriptionPaymentFirestoreRepository extends withSubCollection(withCrudFirestore(withHelpers(withFirestore(Base)))) {
-    constructor({ firestore, interceptors }, parentRepository) {
+    constructor({ firestore, interceptors, cache, }, parentRepository) {
         super({
             firestore,
             collectionName: 'payments',
             parentIdField: 'subscriptionId',
             model: SubscriptionPayment,
             interceptors,
+            cache,
         });
         this.parentRepository = parentRepository;
     }
 }
 
 class SubscriptionSummaryFirestoreRepository extends withCrudFirestore(withHelpers(withFirestore(Base))) {
-    constructor({ firestore, interceptors, }) {
+    constructor({ firestore, interceptors, cache, }) {
         super({
             firestore,
             collectionName: 'subscriptionSummary',
             model: SubscriptionSummary,
             interceptors,
+            cache,
         });
     }
 }
 
 class UserAddressFirestoreRepository extends withSubCollection(withCrudFirestore(withHelpers(withFirestore(Base)))) {
-    constructor({ firestore, interceptors }, parentRepository) {
+    constructor({ firestore, interceptors, cache, }, parentRepository) {
         super({
             firestore,
             collectionName: 'address',
             parentIdField: 'userId',
             model: UserAddress,
             interceptors,
+            cache,
         });
         this.parentRepository = parentRepository;
     }
 }
 
 class UserBeautyProfileFirestoreRepository extends withSubCollection(withCrudFirestore(withHelpers(withFirestore(Base)))) {
-    constructor({ firestore, interceptors }, parentRepository) {
+    constructor({ firestore, interceptors, cache, }, parentRepository) {
         super({
             firestore,
             collectionName: 'CX',
             parentIdField: 'userId',
             model: BeautyProfile,
             interceptors,
+            cache,
         });
         this.parentRepository = parentRepository;
     }
 }
 
 class UserFirestoreRepository extends withCrudFirestore(withHelpers(withFirestore(Base))) {
-    constructor({ firestore, interceptors }) {
+    constructor({ firestore, interceptors, cache, }) {
         super({
             firestore,
             collectionName: 'users',
             model: User,
             interceptors,
+            cache,
         });
     }
     async get(identifiers) {
@@ -4580,13 +4663,14 @@ __decorate([
 ], UserFirestoreRepository.prototype, "checkIfExistsByField", null);
 
 class UserPaymentMethodFirestoreRepository extends withSubCollection(withCrudFirestore(withHelpers(withFirestore(Base)))) {
-    constructor({ firestore, interceptors }, parentRepository) {
+    constructor({ firestore, interceptors, cache, }, parentRepository) {
         super({
             firestore,
             collectionName: 'payment_method',
             parentIdField: 'userId',
             model: UserPaymentMethod,
             interceptors,
+            cache,
         });
         this.parentRepository = parentRepository;
     }
@@ -5253,7 +5337,7 @@ __decorate([
 ], ProductErrorsHasuraGraphQL.prototype, "product", void 0);
 
 class CategoryCollectionChildrenHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGraphQL(Base)) {
-    constructor({ endpoint, authOptions, interceptors, }) {
+    constructor({ endpoint, authOptions, interceptors, cache, }) {
         super({
             tableName: 'category_collection_children',
             model: CategoryCollectionChildren,
@@ -5284,12 +5368,13 @@ class CategoryCollectionChildrenHasuraGraphQLRepository extends withCrudHasuraGr
                     },
                 },
             ],
+            cache,
         });
     }
 }
 
 class CategoryFilterHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGraphQL(Base)) {
-    constructor({ endpoint, authOptions, interceptors, }) {
+    constructor({ endpoint, authOptions, interceptors, cache, }) {
         super({
             tableName: 'category_filter',
             model: CategoryFilter,
@@ -5371,6 +5456,7 @@ class CategoryFilterHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHa
                     },
                 },
             ],
+            cache,
         });
     }
     deleteByCategory(categoryId) {
@@ -5615,12 +5701,10 @@ class CategoryHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGr
         const mostRelevants = category.getMostRelevantByShop(shop);
         const mostRelevantProductsIds = [...new Set(mostRelevants.concat(category.products))];
         const products = [];
-        const { data: productsData } = await this.productRepository.findCatalog({
-            filters: {
-                id: { operator: Where.IN, value: mostRelevantProductsIds },
-                published: true,
-            },
-            fields: [
+        const { data: productsData } = await this.productRepository.findCatalog(Object.assign(Object.assign({ filters: Object.assign({ id: {
+                    operator: Where.IN,
+                    value: mostRelevantProductsIds,
+                }, published: true }, (options.hasStock ? { stock: { quantity: { operator: Where.GT, value: 0 } } } : {})) }, (options.limit ? { limit: options.limit } : {})), { fields: [
                 'id',
                 'name',
                 'slug',
@@ -5646,15 +5730,12 @@ class CategoryHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGr
                 'shoppingCount',
                 'gender',
                 'createdAt',
-            ],
-            options: { enableCount: false },
-            orderBy: {
+            ], options: { enableCount: false }, orderBy: {
+                stock: 'desc',
                 shoppingCount: 'desc',
                 rate: 'desc',
-                stock: 'desc',
                 name: 'asc',
-            },
-        }, shop === Shops.MENSMARKET ? 'male' : 'female', optionsCache);
+            } }), 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)
@@ -5840,7 +5921,7 @@ __decorate([
 ], CategoryHasuraGraphQLRepository.prototype, "isChild", null);
 
 class CategoryProductHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGraphQL(Base)) {
-    constructor({ endpoint, authOptions, interceptors, }) {
+    constructor({ endpoint, authOptions, interceptors, cache, }) {
         super({
             tableName: 'category_product',
             model: CategoryProduct,
@@ -5848,6 +5929,7 @@ class CategoryProductHasuraGraphQLRepository extends withCrudHasuraGraphQL(withH
             authOptions,
             interceptors,
             fields: [{ productId: { columnName: 'product_id' } }, { categoryId: { columnName: 'category_id' } }, 'order'],
+            cache,
         });
     }
     async removeProductFromCategory(categoryId, productId) {
@@ -5874,7 +5956,7 @@ class CategoryProductHasuraGraphQLRepository extends withCrudHasuraGraphQL(withH
 }
 
 class FilterHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGraphQL(Base)) {
-    constructor({ endpoint, authOptions, interceptors, }, filterOptionRepository, categoryFilterRepository) {
+    constructor({ endpoint, authOptions, interceptors, cache, }, filterOptionRepository, categoryFilterRepository) {
         super({
             tableName: 'filter',
             model: Filter,
@@ -5914,6 +5996,7 @@ class FilterHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGrap
                     },
                 },
             ],
+            cache,
         });
         this.filterOptionRepository = filterOptionRepository;
         this.categoryFilterRepository = categoryFilterRepository;
@@ -6000,7 +6083,7 @@ __decorate([
 ], FilterHasuraGraphQLRepository.prototype, "deleteOptions", null);
 
 class FilterOptionHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGraphQL(Base)) {
-    constructor({ endpoint, authOptions, interceptors, }) {
+    constructor({ endpoint, authOptions, interceptors, cache, }) {
         super({
             tableName: 'filter_option',
             model: FilterOption,
@@ -6014,18 +6097,20 @@ class FilterOptionHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasu
                 { createdAt: { columnName: 'created_at' } },
                 { updatedAt: { columnName: 'updated_at' } },
             ],
+            cache,
         });
     }
 }
 
 class ProductErrorsHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGraphQL(Base)) {
-    constructor({ endpoint, authOptions, interceptors, }, productRepository) {
+    constructor({ endpoint, authOptions, interceptors, cache, }, productRepository) {
         super({
             tableName: 'product_errors',
             model: ProductErrorsHasuraGraphQL,
             endpoint,
             authOptions,
             interceptors,
+            cache,
             fields: [
                 {
                     productId: {
@@ -6739,7 +6824,7 @@ __decorate([
 ], ProductHasuraGraphQLRepository.prototype, "findReviewsByProduct", null);
 
 class ProductReviewHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGraphQL(Base)) {
-    constructor({ endpoint, authOptions, interceptors, }) {
+    constructor({ endpoint, authOptions, interceptors, cache, }) {
         super({
             tableName: 'product_review',
             model: ProductReview,
@@ -6763,6 +6848,7 @@ class ProductReviewHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHas
                 { createdAt: { columnName: 'created_at' } },
                 { updatedAt: { columnName: 'updated_at' } },
             ],
+            cache,
         });
     }
     async updateManyStatus(reviews) {
@@ -6804,13 +6890,14 @@ __decorate([
 ], ProductReviewHasuraGraphQLRepository.prototype, "disaproveReview", null);
 
 class ProductStockNotificationHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGraphQL(Base)) {
-    constructor({ endpoint, authOptions, interceptors, }) {
+    constructor({ endpoint, authOptions, interceptors, cache, }) {
         super({
             tableName: 'product_stock_notification',
             model: ProductStockNotification,
             endpoint,
             authOptions,
             interceptors,
+            cache,
             fields: [
                 'id',
                 { productId: { columnName: 'product_id' } },
@@ -6865,13 +6952,14 @@ class ProductStockNotificationHasuraGraphQLRepository extends withCrudHasuraGrap
 }
 
 class VariantHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGraphQL(Base)) {
-    constructor({ endpoint, authOptions, interceptors, }) {
+    constructor({ endpoint, authOptions, interceptors, cache, }) {
         super({
             tableName: 'product',
             model: VariantHasuraGraphQL,
             endpoint,
             authOptions,
             interceptors,
+            cache,
             fields: [
                 { id: { columnName: 'id', to: (value) => +value, from: (value) => value.toString() } },
                 { firestoreId: { columnName: 'firestore_id' } },
@@ -6978,13 +7066,14 @@ class WishlistHasuraGraphQL extends Wishlist {
 }
 
 class WishlistHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGraphQL(Base)) {
-    constructor({ endpoint, authOptions, interceptors, }, categoryProductRepository) {
+    constructor({ endpoint, authOptions, interceptors, cache, }, categoryProductRepository) {
         super({
             tableName: 'category',
             model: WishlistHasuraGraphQL,
             endpoint,
             authOptions,
             interceptors,
+            cache,
             fields: [
                 { id: { columnName: 'id', to: (value) => +value, from: (value) => value.toString() } },
                 { firestoreId: { columnName: 'firestore_id' } },