Refactory of PR #13

build.gradle

@@ -22,19 +22,30 @@ repositories {
 }
 
 dependencies {
+	// Spring Boot
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0'
-	compileOnly 'org.projectlombok:lombok'
+
+	implementation group: 'org.mapstruct', name: 'mapstruct', version: '1.5.5.Final'
+	implementation 'org.projectlombok:lombok-mapstruct-binding:0.2.0'
+	implementation  'org.projectlombok:lombok'
+
+	annotationProcessor  group: 'org.mapstruct', name: 'mapstruct-processor', version: '1.5.5.Final'
+	annotationProcessor "org.projectlombok:lombok-mapstruct-binding:0.2.0"
 	annotationProcessor 'org.projectlombok:lombok'
+
+	// Database
+	implementation 'org.mariadb.jdbc:mariadb-java-client:3.1.4'
+
+	// Test
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
-	implementation 'org.mariadb.jdbc:mariadb-java-client:3.1.4'
+	testAnnotationProcessor 'org.projectlombok:lombok'
 	implementation 'com.h2database:h2:2.1.214' // TODO : testimplementation으로 변경
 
-	implementation 'io.jsonwebtoken:jjwt-api:0.11.2'
-	implementation 'io.jsonwebtoken:jjwt-impl:0.11.2'
+	// JWT
 	implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.5'
 	runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.5'
 	runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.5'

src/main/generated/com/gdsc/blog/mapper/ArticleMapperImpl.java

@@ -0,0 +1,41 @@
+package com.gdsc.blog.mapper;
+
+import com.gdsc.blog.article.dto.ArticleDto;
+import com.gdsc.blog.article.entity.Article;
+import com.gdsc.blog.comment.entity.Comment;
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.processing.Generated;
+import org.springframework.stereotype.Component;
+
+@Generated(
+    value = "org.mapstruct.ap.MappingProcessor",
+    date = "2023-07-17T01:17:13+0900",
+    comments = "version: 1.5.5.Final, compiler: javac, environment: Java 17.0.7 (Oracle Corporation)"
+)
+@Component
+public class ArticleMapperImpl implements ArticleMapper {
+
+    @Override
+    public ArticleDto toDto(Article article) {
+        if ( article == null ) {
+            return null;
+        }
+
+        ArticleDto.ArticleDtoBuilder articleDto = ArticleDto.builder();
+
+        articleDto.idx( article.getIdx() );
+        articleDto.title( article.getTitle() );
+        articleDto.content( article.getContent() );
+        List<Comment> list = article.getComments();
+        if ( list != null ) {
+            articleDto.comments( new ArrayList<Comment>( list ) );
+        }
+
+        articleDto.username( article.getUser().getUsername() );
+        articleDto.createdAt( article.getCreateDate().toLocalDateTime() );
+        articleDto.modifiedAt( article.getModifyDate().toLocalDateTime() );
+
+        return articleDto.build();
+    }
+}

src/main/java/com/gdsc/blog/BlogApplication.java

@@ -5,9 +5,7 @@
 
 @SpringBootApplication
 public class BlogApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.run(BlogApplication.class, args);
-	}
-
+    public static void main(String[] args) {
+        SpringApplication.run(BlogApplication.class, args);
+    }
 }

src/main/java/com/gdsc/blog/article/controller/ArticleController.java

