Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@
import cc.backend.notice.dto.MemberNoticeResponseDTO;
import cc.backend.notice.service.MemberNoticeService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.*;

import java.time.LocalDateTime;
import java.util.List;

@RestController
@RequiredArgsConstructor
Expand All @@ -28,7 +26,7 @@ public class MemberNoticeController {
"type이 HOT, COMMENT 일 경우 contentId는 BoardId," +
"type이 REPLY 일 경우 contentId는 CommentId" +
"type이 TICKET 일 경우 contentId는 TicketId")
public ApiResponse<MemberNoticeResponseDTO.MemberNoticeListDTO> getAllMemberNotice(
public ApiResponse<MemberNoticeResponseDTO.MemberNoticeScrollDTO> getAllMemberNotice(
@AuthenticationPrincipal(expression = "member") Member member,
@RequestParam(required = false) Long cursorId,
@RequestParam(required = false)
Expand Down
21 changes: 5 additions & 16 deletions src/main/java/cc/backend/notice/dto/MemberNoticeResponseDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.springframework.cglib.core.Local;

import java.time.LocalDateTime;
import java.util.List;
Expand All @@ -29,21 +28,11 @@ public static class MemberNoticeDTO {
@Builder
@AllArgsConstructor
@NoArgsConstructor
public static class MemberNoticeListDTO {
private Meta meta;
private List<MemberNoticeDTO> items;

@Getter
@Builder
@AllArgsConstructor
@NoArgsConstructor
public static class Meta {
private int count;
private boolean empty;
private boolean hasNext;
private Long nextCursorId;
private LocalDateTime nextCursorCreatedAt;
}
public static class MemberNoticeScrollDTO {
private List<MemberNoticeDTO> memberNotices;
private boolean hasNext;
private Long nextCursorId;
private LocalDateTime nextCursorCreatedAt;

}
}
20 changes: 8 additions & 12 deletions src/main/java/cc/backend/notice/service/MemberNoticeService.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class MemberNoticeService {
private final NoticeRepository noticeRepository;
private final MemberRepository memberRepository;

public MemberNoticeResponseDTO.MemberNoticeListDTO getAllMemberNotice(
public MemberNoticeResponseDTO.MemberNoticeScrollDTO getAllMemberNotice(
Long memberId, Long cursorId, LocalDateTime cursorCreatedAt, int pageSize) {

memberRepository.findById(memberId)
Expand Down Expand Up @@ -59,17 +59,13 @@ public MemberNoticeResponseDTO.MemberNoticeListDTO getAllMemberNotice(
LocalDateTime nextCursorCreatedAt = hasNext ? limited.get(limited.size() - 1).getCreatedAt() : null;


return MemberNoticeResponseDTO.MemberNoticeListDTO.builder()
.items(items)
.meta(MemberNoticeResponseDTO.MemberNoticeListDTO.Meta.builder()
.count(items.size())
.hasNext(hasNext)
.empty(items.isEmpty())
.nextCursorId(nextCursorId)
.nextCursorCreatedAt(nextCursorCreatedAt)
.build())
.build();
}
return MemberNoticeResponseDTO.MemberNoticeScrollDTO.builder()
.memberNotices(items)
.hasNext(hasNext)
.nextCursorId(nextCursorId)
.nextCursorCreatedAt(nextCursorCreatedAt)
.build()
;}
Comment on lines +67 to +68
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Minor formatting issue: extraneous semicolon before closing brace.

Line 68 has ;} which should just be }.

Proposed fix
-                .build()
-                ;}
+                .build();
+    }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
.build()
;}
.build();
}
🤖 Prompt for AI Agents
In `@src/main/java/cc/backend/notice/service/MemberNoticeService.java` around
lines 67 - 68, In MemberNoticeService, remove the stray semicolon before the
closing brace after the builder call (the `;}` sequence) so the method/block
ends with a plain `}`; locate the builder chain around the .build() call in the
MemberNoticeService class and delete the extraneous semicolon that immediately
precedes the closing brace.


@Transactional
public MemberNoticeResponseDTO.MemberNoticeDTO readNotice(Long noticeId, Long memberId){
Expand Down