From c612365cf13dec6be2ce63e040c669e1d32582be Mon Sep 17 00:00:00 2001
From: 202102711JiHyunWoo
 <105435641+202102711JiHyunWoo@users.noreply.github.com>
Date: Fri, 18 Apr 2025 14:35:09 +0900
Subject: [PATCH 1/4] Update MemberService.java

---
 src/main/java/cnu/mvc/domain/member/MemberService.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/cnu/mvc/domain/member/MemberService.java b/src/main/java/cnu/mvc/domain/member/MemberService.java
index b8e785e..eeadbcb 100644
--- a/src/main/java/cnu/mvc/domain/member/MemberService.java
+++ b/src/main/java/cnu/mvc/domain/member/MemberService.java
@@ -10,11 +10,16 @@ public class MemberService {
     private final MemberRepository memberRepository;
 
     public Member join(Member member){
+        // 이메일 중복 구현
+        if(findByEmail(member.getEmail()) != null ) {
+            throw new IllegalStateException("이미 존재하는 이메일 계정입니다.");
+        }
         return memberRepository.save(member);
     }
 
     public Member validateMember(String email, String pwd) {
         Member findMember = findById(1L);
+        
         return findMember;
     }
 
@@ -25,6 +30,7 @@ public Member findById(Long id) {
     // 구현
     public Member findByEmail(String email) {
         return memberRepository.findByEmail(email);
+        
     }
 
 }

From a4ff65cb93d2de211aff4890f8447135ec147eb9 Mon Sep 17 00:00:00 2001
From: 202102711JiHyunWoo
 <105435641+202102711JiHyunWoo@users.noreply.github.com>
Date: Fri, 18 Apr 2025 14:54:03 +0900
Subject: [PATCH 2/4] Update MemberService.java

---
 .../java/cnu/mvc/domain/member/MemberService.java   | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cnu/mvc/domain/member/MemberService.java b/src/main/java/cnu/mvc/domain/member/MemberService.java
index eeadbcb..a5722a4 100644
--- a/src/main/java/cnu/mvc/domain/member/MemberService.java
+++ b/src/main/java/cnu/mvc/domain/member/MemberService.java
@@ -18,9 +18,14 @@ public Member join(Member member){
     }
 
     public Member validateMember(String email, String pwd) {
-        Member findMember = findById(1L);
-        
-        return findMember;
+        Member check_member = findByEmail(email);
+
+        if (check_member == null || !check_member.getPwd().equals(pwd)){
+            
+            throw new IllegalArgumentException("이메일 또는 비밀번호를 확인해주세요.");
+            
+        }
+        return check_member;
     }
 
     public Member findById(Long id) {
@@ -30,7 +35,5 @@ public Member findById(Long id) {
     // 구현
     public Member findByEmail(String email) {
         return memberRepository.findByEmail(email);
-        
     }
-
 }

From e075c6cec0adbafbab115e8b199e26ece5b663e1 Mon Sep 17 00:00:00 2001
From: 202102711JiHyunWoo
 <105435641+202102711JiHyunWoo@users.noreply.github.com>
Date: Fri, 18 Apr 2025 14:56:53 +0900
Subject: [PATCH 3/4] Update MemberRepository.java

---
 src/main/java/cnu/mvc/domain/member/MemberRepository.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/cnu/mvc/domain/member/MemberRepository.java b/src/main/java/cnu/mvc/domain/member/MemberRepository.java
index 1b273fc..0fe6f84 100644
--- a/src/main/java/cnu/mvc/domain/member/MemberRepository.java
+++ b/src/main/java/cnu/mvc/domain/member/MemberRepository.java
@@ -22,6 +22,11 @@ public Member findById(Long id) {
 
     // 구현
     public Member findByEmail(String email) {
+        for (Member member : store.values()){
+            if ( member.getEmail().equals(email)) {
+                return member;
+            }
+        }
         return null;
     }
 }

From 143e487e97973f3c65bb42162cf651232fc91c27 Mon Sep 17 00:00:00 2001
From: 202102711JiHyunWoo
 <105435641+202102711JiHyunWoo@users.noreply.github.com>
Date: Fri, 18 Apr 2025 15:02:40 +0900
Subject: [PATCH 4/4] Update MemberRepository.java

---
 src/main/java/cnu/mvc/domain/member/MemberRepository.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/cnu/mvc/domain/member/MemberRepository.java b/src/main/java/cnu/mvc/domain/member/MemberRepository.java
index 0fe6f84..5e1bdfe 100644
--- a/src/main/java/cnu/mvc/domain/member/MemberRepository.java
+++ b/src/main/java/cnu/mvc/domain/member/MemberRepository.java
@@ -5,6 +5,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+
 @Repository
 public class MemberRepository {