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 roomMembers = roomMemberRepository.findByRoomId(roomId); List 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); }