Kwon ju hwan

build.gradle

@@ -27,6 +27,7 @@ dependencies {
     compileOnly 'org.projectlombok:lombok'
     runtimeOnly 'com.h2database:h2'
     annotationProcessor 'org.projectlombok:lombok'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 

readme.md

@@ -28,18 +28,18 @@
 #### 패키지 구조
 ```text
 ├── controller
-│   └── UserController.java
+│   └── MemberController.java
 ├── domain
-│   ├── User.java
-│   ├── UserLevel.java
-│   └── UserType.java
+│   ├── Member.java
+│   ├── MemberLevel.java
+│   └── MemberType.java
 ├── repository
-│   └── UserRepository.java
+│   └── MemberRepository.java
 └── service
-    └── UserService.java
+    └── MemberService.java
 
 ```
-* 모든 도메인 패키지 구조는 다음을 따릅니다. (예시 : `user` 도메인)
+* 모든 도메인 패키지 구조는 다음을 따릅니다. (예시 : `Member` 도메인)
 * 각 패키지 내부의 클래스들은 예시일 뿐 얼마든지 클래스를 추가로 생성하셔도 됩니다.
 
 ### 유저 도메인을 완성해봅시다.
@@ -49,8 +49,8 @@
 | username       | 사용자 아이디  | 사용자 로그인 아이디              |
 | password       | 사용자 비밀번호 | 사용자 비밀번호                 |
 | nickname       | 사용자 닉네임  | 사용자 닉네임                   |
-| userLevel      | 사용자 등급   | 사용자 등급                   |
-| type           | 사용자 유형   | 사용자 유형으로 ADMIN, USER가 존재 |
+| MemberLevel    | 사용자 등급   | 사용자 등급                   |
+| type           | 사용자 유형   | 사용자 유형으로 ADMIN, Member가 존재 |
 | createdAt      | 생성 일시    | 사용자 최초 생성 일시             |
 | lastModifiedAt | 최종 수정 일시 | 사용자 최종 수정 일시             |
 * 사용자는 `회원가입`이 가능합니다.
@@ -62,7 +62,7 @@
   * BRONZE, SILVER, GOLD가 존재하며 추후 주문 시 결제 금액 할인이 가능합니다.
   * 5번 구매를 하면 SILVER, 10번 구매를 하면 GOLD로 등급업이 됩니다.
 * 사용자 별 `타입(type)`이 존재합니다.
-  * USER : 일반유저로 상품을 구매는 가능하지만 추가할 수 없습니다.
+  * Member : 일반유저로 상품을 구매는 가능하지만 추가할 수 없습니다.
   * ADMIN : 관리자로 상품을 구매와 추가 모두 가능합니다.
 
 <br>
@@ -93,7 +93,7 @@
 | 변수명            | 필드명      | 설명         |
 |----------------|----------|------------|
 | id             | 주문 아이디   | 주문 엔티티 식별자 |
-| userId         | 유저 아이디   | 유저 엔티티 식별자 |
+| MemberId         | 유저 아이디   | 유저 엔티티 식별자 |
 | orderProducts  | 주문 상품 정보 | 주문의 상품의 정보 |
 | price          | 총 주문 가격  | 총 주문 가격    |
 | orderStatus    | 주문 상태    | 주문 상태      |

src/main/java/com/swger/tddstudy/member/controller/MemberController.java

@@ -0,0 +1,44 @@
+package com.swger.tddstudy.member.controller;
+
+import com.swger.tddstudy.member.domain.Member;
+import com.swger.tddstudy.member.domain.DTO.MemberDTO;
+import com.swger.tddstudy.member.domain.DTO.MemberSignInDTO;
+import com.swger.tddstudy.member.repository.MemberRepository;
+import com.swger.tddstudy.member.service.MemberService;
+import javax.servlet.http.HttpSession;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.BindException;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+public class MemberController {
+
+    private final MemberService memberService;
+
+    @PostMapping("/signUp")
+    public String signUp(@Validated @RequestBody MemberDTO memberDTO, BindingResult bindingResult)
+        throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BindException(bindingResult);
+        }
+        memberService.SignUp(memberDTO);
+        return "signUpOK";
+    }
+
+    @PostMapping("/logIn")
+    public String logIn(@Validated @RequestBody MemberSignInDTO memberSignInDTO,
+        BindingResult bindingResult, HttpSession session) throws Exception {
+        if (bindingResult.hasErrors()) {
+            throw new BindException(bindingResult);
+        }
+        Member member = memberService.SignIn(memberSignInDTO);
+        session.setAttribute("id", member.getId());
+        return "LogInOK";
+    }
+
+}

