From 519bf16502e4b4e76de2fbe36d2d8cc18c9e7cc4 Mon Sep 17 00:00:00 2001
From: hysong4u <hayeon_song@naver.com>
Date: Wed, 17 Jan 2024 13:00:46 +0900
Subject: [PATCH] =?UTF-8?q?[fix]=20=EC=84=A0=EB=AC=BC=EB=B0=A9=20=EC=9D=B4?=
 =?UTF-8?q?=EB=AF=B8=EC=A7=80=20default=EA=B0=92=20=EC=84=A4=EC=A0=95=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/org/sopt/sweet/domain/room/entity/Room.java    | 3 +--
 .../java/org/sopt/sweet/domain/room/service/RoomService.java | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/sopt/sweet/domain/room/entity/Room.java b/src/main/java/org/sopt/sweet/domain/room/entity/Room.java
index d24ab7d..2d7f52a 100644
--- a/src/main/java/org/sopt/sweet/domain/room/entity/Room.java
+++ b/src/main/java/org/sopt/sweet/domain/room/entity/Room.java
@@ -18,7 +18,6 @@
 public class Room extends BaseTimeEntity {
 
     private static final int DEFAULT_NUMBER = 1;
-    private static final String DEFAULT_IMAGE_URL = "https://sweet-gift-bucket.s3.ap-northeast-2.amazonaws.com/sweet.png";
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -50,7 +49,7 @@ public class Room extends BaseTimeEntity {
     @Builder
     public Room(String gifteeName, String imageUrl, LocalDateTime deliveryDate, LocalDateTime tournamentStartDate, TournamentDuration tournamentDuration, String invitationCode, Member host) {
         this.gifteeName = gifteeName;
-        this.imageUrl = DEFAULT_IMAGE_URL;
+        this.imageUrl = imageUrl;
         this.gifterNumber = DEFAULT_NUMBER;
         this.deliveryDate = deliveryDate;
         this.tournamentStartDate = tournamentStartDate;
diff --git a/src/main/java/org/sopt/sweet/domain/room/service/RoomService.java b/src/main/java/org/sopt/sweet/domain/room/service/RoomService.java
index 3eae0dc..e4148ac 100644
--- a/src/main/java/org/sopt/sweet/domain/room/service/RoomService.java
+++ b/src/main/java/org/sopt/sweet/domain/room/service/RoomService.java
@@ -43,6 +43,7 @@ public class RoomService {
     private final GiftRepository giftRepository;
     private final ProductRepository productRepository;
     private static final String CHARACTERS = "abcdefghijklmnopqrstuvwxyz0123456789";
+    private static final String DEFAULT_IMAGE_URL = "https://sweet-gift-bucket.s3.ap-northeast-2.amazonaws.com/sweet.png";
     private static final int CODE_LENGTH = 6;
     private static final int MAX_GIFTER_NUMBER = 8;
 
@@ -52,7 +53,7 @@ public CreateRoomResponseDto createNewRoom(Long memberId, CreateRoomRequestDto c
         String invitationCode = generateUniqueInvitationCode();
         Room room = Room.builder()
                 .gifteeName(createRoomRequestDto.gifteeName())
-                .imageUrl(createRoomRequestDto.imageUrl())
+                .imageUrl(createRoomRequestDto.imageUrl() != null ? createRoomRequestDto.imageUrl() : DEFAULT_IMAGE_URL)
                 .deliveryDate(createRoomRequestDto.deliveryDate())
                 .tournamentStartDate(createRoomRequestDto.tournamentStartDate())
                 .tournamentDuration(createRoomRequestDto.tournamentDuration())
@@ -152,7 +153,7 @@ public RoomMemberDetailDto getRoomMembers(Long memberId, Long roomId) {
         List<RoomMember> roomMembers = roomMemberRepository.findByRoomId(roomId);
         List<RoomMemberDto> roomMemberDtoList = mapToRoomMemberDtoList(roomMembers);
         RoomDto roomDto = new RoomDto(room.getGifteeName(), room.getGifterNumber());
-        OwnerDto ownerDto = new OwnerDto(room.getHost().getId(), room.getHost().getProfileImg(),room.getHost().getNickName());
+        OwnerDto ownerDto = new OwnerDto(room.getHost().getId(), room.getHost().getProfileImg(), room.getHost().getNickName());
         return RoomMemberDetailDto.of(roomDto, ownerDto, roomMemberDtoList);
     }