Skip to content

Commit 4100432

Browse files
authored
Merge pull request #178 from ASSU-org/develop
Develop
2 parents 48fb292 + 0e279c5 commit 4100432

File tree

3 files changed

+3
-46
lines changed

3 files changed

+3
-46
lines changed

src/main/java/com/assu/server/domain/certification/config/CertifyWebSocketConfig.java

Lines changed: 0 additions & 37 deletions
This file was deleted.

src/main/java/com/assu/server/domain/chat/converter/BlockConverter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public static BlockResponseDTO.BlockMemberDTO toBlockedMemberDTO(Block block) {
3838
return BlockResponseDTO.BlockMemberDTO.builder()
3939
.memberId(blockedMember.getId())
4040
.name(blockedName) // 또는 getNickname() 등 실제 필드명 사용
41+
.blockDate(block.getCreatedAt())
4142
.build();
4243
}
4344

src/main/java/com/assu/server/domain/chat/dto/BlockResponseDTO.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import lombok.Getter;
66
import lombok.NoArgsConstructor;
77

8-
import java.util.List;
8+
import java.time.LocalDateTime;
99

1010
public class BlockResponseDTO {
1111

@@ -16,6 +16,7 @@ public class BlockResponseDTO {
1616
public static class BlockMemberDTO {
1717
private Long memberId;
1818
private String name;
19+
private LocalDateTime blockDate;
1920
}
2021

2122
@Getter
@@ -28,12 +29,4 @@ public static class CheckBlockMemberDTO {
2829
private boolean blocked;
2930
}
3031

31-
@Getter
32-
@Builder
33-
@AllArgsConstructor
34-
@NoArgsConstructor
35-
public static class BlockedMemberListDTO {
36-
List<BlockMemberDTO> blockedMembers;
37-
}
38-
3932
}

0 commit comments

Comments
 (0)