Merge pull request #37 from GDG-Hackathon-77ia/refactor/changeDomain

Refactor/change domain
GDG-Hackathon-77ia · Nov 15, 2024 · e9ad2fa · e9ad2fa
2 parents 9ec16b0 + 5d7cc7a
commit e9ad2fa
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 1 deletion.
diff --git a/src/main/java/com/gdg/kkia/common/config/SwaggerConfig.java b/src/main/java/com/gdg/kkia/common/config/SwaggerConfig.java
@@ -14,7 +14,7 @@
 @Configuration
 public class SwaggerConfig {
     private static final String LOCAL_SERVER_URL = "http://localhost:8080";
-    private static final String PROD_SERVER_URL = "https://kkia.backapi.site";
+    private static final String PROD_SERVER_URL = "https://dandani.site";
     private final Environment environment;
 
     public SwaggerConfig(Environment environment) {

diff --git a/src/main/java/com/gdg/kkia/common/exception/EmptyFieldException.java b/src/main/java/com/gdg/kkia/common/exception/EmptyFieldException.java
@@ -0,0 +1,7 @@
+package com.gdg.kkia.common.exception;
+
+public class EmptyFieldException extends RuntimeException {
+    public EmptyFieldException(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/java/com/gdg/kkia/common/exception/GlobalExceptionHandler.java b/src/main/java/com/gdg/kkia/common/exception/GlobalExceptionHandler.java
@@ -82,4 +82,12 @@ public ResponseEntity<ProblemDetail> handleNoWrittenSurveyException(NoWrittenSur
         return ResponseEntity.status(HttpStatusCode.valueOf(463)).body(problemDetail);
     }
 
+    @ExceptionHandler(EmptyFieldException.class)
+    public ResponseEntity<ProblemDetail> handleEmptyFieldException(EmptyFieldException e) {
+
+        ProblemDetail problemDetail = ProblemDetail.forStatusAndDetail(HttpStatusCode.valueOf(463), e.getMessage());
+        problemDetail.setTitle("Empty Field Exception");
+        return ResponseEntity.status(HttpStatusCode.valueOf(464)).body(problemDetail);
+    }
+
 }
diff --git a/src/main/java/com/gdg/kkia/dailyresponse/entity/DailyResponse.java b/src/main/java/com/gdg/kkia/dailyresponse/entity/DailyResponse.java
@@ -1,7 +1,9 @@
 package com.gdg.kkia.dailyresponse.entity;
 
+import com.gdg.kkia.common.exception.EmptyFieldException;
 import com.gdg.kkia.member.entity.Member;
 import jakarta.persistence.*;
+import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import org.hibernate.annotations.OnDelete;
@@ -30,6 +32,7 @@ public class DailyResponse {
     @NotNull
     private LocalDate responseDate;
     @NotNull
+    @NotEmpty
     private String response;
     @ManyToOne
     @JoinColumn(name = "member_id")
@@ -43,6 +46,9 @@ public class DailyResponse {
     private DailyQuestion dailyQuestion;
 
     public DailyResponse(String response, Member member, DailyQuestion dailyQuestion) {
+        if (response.isBlank() || response.isEmpty()) {
+            throw new EmptyFieldException("비어있을 수 없습니다.");
+        }
         this.response = response;
         this.member = member;
         this.dailyQuestion = dailyQuestion;

diff --git a/src/main/java/com/gdg/kkia/diary/entity/Diary.java b/src/main/java/com/gdg/kkia/diary/entity/Diary.java
@@ -1,8 +1,10 @@
 package com.gdg.kkia.diary.entity;
 
 import com.gdg.kkia.common.exception.BadRequestException;
+import com.gdg.kkia.common.exception.EmptyFieldException;
 import com.gdg.kkia.member.entity.Member;
 import jakarta.persistence.*;
+import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import org.hibernate.annotations.OnDelete;
@@ -26,6 +28,7 @@ public class Diary {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     @NotNull
+    @NotEmpty
     private String content;
     @NotNull
     @CreatedDate
@@ -42,6 +45,9 @@ public class Diary {
     private Member member;
 
     public Diary(Diary.Type type, String content, Member member) {
+        if (content.isBlank() || content.isEmpty()) {
+            throw new EmptyFieldException("비어있을 수 없습니다.");
+        }
         this.type = type;
         this.content = content;
         this.member = member;

diff --git a/src/main/java/com/gdg/kkia/memo/entity/Memo.java b/src/main/java/com/gdg/kkia/memo/entity/Memo.java
@@ -1,8 +1,10 @@
 package com.gdg.kkia.memo.entity;
 
+import com.gdg.kkia.common.exception.EmptyFieldException;
 import com.gdg.kkia.diary.entity.Diary;
 import com.gdg.kkia.member.entity.Member;
 import jakarta.persistence.*;
+import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import org.hibernate.annotations.OnDelete;
@@ -24,6 +26,7 @@ public class Memo {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     @NotNull
+    @NotEmpty
     @Setter
     private String content;
     @NotNull
@@ -37,6 +40,9 @@ public class Memo {
     private Member member;
 
     public Memo(String content, Member member) {
+        if (content.isBlank() || content.isEmpty()) {
+            throw new EmptyFieldException("비어있을 수 없습니다.");
+        }
         this.content = content;
         this.member = member;
     }

diff --git a/src/main/java/com/gdg/kkia/pet/entity/Pet.java b/src/main/java/com/gdg/kkia/pet/entity/Pet.java
@@ -1,8 +1,10 @@
 package com.gdg.kkia.pet.entity;
 
 import com.gdg.kkia.common.exception.BadRequestException;
+import com.gdg.kkia.common.exception.EmptyFieldException;
 import com.gdg.kkia.member.entity.Member;
 import jakarta.persistence.*;
+import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
 import org.hibernate.annotations.OnDelete;
@@ -28,6 +30,7 @@ public class Pet {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     @NotNull
+    @NotEmpty
     private String name;
     @NotNull
     private int level;
@@ -42,6 +45,9 @@ public class Pet {
     private Member member;
 
     public Pet(String name, Member member) {
+        if (name.isBlank() || name.isEmpty()) {
+            throw new EmptyFieldException("비어있을 수 없습니다.");
+        }
         this.name = name;
         this.member = member;
         this.level = INITIAL_LEVEL;