diff --git a/src/main/java/com/back/domain/user/entity/User.java b/src/main/java/com/back/domain/user/entity/User.java index c746c241..4ad1a26d 100644 --- a/src/main/java/com/back/domain/user/entity/User.java +++ b/src/main/java/com/back/domain/user/entity/User.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Objects; @Entity @Table(name = "users") // 예약어 충돌 방지를 위해 "users" 권장 @@ -70,6 +71,17 @@ public class User { @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true) private List postLikes = new ArrayList<>(); + @Override + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) return false; + User user = (User) o; + return Objects.equals(id, user.id); + } + + @Override + public int hashCode() { + return Objects.hashCode(id); + } public boolean isAdmin() { return "ADMIN".equalsIgnoreCase(role); diff --git a/src/main/java/com/back/global/security/SecurityUser.java b/src/main/java/com/back/global/security/SecurityUser.java index ae0b9adb..0c7c0b2a 100644 --- a/src/main/java/com/back/global/security/SecurityUser.java +++ b/src/main/java/com/back/global/security/SecurityUser.java @@ -38,7 +38,6 @@ public SecurityUser( authorities ); - this.id = id; this.nickname = nickname; this.email = email; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 98079d1b..c1412685 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -29,17 +29,6 @@ spring: encoding: UTF-8 data-locations: classpath:data-h2.sql - cloud: - aws: - region: - static: ap-northeast-2 - stack: - auto: false - credentials: - access-key: ${AWS_ACCESS_KEY_ID} # 로컬용 더미값 - secret-key: ${AWS_SECRET_ACCESS_KEY} - s3: - bucket: team2-app-s3-bucket # Swagger 설정 springdoc: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e2ac5c23..4f164228 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -47,6 +47,18 @@ spring: user-info-uri: https://openapi.naver.com/v1/nid/me user-name-attribute: response + cloud: + aws: + region: + static: ap-northeast-2 + stack: + auto: false + credentials: + access-key: ${AWS_ACCESS_KEY_ID} # 로컬용 더미값 + secret-key: ${AWS_SECRET_ACCESS_KEY} + s3: + bucket: team2-app-s3-bucket + ai: openai: api-key: ${GEMINI_API_KEY}