Merge branch 'part2-김경린-sprint8' into part2-김경린

k01zero · k01zero · commit 1a6c3a8d179f · 2025-04-15T18:29:00.000+09:00
diff --git a/.discodeit/storage/02bc2eec-7ea4-43e4-91d4-295ef23e42e7 b/.discodeit/storage/02bc2eec-7ea4-43e4-91d4-295ef23e42e7
@@ -0,0 +1 @@
+테스트 첨부 파일 내용
diff --git a/.discodeit/storage/2328cff6-dac4-41fa-b648-21e3fececf3c b/.discodeit/storage/2328cff6-dac4-41fa-b648-21e3fececf3c
@@ -0,0 +1 @@
+test-image
diff --git a/.discodeit/storage/270ad0c1-b531-4ca4-aac0-1cedf352e995 b/.discodeit/storage/270ad0c1-b531-4ca4-aac0-1cedf352e995
@@ -0,0 +1 @@
+테스트 첨부 파일 내용
diff --git a/.discodeit/storage/38687ce4-2196-40cd-b1aa-a96e9ab558a5 b/.discodeit/storage/38687ce4-2196-40cd-b1aa-a96e9ab558a5
@@ -0,0 +1 @@
+테스트 첨부 파일 내용
diff --git a/.discodeit/storage/54d122ee-6c90-4621-b383-6fe87a01d863 b/.discodeit/storage/54d122ee-6c90-4621-b383-6fe87a01d863
@@ -0,0 +1 @@
+테스트 첨부 파일 내용
diff --git a/.discodeit/storage/7c952505-78fb-4295-a943-275f6106c356 b/.discodeit/storage/7c952505-78fb-4295-a943-275f6106c356
@@ -0,0 +1 @@
+updated-image
diff --git a/.discodeit/storage/9058e6e7-acfb-4b85-9a5c-203738959e6c b/.discodeit/storage/9058e6e7-acfb-4b85-9a5c-203738959e6c
@@ -0,0 +1 @@
+테스트 첨부 파일 내용
diff --git a/.discodeit/storage/a441e114-dd2e-48b1-9e20-5b629b0fb17f b/.discodeit/storage/a441e114-dd2e-48b1-9e20-5b629b0fb17f
@@ -0,0 +1 @@
+test-image
diff --git a/.discodeit/storage/befe9f6e-4ad5-40ac-b6fc-f908784e3f30 b/.discodeit/storage/befe9f6e-4ad5-40ac-b6fc-f908784e3f30
@@ -0,0 +1 @@
+테스트 첨부 파일 내용
diff --git a/.discodeit/storage/fa582886-5ac1-4724-ad00-9922789ad086 b/.discodeit/storage/fa582886-5ac1-4724-ad00-9922789ad086
@@ -0,0 +1 @@
+테스트 첨부 파일 내용
diff --git a/.discodeit/storage/fae803d6-78b2-4356-9e87-a4ad74751fc8 b/.discodeit/storage/fae803d6-78b2-4356-9e87-a4ad74751fc8
@@ -0,0 +1 @@
+테스트 첨부 파일 내용
diff --git a/.gitignore b/.gitignore
@@ -43,7 +43,8 @@ bin/
 
 ### 환경변수 ###
 .env
-.env.forPR
+forPR.env
+discodeit.env
 
 ...
 .idea
