상담확인서 신청 & 확인 로직 개발

src/main/java/com/gapple/weeingback/domain/auth/dto/AuthJoinRequest.java

@@ -7,11 +7,17 @@
 @Getter
 @AllArgsConstructor
 public class AuthJoinRequest {
-    @Pattern(regexp = "^[a-zA-Z0-9._%+-][email protected]$")
+    @Pattern(regexp = "^[a-zA-Z0-9._%+-][email protected]$", message = "gsm.hs.kr 도메인을 사용하는 메일이 아닙니다.")
     @NotBlank
     private String email;
 
     @NotBlank
-    @Pattern(regexp = "^(?=.*[a-zA-Z])(?=.*\\d)(?=.*\\W).{8,16}$", message = "Invalid password")
+    @Pattern(regexp = "^(?=.*[a-zA-Z])(?=.*\\d)(?=.*\\W).{8,16}$", message = "정규식에 맞지 않는 비밀번호입니다.")
     private String password;
+
+    @NotBlank
+    @Pattern(regexp = "^[가-힣]{2,}$", message = "한글 실명을 입력하지 않았습니다.")
+    private String name;
+
+    private Long number;
 }

src/main/java/com/gapple/weeingback/domain/auth/service/impl/AuthServiceImpl.java

@@ -12,10 +12,15 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 @Service
 @RequiredArgsConstructor
 @Slf4j
