diff --git a/pom.xml b/pom.xml
index a9b88132..ab8e9a43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
4.0.0
org.opencommercial
api
- 1.3.9
+ 1.3.10
jar
diff --git a/src/main/java/org/opencommercial/model/ConfiguracionSucursal.java b/src/main/java/org/opencommercial/model/ConfiguracionSucursal.java
index 487321b7..6a5b71ce 100644
--- a/src/main/java/org/opencommercial/model/ConfiguracionSucursal.java
+++ b/src/main/java/org/opencommercial/model/ConfiguracionSucursal.java
@@ -3,27 +3,30 @@
import com.fasterxml.jackson.annotation.JsonGetter;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
-import java.time.LocalDateTime;
+import com.fasterxml.jackson.annotation.JsonView;
import jakarta.persistence.*;
import jakarta.validation.constraints.DecimalMin;
import jakarta.validation.constraints.NotNull;
-
-import com.fasterxml.jackson.annotation.JsonView;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import lombok.*;
import org.opencommercial.config.Views;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
@Entity
@Table(name = "configuracionsucursal")
@Data
@AllArgsConstructor
@NoArgsConstructor
@EqualsAndHashCode(of = "idConfiguracionSucursal")
-@ToString(exclude = "certificadoAfip")
+@ToString(exclude = {
+ "certificadoAfip",
+ "passwordCertificadoAfip",
+ "tokenWSAA",
+ "signTokenWSAA",
+ "fechaGeneracionTokenWSAA",
+ "fechaVencimientoTokenWSAA"
+})
@JsonIgnoreProperties({
"tokenWSAA",
"signTokenWSAA",
diff --git a/src/main/java/org/opencommercial/model/Credencial.java b/src/main/java/org/opencommercial/model/Credencial.java
index 56a9931d..d723538d 100644
--- a/src/main/java/org/opencommercial/model/Credencial.java
+++ b/src/main/java/org/opencommercial/model/Credencial.java
@@ -3,10 +3,12 @@
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
+import lombok.ToString;
@Data
@AllArgsConstructor
@NoArgsConstructor
+@ToString(exclude = {"password"})
public class Credencial {
private String username;
diff --git a/src/main/java/org/opencommercial/model/Rubro.java b/src/main/java/org/opencommercial/model/Rubro.java
index 613ee01f..2ee5f08a 100644
--- a/src/main/java/org/opencommercial/model/Rubro.java
+++ b/src/main/java/org/opencommercial/model/Rubro.java
@@ -1,20 +1,15 @@
package org.opencommercial.model;
-import java.io.Serializable;
-import jakarta.persistence.*;
-import jakarta.validation.constraints.NotNull;
-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonView;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
import org.hibernate.validator.constraints.Length;
import org.opencommercial.config.Views;
-import jakarta.validation.constraints.NotEmpty;
+import java.io.Serializable;
@Entity
@Table(name = "rubro")
@@ -22,7 +17,7 @@
@AllArgsConstructor
@NoArgsConstructor
@EqualsAndHashCode(of = "nombre")
-@ToString
+@ToString(exclude = {"imagenHtml"})
@JsonView(Views.Comprador.class)
@JsonIgnoreProperties({"eliminado"})
public class Rubro implements Serializable {
diff --git a/src/main/java/org/opencommercial/model/Sucursal.java b/src/main/java/org/opencommercial/model/Sucursal.java
index a4e19dcb..11ce0527 100644
--- a/src/main/java/org/opencommercial/model/Sucursal.java
+++ b/src/main/java/org/opencommercial/model/Sucursal.java
@@ -21,7 +21,7 @@
@AllArgsConstructor
@NoArgsConstructor
@EqualsAndHashCode(of = {"nombre"})
-@ToString
+@ToString(exclude = "logo")
@JsonView(Views.Comprador.class)
@JsonIgnoreProperties("eliminada")
public class Sucursal implements Serializable {
diff --git a/src/main/java/org/opencommercial/model/TokenAccesoExcluido.java b/src/main/java/org/opencommercial/model/TokenAccesoExcluido.java
index 6709f40d..64654bfb 100644
--- a/src/main/java/org/opencommercial/model/TokenAccesoExcluido.java
+++ b/src/main/java/org/opencommercial/model/TokenAccesoExcluido.java
@@ -1,10 +1,7 @@
package org.opencommercial.model;
import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
import java.io.Serializable;
@@ -14,6 +11,7 @@
@AllArgsConstructor
@NoArgsConstructor
@Builder
+@ToString(exclude = {"token"})
public class TokenAccesoExcluido implements Serializable {
@Id
diff --git a/src/main/java/org/opencommercial/model/Usuario.java b/src/main/java/org/opencommercial/model/Usuario.java
index dc28194f..0e28ddc4 100644
--- a/src/main/java/org/opencommercial/model/Usuario.java
+++ b/src/main/java/org/opencommercial/model/Usuario.java
@@ -2,19 +2,16 @@
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.List;
-import jakarta.persistence.*;
import com.fasterxml.jackson.annotation.JsonView;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-import org.opencommercial.config.Views;
+import jakarta.persistence.*;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotEmpty;
+import lombok.*;
+import org.opencommercial.config.Views;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
@Entity
@Table(name = "usuario")
@@ -22,10 +19,13 @@
@AllArgsConstructor
@NoArgsConstructor
@EqualsAndHashCode(of = {"username", "email"})
-@ToString(exclude = {"roles", "password"})
+@ToString(exclude = {
+ "password",
+ "passwordRecoveryKey",
+ "passwordRecoveryKeyExpirationDate"
+})
@JsonView(Views.Comprador.class)
@JsonIgnoreProperties({
- "token",
"passwordRecoveryKey",
"passwordRecoveryKeyExpirationDate",
"eliminado"