diff --git a/.logs/app.2025-04-14.log b/.logs/app.2025-04-14.log
diff --git a/.logs/app.log b/.logs/app.log
diff --git a/src/main/java/com/sprint/mission/discodeit/controller/MessageController.java b/src/main/java/com/sprint/mission/discodeit/controller/MessageController.java
@@ -96,10 +96,10 @@ public ResponseEntity<Void> deleteMessage(@PathVariable("messageId") UUID messag
 
   @GetMapping
   public ResponseEntity<PageResponse<MessageDto>> getMessageByChannelId(
-      @RequestParam("messageId") UUID channelId,
+      @RequestParam("channelId") UUID channelId,
       @RequestParam(defaultValue = "0") int page, // 0페이지 부터
       @RequestParam(defaultValue = "50") int size, // 50개씩
-      @RequestParam(defaultValue = "createDate") String sortBy, // 정렬 기준
+      @RequestParam(defaultValue = "createdAt") String sortBy, // 정렬 기준
       @RequestParam(defaultValue = "desc") String direction) { // 내림차순 --> 최신 것부터
     // PageRequest.of(page, size, sort)
     // 0, 10, Sort.by("orderDate").descending()
diff --git a/src/main/java/com/sprint/mission/discodeit/controller/UserController.java b/src/main/java/com/sprint/mission/discodeit/controller/UserController.java
@@ -6,7 +6,6 @@
 import com.sprint.mission.discodeit.dto.UserStatusDto;
 import com.sprint.mission.discodeit.dto.user.*;
 import com.sprint.mission.discodeit.dto.userStatus.UserStatusUpdateByUserIdRequest;
-import com.sprint.mission.discodeit.dto.userStatus.UserStatusUpdateRequest;
 import com.sprint.mission.discodeit.service.UserService;
 import com.sprint.mission.discodeit.service.UserStatusService;
 import jakarta.validation.Valid;
@@ -36,67 +35,50 @@ public class UserController implements UserApi {
   public ResponseEntity<UserDto> createUser(
       @Valid @RequestPart(value = "userCreateRequest") UserCreateRequest userCreateRequest,
       @RequestPart(value = "binaryContent", required = false) MultipartFile file) {
-
     /* 유저 생성 요청(Request) */
     log.info("유저 생성 요청(Request): username={}, hasProfileImage={}",
         userCreateRequest.username(),
         file != null);
-
     // 프로필 이미지 처리
     Optional<BinaryContentCreateRequest> profileRequest =
         Optional.ofNullable(file).flatMap(this::resolveProfileRequest);
 
     if (profileRequest.isPresent()) {
-      log.debug("프로필 이미지 생성 : filename={}, size={}, contentType={}",
-          file.getName(),
-          file.getSize(),
-          file.getContentType());
+      log.debug("프로필 이미지 생성 : {}", profileRequest);
     }
-
     // 유저 생성
     UserDto userDto = userService.createUser(userCreateRequest, profileRequest);
     /* 유저 생성 응답(Response) */
-    log.info("유저 생성 응답(Response): username={}, HttpStatus={} ",
-        userDto.username(),
-        HttpStatus.CREATED);
+    log.debug("유저 생성 응답(Response) {}", userDto);
     return ResponseEntity.status(HttpStatus.CREATED).body(userDto);
   }
 
   @PatchMapping(value = "/{userId}", consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
-  public ResponseEntity<UserDto> updateUser(@PathVariable UUID userId,
+  public ResponseEntity<UserDto> updateUser(
+      @PathVariable UUID userId,
       @Valid @RequestPart(value = "userUpdateRequest") UserUpdateRequest userUpdateRequest,
-      @RequestPart(value = "profile", required = false) MultipartFile file) {
+      @RequestPart(value = "profile", required = false) MultipartFile file
+  ) {
     log.info(
-        "유저 수정 요청(Request): usernameChanged={}, emailChanged={}, passwordChanged={}, hasProfileImage={}",
-        userUpdateRequest.newUsername() != null,
-        userUpdateRequest.newEmail() != null,
-        userUpdateRequest.newPassword() != null,
-        file != null && !file.isEmpty()
+        "유저 수정 요청(Request): userId={}, userUpdateRequest={}", userId, userUpdateRequest
     );
-
     // 새로운 프로필 이미지 처리
     Optional<BinaryContentCreateRequest> profileRequest =
         Optional.ofNullable(file).flatMap(this::resolveProfileRequest);
-
     if (profileRequest.isPresent()) {
-      log.debug("프로필 이미지 생성 : filename={}, size={}, contentType={}",
-          file.getName(),
-          file.getSize(),
-          file.getContentType());
+      log.debug("프로필 이미지 생성 : {}", profileRequest);
     }
-
     // 유저 수정
     UserDto userDto = userService.updateUserInfo(userId, userUpdateRequest, profileRequest);
-    log.info("유저 수정 응답(Response): username={}, HttpStatus={} ",
-        userDto.username(),
-        HttpStatus.OK);
-    return ResponseEntity.ok(userDto);
+    log.debug("유저 수정 응답(Response) {}", userDto);
+    return ResponseEntity.status(HttpStatus.OK).body(userDto);
 
   }
 
 
   @PatchMapping(value = "/{userId}/userStatus")
-  public ResponseEntity<UserStatusDto> updateUserStateByUserId(@PathVariable UUID userId,
+  public ResponseEntity<UserStatusDto> updateUserStateByUserId(
+      @PathVariable UUID userId,
       @RequestBody UserStatusUpdateByUserIdRequest userStatusUpdateByUserIdRequest) {
 
     // 유저 상태 수정
diff --git a/src/main/java/com/sprint/mission/discodeit/mapper/BinaryContentMapper.java b/src/main/java/com/sprint/mission/discodeit/mapper/BinaryContentMapper.java
@@ -13,33 +13,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 
 @Mapper(componentModel = "spring")
-public abstract class BinaryContentMapper {
+public interface BinaryContentMapper {
 
-  @PostConstruct
-  public void init() {
-    // 메퍼가 초기화되었는지, binaryContentStorage가 주입되었는지 확인
-    // System.out.println(" BinaryContentMapper  BinaryContentMapper  BinaryContentMapper ");
-  }
+  BinaryContentDto toDto(BinaryContent binaryContent);
 
-  @Autowired
-  protected BinaryContentStorage binaryContentStorage;
-
-  // BinaryContent에 bytes 없고, id로 BinaryContentStorage에서 들고와야 한다.
-  @Mapping(target = "bytes", source = "id", qualifiedByName = "mapBytes")
-  public abstract BinaryContentDto toDto(BinaryContent binaryContent);
-
-  // 맞는지 모르겠음 우선 보류
-  public abstract BinaryContent toEntity(BinaryContentDto binaryContentDto);
-
-  // 5.10 @Named 어노테이션 - Mapping#qualitiedByName 연계
-  // Mapping#qualifiedByName또는 를 제공하면 Mapping#qualifiedByMapStruct가 해당 메서드를 사용하도록 강제합니다.
-  @Named("mapBytes")
-  byte[] mapBytes(UUID id) {
-    try (InputStream inputStream = binaryContentStorage.get(id)) {  // 스트림을 닫도록 설정
-      return inputStream.readAllBytes();  // 한 번만 읽고, 데이터를 바이트 배열로 반환
-    } catch (IOException e) {
-      throw new RuntimeException("Failed to read binary content for ID: " + id, e);
-    }
-  }
+  BinaryContent toEntity(BinaryContentDto binaryContentDto);
 
 }
diff --git a/src/main/java/com/sprint/mission/discodeit/repository/ChannelRepository.java b/src/main/java/com/sprint/mission/discodeit/repository/ChannelRepository.java
@@ -2,9 +2,14 @@
 
 import com.sprint.mission.discodeit.entity.Channel;
 
+import com.sprint.mission.discodeit.entity.ChannelType;
+import java.util.List;
 import java.util.UUID;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface ChannelRepository extends JpaRepository<Channel, UUID> {
 
+  List<Channel> findAllByTypeOrIdIn(ChannelType type, List<UUID> ids);
+
+
 }
diff --git a/src/main/java/com/sprint/mission/discodeit/service/BinaryContentService.java b/src/main/java/com/sprint/mission/discodeit/service/BinaryContentService.java
@@ -4,7 +4,6 @@
 import com.sprint.mission.discodeit.dto.BinaryContentDto;
 
 import jakarta.transaction.Transactional;
-import java.io.InputStream;
 import java.util.List;
 import java.util.UUID;
 import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicBinaryContentService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicBinaryContentService.java
@@ -38,6 +38,7 @@ public BinaryContentDto createBinaryContent(BinaryContentCreateRequest request)
         .contentType(request.contentType())
         .build();
     binaryContentRepository.save(binaryContent);
+
     binaryContentStorage.put(binaryContent.getId(), request.bytes());
     return binaryContentMapper.toDto(binaryContent);
   }
diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicChannelService.java
@@ -97,10 +97,13 @@ public List<ChannelDto> findAllByUserId(UUID userId) {
     userRepository.findById(userId).orElseThrow(() -> {
       return new UserNotFoundException(Map.of("userId", userId));
     });
-    List<Channel> channels = readStatusService.findAllReadStatusEntitiesByUserId(userId).stream()
+    List<UUID> mySubscribedChannelIds = readStatusRepository.findAllByUserId(userId).stream()
         .map(ReadStatus::getChannel)
+        .map(Channel::getId)
         .toList();
-    return channels.stream()
+
+    return channelRepository.findAllByTypeOrIdIn(ChannelType.PUBLIC, mySubscribedChannelIds)
+        .stream()
         .map(channelMapper::toDto)
         .toList();
   }
@@ -154,10 +157,11 @@ public void deleteChannelById(UUID id) {
     String keyword = inputHandler.getYesNOInput().toLowerCase();
     if (keyword.equals("y")) {
 
-      if (channelRepository.findById(id).isEmpty()) {
-        log.error("채널 삭제 단계에서 채널을 찾지 못함: channelId={}", id);
-        throw new ChannelNotFoundException(Map.of("channelId", id));
-      }
+      channelRepository.findById(id)
+          .orElseThrow(() -> {
+            log.error("채널 수정 단계에서 채널을 찾지 못함: channelId={}", id);
+            return new ChannelNotFoundException(Map.of("id", id));
+          });
 
       log.info("채널 메세지 삭제");
       // 채널 메세지 삭제
diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicMessageService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicMessageService.java
@@ -94,6 +94,8 @@ public MessageDto createMessage(MessageCreateRequest messageCreateRequest,
     log.info("메세지 생성 시도 성공: messageContent={}, createdAt={}",
         message.getContent(),
         message.getCreatedAt());
+    log.info("메세지 생성 시도 성공: messageID={}",
+        message.getId());
     return messageMapper.toDto(message);
   }
 
diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserService.java
@@ -57,6 +57,8 @@ public UserDto createUser(UserCreateRequest userCreateRequest,
       Optional<BinaryContentCreateRequest> optionalProfileCreateRequest) {
 
     log.info("사용자 생성 시도: username={}", userCreateRequest.username());
+    log.debug("사용자 생성 시도: userCreateRequest={}, optionalProfileCreateRequest={}", userCreateRequest,
+        optionalProfileCreateRequest);
 
     // username과 email이 다른 유저와 같이 겹치는지 검증
     if (userRepository.existsByUsername(userCreateRequest.username())) {
@@ -105,13 +107,8 @@ public UserDto createUser(UserCreateRequest userCreateRequest,
         .user(user)
         .lastActiveAt(Instant.now())
         .build();
-    userStatusRepository.save(userStatus);
+    userStatus = userStatusRepository.save(userStatus);
 
-    /** 멘토님 궁금한 점 있습니다!!!
-     * base 7 코드에서는 user에  userStatus를 지정하지 않던데
-     * 저는 위와 같이 했을 때 toDto 쪽에서 문제가 생기던데,
-     * 코드를 어떻게 이해보면 될까요?
-     * **/
     user.updateUserStatus(userStatus);
 
     /* 중복이 없는 유저 이름과 만들어진 시각을 log.info에 담는다.*/
diff --git a/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserStatusService.java b/src/main/java/com/sprint/mission/discodeit/service/basic/BasicUserStatusService.java
@@ -12,11 +12,13 @@
 import jakarta.transaction.Transactional;
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.UUID;
 
+@Slf4j // 로깅을 위한 Lombok 어노테이션 추가
 @Service
 @RequiredArgsConstructor
 public class BasicUserStatusService implements UserStatusService {
@@ -80,6 +82,7 @@ public UserStatusDto updateUserStatus(UserStatusUpdateRequest request) {
   @Override
   public UserStatusDto updateUserStatusByUserId(UUID userId,
       UserStatusUpdateByUserIdRequest request) {
+    log.info("UserId로 유저 상태 업데이트 시도");
     UserStatus userStatus =
         userStatusRepository.findByUserId(userId)
             .orElseThrow(
@@ -88,7 +91,7 @@ public UserStatusDto updateUserStatusByUserId(UUID userId,
     userStatus.updateLastConnectAt(request.newLastActiveAt());
     userStatus.refreshUpdateAt();
     // userStatusRepository.save(userStatus); JPA 의 더티 채킹으로 save 하지 않아도 DB에 자동 업데이트
-
+    log.info("UserId로 유저 상태 업데이트 시도 성공");
     return userStatusMapper.toDto(userStatus);
   }
 
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -8,10 +8,13 @@ spring:
   jpa:
     show-sql: true
 
+
   servlet:
     multipart:
       max-file-size: 10MB # 파일 하나의 최대 크기
       max-request-size: 20MB # 한 벙네 최대 업로드 가능 용량
+  profiles:
+    active: test
 
 discodeit:
   storage:
diff --git a/src/test/java/com/sprint/mission/discodeit/TDDTestApplicationTests.java b/src/test/java/com/sprint/mission/discodeit/TDDTestApplicationTests.java
diff --git a/src/test/java/com/sprint/mission/discodeit/cotroller/ChannelControllerTest.java b/src/test/java/com/sprint/mission/discodeit/cotroller/ChannelControllerTest.java
diff --git a/src/test/java/com/sprint/mission/discodeit/cotroller/MessageControllerTest.java b/src/test/java/com/sprint/mission/discodeit/cotroller/MessageControllerTest.java
diff --git a/src/test/java/com/sprint/mission/discodeit/cotroller/UserControllerTest.java b/src/test/java/com/sprint/mission/discodeit/cotroller/UserControllerTest.java
diff --git a/src/test/java/com/sprint/mission/discodeit/integration/ChannelApiIntegrationTest.java b/src/test/java/com/sprint/mission/discodeit/integration/ChannelApiIntegrationTest.java
diff --git a/src/test/java/com/sprint/mission/discodeit/integration/MessageApiIntegrationTest.java b/src/test/java/com/sprint/mission/discodeit/integration/MessageApiIntegrationTest.java
diff --git a/src/test/java/com/sprint/mission/discodeit/integration/UserApiIntegrationTest.java b/src/test/java/com/sprint/mission/discodeit/integration/UserApiIntegrationTest.java
diff --git a/src/test/java/com/sprint/mission/discodeit/service/ChannelServiceTest.java b/src/test/java/com/sprint/mission/discodeit/service/ChannelServiceTest.java
diff --git a/src/test/java/com/sprint/mission/discodeit/service/UserServiceTest.java b/src/test/java/com/sprint/mission/discodeit/service/UserServiceTest.java
