Skip to content

Commit 25793f2

Browse files
authored
Merge pull request #245 from CEOS-Developers/dev
merge dev
2 parents 00b7b7b + 1a0bce1 commit 25793f2

46 files changed

Lines changed: 561 additions & 202 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,6 @@ out/
4444
application-secret.yml
4545

4646
###
47-
.env**
47+
.env**
48+
49+
AGENTS.md

src/main/java/ceos/backend/BackendApplication.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
import org.springframework.boot.autoconfigure.SpringBootApplication;
66
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
77
import org.springframework.scheduling.annotation.EnableAsync;
8+
import org.springframework.scheduling.annotation.EnableScheduling;
89

910
@SpringBootApplication
1011
@EnableAsync
12+
@EnableScheduling
1113
@EnableJpaAuditing
1214
public class BackendApplication {
1315

src/main/java/ceos/backend/domain/admin/AdminController.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ public void signUp(@RequestBody @Valid SignUpRequest signUpRequest) {
4141

4242
@Operation(summary = "로그인")
4343
@PostMapping("/signin")
44-
public TokenResponse signIn(HttpServletRequest request, @RequestBody @Valid SignInRequest signInRequest) {
44+
public TokenResponse signIn(
45+
HttpServletRequest request, @RequestBody @Valid SignInRequest signInRequest) {
4546
log.info("로그인");
4647
String device = request.getHeader("User-Agent").contains("mobile") ? MOBILE : WEB;
4748
return adminService.signIn(device, signInRequest);
@@ -72,7 +73,8 @@ public void resetPwd(
7273

7374
@Operation(summary = "로그아웃")
7475
@PostMapping("/logout")
75-
public void logout(HttpServletRequest request, @AuthenticationPrincipal AdminDetails adminUser) {
76+
public void logout(
77+
HttpServletRequest request, @AuthenticationPrincipal AdminDetails adminUser) {
7678
log.info("로그아웃");
7779
String device = request.getHeader("User-Agent").contains("mobile") ? MOBILE : WEB;
7880
adminService.logout(device, adminUser);

src/main/java/ceos/backend/domain/admin/service/AdminService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ public TokenResponse signIn(String device, SignInRequest signInRequest) {
6262

6363
// 토큰 발급
6464
final String accessToken = tokenProvider.createAccessToken(admin.getId(), authentication);
65-
final String refreshToken = tokenProvider.createRefreshToken(admin.getId(), authentication, redisKey);
65+
final String refreshToken =
66+
tokenProvider.createRefreshToken(admin.getId(), authentication, redisKey);
6667

6768
return adminMapper.toTokenResponse(accessToken, refreshToken);
6869
}

src/main/java/ceos/backend/domain/application/ApplicationController.java

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
package ceos.backend.domain.application;
32

43

@@ -38,13 +37,25 @@ public class ApplicationController {
3837
@Operation(summary = "지원자 목록 보기")
3938
@GetMapping
4039
public GetApplications getApplications(
41-
@Parameter(schema = @Schema(allowableValues = {"PRODUCT", "DESIGN", "FRONTEND", "BACKEND"}))
42-
@RequestParam(value = "part", required = false, defaultValue = "") Part part,
40+
@Parameter(
41+
schema =
42+
@Schema(
43+
allowableValues = {
44+
"PRODUCT",
45+
"DESIGN",
46+
"FRONTEND",
47+
"BACKEND"
48+
}))
49+
@RequestParam(value = "part", required = false, defaultValue = "")
50+
Part part,
4351
@Parameter(schema = @Schema(allowableValues = {"PASS", "FAIL"}))
44-
@RequestParam(value = "docPass", required = false, defaultValue = "") Pass docPass,
52+
@RequestParam(value = "docPass", required = false, defaultValue = "")
53+
Pass docPass,
4554
@Parameter(schema = @Schema(allowableValues = {"PASS", "FAIL"}))
46-
@RequestParam(value = "finalPass", required = false, defaultValue = "") Pass finalPass,
47-
@RequestParam(value = "applicantName", required = false, defaultValue = "") String applicantName,
55+
@RequestParam(value = "finalPass", required = false, defaultValue = "")
56+
Pass finalPass,
57+
@RequestParam(value = "applicantName", required = false, defaultValue = "")
58+
String applicantName,
4859
@RequestParam("pageNum") int pageNum,
4960
@RequestParam("limit") int limit) {
5061
log.info("지원자 목록 보기");
@@ -145,7 +156,8 @@ public void updateDocumentPassStatus(
145156

146157
@Operation(summary = "면접 참여 가능 여부 확인", description = "resultDateDoc ~ resultDateFinal 전날")
147158
@GetMapping(value = "/{applicationId}/interview/availability")
148-
public GetInterviewAvailability getInterviewAvailability(@PathVariable("applicationId") Long applicationId) {
159+
public GetInterviewAvailability getInterviewAvailability(
160+
@PathVariable("applicationId") Long applicationId) {
149161
log.info("면접 참여 가능 여부 확인");
150162
return applicationService.getInterviewAvailability(applicationId);
151163
}

src/main/java/ceos/backend/domain/application/domain/Application.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
import jakarta.persistence.*;
88
import jakarta.validation.constraints.NotNull;
99
import jakarta.validation.constraints.Size;
10+
import java.util.ArrayList;
11+
import java.util.List;
1012
import lombok.AccessLevel;
1113
import lombok.Builder;
1214
import lombok.Getter;
1315
import lombok.NoArgsConstructor;
1416
import org.hibernate.annotations.DynamicInsert;
1517

16-
import java.util.ArrayList;
17-
import java.util.List;
18-
1918
@DynamicInsert
2019
@Getter
2120
@NoArgsConstructor(access = AccessLevel.PROTECTED)

src/main/java/ceos/backend/domain/application/domain/AvailableCheck.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package ceos.backend.domain.application.domain;
22

3+
34
import com.fasterxml.jackson.annotation.JsonCreator;
45
import com.fasterxml.jackson.annotation.JsonValue;
6+
import java.util.stream.Stream;
57
import lombok.Getter;
68
import lombok.RequiredArgsConstructor;
79

8-
import java.util.stream.Stream;
9-
1010
@Getter
1111
@RequiredArgsConstructor
1212
public enum AvailableCheck {

src/main/java/ceos/backend/domain/application/dto/response/GetFinalAvailability.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package ceos.backend.domain.application.dto.response;
22

3+
34
import ceos.backend.domain.application.domain.Application;
45
import ceos.backend.domain.application.domain.AvailableCheck;
56
import lombok.Builder;
@@ -23,5 +24,4 @@ public static GetFinalAvailability of(Application application) {
2324
.reason(application.getFinalUnableReason())
2425
.build();
2526
}
26-
2727
}

src/main/java/ceos/backend/domain/application/dto/response/GetInterviewAvailability.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package ceos.backend.domain.application.dto.response;
22

3+
34
import ceos.backend.domain.application.domain.Application;
45
import ceos.backend.domain.application.domain.AvailableCheck;
56
import lombok.Builder;

src/main/java/ceos/backend/domain/application/exception/exceptions/NotDeletableDuringRecruitment.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package ceos.backend.domain.application.exception.exceptions;
22

3+
34
import ceos.backend.domain.application.exception.ApplicationErrorCode;
45
import ceos.backend.global.error.BaseErrorException;
56

67
public class NotDeletableDuringRecruitment extends BaseErrorException {
7-
public static final NotDeletableDuringRecruitment EXCEPTION = new NotDeletableDuringRecruitment();
8+
public static final NotDeletableDuringRecruitment EXCEPTION =
9+
new NotDeletableDuringRecruitment();
810

911
private NotDeletableDuringRecruitment() {
1012
super(ApplicationErrorCode.NOT_DELETABLE_DURING_RECRUITMENT);

0 commit comments

Comments
 (0)