@infrab4a/connect 5.5.5-beta.0 → 5.5.6-beta.0

package/index.cjs.js

@@ -2410,21 +2410,24 @@ var ShopPageSectionType;
 (function (ShopPageSectionType) {
     ShopPageSectionType["LIVE"] = "LIVE";
     ShopPageSectionType["CAROUSEL"] = "CAROUSEL";
+    ShopPageSectionType["BANNER"] = "BANNER";
     ShopPageSectionType["INFOBARS"] = "INFOBARS";
     ShopPageSectionType["HIGHLIGHTS"] = "HIGHLIGHTS";
     ShopPageSectionType["SUBSCRIBER_INFO"] = "SUBSCRIBER_INFO";
     ShopPageSectionType["COLLECTION"] = "COLLECTION";
+    ShopPageSectionType["BEAUTY_PROFILE_COLLECTION"] = "BEAUTY_PROFILE_COLLECTION";
     ShopPageSectionType["PLANS"] = "PLANS";
     ShopPageSectionType["SINGLE_PLAN"] = "SINGLE_PLAN";
     ShopPageSectionType["BRANDS"] = "BRANDS";
     ShopPageSectionType["NEWSLETTER"] = "NEWSLETTER";
 })(ShopPageSectionType || (ShopPageSectionType = {}));
 
