Merge pull request #17 from f-lab-edu/feature/15

Feature/15: 회원 관리 기능 DB와 연동

Author: KanuBang

app/src/main/java/org/example/domain/global/config/WebMvcConfig.java

@@ -9,12 +9,16 @@
 @Configuration
 @Profile("!test")
 public class WebMvcConfig implements WebMvcConfigurer {
-
+    /*
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(new LoginCheckInterceptor())
                 .order(1)
                 .addPathPatterns("/**")
-                .excludePathPatterns("/profile/add", "/login", "/logout");
+                .excludePathPatterns(
+                        "/profile/add",
+                        "/login", "/logout");
     }
+
+     */
 }

app/src/main/java/org/example/domain/member/MemberController.java

@@ -1,43 +1,48 @@
 package org.example.domain.member;
 
 import jakarta.validation.Valid;
-import org.example.domain.member.dto.MemberEditForm;
-import org.example.domain.member.dto.MemberForm;
+import lombok.RequiredArgsConstructor;
+import org.example.domain.member.dto.request.MemberEditForm;
+import org.example.domain.member.dto.request.MemberJoinForm;
+import org.example.domain.member.dto.response.MemberDTO;
 import org.example.domain.member.entity.Member;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import java.net.URI;
-
 @RestController
 @RequestMapping("/profile")
