@infrab4a/connect 5.4.0-beta.6 → 5.4.0-beta.8

package/index.cjs.js

@@ -7384,6 +7384,7 @@ const commonFields$1 = [
     { tagsProfile: { columnName: 'tags_profile', type: HasuraGraphQLColumnType.Jsonb } },
     { daysOfUse: { columnName: 'days_of_use' } },
     { showVariants: { columnName: 'show_variants' } },
+    { variantSlug: { columnName: 'variant_slug' } },
 ];
 class ProductCatalogHasuraGraphQLRepository extends withFindHasuraGraphQL(withHasuraGraphQL(Base)) {
     constructor({ endpoint, authOptions, interceptors, cache, }) {
@@ -7410,7 +7411,15 @@ class ProductCatalogHasuraGraphQLRepository extends withFindHasuraGraphQL(withHa
             .then((res) => res.data.at(0));
     }
     async getByEAN(EAN, options) {
-        return super
+        if (this.cache?.cacheAdapter && options?.cache?.enabled) {
+            const cacheKey = `${this.model.name.toLowerCase()}:EAN:${EAN}`;
+            const cachedData = await this.cache.cacheAdapter.get(cacheKey);
+            if (cachedData) {
+                this.logger.log(`Dados recuperados do cache: ${cacheKey}`);
+                return this.model.toInstance(deserialize(cachedData));
+            }
+        }
+        const product = await super
             .find({
             filters: {
                 EAN,
@@ -7420,6 +7429,19 @@ class ProductCatalogHasuraGraphQLRepository extends withFindHasuraGraphQL(withHa
             },
         })
             .then((res) => res.data.at(0));
+        if (!product)
+            return null;
+        RoundProductPricesHelper.roundProductPrices(product);
+        if (this.cache?.cacheAdapter && options?.cache?.enabled && product) {
+            const cacheKey = `${this.model.name.toLowerCase()}:EAN:${EAN}`;
+            await this.cache.cacheAdapter.set({
+                key: cacheKey,
+                data: serialize(product),
+                expirationInSeconds: options?.cache?.ttl || this.cache.ttlDefault,
+            });
+            this.logger.log(`Dados salvos no cache: ${cacheKey}`);
+        }
+        return product;
     }
     async find(params, optionsParams) {
         const { filters, fields, ...options } = params || {};
@@ -7712,6 +7734,7 @@ const commonFields = [
     { tagsProfile: { columnName: 'tags_profile', type: HasuraGraphQLColumnType.Jsonb } },
     { daysOfUse: { columnName: 'days_of_use' } },
     { showVariants: { columnName: 'show_variants' } },
+    { variantSlug: { columnName: 'variant_slug' } },
 ];
 const fieldsConfiguration$2 = [
     ...commonFields,
@@ -7904,6 +7927,28 @@ const fieldsConfiguration$2 = [
                 { tagsProfile: { columnName: 'tags_profile' } },
                 { tagsCollection: { columnName: 'tags_collection' } },
                 { variantSlug: { columnName: 'variant_slug' } },
+                {
+                    reviews: {
+                        columnName: 'reviews',
+                        foreignKeyColumn: { product_id: 'id' },
+                        fields: [
+                            'id',
+                            'shop',
+                            'rate',
+                            'author',
+                            'email',
+                            'location',
+                            'review',
+                            'status',
+                            'title',
+                            { personId: { columnName: 'person_id' } },
+                            'points',
+                            { orderId: { columnName: 'order_id' } },
+                            { createdAt: { columnName: 'created_at' } },
+                            { updatedAt: { columnName: 'updated_at' } },
+                        ],
+                    },
+                },
             ],
         },
     },
@@ -7967,10 +8012,14 @@ class ProductHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGra
             ? (await this.find({ filters: { firestoreId: identifiers.id }, options: { enableCount: false } }, options))
                 .data?.[0]
             : await super.get(identifiers, options);
-        // if (product.productId) throw new NotFoundError('Product not found, it is a variant')
-        product.reviews =
-            product.reviews ||
-                (await this.findReviewsByProduct(product.productId ? +product.productId : +product.id, false, options));
+        if (product.productId)
+            throw new NotFoundError('Product not found, it is a variant');
+        product.reviews = product.reviews || (await this.findReviewsByProduct(+product.id, false, options));
+        if (!product.variants?.length) {
+            for (const [index, variant] of product.variants.entries()) {
+                product.variants[index].reviews = await this.findReviewsByProduct(+variant.id, true);
+            }
+        }
         return product;
     }
     async find(params, optionsParams) {
@@ -7988,8 +8037,6 @@ class ProductHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGra
         return super.find({
             ...options,
             filters: { ...filters },
-            // filters: { ...filters, hasVariants: { operator: Where.EQUALS, value: false } },
-            // filters: { ...filters, productId: { operator: Where.ISNULL } },
             fields: [
                 ...bindFields,
                 ...(bindFields.includes('price')
@@ -8026,8 +8073,10 @@ class ProductHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGra
         if (!result.data.length)
             return null;
         const product = result?.data?.shift();
-        if (!product.reviews.length && product.rate > 0) {
-            product.reviews = await this.findReviewsByProduct((product.productId ? product.productId : product.id), true);
+        if (!product.variants?.length) {
+            for (const [index, variant] of product.variants.entries()) {
+                product.variants[index].reviews = await this.findReviewsByProduct(+variant.id, true);
+            }
         }
         RoundProductPricesHelper.roundProductPrices(product);
         if (this.cache?.cacheAdapter && options?.cache?.enabled && product) {
@@ -8041,18 +8090,6 @@ class ProductHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGra
         }
         return product;
     }
-    async getBySlugVariantData(product) {
-        if (!product.reviews.length && product.rate > 0) {
-            product.reviews = await this.findReviewsByProduct((product.productId ? product.productId : product.id), true);
-        }
-        // if (!product.metadata) {
-        //   product.metadata = await this.findReviewsByProduct(
-        //     (product.productId ? product.productId : product.id) as number,
-        //     true,
-        //   )
-        // }
-        return product;
-    }
     async getByEAN(EAN, options) {
         if (this.cache?.cacheAdapter && options?.cache?.enabled) {
             const cacheKey = `${this.model.name.toLowerCase()}:EAN:${EAN}`;
@@ -8260,6 +8297,11 @@ class ProductHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGra
                 type: 'product_review_bool_exp',
                 required: true,
             },
+            order_by: {
+                type: '[product_review_order_by]',
+                value: [{ createdAt: 'desc' }],
+                required: true,
+            },
         });
         const reviews = data?.map((review) => this.bindReviewToModel(review));
         if (this.cache?.cacheAdapter && options?.cache?.enabled && reviews) {
@@ -8687,6 +8729,28 @@ const fieldsConfiguration$1 = [
             }),
         },
     },
+    {
+        reviews: {
+            columnName: 'reviews',
+            foreignKeyColumn: { product_id: 'id' },
+            fields: [
+                'id',
+                'shop',
+                'rate',
+                'author',
+                'email',
+                'location',
+                'review',
+                'status',
+                'title',
+                { personId: { columnName: 'person_id' } },
+                'points',
+                { orderId: { columnName: 'order_id' } },
+                { createdAt: { columnName: 'created_at' } },
+                { updatedAt: { columnName: 'updated_at' } },
+            ],
+        },
+    },
     { variantSlug: { columnName: 'variant_slug' } },
     { createdAt: { columnName: 'created_at' } },
     { updatedAt: { columnName: 'updated_at' } },

package/index.esm.js

@@ -7360,6 +7360,7 @@ const commonFields$1 = [
     { tagsProfile: { columnName: 'tags_profile', type: HasuraGraphQLColumnType.Jsonb } },
     { daysOfUse: { columnName: 'days_of_use' } },
     { showVariants: { columnName: 'show_variants' } },
+    { variantSlug: { columnName: 'variant_slug' } },
 ];
 class ProductCatalogHasuraGraphQLRepository extends withFindHasuraGraphQL(withHasuraGraphQL(Base)) {
     constructor({ endpoint, authOptions, interceptors, cache, }) {
@@ -7386,7 +7387,15 @@ class ProductCatalogHasuraGraphQLRepository extends withFindHasuraGraphQL(withHa
             .then((res) => res.data.at(0));
     }
     async getByEAN(EAN, options) {
-        return super
+        if (this.cache?.cacheAdapter && options?.cache?.enabled) {
+            const cacheKey = `${this.model.name.toLowerCase()}:EAN:${EAN}`;
+            const cachedData = await this.cache.cacheAdapter.get(cacheKey);
+            if (cachedData) {
+                this.logger.log(`Dados recuperados do cache: ${cacheKey}`);
+                return this.model.toInstance(deserialize(cachedData));
+            }
+        }
+        const product = await super
             .find({
             filters: {
                 EAN,
@@ -7396,6 +7405,19 @@ class ProductCatalogHasuraGraphQLRepository extends withFindHasuraGraphQL(withHa
             },
         })
             .then((res) => res.data.at(0));
+        if (!product)
+            return null;
+        RoundProductPricesHelper.roundProductPrices(product);
+        if (this.cache?.cacheAdapter && options?.cache?.enabled && product) {
+            const cacheKey = `${this.model.name.toLowerCase()}:EAN:${EAN}`;
+            await this.cache.cacheAdapter.set({
+                key: cacheKey,
+                data: serialize(product),
+                expirationInSeconds: options?.cache?.ttl || this.cache.ttlDefault,
+            });
+            this.logger.log(`Dados salvos no cache: ${cacheKey}`);
+        }
+        return product;
     }
     async find(params, optionsParams) {
         const { filters, fields, ...options } = params || {};
@@ -7688,6 +7710,7 @@ const commonFields = [
     { tagsProfile: { columnName: 'tags_profile', type: HasuraGraphQLColumnType.Jsonb } },
     { daysOfUse: { columnName: 'days_of_use' } },
     { showVariants: { columnName: 'show_variants' } },
+    { variantSlug: { columnName: 'variant_slug' } },
 ];
 const fieldsConfiguration$2 = [
     ...commonFields,
@@ -7880,6 +7903,28 @@ const fieldsConfiguration$2 = [
                 { tagsProfile: { columnName: 'tags_profile' } },
                 { tagsCollection: { columnName: 'tags_collection' } },
                 { variantSlug: { columnName: 'variant_slug' } },
+                {
+                    reviews: {
+                        columnName: 'reviews',
+                        foreignKeyColumn: { product_id: 'id' },
+                        fields: [
+                            'id',
+                            'shop',
+                            'rate',
+                            'author',
+                            'email',
+                            'location',
+                            'review',
+                            'status',
+                            'title',
+                            { personId: { columnName: 'person_id' } },
+                            'points',
+                            { orderId: { columnName: 'order_id' } },
+                            { createdAt: { columnName: 'created_at' } },
+                            { updatedAt: { columnName: 'updated_at' } },
+                        ],
+                    },
+                },
             ],
         },
     },
@@ -7943,10 +7988,14 @@ class ProductHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGra
             ? (await this.find({ filters: { firestoreId: identifiers.id }, options: { enableCount: false } }, options))
                 .data?.[0]
             : await super.get(identifiers, options);
-        // if (product.productId) throw new NotFoundError('Product not found, it is a variant')
-        product.reviews =
-            product.reviews ||
-                (await this.findReviewsByProduct(product.productId ? +product.productId : +product.id, false, options));
+        if (product.productId)
+            throw new NotFoundError('Product not found, it is a variant');
+        product.reviews = product.reviews || (await this.findReviewsByProduct(+product.id, false, options));
+        if (!product.variants?.length) {
+            for (const [index, variant] of product.variants.entries()) {
+                product.variants[index].reviews = await this.findReviewsByProduct(+variant.id, true);
+            }
+        }
         return product;
     }
     async find(params, optionsParams) {
@@ -7964,8 +8013,6 @@ class ProductHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGra
         return super.find({
             ...options,
             filters: { ...filters },
-            // filters: { ...filters, hasVariants: { operator: Where.EQUALS, value: false } },
-            // filters: { ...filters, productId: { operator: Where.ISNULL } },
             fields: [
                 ...bindFields,
                 ...(bindFields.includes('price')
@@ -8002,8 +8049,10 @@ class ProductHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGra
         if (!result.data.length)
             return null;
         const product = result?.data?.shift();
-        if (!product.reviews.length && product.rate > 0) {
-            product.reviews = await this.findReviewsByProduct((product.productId ? product.productId : product.id), true);
+        if (!product.variants?.length) {
+            for (const [index, variant] of product.variants.entries()) {
+                product.variants[index].reviews = await this.findReviewsByProduct(+variant.id, true);
+            }
         }
         RoundProductPricesHelper.roundProductPrices(product);
         if (this.cache?.cacheAdapter && options?.cache?.enabled && product) {
@@ -8017,18 +8066,6 @@ class ProductHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGra
         }
         return product;
     }
-    async getBySlugVariantData(product) {
-        if (!product.reviews.length && product.rate > 0) {
-            product.reviews = await this.findReviewsByProduct((product.productId ? product.productId : product.id), true);
-        }
-        // if (!product.metadata) {
-        //   product.metadata = await this.findReviewsByProduct(
-        //     (product.productId ? product.productId : product.id) as number,
-        //     true,
-        //   )
-        // }
-        return product;
-    }
     async getByEAN(EAN, options) {
         if (this.cache?.cacheAdapter && options?.cache?.enabled) {
             const cacheKey = `${this.model.name.toLowerCase()}:EAN:${EAN}`;
@@ -8236,6 +8273,11 @@ class ProductHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGra
                 type: 'product_review_bool_exp',
                 required: true,
             },
+            order_by: {
+                type: '[product_review_order_by]',
+                value: [{ createdAt: 'desc' }],
+                required: true,
+            },
         });
         const reviews = data?.map((review) => this.bindReviewToModel(review));
         if (this.cache?.cacheAdapter && options?.cache?.enabled && reviews) {
@@ -8663,6 +8705,28 @@ const fieldsConfiguration$1 = [
             }),
         },
     },
+    {
+        reviews: {
+            columnName: 'reviews',
+            foreignKeyColumn: { product_id: 'id' },
+            fields: [
+                'id',
+                'shop',
+                'rate',
+                'author',
+                'email',
+                'location',
+                'review',
+                'status',
+                'title',
+                { personId: { columnName: 'person_id' } },
+                'points',
+                { orderId: { columnName: 'order_id' } },
+                { createdAt: { columnName: 'created_at' } },
+                { updatedAt: { columnName: 'updated_at' } },
+            ],
+        },
+    },
     { variantSlug: { columnName: 'variant_slug' } },
     { createdAt: { columnName: 'created_at' } },
     { updatedAt: { columnName: 'updated_at' } },

package/package.json

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

package/src/domain/catalog/models/product-base.d.ts

@@ -40,6 +40,7 @@ export declare class ProductBase<T extends ProductBase<T, I>, I = ProductIdentif
     group?: number;
     validity: boolean;
     daysOfUse?: number;
+    variantSlug?: string;
     category: Category;
     kitProducts?: KitProduct[];
     reviews?: ProductReview[];

package/src/domain/catalog/models/variant.d.ts

@@ -4,6 +4,5 @@ export type ProductVariantIdentifiers = 'id' | 'productId';
 export declare class Variant extends ProductBase<Variant, ProductVariantIdentifiers> {
     productId: string;
     grade?: VariantGrade[];
-    variantSlug?: string;
     static get identifiersFields(): ProductVariantIdentifiers[];
 }

package/src/domain/catalog/repositories/product-catalog.repository.d.ts

@@ -1,9 +1,13 @@
+import { ProductHasuraGraphQL } from '../../../infra';
 import { FindRepositoryParams, RepositoryCacheOptions, RepositoryFindResult } from '../../generic';
 import { Product, ProductGender } from '../models';
 export interface ProductCatalogRepository {
     get({ id }: {
         id: string;
     }): Promise<Product>;
+    find(params?: FindRepositoryParams<ProductHasuraGraphQL>, optionsParams?: {
+        cache?: RepositoryCacheOptions;
+    }): Promise<RepositoryFindResult<ProductHasuraGraphQL>>;
     getByEAN(EAN: string, options?: {
         cache?: RepositoryCacheOptions;
     }): Promise<Product>;

package/src/domain/shopping/models/order.d.ts

@@ -11,6 +11,7 @@ export declare class Order extends Checkout {
     deliveredAt?: string;
     trackingEvents?: OrderTrackingEvent[];
     payment: PaymentTransaction;
+    pedidov?: number;
     reshipmentOrderId?: string;
     isChange?: boolean;
     isReshipment?: boolean;

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

@@ -15,7 +15,6 @@ export declare class ProductHasuraGraphQLRepository extends ProductHasuraGraphQL
     getBySlug(slug: string, options?: {
         cache?: RepositoryCacheOptions;
     }): Promise<ProductHasuraGraphQL>;
-    private getBySlugVariantData;
     getByEAN(EAN: string, options?: {
         cache?: RepositoryCacheOptions;
     }): Promise<ProductHasuraGraphQL>;