Merge pull request #125 from Capstone-OpenStep/refactor/#124-get-task

REFACTOR: 상태 변경(FORKED->PROGRESS) api 추가

Author: Miging

src/main/java/com/chungang/capstone/openstep/domain/Task/controller/TaskController.java

@@ -14,6 +14,7 @@
 import com.chungang.capstone.openstep.domain.Task.converter.TaskConverter;
 import com.chungang.capstone.openstep.domain.Task.dto.TaskResponseDTO;
 import com.chungang.capstone.openstep.domain.Task.entity.Task;
+import com.chungang.capstone.openstep.domain.Task.entity.TaskStatus;
 import com.chungang.capstone.openstep.domain.Task.service.TaskQueryService;
 import com.chungang.capstone.openstep.global.apiPayload.ApiResponse;
 import com.chungang.capstone.openstep.global.apiPayload.code.status.SuccessStatus;
@@ -57,6 +58,15 @@ public ApiResponse<TaskResponseDTO.Status> getTaskStatus(
 		Member member= SecurityUtils.getCurrentMember();
 		return ApiResponse.onSuccess(SuccessStatus.TASK_BRANCH_GET_OK, taskQueryService.getStatusByTaskId(taskId,member));
 	}
+	@Operation(summary = "특정 테스크의 상태 변경 API", description = "특정 기여(테스크) 상태를 FORKED -> PROGRESS로 변경합니다.")
+	@PatchMapping("/{task-id}/status")
+	public ApiResponse<TaskResponseDTO.Status> updateTaskStatus(
+		@PathVariable("task-id") Long taskId
+	) {
+		Member member = SecurityUtils.getCurrentMember();
+		TaskResponseDTO.Status updatedStatus = taskQueryService.updateTaskStatusToProgress(taskId, member);
+		return ApiResponse.onSuccess(SuccessStatus.TASK_STATUS_UPDATE_OK, updatedStatus);
+	}
 
 
 

src/main/java/com/chungang/capstone/openstep/domain/Task/repository/TaskRepository.java

@@ -30,10 +30,10 @@ public interface TaskRepository extends JpaRepository<Task, Long> {
 	long countByMemberIdAndStatus(@Param("memberId") Long memberId, @Param("status") TaskStatus status);
 
 	// 특정 날짜 이후의 활동이 있었던 날들 조회
-	@Query("SELECT DISTINCT DATE(t.updatedAt) FROM Task t WHERE t.member.memberId = :memberId AND t.updatedAt >= :fromDate ORDER BY DATE(t.updatedAt)")
+	@Query("SELECT DISTINCT CAST(t.createdAt AS LocalDate) FROM Task t WHERE t.member.memberId = :memberId AND t.createdAt >= :since ORDER BY CAST(t.createdAt AS LocalDate)")
 	List<LocalDate> findDistinctActivityDatesByMemberIdSince(
 		@Param("memberId") Long memberId,
-		@Param("fromDate") LocalDateTime fromDate
+		@Param("since") LocalDateTime since
 	);
 
 	// Explorer 업적용: distinct repo 개수

src/main/java/com/chungang/capstone/openstep/domain/Task/service/TaskQueryService.java

@@ -9,7 +9,6 @@
 import com.chungang.capstone.openstep.domain.Rank.repository.TaskXpLogRepository;
 import com.chungang.capstone.openstep.domain.Rank.service.RankCommandService;
 
-import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 
 import com.chungang.capstone.openstep.domain.Github.service.GitHubStatusResolverService;
@@ -20,10 +19,6 @@
 import com.chungang.capstone.openstep.domain.Task.entity.Task;
 import com.chungang.capstone.openstep.domain.Task.entity.TaskStatus;
 import com.chungang.capstone.openstep.domain.Task.repository.TaskRepository;
-import com.chungang.capstone.openstep.domain.achievement.entity.MemberAchievement;
-import com.chungang.capstone.openstep.domain.achievement.event.PrCreatedEvent;
-import com.chungang.capstone.openstep.domain.achievement.event.TaskActivityEvent;
-import com.chungang.capstone.openstep.domain.achievement.event.TaskCompletedEvent;
 import com.chungang.capstone.openstep.domain.achievement.service.AchievementService;
 import com.chungang.capstone.openstep.global.apiPayload.code.status.ErrorStatus;
 import com.chungang.capstone.openstep.global.apiPayload.exception.TaskException;
@@ -263,4 +258,17 @@ public TaskResponseDTO.TaskDetail updatePRUrl(Long taskId,String prUrl ,Member m
 		taskRepository.save(task);
 		return TaskConverter.toTaskDetail(task);
 	}
+
+	public TaskResponseDTO.Status updateTaskStatusToProgress(Long taskId, Member member) {
+		Task task = taskRepository.findById(taskId).orElseThrow(() ->
+			new TaskException(ErrorStatus.TASK_NOT_FOUND));
+
+		if(task.getStatus()!=TaskStatus.FORKED) {
+			throw new TaskException(ErrorStatus.TASK_STATUS_UPDATE_FORBIDDEN);
+		}
+		task.updateStatus(TaskStatus.PROGRESS);
+		taskRepository.save(task);
+
+		return TaskConverter.toTaskStatus(task);
+	}
 }

