Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ dependencies {//todo: 안쓰는 의존성이나 deprecated된 의존성 제거
implementation 'com.amazonaws:aws-java-sdk-s3:1.12.470'
implementation 'org.hibernate.validator:hibernate-validator:8.0.1.Final'
implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
testImplementation "org.mockito:mockito-core:3.3.3"
implementation 'org.apache.commons:commons-lang3:3.12.0'
testImplementation 'org.mockito:mockito-core:3.3.3'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'io.micrometer:micrometer-registry-prometheus'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@RequiredArgsConstructor
@RequestMapping("/application")
@RestController
public class ApplicationController implements ApplicationControllerSwagger {
public class ApplicationController {

private final ApplicationSubmissionService applicationSubmissionService;
private final ApplicationQueryService applicationQueryService;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,12 @@

import com.example.solidconnection.application.domain.Application;
import com.example.solidconnection.type.LanguageTestType;
import io.swagger.v3.oas.annotations.media.Schema;

@Schema(description = "지원자")
public record ApplicantResponse(
@Schema(description = "닉네임", example = "행복한 개발자")
String nicknameForApply,

@Schema(description = "GPA", example = "3.85")
double gpa,

@Schema(description = "어학 시험 유형", example = "TOEFL_IBT")
LanguageTestType testType,

@Schema(description = "어학 시험 점수", example = "110")
String testScore,

@Schema(description = "현재 사용자가 해당 지원지인지", example = "true")
boolean isMine) {

public static ApplicantResponse of(Application application, boolean isMine) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package com.example.solidconnection.application.dto;

import io.swagger.v3.oas.annotations.media.Schema;

@Schema(description = "지원 정보 제출 성공 여부")
public record ApplicationSubmissionResponse(
@Schema(description = "제출 성공 여부", example = "true")
boolean isSuccess) {
}
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
package com.example.solidconnection.application.dto;

import io.swagger.v3.oas.annotations.media.ArraySchema;
import io.swagger.v3.oas.annotations.media.Schema;

import java.util.List;

@Schema(description = "지망별 지원자 목록")
public record ApplicationsResponse(
@ArraySchema(arraySchema = @Schema(description = "1지망 대학에 지원한 지원자 목록"))
List<UniversityApplicantsResponse> firstChoice,

@ArraySchema(arraySchema = @Schema(description = "2지망 대학에 지원한 지원자 목록"))
List<UniversityApplicantsResponse> secondChoice,

@ArraySchema(arraySchema = @Schema(description = "3지망 대학에 지원한 지원자 목록"))
List<UniversityApplicantsResponse> thirdChoice) {
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
package com.example.solidconnection.application.dto;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;

@Schema(description = "지원서 제출")
public record ApplyRequest(
@NotNull(message = "gpa score id를 입력해주세요.")
@Schema(description = "지원하는 유저의 gpa score id", example = "1")
Long gpaScoreId,

@NotNull(message = "language test score id를 입력해주세요.")
@Schema(description = "지원하는 유저의 language test score id", example = "1")
Long languageTestScoreId,

UniversityChoiceRequest universityChoiceRequest
Expand Down
Original file line number Diff line number Diff line change
@@ -1,26 +1,14 @@
package com.example.solidconnection.application.dto;

import com.example.solidconnection.university.domain.UniversityInfoForApply;
import io.swagger.v3.oas.annotations.media.ArraySchema;
import io.swagger.v3.oas.annotations.media.Schema;

import java.util.List;

@Schema(description = "대학과 그 대학에 지원한 지원자 정보")
public record UniversityApplicantsResponse(
@Schema(description = "대학의 한국어 이름", example = "괌대학")
String koreanName,

@Schema(description = "선발 인원", example = "4")
int studentCapacity,

@Schema(description = "지역", example = "영미권")
String region,

@Schema(description = "국가", example = "미국")
String country,

@ArraySchema(schema = @Schema(description = "지원자 목록", implementation = ApplicantResponse.class))
List<ApplicantResponse> applicants) {

public static UniversityApplicantsResponse of(UniversityInfoForApply universityInfoForApply, List<ApplicantResponse> applicant) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
package com.example.solidconnection.application.dto;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;

@Schema(description = "지망 대학")
public record UniversityChoiceRequest(
@NotNull(message = "1지망 대학교를 입력해주세요.")
@Schema(description = "1지망 대학교의 지원 정보 ID", example = "1")
Long firstChoiceUniversityId,

@Schema(description = "2지망 대학교의 지원 정보 ID (선택사항)", example = "2", nullable = true)
Long secondChoiceUniversityId,

@Schema(description = "3지망 대학교의 지원 정보 ID (선택사항)", example = "3", nullable = true)
Long thirdChoiceUniversityId) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
@RequiredArgsConstructor
@RequestMapping("/auth")
@RestController
public class AuthController implements AuthControllerSwagger {
public class AuthController {

private final AuthService authService;
private final SignUpService signUpService;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package com.example.solidconnection.auth.dto;

import io.swagger.v3.oas.annotations.media.Schema;

@Schema(description = "토큰 재발급 응답")
public record ReissueResponse(
@Schema(description = "새로 발급된 액세스 토큰", example = "newAccessToken123")
String accessToken) {
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
package com.example.solidconnection.auth.dto;

import com.example.solidconnection.auth.dto.kakao.KakaoOauthResponse;
import io.swagger.v3.oas.annotations.media.Schema;

@Schema(description = "로그인 응답 데이터")
public record SignInResponse(
@Schema(description = "사용자 등록 여부", example = "true")
boolean isRegistered,

@Schema(description = "발급된 액세스 토큰", example = "accessTokenExample123")
String accessToken,

@Schema(description = "발급된 리프레시 토큰", example = "refreshTokenExample123")
String refreshToken) implements KakaoOauthResponse {
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,22 @@
import com.example.solidconnection.type.PreparationStatus;
import com.example.solidconnection.type.Role;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.ArraySchema;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;

import java.util.List;

@Schema(description = "회원가입 요청 데이터")
public record SignUpRequest(
@Schema(description = "카카오 인증 토큰", example = "kakaoToken123")
String kakaoOauthToken,

@ArraySchema(schema = @Schema(description = "관심 지역 목록", example = "아시아권"))
List<String> interestedRegions,

@ArraySchema(schema = @Schema(description = "관심 국가 목록", example = "일본"))
List<String> interestedCountries,

@Schema(description = "지원 준비 단계", example = "CONSIDERING")
PreparationStatus preparationStatus,
String profileImageUrl,
Gender gender,

@NotBlank(message = "닉네임을 입력해주세요.")
@Schema(description = "닉네임", example = "nickname123")
String nickname,

@Schema(description = "프로필 이미지 URL", example = "http://example.com/profile.jpg")
String profileImageUrl,

@Schema(description = "성별", example = "MALE")
Gender gender,

@JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "생년월일", example = "1999-01-01")
String birth) {

public SiteUser toSiteUser(String email, Role role) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
package com.example.solidconnection.auth.dto;

import io.swagger.v3.oas.annotations.media.Schema;

@Schema(description = "회원가입 후 응답 데이터")
public record SignUpResponse(
@Schema(description = "액세스 토큰", example = "accessTokenSignup123")
String accessToken,

@Schema(description = "리프레시 토큰", example = "refreshTokenSignup123")
String refreshToken) {
}
Loading