[FEAT] User 관련 API 구현 완료

src/docs/asciidoc/department.adoc

@@ -0,0 +1,9 @@
+== 학과 API
+:source-highlighter: highlightjs
+
+---
+
+=== 학과 리스트 조회 (GET /departments)
+====
+operation::department-controller-test/get-departments[snippets="http-request,http-response,response-fields"]
+====

src/docs/asciidoc/index.adoc

@@ -21,4 +21,6 @@ include::application.adoc[]
 include::inquiry.adoc[]
 include::project.adoc[]
 include::aihub-controller-test.adoc[]
-include::jobInfo-controller-test.adoc[]
+include::jobInfo-controller-test.adoc[]
+include::user.adoc[]
+include::department.adoc[]

src/docs/asciidoc/user.adoc

@@ -0,0 +1,44 @@
+== 유저 API
+:source-highlighter: highlightjs
+
+---
+
+=== 로그인 유저 기본 정보 조회 (GET /users/me)
+====
+operation::user-controller-test/get-me[snippets="http-request,http-response,response-fields"]
+====
+
+=== 로그인 유저 기본 정보 수정 (PUT /users/me)
+====
+operation::user-controller-test/update-me[snippets="http-request,request-fields,http-response,response-fields"]
+====
+
+=== 유저 탈퇴 (DELETE /users/me)
+====
+operation::user-controller-test/delete-me[snippets="http-request,http-response"]
+====
+
+=== 유저 관심 프로젝트 리스트 조회 (GET /users/favorites/projects)
+====
+operation::user-controller-test/get-user-favorite-projects[snippets="http-request,http-response,response-fields"]
+====
+
+=== 유저 관심 대담영상 리스트 조회 (GET /users/favorites/talks)
+====
+operation::user-controller-test/get-user-favorite-talks[snippets="http-request,http-response,response-fields"]
+====
+
+=== 유저 관심 잡페어인터뷰영상 리스트 조회 (GET /users/favorites/jobInterviews)
+====
+operation::user-controller-test/get-user-favorite-interviews[snippets="http-request,http-response,response-fields"]
+====
+
+=== 유저 문의 리스트 조회 (GET /users/inquiries)
+====
+operation::user-controller-test/get-user-inquiries[snippets="http-request,http-response,response-fields"]
+====
+
+=== 유저 과제 제안 리스트 조회 (GET /users/proposals)
+====
+operation::user-controller-test/get-user-proposals[snippets="http-request,http-response,response-fields"]
+====

src/main/java/com/scg/stop/auth/service/AuthService.java

@@ -65,12 +65,14 @@ public RegisterResponse finishRegister(User user, RegisterRequest registerReques
                     user
                     , department);
             studentRepository.save(student);
