Merge pull request #278 from TeamDATEROAD/feature/#277

TeamDATEROAD · Sep 20, 2024 · 7d6b576 · 7d6b576
2 parents 69ab9c3 + 8519d2c
commit 7d6b576
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -47,4 +47,7 @@ dateroad-api/src/main/resources/*.sql
 dateroad-api/src/test/resources/application.yml
 
 ### File ###
-**/static/*.p8
+**/static/*.p8
+
+### Redis Config ###
+redis_conf/
diff --git a/dateroad-common/src/main/java/org/dateroad/code/FailureCode.java b/dateroad-common/src/main/java/org/dateroad/code/FailureCode.java
@@ -76,7 +76,7 @@ public enum FailureCode {
     COURSE_TAG_NOT_FOUND(HttpStatus.NOT_FOUND, "e40410", "데이트 태그를 찾을 수 없습니다."),
     NEAREST_DATE_NOT_FOUND(HttpStatus.NOT_FOUND, "e40411", "다가오는 데이트를 찾을 수 없습니다."),
     LIKE_NOT_FOUND(HttpStatus.NOT_FOUND, "e40412", "해당 데이트 코스에 좋아요를 찾을 수 없습니다."),
-    COURSE_DELETE_ACCESS_DENIED(HttpStatus.NOT_FOUND, "e40414", "해당 코스를 삭제할수 없습니다."),
+    COURSE_DELETE_ACCESS_DENIED(HttpStatus.NOT_FOUND, "e40414", "해당 코스를 삭제할 수 없습니다."),
     INSUFFICIENT_USER_POINTS(HttpStatus.NOT_FOUND, "e40413", "유저의 포인트가 부족합니다."),
     SORT_TYPE_NOT_FOUND(HttpStatus.UNAUTHORIZED, "e40414", "해당 순서 타입을 찾을 수 없습니다."),
     ADVERTISEMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "e40415", "해당 광고를 찾을 수 없습니다."),

diff --git a/dateroad-domain/src/main/java/org/dateroad/user/domain/User.java b/dateroad-domain/src/main/java/org/dateroad/user/domain/User.java
@@ -10,6 +10,8 @@
 import lombok.Setter;
 import org.dateroad.common.BaseTimeEntity;
 
+import java.util.Objects;
+
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
 @Builder(access = AccessLevel.PRIVATE)
@@ -53,6 +55,14 @@ public class User extends BaseTimeEntity {
     @Setter
     private int totalPoint = 0;
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || !(o instanceof User)) return false;
+        User user = (User) o;
+        return Objects.equals(id, user.getId());  // Compare using the unique ID
+    }
+
     public static User create(final String name, final String platformUserId, final Platform platForm, final String imageUrl) {
         return User.builder()
                 .name(name)