[Spring Core] 신관규 과제 제출합니다.

README.md

@@ -28,6 +28,8 @@ http://localhost:8080
 | DELETE | /members/{id}  | 특정 회원을 삭제합니다.         | `id` (path): 회원 ID  | -                              | -                                                                 |
 | POST   | /members       | 새 회원을 생성합니다.          | -                   | Content-Type: application/json | `{ "name": "", "email": "", "password": "" }`                     |
 | PUT    | /members/{id}  | 기존 회원을 업데이트합니다.       | `id` (path): 회원 ID  | Content-Type: application/json | `{ "name": "", "email": "" }`                                     |
+| GET    | /register      | 회원 가입 페이지를 가져옵니다.     | -                   | -                              |
+| GET    | /login         | 로그인 페이지를 가져옵니다.       | -                   | -                              |
 
 ### 사용 예시
 

build.gradle

@@ -19,8 +19,18 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-jdbc'
+	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	implementation 'org.springframework.boot:spring-boot-starter-validation'
+	implementation 'org.springframework.security:spring-security-crypto'
+
 	runtimeOnly 'com.mysql:mysql-connector-j'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+
+	compileOnly 'org.projectlombok:lombok'
+	annotationProcessor 'org.projectlombok:lombok'
+
+	testCompileOnly 'org.projectlombok:lombok'
+	testAnnotationProcessor 'org.projectlombok:lombok'
 }
 
 tasks.named('test') {

src/main/java/com/example/demo/config/SecurityConfig.java

@@ -0,0 +1,16 @@
+package com.example.demo.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+@Configuration
+public class SecurityConfig {
+
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+
+}

src/main/java/com/example/demo/config/WebConfig.java

@@ -0,0 +1,18 @@
+package com.example.demo.config;
+
+import com.example.demo.interceptor.LoginCheckInterceptor;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(new LoginCheckInterceptor())
+                .order(1)
+                .addPathPatterns("/**")
+                .excludePathPatterns("/login", "/register", "/");
+    }
+}

src/main/java/com/example/demo/controller/ArticleController.java

@@ -1,22 +1,15 @@
 package com.example.demo.controller;
 
-import java.net.URI;
-import java.util.List;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.example.demo.controller.dto.request.ArticleCreateRequest;
-import com.example.demo.controller.dto.response.ArticleResponse;
 import com.example.demo.controller.dto.request.ArticleUpdateRequest;
+import com.example.demo.controller.dto.response.ArticleResponse;
 import com.example.demo.service.ArticleService;
