[6주차 과제] 정건우 과제 제출합니다.

build.gradle

@@ -19,6 +19,9 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	compileOnly 'org.projectlombok:lombok'
+	annotationProcessor 'org.projectlombok:lombok'
+
 }
 
 tasks.named('test') {

build/resources/main/templates/home.html

@@ -6,6 +6,7 @@
         <h1>Hello Spring</h1>
         <p>회원 기능</p>
         <p>
+            <a href="/members/login">로그인</a>
             <a href="/members/new">회원 가입</a>
             <a href="/members">회원 목록</a>
         </p>

build/resources/main/templates/members/createMemberForm.html

@@ -7,6 +7,14 @@
             <label for="name">이름</label>
             <input type="text" id="name" name="name" placeholder="이름을 입력하세요">
         </div>
+        <div class="form-group">
+            <label for="email">이메일</label>
+            <input type="email" id="email" name="email" placeholder="이름을 입력하세요">
+        </div>
+        <div class="form-group">
+            <label for="password">비밀번호</label>
+            <input type="password" id="password" name="password" placeholder="이름을 입력하세요">
+        </div>
         <button type="submit">등록</button>
     </form>
 </div> <!-- /container -->

src/main/java/com/landvibe/landlog/controller/MemberController.java

@@ -1,13 +1,22 @@
 package com.landvibe.landlog.controller;
 
 import com.landvibe.landlog.domain.Member;
+import com.landvibe.landlog.dto.LoginForm;
+import com.landvibe.landlog.dto.MemberForm;
 import com.landvibe.landlog.service.MemberService;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.Optional;
 
 @Controller
 public class MemberController {
@@ -22,18 +31,62 @@ public String createForm() {
         return "members/createMemberForm";
     }
 
+    @GetMapping(value = "/members/login")
+    public String login() {
+        return "members/login";
+    }
+
     @PostMapping(value = "/members/new")
-    public String create(MemberForm form) {
+    public String create(@ModelAttribute MemberForm form) {
+        // 멤버 폼 바인딩이 제대로 되었는지 확인
+        // MemberForm에 @Setter 가 없으니 바인딩이 되지 않음 -> ??
+        // @ModelAttribute 는 생략이 가능
+        System.out.println("Form Data: " + form.getName() + ", " + form.getEmail() + ", " + form.getPassword());
+
         Member member = new Member();
         member.setName(form.getName());
+        member.setEmail(form.getEmail());
+        member.setPassword(form.getPassword());
+
+        System.out.println("Member Data: " + member.getName() + ", " + member.getEmail() + ", " + member.getPassword());
+
         memberService.join(member);
         return "redirect:/";
     }
 
+
+
+
     @GetMapping(value = "/members")
     public String list(Model model) {
         List<Member> members = memberService.findMembers();
         model.addAttribute("members", members);
         return "members/memberList";
     }
+
+    @PostMapping("/members/login")
+    public String login(@ModelAttribute LoginForm form, RedirectAttributes redirectAttributes) {
+
+        // 로그인 폼 바인딩 확인
+        System.out.println("Login Form Data : " + form.getEmail() + " " + form.getPassword());
+
+
+        Optional<Member> memberOpt = memberService.login(form.getEmail(), form.getPassword());
+
+        if (memberOpt.isPresent()) {
+            // 로그인 성공 시 /blogs 페이지로 리다이렉트
+            Member member = memberOpt.get();
+            String encodedName;
+            try {
+                encodedName = URLEncoder.encode(member.getName(), StandardCharsets.UTF_8.toString());
+            } catch (UnsupportedEncodingException e) {
+                encodedName = ""; // 기본 값 처리
+            }
+            return "redirect:/blogs?name=" + encodedName;
+        } else {
+            redirectAttributes.addFlashAttribute("error", "로그인 실패! 이메일 또는 비밀번호를 확인하세요.");
+            return "redirect:/";
+        }
+    }
+
 }

src/main/java/com/landvibe/landlog/controller/blogController.java

@@ -0,0 +1,28 @@
+package com.landvibe.landlog.controller;
+
+import com.landvibe.landlog.domain.Blog;
+import com.landvibe.landlog.dto.AddBlogRequest;
+import com.landvibe.landlog.dto.BlogForm;
+import com.landvibe.landlog.service.BlogService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@Controller
+@RequiredArgsConstructor
+public class blogController {
+
+    private final BlogService blogService;
+
+    @GetMapping("/blogs")
+    public String blogList(@RequestParam(name = "name", required = false) String name, Model model) {
+        model.addAttribute("name", name);
+        return "blogs/blogList"; // 템플릿 파일의 이름
+    }
+}

src/main/java/com/landvibe/landlog/domain/Blog.java

@@ -0,0 +1,21 @@
+package com.landvibe.landlog.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class Blog {
+    private Long creatorId;
+    private String title;
+    private String content;
+
+    public void update(String title, String content) {
+        this.title = title;
+        this.content = content;
+    }
+}

src/main/java/com/landvibe/landlog/domain/Member.java

@@ -1,31 +1,18 @@
 package com.landvibe.landlog.domain;
 
+import lombok.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class Member {
 
     private Long id;
     private String name;
 
-    public Member() {
-    }
-
-    public Member(Long id, String name) {
-        this.id = id;
-        this.name = name;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
+    private String email;
 
-    public String getName() {
-        return name;
-    }
+    private String password;
 
-    public void setName(String name) {
-        this.name = name;
-    }
 }

src/main/java/com/landvibe/landlog/dto/AddBlogRequest.java

@@ -0,0 +1,14 @@
+package com.landvibe.landlog.dto;
+
+import com.landvibe.landlog.domain.Blog;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class AddBlogRequest {
+    private String creatorId;
+    private String title;
+    private String content;
+
+}

src/main/java/com/landvibe/landlog/dto/BlogForm.java

@@ -0,0 +1,12 @@
+package com.landvibe.landlog.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class BlogForm {
+    private Long creatorId;
+    private String title;
+    private String content;
+}

src/main/java/com/landvibe/landlog/dto/LoginForm.java

@@ -0,0 +1,11 @@
+package com.landvibe.landlog.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class LoginForm {
+    private String email;
+    private String password;
+}

src/main/java/com/landvibe/landlog/dto/MemberForm.java

@@ -0,0 +1,12 @@
+package com.landvibe.landlog.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class MemberForm {
+    private String name;
+    private String email;
+    private String password;
+}

src/main/java/com/landvibe/landlog/dto/UpdateBlogRequest.java

@@ -0,0 +1,11 @@
+package com.landvibe.landlog.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class UpdateBlogRequest {
+    private String title;
+    private String content;
+}

src/main/java/com/landvibe/landlog/repository/BlogRepository.java

@@ -0,0 +1,20 @@
+package com.landvibe.landlog.repository;
+
+import com.landvibe.landlog.domain.Blog;
+import com.landvibe.landlog.domain.Member;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface BlogRepository {
+
+    Blog save(Blog blog);
+
+    Optional<Blog> findById(Long id);
+
+    void deleteById(Long id);
+
+
+    List<Blog> findAll();
+}

src/main/java/com/landvibe/landlog/repository/MemberRepository.java

@@ -13,5 +13,7 @@ public interface MemberRepository {
 
     Optional<Member> findByName(String name);
 
+    Optional<Member> findByEmail(String email);
+
     List<Member> findAll();
 }

src/main/java/com/landvibe/landlog/repository/MemoryBlogRepository.java

@@ -0,0 +1,39 @@
+package com.landvibe.landlog.repository;
+
+import com.landvibe.landlog.domain.Blog;
+import org.springframework.stereotype.Repository;
+
+import java.util.*;
+
+@Repository
+public class MemoryBlogRepository implements BlogRepository {
+    private static Map<Long, Blog> store = new HashMap<>();
+    private static long sequence = 0L;
+
+    @Override
+    public Blog save(Blog blog) {
+        blog.setCreatorId(++sequence);
+        store.put(blog.getCreatorId(), blog);
+        return blog;
+    }
+
+    @Override
+    public Optional<Blog> findById(Long id) {
+        return Optional.ofNullable(store.get(id));
+    }
+
+    @Override
+    public List<Blog> findAll() {
+        return new ArrayList<>(store.values());
+    }
+
+    public void clearStore() {
+        store.clear();
+    }
+
+    @Override
+    public void deleteById(Long id) {
+        store.remove(id);
+    }
+
+}

src/main/java/com/landvibe/landlog/repository/MemoryMemberRepository.java

@@ -30,6 +30,13 @@ public Optional<Member> findByName(String name) {
                 .findAny();
     }
 
+    @Override
+    public Optional<Member> findByEmail(String email) {
+        return store.values().stream()
+                .filter(member -> member.getEmail().equals(email))
+                .findAny();
+    }
+
     @Override
     public List<Member> findAll() {
         return new ArrayList<>(store.values());