Refactor saco cosas de infraestructura de dominio

Author: JulianKer

src/main/java/com/outfitlab/project/domain/interfaces/repositories/IMarcaRepository.java

@@ -1,8 +1,6 @@
 package com.outfitlab.project.domain.interfaces.repositories;
 
 import com.outfitlab.project.domain.model.MarcaModel;
-import com.outfitlab.project.infrastructure.model.MarcaEntity;
-
 import java.util.List;
 
 public interface IMarcaRepository{

src/main/java/com/outfitlab/project/domain/interfaces/repositories/ITripoRepository.java

@@ -3,7 +3,6 @@
 import com.outfitlab.project.domain.exceptions.*;
 import com.outfitlab.project.domain.model.TripoModel;
 import org.springframework.core.io.ByteArrayResource;
-
 import java.util.Map;
 
 

src/main/java/com/outfitlab/project/domain/model/MarcaModel.java

@@ -1,9 +1,6 @@
 package com.outfitlab.project.domain.model;
 
-import com.outfitlab.project.infrastructure.model.PrendaEntity;
-
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
 
 public class MarcaModel {
@@ -26,6 +23,14 @@ public MarcaModel(String codigoMarca, String nombre, String logoUrl, LocalDateTi
         this.prendas = prendas;
     }
 
+    public MarcaModel(String codigoMarca, String nombre, String logoUrl, LocalDateTime createdAt, LocalDateTime updatedAt) {
+        this.codigoMarca = codigoMarca;
+        this.nombre = nombre;
+        this.logoUrl = logoUrl;
+        this.createdAt = createdAt;
+        this.updatedAt = updatedAt;
+    }
+
     public String getCodigoMarca() {
         return codigoMarca;
     }

src/main/java/com/outfitlab/project/domain/model/PrendaModel.java

@@ -1,15 +1,13 @@
 package com.outfitlab.project.domain.model;
 
-import com.outfitlab.project.infrastructure.model.MarcaEntity;
-
 public class PrendaModel {
 
     private String nombre;
-    private MarcaEntity marca;
+    private MarcaModel marca;
     private String tipo;
     private String imagenUrl;
 
-    public PrendaModel(String nombre, MarcaEntity marca, String tipo, String imagenUrl) {
+    public PrendaModel(String nombre, MarcaModel marca, String tipo, String imagenUrl) {
         this.nombre = nombre;
         this.marca = marca;
         this.tipo = tipo;
@@ -24,11 +22,11 @@ public void setNombre(String nombre) {
         this.nombre = nombre;
     }
 
-    public MarcaEntity getMarca() {
+    public MarcaModel getMarca() {
         return marca;
     }
 
-    public void setMarca(MarcaEntity marca) {
+    public void setMarca(MarcaModel marca) {
         this.marca = marca;
     }
 

src/main/java/com/outfitlab/project/domain/model/UserModel.java

@@ -0,0 +1,67 @@
+package com.outfitlab.project.domain.model;
+
+public class UserModel {
+    private String satulation;
+    private String name;
+    private String secondName;
+    private String lastName;
+    private double years;
+    private String email;
+
+    public UserModel(String name, String lastName, String email, String satulation, String secondName, double years) {
+        this.name = name;
+        this.lastName = lastName;
+        this.email = email;
+        this.satulation = satulation;
+        this.secondName = secondName;
+        this.years = years;
+    }
+
+    public String getSatulation() {
+        return satulation;
+    }
+
+    public void setSatulation(String satulation) {
+        this.satulation = satulation;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSecondName() {
+        return secondName;
+    }
+
+    public void setSecondName(String secondName) {
+        this.secondName = secondName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public double getYears() {
+        return years;
+    }
+
+    public void setYears(double years) {
+        this.years = years;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+}

src/main/java/com/outfitlab/project/domain/service/MarcaService.java

@@ -1,7 +1,6 @@
 package com.outfitlab.project.domain.service;
 
 import com.outfitlab.project.domain.model.MarcaModel;
-import com.outfitlab.project.infrastructure.model.MarcaEntity;
 import com.outfitlab.project.domain.exceptions.MarcasNotFoundException;
 import com.outfitlab.project.domain.useCases.marca.GetAllMarcas;
 import com.outfitlab.project.domain.useCases.marca.GetMarcaByCodigoMarca;

src/main/java/com/outfitlab/project/domain/service/TrippoService.java

@@ -3,7 +3,6 @@
 import com.outfitlab.project.domain.exceptions.*;
 import com.outfitlab.project.domain.model.TripoModel;
 import com.outfitlab.project.domain.useCases.tripo.*;
-import org.hibernate.annotations.processing.Find;
 import org.springframework.web.multipart.MultipartFile;
 import java.util.Map;
 

src/main/java/com/outfitlab/project/domain/service/UserService.java

@@ -1,15 +1,15 @@
 package com.outfitlab.project.domain.service;
 
-import com.outfitlab.project.infrastructure.model.UserEntity;
+import com.outfitlab.project.domain.model.UserModel;
 import com.outfitlab.project.domain.exceptions.UserNotFound;
 import org.springframework.stereotype.Service;
 
 @Service
 public class UserService {
 
-    public UserEntity findUserById(int id) throws UserNotFound {
+    public UserModel findUserById(int id) throws UserNotFound {
         if(id == 1){
-            return new UserEntity(1, "Julian");
+            return new UserModel("Julian", "Schmuker", "julian@gmail.com", "Mr.", "Gabriel", 21.0);
         }
         throw new UserNotFound("No encontramos usuarios!");
     }

src/main/java/com/outfitlab/project/infrastructure/model/MarcaEntity.java

@@ -66,6 +66,26 @@ public void addPrenda(PrendaEntity prenda) {
 
 
     // ------------- acá hacemos los dos convert ------------
+    public static MarcaEntity convertToEntityWithoutPrendas(MarcaModel entity) {
+        return new MarcaEntity(
+                entity.getCodigoMarca(),
+                entity.getNombre(),
+                entity.getLogoUrl(),
+                entity.getCreatedAt(),
+                entity.getUpdatedAt()
+        );
+    }
+
+    public static MarcaModel convertToModelWithoutPrendas(MarcaEntity model) {
+        return new MarcaModel(
+                model.getCodigoMarca(),
+                model.getNombre(),
+                model.getLogoUrl(),
+                model.getCreatedAt(),
+                model.getUpdatedAt()
+        );
+    }
+
     public static MarcaModel convertToModel(MarcaEntity entity) {
         if (entity == null) return null;
 

src/main/java/com/outfitlab/project/infrastructure/model/PrendaEntity.java

@@ -44,19 +44,23 @@ public PrendaEntity(String nombre, MarcaEntity marca, String tipo, String imagen
     }
 
     // ------------- acá hacemos los dos convert ------------
+
+
     public static PrendaModel convertToModel(PrendaEntity prendaEntity) {
+        MarcaModel marcaModel = MarcaEntity.convertToModelWithoutPrendas(prendaEntity.getMarca());
         return new PrendaModel(
                 prendaEntity.getNombre(),
-                prendaEntity.getMarca(),
+                marcaModel,
                 prendaEntity.getTipo(),
                 prendaEntity.getImagenUrl()
         );
     }
 
     public static PrendaEntity convertToEntity(PrendaModel prendaModel) {
+        MarcaEntity entityMarca = MarcaEntity.convertToEntityWithoutPrendas(prendaModel.getMarca());
         return new PrendaEntity(
                 prendaModel.getNombre(),
-                prendaModel.getMarca(),
+                entityMarca,
                 prendaModel.getTipo(),
                 prendaModel.getImagenUrl()
         );