feat: 폰트 영어 이름 추가

Author: SiwonHae

src/main/java/org/fontory/fontorybe/font/controller/dto/FontCreateDTO.java

@@ -16,6 +16,10 @@ public class FontCreateDTO {
     @Size(min = 2, max = 30, message = "폰트 이름은 2자 이상 30자 이하로 입력해주세요.")
     private String name;
 
+    @NotBlank(message = "폰트 영어 이름은 필수 입력 값입니다.")
+    @Size(min = 2, max = 30, message = "폰트 이름은 2자 이상 30자 이하로 입력해주세요.")
+    private String engName;
+
     @NotBlank(message = "폰트 예시는 필수 입력 값입니다.")
     @Size(min = 10, max = 255, message = "폰트 예시는 10자 이상 255자 이하로 입력해주세요.")
     private String example;

src/main/java/org/fontory/fontorybe/font/controller/dto/FontUpdateDTO.java

@@ -8,10 +8,6 @@
 @Getter
 @Builder
 public class FontUpdateDTO {
-    @NotBlank(message = "폰트 이름은 필수 입력 값입니다.")
-    @Size(min = 2, max = 30, message = "폰트 이름은 2자 이상 30자 이하로 입력해주세요.")
-    private String name;
-
     @NotBlank(message = "폰트 예시는 필수 입력 값입니다.")
     @Size(min = 10, max = 255, message = "폰트 예시는 10자 이상 255자 이하로 입력해주세요.")
     private String example;

src/main/java/org/fontory/fontorybe/font/domain/Font.java

@@ -22,6 +22,8 @@ public class Font {
 
     private String name;
 
+    private String engName;
+
     private FontStatus status;
 
     private String example;
@@ -53,6 +55,7 @@ public void increaseDownloadCount() {
     public static Font from(FontCreateDTO fontCreateDTO, Long memberId, String key) {
         return Font.builder()
                 .name(fontCreateDTO.getName())
+                .engName(fontCreateDTO.getEngName())
                 .status(FontStatus.PROGRESS)
                 .example(fontCreateDTO.getExample())
                 .key(key)
@@ -64,7 +67,8 @@ public static Font from(FontCreateDTO fontCreateDTO, Long memberId, String key)
 
     public Font update(FontUpdateDTO fontUpdateDTO) {
         return Font.builder()
-                .name(fontUpdateDTO.getName())
+                .name(this.name)
+                .engName(this.engName)
                 .example(fontUpdateDTO.getExample())
                 .id(this.id)
                 .status(this.status)
@@ -77,34 +81,19 @@ public Font update(FontUpdateDTO fontUpdateDTO) {
                 .build();
     }
 
-    public Font updateProgress(FontProgressUpdateDTO fontProgressUpdateDTO, Long fontId) {
-
-        if (fontProgressUpdateDTO.getStatus() == FontStatus.DONE) {
-            return Font.builder()
-                    .name(this.name)
-                    .example(this.example)
-                    .id(this.id)
-                    .status(fontProgressUpdateDTO.getStatus())
-                    .downloadCount(this.downloadCount)
-                    .bookmarkCount(this.bookmarkCount)
-                    .key(this.key)
-                    .memberId(this.memberId)
-                    .createdAt(this.createdAt)
-                    .updatedAt(this.updatedAt)
-                    .build();
-        } else {
-            return Font.builder()
-                    .name(this.name)
-                    .example(this.example)
-                    .id(this.id)
-                    .status(fontProgressUpdateDTO.getStatus())
-                    .downloadCount(this.downloadCount)
-                    .bookmarkCount(this.bookmarkCount)
-                    .key(this.key)
-                    .memberId(this.memberId)
-                    .createdAt(this.createdAt)
-                    .updatedAt(this.updatedAt)
-                    .build();
-        }
+    public Font updateProgress(FontProgressUpdateDTO fontProgressUpdateDTO) {
+        return Font.builder()
+                .name(this.name)
+                .engName(this.engName)
+                .example(this.example)
+                .id(this.id)
+                .status(fontProgressUpdateDTO.getStatus())
+                .downloadCount(this.downloadCount)
+                .bookmarkCount(this.bookmarkCount)
+                .key(this.key)
+                .memberId(this.memberId)
+                .createdAt(this.createdAt)
+                .updatedAt(this.updatedAt)
+                .build();
     }
 }

src/main/java/org/fontory/fontorybe/font/infrastructure/entity/FontEntity.java

@@ -31,6 +31,8 @@ public class FontEntity extends BaseEntity {
 
     private String name;
 
+    private String engName;
+
     @Enumerated(EnumType.STRING)
     private FontStatus status;
 
@@ -49,6 +51,7 @@ public Font toModel() {
         return Font.builder()
                 .id(id)
                 .name(name)
+                .engName(engName)
                 .status(status)
                 .example(example)
                 .downloadCount(downloadCount)
@@ -64,6 +67,7 @@ public static FontEntity from(Font font) {
         return FontEntity.builder()
                 .id(font.getId())
                 .name(font.getName())
+                .engName(font.getEngName())
                 .status(font.getStatus())
                 .example(font.getExample())
                 .downloadCount(font.getDownloadCount())

src/main/java/org/fontory/fontorybe/font/service/FontServiceImpl.java

@@ -105,8 +105,8 @@ public FontUpdateResponse update(Long memberId, Long fontId, FontUpdateDTO fontU
         Font targetFont = getOrThrowById(fontId);
 
         checkFontOwnership(member.getId(), targetFont.getMemberId());
-        checkContainsBadWord(fontUpdateDTO.getName(), fontUpdateDTO.getExample());
-        
+        checkContainsBadWord(fontUpdateDTO.getExample());
+
         Font updatedFont = fontRepository.save(targetFont.update(fontUpdateDTO));
         String woff2Url = cloudStorageService.getWoff2Url(updatedFont.getKey());
 
@@ -316,7 +316,7 @@ public FontUpdateResponse updateProgress(Long fontId, FontProgressUpdateDTO font
         log.info("Service executing: Updating font ID: {}", fontId);
         Font targetFont = getOrThrowById(fontId);
 
-        Font updatedFont = fontRepository.save(targetFont.updateProgress(fontProgressUpdateDTO, fontId));
+        Font updatedFont = fontRepository.save(targetFont.updateProgress(fontProgressUpdateDTO));
         String woff2Url = cloudStorageService.getWoff2Url(updatedFont.getKey());
 
         if (fontProgressUpdateDTO.getStatus() == FontStatus.DONE) {
@@ -383,4 +383,13 @@ private void checkContainsBadWord(String name, String example) {
             throw new FontContainsBadWordException();
         }
     }
+
+    private void checkContainsBadWord(String example) {
+        log.debug("Service detail: Checking bad word: example={}", example);
+
+        if (badWordFiltering.blankCheck(example)) {
+            log.warn("Service warning: Font contains bad word: example={}", example);
+            throw new FontContainsBadWordException();
+        }
+    }
 }