Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -240,7 +240,7 @@ public TaskResult findById(UUID taskId, ActorContext actor) {
return toResult(
task,
checklistRepository.findAllByTaskIdAndCompanyId(taskId, actor.companyId()),
findWorker(task, actor.companyId()),
findWorkerReadOnly(task, actor.companyId()),
catalogService.requireWorkflow(task.workflowId())
);
}
Expand Down Expand Up @@ -611,6 +611,13 @@ private WorkerTaskContext findWorker(Task task, UUID companyId) {
: null;
}

private WorkerTaskContext findWorkerReadOnly(Task task, UUID companyId) {
return task.targetType() == TaskTargetType.WORKER
? workerReader.findByIdAndCompanyIdReadOnly(task.workerId(), companyId)
.orElseThrow(() -> new ApiException(TaskErrorCode.WORKER_NOT_FOUND))
: null;
}

private WorkerTaskContext resolveCreateTarget(
CreateTaskCommand command,
WorkflowDefinition workflow,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@
public interface WorkerTaskContextReader {

Optional<WorkerTaskContext> findByIdAndCompanyId(UUID workerId, UUID companyId);

Optional<WorkerTaskContext> findByIdAndCompanyIdReadOnly(UUID workerId, UUID companyId);
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,18 @@ public Optional<WorkerTaskContext> findByIdAndCompanyId(UUID workerId, UUID comp
return Optional.empty();
}

return findContext(workerId, companyId);
}

@Override
public Optional<WorkerTaskContext> findByIdAndCompanyIdReadOnly(
UUID workerId,
UUID companyId
) {
return findContext(workerId, companyId);
}

private Optional<WorkerTaskContext> findContext(UUID workerId, UUID companyId) {
List<WorkerTaskContext> rows = jdbcTemplate.query(
"""
SELECT worker_id, work_status, stay_expiry_date,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,16 @@
import static org.assertj.core.api.Assertions.assertThat;

import com.fowoco.server.ServerApplication;
import com.fowoco.server.auth.application.ActorContext;
import com.fowoco.server.auth.domain.UserRole;
import com.fowoco.server.common.security.PostgreSqlRlsTestLock;
import com.fowoco.server.task.application.TaskResult;
import com.fowoco.server.task.application.TaskWorkflowService;
import java.nio.file.Path;
import java.sql.Timestamp;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
Expand All @@ -24,6 +29,10 @@ class DemoSeedPostgreSqlApplicationIntegrationTest {

private static final UUID COMPANY_ID =
UUID.fromString("90000000-0000-0000-0000-000000000001");
private static final UUID ADMIN_USER_ID =
UUID.fromString("90000000-0000-0000-0000-000000000002");
private static final UUID TASK_ID =
UUID.fromString("94000000-0000-0000-0000-000000000003");
private static final UUID REPRESENTATIVE_WORKER_ID =
UUID.fromString("92000000-0000-0000-0000-000000000006");
private static final UUID SHOWCASE_CASE_ID =
Expand Down Expand Up @@ -67,6 +76,7 @@ void bootsFullDemoSeedUpgradesPreviousReleaseAndRestartsIdempotentlyOnPostgreSql
)) {
JdbcTemplate jdbcTemplate = context.getBean(JdbcTemplate.class);
assertGoldenFlowStartState(jdbcTemplate);
assertTaskDetailReadable(context);
firstBoot = snapshot(jdbcTemplate);
emulatePreviousReleaseSeed(jdbcTemplate);
}
Expand All @@ -78,6 +88,7 @@ void bootsFullDemoSeedUpgradesPreviousReleaseAndRestartsIdempotentlyOnPostgreSql
)) {
JdbcTemplate jdbcTemplate = context.getBean(JdbcTemplate.class);
assertGoldenFlowStartState(jdbcTemplate);
assertTaskDetailReadable(context);
assertThat(snapshot(jdbcTemplate)).isEqualTo(firstBoot);
}

Expand Down Expand Up @@ -261,6 +272,16 @@ SELECT COUNT(*)
}
}

private void assertTaskDetailReadable(ConfigurableApplicationContext context) {
TaskResult result = context.getBean(TaskWorkflowService.class).findById(
TASK_ID,
new ActorContext(ADMIN_USER_ID, COMPANY_ID, Set.of(UserRole.ADMIN))
);

assertThat(result.task().taskId()).isEqualTo(TASK_ID);
assertThat(result.task().workerId()).isNotNull();
}

private SeedSnapshot snapshot(JdbcTemplate jdbcTemplate) {
Map<String, Integer> counts = new LinkedHashMap<>();
EXPECTED_COUNTS.forEach((table, expected) -> {
Expand Down
Loading