src/main/java/com/swger/tddstudy/member/domain/DTO/MemberDTO.java

@@ -0,0 +1,25 @@
+package com.swger.tddstudy.member.domain.DTO;
+
+import lombok.Getter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+public class MemberDTO {
+    @NotBlank
+    private String username;
+    @NotBlank
+    private String password;
+    @NotBlank
+    private String nickname;
+    @NotBlank
+    private String rePassword;
+
+    public MemberDTO(String username, String password, String nickname, String rePassword) {
+        this.username = username;
+        this.password = password;
+        this.nickname = nickname;
+        this.rePassword = rePassword;
+    }
+    public MemberDTO(){}
+}

src/main/java/com/swger/tddstudy/member/domain/DTO/MemberSignInDTO.java

@@ -0,0 +1,20 @@
+package com.swger.tddstudy.member.domain.DTO;
+
+import lombok.Getter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+public class MemberSignInDTO {
+
+    @NotBlank
+    private String username;
+    @NotBlank
+    private String password;
+
+    public MemberSignInDTO(String username, String password) {
+        this.username = username;
+        this.password = password;
+    }
+    public MemberSignInDTO(){}
+}

src/main/java/com/swger/tddstudy/member/domain/Member.java

@@ -0,0 +1,61 @@
+package com.swger.tddstudy.member.domain;
+
+import com.swger.tddstudy.member.domain.DTO.MemberDTO;
+import com.swger.tddstudy.util.BaseEntity;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
+
+import lombok.Getter;
+
+@Getter
+@Entity
+public class Member extends BaseEntity {
+
+    @Id @GeneratedValue
+    private Long id;
+
+    @NotBlank
+    private String username;
+
+    @NotBlank
+    private String password;
+
+    @NotBlank
+    private String nickname;
+
+    @Enumerated(EnumType.STRING)
+    private MemberLevel memberLevel;
+
+    @Enumerated(EnumType.STRING)
+    private MemberType memberType;
+
+    public Member(String username, String password, String nickname) {
+        this.username = username;
+        this.password = password;
+        this.nickname = nickname;
+        this.memberLevel = MemberLevel.BRONZE;
+        this.memberType = MemberType.Member;
+    }
+    public Member(){}
+
+    public Member(MemberDTO memberDTO){
+        this.username = memberDTO.getUsername();
+        this.password = memberDTO.getPassword();
+        this.nickname = memberDTO.getNickname();
+        this.memberLevel = MemberLevel.BRONZE;
+        this.memberType = MemberType.Member;
+    }
+    public void AdminMember(){
+        this.memberType = MemberType.ADMIN;
+    }
+    public void LevelUp() {
+        if (this.getMemberLevel().equals(MemberLevel.SILVER)) {
+            this.memberLevel = MemberLevel.GOLD;
+        }
+        if (this.getMemberLevel().equals(MemberLevel.BRONZE)) {
+            this.memberLevel = MemberLevel.SILVER;
+        }
+    }
+
+}

src/main/java/com/swger/tddstudy/user/domain/UserLevel.java → src/main/java/com/swger/tddstudy/member/domain/MemberLevel.java

