refactor: userId 가 있다는 가정 하에 코드 변경

InJunKangW · InJunKangW · commit 4a1193d6f267 · 2025-03-28T17:02:15.000+09:00
diff --git a/src/main/java/com/example/log4u/domain/reports/controller/ReportsController.java b/src/main/java/com/example/log4u/domain/reports/controller/ReportsController.java
@@ -18,15 +18,17 @@ public class ReportsController {
     public ResponseEntity<Void> createReportForDiary(
             @RequestBody ReportCreateRequestDto reportCreateRequestDto,
             @PathVariable Long diaryId) {
-        reportService.createDiaryReport(reportCreateRequestDto, diaryId);
+        long reporterId = 1L; // SecurityContextHolder 에서 온다고 가정
+        reportService.createDiaryReport(reporterId, reportCreateRequestDto, diaryId);
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
 
     @PostMapping("/comments/{commentId}")
     public ResponseEntity<Void> createReport(
             @RequestBody ReportCreateRequestDto reportCreateRequestDto,
             @PathVariable Long commentId) {
-        reportService.createCommentReport(reportCreateRequestDto, commentId);
+        long reporterId = 1L;
+        reportService.createCommentReport(reporterId, reportCreateRequestDto, commentId);
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
 }
diff --git a/src/main/java/com/example/log4u/domain/reports/dto/ReportCreateRequestDto.java b/src/main/java/com/example/log4u/domain/reports/dto/ReportCreateRequestDto.java
@@ -14,8 +14,9 @@ public record ReportCreateRequestDto(
     @Length(min = 2)
     String content
 ) {
-    public Report toEntity(Report.ReportTargetType reportTargetType, Long targetId){
+    public Report toEntity(long reporterId, Report.ReportTargetType reportTargetType, Long targetId){
         return Report.builder()
+                .reporterId(reporterId)
                 .reportTargetType(reportTargetType)
                 .reportType(reportType)
                 .reportTargetId(targetId)
diff --git a/src/main/java/com/example/log4u/domain/reports/entity/Report.java b/src/main/java/com/example/log4u/domain/reports/entity/Report.java
@@ -24,6 +24,8 @@ public enum ReportTargetType{
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    private long reporterId;
+
     @Enumerated(EnumType.STRING)
     private ReportTargetType reportTargetType;
 
diff --git a/src/main/java/com/example/log4u/domain/reports/service/ReportService.java b/src/main/java/com/example/log4u/domain/reports/service/ReportService.java
@@ -14,16 +14,18 @@ public class ReportService {
     private final ReportRepository reportRepository;
 
     public void createDiaryReport(
+            long reporterId,
             ReportCreateRequestDto reportCreateRequestDto,
             Long diaryId) {
-        Report report = reportCreateRequestDto.toEntity(Report.ReportTargetType.DIARY, diaryId);
+        Report report = reportCreateRequestDto.toEntity(reporterId, Report.ReportTargetType.DIARY, diaryId);
         reportRepository.save(report);
     }
 
     public void createCommentReport(
+            long reporterId,
             ReportCreateRequestDto reportCreateRequestDto,
             Long commentId) {
-        Report report = reportCreateRequestDto.toEntity(Report.ReportTargetType.DIARY, commentId);
+        Report report = reportCreateRequestDto.toEntity(reporterId, Report.ReportTargetType.COMMENT, commentId);
         reportRepository.save(report);
     }
 }
diff --git a/src/main/java/com/example/log4u/domain/supports/controller/SupportController.java b/src/main/java/com/example/log4u/domain/supports/controller/SupportController.java
@@ -23,7 +23,8 @@ public class SupportController {
     public ResponseEntity<Void> createSupport(
             @RequestBody @Valid SupportCreateRequestDto supportCreateRequestDto
             ){
-        supportService.createSupport(supportCreateRequestDto);
+        long requesterId = 1L;
+        supportService.createSupport(requesterId, supportCreateRequestDto);
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
 
@@ -32,14 +33,16 @@ public ResponseEntity<Page<SupportOverviewGetResponseDto>> getSupportOverviewPag
             @RequestParam(required = false) Integer page,
             @RequestParam(required = false) SupportType supportType
     ){
-        Page<SupportOverviewGetResponseDto> supportOverviewPage = supportService.getSupportPage(page, supportType);
+        long requesterId = 1L;
+        Page<SupportOverviewGetResponseDto> supportOverviewPage = supportService.getSupportPage(requesterId, page, supportType);
         return ResponseEntity.ok().body(supportOverviewPage);
     }
 
     @GetMapping("/{supportId}")
     public ResponseEntity<SupportGetResponseDto> getSupportBySupportId(
             @PathVariable Long supportId){
-        SupportGetResponseDto supportGetResponseDto = supportService.getSupportById(supportId);
+        long requesterId = 1L;
+        SupportGetResponseDto supportGetResponseDto = supportService.getSupportById(requesterId, supportId);
         return ResponseEntity.ok().body(supportGetResponseDto);
     }
 }
diff --git a/src/main/java/com/example/log4u/domain/supports/dto/SupportCreateRequestDto.java b/src/main/java/com/example/log4u/domain/supports/dto/SupportCreateRequestDto.java
@@ -18,8 +18,9 @@ public record SupportCreateRequestDto(
         @Length(min = 2)
         String content
 ) {
-        public Support toEntity(){
+        public Support toEntity(long requesterId){
                 return Support.builder()
+                        .requesterId(requesterId)
                         .supportType(supportType)
                         .title(title)
                         .content(content)
diff --git a/src/main/java/com/example/log4u/domain/supports/dto/SupportGetResponseDto.java b/src/main/java/com/example/log4u/domain/supports/dto/SupportGetResponseDto.java
@@ -9,6 +9,7 @@
 @Builder
 public record SupportGetResponseDto (
         long id,
+        long requesterId,
         SupportType supportType,
         String title,
         String content,
diff --git a/src/main/java/com/example/log4u/domain/supports/dto/SupportOverviewGetResponseDto.java b/src/main/java/com/example/log4u/domain/supports/dto/SupportOverviewGetResponseDto.java
@@ -8,6 +8,7 @@
 @Builder
 public record SupportOverviewGetResponseDto(
         long id,
+        long requesterId,
         SupportType supportType,
         String title,
         LocalDateTime createdAt,
diff --git a/src/main/java/com/example/log4u/domain/supports/entity/Support.java b/src/main/java/com/example/log4u/domain/supports/entity/Support.java
@@ -20,6 +20,8 @@ public class Support {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    private long requesterId;
+
     private SupportType supportType;
 
     private String title;
diff --git a/src/main/java/com/example/log4u/domain/supports/repository/SupportQuerydsl.java b/src/main/java/com/example/log4u/domain/supports/repository/SupportQuerydsl.java
@@ -24,9 +24,12 @@ public SupportQuerydsl() {
     }
 
     public Page<SupportOverviewGetResponseDto> getSupportOverviewGetResponseDtoPage(
+            long requesterId,
             Pageable pageable,
             SupportType supportType) {
+
         BooleanBuilder builder = new BooleanBuilder();
+        builder.and(support.requesterId.eq(requesterId));
 
         if (supportType != null){
             builder.and(support.supportType.eq(supportType));
@@ -35,6 +38,7 @@ public Page<SupportOverviewGetResponseDto> getSupportOverviewGetResponseDtoPage(
         List<SupportOverviewGetResponseDto> content = from(support)
                 .select(Projections.constructor(SupportOverviewGetResponseDto.class,
                         support.id,
+                        support.requesterId,
                         support.supportType,
                         support.title,
                         support.createdAt,
@@ -50,17 +54,21 @@ public Page<SupportOverviewGetResponseDto> getSupportOverviewGetResponseDtoPage(
                 .fetchCount());
     }
 
-    public SupportGetResponseDto getSupportGetResponseDtoById(Long supportId) {
+    public SupportGetResponseDto getSupportGetResponseDtoById(
+            long requesterId,
+            Long supportId) {
         return from(support)
                 .select(Projections.constructor(SupportGetResponseDto.class,
                         support.id,
+                        support.requesterId,
                         support.supportType,
                         support.title,
                         support.content,
                         support.createdAt,
                         support.answerContent,
                         support.answeredAt))
-                .where(support.id.eq(supportId))
+                .where(support.id.eq(supportId)
+                        .and(support.requesterId.eq(requesterId)))
                 .fetchOne();
     }
 }
diff --git a/src/main/java/com/example/log4u/domain/supports/service/SupportService.java b/src/main/java/com/example/log4u/domain/supports/service/SupportService.java
@@ -21,23 +21,28 @@ public class SupportService {
     private final SupportRepository supportRepository;
     private final SupportQuerydsl supportQuerydsl;
 
-    public void createSupport(SupportCreateRequestDto supportCreateRequestDto) {
-        Support support = supportCreateRequestDto.toEntity();
+    public void createSupport(
+            long requesterId,
+            SupportCreateRequestDto supportCreateRequestDto) {
+        Support support = supportCreateRequestDto.toEntity(requesterId);
         supportRepository.save(support);
     }
 
     @Transactional(readOnly = true)
     public Page<SupportOverviewGetResponseDto> getSupportPage(
+            long requesterId,
             Integer page,
             SupportType supportType
     ){
         int primitivePage = page == null ? 0 : page - 1;
         Pageable pageable = PageRequest.of(primitivePage, 10);
-        return supportQuerydsl.getSupportOverviewGetResponseDtoPage(pageable, supportType);
+        return supportQuerydsl.getSupportOverviewGetResponseDtoPage(requesterId, pageable, supportType);
     }
 
     @Transactional(readOnly = true)
-    public SupportGetResponseDto getSupportById(Long supportId) {
-        return supportQuerydsl.getSupportGetResponseDtoById(supportId);
+    public SupportGetResponseDto getSupportById(
+            long requesterId,
+            Long supportId) {
+        return supportQuerydsl.getSupportGetResponseDtoById(requesterId, supportId);
     }
 }
diff --git a/src/test/java/com/example/log4u/domain/report/service/ReportServiceTest.java b/src/test/java/com/example/log4u/domain/report/service/ReportServiceTest.java
@@ -27,7 +27,7 @@ public class ReportServiceTest {
     @Test
     void createDiaryReportTest() {
         ReportCreateRequestDto reportCreateRequestDto = new ReportCreateRequestDto(ReportType.ETC, "기타 신고");
-        reportService.createDiaryReport(reportCreateRequestDto, 1L);
+        reportService.createDiaryReport(1L, reportCreateRequestDto, 1L);
 
         verify(reportRepository, times(1))
                 .save(any());
@@ -37,7 +37,7 @@ void createDiaryReportTest() {
     @Test
     void createCommentReportTest() {
         ReportCreateRequestDto reportCreateRequestDto = new ReportCreateRequestDto(ReportType.ETC, "기타 신고");
-        reportService.createCommentReport(reportCreateRequestDto, 1L);
+        reportService.createCommentReport(1L, reportCreateRequestDto, 1L);
 
         verify(reportRepository, times(1))
                 .save(any());

Original file line number	Diff line number	Diff line change
`@@ -18,15 +18,17 @@ public class ReportsController {`
`18`	`18`	`public ResponseEntity<Void> createReportForDiary(`
`19`	`19`	`@RequestBody ReportCreateRequestDto reportCreateRequestDto,`
`20`	`20`	`@PathVariable Long diaryId) {`
`21`		`- reportService.createDiaryReport(reportCreateRequestDto, diaryId);`
	`21`	`+ long reporterId = 1L; // SecurityContextHolder 에서 온다고 가정`
	`22`	`+ reportService.createDiaryReport(reporterId, reportCreateRequestDto, diaryId);`
`22`	`23`	`return new ResponseEntity<>(HttpStatus.CREATED);`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`@PostMapping("/comments/{commentId}")`
`26`	`27`	`public ResponseEntity<Void> createReport(`
`27`	`28`	`@RequestBody ReportCreateRequestDto reportCreateRequestDto,`
`28`	`29`	`@PathVariable Long commentId) {`
`29`		`- reportService.createCommentReport(reportCreateRequestDto, commentId);`
	`30`	`+ long reporterId = 1L;`
	`31`	`+ reportService.createCommentReport(reporterId, reportCreateRequestDto, commentId);`
`30`	`32`	`return new ResponseEntity<>(HttpStatus.CREATED);`
`31`	`33`	`}`
`32`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,16 +14,18 @@ public class ReportService {`
`14`	`14`	`private final ReportRepository reportRepository;`
`15`	`15`
`16`	`16`	`public void createDiaryReport(`
	`17`	`+ long reporterId,`
`17`	`18`	`ReportCreateRequestDto reportCreateRequestDto,`
`18`	`19`	`Long diaryId) {`
`19`		`- Report report = reportCreateRequestDto.toEntity(Report.ReportTargetType.DIARY, diaryId);`
	`20`	`+ Report report = reportCreateRequestDto.toEntity(reporterId, Report.ReportTargetType.DIARY, diaryId);`
`20`	`21`	`reportRepository.save(report);`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`public void createCommentReport(`
	`25`	`+ long reporterId,`
`24`	`26`	`ReportCreateRequestDto reportCreateRequestDto,`
`25`	`27`	`Long commentId) {`
`26`		`- Report report = reportCreateRequestDto.toEntity(Report.ReportTargetType.DIARY, commentId);`
	`28`	`+ Report report = reportCreateRequestDto.toEntity(reporterId, Report.ReportTargetType.COMMENT, commentId);`
`27`	`29`	`reportRepository.save(report);`
`28`	`30`	`}`
`29`	`31`	`}`