+import jakarta.validation.Valid;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.net.URI;
+import java.util.List;
 
 @RestController
 public class ArticleController {
@@ -29,42 +22,42 @@ public ArticleController(ArticleService articleService) {
 
     @GetMapping("/articles")
     public ResponseEntity<List<ArticleResponse>> getArticles(
-        @RequestParam Long boardId
+            @RequestParam Long boardId
     ) {
         List<ArticleResponse> response = articleService.getByBoardId(boardId);
         return ResponseEntity.ok(response);
     }
 
     @GetMapping("/articles/{id}")
     public ResponseEntity<ArticleResponse> getArticle(
-        @PathVariable Long id
+            @PathVariable Long id
     ) {
-        ArticleResponse response = articleService.getById(id);
+        ArticleResponse response = articleService.getByArticleId(id);
         return ResponseEntity.ok(response);
     }
 
     @PostMapping("/articles")
-    public ResponseEntity<ArticleResponse> crateArticle(
-        @RequestBody ArticleCreateRequest request
+    public ResponseEntity<ArticleResponse> createArticle(
+            @Valid @RequestBody ArticleCreateRequest request
     ) {
-        ArticleResponse response = articleService.create(request);
+        ArticleResponse response = articleService.createArticle(request);
         return ResponseEntity.created(URI.create("/articles/" + response.id())).body(response);
     }
 
     @PutMapping("/articles/{id}")
     public ResponseEntity<ArticleResponse> updateArticle(
-        @PathVariable Long id,
-        @RequestBody ArticleUpdateRequest request
+            @PathVariable Long id,
+            @RequestBody ArticleUpdateRequest request
     ) {
-        ArticleResponse response = articleService.update(id, request);
+        ArticleResponse response = articleService.updateArticle(id, request);
         return ResponseEntity.ok(response);
     }
 
     @DeleteMapping("/articles/{id}")
-    public ResponseEntity<Void> updateArticle(
-        @PathVariable Long id
+    public ResponseEntity<Void> deleteArticle(
+            @PathVariable Long id
     ) {
-        articleService.delete(id);
+        articleService.deleteArticle(id);
         return ResponseEntity.noContent().build();
     }
 }

src/main/java/com/example/demo/controller/BoardController.java

@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import jakarta.validation.Valid;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,29 +33,29 @@ public List<BoardResponse> getBoards() {
 
     @GetMapping("/boards/{id}")
     public BoardResponse getBoard(
-        @PathVariable Long id
+            @PathVariable Long id
     ) {
         return boardService.getBoardById(id);
     }
 
     @PostMapping("/boards")
     public BoardResponse createBoard(
-        @RequestBody BoardCreateRequest request
+            @Valid @RequestBody BoardCreateRequest request
     ) {
         return boardService.createBoard(request);
     }
 
     @PutMapping("/boards/{id}")
     public BoardResponse updateBoard(
-        @PathVariable Long id,
-        @RequestBody BoardUpdateRequest updateRequest
+            @PathVariable Long id,
+            @RequestBody BoardUpdateRequest updateRequest
     ) {
-        return boardService.update(id, updateRequest);
+        return boardService.updateBoard(id, updateRequest);
     }
 
     @DeleteMapping("/boards/{id}")
     public ResponseEntity<Void> deleteBoard(
-        @PathVariable Long id
+            @PathVariable Long id
     ) {
         boardService.deleteBoard(id);
         return ResponseEntity.noContent().build();

src/main/java/com/example/demo/controller/LoginController.java

@@ -0,0 +1,46 @@
+package com.example.demo.controller;
+
+import com.example.demo.controller.dto.request.LoginRequest;
+import com.example.demo.controller.dto.response.MemberResponse;
+import com.example.demo.service.LoginService;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.io.IOException;
+
+@Controller
+public class LoginController {
+
+    private final LoginService loginService;
+
+    public LoginController(LoginService loginService) {
+        this.loginService = loginService;
+    }
+
+    @PostMapping("/login")
+    public ResponseEntity<MemberResponse> login(
+            @Valid @ModelAttribute LoginRequest loginRequest,
+            HttpServletResponse response,
+            HttpServletRequest request
+    ) throws IOException {
+        MemberResponse member = loginService.login(loginRequest);
+        if (member == null) {
+            response.sendRedirect(request.getContextPath());
+            return ResponseEntity.badRequest().build();
+        }
+
+        Cookie cookie = new Cookie("memberId", String.valueOf(member.id()));
+        cookie.setHttpOnly(true);
+        cookie.setSecure(true);
+
+        response.addCookie(cookie);
+        response.sendRedirect(request.getContextPath() + "/main");
+        return ResponseEntity.ok(member);
+    }
+}

src/main/java/com/example/demo/controller/MemberController.java

@@ -1,20 +1,14 @@
 package com.example.demo.controller;
 
-import java.util.List;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.example.demo.controller.dto.request.MemberCreateRequest;
 import com.example.demo.controller.dto.request.MemberUpdateRequest;
 import com.example.demo.controller.dto.response.MemberResponse;
 import com.example.demo.service.MemberService;
+import jakarta.validation.Valid;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @RestController
 public class MemberController {
@@ -27,40 +21,40 @@ public MemberController(MemberService memberService) {
 
     @GetMapping("/members")
     public ResponseEntity<List<MemberResponse>> getMembers() {
-        List<MemberResponse> response = memberService.getAll();
+        List<MemberResponse> response = memberService.getMembers();
         return ResponseEntity.ok(response);
     }
 
     @GetMapping("/members/{id}")
     public ResponseEntity<MemberResponse> getMember(
-        @PathVariable Long id
+            @PathVariable Long id
     ) {
-        MemberResponse response = memberService.getById(id);
+        MemberResponse response = memberService.getByMemberId(id);
         return ResponseEntity.ok(response);
     }
 
     @PostMapping("/members")
-    public ResponseEntity<MemberResponse> create(
-        @RequestBody MemberCreateRequest request
+    public ResponseEntity<MemberResponse> createMember(
+            @Valid @ModelAttribute MemberCreateRequest request
     ) {
-        MemberResponse response = memberService.create(request);
+        MemberResponse response = memberService.createMember(request);
         return ResponseEntity.ok(response);
     }
 
     @PutMapping("/members/{id}")
     public ResponseEntity<MemberResponse> updateMember(
-        @PathVariable Long id,
-        @RequestBody MemberUpdateRequest request
+            @PathVariable Long id,
+            @RequestBody MemberUpdateRequest request
     ) {
-        MemberResponse response = memberService.update(id, request);
+        MemberResponse response = memberService.updateMember(id, request);
         return ResponseEntity.ok(response);
     }
 
     @DeleteMapping("/members/{id}")
     public ResponseEntity<Void> deleteMember(
-        @PathVariable Long id
+            @PathVariable Long id
     ) {
-        memberService.delete(id);
+        memberService.deleteMember(id);
         return ResponseEntity.noContent().build();
     }
 }

src/main/java/com/example/demo/controller/PageController.java

@@ -1,6 +1,8 @@
 package com.example.demo.controller;
 
+import com.example.demo.controller.dto.request.LoginRequest;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 
 
@@ -23,4 +25,20 @@ public String getArticlesPage() {
     public String getArticleDetailPage() {
         return "article";
     }
+
+    @GetMapping("/register")
+    public String getRegisterPage() {
+        return "register";
+    }
+
+    @GetMapping("/login")
+    public String getLoginPage() {
+        return "login";
+    }
+
+    @GetMapping("/index")
+    public String getIndexPage() {
+        return "index";
+    }
+
 }

src/main/java/com/example/demo/controller/dto/request/ArticleCreateRequest.java

@@ -1,10 +1,22 @@
 package com.example.demo.controller.dto.request;
 
+import com.example.demo.domain.Article;
+import com.example.demo.domain.Board;
+import com.example.demo.domain.Member;
+import jakarta.validation.constraints.NotNull;
+
 public record ArticleCreateRequest(
-    Long authorId,
-    Long boardId,
-    String title,
-    String description
+    @NotNull(message = "회원 아이디는 필수로 입력해야 합니다.") Long authorId,
+    @NotNull(message = "게시판 아이디는 필수로 입력해야 합니다.") Long boardId,
+    @NotNull(message = "제목은 필수로 입력해야 합니다.") String title,
+    @NotNull(message = "게시물 내용은 필수로 입력해야 합니다.") String description
 ) {
-
+    public Article toEntity(Board board, Member member) {
+        return Article.builder()
+                .member(member)
+                .board(board)
+                .title(this.title)
+                .content(this.description)
+                .build();
+    }
 }

src/main/java/com/example/demo/controller/dto/request/BoardCreateRequest.java

@@ -1,7 +1,12 @@
 package com.example.demo.controller.dto.request;
 
+import com.example.demo.domain.Board;
+import jakarta.validation.constraints.NotNull;
+
 public record BoardCreateRequest(
-    String name
+    @NotNull(message = "게시판 이름은 필수로 입력해야 합니다.") String name
 ) {
-
+    public Board toEntity() {
+        return new Board(name);
+    }
 }