Merge remote-tracking branch 'origin/master'

src/main/java/com/project/bumawiki/domain/docs/presentation/DocsPopularInformationController.java

@@ -2,24 +2,26 @@
 
 import java.util.List;
 
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.project.bumawiki.domain.docs.domain.repository.DocsRepository;
 import com.project.bumawiki.domain.docs.presentation.dto.response.DocsPopularResponseDto;
-import com.project.bumawiki.domain.docs.service.DocsPopularInformationService;
 
 import lombok.RequiredArgsConstructor;
 
 @RestController
-@RequestMapping("/api/docs")
 @RequiredArgsConstructor
+@RequestMapping("/api/docs")
 public class DocsPopularInformationController {
-	private final DocsPopularInformationService docsPopularInformationService;
+	private final DocsRepository docsRepository;
 
 	@GetMapping("/popular")
-	public ResponseEntity<List<DocsPopularResponseDto>> docsPopular() {
-		return ResponseEntity.ok(docsPopularInformationService.getDocsByPopular());
+	@ResponseStatus(HttpStatus.OK)
+	public List<DocsPopularResponseDto> docsPopular() {
+		return docsRepository.findByThumbsUpsDesc();
 	}
 }

src/main/java/com/project/bumawiki/domain/docs/presentation/dto/response/DocsNameAndEnrollResponseDto.java

@@ -6,7 +6,7 @@
 import com.project.bumawiki.domain.docs.domain.Docs;
 import com.project.bumawiki.domain.docs.domain.VersionDocs;
 import com.project.bumawiki.domain.docs.domain.type.DocsType;
-import com.project.bumawiki.domain.docs.service.DocsUtil;
+import com.project.bumawiki.domain.docs.util.DocsUtil;
 
 import lombok.Getter;
 

src/main/java/com/project/bumawiki/domain/docs/presentation/dto/response/DocsPopularResponseDto.java

@@ -1,19 +1,15 @@
 package com.project.bumawiki.domain.docs.presentation.dto.response;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.project.bumawiki.domain.docs.domain.type.DocsType;
 
-public class DocsPopularResponseDto {
-	@JsonProperty
-	private final String title;
-	@JsonProperty
-	private final int enroll;
-	@JsonProperty
-	private final DocsType docsType;
-	@JsonProperty
-	private final long thumbsUpsCounts;
+public record DocsPopularResponseDto(
+	String title,
+	Integer enroll,
+	DocsType docsType,
+	Long thumbsUpsCounts
+) {
 
-	public DocsPopularResponseDto(String title, int enroll, DocsType docsType, long thumbsUpsCounts) {
+	public DocsPopularResponseDto(String title, Integer enroll, DocsType docsType, Long thumbsUpsCounts) {
 		this.title = title;
 		this.enroll = enroll;
 		this.docsType = docsType;

src/main/java/com/project/bumawiki/domain/docs/presentation/dto/response/DocsResponseDto.java

@@ -8,7 +8,7 @@
 import com.project.bumawiki.domain.docs.domain.VersionDocs;
 import com.project.bumawiki.domain.docs.domain.type.DocsType;
 import com.project.bumawiki.domain.docs.domain.type.Status;
-import com.project.bumawiki.domain.docs.service.DocsUtil;
+import com.project.bumawiki.domain.docs.util.DocsUtil;
 import com.project.bumawiki.domain.user.domain.User;
 import com.project.bumawiki.domain.user.presentation.dto.SimpleUserDto;
 

src/main/java/com/project/bumawiki/domain/docs/service/DocsUtil.java → src/main/java/com/project/bumawiki/domain/docs/util/DocsUtil.java

@@ -1,4 +1,4 @@
-package com.project.bumawiki.domain.docs.service;
+package com.project.bumawiki.domain.docs.util;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;