Merge pull request #21 from WE-ARE-RACCOONS/RAC-78

RAC-78 feat: 회원가입 및 로그인

src/main/java/com/postgraduate/domain/auth/presentation/AuthController.java

@@ -34,7 +34,7 @@ public class AuthController {
     public ResponseDto<?> getUserDetails(@RequestBody KakaoLoginRequest request) {
         AuthUserResponse authUser = kakaoSignInUseCase.getUser(request.getAccessToken());
         if (authUser.getSocialId() != null) {
-            return ResponseDto.create(NOT_FOUND.value(), NOT_REGISTERED_USER_MESSAGE.getMessage(), authUser);
+            return ResponseDto.create(OK.value(), NOT_REGISTERED_USER_MESSAGE.getMessage(), authUser);
         }
         JwtTokenResponse jwtToken = jwtUseCase.signIn(authUser.getUser());
         return ResponseDto.create(OK.value(), SUCCESS_AUTH_MESSAGE.getMessage(), jwtToken);

src/main/java/com/postgraduate/domain/mentoring/domain/entity/Mentoring.java

@@ -21,21 +21,30 @@ public class Mentoring {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long mentoringId;
+
     @ManyToOne
     private User user;
+
     @ManyToOne
     private Senior senior;
+
     @Column(nullable = false)
     private String topic;
+
     @Column(nullable = false)
     private String question;
+
     @Column(nullable = false)
     private String date;
+
     @Column(nullable = false)
     private int pay;
+
     @Enumerated(EnumType.STRING)
     private Status status;
+
     @CreationTimestamp
     private LocalDate createdAt;
+
     private LocalDate deletedAt;
 }

src/main/java/com/postgraduate/domain/payment/domain/entity/Payment.java

@@ -21,12 +21,17 @@ public class Payment {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long paymentId;
+
     @OneToOne
     private Mentoring mentoring;
+
     @CreationTimestamp
     private LocalDate createdAt;
+
     private LocalDate paidAt;
+
     private LocalDate deletedAt;
+
     @Enumerated(EnumType.STRING)
     @Column(nullable = false)
     @Builder.Default

src/main/java/com/postgraduate/domain/review/domain/entity/Review.java

@@ -21,17 +21,22 @@ public class Review {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long reviewId;
+
     @OneToOne
     private Mentoring mentoring;
+
     @Lob
     @Column(nullable = false)
     private String content;
+
     @Column(nullable = false)
     @Enumerated(EnumType.STRING)
     @Builder.Default
     private Status status = Status.REJECT;
+
     @CreationTimestamp
     private LocalDate createdAt;
+
     @UpdateTimestamp
     private LocalDate updatedAt;
     // 삭제가 추가된다면 삭제인지 아닌지 상태가 있어야하는데, 없어서 일단 뺌

src/main/java/com/postgraduate/domain/senior/application/dto/req/SeniorProfileRequest.java

@@ -0,0 +1,22 @@
+package com.postgraduate.domain.senior.application.dto.req;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public class SeniorProfileRequest {
+    @NotNull
+    private String info;
+    @NotNull
+    private String target;
+    @NotNull
+    private String chatLink;
+    @NotNull
+    private String time;
+    @NotNull
+    private int term;
+}

src/main/java/com/postgraduate/domain/senior/application/dto/req/SeniorSignUpRequest.java

@@ -0,0 +1,32 @@
+package com.postgraduate.domain.senior.application.dto.req;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public class SeniorSignUpRequest {
+    @NotNull
+    private String college;
+    @NotNull
+    private String major;
+    @NotNull
+    private String postgradu;
+    @NotNull
+    private String professor;
+    @NotNull
+    private String lab;
+    @NotNull
+    private String field;
+    @NotNull
+    private String certification;
+    @NotNull
+    private String account;
+    @NotNull
+    private String bank;
+    @NotNull
+    private String rrn;
+}

src/main/java/com/postgraduate/domain/senior/application/mapper/SeniorMapper.java

@@ -0,0 +1,24 @@
+package com.postgraduate.domain.senior.application.mapper;
+
+import com.postgraduate.domain.senior.application.dto.req.SeniorSignUpRequest;
+import com.postgraduate.domain.senior.domain.entity.Senior;
+import com.postgraduate.domain.user.domain.entity.User;
+
+public class SeniorMapper {
+
+    public static Senior mapToSenior(User user, SeniorSignUpRequest request) {
+        return Senior.builder()
+                .user(user)
+                .college(request.getCollege())
+                .major(request.getMajor())
+                .postgradu(request.getPostgradu())
+                .professor(request.getProfessor())
+                .lab(request.getLab())
+                .field(request.getField())
+                .certification(request.getCertification())
+                .account(request.getAccount())
+                .bank(request.getBank())
+                .rrn(request.getRrn())
+                .build();
+    }
+}

src/main/java/com/postgraduate/domain/senior/application/usecase/SeniorSignUpUseCase.java

@@ -0,0 +1,27 @@
+package com.postgraduate.domain.senior.application.usecase;
+
+import com.postgraduate.domain.senior.application.dto.req.SeniorSignUpRequest;
+import com.postgraduate.domain.senior.domain.service.SeniorSaveService;
+import com.postgraduate.domain.user.domain.entity.User;
+import com.postgraduate.domain.user.domain.entity.constant.Role;
+import com.postgraduate.domain.user.domain.service.UserUpdateService;
+import com.postgraduate.global.auth.AuthDetails;
+import com.postgraduate.global.config.security.util.SecurityUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class SeniorSignUpUseCase {
+    private final UserUpdateService userUpdateService;
+    private final SeniorSaveService seniorSaveService;
+    private final SecurityUtils securityUtils;
+
+    public void signUp(AuthDetails authDetails, SeniorSignUpRequest request) {
+        User user = securityUtils.getLoggedInUser(authDetails);
+        userUpdateService.updateRole(user.getUserId(), Role.SENIOR);
+        seniorSaveService.saveSenior(user, request);
+    }
+}

src/main/java/com/postgraduate/domain/senior/application/usecase/SeniorUpdateUseCase.java

@@ -0,0 +1,28 @@
+package com.postgraduate.domain.senior.application.usecase;
+
+import com.postgraduate.domain.senior.application.dto.req.SeniorProfileRequest;
+import com.postgraduate.domain.senior.domain.entity.Senior;
+import com.postgraduate.domain.senior.domain.service.SeniorGetService;
+import com.postgraduate.domain.senior.domain.service.SeniorSaveService;
+import com.postgraduate.domain.user.domain.entity.User;
+import com.postgraduate.domain.user.domain.service.UserGetService;
+import com.postgraduate.global.auth.AuthDetails;
+import com.postgraduate.global.config.security.util.SecurityUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class SeniorUpdateUseCase {
+    private final SeniorSaveService seniorSaveService;
+    private final SeniorGetService seniorGetService;
+    private final SecurityUtils securityUtils;
+
+    public void updateProfile(AuthDetails authDetails, SeniorProfileRequest request) {
+        User user = securityUtils.getLoggedInUser(authDetails);
+        Senior senior = seniorGetService.byUser(user);
+        seniorSaveService.saveSenior(senior, request);
+    }
+}

src/main/java/com/postgraduate/domain/senior/domain/entity/Senior.java

@@ -16,39 +16,60 @@ public class Senior {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long seniorId;
+
     @OneToOne
     private User user;
-    @Column(nullable = false)
-    private String name;
+
     @Column(nullable = false)
     private String college;
+
     @Column(nullable = false)
     private String major;
+
     @Column(nullable = false)
     private String postgradu;
+
     @Column(nullable = false)
     private String professor;
+
     @Column(nullable = false)
     private String lab;
+
     @Column(nullable = false)
     private String field;
-    @Column(nullable = false, length = 500)
+
     private String info;
-    @Column(nullable = false)
+
     private String target;
-    @Column(nullable = false)
+
     private String chatLink;
-    @Column(nullable = false)
+
     private String time;
-    @Column(nullable = false)
+
     private int term;
+
     @Column(nullable = false)
     private String account;
+
     @Column(nullable = false)
     private String bank;
+
     private String certification;
+
+    @Column(nullable = false)
+    private String rrn;
+
     @Column(nullable = false)
     private boolean status;
+
     @Column(nullable = false)
     private int hit;
+
+    public void updateProfile(String info, String target, String chatLink, String time, int term) {
+        this.info = info;
+        this.target = target;
+        this.chatLink = chatLink;
+        this.time = time;
+        this.term = term;
+    }
 }

src/main/java/com/postgraduate/domain/senior/domain/entity/repository/SeniorRepository.java

@@ -0,0 +1,11 @@
+package com.postgraduate.domain.senior.domain.entity.repository;
+
+import com.postgraduate.domain.senior.domain.entity.Senior;
+import com.postgraduate.domain.user.domain.entity.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+public interface SeniorRepository extends JpaRepository<Senior, Long> {
+    Optional<Senior> findByUser(User user);
+}

src/main/java/com/postgraduate/domain/senior/domain/service/SeniorGetService.java

@@ -0,0 +1,17 @@
+package com.postgraduate.domain.senior.domain.service;
+
+import com.postgraduate.domain.senior.domain.entity.Senior;
+import com.postgraduate.domain.senior.domain.entity.repository.SeniorRepository;
+import com.postgraduate.domain.user.domain.entity.User;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class SeniorGetService {
+    private final SeniorRepository seniorRepository;
+
+    public Senior byUser(User user) {
+        return seniorRepository.findByUser(user).orElseThrow(/**예외 처리**/);
+    }
+}

src/main/java/com/postgraduate/domain/senior/domain/service/SeniorSaveService.java

@@ -0,0 +1,26 @@
+package com.postgraduate.domain.senior.domain.service;
+
+import com.postgraduate.domain.senior.application.dto.req.SeniorProfileRequest;
+import com.postgraduate.domain.senior.application.dto.req.SeniorSignUpRequest;
+import com.postgraduate.domain.senior.application.mapper.SeniorMapper;
+import com.postgraduate.domain.senior.domain.entity.Senior;
+import com.postgraduate.domain.senior.domain.entity.repository.SeniorRepository;
+import com.postgraduate.domain.user.domain.entity.User;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class SeniorSaveService {
+    private final SeniorRepository seniorRepository;
+
+    public Senior saveSenior(User user, SeniorSignUpRequest request) {
+        Senior senior = SeniorMapper.mapToSenior(user, request);
+        return seniorRepository.save(senior);
+    }
+
+    public Senior saveSenior(Senior senior, SeniorProfileRequest request) {
+        senior.updateProfile(request.getInfo(), request.getTarget(), request.getChatLink(), request.getTime(), request.getTerm());
+        return seniorRepository.save(senior);
+    }
+}

src/main/java/com/postgraduate/domain/senior/presentation/SeniorController.java

@@ -0,0 +1,43 @@
+package com.postgraduate.domain.senior.presentation;
+
+import com.postgraduate.domain.senior.application.dto.req.SeniorProfileRequest;
+import com.postgraduate.domain.senior.application.dto.req.SeniorSignUpRequest;
+import com.postgraduate.domain.senior.application.usecase.SeniorSignUpUseCase;
+import com.postgraduate.domain.senior.application.usecase.SeniorUpdateUseCase;
+import com.postgraduate.global.auth.AuthDetails;
+import com.postgraduate.global.dto.ResponseDto;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+
+import static com.postgraduate.domain.senior.presentation.constant.SeniorResponseMessage.SUCCESS_SENIOR_SIGN_UP_MESSAGE;
+import static com.postgraduate.domain.senior.presentation.constant.SeniorResponseMessage.SUCCESS_UPDATE_PROFILE_MESSAGE;
+import static org.springframework.http.HttpStatus.OK;
+
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/senior")
+@Tag(name = "SENIOR Controller")
+public class SeniorController {
+    private final SeniorSignUpUseCase signUpUseCase;
+    private final SeniorUpdateUseCase updateUseCase;
+
+    @PostMapping("/signup")
+    @Operation(summary = "대학원생 가입", description = "대학원생 회원가입")
+    public ResponseDto singUpSenior(@AuthenticationPrincipal AuthDetails authDetails,
+                                       @RequestBody SeniorSignUpRequest request) {
+        signUpUseCase.signUp(authDetails, request);
+        return ResponseDto.create(OK.value(), SUCCESS_SENIOR_SIGN_UP_MESSAGE.getMessage());
+    }
+
+    @PatchMapping("/profile")
+    @Operation(summary = "대학원생 프로필 등록", description = "소개글, 추천대상, 오픈채팅방 링크, 가능 시간대, 소통시간")
+    public ResponseDto singUpSenior(@AuthenticationPrincipal AuthDetails authDetails,
+                                       @RequestBody SeniorProfileRequest request) {
+        updateUseCase.updateProfile(authDetails, request);
+        return ResponseDto.create(OK.value(), SUCCESS_UPDATE_PROFILE_MESSAGE.getMessage());
+    }
+}