+            user.updateStudentInfo(student);
         }
         else if (Arrays.asList(UserType.INACTIVE_PROFESSOR, UserType.INACTIVE_COMPANY)
                 .contains(registerRequest.getUserType())) {
             Application application = new Application(registerRequest.getDivision(), registerRequest.getPosition(),
                     user);
             applicationRepository.save(application);
+            user.updateApplication(application);
         }
         user.register(registerRequest.getName(),
                 registerRequest.getEmail(),

src/main/java/com/scg/stop/domain/proposal/domain/Proposal.java

@@ -54,5 +54,9 @@ public class Proposal extends BaseTimeEntity {
     private User user;
 
     @OneToOne(fetch = LAZY, mappedBy = "proposal")
-    private ProposalResponse proposalResponse;
+    private ProposalReply reply;
+
+    public void setUser(User user) {
+        this.user = user;
+    }
 }

src/main/java/com/scg/stop/domain/proposal/domain/ProposalResponse.java → src/main/java/com/scg/stop/domain/proposal/domain/ProposalReply.java

@@ -17,7 +17,7 @@
 @Entity
 @Getter
 @NoArgsConstructor(access = PROTECTED)
-public class ProposalResponse extends BaseTimeEntity {
+public class ProposalReply extends BaseTimeEntity {
 
     @Id
     @GeneratedValue(strategy = IDENTITY)

src/main/java/com/scg/stop/domain/proposal/repository/ProposalRepository.java

@@ -0,0 +1,11 @@
+package com.scg.stop.domain.proposal.repository;
+
+import com.scg.stop.domain.proposal.domain.Proposal;
+import com.scg.stop.user.domain.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+public interface ProposalRepository extends JpaRepository<Proposal, Long> {
+    List<Proposal> findByUser(User user);
+}

src/main/java/com/scg/stop/global/exception/ExceptionCode.java

@@ -35,6 +35,8 @@ public enum ExceptionCode {
     INVALID_USERTYPE(4005, "회원 가입 이용이 불가능한 회원 유형입니다."),
     NOT_FOUND_APPLICATION_ID(4010, "ID에 해당하는 인증 신청 정보가 존재하지 않습니다."),
     ALREADY_VERIFIED_USER(4011, "이미 인증 된 회원입니다."),
+    UNABLE_TO_EDIT_USER_TYPE(4100, "회원 유형은 수정할 수 없습니다."),
+    DIVISION_OR_POSITION_REQUIRED(4101, "소속 또는 직책의 형식이 잘못되었습니다."),
 
     // project domain
     NOT_FOUND_PROJECT(77000, "프로젝트를 찾을 수 없습니다."),

src/main/java/com/scg/stop/project/domain/Comment.java

@@ -39,4 +39,8 @@ public class Comment extends BaseTimeEntity {
     @ManyToOne(fetch = LAZY)
     @JoinColumn(name = "user_id")
     private User user;
+
+    public void setUser(User user) {
+        this.user = user;
+    }
 }

src/main/java/com/scg/stop/project/domain/Inquiry.java

@@ -33,7 +33,7 @@ public class Inquiry extends BaseTimeEntity {
     @JoinColumn(name = "user_id")
     private User user;
 
-    @OneToOne(fetch = LAZY, mappedBy = "inquiry", cascade = CascadeType.ALL, orphanRemoval = true)
+    @OneToOne(fetch = LAZY, mappedBy = "inquiry")
     private InquiryReply reply;
 
     private Inquiry(String title, String content, Project project, User user) {
@@ -55,4 +55,8 @@ public void updateInquiry(String title, String content) {
     public void deleteReply() {
         this.reply = null;
     }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
 }

src/main/java/com/scg/stop/project/domain/Likes.java

@@ -34,4 +34,8 @@ public class Likes extends BaseTimeEntity {
     @ManyToOne(fetch = LAZY)
     @JoinColumn(name = "user_id")
     private User user;
+
+    public void setUser(User user) {
+        this.user = user;
+    }
 }

src/main/java/com/scg/stop/project/repository/FavoriteProjectRepository.java

@@ -1,10 +1,18 @@
 package com.scg.stop.project.repository;
 
 import com.scg.stop.project.domain.FavoriteProject;
+import com.scg.stop.project.domain.Project;
+import com.scg.stop.user.domain.User;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface FavoriteProjectRepository extends JpaRepository<FavoriteProject, Long> {
     Optional<FavoriteProject> findByProjectIdAndUserId(Long projectId, Long userId);
+
+    @Query("SELECT f.project FROM FavoriteProject f WHERE f.user = :user")
+    List<Project> findAllByUser(@Param("user") User user);
 }

src/main/java/com/scg/stop/project/repository/InquiryRepository.java

@@ -1,13 +1,18 @@
 package com.scg.stop.project.repository;
 
 import com.scg.stop.project.domain.Inquiry;
+import com.scg.stop.user.domain.User;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import java.util.List;
+
 public interface InquiryRepository extends JpaRepository<Inquiry, Long> {
     @Query("SELECT i FROM Inquiry i WHERE :title IS NULL OR i.title LIKE %:title%")
     Page<Inquiry> findInquiries(@Param("title") String title, Pageable pageable);
+
+    List<Inquiry> findByUser(User user);
 }

src/main/java/com/scg/stop/user/controller/DepartmentController.java

@@ -0,0 +1,25 @@
+package com.scg.stop.user.controller;
+
+import com.scg.stop.user.dto.response.DepartmentResponse;
+import com.scg.stop.user.service.DepartmentService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/departments")
+public class DepartmentController {
+
+    private final DepartmentService departmentService;
+
+    @GetMapping
+    public ResponseEntity<List<DepartmentResponse>> getDepartments() {
+        List<DepartmentResponse> departments = departmentService.getDepartments();
+        return ResponseEntity.ok(departments);
+    }
+}

src/main/java/com/scg/stop/user/controller/UserController.java

@@ -0,0 +1,79 @@
+package com.scg.stop.user.controller;
+
+import com.scg.stop.auth.annotation.AuthUser;
+import com.scg.stop.project.dto.response.ProjectResponse;
+import com.scg.stop.user.domain.AccessType;
+import com.scg.stop.user.domain.User;
+import com.scg.stop.user.dto.request.UserUpdateRequest;
+import com.scg.stop.user.dto.response.FavoriteResponse;
+import com.scg.stop.user.dto.response.UserInquiryResponse;
+import com.scg.stop.user.dto.response.UserProposalResponse;
+import com.scg.stop.user.dto.response.UserResponse;
+import com.scg.stop.user.service.UserService;
+import com.scg.stop.video.dto.response.JobInterviewUserResponse;
+import com.scg.stop.video.dto.response.TalkUserResponse;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/users")
+public class UserController {
+
+    private final UserService userService;
+
+    @GetMapping("/me")
+    public ResponseEntity<UserResponse> getMe(@AuthUser(accessType = {AccessType.ALL}) User user) {
+        UserResponse userResponse = userService.getMe(user);
+        return ResponseEntity.ok(userResponse);
+    }
+
+    @PutMapping("/me")
+    public ResponseEntity<UserResponse> updateMe(
+            @AuthUser(accessType = {AccessType.ALL}) User user,
+            @RequestBody @Valid UserUpdateRequest request
+    ) {
+        UserResponse updatedUserResponse = userService.updateMe(user, request);
+        return ResponseEntity.ok(updatedUserResponse);
+    }
+
+    @DeleteMapping("/me")
+    public ResponseEntity<Void> deleteMe(@AuthUser(accessType = {AccessType.ALL}) User user) {
+        userService.deleteMe(user);
+        return ResponseEntity.noContent().build();
+    }
+
+    @GetMapping("/inquiries")
+    public ResponseEntity<List<UserInquiryResponse>> getUserInquiries(@AuthUser(accessType = {AccessType.ALL}) User user) {
+        List<UserInquiryResponse> inquiries = userService.getUserInquiries(user);
+        return ResponseEntity.ok(inquiries);
+    }
+
+    @GetMapping("/proposals")
+    public ResponseEntity<List<UserProposalResponse>> getUserProposals(@AuthUser(accessType = {AccessType.ALL}) User user) {
+        List<UserProposalResponse> proposals = userService.getUserProposals(user);
+        return ResponseEntity.ok(proposals);
+    }
+
+    @GetMapping("/favorites/projects")
+    public ResponseEntity<List<ProjectResponse>> getUserFavoriteProjects(@AuthUser(accessType = {AccessType.ALL}) User user) {
+        List<ProjectResponse> userFavoriteProjects = userService.getUserFavoriteProjects(user);
+        return ResponseEntity.ok(userFavoriteProjects);
+    }
+
+    @GetMapping("/favorites/talks")
+    public ResponseEntity<List<TalkUserResponse>> getUserFavoriteTalks(@AuthUser(accessType = {AccessType.ALL}) User user) {
+        List<TalkUserResponse> userFavoriteTalks = userService.getUserFavoriteTalks(user);
+        return ResponseEntity.ok(userFavoriteTalks);
+    }
+
+    @GetMapping("/favorites/jobInterviews")
+    public ResponseEntity<List<JobInterviewUserResponse>> getUserFavoriteInterviews(@AuthUser(accessType = {AccessType.ALL}) User user) {
+        List<JobInterviewUserResponse> userFavoriteInterviews = userService.getUserFavoriteInterviews(user);
+        return ResponseEntity.ok(userFavoriteInterviews);
+    }
+}

src/main/java/com/scg/stop/user/domain/Application.java

@@ -52,4 +52,12 @@ public void activate() {
     public void reject() {
         status = ApplicationStatus.REJECTED;
     }
+
+    public void updateDivision(String newDivision) {
+        this.division = newDivision;
+    }
+
+    public void updatePosition(String newPosition) {
+        this.position = newPosition;
+    }
 }

src/main/java/com/scg/stop/user/domain/Department.java

@@ -29,4 +29,8 @@ public class Department extends BaseTimeEntity {
 
     @OneToMany(fetch = LAZY, mappedBy = "department")
     private List<Student> students = new ArrayList<>();
+
+    public void updateName(String newName) {
+        this.name = newName;
+    }
 }

src/main/java/com/scg/stop/user/domain/FavoriteType.java

@@ -0,0 +1,7 @@
+package com.scg.stop.user.domain;
+
+public enum FavoriteType {
+    PROJECT, // 프로젝트
+    TALK, // 대담영상
+    JOBINTERVIEW // 잡페어영상
+}

src/main/java/com/scg/stop/user/domain/Student.java

@@ -50,4 +50,12 @@ public static Student of(String studentNumber, User user, Department department)
                 .department(department)
                 .build();
     }
+
+    public void updateStudentNumber(String newStudentNumber) {
+        this.studentNumber = newStudentNumber;
+    }
+
+    public void updateDepartment(Department newDepartment) {
+        this.department = newDepartment;
+    }
 }