From 562b7678f01aafaa927a68e1ee4ebeb2a0baab8b Mon Sep 17 00:00:00 2001 From: YuJin Kwon Date: Fri, 18 Aug 2023 15:50:40 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[Feat/#14]=20=EC=9C=A0=EC=A0=80=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=EC=97=90=20=ED=94=84=EB=A1=9C=ED=95=84=20=EC=82=AC?= =?UTF-8?q?=EC=A7=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../semtleapp/semtleuser/dto/SemtleUserRes.java | 6 +++++- .../repository/SemtleUserInfoRepository.java | 12 ++++++++++++ .../semtleuser/service/SemtleUserServiceImpl.java | 8 +++++--- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/semtleapp/semtleapp/semtleuser/dto/SemtleUserRes.java b/src/main/java/com/semtleapp/semtleapp/semtleuser/dto/SemtleUserRes.java index f811a2d..a93af0b 100644 --- a/src/main/java/com/semtleapp/semtleapp/semtleuser/dto/SemtleUserRes.java +++ b/src/main/java/com/semtleapp/semtleapp/semtleuser/dto/SemtleUserRes.java @@ -2,6 +2,7 @@ import com.semtleapp.semtleapp.semtleuser.entity.SemtleUser; import com.semtleapp.semtleapp.semtleuser.entity.SemtleUserInfo; +import com.semtleapp.semtleapp.semtleuser.repository.SemtleUserInfoRepository; import lombok.*; public class SemtleUserRes { @@ -18,8 +19,10 @@ public static class UserDetail { private int grade; private String studentId; private String phone; + private SemtleUserInfoRepository.GetProfileImage profileImage; - public static UserDetail toDto(SemtleUser user, SemtleUserInfo userInfo){ + + public static UserDetail toDto(SemtleUser user, SemtleUserInfo userInfo, SemtleUserInfoRepository.GetProfileImage profileImage){ return UserDetail.builder() .email(user.getEmail()) .name(userInfo.getName()) @@ -27,6 +30,7 @@ public static UserDetail toDto(SemtleUser user, SemtleUserInfo userInfo){ .grade(userInfo.getGrade()) .studentId(userInfo.getStudentId()) .phone(userInfo.getPhone()) + .profileImage(profileImage) .build(); } diff --git a/src/main/java/com/semtleapp/semtleapp/semtleuser/repository/SemtleUserInfoRepository.java b/src/main/java/com/semtleapp/semtleapp/semtleuser/repository/SemtleUserInfoRepository.java index 76e38e6..b282b58 100644 --- a/src/main/java/com/semtleapp/semtleapp/semtleuser/repository/SemtleUserInfoRepository.java +++ b/src/main/java/com/semtleapp/semtleapp/semtleuser/repository/SemtleUserInfoRepository.java @@ -1,14 +1,26 @@ package com.semtleapp.semtleapp.semtleuser.repository; +import com.semtleapp.semtleapp.semtlestudy.repository.SemtleStudyPostRepository; import com.semtleapp.semtleapp.semtleuser.entity.SemtleUser; import com.semtleapp.semtleapp.semtleuser.entity.SemtleUserInfo; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import java.util.List; import java.util.Optional; @Repository public interface SemtleUserInfoRepository extends JpaRepository { Optional findBySemtleUser(SemtleUser semtleUser); + + @Query(value = "select p.file_name as 'fileName', p.file_download_path as 'fileDownLoadPath' from photo p where p.target_id=:userId and p.type='USER'", nativeQuery = true) + GetProfileImage getProfileImage(@Param("postId") Long userId); + + interface GetProfileImage { + String getFileName(); + String getFileDownLoadPath(); + } } diff --git a/src/main/java/com/semtleapp/semtleapp/semtleuser/service/SemtleUserServiceImpl.java b/src/main/java/com/semtleapp/semtleapp/semtleuser/service/SemtleUserServiceImpl.java index a4fc208..3b02142 100644 --- a/src/main/java/com/semtleapp/semtleapp/semtleuser/service/SemtleUserServiceImpl.java +++ b/src/main/java/com/semtleapp/semtleapp/semtleuser/service/SemtleUserServiceImpl.java @@ -82,16 +82,18 @@ public SemtleUserRes.UserDetail signup(SemtleUserReq.SignupDto signupDto, Multip //프로필 사진 업로드하기 fileUserService.saveFile(file, PhotoType.USER, userId); + SemtleUserInfoRepository.GetProfileImage profileImage = semtleUserInfoRepository.getProfileImage(userId); - - return SemtleUserRes.UserDetail.toDto(user, userInfo); + return SemtleUserRes.UserDetail.toDto(user, userInfo, profileImage); } @Override public SemtleUserRes.UserDetail nowUser(String email) { SemtleUser user = semtleUserRepository.findByEmail(email).get(); SemtleUserInfo userInfo = semtleUserInfoRepository.findBySemtleUser(user).get(); - return SemtleUserRes.UserDetail.toDto(user, userInfo); + SemtleUserInfoRepository.GetProfileImage profileImage = semtleUserInfoRepository.getProfileImage(user.getUserId()); + + return SemtleUserRes.UserDetail.toDto(user, userInfo, profileImage); } From a94a1028509323f2ca877b6bf1d59fdfe530866a Mon Sep 17 00:00:00 2001 From: YuJin Kwon Date: Sat, 19 Aug 2023 11:51:11 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[Feat/#14]=20=EC=9C=A0=EC=A0=80=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=EC=97=90=20=ED=94=84=EB=A1=9C=ED=95=84=20=EC=82=AC?= =?UTF-8?q?=EC=A7=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../semtleuser/repository/SemtleUserInfoRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/semtleapp/semtleapp/semtleuser/repository/SemtleUserInfoRepository.java b/src/main/java/com/semtleapp/semtleapp/semtleuser/repository/SemtleUserInfoRepository.java index b282b58..24e939d 100644 --- a/src/main/java/com/semtleapp/semtleapp/semtleuser/repository/SemtleUserInfoRepository.java +++ b/src/main/java/com/semtleapp/semtleapp/semtleuser/repository/SemtleUserInfoRepository.java @@ -17,7 +17,7 @@ public interface SemtleUserInfoRepository extends JpaRepository findBySemtleUser(SemtleUser semtleUser); @Query(value = "select p.file_name as 'fileName', p.file_download_path as 'fileDownLoadPath' from photo p where p.target_id=:userId and p.type='USER'", nativeQuery = true) - GetProfileImage getProfileImage(@Param("postId") Long userId); + GetProfileImage getProfileImage(@Param("userId") Long userId); interface GetProfileImage { String getFileName();