[BE-REFACTOR] cloudfront 주소를 변경한다 (#465)

* refactor: cloudfront url 수정 * refactor: 이미지 url 한 곳에서 관리 --------- Co-authored-by: unifolio0 <[email protected]>
woowacourse-teams · Nov 29, 2024 · 9124d89 · 9124d89
1 parent c591ea5
commit 9124d89
Show file tree

Hide file tree

Showing 15 changed files with 59 additions and 55 deletions.
diff --git a/backend/pokerogue/src/main/java/com/pokerogue/helper/ability/dto/AbilityTypeResponse.java b/backend/pokerogue/src/main/java/com/pokerogue/helper/ability/dto/AbilityTypeResponse.java
@@ -1,10 +1,11 @@
 package com.pokerogue.helper.ability.dto;
 
+import com.pokerogue.helper.global.config.ImageUrl;
 import com.pokerogue.helper.type.data.Type;
 
 public record AbilityTypeResponse(String typeLogo, String typeName) {
 
     public static AbilityTypeResponse from(Type type) {
-        return new AbilityTypeResponse(type.getImage(), type.getKoName());
+        return new AbilityTypeResponse(ImageUrl.getTypeImage(type.getName()), type.getKoName());
     }
 }
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
@@ -12,6 +12,7 @@
 import com.pokerogue.helper.biome.dto.NextBiomeResponse;
 import com.pokerogue.helper.biome.dto.TrainerPokemonResponse;
 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;
@@ -122,7 +123,7 @@ private List<BiomePokemonResponse> getBiomePokemons(List<String> biomePokemons)
     private List<BiomeTypeResponse> getTypesResponses(List<Type> types) {
         return types.stream()
                 .map(type -> new BiomeTypeResponse(
-                        type.getImage(),
+                        ImageUrl.getTypeImage(type.getName()),
                         type.getKoName())
                 )
                 .toList();
@@ -133,7 +134,7 @@ private List<BiomeTypeResponse> getTrainerTypesResponses(List<Trainer> trainers)
                 .map(Trainer::getTypes)
                 .flatMap(List::stream)
                 .map(type -> new BiomeTypeResponse(
-                        type.getImage(),
+                        ImageUrl.getTypeImage(type.getName()),
                         type.getKoName())
                 )
                 .toList();

diff --git a/...rogue/helper/pokemon/config/ImageUrl.java → ...erogue/helper/global/config/ImageUrl.java b/...rogue/helper/pokemon/config/ImageUrl.java → ...erogue/helper/global/config/ImageUrl.java
@@ -1,16 +1,16 @@
-package com.pokerogue.helper.pokemon.config;
+package com.pokerogue.helper.global.config;
 
 public enum ImageUrl {
 
-    BASE_URL("https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue"),
+    BASE_URL("https://d11z3l5940xyw9.cloudfront.net/pokerogue"),
     POKEMON_FRONT("/pokemon/front/"),
     POKEMON_BACK("/pokemon/back/"),
     TYPE("/type/"),
     MOVE_CATEGORY("/move-category/"),
     BIOME("/biome/"),
     ;
 
-    public static final String PNG = ".png";
+    private static final String PNG = ".png";
     private final String url;
 
     ImageUrl(String url) {
@@ -29,4 +29,11 @@ public static String getBiomeImage(String id) {
         return BASE_URL.url + BIOME.url + id + PNG;
     }
 
+    public static String getMoveCategoryImage(String id) {
+        return BASE_URL.url + MOVE_CATEGORY.url + id + PNG;
+    }
+
+    public static String getTypeImage(String id) {
+        return BASE_URL.url + TYPE.url + id;
+    }
 }
diff --git a/backend/pokerogue/src/main/java/com/pokerogue/helper/move/data/MoveCategory.java b/backend/pokerogue/src/main/java/com/pokerogue/helper/move/data/MoveCategory.java
@@ -9,21 +9,17 @@
 @Getter
 public enum MoveCategory {
 
-    STATUS("변화", "status", "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/move-category/status"),
-    SPECIAL("특수", "special",
-            "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/move-category/special"),
-    PHYSICAL("물리", "physical",
-            "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/move-category/physical"),
+    STATUS("변화", "status"),
+    SPECIAL("특수", "special"),
+    PHYSICAL("물리", "physical"),
     ;
 
     private final String name;
     private final String engName;
-    private final String image;
 
-    MoveCategory(String name, String engName, String image) {
+    MoveCategory(String name, String engName) {
         this.name = name;
         this.engName = engName;
-        this.image = image;
     }
 
     public static Optional<MoveCategory> findByEngName(String name) {
@@ -36,10 +32,6 @@ private boolean hasSameEngName(String name) {
         return this.engName.equals(name);
     }
 
-    public String getImage() {
-        return image + ".png";
-    }
-
     public static MoveCategory convertFrom(String moveCategoryData) {
         return findByEngName(moveCategoryData)
                 .orElseThrow(() -> new GlobalCustomException(ErrorMessage.MOVE_CATEGORY_NOT_FOUND));

diff --git a/backend/pokerogue/src/main/java/com/pokerogue/helper/move/dto/MoveDetailResponse.java b/backend/pokerogue/src/main/java/com/pokerogue/helper/move/dto/MoveDetailResponse.java
@@ -1,5 +1,6 @@
 package com.pokerogue.helper.move.dto;
 
+import com.pokerogue.helper.global.config.ImageUrl;
 import com.pokerogue.helper.move.data.Move;
 import com.pokerogue.helper.move.data.MoveCategory;
 import com.pokerogue.helper.move.data.MoveFlag;
@@ -38,9 +39,9 @@ public static MoveDetailResponse from(Move move, List<String> levelMoveIdsContai
                 move.getId(),
                 move.getKoName(),
                 type.getName(),
-                type.getImage(),
+                ImageUrl.getTypeImage(type.getName()),
                 moveCategory.getEngName(),
-                moveCategory.getImage(),
+                ImageUrl.getMoveCategoryImage(moveCategory.getEngName()),
                 move.getMoveTarget().getId(),
                 move.getPower(),
                 move.getAccuracy(),

diff --git a/backend/pokerogue/src/main/java/com/pokerogue/helper/move/dto/MoveResponse.java b/backend/pokerogue/src/main/java/com/pokerogue/helper/move/dto/MoveResponse.java
@@ -1,5 +1,6 @@
 package com.pokerogue.helper.move.dto;
 
+import com.pokerogue.helper.global.config.ImageUrl;
 import com.pokerogue.helper.move.data.Move;
 import com.pokerogue.helper.move.data.MoveCategory;
 import com.pokerogue.helper.type.data.Type;
@@ -24,9 +25,9 @@ public static MoveResponse from(Move move) {
                 move.getId(),
                 move.getKoName(),
                 type.getName(),
-                type.getImage(),
+                ImageUrl.getTypeImage(type.getName()),
                 moveCategory.getEngName(),
-                moveCategory.getImage(),
+                ImageUrl.getMoveCategoryImage(moveCategory.getEngName()),
                 move.getPower(),
                 move.getAccuracy(),
                 move.getEffect()

diff --git a/backend/pokerogue/src/main/java/com/pokerogue/helper/pokemon/dto/EggMoveResponse.java b/backend/pokerogue/src/main/java/com/pokerogue/helper/pokemon/dto/EggMoveResponse.java
@@ -1,5 +1,6 @@
 package com.pokerogue.helper.pokemon.dto;
 
+import com.pokerogue.helper.global.config.ImageUrl;
 import com.pokerogue.helper.move.data.Move;
 import com.pokerogue.helper.move.data.MoveCategory;
 import com.pokerogue.helper.type.data.Type;
@@ -27,9 +28,9 @@ public static EggMoveResponse from(Move move) {
                 move.getPower(),
                 move.getAccuracy(),
                 type.getName(),
-                type.getImage(),
+                ImageUrl.getTypeImage(type.getName()),
                 moveCategory.getName(),
-                moveCategory.getImage()
+                ImageUrl.getMoveCategoryImage(moveCategory.getEngName())
         );
     }
 

diff --git a/backend/pokerogue/src/main/java/com/pokerogue/helper/pokemon/dto/EvolutionResponse.java b/backend/pokerogue/src/main/java/com/pokerogue/helper/pokemon/dto/EvolutionResponse.java
@@ -1,7 +1,7 @@
 package com.pokerogue.helper.pokemon.dto;
 
 
-import com.pokerogue.helper.pokemon.config.ImageUrl;
+import com.pokerogue.helper.global.config.ImageUrl;
 import com.pokerogue.helper.pokemon.data.Evolution;
 import com.pokerogue.helper.pokemon.data.Pokemon;
 

diff --git a/backend/pokerogue/src/main/java/com/pokerogue/helper/pokemon/dto/PokemonBiomeResponse.java b/backend/pokerogue/src/main/java/com/pokerogue/helper/pokemon/dto/PokemonBiomeResponse.java
@@ -1,7 +1,7 @@
 package com.pokerogue.helper.pokemon.dto;
 
 import com.pokerogue.helper.biome.data.Biome;
-import com.pokerogue.helper.pokemon.config.ImageUrl;
+import com.pokerogue.helper.global.config.ImageUrl;
 
 public record PokemonBiomeResponse(String id, String name, String image) {
     public static PokemonBiomeResponse from(Biome biome) {

diff --git a/backend/pokerogue/src/main/java/com/pokerogue/helper/pokemon/dto/PokemonDetailResponse.java b/backend/pokerogue/src/main/java/com/pokerogue/helper/pokemon/dto/PokemonDetailResponse.java
@@ -1,6 +1,6 @@
 package com.pokerogue.helper.pokemon.dto;
 
-import com.pokerogue.helper.pokemon.config.ImageUrl;
+import com.pokerogue.helper.global.config.ImageUrl;
 import com.pokerogue.helper.pokemon.data.Pokemon;
 import com.pokerogue.helper.type.dto.PokemonTypeResponse;
 import java.util.List;

diff --git a/backend/pokerogue/src/main/java/com/pokerogue/helper/pokemon/dto/PokemonMoveResponse.java b/backend/pokerogue/src/main/java/com/pokerogue/helper/pokemon/dto/PokemonMoveResponse.java
@@ -1,5 +1,6 @@
 package com.pokerogue.helper.pokemon.dto;
 
+import com.pokerogue.helper.global.config.ImageUrl;
 import com.pokerogue.helper.move.data.Move;
 import com.pokerogue.helper.move.data.MoveCategory;
 import com.pokerogue.helper.type.data.Type;
@@ -27,9 +28,9 @@ public static PokemonMoveResponse from(Move move, Integer level) {
                 move.getPower(),
                 move.getAccuracy(),
                 moveType.getName(),
-                moveType.getImage(),
+                ImageUrl.getTypeImage(moveType.getName()),
                 moveCategory.getName(),
-                moveCategory.getImage()
+                ImageUrl.getMoveCategoryImage(moveCategory.getEngName())
         );
     }
 

diff --git a/backend/pokerogue/src/main/java/com/pokerogue/helper/pokemon/dto/PokemonResponse.java b/backend/pokerogue/src/main/java/com/pokerogue/helper/pokemon/dto/PokemonResponse.java
@@ -1,6 +1,6 @@
 package com.pokerogue.helper.pokemon.dto;
 
-import com.pokerogue.helper.pokemon.config.ImageUrl;
+import com.pokerogue.helper.global.config.ImageUrl;
 import com.pokerogue.helper.pokemon.data.Pokemon;
 import com.pokerogue.helper.type.dto.PokemonTypeResponse;
 import java.util.List;

diff --git a/backend/pokerogue/src/main/java/com/pokerogue/helper/type/data/Type.java b/backend/pokerogue/src/main/java/com/pokerogue/helper/type/data/Type.java
@@ -9,36 +9,34 @@
 @Getter
 public enum Type {
 
-    GRASS("grass", "풀", "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/type/grass"),
-    POISON("poison", "독", "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/type/poison"),
-    FIRE("fire", "불꽃", "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/type/fire"),
-    WATER("water", "물", "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/type/water"),
-    ELECTRIC("electric", "전기", "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/type/electric"),
-    NORMAL("normal", "노말", "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/type/normal"),
-    FAIRY("fairy", "페어리", "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/type/fairy"),
-    BUG("bug", "벌레", "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/type/bug"),
-    DARK("dark", "악", "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/type/dark"),
-    DRAGON("dragon", "드래곤", "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/type/dragon"),
-    FIGHTING("fighting", "격투", "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/type/fighting"),
-    FLYING("flying", "비행", "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/type/flying"),
-    GHOST("ghost", "고스트", "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/type/ghost"),
-    GROUND("ground", "땅", "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/type/ground"),
-    ICE("ice", "얼음", "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/type/ice"),
-    ROCK("rock", "바위", "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/type/rock"),
-    PSYCHIC("psychic", "에스퍼", "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/type/psychic"),
-    STEEL("steel", "강철", "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/type/steel"),
-    STELLAR("stellar", "스텔라", "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/type/stellar"),
-    UNKNOWN("unknown", "언노운", "https://dl70s9ccojnge.cloudfront.net/pokerogue-helper/pokerogue/type/unknown"),
+    GRASS("grass", "풀"),
+    POISON("poison", "독"),
+    FIRE("fire", "불꽃"),
+    WATER("water", "물"),
+    ELECTRIC("electric", "전기"),
+    NORMAL("normal", "노말"),
+    FAIRY("fairy", "페어리"),
+    BUG("bug", "벌레"),
+    DARK("dark", "악"),
+    DRAGON("dragon", "드래곤"),
+    FIGHTING("fighting", "격투"),
+    FLYING("flying", "비행"),
+    GHOST("ghost", "고스트"),
+    GROUND("ground", "땅"),
+    ICE("ice", "얼음"),
+    ROCK("rock", "바위"),
+    PSYCHIC("psychic", "에스퍼"),
+    STEEL("steel", "강철"),
+    STELLAR("stellar", "스텔라"),
+    UNKNOWN("unknown", "언노운"),
     ;
 
     private final String name;
     private final String koName;
-    private final String image;
 
-    Type(String name, String koName, String image) {
+    Type(String name, String koName) {
         this.name = name;
         this.koName = koName;
-        this.image = image;
     }
 
     public static Optional<Type> findByName(String name) {

diff --git a/backend/pokerogue/src/main/java/com/pokerogue/helper/type/dto/PokemonTypeResponse.java b/backend/pokerogue/src/main/java/com/pokerogue/helper/type/dto/PokemonTypeResponse.java
@@ -1,10 +1,11 @@
 package com.pokerogue.helper.type.dto;
 
+import com.pokerogue.helper.global.config.ImageUrl;
 import com.pokerogue.helper.type.data.Type;
 
 public record PokemonTypeResponse(String typeName, String typeLogo) {
 
     public static PokemonTypeResponse from(Type type) {
-        return new PokemonTypeResponse(type.getKoName(), type.getImage());
+        return new PokemonTypeResponse(type.getKoName(), ImageUrl.getTypeImage(type.getName()));
     }
 }
diff --git a/backend/pokerogue/src/main/resources b/backend/pokerogue/src/main/resources