Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
366b8d9
RWA-4067: Integration tests refactored
adityadwadasi Feb 20, 2025
b33e6ee
Code corrections.
adityadwadasi Feb 20, 2025
f6ded7d
Merge branch 'master' into RWA-4067_refactor_integration_tests
adityadwadasi Feb 25, 2025
7ae36cc
Removed PENDING_AUTO_ASSIGN Scenario
adityadwadasi Feb 26, 2025
2504f1d
Corrected test cases.
adityadwadasi Feb 26, 2025
e291add
Merge branch 'master' into RWA-4067_refactor_integration_tests
adityadwadasi Mar 3, 2025
bd34f5d
Merge branch 'master' into RWA-4067_refactor_integration_tests
adityadwadasi Mar 12, 2025
36914e0
Merge branch 'master' into RWA-4067_refactor_integration_tests
adityadwadasi Apr 3, 2025
487bca5
Merge branch 'master' into RWA-4067_refactor_integration_tests
adityadwadasi Apr 10, 2025
a35cc22
Merge branch 'master' into RWA-4067_refactor_integration_tests
adityadwadasi Apr 15, 2025
4341622
Merge branch 'master' into RWA-4067_refactor_integration_tests
adityadwadasi Apr 15, 2025
b570a62
Merge branch 'master' into RWA-4067_refactor_integration_tests
adityadwadasi Apr 16, 2025
86a3377
Merge branch 'master' into RWA-4067_refactor_integration_tests
adityadwadasi May 1, 2025
f6bdfba
Merge branch 'master' into RWA-4067_refactor_integration_tests
adityadwadasi May 1, 2025
f2f2449
Merge branch 'master' into RWA-4067_refactor_integration_tests
adityadwadasi May 6, 2025
460753d
Merge branch 'master' into RWA-4067_refactor_integration_tests
adityadwadasi May 20, 2025
16b4bfe
Merge branch 'master' into RWA-4067_refactor_integration_tests
adityadwadasi May 27, 2025
2599113
Merge branch 'master' into RWA-4067_refactor_integration_tests
adityadwadasi Jun 2, 2025
7b2b849
Merge branch 'master' into RWA-4067_refactor_integration_tests
adityadwadasi Jun 10, 2025
0e59c19
Merge branch 'master' into RWA-4067_refactor_integration_tests
adityadwadasi Jun 12, 2025
c08cfdc
Merge branch 'master' into RWA-4067_refactor_integration_tests
adityadwadasi Jul 15, 2025
790d997
Merge branch 'master' into RWA-4067_refactor_integration_tests
adityadwadasi Oct 15, 2025
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 @@ -40,15 +40,20 @@
import uk.gov.hmcts.reform.wataskmanagementapi.domain.search.SortingParameter;
import uk.gov.hmcts.reform.wataskmanagementapi.domain.search.parameter.SearchParameterList;
import uk.gov.hmcts.reform.wataskmanagementapi.domain.task.Task;
import uk.gov.hmcts.reform.wataskmanagementapi.entity.TaskResource;
import uk.gov.hmcts.reform.wataskmanagementapi.repository.TaskResourceRepository;
import uk.gov.hmcts.reform.wataskmanagementapi.services.CFTTaskDatabaseService;
import uk.gov.hmcts.reform.wataskmanagementapi.services.CFTTaskMapper;
import uk.gov.hmcts.reform.wataskmanagementapi.services.CamundaService;

import java.time.OffsetDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;

Expand Down Expand Up @@ -76,14 +81,21 @@ public class CftQueryServiceITTest extends RoleAssignmentHelper {
@Autowired
private AllowedJurisdictionConfiguration allowedJurisdictionConfiguration;

private CFTTaskDatabaseService cftTaskDatabaseService;

private static final UserInfo userInfo = UserInfo.builder().email("[email protected]").uid("user").build();

@Autowired
TaskResourceRepository taskResourceRepository;

@BeforeEach
void setUp() {
CFTTaskMapper cftTaskMapper = new CFTTaskMapper(new ObjectMapper());
cftQueryService = new CftQueryService(camundaService, cftTaskMapper, new TaskResourceDao(entityManager),
allowedJurisdictionConfiguration
);

cftTaskDatabaseService = new CFTTaskDatabaseService(taskResourceRepository, cftTaskMapper);
}

@Disabled
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test still looks like it is Disabled?

Expand Down Expand Up @@ -111,9 +123,9 @@ void shouldRetrieveTasks(TaskQueryScenario scenario) {
AccessControlResponse accessControlResponse = new AccessControlResponse(scenario.userInfo,
scenario.roleAssignments);
SearchRequest searchRequest = SearchTaskRequestMapper.map(scenario.searchTaskRequest);

indexRecord();
//when
final GetTasksResponse<Task> allTasks = cftQueryService.searchForTasks(
final GetTasksResponse<Task> allTasks = cftTaskDatabaseService.searchForTasks(
scenario.firstResult,
scenario.maxResults,
searchRequest,
Expand Down Expand Up @@ -818,6 +830,7 @@ private static List<RoleAssignment> roleAssignmentWithAllGrantTypes(Classificati
List<RoleAssignment> roleAssignments = new ArrayList<>();
RoleAssignment roleAssignment = RoleAssignment.builder().roleName("hmcts-judiciary")
.classification(classification)
.attributes(Collections.emptyMap())
.grantType(GrantType.SPECIFIC)
.roleType(RoleType.ORGANISATION)
.beginTime(OffsetDateTime.now().minusYears(1))
Expand Down Expand Up @@ -869,12 +882,9 @@ private static List<RoleAssignment> roleAssignmentWithAllGrantTypes(Classificati
.build();
roleAssignments.add(roleAssignment);

final Map<String, String> excludeddAttributes = Map.of(
RoleAttributeDefinition.CASE_ID.value(), "1623278362431003"
);
roleAssignment = RoleAssignment.builder().roleName("senior-tribunal-caseworker")
.classification(classification)
.attributes(excludeddAttributes)
.attributes(Collections.emptyMap())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you remove the excluded attributes?

.grantType(GrantType.EXCLUDED)
.roleType(RoleType.CASE)
.beginTime(OffsetDateTime.now().minusYears(1))
Expand All @@ -891,6 +901,7 @@ private static List<RoleAssignment> defaultSort(Classification classification) {
.classification(classification)
.roleType(RoleType.ORGANISATION)
.grantType(GrantType.SPECIFIC)
.attributes(Collections.emptyMap())
.beginTime(OffsetDateTime.now().minusYears(1))
.endTime(OffsetDateTime.now().plusYears(1))
.build();
Expand Down Expand Up @@ -919,4 +930,15 @@ public String toString() {
}

}

private void indexRecord() {
List<String> ids = new ArrayList<>();
taskResourceRepository.findAll().forEach(taskResource -> ids.add(taskResource.getTaskId()));
ids.forEach(id -> {
Optional<TaskResource> taskResource = taskResourceRepository.findById(id);
TaskResource task = taskResource.get();
task.setIndexed(true);
taskResourceRepository.save(task);
});
}
}
Loading