Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7579ef2
refactor: 공식 프로젝트 조회 경로 및 응답 호환성 보완
jeong1112 Nov 16, 2026
136748a
refactor: 공식 홈페이지 조회 데이터 및 응답 계약 보완
jeong1112 Nov 16, 2026
dfb8f51
refactor: 모집 페이지 조회 경로 및 파트 소개 응답 수정
jeong1112 Nov 16, 2026
648a05b
refactor: 활동 후기 API 경로 및 등록 계약 정리
jeong1112 Nov 16, 2026
bd1d6a7
refactor: 홈페이지 후기 API 요청·응답 및 유형별 제한 정리
jeong1112 Nov 16, 2026
c4b229c
refactor : 솝트 스토리 API 엔드포인트 수정
jeong1112 Nov 16, 2026
bc86022
refactor : 알림 신청 API 엔드포인트 수정
jeong1112 Nov 16, 2026
80b9592
refactor : 방문자 API 엔드포인트 수정
jeong1112 Nov 16, 2026
37ea05a
refactor : 어드민 API 엔드포인트 및 로직 수정
jeong1112 Nov 16, 2026
f36c02c
refactor : 최신 소식 관리 API 엔드포인트 수정
jeong1112 Nov 16, 2026
aaccfa1
refactor : S3 업로드 API 엔드포인트 수정
jeong1112 Nov 16, 2026
d84e8b1
refactor : 솝트스토리 유효성 검사 레거시 로직에 동기화
jeong1112 Nov 16, 2026
b9db63f
refactor : S3 인증 범위 레거시와 동기화
jeong1112 Nov 16, 2026
e5bb80a
fix : ProjectControllerTest에서 생성자 인자 추가
jeong1112 Nov 16, 2026
0612ea9
fix: 모집 FAQ 및 초안 저장 호환성 보완
jeong1112 Nov 16, 2026
4b40dd0
fix: 신규 소식 저장 시 게시일 누락 수정
jeong1112 Nov 16, 2026
2a60768
fix: 솝트스토리 축약형 IPv6 검증 오류 수정
jeong1112 Nov 16, 2026
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
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ private void setSecuredHttp(final HttpSecurity http, final boolean includeSwagge
authorize
.requestMatchers(
"/api/v1/admin/**",
"/v2/admin",
"/v2/admin/**",
"/api/v1/auth/password",
"/api/v1/banners",
"/api/v1/banners/**",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,15 @@ private SecurityConstant() {}
"/api/v1/auth/login",
"/api/v1/auth/refresh",
"/api/v1/official",
"/v2/homepage",
"/v2/recruit",
"/v2/projects",
"/v2/reviews",
"/v2/homepage-reviews",
Comment thread
jeong1112 marked this conversation as resolved.
Resolved
"/v2/soptstory",
"/v2/s3",
"/v2/visitor",
"/v2/notification",
"/api/v1/social/accounts",
"/api/v1/popups",
"/api/v1/banners/images",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import static org.sopt.makers.api.controller.admin.official.AdminOfficialSuccessCode.SUCCESS_CONFIRM_RECRUIT;
import static org.sopt.makers.api.controller.admin.official.AdminOfficialSuccessCode.SUCCESS_GET_ADMIN_MAIN;

import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.sopt.makers.api.common.factory.ResponseFactory;
import org.sopt.makers.api.controller.admin.official.dto.AdminOfficialRequest;
Expand All @@ -26,7 +27,7 @@

@RestController
@RequiredArgsConstructor
@RequestMapping("/api/v1/admin/official")
@RequestMapping("/v2/admin")
public class AdminOfficialController implements AdminOfficialApi {

private final AdminOfficialFacade adminOfficialFacade;
Expand All @@ -43,7 +44,7 @@ public ResponseEntity<BaseResponse<?>> getAdminMain(
@Override
@PostMapping("/common")
public ResponseEntity<BaseResponse<?>> addCommonData(
@RequestBody AdminOfficialRequest.AddCommonRequest request) {
@Valid @RequestBody AdminOfficialRequest.AddCommonRequest request) {
return ResponseFactory.success(
SUCCESS_ADD_COMMON,
AdminOfficialResponse.AddCommonResponse.from(
Expand All @@ -53,7 +54,7 @@ public ResponseEntity<BaseResponse<?>> addCommonData(
@Override
@PostMapping("/common/confirm")
public ResponseEntity<BaseResponse<?>> confirmCommonData(
@RequestBody AdminOfficialRequest.ConfirmRequest request) {
@Valid @RequestBody AdminOfficialRequest.ConfirmRequest request) {
return ResponseFactory.success(
SUCCESS_CONFIRM_COMMON,
AdminOfficialResponse.ConfirmResponse.from(
Expand All @@ -63,7 +64,7 @@ public ResponseEntity<BaseResponse<?>> confirmCommonData(
@Override
@PostMapping("/home")
public ResponseEntity<BaseResponse<?>> addHomeData(
@RequestBody AdminOfficialRequest.AddHomeRequest request) {
@Valid @RequestBody AdminOfficialRequest.AddHomeRequest request) {
return ResponseFactory.success(
SUCCESS_ADD_HOME,
AdminOfficialResponse.AddHomeResponse.from(
Expand All @@ -73,7 +74,7 @@ public ResponseEntity<BaseResponse<?>> addHomeData(
@Override
@PostMapping("/home/confirm")
public ResponseEntity<BaseResponse<?>> confirmHomeData(
@RequestBody AdminOfficialRequest.ConfirmRequest request) {
@Valid @RequestBody AdminOfficialRequest.ConfirmRequest request) {
return ResponseFactory.success(
SUCCESS_CONFIRM_HOME,
AdminOfficialResponse.ConfirmResponse.from(
Expand All @@ -83,7 +84,7 @@ public ResponseEntity<BaseResponse<?>> confirmHomeData(
@Override
@PostMapping("/about")
public ResponseEntity<BaseResponse<?>> addAboutData(
@RequestBody AdminOfficialRequest.AddAboutRequest request) {
@Valid @RequestBody AdminOfficialRequest.AddAboutRequest request) {
return ResponseFactory.success(
SUCCESS_ADD_ABOUT,
AdminOfficialResponse.AddAboutResponse.from(
Expand All @@ -93,7 +94,7 @@ public ResponseEntity<BaseResponse<?>> addAboutData(
@Override
@PostMapping("/about/confirm")
public ResponseEntity<BaseResponse<?>> confirmAboutData(
@RequestBody AdminOfficialRequest.ConfirmRequest request) {
@Valid @RequestBody AdminOfficialRequest.ConfirmRequest request) {
return ResponseFactory.success(
SUCCESS_CONFIRM_ABOUT,
AdminOfficialResponse.ConfirmResponse.from(
Expand All @@ -103,7 +104,7 @@ public ResponseEntity<BaseResponse<?>> confirmAboutData(
@Override
@PostMapping("/recruit")
public ResponseEntity<BaseResponse<?>> addRecruitData(
@RequestBody AdminOfficialRequest.AddRecruitRequest request) {
@Valid @RequestBody AdminOfficialRequest.AddRecruitRequest request) {
return ResponseFactory.success(
SUCCESS_ADD_RECRUIT,
AdminOfficialResponse.AddRecruitResponse.from(
Expand All @@ -113,7 +114,7 @@ public ResponseEntity<BaseResponse<?>> addRecruitData(
@Override
@PostMapping("/recruit/confirm")
public ResponseEntity<BaseResponse<?>> confirmRecruitData(
@RequestBody AdminOfficialRequest.ConfirmRequest request) {
@Valid @RequestBody AdminOfficialRequest.ConfirmRequest request) {
return ResponseFactory.success(
SUCCESS_CONFIRM_RECRUIT,
AdminOfficialResponse.ConfirmResponse.from(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
package org.sopt.makers.api.controller.admin.official.dto;

import jakarta.validation.Valid;
import jakarta.validation.constraints.*;
import java.time.LocalDate;
import java.util.Arrays;
import java.util.List;
import org.sopt.makers.core.type.Part;
import org.sopt.makers.domain.official.admin.facade.AdminOfficialFacade;
import org.sopt.makers.domain.official.admin.port.AdminCachePort;
import org.sopt.makers.domain.official.faq.FaqCategory;
import org.sopt.makers.domain.official.homepage.review.HomepageReviewType;

public class AdminOfficialRequest {

public record AddCommonRequest(
Integer generation,
String name,
String darkModeKeyColor,
String darkModeTextColor,
String lightModeKeyColor,
String lightModeTextColor,
List<RecruitScheduleRequest> recruitSchedule) {
@NotNull @Positive Integer generation,
@NotEmpty String name,
@NotNull @Valid BrandingColorRequest brandingColor,
@Valid List<RecruitScheduleRequest> recruitSchedule) {

public record RecruitScheduleRequest(String type, ScheduleRequest schedule) {}
public record RecruitScheduleRequest(
@Pattern(regexp = "^(OB|YB)$") String type, @Valid ScheduleRequest schedule) {}

public record ScheduleRequest(
String applicationStartTime,
Expand Down Expand Up @@ -48,23 +52,28 @@ public AdminOfficialFacade.AddCommonRequest toCommand() {
return new AdminOfficialFacade.AddCommonRequest(
generation,
name,
darkModeKeyColor,
darkModeTextColor,
lightModeKeyColor,
lightModeTextColor,
brandingColor.darkModeKeyColor(),
brandingColor.darkModeTextColor(),
brandingColor.lightModeKeyColor(),
brandingColor.lightModeTextColor(),
schedules);
}
}

public record AddHomeRequest(
Integer generation,
@NotNull @Positive Integer generation,
String homeHeaderImageFileName,
List<NewsRequest> news,
List<ReviewRequest> review) {
@Valid List<NewsRequest> news,
@Valid List<ReviewRequest> review) {

public record NewsRequest(String title, String link, String imageFileName) {}
public record NewsRequest(
@NotEmpty String title, @NotEmpty String link, @NotNull String imageFileName) {}

public record ReviewRequest(String title, String content, String authorInfo) {}
public record ReviewRequest(
@NotBlank @Size(max = 10) String title,
@NotBlank @Size(max = 200) String content,
@NotBlank String authorInfo,
HomepageReviewType type) {}

public AdminOfficialFacade.AddHomeRequest toCommand() {
List<AdminOfficialFacade.AddHomeRequest.NewsFileRequest> newsRequests =
Expand All @@ -83,35 +92,36 @@ public AdminOfficialFacade.AddHomeRequest toCommand() {
.map(
r ->
new AdminOfficialFacade.AddHomeRequest.ReviewRequest(
r.title(), r.content(), r.authorInfo()))
r.title(), r.content(), r.authorInfo(), r.type()))
.toList();
return new AdminOfficialFacade.AddHomeRequest(
generation, homeHeaderImageFileName, newsRequests, reviewRequests);
}
}

public record AddAboutRequest(
Integer generation,
@NotNull @Positive Integer generation,
String headerImageFileName,
List<CoreValueRequest> coreValue,
List<MemberRequest> member,
List<ActivityScheduleRequest> activitySchedule) {
@Valid List<CoreValueRequest> coreValue,
@Valid List<MemberRequest> member,
@Valid List<ActivityScheduleRequest> activitySchedule) {

public record CoreValueRequest(
String value, String description, String detailDescription, String imageFileName) {}
@NotBlank String value,
@NotBlank String description,
@NotBlank String detailDescription,
String imageFileName) {}

public record MemberRequest(
String role,
String name,
String affiliation,
String introduction,
@NotBlank String role,
@NotBlank String name,
@NotBlank String affiliation,
@NotBlank String introduction,
String profileImageFileName,
String snsEmail,
String snsLinkedin,
String snsGithub,
String snsBehance) {}
@Valid SnsRequest sns) {}

public record ActivityScheduleRequest(String name, LocalDate startDate, LocalDate endDate) {}
public record ActivityScheduleRequest(
@NotBlank String name, @NotNull LocalDate startDate, LocalDate endDate) {}

public AdminOfficialFacade.AddAboutRequest toCommand() {
List<AdminOfficialFacade.AddAboutRequest.CoreValueRequest> cvRequests =
Expand All @@ -138,10 +148,10 @@ public AdminOfficialFacade.AddAboutRequest toCommand() {
m.affiliation(),
m.introduction(),
m.profileImageFileName(),
m.snsEmail(),
m.snsLinkedin(),
m.snsGithub(),
m.snsBehance()))
m.sns() == null ? null : m.sns().email(),
m.sns() == null ? null : m.sns().linkedin(),
m.sns() == null ? null : m.sns().github(),
m.sns() == null ? null : m.sns().behance()))
.toList();
List<AdminOfficialFacade.AddAboutRequest.ActivityScheduleRequest> scheduleRequests =
activitySchedule == null
Expand All @@ -158,24 +168,26 @@ public AdminOfficialFacade.AddAboutRequest toCommand() {
}

public record AddRecruitRequest(
Integer generation,
@NotNull @Positive Integer generation,
String recruitHeaderImageFileName,
List<PartIntroductionRequest> partIntroduction,
List<PartCurriculumRequest> partCurriculum,
List<RecruitPartCurriculumRequest> recruitPartCurriculum,
List<RecruitQuestionRequest> recruitQuestion) {
@Valid List<PartIntroductionRequest> partIntroduction,
@Valid List<PartCurriculumRequest> partCurriculum,
@Valid List<RecruitPartCurriculumRequest> recruitPartCurriculum,
@Valid List<RecruitQuestionRequest> recruitQuestion,
@Valid List<@NotNull FaqRequest> faq) {

public record PartIntroductionRequest(String part, String description) {}
public record PartIntroductionRequest(@NotBlank String part, @NotBlank String description) {}

public record PartCurriculumRequest(String part, List<String> curriculums) {}
public record PartCurriculumRequest(
@NotBlank String part, @NotEmpty List<String> curriculums) {}

public record RecruitPartCurriculumRequest(String part, IntroductionRequest introduction) {}
public record RecruitPartCurriculumRequest(
@NotBlank String part, @NotNull @Valid IntroductionRequest introduction) {}

public record IntroductionRequest(String content, String preference) {}
public record IntroductionRequest(@NotBlank String content, String preference) {}

public record RecruitQuestionRequest(String part, List<QuestionRequest> questions) {}

public record QuestionRequest(String question, String answer) {}
public record RecruitQuestionRequest(
@NotBlank String part, @NotEmpty @Valid List<QuestionRequest> questions) {}

public AdminOfficialFacade.AddRecruitRequest toCommand() {
List<AdminCachePort.PartIntroductionData> piData =
Expand Down Expand Up @@ -204,29 +216,59 @@ public AdminOfficialFacade.AddRecruitRequest toCommand() {
rpc.introduction().content(),
rpc.introduction().preference())))
.toList();
List<AdminCachePort.RecruitQuestionData> rqData =
recruitQuestion == null
? null
: recruitQuestion.stream()
.map(
rq ->
new AdminCachePort.RecruitQuestionData(
rq.part(),
rq.questions() == null
? null
: rq.questions().stream()
.map(
q ->
new AdminCachePort.QuestionData(
q.question(), q.answer()))
.toList()))
.toList();
List<AdminCachePort.FaqData> faqData = null;
if (faq != null) {
faqData =
faq.stream()
.map(
f ->
new AdminCachePort.FaqData(
Arrays.stream(FaqCategory.values())
.filter(
category ->
category.getDisplayName().equals(f.category().trim()))
.findFirst()
.orElseThrow(),
f.questions().stream()
.map(q -> new AdminCachePort.QuestionData(q.question(), q.answer()))
.toList()))
.toList();
} else if (recruitQuestion != null) {
faqData =
recruitQuestion.stream()
.map(
f ->
new AdminCachePort.FaqData(
FaqCategory.valueOf(Part.fromString(f.part()).name()),
f.questions().stream()
.map(q -> new AdminCachePort.QuestionData(q.question(), q.answer()))
.toList()))
.toList();
}
return new AdminOfficialFacade.AddRecruitRequest(
generation, recruitHeaderImageFileName, piData, pcData, rpcData, rqData);
generation, recruitHeaderImageFileName, piData, pcData, rpcData, faqData);
}
}

public record ConfirmRequest(Integer generation) {}
public record BrandingColorRequest(
@NotNull @Pattern(regexp = "^#?[A-Fa-f0-9]{6}$") String darkModeKeyColor,
@NotNull @Pattern(regexp = "^(white|black)$") String darkModeTextColor,
@NotNull @Pattern(regexp = "^#?[A-Fa-f0-9]{6}$") String lightModeKeyColor,
@NotNull @Pattern(regexp = "^(white|black)$") String lightModeTextColor) {}

public record SnsRequest(
@Email String email,
@Pattern(regexp = "^https?://.*") String linkedin,
@Pattern(regexp = "^https?://.*") String github,
@Pattern(regexp = "^https?://.*") String behance) {}

public record QuestionRequest(@NotBlank String question, @NotBlank String answer) {}

public record FaqRequest(
@NotBlank @Pattern(regexp = "^\\s*(지원자격|면접|활동)\\s*$") String category,
@NotEmpty List<@NotNull @Valid QuestionRequest> questions) {}

public record ConfirmRequest(@NotNull @Positive Integer generation) {}

private AdminOfficialRequest() {}
}
Loading
Loading