feat: 레피시 리팩토링 - #104

mju-likelion · Aug 5, 2024 · 2a96cf8 · 2a96cf8
2 parents 97365ee + 2d39a9c
commit 2a96cf8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/src/main/java/com/hackathonteam1/refreshrator/dto/response/recipe/DetailRecipeDto.java b/src/main/java/com/hackathonteam1/refreshrator/dto/response/recipe/DetailRecipeDto.java
@@ -24,6 +24,7 @@
 public class DetailRecipeDto {
     private UUID id;
     private String name;
+    private String writer;
     private List<IngredientRecipeResponseDto> ingredientRecipes;
     private String cookingStep;
     private int likeCount;
@@ -40,7 +41,7 @@ public class DetailRecipeDto {
     public static DetailRecipeDto mapping(Recipe recipe, List<IngredientRecipe> ingredientRecipes){
         List<IngredientRecipeResponseDto> ingredientDtos = ingredientRecipes.stream().map(
                 i->IngredientRecipeResponseDto.changeToDto(i)).collect(Collectors.toList());
-        return new DetailRecipeDto(recipe.getId(), recipe.getName(), ingredientDtos,
+        return new DetailRecipeDto(recipe.getId(), recipe.getName(), recipe.getUser().getName(), ingredientDtos,
                 recipe.getCookingStep(), recipe.getLikeCount(), ImageDto.mapping(recipe.getImage()),
                 recipe.getCreatedAt(), recipe.getUpdatedAt());
     }

diff --git a/src/main/java/com/hackathonteam1/refreshrator/entity/Recipe.java b/src/main/java/com/hackathonteam1/refreshrator/entity/Recipe.java
@@ -20,8 +20,7 @@ public class Recipe extends BaseEntity{
     @Column(nullable = false)
     private String name;
 
-    @Column(nullable = false)
-    @Lob
+    @Column(nullable = false, length = 5000)
     private String cookingStep;
 
     @ManyToOne(fetch = FetchType.LAZY, optional = false)

diff --git a/src/main/java/com/hackathonteam1/refreshrator/service/RecipeServiceImpl.java b/src/main/java/com/hackathonteam1/refreshrator/service/RecipeServiceImpl.java
@@ -61,6 +61,8 @@ public class RecipeServiceImpl implements RecipeService{
     private final ImageRepository imageRepository;
     private final RecipeLikeRepository recipeLikeRepository;
 
+    private static final List<String> IMAGE_EXTENSION = Arrays.asList(".jpg", ".jpeg", ".png", ".gif", ".webp", ".bmp", ".tiff", ".svg", ".heic");
+
     @Override
     @Cacheable(value = "recipeListCache",key = "#keyword + '-' + #type + '-' + #page + '-' + #size", cacheManager = "redisCacheManager")
     public RecipeListDto getList(String keyword, String type, int page, int size) {
@@ -95,6 +97,12 @@ public void register(RegisterRecipeDto registerRecipeDto, User user) {
             image = findImageByImageId(registerRecipeDto.getImageId());
         }
 
+        //동일한 재료를 요청할 경우 예외처리
+        Set<UUID> ingredientIdSet = new HashSet<>(registerRecipeDto.getIngredientIds());
+        if(ingredientIdSet.size() != registerRecipeDto.getIngredientIds().size()){
+            throw new BadRequestException(ErrorCode.DUPLICATED_RECIPE_INGREDIENT);
+        }
+
         Recipe recipe = Recipe.builder()
                 .name(registerRecipeDto.getName())
                 .cookingStep(registerRecipeDto.getCookingStep())
@@ -104,7 +112,7 @@ public void register(RegisterRecipeDto registerRecipeDto, User user) {
 
         recipeRepository.save(recipe);
 
-        registerRecipeDto.getIngredientIds().stream().forEach(i -> registerRecipeIngredient(findIngredientByIngredientId(i),recipe));
+        ingredientIdSet.stream().forEach(i -> registerRecipeIngredient(findIngredientByIngredientId(i),recipe));
     }
 
     //상세조회
@@ -234,11 +242,10 @@ public RecipeListDto getRecommendation(int page, int size, int match, String typ
     @Override
     public ImageDto registerImage(MultipartFile file) {
 
-        if(!file.getContentType().equals(MediaType.IMAGE_GIF_VALUE) &&
-                !file.getContentType().equals(MediaType.IMAGE_PNG_VALUE) &&
-                !file.getContentType().equals(MediaType.IMAGE_JPEG_VALUE) ){
+        String fileName = file.getOriginalFilename();
+        if(!IMAGE_EXTENSION.stream().anyMatch(i-> fileName.endsWith(i))){
             throw new FileStorageException(ErrorCode.FILE_TYPE_ERROR);
-        }
+        };
 
         String url;
         try {