+/* eslint-disable max-lines-per-function */
 class ShopSettings extends BaseModel {
     static get identifiersFields() {
         return ['id'];
     }
-    pageSections(displayRules) {
+    getPageSections(displayRules) {
         const now = new Date();
         return (Array.isArray(this.sections) ? this.sections : [])
             .map((section) => {
@@ -2433,7 +2436,7 @@ class ShopSettings extends BaseModel {
                 const filteredBanners = section.banners.filter((banner) => {
                     // Filtra por displayRules
                     const rulesMatch = banner.displayRules
-                        ? Object.keys(displayRules).every((key) => banner.displayRules && banner.displayRules[key] === displayRules[key])
+                        ? Object.keys(displayRules).some((key) => banner.displayRules && banner.displayRules[key] === displayRules[key])
                         : true;
                     // Filtra por publishDate e expirationDate
                     const publishOk = !banner.publishDate || now >= new Date(banner.publishDate);
@@ -2442,15 +2445,38 @@ class ShopSettings extends BaseModel {
                 });
                 return { ...section, banners: filteredBanners };
             }
+            // Filtra highlights
+            if (section.type === ShopPageSectionType.HIGHLIGHTS && Array.isArray(section.highlights)) {
+                const filteredHighlights = section.highlights.filter((highlight) => {
+                    // Filtra por displayRules
+                    const rulesMatch = highlight.displayRules
+                        ? Object.keys(displayRules).some((key) => highlight.displayRules && highlight.displayRules[key] === displayRules[key])
+                        : true;
+                    return rulesMatch;
+                });
+                return { ...section, highlights: filteredHighlights };
+            }
             // Filtra collections
             if (section.type === ShopPageSectionType.COLLECTION) {
                 const rulesMatch = section.displayRules
-                    ? Object.keys(displayRules).every((key) => section.displayRules && section.displayRules[key] === displayRules[key])
+                    ? Object.keys(displayRules).some((key) => section.displayRules && section.displayRules[key] === displayRules[key])
                     : true;
                 const publishOk = !section.publishDate || now >= new Date(section.publishDate);
                 const expireOk = !section.expirationDate || now <= new Date(section.expirationDate);
                 return rulesMatch && publishOk && expireOk ? section : null;
             }
+            // Filtra banners
+            if (section.type === ShopPageSectionType.BANNER) {
+                const rulesMatch = section.displayRules
+                    ? Object.keys(displayRules).some((key) => section.displayRules && section.displayRules[key] === displayRules[key])
+                    : true;
+                const publishOk = !section.publishDate || now >= new Date(section.publishDate);
+                const expireOk = !section.expirationDate || now <= new Date(section.expirationDate);
+                return rulesMatch && publishOk && expireOk ? section : null;
+            }
+            if (section.type === ShopPageSectionType.LIVE) {
+                return section.active ? section : null;
+            }
             // Demais seções retornam normalmente
             return section;
         })
@@ -9755,6 +9781,7 @@ class MercadoPagoCardAxiosAdapter {
                     limiteRange: 'day',
                     card,
                     gatewayInfo: {
+                        gateway: exports.PaymentProviders.MERCADOPAGO,
                         status: data.status,
                         statusDetail: data.status_detail,
                     },
@@ -10770,6 +10797,7 @@ class PagarmeV5CardAxiosAdapter {
                     card,
                     orderBlockedRepository: this.orderBlockedRepository,
                     gatewayInfo: {
+                        gateway: exports.PaymentProviders.PAGARME,
                         status: charge.status,
                         statusDetail: charge.last_transaction?.status,
                     },

package/index.esm.js

@@ -2386,21 +2386,24 @@ var ShopPageSectionType;
 (function (ShopPageSectionType) {
     ShopPageSectionType["LIVE"] = "LIVE";
     ShopPageSectionType["CAROUSEL"] = "CAROUSEL";
+    ShopPageSectionType["BANNER"] = "BANNER";
     ShopPageSectionType["INFOBARS"] = "INFOBARS";
     ShopPageSectionType["HIGHLIGHTS"] = "HIGHLIGHTS";
     ShopPageSectionType["SUBSCRIBER_INFO"] = "SUBSCRIBER_INFO";
     ShopPageSectionType["COLLECTION"] = "COLLECTION";
+    ShopPageSectionType["BEAUTY_PROFILE_COLLECTION"] = "BEAUTY_PROFILE_COLLECTION";
     ShopPageSectionType["PLANS"] = "PLANS";
     ShopPageSectionType["SINGLE_PLAN"] = "SINGLE_PLAN";
     ShopPageSectionType["BRANDS"] = "BRANDS";
     ShopPageSectionType["NEWSLETTER"] = "NEWSLETTER";
 })(ShopPageSectionType || (ShopPageSectionType = {}));
 
+/* eslint-disable max-lines-per-function */
 class ShopSettings extends BaseModel {
     static get identifiersFields() {
         return ['id'];
     }
-    pageSections(displayRules) {
+    getPageSections(displayRules) {
         const now = new Date();
         return (Array.isArray(this.sections) ? this.sections : [])
             .map((section) => {
@@ -2409,7 +2412,7 @@ class ShopSettings extends BaseModel {
                 const filteredBanners = section.banners.filter((banner) => {
                     // Filtra por displayRules
                     const rulesMatch = banner.displayRules
-                        ? Object.keys(displayRules).every((key) => banner.displayRules && banner.displayRules[key] === displayRules[key])
+                        ? Object.keys(displayRules).some((key) => banner.displayRules && banner.displayRules[key] === displayRules[key])
                         : true;
                     // Filtra por publishDate e expirationDate
                     const publishOk = !banner.publishDate || now >= new Date(banner.publishDate);
@@ -2418,15 +2421,38 @@ class ShopSettings extends BaseModel {
                 });
                 return { ...section, banners: filteredBanners };
             }
+            // Filtra highlights
+            if (section.type === ShopPageSectionType.HIGHLIGHTS && Array.isArray(section.highlights)) {
+                const filteredHighlights = section.highlights.filter((highlight) => {
+                    // Filtra por displayRules
+                    const rulesMatch = highlight.displayRules
+                        ? Object.keys(displayRules).some((key) => highlight.displayRules && highlight.displayRules[key] === displayRules[key])
+                        : true;
+                    return rulesMatch;
+                });
+                return { ...section, highlights: filteredHighlights };
+            }
             // Filtra collections
             if (section.type === ShopPageSectionType.COLLECTION) {
                 const rulesMatch = section.displayRules
-                    ? Object.keys(displayRules).every((key) => section.displayRules && section.displayRules[key] === displayRules[key])
+                    ? Object.keys(displayRules).some((key) => section.displayRules && section.displayRules[key] === displayRules[key])
                     : true;
                 const publishOk = !section.publishDate || now >= new Date(section.publishDate);
                 const expireOk = !section.expirationDate || now <= new Date(section.expirationDate);
                 return rulesMatch && publishOk && expireOk ? section : null;
             }
+            // Filtra banners
+            if (section.type === ShopPageSectionType.BANNER) {
+                const rulesMatch = section.displayRules
+                    ? Object.keys(displayRules).some((key) => section.displayRules && section.displayRules[key] === displayRules[key])
+                    : true;
+                const publishOk = !section.publishDate || now >= new Date(section.publishDate);
+                const expireOk = !section.expirationDate || now <= new Date(section.expirationDate);
+                return rulesMatch && publishOk && expireOk ? section : null;
+            }
+            if (section.type === ShopPageSectionType.LIVE) {
+                return section.active ? section : null;
+            }
             // Demais seções retornam normalmente
             return section;
         })
@@ -9731,6 +9757,7 @@ class MercadoPagoCardAxiosAdapter {
                     limiteRange: 'day',
                     card,
                     gatewayInfo: {
+                        gateway: PaymentProviders.MERCADOPAGO,
                         status: data.status,
                         statusDetail: data.status_detail,
                     },
@@ -10746,6 +10773,7 @@ class PagarmeV5CardAxiosAdapter {
                     card,
                     orderBlockedRepository: this.orderBlockedRepository,
                     gatewayInfo: {
+                        gateway: PaymentProviders.PAGARME,
                         status: charge.status,
                         statusDetail: charge.last_transaction?.status,
                     },

package/package.json

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

package/src/domain/shop-settings/models/shop-page-settings.d.ts

@@ -14,5 +14,5 @@ export declare class ShopSettings extends BaseModel<ShopSettings> {
     hasMultiples?: boolean;
     pagePath?: string;
     static get identifiersFields(): GenericIdentifier[];
-    pageSections(displayRules: DisplayRules): SectionUnion[];
+    getPageSections(displayRules: DisplayRules): SectionUnion[];
 }

package/src/domain/shop-settings/models/types/shop-page-section.type.d.ts

@@ -1,18 +1,21 @@
 export type ShopPageSection = Array<SectionUnion>;
-export type SectionUnion = SectionLive | SectionCarousel | SectionInfobars | SectionHighlights | SectionSubscriberInfo | SectionCollection | SectionPlans | SectionSinglePlan | SectionBrands | SectionNewsletter;
+export type SectionUnion = SectionLive | SectionCarousel | SectionBanner | SectionInfobars | SectionHighlights | SectionSubscriberInfo | SectionCollection | SectionBeautyProfileCollection | SectionPlans | SectionSinglePlan | SectionBrands | SectionNewsletter;
 export declare enum ShopPageSectionType {
     LIVE = "LIVE",
     CAROUSEL = "CAROUSEL",
+    BANNER = "BANNER",
     INFOBARS = "INFOBARS",
     HIGHLIGHTS = "HIGHLIGHTS",
     SUBSCRIBER_INFO = "SUBSCRIBER_INFO",
     COLLECTION = "COLLECTION",
+    BEAUTY_PROFILE_COLLECTION = "BEAUTY_PROFILE_COLLECTION",
     PLANS = "PLANS",
     SINGLE_PLAN = "SINGLE_PLAN",
     BRANDS = "BRANDS",
     NEWSLETTER = "NEWSLETTER"
 }
 export type SectionLive = {
+    id: string;
     type: ShopPageSectionType.LIVE;
     fixed: boolean;
     editable: boolean;
@@ -21,41 +24,51 @@ export type SectionLive = {
     active: boolean;
 };
 export type SectionCarousel = {
+    id: string;
     type: ShopPageSectionType.CAROUSEL;
     fixed: boolean;
     editable: boolean;
     banners: Banner[];
 };
 export type SectionInfobars = {
+    id: string;
     type: ShopPageSectionType.INFOBARS;
     fixed: boolean;
     editable: boolean;
     infobars: Infobar[];
 };
 export type Infobar = {
+    id: string;
     link: string;
     text: string;
     active: boolean;
 };
 export type SectionHighlights = {
+    id: string;
     type: ShopPageSectionType.HIGHLIGHTS;
     fixed: boolean;
     editable: boolean;
     highlights: Highlight[];
 };
 export type Highlight = {
+    id: string;
     title: string;
+    subtitle: string;
     link: string;
     image: string;
     altText: string;
     highlighted: boolean;
+    starred: boolean;
+    displayRules?: DisplayRules;
 };
 export type SectionSubscriberInfo = {
+    id: string;
     type: ShopPageSectionType.SUBSCRIBER_INFO;
     fixed: boolean;
     editable: boolean;
 };
 export type Banner = {
+    id: string;
     mobileImage: string;
     desktopImage: string;
     link: string;
@@ -65,7 +78,13 @@ export type Banner = {
     publishDate?: Date;
     expirationDate?: Date;
 };
+export type SectionBanner = Banner & {
+    type: ShopPageSectionType.BANNER;
+    fixed: boolean;
+    editable: boolean;
+};
 export type SectionCollection = {
+    id: string;
     type: ShopPageSectionType.COLLECTION;
     fixed: boolean;
     editable: boolean;
@@ -76,23 +95,33 @@ export type SectionCollection = {
     publishDate?: Date;
     expirationDate?: Date;
 };
+export type SectionBeautyProfileCollection = {
+    id: string;
+    type: ShopPageSectionType.BEAUTY_PROFILE_COLLECTION;
+    fixed: boolean;
+    editable: boolean;
+};
 export type DisplayRules = {
     subscriberBuyer: boolean;
     notSubscriber: boolean;
     subscriberNotBuyer: boolean;
     topBadgeSubscriber: boolean;
+    beautyProfile?: boolean;
 };
 export type SectionPlans = {
+    id: string;
     type: ShopPageSectionType.PLANS;
     fixed: boolean;
     editable: boolean;
 };
 export type SectionSinglePlan = {
+    id: string;
     type: ShopPageSectionType.SINGLE_PLAN;
     fixed: boolean;
     editable: boolean;
 };
 export type SectionBrands = {
+    id: string;
     type: ShopPageSectionType.BRANDS;
     fixed: boolean;
     editable: boolean;
@@ -105,6 +134,7 @@ export type SectionBrands = {
     ];
 };
 export type SectionNewsletter = {
+    id: string;
     type: ShopPageSectionType.NEWSLETTER;
     fixed: boolean;
     editable: boolean;

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

@@ -19,7 +19,11 @@ export declare class OrderBlocked extends BaseModel<OrderBlocked> {
     type: OrderBlockedType;
     card?: any;
     checkout: Checkout;
-    gatewayInfo?: any;
+    gatewayInfo?: {
+        gateway?: string;
+        status?: string;
+        statusDetail?: string;
+    };
     date: Date;
     static get identifiersFields(): GenericIdentifier[];
 }

package/src/domain/shopping/repositories/order-blocked.repository.d.ts

@@ -7,7 +7,11 @@ type CreateBlockedOrderParams = {
     type: string;
     limiteRange: string;
     card?: PaymentCardInfo;
-    gatewayInfo?: any;
+    gatewayInfo?: {
+        gateway?: string;
+        status?: string;
+        statusDetail?: string;
+    };
 };
 export interface OrderBlockedRepository extends CrudRepository<OrderBlocked> {
     createBlockedOrderOrPayment(params: CreateBlockedOrderParams): Promise<OrderBlocked>;

package/src/infra/pagarme/adapters/helpers/pagarme-blocked-order.helper.d.ts

@@ -6,6 +6,7 @@ interface BlockedOrderParams {
     card: PaymentCardInfo;
     orderBlockedRepository: OrderBlockedRepository;
     gatewayInfo?: {
+        gateway: string;
         status: string;
         statusDetail: string;
     };