+@RequiredArgsConstructor
 public class MemberController {
     private final MemberService memberService;
 
-    @Autowired
-    public MemberController(MemberService memberService) {
-        this.memberService = memberService;
-    }
-
-    // 회원가입
+    x
     @PostMapping("/add")
-    public ResponseEntity<Member> memberAdd(@Valid @RequestBody MemberForm memberForm) {
+    public ResponseEntity<MemberDTO> memberAdd(@Valid @RequestBody MemberJoinForm memberForm) {
         Member savedMember = memberService.addMember(memberForm);
-        return ResponseEntity.status(201).body(savedMember);
+        MemberDTO memberDTO = MemberDTO.createMemberDTO(savedMember);
+        return ResponseEntity.status(201).body(memberDTO);
     }
 
     // 사용자 프로필 조회
     @GetMapping("/{user_id}")
-    public ResponseEntity<Member> memberDetails(@PathVariable(value = "user_id") Long user_id) {
-        Member member = memberService.findMember(user_id);
-        return ResponseEntity.ok().body(member);
+    public ResponseEntity<MemberDTO> memberDetails(@PathVariable(value = "user_id") Long userId) {
+        Member member = memberService.findMember(userId);
+        MemberDTO memberDTO = MemberDTO.createMemberDTO(member);
+        return ResponseEntity.ok().body(memberDTO);
     }
 
+    // 사용자 프로필 수정 폼에 초기 데이터 제공
+    @GetMapping("/{user_id}/edit")
+    public ResponseEntity<MemberDTO> memberModify(@PathVariable(value = "user_id") Long userId) {
+        Member member = memberService.findMember(userId);
+        MemberDTO memberDTO = MemberDTO.createMemberDTO(member);
+        return ResponseEntity.ok().body(memberDTO);
+    }
     // 사용자 프로필 수정
     @PutMapping("/{user_id}/edit")
-    public ResponseEntity<Member> memberModify(@PathVariable(value = "user_id") Long user_id, @Valid @RequestBody MemberEditForm memberEditForm) {
+    public ResponseEntity<MemberDTO> memberModify(@PathVariable(value = "user_id") Long user_id, @Valid @RequestBody MemberEditForm memberEditForm) {
         Member updateMember = memberService.modifyMember(user_id, memberEditForm);
-        return ResponseEntity.ok().body(updateMember);
+        MemberDTO memberDTO = MemberDTO.createMemberDTO(updateMember);
+        return ResponseEntity.ok().body(memberDTO);
     }
 }

app/src/main/java/org/example/domain/member/MemberRepository.java

@@ -1,6 +1,8 @@
 package org.example.domain.member;
 
 
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import lombok.extern.slf4j.Slf4j;
 import org.example.domain.member.entity.Member;
 import org.springframework.stereotype.Repository;
@@ -11,23 +13,27 @@
 @Slf4j
 @Repository
 public class MemberRepository {
-    private ConcurrentHashMap<Long, Member> store = new ConcurrentHashMap<>();
+
+    @PersistenceContext
+    private EntityManager em;
 
     public Member save(Member member) {
-        log.debug("save: memberId={}", member.getId());
-        store.put(member.getId(), member);
+        em.persist(member);
         return member;
     }
 
     public Member findById(Long id) {
-        return store.get(id);
+        return em.find(Member.class, id);
     }
 
     public List<Member> findAll() {
-        return new ArrayList<>(store.values());
+        List<Member> members = em.createQuery("select m from Member m", Member.class).getResultList();
+        return members;
     }
     public Optional<Member> findByEmail(String email) {
-        return findAll().stream().filter(m -> m.getEmail().equals(email)).findFirst();
+        Member member = em.createQuery("select m from Member m where m.email = :email", Member.class)
+                .setParameter("email", email).getSingleResult();
+        return Optional.ofNullable(member);
     }
 
     public Optional<Member> findByEmailAndPassword(String email, String password) {
@@ -41,8 +47,4 @@ public Optional<Member> findByEmailAndPassword(String email, String password) {
 
         return Optional.empty();
     }
-
-    public void clearStore() {
-        store.clear();
-    }
 }

app/src/main/java/org/example/domain/member/MemberService.java

@@ -1,26 +1,36 @@
 package org.example.domain.member;
 
-import org.example.domain.member.dto.MemberEditForm;
-import org.example.domain.member.dto.MemberForm;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.example.domain.language.Language;
+import org.example.domain.member.dto.request.MemberEditForm;
+import org.example.domain.member.dto.request.MemberJoinForm;
+import org.example.domain.member.dto.response.MemberDTO;
 import org.example.domain.member.entity.Member;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PutMapping;
 
 @Service
+@RequiredArgsConstructor
+@Transactional(readOnly = true)
+@Slf4j
 public class MemberService {
 
     private final MemberRepository memberRepository;
 
-    @Autowired
-    public MemberService(MemberRepository memberRepository) {
-        this.memberRepository = memberRepository;
-    }
-
     // 회원가입
-    public Member addMember(MemberForm memberForm){
-        return memberRepository.save(Member.createMember(memberForm));
+    @Transactional
+    public Member addMember(MemberJoinForm memberForm){
+        Member member = Member.createMember(memberForm);
+
+        for(String lang : memberForm.getLearning()) {
+            Language language = Language.createLanguage(lang);
+            member.addLearning(language);
+        }
 
+        memberRepository.save(member); // language 도 함께 저장
+        return member;
     }
 
     // 사용자 프로필 조회
@@ -38,14 +48,21 @@ public Member findMember(Long user_id){
 
     // 사용자 프로필 수정
     @PutMapping("/{user_id}/edit")
+    @Transactional
     public Member modifyMember(Long user_id, MemberEditForm memberEditForm){
 
         Member member = memberRepository.findById(user_id);
 
         if(member == null) {
             throw new RuntimeException("존재하지 않는 사용자입니다.");
         }
+        member.clearLearnings();
 
+        for (String lang : memberEditForm.getLearning()) {
+            Language language = Language.createLanguage(lang);
+            member.addLearning(language);
+        }
         return member.editMember(memberEditForm);
+
     }
 }

app/src/main/java/org/example/domain/member/dto/MemberEditForm.java renamed to app/src/main/java/org/example/domain/member/dto/request/MemberEditForm.java

@@ -1,4 +1,4 @@
-package org.example.domain.member.dto;
+package org.example.domain.member.dto.request;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Pattern;
@@ -21,7 +21,7 @@ public class MemberEditForm {
     @Pattern(
             regexp = "^(ko|en|ja|cn|fr|ar|es|ru)$",
             message = "허용되지 않은 언어 코드입니다. (ko, en, ja, cn, fr, ar, es, ru만 허용)"
-    ) private String native_lang;
+    ) private String nativeLang;
 
     @Size(min = 1, max = 5, message = "학습 언어는 1~5개까지 선택 가능합니다.") // 리스트 전체에 대한 검증
     private List<@Pattern(

app/src/main/java/org/example/domain/member/dto/MemberForm.java renamed to app/src/main/java/org/example/domain/member/dto/request/MemberJoinForm.java

@@ -1,4 +1,4 @@
-package org.example.domain.member.dto;
+package org.example.domain.member.dto.request;
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
@@ -11,7 +11,7 @@
 
 @Data
 @Builder
-public class MemberForm {
+public class MemberJoinForm {
 
     @NotBlank(message = "이메일은 반드시 입력해야 합니다.")
     @Email(message = "유효한 이메일 형식이 아닙니다.")

app/src/main/java/org/example/domain/member/dto/response/MemberDTO.java

@@ -0,0 +1,41 @@
+package org.example.domain.member.dto.response;
+
+import lombok.Builder;
+import lombok.Data;
+import org.example.domain.language.Language;
+import org.example.domain.member.entity.Member;
+
+import java.util.List;
+
+@Data
+@Builder
+public class MemberDTO {
+    private Long id;
+    private String email;
+    private String username;
+    private String nationality;
+    private String nativeLang;
+    private String introduction;
+    private List<String> learnings;
+    private int follower;
+    private int following;
+    private int point;
+
+    public static MemberDTO createMemberDTO(Member member) {
+        List<Language> learnings = member.getLearnings();
+        List<String> languages = learnings.stream().map(Language::getLanguage).toList();
+
+        return MemberDTO.builder()
+                .id(member.getId())
+                .email(member.getEmail())
+                .username(member.getUsername())
+                .nationality(member.getNationality())
+                .nativeLang(member.getNativeLang())
+                .introduction(member.getIntroduction())
+                .learnings(languages)
+                .follower(member.getFollower())
+                .following(member.getFollowing())
+                .point(member.getPoint())
+                .build();
+    }
+}

app/src/main/java/org/example/domain/question/QuestionController.java

@@ -7,7 +7,7 @@
 import org.example.domain.question.dto.request.CommentForm;
 import org.example.domain.question.dto.request.QuestionCreateForm;
 import org.example.domain.question.dto.request.QuestionEditForm;
-import org.example.domain.question.entity.Comment;
+import org.example.domain.comment.Comment;
 import org.example.domain.question.entity.Question;
 import org.example.domain.session.SessionConst;
 import org.springframework.beans.factory.annotation.Autowired;

app/src/main/java/org/example/domain/question/QuestionService.java

@@ -5,16 +5,15 @@
 import org.example.domain.question.dto.request.CommentForm;
 import org.example.domain.question.dto.request.QuestionCreateForm;
 import org.example.domain.question.dto.request.QuestionEditForm;
-import org.example.domain.question.entity.Comment;
+import org.example.domain.comment.Comment;
 import org.example.domain.question.entity.Question;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Optional;
 
-import static org.example.domain.question.entity.Comment.*;
+import static org.example.domain.comment.Comment.*;
 
 @Slf4j
 @Service

app/src/main/resources/application.yml

@@ -9,6 +9,7 @@ spring:
   jpa:
     hibernate:
       ddl-auto: update
+    show-sql: true
     database-platform: org.hibernate.dialect.MySQLDialect
 server:
   port: 8081