-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #39 from softeerbootcamp4th/feature/37-admin-comme…
…nt-act [feat] 관리자 이벤트 댓글 조회 & 삭제 (#37)
- Loading branch information
Showing
15 changed files
with
322 additions
and
56 deletions.
There are no files selected for viewing
51 changes: 51 additions & 0 deletions
51
src/main/java/hyundai/softeer/orange/admin/controller/AdminCommentController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
package hyundai.softeer.orange.admin.controller; | ||
import hyundai.softeer.orange.comment.dto.DeleteCommentsDto; | ||
import hyundai.softeer.orange.comment.dto.ResponseCommentsDto; | ||
import hyundai.softeer.orange.comment.service.CommentService; | ||
import hyundai.softeer.orange.core.auth.Auth; | ||
import hyundai.softeer.orange.core.auth.AuthRole; | ||
import io.swagger.v3.oas.annotations.Operation; | ||
import io.swagger.v3.oas.annotations.media.Content; | ||
import io.swagger.v3.oas.annotations.media.Schema; | ||
import io.swagger.v3.oas.annotations.responses.ApiResponse; | ||
import io.swagger.v3.oas.annotations.security.SecurityRequirement; | ||
import jakarta.validation.Valid; | ||
import lombok.RequiredArgsConstructor; | ||
import org.springframework.http.ResponseEntity; | ||
import org.springframework.web.bind.annotation.*; | ||
|
||
@RequestMapping("/api/v1/admin/comments") | ||
@RequiredArgsConstructor | ||
@RestController | ||
@Auth({AuthRole.admin}) | ||
public class AdminCommentController { | ||
private final CommentService commentService; | ||
|
||
/** | ||
* @param eventId 댓글을 검색할 이벤트 id | ||
* @param page 댓글 페이지. default = 0 | ||
* @param size 한번에 읽어 올 댓글 개수. default = 10 | ||
* @return 대상 이벤트에 대해 검색된 댓글 목록 | ||
*/ | ||
@Operation(summary = "관리자가 이벤트에 대한 댓글 목록 조회", description = "이벤트에 대한 댓글 목록을 조회한다.", responses = { | ||
@ApiResponse(responseCode = "200", description = "이벤트에 대한 댓글 목록 조회 성공") | ||
}) | ||
@GetMapping | ||
public ResponseEntity<ResponseCommentsDto> findEventComments( | ||
@RequestParam String eventId, | ||
@RequestParam(required = false, defaultValue = "0") Integer page, | ||
@RequestParam(required = false, defaultValue = "10") Integer size | ||
) { | ||
var comments = commentService.searchComments(eventId, page, size); | ||
return ResponseEntity.ok(comments); | ||
} | ||
|
||
@Operation(summary = "관리가 댓글 목록 삭제", description = "관리자가 이벤트에 대한 댓글 목록을 삭제한다.", responses = { | ||
@ApiResponse(responseCode = "200", description = "댓글 삭제 성공") | ||
}) | ||
@DeleteMapping | ||
public ResponseEntity<Void> deleteEventComments(@Valid @RequestBody DeleteCommentsDto dto) { | ||
commentService.deleteComments(dto.getCommentIds()); | ||
return ResponseEntity.ok().build(); | ||
} | ||
} |
16 changes: 16 additions & 0 deletions
16
src/main/java/hyundai/softeer/orange/comment/dto/DeleteCommentsDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package hyundai.softeer.orange.comment.dto; | ||
|
||
import jakarta.validation.constraints.NotNull; | ||
import lombok.Getter; | ||
|
||
import java.util.List; | ||
|
||
@Getter | ||
public class DeleteCommentsDto { | ||
@NotNull | ||
private List<Long> commentIds; | ||
|
||
public DeleteCommentsDto(List<Long> commentIds) { | ||
this.commentIds = commentIds; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 23 additions & 6 deletions
29
src/main/java/hyundai/softeer/orange/event/common/repository/EventSpecification.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,34 @@ | ||
package hyundai.softeer.orange.event.common.repository; | ||
|
||
import hyundai.softeer.orange.event.common.entity.EventMetadata; | ||
import jakarta.persistence.criteria.Predicate; | ||
import hyundai.softeer.orange.event.common.enums.EventType; | ||
import org.springframework.data.jpa.domain.Specification; | ||
|
||
public class EventSpecification { | ||
public static Specification<EventMetadata> withSearch(String search) { | ||
|
||
public static Specification<EventMetadata> searchOnName(String search) { | ||
return searchOnName(search, true); | ||
} | ||
|
||
public static Specification<EventMetadata> searchOnName(String search, boolean conjunctionOnNull) { | ||
return (metadata, query, cb) -> { | ||
if (search == null || search.isEmpty()) return cb.conjunction(); | ||
if (search == null || search.isEmpty()) return (conjunctionOnNull ? cb.conjunction() : cb.disjunction()); | ||
return cb.like(metadata.get("name"), "%" + search + "%"); | ||
}; | ||
} | ||
|
||
Predicate searchName = cb.like(metadata.get("name"), "%" + search + "%"); | ||
Predicate searchEventId = cb.like(metadata.get("eventId"), "%" + search + "%"); | ||
return cb.or(searchName, searchEventId); | ||
public static Specification<EventMetadata> searchOnEventId(String search) { | ||
return searchOnEventId(search, true); | ||
} | ||
|
||
public static Specification<EventMetadata> searchOnEventId(String search, boolean conjunctionOnNull) { | ||
return (metadata, query, cb) -> { | ||
if (search == null || search.isEmpty()) return (conjunctionOnNull ? cb.conjunction() : cb.disjunction()); | ||
return cb.like(metadata.get("eventId"), "%" + search + "%"); | ||
}; | ||
} | ||
|
||
public static Specification<EventMetadata> isEventTypeOf(EventType eventType) { | ||
return (metadata, query, cb) -> cb.equal(metadata.get("eventType"), eventType); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
src/main/java/hyundai/softeer/orange/event/dto/EventSearchHintDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
package hyundai.softeer.orange.event.dto; | ||
|
||
import lombok.Getter; | ||
|
||
/** | ||
* 관리자가 이벤트 댓글 검색 시 자동완성 영역에 제공되는 데이터 | ||
*/ | ||
public interface EventSearchHintDto { | ||
String getEventId(); | ||
String getName(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.