Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/profile image #22

Merged
merged 11 commits into from
Jan 21, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat : 프로필 사진 설정 및 받아오기 기능 추가 및 작동 확인
whrjsgml0000 committed Jan 20, 2025
commit 3f53cda863cbc19672e52cca168933df24d7d88c
12 changes: 8 additions & 4 deletions src/main/java/club/inq/team1/controller/UserController.java
Original file line number Diff line number Diff line change
@@ -115,7 +115,7 @@ public ResponseEntity<User> updateCurrentUserPassword(@RequestBody @Valid Update
public ResponseEntity<PublicUserProfileDTO> getUserProfile(@PathVariable("id") Long id){
User user = userService.getUserProfile(id);
UserInfo userInfo = user.getUserInfo();

// todo 수정 필요
PublicUserProfileDTO publicUserProfileDTO = new PublicUserProfileDTO();
publicUserProfileDTO.setUserId(user.getUserId());
publicUserProfileDTO.setNickname(userInfo.getNickname());
@@ -125,10 +125,14 @@ public ResponseEntity<PublicUserProfileDTO> getUserProfile(@PathVariable("id") L
return ResponseEntity.status(200).body(publicUserProfileDTO);
}

@PostMapping(value = "/my/image", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE}, produces = {MediaType.IMAGE_JPEG_VALUE, MediaType.IMAGE_PNG_VALUE})
public ResponseEntity<Boolean> setProfileImage(@RequestPart("image")MultipartFile image) {
@PostMapping(value = "/my/image", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE}, produces = {MediaType.APPLICATION_JSON_VALUE})
public ResponseEntity<String> setProfileImage(@RequestPart("image")MultipartFile image) {
boolean b = userService.setUserProfileImage(image);
return ResponseEntity.status(200).body(b);
return ResponseEntity.status(200).body(Boolean.toString(b));
}

@GetMapping(value = "/{userId}/image", produces = {MediaType.IMAGE_JPEG_VALUE, MediaType.IMAGE_PNG_VALUE})
public ResponseEntity<byte[]> getProfileImage(@PathVariable("userId") Long userId){
return ResponseEntity.ok(userService.getUserProfileImage(userId));
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
package club.inq.team1.repository;

import club.inq.team1.dto.projection.ProfileImageProjectionDTO;
import club.inq.team1.entity.User;
import club.inq.team1.entity.UserInfo;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;

public interface UserInfoRepository extends JpaRepository<UserInfo,Long> {
boolean existsByNickname(String nickname);
Optional<ProfileImageProjectionDTO> findProfileImagePathByUser(User user);
}
1 change: 1 addition & 0 deletions src/main/java/club/inq/team1/service/UserService.java
Original file line number Diff line number Diff line change
@@ -16,4 +16,5 @@ public interface UserService {
User updatePassword(UpdateUserPasswordDTO updateUserPasswordDTO);
User getUserProfile(Long id);
boolean setUserProfileImage(MultipartFile multipartFile);
byte[] getUserProfileImage(Long userId);
}
32 changes: 25 additions & 7 deletions src/main/java/club/inq/team1/service/impl/UserServiceImpl.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package club.inq.team1.service.impl;

import club.inq.team1.dto.projection.ProfileImageProjectionDTO;
import club.inq.team1.dto.request.PutUserPrivateInfoDTO;
import club.inq.team1.dto.request.UpdateUserPasswordDTO;
import club.inq.team1.dto.request.UserJoinDTO;
@@ -11,6 +12,7 @@
import jakarta.transaction.Transactional;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -112,23 +114,39 @@ public User getUserProfile(Long id) {
@Override
@Transactional
public boolean setUserProfileImage(MultipartFile multipartFile) {
String path = "file:///C:/images/";
String uploadPath = path + "profile/" + LocalDateTime.now().format(DateTimeFormatter.BASIC_ISO_DATE);
UserInfo userInfo = getCurrentLoginUser().orElseThrow().getUserInfo();

UserInfo userInfoId = getCurrentLoginUser().orElseThrow().getUserInfoId();
// 프로필 이미지 저장 경로 C:/images/profile/yyyyMMdd/randomUUID+originalName.format
String startPath = "C:/images/";
String profilePath = startPath + "profile/" + LocalDateTime.now().format(DateTimeFormatter.BASIC_ISO_DATE) + "/";

String fileName = UUID.randomUUID() + multipartFile.getOriginalFilename();
String filePath = uploadPath + fileName;
String imageFileStoredName = UUID.randomUUID() + multipartFile.getOriginalFilename();
String filePath = profilePath + imageFileStoredName;
try {
File f = new File(filePath);
f.mkdirs();
multipartFile.transferTo(f);
userInfoId.setProfileImagePath(filePath);
userInfoRepository.save(userInfoId);
userInfo.setProfileImagePath(filePath);
userInfoRepository.save(userInfo);
} catch (IOException e) {
throw new RuntimeException(e);
}

return true;
}

@Override
public byte[] getUserProfileImage(Long userId){
User user = userRepository.findById(userId).orElseThrow();
ProfileImageProjectionDTO profileImageProjectionDTO = userInfoRepository.findProfileImagePathByUser(user)
.orElseThrow();

String profileImagePath = profileImageProjectionDTO.getProfileImagePath();

try {
return Files.readAllBytes(Path.of(profileImagePath));
} catch (IOException e) {
throw new RuntimeException(e);
}
}
}