From 5c1b3582f0649571d770bff819731b1bff95d7b1 Mon Sep 17 00:00:00 2001 From: junwon <67488973+wjdwnsdnjs13@users.noreply.github.com> Date: Thu, 29 Aug 2024 14:44:16 +0900 Subject: [PATCH] =?UTF-8?q?[NO=5FJIRA]=20=EA=B8=B0=EB=B3=B8=20=ED=94=84?= =?UTF-8?q?=EB=A1=9C=ED=95=84=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20(#176)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor : 기본 프로필 이미지 변경 * refactor : 기본 프로필 이미지 환경 변수로 처리 --- .github/workflows/dev-build-and-deploy.yaml | 1 + .github/workflows/manual-prod-deploy.yaml | 1 + .../jpa/oauth/entity/GoogleUserInfoEntity.java | 6 +++++- .../jpa/oauth/entity/KakaoUserInfoEntity.java | 6 +++++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev-build-and-deploy.yaml b/.github/workflows/dev-build-and-deploy.yaml index f117acc7..45d4ccd2 100644 --- a/.github/workflows/dev-build-and-deploy.yaml +++ b/.github/workflows/dev-build-and-deploy.yaml @@ -133,6 +133,7 @@ jobs: -e AWS_S3_ACCESS_KEY=${{ secrets.AWS_S3_ACCESS_KEY }} \ -e AWS_S3_SECRET_KEY=${{ secrets.AWS_S3_SECRET_KEY }} \ -e AWS_S3_BUCKET_NAME=${{ secrets.DEV_AWS_S3_BUCKET_NAME }} \ + -e AWS_S3_BASICPROFILEIMAGEURL=${{ secrets.BASICPROFILEIMAGEURL }} \ -e TZ=Asia/Seoul \ -e SENTRY_DSN=${{ secrets.SENTRY_DSN }} \ -e SENTRY_ENABLE_TRACING=true \ diff --git a/.github/workflows/manual-prod-deploy.yaml b/.github/workflows/manual-prod-deploy.yaml index c5bd26f6..ec62a71a 100644 --- a/.github/workflows/manual-prod-deploy.yaml +++ b/.github/workflows/manual-prod-deploy.yaml @@ -70,6 +70,7 @@ jobs: -e AWS_S3_ACCESS_KEY=${{ secrets.AWS_S3_ACCESS_KEY }} \ -e AWS_S3_SECRET_KEY=${{ secrets.AWS_S3_SECRET_KEY }} \ -e AWS_S3_BUCKET_NAME=${{ secrets.PROD_AWS_S3_BUCKET_NAME }} \ + -e AWS_S3_BASICPROFILEIMAGEURL=${{ secrets.BASICPROFILEIMAGEURL }} \ -e TZ=Asia/Seoul \ -e SENTRY_DSN=${{ secrets.SENTRY_DSN }} \ -e SENTRY_ENABLE_TRACING=true \ diff --git a/infrastructure/src/main/java/org/depromeet/spot/infrastructure/jpa/oauth/entity/GoogleUserInfoEntity.java b/infrastructure/src/main/java/org/depromeet/spot/infrastructure/jpa/oauth/entity/GoogleUserInfoEntity.java index f81d7b87..07d2b20d 100644 --- a/infrastructure/src/main/java/org/depromeet/spot/infrastructure/jpa/oauth/entity/GoogleUserInfoEntity.java +++ b/infrastructure/src/main/java/org/depromeet/spot/infrastructure/jpa/oauth/entity/GoogleUserInfoEntity.java @@ -4,6 +4,7 @@ import org.depromeet.spot.domain.member.enums.MemberRole; import org.depromeet.spot.domain.member.enums.SnsProvider; import org.depromeet.spot.infrastructure.jpa.common.entity.BaseEntity; +import org.springframework.beans.factory.annotation.Value; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @@ -16,6 +17,9 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class GoogleUserInfoEntity extends BaseEntity { + @Value("${aws.s3.basicProfileImageUrl}") + private String BASIC_PROFILE_IMAGE_URL; + // 구글 로그인은 sub라는 이름으로 id값을 줌. // 구글의 sub 값은 Long 타입을 넘어감. // BigInteger로 처리하거나 String으로 처리해야함. @@ -38,7 +42,7 @@ public Member toGoogleDomain(Member member) { return Member.builder() .email(email) .nickname(member.getNickname()) - .profileImage(profileImageUrl) + .profileImage(BASIC_PROFILE_IMAGE_URL) .snsProvider(SnsProvider.GOOGLE) .idToken(idToken) .role(MemberRole.ROLE_USER) diff --git a/infrastructure/src/main/java/org/depromeet/spot/infrastructure/jpa/oauth/entity/KakaoUserInfoEntity.java b/infrastructure/src/main/java/org/depromeet/spot/infrastructure/jpa/oauth/entity/KakaoUserInfoEntity.java index c7ffb4b5..1708a1d1 100644 --- a/infrastructure/src/main/java/org/depromeet/spot/infrastructure/jpa/oauth/entity/KakaoUserInfoEntity.java +++ b/infrastructure/src/main/java/org/depromeet/spot/infrastructure/jpa/oauth/entity/KakaoUserInfoEntity.java @@ -8,6 +8,7 @@ import org.depromeet.spot.domain.member.enums.MemberRole; import org.depromeet.spot.domain.member.enums.SnsProvider; import org.depromeet.spot.infrastructure.jpa.common.entity.BaseEntity; +import org.springframework.beans.factory.annotation.Value; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @@ -21,6 +22,9 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class KakaoUserInfoEntity extends BaseEntity { + @Value("${aws.s3.basicProfileImageUrl}") + private String BASIC_PROFILE_IMAGE_URL; + // 서비스에 연결 완료된 시각. UTC @JsonProperty("connected_at") public Date connectedAt; @@ -100,7 +104,7 @@ public Member toKakaoDomain(Member member) { .name(kakaoAccount.name) .nickname(member.getNickname()) .phoneNumber(kakaoAccount.phoneNumber) - .profileImage(kakaoAccount.profile.profileImageUrl) + .profileImage(BASIC_PROFILE_IMAGE_URL) .snsProvider(SnsProvider.KAKAO) .idToken(getId().toString()) .role(MemberRole.ROLE_USER)