@@ -1,9 +1,9 @@
-package com.swger.tddstudy.user.domain;
+package com.swger.tddstudy.member.domain;
 
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
-public enum UserLevel {
+public enum MemberLevel {
 
     BRONZE("브론즈"), SILVER("실버"), GOLD("골드");
 

src/main/java/com/swger/tddstudy/member/domain/MemberType.java

@@ -0,0 +1,12 @@
+package com.swger.tddstudy.member.domain;
+
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public enum MemberType {
+
+    Member("일반회원"), ADMIN("관리자");
+
+    private final String text;
+
+}

src/main/java/com/swger/tddstudy/member/repository/MemberRepository.java

@@ -0,0 +1,14 @@
+package com.swger.tddstudy.member.repository;
+
+import com.swger.tddstudy.member.domain.Member;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface MemberRepository extends JpaRepository<Member,Long> {
+    Optional<Member> findByUsername(String  username);
+
+    @Override
+    <S extends Member> S save(S entity);
+}

src/main/java/com/swger/tddstudy/member/service/MemberService.java

@@ -0,0 +1,48 @@
+package com.swger.tddstudy.member.service;
+
+import com.swger.tddstudy.member.domain.Member;
+import com.swger.tddstudy.member.domain.DTO.MemberDTO;
+import com.swger.tddstudy.member.domain.DTO.MemberSignInDTO;
+import com.swger.tddstudy.member.domain.MemberLevel;
+import com.swger.tddstudy.member.domain.MemberType;
+import com.swger.tddstudy.member.repository.MemberRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class MemberService {
+    private final MemberRepository memberRepository;
+    public Member join(Member member){
+        memberRepository.save(member);
+        return member;
+    }
+    public Member SignUp(MemberDTO member){
+        if(!member.getPassword().equals(member.getRePassword())){
+            throw new IllegalArgumentException("RePassword Mismatch");
+        }
+        Member signUpMember = new Member(member);
+        join(signUpMember);
+        return signUpMember;
+    }
+    public Member SignUpAdmin(MemberDTO member){
+        if(!member.getPassword().equals(member.getRePassword())){
+            throw new IllegalArgumentException("RePassword Mismatch");
+        }
+        Member signUpMember = new Member(member);
+        signUpMember.AdminMember();
+        join(signUpMember);
+        return signUpMember;
+    }
+    public Member SignIn(MemberSignInDTO member){
+        Member signInMember = memberRepository.findByUsername(member.getUsername()).orElseThrow(() -> new IllegalArgumentException("Username Mismatch"));
+        if (!signInMember.getPassword().equals(member.getPassword())) {
+            throw new IllegalArgumentException("Password Mismatch");
+        }
+        return signInMember;
+    }
+
+}

src/main/java/com/swger/tddstudy/order/domain/Order.java

@@ -2,7 +2,7 @@
 
 import com.swger.tddstudy.orderProduct.domain.OrderProduct;
 import com.swger.tddstudy.util.BaseEntity;
-import com.swger.tddstudy.user.domain.User;
+import com.swger.tddstudy.member.domain.Member;
 import java.util.List;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
@@ -26,13 +26,13 @@ public class Order extends BaseEntity {
     private Long id;
 
     @ManyToOne
-    private User user;
+    private Member Member;
 
     @OneToMany(mappedBy = "order", cascade = CascadeType.ALL)
     private List<OrderProduct> orderProducts;
 
     private int price;
 
-    @Enum태erated(EnumType.STRING)
+    @Enumerated(EnumType.STRING)
     private OrderStatus orderStatus;
 }

src/main/java/com/swger/tddstudy/product/controller/ProductController.java

@@ -0,0 +1,43 @@
+package com.swger.tddstudy.product.controller;
+
+import com.swger.tddstudy.member.domain.MemberType;
+import com.swger.tddstudy.member.repository.MemberRepository;
+import com.swger.tddstudy.member.service.MemberService;
+import com.swger.tddstudy.product.domain.DTO.ProductRegisterDTO;
+import com.swger.tddstudy.product.service.ProductService;
+import javax.naming.AuthenticationException;
+import javax.servlet.http.HttpSession;
+import lombok.RequiredArgsConstructor;
+import org.hibernate.engine.spi.ManagedEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindException;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+public class ProductController {
+
+    private final ProductService productService;
+    private final MemberRepository memberRepository;
+
+    @PostMapping("/productRegister")
+    public String productRegister(@Validated @RequestBody ProductRegisterDTO DTO, BindingResult br,
+        HttpSession httpSession) throws BindException, AuthenticationException {
+        if (br.hasErrors()) throw new BindException(br);
+        productService.register(DTO);
+
+        if (httpSession.getAttribute("id") == null) {
+            throw new AuthenticationException("You must SignIn");
+        }
+
+        if(!memberRepository.findById((Long) httpSession.getAttribute("id"))
+            .get().getMemberType().equals(MemberType.ADMIN)){
+            throw new AuthenticationException("You are not Admin");
+        }
+        return "Register OK";
+    }
+}