Refactor/#22 학생회 회원가입 시 당선 정보가 담긴 사진을 첨부하고 이를 관리자가 승인해야만 회원가입이 되도록 구현

src/main/java/com/campus/campus/domain/council/application/dto/request/StudentCouncilLoginIdValidateRequest.java

@@ -0,0 +1,11 @@
+package com.campus.campus.domain.council.application.dto.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+
+public record StudentCouncilLoginIdValidateRequest(
+	@Schema(description = "회원가입 id", example = "dede1234")
+	@NotBlank
+	String loginId
+) {
+}

src/main/java/com/campus/campus/domain/council/application/dto/request/StudentCouncilSignUpRequest.java

@@ -35,6 +35,10 @@ public record StudentCouncilSignUpRequest(
 	Long collegeId,
 
 	@Schema(description = "학과 id", example = "1")
-	Long majorId
+	Long majorId,
+
+	@Schema(description = "당선 사진 url", example = "https://www.election.com.png")
+	@NotBlank
+	String electionImageUrl
 ) {
 }

src/main/java/com/campus/campus/domain/council/application/dto/response/StudentCouncilLoginResponse.java

@@ -32,6 +32,9 @@ public record StudentCouncilLoginResponse(
 	String collegeName,
 
 	@Schema(description = "학과 이름 (없으면 null)", example = "컴퓨터공학과")
-	String majorName
+	String majorName,
+
+	@Schema(description = "학생회 이름", example = "가천대학교 총학생회")
+	String councilName
 ) {
 }

src/main/java/com/campus/campus/domain/council/application/mapper/StudentCouncilLoginMapper.java

@@ -30,6 +30,8 @@ public StudentCouncil createStudentCouncil(StudentCouncilSignUpRequest studentCo
 			.school(school)
 			.college(college)
 			.major(major)
+			.electionImageUrl(studentCouncilSignUpRequest.electionImageUrl())
+			.managerApproved(false)
 			.build();
 	}
 
@@ -44,7 +46,8 @@ public StudentCouncilLoginResponse toStudentCouncilLoginResponse(StudentCouncil
 			studentCouncil.getCouncilType(),
 			studentCouncil.getSchool().getSchoolName(),
 			studentCouncil.getCollege() != null ? studentCouncil.getCollege().getCollegeName() : null,
-			studentCouncil.getMajor() != null ? studentCouncil.getMajor().getMajorName() : null
+			studentCouncil.getMajor() != null ? studentCouncil.getMajor().getMajorName() : null,
+			studentCouncil.getCouncilName()
 		);
 	}
 

src/main/java/com/campus/campus/domain/council/application/service/CouncilLoginService.java

@@ -8,6 +8,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import com.campus.campus.domain.council.application.dto.request.StudentCouncilFindPasswordRequest;
+import com.campus.campus.domain.council.application.dto.request.StudentCouncilLoginIdValidateRequest;
 import com.campus.campus.domain.council.application.dto.request.StudentCouncilLoginRequest;
 import com.campus.campus.domain.council.application.dto.request.StudentCouncilSignUpRequest;
 import com.campus.campus.domain.council.application.dto.request.StudentCouncilWithdrawRequest;
@@ -23,6 +24,7 @@
 import com.campus.campus.domain.council.application.exception.SignupEmailNotFoundException;
 import com.campus.campus.domain.council.application.exception.StudentCouncilNotFoundException;
 import com.campus.campus.domain.council.application.mapper.StudentCouncilLoginMapper;
+import com.campus.campus.domain.council.application.util.CouncilNameGenerator;
 import com.campus.campus.domain.council.domain.entity.StudentCouncil;
 import com.campus.campus.domain.council.domain.repository.StudentCouncilRepository;
 import com.campus.campus.domain.mail.application.exception.EmailVerificationNotFoundException;
