Release v2.7.0

app-main/src/main/java/net/causw/app/main/core/batch/BatchScheduler.java

@@ -4,7 +4,6 @@
 import java.util.List;
 
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Slice;
 import org.springframework.scheduling.annotation.Scheduled;
 
@@ -47,14 +46,11 @@ public void scheduleCleanupDeactivatedUsers() {
 
 			LocalDateTime dueDate = LocalDateTime.now().minusDays(30);
 
-			boolean hasNext;
-			do {
-				Page<User> userPage = userReader.findUsersDeletedBefore(
+			while (true) {
+				List<User> withdrawnUsers = userReader.findCleanupTargets(
 					dueDate,
 					pageableFactory.create(0, StaticValue.BATCH_USER_LIST_SIZE));
 
-				List<User> withdrawnUsers = userPage.getContent();
-
 				if (withdrawnUsers.isEmpty()) {
 					break;
 				}
@@ -66,10 +62,9 @@ public void scheduleCleanupDeactivatedUsers() {
 				admissionWriter.deleteAdmissionByUsers(withdrawnUsers);
 				userWriter.cleanupWithdrawnUsers(withdrawnUsers);
 
-				hasNext = userPage.hasNext();
 				log.info("[유저 정리 배치] {}명 처리 완료", withdrawnUsers.size());
+			}
 
-			} while (hasNext);
 			log.info("[유저 정리 배치] 탈퇴 유저 후처리 완료");
 		} catch (Exception e) {
 			log.error("유저 정리 배치 실패: {}", e.getMessage(), e);

app-main/src/main/java/net/causw/app/main/core/security/JwtTokenProvider.java

@@ -3,6 +3,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.Set;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 import javax.crypto.SecretKey;
@@ -65,6 +66,8 @@ public String createRefreshToken() {
 		Date now = new Date();
 
 		return Jwts.builder()
+			.id(UUID.randomUUID().toString())
+			.issuedAt(now)
 			.expiration(new Date(now.getTime() + StaticValue.JWT_REFRESH_TOKEN_VALID_TIME))
 			.signWith(secretKey, Jwts.SIG.HS256)
 			.compact();

app-main/src/main/java/net/causw/app/main/domain/integration/crawled/service/CrawledToPostTransferService.java

@@ -46,12 +46,12 @@ public class CrawledToPostTransferService {
 	@Transactional
 	public void transferToPosts() {
 		Board board = getBoard();
-		User adminUser = getAdminUser();
+		User systemUser = getSystemUser();
 		List<CrawledNotice> updatedNotices = getUpdatedNotices();
 
 		int savedCount = 0;
 		for (CrawledNotice notice : updatedNotices) {
-			if (processUpdatedNotice(notice, board, adminUser)) {
+			if (processUpdatedNotice(notice, board, systemUser)) {
 				notice.setIsUpdated(false);
 				crawledNoticeRepository.save(notice);
 				savedCount++;
@@ -67,8 +67,8 @@ private Board getBoard() {
 	}
 
 	//관리자 조회
-	private User getAdminUser() {
-		return userRepository.findByStudentId(StaticValue.ADMIN_STUDENT_ID)
+	private User getSystemUser() {
+		return userRepository.findByEmail(StaticValue.SYSTEM_CRAWLER_ACCOUNT)
 			.orElseThrow(() -> new BadRequestException(
 				ErrorCode.ROW_DOES_NOT_EXIST, MessageUtil.USER_NOT_FOUND));
 	}

app-main/src/main/java/net/causw/app/main/domain/user/account/api/v2/controller/UserInfoController.java

@@ -18,10 +18,13 @@
 import net.causw.app.main.domain.user.account.api.v2.dto.request.UserInfoListRequest;
 import net.causw.app.main.domain.user.account.api.v2.dto.request.UserInfoUpdateRequest;
 import net.causw.app.main.domain.user.account.api.v2.dto.response.UserInfoDetailResponse;
+import net.causw.app.main.domain.user.account.api.v2.dto.response.UserInfoDirectoryResponse;
 import net.causw.app.main.domain.user.account.api.v2.dto.response.UserInfoSummaryResponse;
 import net.causw.app.main.domain.user.account.api.v2.mapper.UserInfoDtoMapper;
 import net.causw.app.main.domain.user.account.service.UserInfoService;
+import net.causw.app.main.domain.user.account.service.dto.request.UserInfoListCondition;
 import net.causw.app.main.domain.user.account.service.dto.result.UserInfoDetailResult;
+import net.causw.app.main.domain.user.account.service.dto.result.UserInfoDirectoryResult;
 import net.causw.app.main.domain.user.account.service.dto.result.UserInfoSummaryResult;
 import net.causw.app.main.domain.user.auth.userdetails.CustomUserDetails;
 import net.causw.app.main.shared.dto.ApiResponse;
@@ -100,9 +103,34 @@ public ApiResponse<PageResponse<UserInfoSummaryResponse>> getUserInfoPage(
 		@ModelAttribute @Valid UserInfoListRequest request,
 		@RequestParam(name = "pageNum", required = false, defaultValue = "0") Integer pageNum,
 		@AuthenticationPrincipal CustomUserDetails userDetails) {
-		Page<UserInfoSummaryResult> result = userInfoService.getUserInfoPage(userInfoDtoMapper.toListCondition(request),
-			pageNum, userDetails.getUserId());
+
+		UserInfoListCondition listCondition = userInfoDtoMapper.toListCondition(request);
+		Page<UserInfoSummaryResult> result = userInfoService.getUserInfoPage(listCondition, pageNum,
+			userDetails.getUserId());
 		Page<UserInfoSummaryResponse> response = result.map(userInfoDtoMapper::toSummaryResponse);
+
 		return ApiResponse.success(PageResponse.from(response));
 	}
+
+	/**
+	 * 동문 수첩 프로필 리스트 조회 및 검색
+	 * @param request 동문 수첩 프로필 리스트 조회 요청 DTO
+	 * @param pageNum 페이징
+	 * @return 조회된 동문 수첩 프로필 리스트
+	 */
+	@GetMapping(value = "/list")
+	@ResponseStatus(HttpStatus.OK)
+	@Operation(summary = "동문 수첩 프로필 리스트 조회 및 검색 (커서기반)", description = "검색어 또는 필터를 포함해 동문 수첩 프로필 리스트를 조회합니다.(본인 프로필 포함)")
+	public ApiResponse<UserInfoDirectoryResponse> getUserInfoList(
+		@ModelAttribute @Valid UserInfoListRequest request,
+		@AuthenticationPrincipal CustomUserDetails userDetails) {
+
+		UserInfoListCondition listCondition = userInfoDtoMapper.toListCondition(request);
+		UserInfoDirectoryResult result = userInfoService.getUserInfoByCursor(
+			listCondition,
+			userDetails.getUserId(),
+			request.cursor());
+
+		return ApiResponse.success(userInfoDtoMapper.toDirectoryResponse(result));
+	}
 }

app-main/src/main/java/net/causw/app/main/domain/user/account/api/v2/dto/request/UserInfoListRequest.java

@@ -15,5 +15,7 @@ public record UserInfoListRequest(
 
 	@Schema(description = "학적 상태", example = "[\"ENROLLED\", \"GRADUATED\"]") List<String> academicStatus,
 
-	@Schema(description = "정렬 기준", example = "UPDATED_AT_DESC") String sortType) {
+	@Schema(description = "정렬 기준", example = "UPDATED_AT_DESC") String sortType,
+
+	@Schema(description = "요청 커서(없으면 null)", example = "{랜덤 해시값}") String cursor) {
 }

app-main/src/main/java/net/causw/app/main/domain/user/account/api/v2/dto/response/DepartmentResponse.java

@@ -0,0 +1,8 @@
+package net.causw.app.main.domain.user.account.api.v2.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public record DepartmentResponse(
+	@Schema(description = "학과 코드", example = "SCHOOL_OF_SW") String code,
+	@Schema(description = "학과 이름", example = "소프트웨어학부") String name) {
+}

app-main/src/main/java/net/causw/app/main/domain/user/account/api/v2/dto/response/UserInfoDetailResponse.java

@@ -15,6 +15,8 @@ public record UserInfoDetailResponse(
 
 	@Schema(description = "사용자 학번", example = "18학번") String admissionYear,
 
+	@Schema(description = "사용자 학과", example = "소프트웨어학부/미기입") String departmentDescription,
+
 	@Schema(description = "사용자 학적 상태", example = "졸업생") String academicStatus,
 
 	@Schema(description = "동문 수첩 프로필 소개글", example = "동문 수첩 프로필 소개글입니다.") String description,
@@ -35,5 +37,9 @@ public record UserInfoDetailResponse(
 
 	@Schema(description = "사용자 관심 기술", example = "[\"Tech0\", \"Tech1\"]") List<String> userInterestTech,
 
-	@Schema(description = "사용자 관심 도메인", example = "[\"Domain0\", \"Domain1\"]") List<String> userInterestDomain) {
+	@Schema(description = "사용자 관심 도메인", example = "[\"Domain0\", \"Domain1\"]") List<String> userInterestDomain,
+
+	@Schema(description = "커피챗 가능 여부", example = "false") boolean isCoffeeChatAvailable
+
+) {
 }

app-main/src/main/java/net/causw/app/main/domain/user/account/api/v2/dto/response/UserInfoDirectoryResponse.java

@@ -0,0 +1,9 @@
+package net.causw.app.main.domain.user.account.api.v2.dto.response;
+
+import java.util.List;
+
+public record UserInfoDirectoryResponse(
+	UserInfoSummaryResponse myProfile,
+	List<UserInfoSectionResponse> sections,
+	String nextCursor) {
+}

app-main/src/main/java/net/causw/app/main/domain/user/account/api/v2/dto/response/UserInfoSectionResponse.java

@@ -0,0 +1,11 @@
+package net.causw.app.main.domain.user.account.api.v2.dto.response;
+
+import java.util.List;
+
+import net.causw.app.main.domain.user.account.enums.userinfo.UserInfoSectionType;
+
+public record UserInfoSectionResponse(
+	UserInfoSectionType type,
+	List<UserInfoSummaryResponse> items,
+	boolean hasNext) {
+}

app-main/src/main/java/net/causw/app/main/domain/user/account/api/v2/dto/response/UserInfoSummaryResponse.java

@@ -15,5 +15,9 @@ public record UserInfoSummaryResponse(
 
 	@Schema(description = "사용자 학적 상태", example = "졸업생") String academicStatus,
 
-	@Schema(description = "동문 수첩 프로필 설명", example = "동문 수첩 프로필 설명입니다.") String description) {
+	@Schema(description = "사용자 학과") DepartmentResponse department,
+
+	@Schema(description = "동문 수첩 프로필 설명", example = "동문 수첩 프로필 설명입니다.") String description,
+
+	@Schema(description = "커피챗 가능 여부", example = "false") boolean isCoffeeChatAvailable) {
 }

app-main/src/main/java/net/causw/app/main/domain/user/account/api/v2/mapper/UserInfoDtoMapper.java

@@ -1,24 +1,58 @@
 package net.causw.app.main.domain.user.account.api.v2.mapper;
 
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 
 import net.causw.app.main.domain.user.account.api.v2.dto.request.UserInfoListRequest;
 import net.causw.app.main.domain.user.account.api.v2.dto.request.UserInfoUpdateRequest;
+import net.causw.app.main.domain.user.account.api.v2.dto.response.DepartmentResponse;
 import net.causw.app.main.domain.user.account.api.v2.dto.response.UserInfoDetailResponse;
+import net.causw.app.main.domain.user.account.api.v2.dto.response.UserInfoDirectoryResponse;
+import net.causw.app.main.domain.user.account.api.v2.dto.response.UserInfoSectionResponse;
 import net.causw.app.main.domain.user.account.api.v2.dto.response.UserInfoSummaryResponse;
+import net.causw.app.main.domain.user.account.enums.user.Department;
 import net.causw.app.main.domain.user.account.service.dto.request.UserInfoListCondition;
 import net.causw.app.main.domain.user.account.service.dto.request.UserInfoUpdateCommand;
 import net.causw.app.main.domain.user.account.service.dto.result.UserInfoDetailResult;
+import net.causw.app.main.domain.user.account.service.dto.result.UserInfoDirectoryResult;
+import net.causw.app.main.domain.user.account.service.dto.result.UserInfoSectionResult;
 import net.causw.app.main.domain.user.account.service.dto.result.UserInfoSummaryResult;
 
 @Mapper(componentModel = "spring")
 public interface UserInfoDtoMapper {
 
+	@Mapping(target = "departmentDescription", source = "result.department.name", defaultValue = "학과 미기입")
 	UserInfoDetailResponse toDetailResponse(UserInfoDetailResult result);
 
 	UserInfoSummaryResponse toSummaryResponse(UserInfoSummaryResult result);
 
+	/**
+	 * 학과 enum을 API 응답 객체로 변환한다.
+	 * @param department 학과 enum
+	 * @return 학과 코드와 이름을 포함한 응답, 학과가 없으면 {@code null}
+	 */
+	default DepartmentResponse toDepartmentResponse(Department department) {
+		if (department == null) {
+			return null;
+		}
+		return new DepartmentResponse(department.name(), department.getName());
+	}
+
+	/**
+	 * 동문 섹션 조회 결과를 API 응답으로 변환한다.
+	 * @param result 동문 섹션 조회 결과
+	 * @return 동문 섹션 응답
+	 */
+	UserInfoSectionResponse toSectionResponse(UserInfoSectionResult result);
+
+	/**
+	 * 동문 목록 조회 결과를 API 응답으로 변환한다.
+	 * @param result 동문 목록 조회 결과
+	 * @return 동문 목록 응답
+	 */
+	UserInfoDirectoryResponse toDirectoryResponse(UserInfoDirectoryResult result);
+
 	UserInfoUpdateCommand toUpdateCommand(UserInfoUpdateRequest request);
 
 	UserInfoListCondition toListCondition(UserInfoListRequest request);
-}
+}

app-main/src/main/java/net/causw/app/main/domain/user/account/entity/userInfo/UserInfo.java

@@ -46,15 +46,6 @@ public class UserInfo extends BaseEntity {
 	@JoinColumn(name = "user_id", nullable = false)
 	private User user;
 
-	/**
-	 * @deprecated v2 API에서는 직업(job) 정보가 소개글(description)과 역할이 겹쳐 더 이상 사용하지 않습니다.
-	 * v1 호환을 위해 컬럼은 유지합니다.
-	 * TODO: v2 배포 완료 후 제거
-	 */
-	@Deprecated(since = "v2")
-	@Column(name = "job", nullable = true)
-	private String job;
-
 	@Column(name = "description", nullable = true)
 	private String description;
 
@@ -93,24 +84,16 @@ public class UserInfo extends BaseEntity {
 	@Builder.Default
 	private Set<String> userInterestDomain = new HashSet<>();
 
+	@Column(name = "is_coffee_chat_available", nullable = false)
+	@Builder.Default
+	private boolean isCoffeeChatAvailable = false;
+
 	public static UserInfo of(User user) {
 		return UserInfo.builder()
 			.user(user)
 			.build();
 	}
 
-	/**
-	 * v1 API용 업데이트. description, job, socialLinks, isPhoneNumberVisible을 한 번에 갱신한다.
-	 * v1은 API 레이어에서 검증하므로 엔티티 레벨 검증 없이 직접 반영한다.
-	 */
-	@Deprecated(since = "v2 API에서는 description, socialLinks, isPhoneNumberVisible을 각각 업데이트하는 별도의 메서드를 사용합니다.")
-	public void updateV1(String description, String job, List<String> socialLinks, boolean isPhoneNumberVisible) {
-		this.description = description;
-		this.job = job;
-		this.socialLinks = socialLinks == null ? new ArrayList<>() : new ArrayList<>(socialLinks);
-		this.isPhoneNumberVisible = isPhoneNumberVisible;
-	}
-
 	public void update(
 		String description,
 		boolean isPhoneNumberVisible) {

app-main/src/main/java/net/causw/app/main/domain/user/account/enums/userinfo/UserInfoSectionType.java

@@ -0,0 +1,18 @@
+package net.causw.app.main.domain.user.account.enums.userinfo;
+
+public enum UserInfoSectionType {
+	COFFEE_CHAT_AVAILABLE,
+	ALL_MEMBERS;
+
+	/**
+	 * 현재 섹션 다음에 조회할 섹션을 반환한다.
+	 * @return 다음 섹션, 마지막 섹션인 경우 {@code null}
+	 */
+	public UserInfoSectionType next() {
+		return switch (this) {
+			case COFFEE_CHAT_AVAILABLE -> ALL_MEMBERS;
+			case ALL_MEMBERS -> null;
+		};
+
+	}
+}

app-main/src/main/java/net/causw/app/main/domain/user/account/repository/user/UserRepository.java

@@ -102,7 +102,17 @@ List<User> findByRoleAndAcademicStatusAndState(@Param("role") Role role,
 
 	Long countByCreatedAtBetween(LocalDateTime start, LocalDateTime end);
 
-	Page<User> findAllByDeletedAtIsNotNullAndDeletedAtBefore(LocalDateTime deletedAt, Pageable pageable);
+	@Query("""
+		SELECT u
+		FROM User u
+		WHERE u.deletedAt IS NOT NULL
+		  AND u.deletedAt < :deletedAt
+		  AND u.email NOT LIKE 'deleted\\_%' ESCAPE '\\'
+		ORDER BY u.deletedAt ASC
+		""")
+	List<User> findCleanupTargets(
+		@Param("deletedAt") LocalDateTime deletedAt,
+		Pageable pageable);
 
 	Slice<User> findAllByStateAndUpdatedAtBeforeAndDeletedAtIsNull(UserState state, LocalDateTime updatedAt,
 		Pageable pageable);