refactor logica segun Ismael, solo fashion, falta todo lo demás

Author: JulianKer

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

@@ -0,0 +1,15 @@
+package com.outfitlab.project.domain.interfaces.repositories;
+
+import com.outfitlab.project.domain.exceptions.FashnApiException;
+import com.outfitlab.project.domain.exceptions.PredictionFailedException;
+
+public interface FashnRepository {
+
+    String combine(String garmentUrl, String category, String avatarType) throws FashnApiException;
+
+    String combineSecondGarment(String garmentUrl, String category, String avatarCombinedUrl) throws FashnApiException;
+
+    String pollStatus(String id) throws FashnApiException, PredictionFailedException;
+
+    String combineTopAndBottom(String top, String bottom, String avatarType) throws PredictionFailedException, FashnApiException;
+}

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

@@ -3,7 +3,7 @@
 import com.outfitlab.project.domain.model.MarcaModel;
 import java.util.List;
 
-public interface IMarcaRepository{
+public interface MarcaRepository {
     MarcaModel buscarPorCodigoMarca(String codigoMarca);// hay que hacer un DTO que no me deje traer el id
     List<MarcaModel> obtenerTodas();
 }

…faces/repositories/IMarcaRepository.java …rfaces/repositories/MarcaRepository.javasrc/main/java/com/outfitlab/project/domain/interfaces/repositories/IMarcaRepository.java renamed to src/main/java/com/outfitlab/project/domain/interfaces/repositories/MarcaRepository.java src/main/java/com/outfitlab/project/domain/interfaces/repositories/IMarcaRepository.java renamed to src/main/java/com/outfitlab/project/domain/interfaces/repositories/MarcaRepository.java

@@ -6,7 +6,7 @@
 import java.util.Map;
 
 
-public interface ITripoRepository {
+public interface TripoRepository {
 
     TripoModel buscarPorTaskId(String taskId);
 

…faces/repositories/ITripoRepository.java …rfaces/repositories/TripoRepository.javasrc/main/java/com/outfitlab/project/domain/interfaces/repositories/ITripoRepository.java renamed to src/main/java/com/outfitlab/project/domain/interfaces/repositories/TripoRepository.java src/main/java/com/outfitlab/project/domain/interfaces/repositories/ITripoRepository.java renamed to src/main/java/com/outfitlab/project/domain/interfaces/repositories/TripoRepository.java

@@ -2,7 +2,7 @@
 
 import org.springframework.web.multipart.MultipartFile;
 
-public interface IAwsRepository {
+public interface UploadImageRepository {
 
     String uploadFile(MultipartFile file, String folder);
 

…erfaces/repositories/IAwsRepository.java …/repositories/UploadImageRepository.javasrc/main/java/com/outfitlab/project/domain/interfaces/repositories/IAwsRepository.java renamed to src/main/java/com/outfitlab/project/domain/interfaces/repositories/UploadImageRepository.java src/main/java/com/outfitlab/project/domain/interfaces/repositories/IAwsRepository.java renamed to src/main/java/com/outfitlab/project/domain/interfaces/repositories/UploadImageRepository.java

@@ -0,0 +1,21 @@
+package com.outfitlab.project.domain.model.dto;
+
+public class CombineRequestModel {
+    private String top;
+    private String bottom;
+    private Boolean isMan;
+    private String avatarType;
+
+    public CombineRequestModel() {}
+    public CombineRequestModel(String top, String bottom, Boolean isMan, String avatarType) {}
+
+    public String getAvatarType() {return avatarType;}
+    public void setAvatarType(String avatarType) {this.avatarType = avatarType;}
+    public String getTop() { return top; }
+    public void setTop(String top) { this.top = top; }
+    public String getBottom() { return bottom; }
+    public void setBottom(String bottom) { this.bottom = bottom; }
+    public Boolean getIsMan() {return isMan;}
+    public void setIsMan(Boolean isMan) {this.isMan = isMan;}
+
+}

src/main/java/com/outfitlab/project/domain/model/dto/CombineRequestModel.java

@@ -9,14 +9,14 @@
 public class TrippoService {
 
     private final UploadImageToTripo uploadImageToTripo;
-    private final UploadImageToAws uploadImageToAws;
+    private final SaveImage uploadImageToAws;
     private final GenerateImageToModelTrippo generateImageToModelTrippo;
     private final SaveTripoModel saveTripoModel;
     private final CheckTaskStatus checkTaskStatus;
     private final UpdateTripoModel updateTripoModel;
     private final FindTripoModelByTaskid findTripoModelByTaskid;
 
-    public TrippoService(UploadImageToTripo uploadImageToTripo, UploadImageToAws uploadImageToAws, GenerateImageToModelTrippo generateImageToModelTrippo,
+    public TrippoService(UploadImageToTripo uploadImageToTripo, SaveImage uploadImageToAws, GenerateImageToModelTrippo generateImageToModelTrippo,
                          SaveTripoModel saveTripoModel, CheckTaskStatus checkTaskStatus, UpdateTripoModel updateTripoModel, FindTripoModelByTaskid findTripoModelByTaskid) {
         this.uploadImageToTripo = uploadImageToTripo;
         this.uploadImageToAws = uploadImageToAws;

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

@@ -1,19 +1,46 @@
 package com.outfitlab.project.domain.useCases.fashn;
 
 import com.outfitlab.project.domain.exceptions.FashnApiException;
-import com.outfitlab.project.domain.interfaces.repositories.IFashnRepository;
-import com.outfitlab.project.presentation.dto.CombineRequest;
+import com.outfitlab.project.domain.exceptions.PredictionFailedException;
+import com.outfitlab.project.domain.interfaces.repositories.FashnRepository;
+import com.outfitlab.project.domain.model.dto.CombineRequestModel;
 
 public class CombinePrendas {
 
+    private final String TOPS = "tops";
+    private final String BOTTOMS = "bottoms";
+    private final FashnRepository iFashnRepository;
 
-    private final IFashnRepository iFashnRepository;
-
-    public CombinePrendas(IFashnRepository iFashnRepository) {
+    public CombinePrendas(FashnRepository iFashnRepository) {
         this.iFashnRepository = iFashnRepository;
     }
 
-    public String execute(CombineRequest req, String category, String avatarUrl) throws FashnApiException {
-        return this.iFashnRepository.combine(req, category, avatarUrl);
+    public String execute(CombineRequestModel request) throws FashnApiException, PredictionFailedException {
+        checkRequestCombine(request.getTop(), request.getBottom());
+
+        if (isOnlyTop(request.getTop(), request.getBottom())) return combine(request.getTop(), TOPS, request.getAvatarType());
+        if (isOnlyBotton(request.getBottom(), request.getTop())) return combine(request.getBottom(), BOTTOMS, request.getAvatarType());
+
+        return combineTopAndBottom(request.getTop(), request.getBottom(), request.getAvatarType());
+    }
+
+    private boolean isOnlyTop(String top, String bottom) {
+        return top != null && (bottom == null || bottom.isBlank());
+    }
+
+    private void checkRequestCombine(String top, String bottom) throws FashnApiException {
+        if ((top == null || top.isBlank()) && (bottom == null || bottom.isBlank())) throw new FashnApiException("Debe proporcionarse al menos una prenda (superior o inferior).");
+    }
+
+    private boolean isOnlyBotton(String bottom, String top) {
+        return bottom != null && (top == null || top.isBlank());
+    }
+
+    private String combine(String garmentUrl, String category, String avatarType) throws FashnApiException, PredictionFailedException {
+        return this.iFashnRepository.pollStatus(this.iFashnRepository.combine(garmentUrl, category, avatarType));
+    }
+
+    private String combineTopAndBottom(String top, String bottom, String avatarType) throws FashnApiException, PredictionFailedException {
+        return this.iFashnRepository.combineTopAndBottom(top, bottom, avatarType);
     }
 }