Merge commit 'e1aa8eb062e32a46b1b6e7afcfc99e446ca16711' into work/tasks

This commit is contained in:
sechmachine
2026-08-15 01:19:29 +07:00
3 changed files with 130 additions and 2 deletions
@@ -1,6 +1,7 @@
package com.lab.labtimesheet.feature.project.service;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -178,6 +179,42 @@ class ProjectServiceIntegrationTest {
assertEquals(1, projectPages.dashboardSummary(mentorId).distinctActiveMemberCount());
}
@Test
void completedProjectQueriesReturnHistoricalMembersWithoutRequiringACurrentLeader() {
long mentorId = user("mentor-history@example.test", "MENTOR");
long leaderId = intern("leader-history@example.test", "I012");
long memberId = intern("member-history@example.test", "I013");
long projectId = createProject(mentorId, leaderId, "Completed history");
projectService.addMember(mentorId, projectId, memberId);
var activatedAt = dbTime(NOW.plusSeconds(30));
var completedAt = dbTime(NOW.plusSeconds(60));
jdbc.update("""
update project_leadership_terms
set ended_at = ?, ended_by_mentor_user_id = ?
where project_id = ? and ended_at is null
""", completedAt, mentorId, projectId);
jdbc.update("""
update project_memberships
set left_at = ?, removed_by_mentor_user_id = ?, updated_at = ?
where project_id = ? and left_at is null
""", completedAt, mentorId, completedAt, projectId);
jdbc.update("""
update projects
set status = 'COMPLETED', activated_at = ?, completed_at = ?, updated_at = ?
where id = ?
""", activatedAt, completedAt, completedAt, projectId);
entityManager.clear();
var taskContext = projectPages.taskContext(memberId, projectId);
assertEquals("COMPLETED", taskContext.status());
assertNull(taskContext.currentLeaderMembershipId());
assertEquals(List.of(), taskContext.activeMembers());
var members = projectPages.members(memberId, projectId);
assertEquals(2, members.size());
assertTrue(members.stream().allMatch(member -> member.leftAt() != null));
assertTrue(members.stream().noneMatch(member -> member.currentLeader()));
}
private long createProject(long mentorId, long leaderId, String name) {
return projectService.create(
mentorId,