@@ -31,7 +36,9 @@ public ResponseEntity<AuthJoinResponse> join(AuthJoinRequest req){
             Member member = Member.builder()
                     .email(req.getEmail())
                     .password(passwordEncoder.encode(req.getPassword()))
-                    .role(AccessRole.STUDENT)
+                    .name(req.getName())
+                    .number(req.getNumber())
+                    .role(AccessRole.ROLE_STUDENT.getName())
                     .build();
 
             memberRepository.save(member);
@@ -45,12 +52,13 @@ public ResponseEntity<AuthLoginResponse> login(AuthLoginRequest request){
 
         if(passwordEncoder.matches(request.getPassword(), member.getPassword())){
             String id = member.getId().toString();
-            String role = member.getRole().toString();
+            String password = member.getPassword();
 
-            log.info(id + " " + role);
+            List<AccessRole> roles = new ArrayList<>();
+            roles.add(AccessRole.valueOf(member.getRole()));
 
             Authentication authentication =
-                    new UsernamePasswordAuthenticationToken(id, role);
+                    new UsernamePasswordAuthenticationToken(id, password, roles);
             String token = jwtProvider.generateToken(authentication);
             return ResponseEntity.ok(new AuthLoginResponse(token, "ok"));
         } else throw new IllegalArgumentException();

src/main/java/com/gapple/weeingback/domain/boardgame/entity/Boardgame.java

@@ -0,0 +1,33 @@
+package com.gapple.weeingback.domain.boardgame.entity;
+
+import com.gapple.weeingback.domain.member.entity.Member;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.GenericGenerator;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+@Table
+@Entity
+@Getter @Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class Boardgame {
+    @Id
+    @GeneratedValue(generator = "uuid2", strategy = GenerationType.IDENTITY)
+    @GenericGenerator(name="uuid2", strategy = "uuid2")
+    private UUID id;
+
+    @Column
+    private UUID creator;
+
+    @Column
+    @OneToMany(fetch = FetchType.LAZY)
+    private List<Member> members;
+}

src/main/java/com/gapple/weeingback/domain/consulting/controller/ConsultingController.java

@@ -1,14 +1,13 @@
 package com.gapple.weeingback.domain.consulting.controller;
 
-import com.gapple.weeingback.domain.consulting.entity.dto.request.ConsultingSubmitResponse;
+import com.gapple.weeingback.domain.consulting.entity.dto.request.ConsultingCancleRequest;
+import com.gapple.weeingback.domain.consulting.entity.dto.response.ConsultingCancleResponse;
+import com.gapple.weeingback.domain.consulting.entity.dto.response.ConsultingShowResponse;
+import com.gapple.weeingback.domain.consulting.entity.dto.response.ConsultingSubmitResponse;
 import com.gapple.weeingback.domain.consulting.service.implementation.ConsultingServiceImpl;
 import jakarta.validation.Valid;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.gapple.weeingback.domain.consulting.entity.dto.request.ConsultingSubmitRequest;
 import lombok.RequiredArgsConstructor;
 
@@ -19,7 +18,17 @@ public class ConsultingController {
     private final ConsultingServiceImpl service;
 
     @PostMapping("/submit")
-    public ResponseEntity<ConsultingSubmitResponse> submitOkay(@Valid @RequestBody ConsultingSubmitRequest request){
+    public ResponseEntity<ConsultingSubmitResponse> submitConsulting(@Valid @RequestBody ConsultingSubmitRequest request){
         return service.submitConsulting(request);
     }
+
+    @GetMapping("/list")
+    public ResponseEntity<ConsultingShowResponse> showConsulting(){
+        return service.showConsulting();
+    }
+
+    @GetMapping("/cancle")
+    public ResponseEntity<ConsultingCancleResponse> cancleConsulting(@Valid @RequestBody ConsultingCancleRequest request){
+        return service.cancleConsulting(request);
+    }
 }

src/main/java/com/gapple/weeingback/domain/consulting/entity/Consulting.java

@@ -1,7 +1,12 @@
 package com.gapple.weeingback.domain.consulting.entity;
 
+import com.gapple.weeingback.domain.member.entity.Member;
 import jakarta.persistence.*;
 import lombok.*;
+import org.hibernate.annotations.GenericGenerator;
+
+import java.util.List;
+import java.util.UUID;
 
 @Table
 @Entity
@@ -10,8 +15,10 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class Consulting {
-  @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-  private Long id;
+  @Id
+  @GeneratedValue(generator = "uuid2", strategy = GenerationType.IDENTITY)
+  @GenericGenerator(name="uuid2", strategy = "uuid2")
+  private UUID id;
 
   @Column(nullable = false)
   private Long issuedAt;
@@ -22,8 +29,16 @@ public class Consulting {
   @Column(nullable = false)
   private boolean isAccess;
 
-  public Consulting(Long issuedAt, int classTime){
+  @Column(columnDefinition = "VARCHAR(3000)")
+  private String description;
+
+  public Consulting(Long issuedAt, int classTime, String description) {
     this.issuedAt = issuedAt;
     this.classTime = classTime;
+    this.description = description;
+  }
+
+  public static Consulting toConsulting(Long issuedAt, int classTime, String description){
+    return new Consulting(issuedAt, classTime, description);
   }
 }

src/main/java/com/gapple/weeingback/domain/consulting/entity/ToConsultingResponse.java

@@ -0,0 +1,16 @@
+package com.gapple.weeingback.domain.consulting.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class ToConsultingResponse {
+    private String id;
+
+    private Long issuedAt;
+
+    private int classTime;
+
+    private String description;
+}

src/main/java/com/gapple/weeingback/domain/consulting/entity/dto/request/ConsultingCancleRequest.java

@@ -1,12 +1,12 @@
 package com.gapple.weeingback.domain.consulting.entity.dto.request;
 
-import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
 public class ConsultingCancleRequest {
-    @Email
-    private String email;
+    @NotBlank
+    private String consultingId;
 }

src/main/java/com/gapple/weeingback/domain/consulting/entity/dto/request/ConsultingSubmitRequest.java

@@ -1,5 +1,7 @@
 package com.gapple.weeingback.domain.consulting.entity.dto.request;
 
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -8,5 +10,9 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class ConsultingSubmitRequest {
+    @NotNull
     private int classTime;
+
+    @NotBlank
+    private String description;
 }

src/main/java/com/gapple/weeingback/domain/consulting/entity/dto/response/ConsultingCancleResponse.java

@@ -0,0 +1,12 @@
+package com.gapple.weeingback.domain.consulting.entity.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class ConsultingCancleResponse {
+    private String success;
+}

src/main/java/com/gapple/weeingback/domain/consulting/entity/dto/response/ConsultingShowResponse.java

@@ -0,0 +1,21 @@
+package com.gapple.weeingback.domain.consulting.entity.dto.response;
+
+import com.gapple.weeingback.domain.consulting.entity.Consulting;
+import com.gapple.weeingback.domain.consulting.entity.ToConsultingResponse;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ConsultingShowResponse {
+
+    private List<ToConsultingResponse> consults;
+
+    private String success;
+}

src/main/java/com/gapple/weeingback/domain/consulting/entity/dto/request/ConsultingSubmitResponse.java → src/main/java/com/gapple/weeingback/domain/consulting/entity/dto/response/ConsultingSubmitResponse.java

@@ -1,4 +1,4 @@
-package com.gapple.weeingback.domain.consulting.entity.dto.request;
+package com.gapple.weeingback.domain.consulting.entity.dto.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/gapple/weeingback/domain/consulting/repository/ConsultingRepository.java

@@ -0,0 +1,12 @@
+package com.gapple.weeingback.domain.consulting.repository;
+
+import com.gapple.weeingback.domain.consulting.entity.Consulting;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+import java.util.UUID;
+
+public interface ConsultingRepository extends JpaRepository<Consulting, Long> {
+
+    void removeById(UUID consultingId);
+}

src/main/java/com/gapple/weeingback/domain/consulting/service/ConsultingService.java

@@ -1,9 +1,16 @@
 package com.gapple.weeingback.domain.consulting.service;
 
+import com.gapple.weeingback.domain.consulting.entity.dto.request.ConsultingCancleRequest;
+import com.gapple.weeingback.domain.consulting.entity.dto.response.ConsultingCancleResponse;
+import com.gapple.weeingback.domain.consulting.entity.dto.response.ConsultingShowResponse;
 import com.gapple.weeingback.domain.consulting.entity.dto.request.ConsultingSubmitRequest;
-import com.gapple.weeingback.domain.consulting.entity.dto.request.ConsultingSubmitResponse;
+import com.gapple.weeingback.domain.consulting.entity.dto.response.ConsultingSubmitResponse;
 import org.springframework.http.ResponseEntity;
 
 public interface ConsultingService {
     ResponseEntity<ConsultingSubmitResponse> submitConsulting(ConsultingSubmitRequest request);
+
+    ResponseEntity<ConsultingShowResponse> showConsulting();
+
+    ResponseEntity<ConsultingCancleResponse> cancleConsulting(ConsultingCancleRequest request);
 }

src/main/java/com/gapple/weeingback/domain/consulting/service/implementation/ConsultingServiceImpl.java

@@ -1,37 +1,78 @@
 package com.gapple.weeingback.domain.consulting.service.implementation;
 
 import com.gapple.weeingback.domain.consulting.entity.Consulting;
+import com.gapple.weeingback.domain.consulting.entity.ToConsultingResponse;
+import com.gapple.weeingback.domain.consulting.entity.dto.request.ConsultingCancleRequest;
+import com.gapple.weeingback.domain.consulting.entity.dto.response.ConsultingCancleResponse;
+import com.gapple.weeingback.domain.consulting.entity.dto.response.ConsultingShowResponse;
 import com.gapple.weeingback.domain.consulting.entity.dto.request.ConsultingSubmitRequest;
-import com.gapple.weeingback.domain.consulting.entity.dto.request.ConsultingSubmitResponse;
+import com.gapple.weeingback.domain.consulting.entity.dto.response.ConsultingSubmitResponse;
+import com.gapple.weeingback.domain.consulting.repository.ConsultingRepository;
 import com.gapple.weeingback.domain.consulting.service.ConsultingService;
 import com.gapple.weeingback.domain.member.entity.Member;
 import com.gapple.weeingback.domain.member.repository.MemberRepository;
-import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.UUID;
 
 @Service
+@Slf4j
 @RequiredArgsConstructor
 public class ConsultingServiceImpl implements ConsultingService {
     private final MemberRepository memberRepository;
+    private final ConsultingRepository consultingRepository;
 
+    @Override
     @Transactional
     public ResponseEntity<ConsultingSubmitResponse> submitConsulting(ConsultingSubmitRequest request){
         String id = SecurityContextHolder.getContext().getAuthentication().getName();
+
         Member member = memberRepository.findMemberById(UUID.fromString(id));
 
-        if(member.getConsulting() != null){
-            member.setConsulting(new Consulting(Instant.now().toEpochMilli(), request.getClassTime()));
-        }
+            // 해당 시간이 니가 이미 보낸 신청이 있으면 거절할건데 로직
+
+        Consulting consulting = Consulting.toConsulting(
+                Instant.now().toEpochMilli(),
+                request.getClassTime(),
+                request.getDescription());
 
+        member.addConsulting(consulting);
+
+        consultingRepository.save(consulting);
         memberRepository.save(member);
 
-        return ResponseEntity.accepted().body(new ConsultingSubmitResponse("okay"));
+        return ResponseEntity.accepted().body(new ConsultingSubmitResponse("ok"));
+    }
+
+    @Override
+    @Transactional
+    public ResponseEntity<ConsultingShowResponse> showConsulting() {
+        String id = SecurityContextHolder.getContext().getAuthentication().getName();
+        Member member = memberRepository.findMemberById(UUID.fromString(id));
+
+        List<ToConsultingResponse> consultingResponses = new ArrayList<>();
+
+        List<Consulting> consults = member.getConsulting();
+        consults.forEach(consulting -> consultingResponses.add(new ToConsultingResponse(
+                consulting.getId().toString(),
+                consulting.getIssuedAt(),
+                consulting.getClassTime(),
+                consulting.getDescription())));
+
+        return ResponseEntity.ok().body(new ConsultingShowResponse(consultingResponses, "okay"));
+    }
+
+    @Override
+    public ResponseEntity<ConsultingCancleResponse> cancleConsulting(ConsultingCancleRequest request) {
+        consultingRepository.removeById(UUID.fromString(request.getConsultingId()));
+        return ResponseEntity.ok().body(new ConsultingCancleResponse("ok"));
     }
 }