Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[OPIK-422] minor code improvements #634

Merged
merged 1 commit into from
Nov 14, 2024
Merged

[OPIK-422] minor code improvements #634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions apps/opik-backend/src/main/java/com/comet/opik/domain/ProjectService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,8 @@ private List<UUID> sortByLastTrace(
@NonNull Map<UUID, Instant> projectLastUpdatedTraceAtMap,
@NonNull SortingField sortingField) {
// for projects with no traces - use last_updated_at
allProjectIdsLastUpdated.stream().filter(project -> !projectLastUpdatedTraceAtMap.containsKey(project.id()))
.forEach(project -> projectLastUpdatedTraceAtMap.put(project.id(), project.lastUpdatedAt()));
allProjectIdsLastUpdated.forEach(
project -> projectLastUpdatedTraceAtMap.computeIfAbsent(project.id(), key -> project.lastUpdatedAt()));

Comparator<Map.Entry<UUID, Instant>> comparator = sortingField.direction() == Direction.DESC
? reverseOrder(Map.Entry.comparingByValue())
Expand Down
88 changes: 35 additions & 53 deletions ...opik-backend/src/test/java/com/comet/opik/api/resources/v1/priv/ProjectsResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,30 +831,7 @@ void getProjects__whenSortingProjectsByLastTrace__thenReturnProjectSorted(Direct
.lastUpdatedTraceAt(trace.lastUpdatedAt()).build();
}).toList();

var sorting = List.of(SortingField.builder()
.field(SortableFields.LAST_UPDATED_TRACE_AT)
.direction(request)
.build());

var actualResponse = client.target(URL_TEMPLATE.formatted(baseURI))
.queryParam("size", projects.size())
.queryParam("sorting", URLEncoder.encode(JsonUtils.writeValueAsString(sorting),
StandardCharsets.UTF_8))
.request()
.header(HttpHeaders.AUTHORIZATION, apiKey)
.header(WORKSPACE_HEADER, workspaceName)
.get();

var actualEntity = actualResponse.readEntity(Project.ProjectPage.class);

assertThat(actualResponse.getStatusInfo().getStatusCode()).isEqualTo(200);
assertThat(actualEntity.size()).isEqualTo(projects.size());
assertThat(actualEntity.total()).isEqualTo(projects.size());
assertThat(actualEntity.page()).isEqualTo(1);

var expectedProjects = expected == Direction.DESC ? projects.reversed() : projects;
assertThat(actualEntity.content()).usingRecursiveFieldByFieldElementComparatorIgnoringFields(IGNORED_FIELDS)
.containsExactlyElementsOf(expectedProjects);
requestAndAssertLastTraceSorting(workspaceName, apiKey, projects, request, expected);
}

@ParameterizedTest
Expand Down Expand Up @@ -888,36 +865,10 @@ void getProjects__whenSortingProjectsByLastTraceAndNoTraceExists__thenReturnProj
UUID projectId = createProject(project, apiKey, workspaceName);
return project.toBuilder().id(projectId).build();
}).toList();
List<Project> allProjects = Stream.concat(withTraceProjects.stream(), noTraceProjects.stream()).toList();

var sorting = List.of(SortingField.builder()
.field(SortableFields.LAST_UPDATED_TRACE_AT)
.direction(request)
.build());

var actualResponse = client.target(URL_TEMPLATE.formatted(baseURI))
.queryParam("size", allProjects.size())
.queryParam("sorting", URLEncoder.encode(JsonUtils.writeValueAsString(sorting),
StandardCharsets.UTF_8))
.request()
.header(HttpHeaders.AUTHORIZATION, apiKey)
.header(WORKSPACE_HEADER, workspaceName)
.get();

var actualEntity = actualResponse.readEntity(Project.ProjectPage.class);

assertThat(actualResponse.getStatusInfo().getStatusCode()).isEqualTo(200);
assertThat(actualEntity.size()).isEqualTo(allProjects.size());
assertThat(actualEntity.total()).isEqualTo(allProjects.size());
assertThat(actualEntity.page()).isEqualTo(1);

var allExpectedProjects = Stream.concat(withTraceProjects.stream(), noTraceProjects.stream()).toList();
if (expected == Direction.DESC) {
allExpectedProjects = allExpectedProjects.reversed();
}

assertThat(actualEntity.content()).usingRecursiveFieldByFieldElementComparatorIgnoringFields(IGNORED_FIELDS)
.containsExactlyElementsOf(allExpectedProjects);
requestAndAssertLastTraceSorting(
workspaceName, apiKey, Stream.concat(withTraceProjects.stream(), noTraceProjects.stream()).toList(),
request, expected);
}

public static Stream<Arguments> sortDirectionProvider() {
Expand Down Expand Up @@ -1248,6 +1199,37 @@ private void assertProject(Project project, String apiKey, String workspaceName)
assertThat(actualEntity.lastUpdatedAt()).isAfter(project.createdAt());
}

private void requestAndAssertLastTraceSorting(String workspaceName, String apiKey, List<Project> allProjects,
Direction request, Direction expected) {
var sorting = List.of(SortingField.builder()
.field(SortableFields.LAST_UPDATED_TRACE_AT)
.direction(request)
.build());

var actualResponse = client.target(URL_TEMPLATE.formatted(baseURI))
.queryParam("size", allProjects.size())
.queryParam("sorting", URLEncoder.encode(JsonUtils.writeValueAsString(sorting),
StandardCharsets.UTF_8))
.request()
.header(HttpHeaders.AUTHORIZATION, apiKey)
.header(WORKSPACE_HEADER, workspaceName)
.get();

var actualEntity = actualResponse.readEntity(Project.ProjectPage.class);

assertThat(actualResponse.getStatusInfo().getStatusCode()).isEqualTo(200);
assertThat(actualEntity.size()).isEqualTo(allProjects.size());
assertThat(actualEntity.total()).isEqualTo(allProjects.size());
assertThat(actualEntity.page()).isEqualTo(1);

if (expected == Direction.DESC) {
allProjects = allProjects.reversed();
}

assertThat(actualEntity.content()).usingRecursiveFieldByFieldElementComparatorIgnoringFields(IGNORED_FIELDS)
.containsExactlyElementsOf(allProjects);
}

@Nested
@DisplayName("Create:")
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
Expand Down