From 594d073cfcbc9f338f3c448de5003f3f19a1f567 Mon Sep 17 00:00:00 2001 From: unanchoi Date: Wed, 10 Jan 2024 02:14:51 +0900 Subject: [PATCH] =?UTF-8?q?[REFACTOR]=20Controller,=20Entity=20=EB=A6=AC?= =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApplicationApi.java | 41 +++++++++++++++++++ .../controller/ApplicationController.java | 25 +++++------ .../controller/HomeController.java | 12 ------ .../controller/InterviewApi.java | 23 +++++++++++ .../controller/InterviewController.java | 10 +---- .../controller/InterviewFileUploadApi.java | 16 ++++++++ .../InterviewFileUploadController.java | 4 -- .../startlionserver/controller/PartApi.java | 25 +++++++++++ .../controller/PartController.java | 22 +++------- .../startlionserver/controller/UserApi.java | 15 +++++++ .../controller/UserController.java | 10 +---- .../startlionserver/domain/PathType.java | 4 +- .../startlionserver/domain/entity/Answer.java | 9 ---- .../domain/entity/Application.java | 6 +-- .../domain/entity/CommonQuestion.java | 1 - .../domain/entity/Curriculum.java | 1 - .../domain/entity/Interview.java | 2 - .../domain/entity/InterviewContent.java | 2 - .../domain/entity/InterviewTime.java | 4 +- .../startlionserver/domain/entity/Part.java | 2 +- .../domain/entity/PartQuestion.java | 4 +- .../domain/entity/PathToKnow.java | 10 +---- .../startlionserver/domain/entity/User.java | 3 -- src/main/resources/application-local.yaml | 5 ++- 24 files changed, 155 insertions(+), 101 deletions(-) create mode 100644 src/main/java/com/startlion/startlionserver/controller/ApplicationApi.java delete mode 100644 src/main/java/com/startlion/startlionserver/controller/HomeController.java create mode 100644 src/main/java/com/startlion/startlionserver/controller/InterviewApi.java create mode 100644 src/main/java/com/startlion/startlionserver/controller/InterviewFileUploadApi.java create mode 100644 src/main/java/com/startlion/startlionserver/controller/PartApi.java create mode 100644 src/main/java/com/startlion/startlionserver/controller/UserApi.java diff --git a/src/main/java/com/startlion/startlionserver/controller/ApplicationApi.java b/src/main/java/com/startlion/startlionserver/controller/ApplicationApi.java new file mode 100644 index 0000000..92efa1d --- /dev/null +++ b/src/main/java/com/startlion/startlionserver/controller/ApplicationApi.java @@ -0,0 +1,41 @@ +package com.startlion.startlionserver.controller; + +import com.startlion.startlionserver.dto.request.application.ApplicationPage1PutRequest; +import com.startlion.startlionserver.dto.request.application.ApplicationPage2PutRequest; +import com.startlion.startlionserver.dto.request.application.ApplicationPage3PutRequest; +import com.startlion.startlionserver.dto.request.application.ApplicationPage4PutRequest; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +import java.security.Principal; + +@Tag(name = "[Application] 지원서 관련 API") +public interface ApplicationApi { + + @Operation(summary = "지원서 정보 가져오기 (저장된 지원서가 없을 시(applicationId = 0), 지원서 1페이지 질문 가져오기)") + Object getApplication( + @PathVariable(required = false) Long applicationId, + @RequestParam(required = false) Integer page, + Principal principal); + + @Operation(summary = "지원서 저장하기 1페이지 -> GET application/으로 접근했을 때 사용") + ResponseEntity postApplicationPage1(@RequestBody ApplicationPage1PutRequest request, Principal principal); + + @Operation(summary = "지원서 저장하기 1페이지 -> GET application/{applicationId}으로 접근했을 때 사용") + ResponseEntity updateApplicationPage1(@PathVariable @Parameter(description = "지원서 ID") Long applicationId, @RequestBody ApplicationPage1PutRequest request, Principal principal); + + @Operation(summary = "지원서 저장하기 2페이지") + ResponseEntity updateApplicationPage2(@PathVariable @Parameter(description = "지원서 ID") Long applicationId, @RequestBody ApplicationPage2PutRequest request, Principal principal); + + @Operation(summary = "지원서 저장하기 3페이지") + ResponseEntity updateApplicationPage3(@PathVariable @Parameter(description = "지원서 ID") Long applicationId, @RequestBody ApplicationPage3PutRequest request, Principal principal); + + @Operation(summary = "지원서 저장하기 4페이지 -> 제출") + ResponseEntity updateApplicationPage4(@PathVariable @Parameter(description = "지원서 ID") Long applicationId, @RequestBody ApplicationPage4PutRequest request, Principal principal); + +} diff --git a/src/main/java/com/startlion/startlionserver/controller/ApplicationController.java b/src/main/java/com/startlion/startlionserver/controller/ApplicationController.java index 6cf59f5..1d425e6 100644 --- a/src/main/java/com/startlion/startlionserver/controller/ApplicationController.java +++ b/src/main/java/com/startlion/startlionserver/controller/ApplicationController.java @@ -1,16 +1,15 @@ package com.startlion.startlionserver.controller; -import com.startlion.startlionserver.dto.request.application.*; -import com.startlion.startlionserver.dto.response.application.ApplicationPage1GetResponse; +import com.startlion.startlionserver.dto.request.application.ApplicationPage1PutRequest; +import com.startlion.startlionserver.dto.request.application.ApplicationPage2PutRequest; +import com.startlion.startlionserver.dto.request.application.ApplicationPage3PutRequest; +import com.startlion.startlionserver.dto.request.application.ApplicationPage4PutRequest; import com.startlion.startlionserver.service.ApplicationService; import com.startlion.startlionserver.util.UserUtil; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import java.net.URI; @@ -19,15 +18,14 @@ @RestController @RequestMapping(value = "/application") @RequiredArgsConstructor -@Tag(name = "[Application] 지원서 관련 API") -public class ApplicationController { +public class ApplicationController implements ApplicationApi { private final ApplicationService applicationService; @Value("${global.generation}") Long generation; - @Operation(summary = "지원서 정보 가져오기 (저장된 지원서가 없을 시(applicationId = 0), 지원서 1페이지 질문 가져오기)") + @Override @GetMapping("/{applicationId}") public Object getApplication( @PathVariable(required = false) Long applicationId, @@ -42,8 +40,7 @@ public Object getApplication( // 지원서 저장하기의 경우 받아야 하는 Body 정보가 다르기 때문에, 4개의 API로 나누었습니다. // 지원서 저장하기 1페이지 - - @Operation(summary = "지원서 저장하기 1페이지 -> GET application/으로 접근했을 때 사용") + @Override @PostMapping public ResponseEntity postApplicationPage1(@RequestBody ApplicationPage1PutRequest request, Principal principal){ Long applicationId = applicationService.createApplicationPage1(request, generation, UserUtil.getUserId(principal)); @@ -51,7 +48,7 @@ public ResponseEntity postApplicationPage1(@RequestBody ApplicationPage1 return ResponseEntity.created(uri).body("Application ID: " + applicationId); } - @Operation(summary = "지원서 저장하기 1페이지 -> GET application/{applicationId}으로 접근했을 때 사용") + @Override @PutMapping("/{applicationId}/page1") public ResponseEntity updateApplicationPage1(@PathVariable @Parameter(description = "지원서 ID") Long applicationId, @RequestBody ApplicationPage1PutRequest request, Principal principal){ URI uri = URI.create("/application/" + applicationService.updateApplicationPage1(applicationId, request, generation, UserUtil.getUserId(principal))); @@ -59,7 +56,7 @@ public ResponseEntity updateApplicationPage1(@PathVariable @Parameter(de } // 지원서 저장하기 2페이지 - @Operation(summary = "지원서 저장하기 2페이지") + @Override @PutMapping("/{applicationId}/page2") public ResponseEntity updateApplicationPage2(@PathVariable @Parameter(description = "지원서 ID") Long applicationId, @RequestBody ApplicationPage2PutRequest request, Principal principal){ URI uri = URI.create("/application/" + applicationService.updateApplicationPage2(applicationId, request, UserUtil.getUserId(principal))); @@ -67,7 +64,7 @@ public ResponseEntity updateApplicationPage2(@PathVariable @Parameter(de } // 지원서 저장하기 3페이지 - @Operation(summary = "지원서 저장하기 3페이지") + @Override @PutMapping("/{applicationId}/page3") public ResponseEntity updateApplicationPage3(@PathVariable @Parameter(description = "지원서 ID") Long applicationId, @RequestBody ApplicationPage3PutRequest request, Principal principal){ URI uri = URI.create("/application/" + applicationService.updateApplicationPage3(applicationId, request, UserUtil.getUserId(principal))); @@ -75,7 +72,7 @@ public ResponseEntity updateApplicationPage3(@PathVariable @Parameter(de } // 지원서 저장하기 4페이지 -> 제출 - @Operation(summary = "지원서 저장하기 4페이지 -> 제출") + @Override @PutMapping("/{applicationId}/page4") public ResponseEntity updateApplicationPage4(@PathVariable @Parameter(description = "지원서 ID") Long applicationId, @RequestBody ApplicationPage4PutRequest request, Principal principal){ URI uri = URI.create("/application/" + applicationService.updateApplicationPage4(applicationId, request, UserUtil.getUserId(principal))); diff --git a/src/main/java/com/startlion/startlionserver/controller/HomeController.java b/src/main/java/com/startlion/startlionserver/controller/HomeController.java deleted file mode 100644 index 698d2f2..0000000 --- a/src/main/java/com/startlion/startlionserver/controller/HomeController.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.startlion.startlionserver.controller; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/") -public class HomeController { - @GetMapping - public void home(){} -} diff --git a/src/main/java/com/startlion/startlionserver/controller/InterviewApi.java b/src/main/java/com/startlion/startlionserver/controller/InterviewApi.java new file mode 100644 index 0000000..a99a086 --- /dev/null +++ b/src/main/java/com/startlion/startlionserver/controller/InterviewApi.java @@ -0,0 +1,23 @@ +package com.startlion.startlionserver.controller; + + +import com.startlion.startlionserver.dto.response.interview.InterviewDetailResponse; +import com.startlion.startlionserver.dto.response.interview.InterviewResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +@Tag(name = "[Interview] 인터뷰 관련 API") +public interface InterviewApi { + + @Operation(summary = "interview 정보 조회") + ResponseEntity> getInterviews(@RequestParam(required = false) String part); + + @Operation(summary = "interviewId로 interview 정보 조회") + ResponseEntity getInterviewById(@PathVariable Long interviewId); + +} diff --git a/src/main/java/com/startlion/startlionserver/controller/InterviewController.java b/src/main/java/com/startlion/startlionserver/controller/InterviewController.java index c3354a4..2f30d49 100644 --- a/src/main/java/com/startlion/startlionserver/controller/InterviewController.java +++ b/src/main/java/com/startlion/startlionserver/controller/InterviewController.java @@ -4,8 +4,6 @@ import com.startlion.startlionserver.dto.response.interview.InterviewDetailResponse; import com.startlion.startlionserver.dto.response.interview.InterviewResponse; import com.startlion.startlionserver.service.InterviewService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.val; import org.springframework.http.ResponseEntity; @@ -15,21 +13,17 @@ @RestController @RequiredArgsConstructor -@RequestMapping("api/interviews") -@Tag(name = "[Interview] 인터뷰 관련 API") -public class InterviewController { +@RequestMapping("/api/interviews") +public class InterviewController implements InterviewApi { private final InterviewService interviewService; - - @Operation(summary = "interview 정보 조회") @GetMapping public ResponseEntity> getInterviews(@RequestParam(required = false) String part) { val response = interviewService.getInterviews(part); return ResponseEntity.ok(response); } - @Operation(summary = "interviewId로 interview 정보 조회") @GetMapping("/{interviewId}") public ResponseEntity getInterviewById(@PathVariable Long interviewId) { val response = interviewService.getInterviewById(interviewId); diff --git a/src/main/java/com/startlion/startlionserver/controller/InterviewFileUploadApi.java b/src/main/java/com/startlion/startlionserver/controller/InterviewFileUploadApi.java new file mode 100644 index 0000000..8097532 --- /dev/null +++ b/src/main/java/com/startlion/startlionserver/controller/InterviewFileUploadApi.java @@ -0,0 +1,16 @@ +package com.startlion.startlionserver.controller; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.multipart.MultipartFile; + + +@Tag(name = "[Interview] 인터뷰 파일 업로드 관련 API") +public interface InterviewFileUploadApi { + + @Operation(summary = "파일 업로드") + ResponseEntity uploadFile(@RequestPart MultipartFile file, @PathVariable Long interviewId); +} diff --git a/src/main/java/com/startlion/startlionserver/controller/InterviewFileUploadController.java b/src/main/java/com/startlion/startlionserver/controller/InterviewFileUploadController.java index 548a556..bdcd8c0 100644 --- a/src/main/java/com/startlion/startlionserver/controller/InterviewFileUploadController.java +++ b/src/main/java/com/startlion/startlionserver/controller/InterviewFileUploadController.java @@ -1,8 +1,6 @@ package com.startlion.startlionserver.controller; import com.startlion.startlionserver.service.InterviewFileUploadService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -11,12 +9,10 @@ @RestController @RequestMapping("api/interviews") @RequiredArgsConstructor -@Tag(name = "[Interview] 인터뷰 파일 업로드 관련 API") public class InterviewFileUploadController { private final InterviewFileUploadService interviewFileUploadService; - @Operation(summary = "파일 업로드") @PostMapping("{interviewId}/file") public ResponseEntity uploadFile(@RequestPart MultipartFile file, @PathVariable Long interviewId) { interviewFileUploadService.uploadFile(file, interviewId); diff --git a/src/main/java/com/startlion/startlionserver/controller/PartApi.java b/src/main/java/com/startlion/startlionserver/controller/PartApi.java new file mode 100644 index 0000000..90237fc --- /dev/null +++ b/src/main/java/com/startlion/startlionserver/controller/PartApi.java @@ -0,0 +1,25 @@ +package com.startlion.startlionserver.controller; + +import com.startlion.startlionserver.dto.response.part.PartResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PathVariable; + +@Tag(name = "[Part] 파트 관련 API") +public interface PartApi { + + @Operation(summary = "part 정보 조회") + @ApiResponses( + value = { + @ApiResponse(responseCode = "200", description = "성공"), + @ApiResponse(responseCode = "404", description = "찾을 수 없음"), + @ApiResponse(responseCode = "500", description = "서버 오류") + } + ) + ResponseEntity getPart(@PathVariable String name); + + +} diff --git a/src/main/java/com/startlion/startlionserver/controller/PartController.java b/src/main/java/com/startlion/startlionserver/controller/PartController.java index 861dd7e..2d9b955 100644 --- a/src/main/java/com/startlion/startlionserver/controller/PartController.java +++ b/src/main/java/com/startlion/startlionserver/controller/PartController.java @@ -2,31 +2,21 @@ import com.startlion.startlionserver.dto.response.part.PartResponse; import com.startlion.startlionserver.service.PartService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.responses.ApiResponses; -import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.val; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor @RequestMapping("/api/parts") -@Tag(name = "[Part] 파트 관련 API") -public class PartController { +public class PartController implements PartApi { private final PartService partService; - - @Operation(summary = "part 정보 조회") - @ApiResponses( - value = { - @ApiResponse(responseCode = "200", description = "성공"), - @ApiResponse(responseCode = "404", description = "찾을 수 없음"), - @ApiResponse(responseCode = "500", description = "서버 오류") - } - ) + @Override @GetMapping("/{name}") public ResponseEntity getPart(@PathVariable String name) { val response = partService.getPartByName(name); diff --git a/src/main/java/com/startlion/startlionserver/controller/UserApi.java b/src/main/java/com/startlion/startlionserver/controller/UserApi.java new file mode 100644 index 0000000..0609596 --- /dev/null +++ b/src/main/java/com/startlion/startlionserver/controller/UserApi.java @@ -0,0 +1,15 @@ +package com.startlion.startlionserver.controller; + +import com.startlion.startlionserver.dto.response.application.ApplicationListWithSubmittedResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.http.ResponseEntity; + +import java.security.Principal; + +@Tag(name = "[User] 유저 관련 API") +public interface UserApi { + + @Operation(summary = "내 정보 조회") + ResponseEntity getApplicationList(Principal principal); +} diff --git a/src/main/java/com/startlion/startlionserver/controller/UserController.java b/src/main/java/com/startlion/startlionserver/controller/UserController.java index b279fc8..d602e84 100644 --- a/src/main/java/com/startlion/startlionserver/controller/UserController.java +++ b/src/main/java/com/startlion/startlionserver/controller/UserController.java @@ -3,28 +3,22 @@ import com.startlion.startlionserver.dto.response.application.ApplicationListWithSubmittedResponse; import com.startlion.startlionserver.service.UserService; import com.startlion.startlionserver.util.UserUtil; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.val; -import org.aspectj.weaver.MemberUtils; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.security.Principal; @RestController -@RequestMapping("api/users") +@RequestMapping("/api/users") @RequiredArgsConstructor -@Tag(name = "[User] 유저 관련 API") -public class UserController { +public class UserController implements UserApi { private final UserService userService; - @Operation(summary = "내 정보 조회") @GetMapping("/me") public ResponseEntity getApplicationList( Principal principal) { diff --git a/src/main/java/com/startlion/startlionserver/domain/PathType.java b/src/main/java/com/startlion/startlionserver/domain/PathType.java index ef8baed..dc2f341 100644 --- a/src/main/java/com/startlion/startlionserver/domain/PathType.java +++ b/src/main/java/com/startlion/startlionserver/domain/PathType.java @@ -1,2 +1,4 @@ -package com.startlion.startlionserver.domain;public enum PathType { +package com.startlion.startlionserver.domain; + +public enum PathType { } diff --git a/src/main/java/com/startlion/startlionserver/domain/entity/Answer.java b/src/main/java/com/startlion/startlionserver/domain/entity/Answer.java index 347f3b0..8d1d2e8 100644 --- a/src/main/java/com/startlion/startlionserver/domain/entity/Answer.java +++ b/src/main/java/com/startlion/startlionserver/domain/entity/Answer.java @@ -23,39 +23,30 @@ public class Answer { @JoinColumn(name = "application_id") private Application application; - @Column(length = 500) @ColumnDefault("''") private String commonAnswer1; - @Column(length = 500) @ColumnDefault("''") private String commonAnswer2; - @Column(length = 500) @ColumnDefault("''") private String commonAnswer3; - @Column(length = 500) @ColumnDefault("''") private String commonAnswer4; - @Column(length = 500) @ColumnDefault("''") private String commonAnswer5; - @Column(length = 500) @ColumnDefault("''") private String partAnswer1; - @Column(length = 500) @ColumnDefault("''") private String partAnswer2; - @Column(length = 500) @ColumnDefault("''") private String partAnswer3; - @Column(length = 500) @ColumnDefault("''") private String partAnswer4; diff --git a/src/main/java/com/startlion/startlionserver/domain/entity/Application.java b/src/main/java/com/startlion/startlionserver/domain/entity/Application.java index 8a8780d..5e252d1 100644 --- a/src/main/java/com/startlion/startlionserver/domain/entity/Application.java +++ b/src/main/java/com/startlion/startlionserver/domain/entity/Application.java @@ -14,14 +14,11 @@ import java.util.stream.Collectors; @Entity -@NoArgsConstructor(access = AccessLevel.PROTECTED) -@Getter -@Table +@NoArgsConstructor(access = AccessLevel.PROTECTED) @Getter public class Application extends BaseTimeEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(nullable = false) private Long applicationId; @OneToOne(mappedBy = "application") @@ -73,7 +70,6 @@ public class Application extends BaseTimeEntity { @JsonIgnore // 무한 참조 에러 방지 private List pathToKnows = new ArrayList<>(); - @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "part_id") @JsonIgnore // 무한 참조 에러 방지 diff --git a/src/main/java/com/startlion/startlionserver/domain/entity/CommonQuestion.java b/src/main/java/com/startlion/startlionserver/domain/entity/CommonQuestion.java index 58faeb3..ece9645 100644 --- a/src/main/java/com/startlion/startlionserver/domain/entity/CommonQuestion.java +++ b/src/main/java/com/startlion/startlionserver/domain/entity/CommonQuestion.java @@ -8,7 +8,6 @@ @Entity @NoArgsConstructor(access = AccessLevel.PROTECTED) @Getter -@Table public class CommonQuestion { @Id diff --git a/src/main/java/com/startlion/startlionserver/domain/entity/Curriculum.java b/src/main/java/com/startlion/startlionserver/domain/entity/Curriculum.java index 7e7501c..f966285 100644 --- a/src/main/java/com/startlion/startlionserver/domain/entity/Curriculum.java +++ b/src/main/java/com/startlion/startlionserver/domain/entity/Curriculum.java @@ -8,7 +8,6 @@ @Entity @NoArgsConstructor(access = AccessLevel.PROTECTED) @Getter -@Table public class Curriculum { @Id diff --git a/src/main/java/com/startlion/startlionserver/domain/entity/Interview.java b/src/main/java/com/startlion/startlionserver/domain/entity/Interview.java index 36f0428..0519339 100644 --- a/src/main/java/com/startlion/startlionserver/domain/entity/Interview.java +++ b/src/main/java/com/startlion/startlionserver/domain/entity/Interview.java @@ -8,12 +8,10 @@ @Entity @NoArgsConstructor(access = AccessLevel.PROTECTED) @Getter -@Table public class Interview { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(nullable = false) private Long interviewId; @Column(length = 100) diff --git a/src/main/java/com/startlion/startlionserver/domain/entity/InterviewContent.java b/src/main/java/com/startlion/startlionserver/domain/entity/InterviewContent.java index 2468f04..a58f670 100644 --- a/src/main/java/com/startlion/startlionserver/domain/entity/InterviewContent.java +++ b/src/main/java/com/startlion/startlionserver/domain/entity/InterviewContent.java @@ -8,12 +8,10 @@ @Entity @NoArgsConstructor(access = AccessLevel.PROTECTED) @Getter -@Table public class InterviewContent { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(nullable = false) private Long interviewAnswerId; @ManyToOne(fetch = FetchType.LAZY) diff --git a/src/main/java/com/startlion/startlionserver/domain/entity/InterviewTime.java b/src/main/java/com/startlion/startlionserver/domain/entity/InterviewTime.java index 6130b05..ee4b4be 100644 --- a/src/main/java/com/startlion/startlionserver/domain/entity/InterviewTime.java +++ b/src/main/java/com/startlion/startlionserver/domain/entity/InterviewTime.java @@ -1,15 +1,15 @@ package com.startlion.startlionserver.domain.entity; import jakarta.persistence.*; +import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; import java.util.List; @Entity -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) @Getter -@Table public class InterviewTime { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/src/main/java/com/startlion/startlionserver/domain/entity/Part.java b/src/main/java/com/startlion/startlionserver/domain/entity/Part.java index 75fe4c3..5d96d6d 100644 --- a/src/main/java/com/startlion/startlionserver/domain/entity/Part.java +++ b/src/main/java/com/startlion/startlionserver/domain/entity/Part.java @@ -35,7 +35,7 @@ public class Part { @Column(length = 200) private String typeOfTalent; - @Column(length = 500) // 이미지 URL 저장 필드 추가 + @Column(columnDefinition = "TEXT") private String imageUrl; @Column(nullable = false) diff --git a/src/main/java/com/startlion/startlionserver/domain/entity/PartQuestion.java b/src/main/java/com/startlion/startlionserver/domain/entity/PartQuestion.java index d9b05ca..fa96a29 100644 --- a/src/main/java/com/startlion/startlionserver/domain/entity/PartQuestion.java +++ b/src/main/java/com/startlion/startlionserver/domain/entity/PartQuestion.java @@ -8,12 +8,10 @@ @Entity @NoArgsConstructor(access = AccessLevel.PROTECTED) @Getter -@Table public class PartQuestion { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(nullable = false) private Long questionId; @ManyToOne(fetch = FetchType.LAZY) @@ -34,4 +32,4 @@ public class PartQuestion { @Column(length = 100) private String partQuestion4; -} +} \ No newline at end of file diff --git a/src/main/java/com/startlion/startlionserver/domain/entity/PathToKnow.java b/src/main/java/com/startlion/startlionserver/domain/entity/PathToKnow.java index 9faaa0c..fda6ed9 100644 --- a/src/main/java/com/startlion/startlionserver/domain/entity/PathToKnow.java +++ b/src/main/java/com/startlion/startlionserver/domain/entity/PathToKnow.java @@ -1,20 +1,14 @@ package com.startlion.startlionserver.domain.entity; import jakarta.persistence.*; +import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; -import lombok.Setter; import net.minidev.json.annotate.JsonIgnore; -import org.hibernate.annotations.ColumnDefault; - -import java.util.ArrayList; -import java.util.List; @Entity @Getter -@Table -@Setter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class PathToKnow { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/src/main/java/com/startlion/startlionserver/domain/entity/User.java b/src/main/java/com/startlion/startlionserver/domain/entity/User.java index 67632fe..84a06ae 100644 --- a/src/main/java/com/startlion/startlionserver/domain/entity/User.java +++ b/src/main/java/com/startlion/startlionserver/domain/entity/User.java @@ -2,7 +2,6 @@ import com.startlion.startlionserver.domain.BaseTimeEntity; import jakarta.persistence.*; -import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; @@ -17,7 +16,6 @@ public class User extends BaseTimeEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "user_id", nullable = false) private Long userId; @Column(unique = true, length = 100) @@ -32,7 +30,6 @@ public class User extends BaseTimeEntity { private String imageUrl; - @Column(length = 1024) private String refreshToken; private LocalDateTime expiredIn; diff --git a/src/main/resources/application-local.yaml b/src/main/resources/application-local.yaml index fe3ca5d..beb1f06 100644 --- a/src/main/resources/application-local.yaml +++ b/src/main/resources/application-local.yaml @@ -56,4 +56,7 @@ springdoc: api-docs: path: /api-docs/json groups: - enabled: true \ No newline at end of file + enabled: true + +global: + generation: 12 \ No newline at end of file