src/main/java/com/chungang/capstone/openstep/domain/achievement/enums/AchievementType.java

@@ -9,15 +9,13 @@ public enum AchievementType {
 
 	// 즉시 달성형
 	FIRST_COMMIT("첫 커밋", "처음으로 PR을 등록했을 때", 1, AchievementCategory.INSTANT),
-
-	// 누적형
 	BUG_HUNTER("버그 헌터", "bug, fix, error, issue 등의 키워드가 포함된 PR을 생성", 5, AchievementCategory.CUMULATIVE),
-	PR_MASTER("PR 마스터", "총 PR 생성 횟수가 5회 이상", 5, AchievementCategory.CUMULATIVE),
 
 	// 연속형 (활동 기반)
 	CONSISTENT_DEV("꾸준한 개발자", "7일 연속으로 Task 활동(상태 변경, 업데이트 등)을 진행", 7, AchievementCategory.CONSECUTIVE),
 
-	// 탐험형
+	// 누적형
+	PR_MASTER("PR 마스터", "총 PR 생성 횟수가 5회 이상", 5, AchievementCategory.CUMULATIVE),
 	EXPLORER_LV1("탐험가 LV1", "2개 이상의 서로 다른 Repo에서 Task를 생성", 2, AchievementCategory.EXPLORATION),
 	EXPLORER_LV2("탐험가 LV2", "5개 이상의 서로 다른 Repo에서 Task를 생성", 5, AchievementCategory.EXPLORATION),
 	EXPLORER_LV3("탐험가 LV3", "10개 이상의 서로 다른 Repo에서 Task를 생성", 10, AchievementCategory.EXPLORATION),

src/main/java/com/chungang/capstone/openstep/domain/achievement/listener/AchievementEventListener.java

@@ -5,15 +5,12 @@
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 
 import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
-import com.chungang.capstone.openstep.domain.Member.entity.Member;
-import com.chungang.capstone.openstep.domain.Task.entity.Task;
 import com.chungang.capstone.openstep.domain.Task.entity.TaskStatus;
 import com.chungang.capstone.openstep.domain.Task.repository.TaskRepository;
 import com.chungang.capstone.openstep.domain.achievement.enums.AchievementType;
@@ -91,7 +88,7 @@ public void handleTaskActivity(TaskActivityEvent event) {
 
 		try {
 			//활동 기반 꾸준한 개발자 업적 체크
-			checkConsistendDevAchievement(event);
+			checkConsistentDevAchievement(event);
 
 		} catch (Exception e) {
 			log.error("Error processing task activity event for user: {}", event.getMemberId(), e);
@@ -137,7 +134,7 @@ private void checkFirstCommitAchievement(PrCreatedEvent event) {
 		}
 	}
 
-	private void checkConsistendDevAchievement(TaskActivityEvent event) {
+	private void checkConsistentDevAchievement(TaskActivityEvent event) {
 		LocalDateTime sevenDaysAgo = LocalDateTime.now().minusDays(7);
 
 		// 최근 7일간 활동이 있었던 날들 조회

src/main/java/com/chungang/capstone/openstep/global/apiPayload/code/status/ErrorStatus.java

@@ -58,6 +58,7 @@ public enum ErrorStatus implements BaseErrorCode {
     TASK_NOT_FOUND(HttpStatus.NOT_FOUND, "TASK_4001", "존재하지 않는 테스크입니다."),
     TASK_PR_URL_UPDATE_ERROR_INVALID_URL(HttpStatus.BAD_REQUEST, "TASK_4002", "PR URL 형식이 올바르지 않습니다.https://github.com/<owner>/<repo>/pull/<pr-number>"),
     TASK_PR_URL_UPDATE_ERROR_EXCEPT_FORKED(HttpStatus.BAD_REQUEST, "TASK_4002", "PR URL 업데이트는 FORKED 상태에서는 불가능합니다"),
+    TASK_STATUS_UPDATE_FORBIDDEN(HttpStatus.FORBIDDEN, "TASK_4003", "테스크 상태 업데이트는 FORKED -> PROGRESS만 가능합니다."),
     TASK_PR_URL_INVALID(HttpStatus.BAD_REQUEST, "TASK_4003", "PR URL 형식이 올바르지 않습니다."),
 
     // Rank 관련 에러 5000