From 095be78999fc6fe44e66c939ce0ba49f5d3ec262 Mon Sep 17 00:00:00 2001 From: gardening-y Date: Fri, 20 Sep 2024 02:35:35 +0900 Subject: [PATCH 1/3] [chore] redis_config gitignore - #277 --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1809d73a..aeb1db3c 100644 --- a/.gitignore +++ b/.gitignore @@ -47,4 +47,7 @@ dateroad-api/src/main/resources/*.sql dateroad-api/src/test/resources/application.yml ### File ### -**/static/*.p8 \ No newline at end of file +**/static/*.p8 + +### Redis Config ### +redis_conf/ \ No newline at end of file From 3bd438abc3eb29702fd15ad2ef1d65789e3de89a Mon Sep 17 00:00:00 2001 From: gardening-y Date: Fri, 20 Sep 2024 02:36:22 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[fix]=20FailureCode=20=EB=9D=84=EC=96=B4?= =?UTF-8?q?=EC=93=B0=EA=B8=B0=20=EC=88=98=EC=A0=95=20-=20#277?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/dateroad/code/FailureCode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dateroad-common/src/main/java/org/dateroad/code/FailureCode.java b/dateroad-common/src/main/java/org/dateroad/code/FailureCode.java index 9108ea36..56ee8f90 100644 --- 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", "해당 광고를 찾을 수 없습니다."), From 8519d2c0067996fe4e136302f5b2b335691ed9de Mon Sep 17 00:00:00 2001 From: gardening-y Date: Fri, 20 Sep 2024 02:37:45 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[fix]=20User=20equals=20=EC=9E=AC=EC=A0=95?= =?UTF-8?q?=EC=9D=98=20-=20#277?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/dateroad/user/domain/User.java | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 index 395e5ded..3d52c466 100644 --- 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)