Rename AccountChannelSale to AccountSaleChannel and update references; add JsonIgnore annotations to relevant fields

Author: marioserrano09

extensions/saas/sources/core/src/main/java/tools/dynamia/modules/saas/AccountConfig.java

@@ -68,7 +68,7 @@ public EntityReferenceRepository<Long> accountTypeReferenceRepository() {
 
     @Bean
     public EntityReferenceRepository<Long> accountChannelReferenceRepository() {
-        DefaultEntityReferenceRepository<Long> repo = new DefaultEntityReferenceRepository<>(AccountChannelSale.class, "name");
+        DefaultEntityReferenceRepository<Long> repo = new DefaultEntityReferenceRepository<>(AccountSaleChannel.class, "name");
         repo.setCacheable(true);
         return repo;
     }

extensions/saas/sources/core/src/main/java/tools/dynamia/modules/saas/domain/Account.java

@@ -195,7 +195,7 @@ public class Account extends SimpleEntity implements Transferable<AccountDTO> {
     private String activationCoupon;
     private String redirect;
     @ManyToOne
-    private AccountChannelSale channel;
+    private AccountSaleChannel channel;
 
     public Account() {
         initLocale();
@@ -874,11 +874,11 @@ public void setActivationCoupon(String activationCoupon) {
         this.activationCoupon = activationCoupon;
     }
 
-    public AccountChannelSale getChannel() {
+    public AccountSaleChannel getChannel() {
         return channel;
     }
 
-    public void setChannel(AccountChannelSale channel) {
+    public void setChannel(AccountSaleChannel channel) {
         this.channel = channel;
     }
 

extensions/saas/sources/core/src/main/java/tools/dynamia/modules/saas/domain/AccountCategory.java

@@ -17,6 +17,7 @@
 
 package tools.dynamia.modules.saas.domain;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.ManyToOne;
 import org.hibernate.annotations.BatchSize;
 import tools.dynamia.domain.Descriptor;
@@ -37,8 +38,10 @@ public class AccountCategory extends SimpleEntity {
     @Column(unique = true)
     private String name;
     @ManyToOne
+    @JsonIgnore
     private AccountType defaultAccountType;
     @ManyToOne
+    @JsonIgnore
     private AccountProfile defaultAccountProfile;
 
     public String getName() {

extensions/saas/sources/core/src/main/java/tools/dynamia/modules/saas/domain/AccountRegion.java

@@ -1,5 +1,6 @@
 package tools.dynamia.modules.saas.domain;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import tools.dynamia.domain.jpa.SimpleEntity;
@@ -20,16 +21,21 @@ public class AccountRegion extends SimpleEntity {
     private String name;
     private String code;
     @ManyToOne(fetch = FetchType.LAZY)
+    @JsonIgnore
     private AccountProfile defaultProfile;
     @ManyToOne(fetch = FetchType.LAZY)
+    @JsonIgnore
     private AccountType defaultType;
     @ManyToOne(fetch = FetchType.LAZY)
+    @JsonIgnore
     private AccountPaymentProvider paymentProvider;
     @ManyToOne(fetch = FetchType.LAZY)
+    @JsonIgnore
     private Account mainAccount;
     private String currency;
     private String timeZone = TimeZone.getDefault().getDisplayName();
     private String locale = Locale.getDefault().getDisplayName();
+    @JsonIgnore
     private String invoiceType;
 
     @OneToMany(mappedBy = "region", cascade = CascadeType.ALL, orphanRemoval = true)

…ules/saas/domain/AccountChannelSale.java …ules/saas/domain/AccountSaleChannel.javaextensions/saas/sources/core/src/main/java/tools/dynamia/modules/saas/domain/AccountChannelSale.java renamed to extensions/saas/sources/core/src/main/java/tools/dynamia/modules/saas/domain/AccountSaleChannel.java extensions/saas/sources/core/src/main/java/tools/dynamia/modules/saas/domain/AccountChannelSale.java renamed to extensions/saas/sources/core/src/main/java/tools/dynamia/modules/saas/domain/AccountSaleChannel.java

@@ -14,7 +14,7 @@
 @Table(name = "saas_sale_channels")
 @Descriptor(fields = {"name"})
 @BatchSize(size = 10)
-public class AccountChannelSale extends SimpleEntity {
+public class AccountSaleChannel extends SimpleEntity {
 
     @NotNull
     @Column(unique = true)

extensions/saas/sources/core/src/main/java/tools/dynamia/modules/saas/domain/AccountType.java

@@ -19,6 +19,7 @@
 package tools.dynamia.modules.saas.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import org.hibernate.annotations.BatchSize;
 import tools.dynamia.domain.jpa.SimpleEntity;
 import tools.dynamia.domain.Transferable;
@@ -40,6 +41,7 @@
 @Entity
 @Table(name = "saas_account_types")
 @BatchSize(size = 10)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class AccountType extends SimpleEntity implements Transferable<AccountTypeDTO> {
 
     @NotNull

extensions/saas/sources/ui/pom.xml

@@ -59,7 +59,7 @@
         <dependency>
             <groupId>tools.dynamia.modules</groupId>
             <artifactId>tools.dynamia.modules.saas</artifactId>
-            <version>3.5.0</version>
+            <version>26.1</version>
         </dependency>
 
         <dependency>

extensions/saas/sources/ui/src/main/java/tools/dynamia/modules/saas/ui/SaasModuleProvider.java

@@ -43,7 +43,7 @@ public Module getModule() {
         module.addPage(new CrudPage("accountPaymentProviders", "Payments Providers", AccountPaymentProvider.class));
         module.addPage(new CrudPage("accountCategories", "Categories", AccountCategory.class));
         module.addPage(new CrudPage("accountResellers", "Resellers", AccountReseller.class).icon("users").featured(4));
-        module.addPage(new CrudPage("accountChannels", "Sale Channels", AccountChannelSale.class).icon("tags"));
+        module.addPage(new CrudPage("accountChannels", "Sale Channels", AccountSaleChannel.class).icon("tags"));
 
         return module;
     }