Skip to content

Commit

Permalink
Merge pull request #105 from sgdevcamp2023/develop
Browse files Browse the repository at this point in the history 
[playlist/develop] <- [Develop]
  • Loading branch information
@suakang17
suakang17 authored Feb 22, 2024
2 parents e0fe2f4 + 879f8be commit e6f5bf6
Show file tree
Hide file tree
Showing 12 changed files with 202 additions and 175 deletions.
2 changes: 2 additions & 0 deletions src/backend/chatting-server/src/main/java/chattingserver/controller/RoomController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ public ResponseEntity<BaseResponse<RoomResponseDto>> groupCreation(@Valid @Reque
.thumbnailImage(roomResponseDto.getThumbnailImage())
.build());

log.info("roomRespDto-Controller-roomResponseDto={}", roomResponseDto);

searchService.sendIndexingRequestToSearchServer(roomResponseDto);

return ResponseEntity.ok(BaseResponse.from(HttpStatus.CREATED.value(), "채팅방 생성 성공", roomResponseDto));
Expand Down
3 changes: 2 additions & 1 deletion ...ackend/chatting-server/src/main/java/chattingserver/dto/request/RoomCreateRequestDto.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import chattingserver.domain.room.Playlist;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Builder;
import lombok.Getter;
import lombok.ToString;
Expand All @@ -16,7 +17,7 @@ public class RoomCreateRequestDto {
private Long uid;
@NotBlank
private String nickName;
@NotBlank
@NotNull
private String userProfileImage;
@NotBlank
private Playlist playlist;
Expand Down
1 change: 1 addition & 0 deletions src/backend/chatting-server/src/main/java/chattingserver/dto/response/RoomResponseDto.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

@Builder
@Getter
@Setter
@ToString
@AllArgsConstructor
@NoArgsConstructor
Expand Down
330 changes: 165 additions & 165 deletions ...end/chatting-server/src/main/java/chattingserver/repository/ChatroomDummyInitializer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,171 +26,171 @@ public class ChatroomDummyInitializer implements ApplicationRunner {

@Override
public void run(ApplicationArguments args) throws Exception {
User dummyUser1 = User.builder()
.uid(1L)
.nickName("유저닉네임1")
.profileImage("https://cdn.pixabay.com/photo/2015/10/05/22/37/blank-profile-picture-973460_960_720.png")
.enteredAt(LocalDateTime.now())
.build();

User dummyUser2 = User.builder()
.uid(2L)
.nickName("유저닉네임2")
.profileImage("")
.enteredAt(LocalDateTime.now())
.build();

List<User> users = new ArrayList<>();
users.add(dummyUser1);
users.add(dummyUser2);

Music dummyMusic1 = Music.builder()
.id(1L)
.title("음원1")
.artist("아티스트1")
.playtime("12:34")
.thumbnail("https://marketplace.canva.com/EAFHtE880QY/1/0/1600w/canva-blue-and-red-modern-music-youtube-thumbnail-cBAYqTj4TLk.jpg")
.build();

Music dummyMusic2 = Music.builder()
.id(2L)
.title("음원2")
.artist("아티스트2")
.playtime("01:23")
.thumbnail("https://marketplace.canva.com/EAFOwKVP0Ck/1/0/1600w/canva-blue-orange-colorful-aesthetic-minimalist-lofi-music-youtube-thumbnail-ETT-krmERlk.jpg")
.build();

List<Music> dummyMusics = new ArrayList<>();
dummyMusics.add(dummyMusic1);
dummyMusics.add(dummyMusic2);


Playlist dummyPlaylist = Playlist.builder()
.id("qwer1234")
.name("플레이리스트1")
.musics(dummyMusics)
.playlistOwnerId(dummyUser1.getUid())
.playlistOwnerNickName(dummyUser1.getNickName())
.playlistOwnerProfileImage(dummyUser1.getProfileImage())
.build();

// room build
Room dummyRoom = Room.builder()
.roomName(dummyPlaylist.getName())
.playlist(dummyPlaylist)
.playlistDuration(dummyPlaylist.getTotalPlaylistTime())
.thumbnailImage(dummyPlaylist.getFirstMusic().getThumbnail())
.users(users)
.playlistOwner(dummyUser1)
.createdAt(LocalDateTime.now())
.build();

roomRepository.save(dummyRoom);
log.info("방 생성 성공 room={}", dummyRoom);

ChatMessage message1 = chatMessageRepository.save(ChatMessage.builder()
.messageType(MessageType.MSG)
.roomId(dummyRoom.getId())
.senderId(dummyUser1.getUid())
.nickName(dummyUser1.getNickName())
.senderProfileImage(dummyUser1.getProfileImage())
.content("메시지메시지1")
.createdAt(LocalDateTime.now())
.build());

ChatMessage message2 = chatMessageRepository.save(ChatMessage.builder()
.messageType(MessageType.MSG)
.roomId(dummyRoom.getId())
.senderId(dummyUser2.getUid())
.nickName(dummyUser2.getNickName())
.senderProfileImage(dummyUser2.getProfileImage())
.content("메시지메시지2")
.createdAt(LocalDateTime.now())
.build());

log.info("메시지 생성 성공 message1={}", message1);
log.info("메시지 생성 성공 message2={}", message2);

User dummyUser3 = User.builder()
.uid(3L)
.nickName("유저닉네임3")
.profileImage("https://t4.ftcdn.net/jpg/03/64/21/11/360_F_364211147_1qgLVxv1Tcq0Ohz3FawUfrtONzz8nq3e.jpg")
.enteredAt(LocalDateTime.now())
.build();

User dummyUser4 = User.builder()
.uid(3L)
.nickName("유저닉네임4")
.profileImage("https://images.pexels.com/photos/771742/pexels-photo-771742.jpeg?cs=srgb&dl=pexels-mohamed-abdelghaffar-771742.jpg&fm=jpg")
.enteredAt(LocalDateTime.now())
.build();

List<User> users2 = new ArrayList<>();
users2.add(dummyUser3);
users2.add(dummyUser4);
users2.add(dummyUser1);

Music dummyMusic3 = Music.builder()
.id(3L)
.title("음원3")
.artist("아티스트3")
.playtime("12:34")
.thumbnail("https://content.wepik.com/statics/13638236/preview-page0.jpg")
.build();

List<Music> dummyMusics2 = new ArrayList<>();
dummyMusics2.add(dummyMusic1);
dummyMusics2.add(dummyMusic3);


Playlist dummyPlaylist2 = Playlist.builder()
.id("098765432qwerty")
.name("플레이리스트2")
.musics(dummyMusics2)
.playlistOwnerId(dummyUser3.getUid())
.playlistOwnerNickName(dummyUser3.getNickName())
.playlistOwnerProfileImage(dummyUser3.getProfileImage())
.build();

log.info("dummyPlaylist2={}", dummyPlaylist2.toString());
log.info("dummyPlaylist2 firstMusic={}", dummyPlaylist2.getFirstMusic().toString());

// room build
Room dummyRoom2 = Room.builder()
.roomName(dummyPlaylist2.getName())
.playlist(dummyPlaylist2)
.playlistDuration(dummyPlaylist2.getTotalPlaylistTime())
.thumbnailImage(dummyPlaylist2.getFirstMusic().getThumbnail())
.users(users2)
.playlistOwner(dummyUser3)
.createdAt(LocalDateTime.now())
.build();

roomRepository.save(dummyRoom2);
log.info("방 생성 성공 room={}", dummyRoom);

ChatMessage message3 = chatMessageRepository.save(ChatMessage.builder()
.messageType(MessageType.MSG)
.roomId(dummyRoom2.getId())
.senderId(dummyUser1.getUid())
.nickName(dummyUser1.getNickName())
.senderProfileImage(dummyUser1.getProfileImage())
.content("메시지메시지3")
.createdAt(LocalDateTime.now())
.build());

ChatMessage message4 = chatMessageRepository.save(ChatMessage.builder()
.messageType(MessageType.MSG)
.roomId(dummyRoom2.getId())
.senderId(dummyUser4.getUid())
.nickName(dummyUser4.getNickName())
.senderProfileImage(dummyUser4.getProfileImage())
.content("메시지메시지4")
.createdAt(LocalDateTime.now())
.build());

log.info("메시지 생성 성공 message3={}", message3);
log.info("메시지 생성 성공 message4={}", message4);
// User dummyUser1 = User.builder()
// .uid(1L)
// .nickName("유저닉네임1")
// .profileImage("https://cdn.pixabay.com/photo/2015/10/05/22/37/blank-profile-picture-973460_960_720.png")
// .enteredAt(LocalDateTime.now())
// .build();
//
// User dummyUser2 = User.builder()
// .uid(2L)
// .nickName("유저닉네임2")
// .profileImage("")
// .enteredAt(LocalDateTime.now())
// .build();
//
// List<User> users = new ArrayList<>();
// users.add(dummyUser1);
// users.add(dummyUser2);
//
// Music dummyMusic1 = Music.builder()
// .id(1L)
// .title("음원1")
// .artist("아티스트1")
// .playtime("12:34")
// .thumbnail("https://marketplace.canva.com/EAFHtE880QY/1/0/1600w/canva-blue-and-red-modern-music-youtube-thumbnail-cBAYqTj4TLk.jpg")
// .build();
//
// Music dummyMusic2 = Music.builder()
// .id(2L)
// .title("음원2")
// .artist("아티스트2")
// .playtime("01:23")
// .thumbnail("https://marketplace.canva.com/EAFOwKVP0Ck/1/0/1600w/canva-blue-orange-colorful-aesthetic-minimalist-lofi-music-youtube-thumbnail-ETT-krmERlk.jpg")
// .build();
//
// List<Music> dummyMusics = new ArrayList<>();
// dummyMusics.add(dummyMusic1);
// dummyMusics.add(dummyMusic2);
//
//
// Playlist dummyPlaylist = Playlist.builder()
// .id("qwer1234")
// .name("플레이리스트1")
// .musics(dummyMusics)
// .playlistOwnerId(dummyUser1.getUid())
// .playlistOwnerNickName(dummyUser1.getNickName())
// .playlistOwnerProfileImage(dummyUser1.getProfileImage())
// .build();
//
// // room build
// Room dummyRoom = Room.builder()
// .roomName(dummyPlaylist.getName())
// .playlist(dummyPlaylist)
// .playlistDuration(dummyPlaylist.getTotalPlaylistTime())
// .thumbnailImage(dummyPlaylist.getFirstMusic().getThumbnail())
// .users(users)
// .playlistOwner(dummyUser1)
// .createdAt(LocalDateTime.now())
// .build();
//
// roomRepository.save(dummyRoom);
// log.info("방 생성 성공 room={}", dummyRoom);
//
// ChatMessage message1 = chatMessageRepository.save(ChatMessage.builder()
// .messageType(MessageType.MSG)
// .roomId(dummyRoom.getId())
// .senderId(dummyUser1.getUid())
// .nickName(dummyUser1.getNickName())
// .senderProfileImage(dummyUser1.getProfileImage())
// .content("메시지메시지1")
// .createdAt(LocalDateTime.now())
// .build());
//
// ChatMessage message2 = chatMessageRepository.save(ChatMessage.builder()
// .messageType(MessageType.MSG)
// .roomId(dummyRoom.getId())
// .senderId(dummyUser2.getUid())
// .nickName(dummyUser2.getNickName())
// .senderProfileImage(dummyUser2.getProfileImage())
// .content("메시지메시지2")
// .createdAt(LocalDateTime.now())
// .build());
//
// log.info("메시지 생성 성공 message1={}", message1);
// log.info("메시지 생성 성공 message2={}", message2);
//
// User dummyUser3 = User.builder()
// .uid(3L)
// .nickName("유저닉네임3")
// .profileImage("https://t4.ftcdn.net/jpg/03/64/21/11/360_F_364211147_1qgLVxv1Tcq0Ohz3FawUfrtONzz8nq3e.jpg")
// .enteredAt(LocalDateTime.now())
// .build();
//
// User dummyUser4 = User.builder()
// .uid(3L)
// .nickName("유저닉네임4")
// .profileImage("https://images.pexels.com/photos/771742/pexels-photo-771742.jpeg?cs=srgb&dl=pexels-mohamed-abdelghaffar-771742.jpg&fm=jpg")
// .enteredAt(LocalDateTime.now())
// .build();
//
// List<User> users2 = new ArrayList<>();
// users2.add(dummyUser3);
// users2.add(dummyUser4);
// users2.add(dummyUser1);
//
// Music dummyMusic3 = Music.builder()
// .id(3L)
// .title("음원3")
// .artist("아티스트3")
// .playtime("12:34")
// .thumbnail("https://content.wepik.com/statics/13638236/preview-page0.jpg")
// .build();
//
// List<Music> dummyMusics2 = new ArrayList<>();
// dummyMusics2.add(dummyMusic1);
// dummyMusics2.add(dummyMusic3);
//
//
// Playlist dummyPlaylist2 = Playlist.builder()
// .id("098765432qwerty")
// .name("플레이리스트2")
// .musics(dummyMusics2)
// .playlistOwnerId(dummyUser3.getUid())
// .playlistOwnerNickName(dummyUser3.getNickName())
// .playlistOwnerProfileImage(dummyUser3.getProfileImage())
// .build();
//
// log.info("dummyPlaylist2={}", dummyPlaylist2.toString());
// log.info("dummyPlaylist2 firstMusic={}", dummyPlaylist2.getFirstMusic().toString());
//
// // room build
// Room dummyRoom2 = Room.builder()
// .roomName(dummyPlaylist2.getName())
// .playlist(dummyPlaylist2)
// .playlistDuration(dummyPlaylist2.getTotalPlaylistTime())
// .thumbnailImage(dummyPlaylist2.getFirstMusic().getThumbnail())
// .users(users2)
// .playlistOwner(dummyUser3)
// .createdAt(LocalDateTime.now())
// .build();
//
// roomRepository.save(dummyRoom2);
// log.info("방 생성 성공 room={}", dummyRoom);
//
// ChatMessage message3 = chatMessageRepository.save(ChatMessage.builder()
// .messageType(MessageType.MSG)
// .roomId(dummyRoom2.getId())
// .senderId(dummyUser1.getUid())
// .nickName(dummyUser1.getNickName())
// .senderProfileImage(dummyUser1.getProfileImage())
// .content("메시지메시지3")
// .createdAt(LocalDateTime.now())
// .build());
//
// ChatMessage message4 = chatMessageRepository.save(ChatMessage.builder()
// .messageType(MessageType.MSG)
// .roomId(dummyRoom2.getId())
// .senderId(dummyUser4.getUid())
// .nickName(dummyUser4.getNickName())
// .senderProfileImage(dummyUser4.getProfileImage())
// .content("메시지메시지4")
// .createdAt(LocalDateTime.now())
// .build());
//
// log.info("메시지 생성 성공 message3={}", message3);
// log.info("메시지 생성 성공 message4={}", message4);


}
Expand Down
2 changes: 2 additions & 0 deletions src/backend/chatting-server/src/main/java/chattingserver/service/RoomService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ public List<RoomResponseDto> findUnjoinedRooms(Long uid) {

public RoomResponseDto create(RoomCreateRequestDto roomCreateRequestDto) {
// user build
log.info("roomCreateRequestDto={}", roomCreateRequestDto);
User owner = User.builder()
.uid(roomCreateRequestDto.getUid())
.nickName(roomCreateRequestDto.getNickName())
Expand All @@ -112,6 +113,7 @@ public RoomResponseDto create(RoomCreateRequestDto roomCreateRequestDto) {
.thumbnailImage(roomCreateRequestDto.getThumbnailImage())
.playlistOwner(owner)
.users(users)
.createdAt(LocalDateTime.now())
.build();

log.info("생성된 방에 생성자 추가 성공 user={}", room.getUsers().toString());
Expand Down
2 changes: 2 additions & 0 deletions ...ting-server/src/main/java/chattingserver/util/converter/EntityToResponseDtoConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ public RoomResponseDto convertRoom(Room room) {
return RoomResponseDto.builder()
.id(room.getId())
.roomName(room.getRoomName())
.playlistOwner(convertUser(room.getPlaylistOwner()))
.userCount(room.getUsers().size())
.users(room.getUsers().stream().map(this::convertUser).collect(Collectors.toList()))
.musicCount(room.getPlaylist().getMusics().size())
.playlist(room.getPlaylist())
.createdAt(room.getCreatedAt())
.thumbnailImage(room.getThumbnailImage()) // 플레이리스트에 곡 무조건 존재함을 신뢰
.build();
}
Expand Down
Loading

0 comments on commit e6f5bf6

Please sign in to comment.