@@ -0,0 +1,123 @@
+package com.gdsc.blog.article.controller;
+
+import com.gdsc.blog.article.dto.ArticleCreateDto;
+import com.gdsc.blog.article.dto.ArticleDto;
+import com.gdsc.blog.article.dto.ArticleUpdateDto;
+import com.gdsc.blog.article.service.ArticleService;
+import com.gdsc.blog.security.jwt.JwtTokenProvider;
+import com.gdsc.blog.user.service.UserService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Controller
+@RequestMapping("/api/article")
+@RestController
+@RequiredArgsConstructor
+@Tag(name = "게시글 Controller", description = "Article controller API")
+@Slf4j
+public class ArticleController {
+
+    private final ArticleService articleService;
+    private final UserService userService;
+    private final JwtTokenProvider jwtTokenProvider;
+
+    /**
+     * 게시글 생성 API
+     *
+     * @param articleCreateDto 게시글 생성 DTO
+     * @return 생성된 게시글
+     */
+    @PostMapping //컨트롤러 메핑
+    @Operation(summary = "게시글 생성") //swagger 설명
+    public ArticleDto createArticle(
+            @Parameter(name = "게시글 생성 DTO") @RequestBody ArticleCreateDto articleCreateDto,
+            @Parameter(hidden = true) HttpServletRequest req) {
+
+        String username = jwtTokenProvider.getUsername(jwtTokenProvider.resolveToken(req));
+        return articleService.createArticle(articleCreateDto, username);
+    }
+
+    /**
+     * 최근 게시글 조회 API
+     *
+     * @return 게시글 목록
+     */
+    @GetMapping
+    @Operation(summary = "최근 게시글 조회")
+    public List<ArticleDto> getUserArticle() {
+        return articleService.getRecentArticle();
+    }
+
+    /**
+     * id 로 게시글 조회
+     *
+     * @param id  게시글 id
+     * @param req HTTP 파싱 객체
+     * @return 게시글
+     */
+    @GetMapping("/{id}")
+    @Operation(summary = "id로 게시글 조회")
+    public ArticleDto getArticleById(
+            @Parameter(description = "게시글 id") @PathVariable("id") Long id) {
+        return articleService.getArticleById(id);
+    }
+
+    /**
+     * 제목으로 게시글 조회
+     *
+     * @param title 게시글 제목
+     * @param req   HTTP 파싱 객체
+     * @return 게시글
+     */
+    @GetMapping("/search")
+    @Operation(summary = "제목으로 게시글 조회")
+    public List<ArticleDto> getArticleByTitle(
+            @Parameter(description = "게시글 제목") @RequestParam String title,
+            @Parameter(hidden = true) HttpServletRequest req) {
+        return articleService.findArticleByTitle(title);
+    }
+
+    /**
+     * 게시글 수정
+     *
+     * @param id  게시글 id
+     * @param dto 게시글 수정 정보
+     * @param req HTTP 파싱 객체
+     */
+    @PatchMapping("/{id}")
+    @Operation(summary = "게시글 수정")
+    public ArticleDto updateArticle(
+            @Parameter(description = "게시글 id") @PathVariable(value = "id") Long id,
+            @Parameter(name = "게시글 수정 DTO") @RequestBody ArticleUpdateDto dto,
+            @Parameter(hidden = true) HttpServletRequest req) {
+
+        String username = jwtTokenProvider.getUsername(jwtTokenProvider.resolveToken(req));
+        return articleService.updateArticle(id, dto, username);
+    }
+
+    /**
+     * 게시글 삭제 API
+     *
+     * @param id  게시글 id
+     * @param req HTTP 파싱 객체
+     */
+    @DeleteMapping("/{id}")
+    @PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_CLIENT')")
+    @Operation(summary = "게시글 삭제")
+    public void deleteArticle(
+            @Parameter(description = "게시글 id") @PathVariable(value = "id") Long id,
+            @Parameter(hidden = true) HttpServletRequest req) {
+
+        String username = jwtTokenProvider.getUsername(jwtTokenProvider.resolveToken(req));
+        articleService.deleteArticle(id, username);
+    }
+}

src/main/java/com/gdsc/blog/article/dto/ArticleCreateDto.java

@@ -0,0 +1,17 @@
+package com.gdsc.blog.article.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Getter
+@Setter
+public class ArticleCreateDto {
+    @Schema(description = "제목", example = "게시글 제목")
+    public String title;
+
+    @Schema(description = "내용", example = "게시글 내용")
+    public String content;
+}

src/main/java/com/gdsc/blog/article/dto/ArticleDto.java

@@ -0,0 +1,23 @@
+package com.gdsc.blog.article.dto;
+
+import com.gdsc.blog.comment.entity.Comment;
+import lombok.*;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Builder
+@Getter
+@Setter
+public class ArticleDto {
+    private Long idx;
+    private String title;
+    private String content;
+    private LocalDateTime createdAt;
+    private LocalDateTime modifiedAt;
+    private String username;
+    private List<Comment> comments;
+}

src/main/java/com/gdsc/blog/article/dto/ArticleUpdateDto.java

@@ -0,0 +1,17 @@
+package com.gdsc.blog.article.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Getter
+@Setter
+public class ArticleUpdateDto {
+    @Schema(description = "수정할 제목", example = "수정된 게시글 제목")
+    public String title;
+
+    @Schema(description = "수정할 내용", example = "수정된 게시글 내용")
+    public String content;
+}