@@ -60,13 +62,14 @@ public class CouncilLoginService {
 	private final SecurityConfig securityConfig;
 	private final PasswordEncoder passwordEncoder;
 	private final RedisTokenService redisTokenService;
+	private final CouncilNameGenerator councilNameGenerator;
 
 	@Value("${jwt.refresh.expiration-seconds}")
 	private long refreshTokenExpirationSeconds;
 
 	@Transactional
-	public StudentCouncilLoginResponse signUp(StudentCouncilSignUpRequest studentCouncilSignUpRequest) {
-		if(studentCouncilRepository.existsByEmailAndDeletedAtIsNotNull(studentCouncilSignUpRequest.email())){
+	public void signUp(StudentCouncilSignUpRequest studentCouncilSignUpRequest) {
+		if (studentCouncilRepository.existsByEmailAndDeletedAtIsNotNull(studentCouncilSignUpRequest.email())) {
 			throw new CouncilSignupForbiddenException();
 		}
 		if (studentCouncilRepository.existsByEmail(studentCouncilSignUpRequest.email())) {
@@ -88,22 +91,23 @@ public StudentCouncilLoginResponse signUp(StudentCouncilSignUpRequest studentCou
 		StudentCouncil studentCouncil = studentCouncilLoginMapper.createStudentCouncil(
 			studentCouncilSignUpRequest, school, scope.college, scope.major);
 
-		studentCouncilRepository.save(studentCouncil);
-
-		String accessToken = jwtProvider.createCouncilAccessToken(studentCouncil.getId());
-		String refreshToken = jwtProvider.createCouncilRefreshToken(studentCouncil.getId());
+		String councilName = councilNameGenerator.buildCouncilName(studentCouncil);
+		studentCouncil.generateCouncilName(councilName);
 
-		redisTokenService.setRefreshToken("COUNCIL", String.valueOf(studentCouncil.getId()), refreshToken,
-			refreshTokenExpirationSeconds);
+		studentCouncilRepository.save(studentCouncil);
 
 		emailVerification.use();
+	}
 
-		return studentCouncilLoginMapper.toStudentCouncilLoginResponse(studentCouncil, accessToken, refreshToken);
+	public void validateLoginId(StudentCouncilLoginIdValidateRequest studentCouncilLoginIdValidateRequest) {
+		if (studentCouncilRepository.existsByLoginId(studentCouncilLoginIdValidateRequest.loginId())) {
+			throw new LoginIdAlreadyExistsException();
+		}
 	}
 
 	public StudentCouncilLoginResponse login(StudentCouncilLoginRequest studentCouncilLoginRequest) {
 		StudentCouncil studentCouncil = studentCouncilRepository
-			.findByLoginIdAndDeletedAtIsNull(studentCouncilLoginRequest.loginId())
+			.findByLoginIdAndManagerApprovedIsTrueAndDeletedAtIsNull(studentCouncilLoginRequest.loginId())
 			.orElseThrow(StudentCouncilNotFoundException::new);
 
 		if (!passwordEncoder.matches(studentCouncilLoginRequest.password(), studentCouncil.getPassword())) {
@@ -127,7 +131,8 @@ public StudentCouncilFindIdResponse findId(String email) {
 			throw new SignupEmailNotFoundException();
 		}
 
-		StudentCouncil studentCouncil = studentCouncilRepository.findByEmailAndDeletedAtIsNull(email)
+		StudentCouncil studentCouncil = studentCouncilRepository
+			.findByEmailAndManagerApprovedIsTrueAndDeletedAtIsNull(email)
 			.orElseThrow(StudentCouncilNotFoundException::new);
 
 		emailVerification.use();
@@ -138,7 +143,7 @@ public StudentCouncilFindIdResponse findId(String email) {
 	@Transactional
 	public void findPassword(StudentCouncilFindPasswordRequest studentCouncilFindPasswordRequest) {
 		StudentCouncil studentCouncil = studentCouncilRepository
-			.findByLoginIdAndDeletedAtIsNull(studentCouncilFindPasswordRequest.loginId())
+			.findByLoginIdAndManagerApprovedIsTrueAndDeletedAtIsNull(studentCouncilFindPasswordRequest.loginId())
 			.orElseThrow(StudentCouncilNotFoundException::new);
 
 		if (!studentCouncilFindPasswordRequest.email().equals(studentCouncil.getEmail())) {
@@ -157,7 +162,8 @@ public void findPassword(StudentCouncilFindPasswordRequest studentCouncilFindPas
 
 	@Transactional
 	public void withdrawCouncil(Long councilId, StudentCouncilWithdrawRequest studentCouncilWithdrawRequest) {
-		StudentCouncil studentCouncil = studentCouncilRepository.findByIdAndDeletedAtIsNull(councilId)
+		StudentCouncil studentCouncil = studentCouncilRepository
+			.findByIdAndManagerApprovedIsTrueAndDeletedAtIsNull(councilId)
 			.orElseThrow(StudentCouncilNotFoundException::new);
 
 		if (!studentCouncilWithdrawRequest.precaution()) {

src/main/java/com/campus/campus/domain/council/application/service/CouncilService.java

@@ -31,7 +31,8 @@ public class CouncilService {
 
 	@Transactional
 	public void changeEmail(Long councilId, StudentCouncilChangeEmailRequest studentCouncilChangeEmailRequest) {
-		StudentCouncil studentCouncil = studentCouncilRepository.findByIdAndDeletedAtIsNull(councilId)
+		StudentCouncil studentCouncil = studentCouncilRepository
+			.findByIdAndManagerApprovedIsTrueAndDeletedAtIsNull(councilId)
 			.orElseThrow(StudentCouncilNotFoundException::new);
 
 		//soft delete된 유저가 예상치 못하게 계정을 복구해야할 수도 있기에 이를 막기 위해 deleteAt이 존재하더라도 조회되게 한다.
@@ -50,7 +51,8 @@ public void changeEmail(Long councilId, StudentCouncilChangeEmailRequest student
 	@Transactional
 	public void changePassword(Long councilId,
 		StudentCouncilChangePasswordRequest studentCouncilChangePasswordRequest) {
-		StudentCouncil studentCouncil = studentCouncilRepository.findByIdAndDeletedAtIsNull(councilId)
+		StudentCouncil studentCouncil = studentCouncilRepository
+			.findByIdAndManagerApprovedIsTrueAndDeletedAtIsNull(councilId)
 			.orElseThrow(StudentCouncilNotFoundException::new);
 
 		if (!securityConfig.passwordEncoder()

src/main/java/com/campus/campus/domain/council/application/util/CouncilNameGenerator.java

@@ -0,0 +1,34 @@
+package com.campus.campus.domain.council.application.util;
+
+import org.springframework.stereotype.Component;
+
+import com.campus.campus.domain.council.domain.entity.CouncilType;
+import com.campus.campus.domain.council.domain.entity.StudentCouncil;
+
+@Component
+public class CouncilNameGenerator {
+	public String buildCouncilName(StudentCouncil studentCouncil) {
+		String schoolName = studentCouncil.getSchool() != null ? studentCouncil.getSchool().getSchoolName() : "";
+		CouncilType councilType = studentCouncil.getCouncilType();
+
+		return switch (councilType) {
+			case SCHOOL_COUNCIL -> String.format("%s 총학생회", schoolName).trim();
+			case COLLEGE_COUNCIL -> String.format("%s %s 학생회", schoolName, getCollegeName(studentCouncil)).trim();
+			case MAJOR_COUNCIL -> String.format("%s %s 학생회", schoolName, getMajorName(studentCouncil)).trim();
+		};
+	}
+
+	private String getCollegeName(StudentCouncil studentCouncil) {
+		if (studentCouncil.getCollege() == null) {
+			return "";
+		}
+		return studentCouncil.getCollege().getCollegeName();
+	}
+
+	private String getMajorName(StudentCouncil studentCouncil) {
+		if (studentCouncil.getMajor() == null) {
+			return "";
+		}
+		return studentCouncil.getMajor().getMajorName();
+	}
+}

src/main/java/com/campus/campus/domain/council/domain/entity/StudentCouncil.java

@@ -62,6 +62,15 @@ public class StudentCouncil extends BaseEntity {
 	@JoinColumn(name = "major_id")
 	private Major major;
 
+	@Column(name = "council_name")
+	private String councilName;
+
+	@Column(name = "election_image_url")
+	private String electionImageUrl;
+
+	@Column(name = "manager_approved", nullable = false)
+	private boolean managerApproved;
+
 	@Column(name = "deleted_at")
 	private LocalDateTime deletedAt;
 
@@ -73,18 +82,15 @@ public void changePassword(String newPassword) {
 		this.password = newPassword;
 	}
 
-	public String getFullCouncilName() {
-		StringBuilder fullName = new StringBuilder();
-		if (school != null)
-			fullName.append(school.getSchoolName());
-		if (college != null)
-			fullName.append(" ").append(college.getCollegeName());
-		if (major != null)
-			fullName.append(" ").append(major.getMajorName());
-		return fullName.append(" 학생회").toString().trim();
-	}
-
 	public void changeEmail(String newEmail) {
 		this.email = newEmail;
 	}
+
+	public void generateCouncilName(String councilName) {
+		this.councilName = councilName;
+	}
+
+	public void managerApprove() {
+		this.managerApproved = true;
+	}
 }

src/main/java/com/campus/campus/domain/council/domain/repository/StudentCouncilRepository.java

@@ -1,5 +1,6 @@
 package com.campus.campus.domain.council.domain.repository;
 
+import java.util.List;
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -9,28 +10,36 @@
 import com.campus.campus.domain.council.domain.entity.StudentCouncil;
 
 public interface StudentCouncilRepository extends JpaRepository<StudentCouncil, Long> {
-	Optional<StudentCouncil> findByLoginIdAndDeletedAtIsNull(String loginId);
+	Optional<StudentCouncil> findByLoginIdAndManagerApprovedIsTrueAndDeletedAtIsNull(String loginId);
 
-	Optional<StudentCouncil> findByLoginId(String loginId);
+	Optional<StudentCouncil> findByEmailAndManagerApprovedIsTrueAndDeletedAtIsNull(String email);
 
-	Optional<StudentCouncil> findByEmailAndDeletedAtIsNull(String email);
+	@Query("SELECT sc FROM StudentCouncil sc " +
+		"LEFT JOIN FETCH sc.school " +
+		"LEFT JOIN FETCH sc.college " +
+		"LEFT JOIN FETCH sc.major " +
+		"WHERE sc.id = :councilId AND sc.deletedAt IS NULL AND sc.managerApproved IS TRUE")
+	Optional<StudentCouncil> findByIdWithDetailsAndManagerApprovedIsTrueAndDeletedAtIsNull(
+		@Param("councilId") Long councilId);
 
 	@Query("SELECT sc FROM StudentCouncil sc " +
 		"LEFT JOIN FETCH sc.school " +
 		"LEFT JOIN FETCH sc.college " +
 		"LEFT JOIN FETCH sc.major " +
-		"WHERE sc.id = :councilId AND sc.deletedAt IS NULL")
-	Optional<StudentCouncil> findByIdWithDetailsAndDeletedAtIsNull(@Param("councilId") Long councilId);
+		"WHERE sc.deletedAt IS NULL AND sc.managerApproved IS FALSE")
+	List<StudentCouncil> findByManagerWithDetailsApprovedIsFalseAndDeletedAtIsNull();
 
 	boolean existsByLoginId(String loginId);
 
 	boolean existsByEmail(String email);
 
 	boolean existsByEmailAndDeletedAtIsNull(String email);
 
-	Optional<StudentCouncil> findByIdAndDeletedAtIsNull(Long councilId);
+	Optional<StudentCouncil> findByIdAndManagerApprovedIsTrueAndDeletedAtIsNull(Long councilId);
+
+	Optional<StudentCouncil> findByIdAndManagerApprovedIsFalseAndDeletedAtIsNull(Long councilId);
 
-	boolean existsByIdAndDeletedAtIsNull(Long councilId);
+	boolean existsByIdAndManagerApprovedIsTrueAndDeletedAtIsNull(Long councilId);
 
 	boolean existsByEmailAndDeletedAtIsNotNull(String email);
 }

src/main/java/com/campus/campus/domain/council/presentation/StudentCouncilLoginController.java

@@ -10,6 +10,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import com.campus.campus.domain.council.application.dto.request.StudentCouncilFindPasswordRequest;
+import com.campus.campus.domain.council.application.dto.request.StudentCouncilLoginIdValidateRequest;
 import com.campus.campus.domain.council.application.dto.request.StudentCouncilLoginRequest;
 import com.campus.campus.domain.council.application.dto.request.StudentCouncilSignUpRequest;
 import com.campus.campus.domain.council.application.dto.request.StudentCouncilWithdrawRequest;
@@ -31,11 +32,19 @@ public class StudentCouncilLoginController {
 
 	@PostMapping("/signup")
 	@Operation(summary = "학생회 회원가입")
-	public CommonResponse<StudentCouncilLoginResponse> Signup(
-		@Valid @RequestBody StudentCouncilSignUpRequest studentCouncilSignUpRequest) {
-		StudentCouncilLoginResponse response = councilLoginService.signUp(studentCouncilSignUpRequest);
+	public CommonResponse<Void> Signup(@Valid @RequestBody StudentCouncilSignUpRequest studentCouncilSignUpRequest) {
+		councilLoginService.signUp(studentCouncilSignUpRequest);
 
-		return CommonResponse.success(StudentCouncilResponseCode.SIGNUP_SUCCESS, response);
+		return CommonResponse.success(StudentCouncilResponseCode.SIGNUP_REQUEST_SUCCESS);
+	}
+
+	@PostMapping("/signup/validate")
+	@Operation(summary = "학생회 회원가입 id 중복 검증")
+	public CommonResponse<Void> validateLoginId(
+		@Valid @RequestBody StudentCouncilLoginIdValidateRequest studentCouncilLoginIdValidateRequest) {
+		councilLoginService.validateLoginId(studentCouncilLoginIdValidateRequest);
+
+		return CommonResponse.success(StudentCouncilResponseCode.VALIDATE_LOGIN_ID_SUCCESS);
 	}
 
 	@PostMapping("/login")

src/main/java/com/campus/campus/domain/council/presentation/StudentCouncilResponseCode.java

@@ -10,7 +10,8 @@
 @Getter
 @AllArgsConstructor
 public enum StudentCouncilResponseCode implements ResponseCodeInterface {
-	SIGNUP_SUCCESS(200, HttpStatus.OK, "학생회 회원가입에 성공했습니다."),
+	SIGNUP_REQUEST_SUCCESS(200, HttpStatus.OK, "학생회 회원가입 요청에 성공했습니다."),
+	VALIDATE_LOGIN_ID_SUCCESS(200, HttpStatus.OK, "회원가입 로그인 id 중복 검증에 성공했습니다."),
 	LOGIN_SUCCESS(200, HttpStatus.OK, "학생회 로그인에 성공했습니다."),
 	FIND_ID_SUCCESS(200, HttpStatus.OK, "아이디 찾기에 성공했습니다."),
 	FIND_PASSWORD_SUCCESS(200, HttpStatus.OK, "비밀번호 재설정에 성공했습니다."),

src/main/java/com/campus/campus/domain/councilnotice/application/mapper/StudentCouncilNoticeMapper.java

@@ -36,7 +36,7 @@ public NoticeResponse toNoticeResponse(StudentCouncilNotice notice, List<String>
 		return NoticeResponse.builder()
 			.id(notice.getId())
 			.writerId(notice.getWriter().getId())
-			.writerName(notice.getWriter().getFullCouncilName())
+			.writerName(notice.getWriter().getCouncilName())
 			.isWriter(notice.isWrittenByCouncil(councilId))
 			.title(notice.getTitle())
 			.content(notice.getContent())

src/main/java/com/campus/campus/domain/councilnotice/application/service/StudentCouncilNoticeService.java

@@ -49,7 +49,8 @@ public NoticeResponse create(Long councilId, NoticeRequest dto) {
 			throw new NoticeImageLimitExceededException();
 		}
 
-		StudentCouncil writer = studentCouncilRepository.findByIdWithDetailsAndDeletedAtIsNull(councilId)
+		StudentCouncil writer = studentCouncilRepository.
+			findByIdWithDetailsAndManagerApprovedIsTrueAndDeletedAtIsNull(councilId)
 			.orElseThrow(StudentCouncilNotFoundException::new);
 
 		StudentCouncilNotice notice =
@@ -105,6 +106,8 @@ public Page<NoticeListItemResponse> findAll(int page, int size, Long councilId)
 
 	@Transactional
 	public NoticeResponse update(Long councilId, Long noticeId, NoticeRequest dto) {
+		studentCouncilRepository.findByIdAndManagerApprovedIsTrueAndDeletedAtIsNull(councilId)
+			.orElseThrow(StudentCouncilNotFoundException::new);
 
 		if (dto.imageUrls() != null && dto.imageUrls().size() > MAX_IMAGE_COUNT) {
 			throw new NoticeImageLimitExceededException();
@@ -145,6 +148,8 @@ public NoticeResponse update(Long councilId, Long noticeId, NoticeRequest dto) {
 
 	@Transactional
 	public void delete(Long councilId, Long noticeId) {
+		studentCouncilRepository.findByIdAndManagerApprovedIsTrueAndDeletedAtIsNull(councilId)
+			.orElseThrow(StudentCouncilNotFoundException::new);
 
 		StudentCouncilNotice notice = noticeRepository.findByIdWithFullInfo(noticeId)
 			.orElseThrow(NoticeNotFoundException::new);

src/main/java/com/campus/campus/domain/councilpost/application/mapper/StudentCouncilPostMapper.java

@@ -39,7 +39,7 @@ public PostResponse toPostResponse(StudentCouncilPost post, List<String> images,
 		var builder = PostResponse.builder()
 			.id(post.getId())
 			.writerId(writer.getId())
-			.writerName(writer.getFullCouncilName())
+			.writerName(writer.getCouncilName())
 			.isWriter(post.isWrittenByCouncil(currentUserId))
 			.category(post.getCategory())
 			.title(post.getTitle())