[BE-FIX] 바이옴 및 트레이너 이미지 url 수정 (#479)

* fix: 바이옴, 트레이너 이미지 url 수정 * refactor: 사용하지 않는 필드 삭제 --------- Co-authored-by: unifolio0 <[email protected]>
woowacourse-teams · Dec 3, 2024 · 5a4d0db · 5a4d0db
1 parent 5e2870d
commit 5a4d0db
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 19 deletions.
diff --git a/backend/pokerogue/src/main/java/com/pokerogue/helper/ability/service/AbilityService.java b/backend/pokerogue/src/main/java/com/pokerogue/helper/ability/service/AbilityService.java
@@ -1,26 +1,26 @@
 package com.pokerogue.helper.ability.service;
 
-import com.pokerogue.external.s3.service.S3Service;
 import com.pokerogue.helper.ability.data.Ability;
 import com.pokerogue.helper.ability.dto.AbilityDetailResponse;
 import com.pokerogue.helper.ability.dto.AbilityPokemonResponse;
 import com.pokerogue.helper.ability.dto.AbilityResponse;
 import com.pokerogue.helper.ability.dto.AbilityTypeResponse;
 import com.pokerogue.helper.ability.repository.AbilityRepository;
+import com.pokerogue.helper.global.config.ImageUrl;
 import com.pokerogue.helper.global.exception.ErrorMessage;
 import com.pokerogue.helper.global.exception.GlobalCustomException;
 import com.pokerogue.helper.pokemon.data.Pokemon;
 import com.pokerogue.helper.pokemon.repository.PokemonRepository;
 import com.pokerogue.helper.type.data.Type;
-import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 @RequiredArgsConstructor
 public class AbilityService {
 
-    private final S3Service s3Service;
     private final AbilityRepository abilityRepository;
     private final PokemonRepository pokemonRepository;
 
@@ -40,7 +40,7 @@ public AbilityDetailResponse findAbilityDetails(String id) {
         List<AbilityPokemonResponse> abilityPokemonResponses = pokemons.stream()
                 .map(pokemon -> AbilityPokemonResponse.of(
                         pokemon,
-                        s3Service.getPokemonImageFromS3(pokemon.getImageId()),
+                        ImageUrl.getPokemonImage(pokemon.getImageId()),
                         getAbilityTypeResponses(pokemon.getTypes())
                 ))
                 .toList();

diff --git a/backend/pokerogue/src/main/java/com/pokerogue/helper/biome/service/BiomeService.java b/backend/pokerogue/src/main/java/com/pokerogue/helper/biome/service/BiomeService.java
@@ -1,40 +1,33 @@
 package com.pokerogue.helper.biome.service;
 
-import com.pokerogue.external.s3.service.S3Service;
 import com.pokerogue.helper.biome.data.Biome;
 import com.pokerogue.helper.biome.data.NativePokemon;
 import com.pokerogue.helper.biome.data.Trainer;
-import com.pokerogue.helper.biome.dto.BiomeAllPokemonResponse;
-import com.pokerogue.helper.biome.dto.BiomeDetailResponse;
-import com.pokerogue.helper.biome.dto.BiomePokemonResponse;
-import com.pokerogue.helper.biome.dto.BiomeResponse;
-import com.pokerogue.helper.biome.dto.BiomeTypeResponse;
-import com.pokerogue.helper.biome.dto.NextBiomeResponse;
-import com.pokerogue.helper.biome.dto.TrainerPokemonResponse;
+import com.pokerogue.helper.biome.dto.*;
 import com.pokerogue.helper.biome.repository.BiomeRepository;
 import com.pokerogue.helper.global.config.ImageUrl;
 import com.pokerogue.helper.global.constant.SortingCriteria;
 import com.pokerogue.helper.global.exception.ErrorMessage;
 import com.pokerogue.helper.global.exception.GlobalCustomException;
 import com.pokerogue.helper.pokemon.repository.PokemonRepository;
 import com.pokerogue.helper.type.data.Type;
-import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 @RequiredArgsConstructor
 public class BiomeService {
 
-    private final S3Service s3Service;
     private final BiomeRepository biomeRepository;
     private final PokemonRepository pokemonRepository;
 
     public List<BiomeResponse> findBiomes() {
         return biomeRepository.findAll().stream()
                 .map(biome -> BiomeResponse.of(
                         biome,
-                        s3Service.getBiomeImageFromS3(biome.getId()),
+                        ImageUrl.getBiomeImage(biome.getId()),
                         getTypesResponses(biome.getTypes()),
                         getTrainerTypesResponses(biome.getTrainers()))
                 )
@@ -47,7 +40,7 @@ public BiomeDetailResponse findBiome(String id, SortingCriteria bossPokemonOrder
 
         return BiomeDetailResponse.of(
                 biome,
-                s3Service.getBiomeImageFromS3(biome.getId()),
+                ImageUrl.getBiomeImage(biome.getId()),
                 getWildPokemons(biome.getNativePokemons(), wildPokemonOrder),
                 getBossPokemons(biome.getNativePokemons(), bossPokemonOrder),
                 getTrainerPokemons(biome),
@@ -79,7 +72,7 @@ private List<TrainerPokemonResponse> getTrainerPokemons(Biome biome) {
         return biome.getTrainers().stream()
                 .map(trainer -> TrainerPokemonResponse.from(
                         trainer,
-                        s3Service.getTrainerImageFromS3(trainer.getName()),
+                        ImageUrl.getTrainerImage(trainer.getName()),
                         getTypesResponses(trainer.getTypes()),
                         getBiomePokemons(trainer.getPokemonIds()))
                 )
@@ -94,7 +87,7 @@ private List<NextBiomeResponse> getNextBiomes(Biome biome) {
 
                     return NextBiomeResponse.of(
                             nextBiome,
-                            s3Service.getBiomeImageFromS3(nextBiome.getId()),
+                            ImageUrl.getBiomeImage(nextBiome.getId()),
                             String.valueOf(nextBiomeInfo.getPercentage()),
                             getTypesResponses(nextBiome.getTypes()),
                             getTrainerTypesResponses(nextBiome.getTrainers())
@@ -108,7 +101,7 @@ private List<BiomePokemonResponse> getBiomePokemons(List<String> biomePokemons)
                 .map(pokemon -> new BiomePokemonResponse(
                         pokemon.getId(),
                         pokemon.getKoName(),
-                        s3Service.getPokemonImageFromS3(pokemon.getImageId()),
+                        ImageUrl.getPokemonImage(pokemon.getImageId()),
                         getTypesResponses(pokemon.getTypes()))
                 )
                 .distinct()

diff --git a/backend/pokerogue/src/main/java/com/pokerogue/helper/global/config/ImageUrl.java b/backend/pokerogue/src/main/java/com/pokerogue/helper/global/config/ImageUrl.java
@@ -8,6 +8,7 @@ public enum ImageUrl {
     TYPE("/type/"),
     MOVE_CATEGORY("/move-category/"),
     BIOME("/biome/"),
+    TRAINER("/trainer/"),
     ;
 
     private static final String PNG = ".png";
@@ -36,4 +37,8 @@ public static String getMoveCategoryImage(String id) {
     public static String getTypeImage(String id) {
         return BASE_URL.url + TYPE.url + id;
     }
+
+    public static String getTrainerImage(String id) {
+        return BASE_URL.url + TRAINER.url + id + PNG;
+    }
 }