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

[METASVC-125] Fix filtering converter #93

Merged
merged 2 commits into from
Apr 11, 2024
Merged

[METASVC-125] Fix filtering converter #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff18211
[METASVC-125] Fix string to filtering converter
daforster Apr 9, 2024
c41b26d
Fix mockmvc get request using URI instead of template
daforster Apr 10, 2024
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
3 changes: 0 additions & 3 deletions ...ub/dbmdz/metadata/server/controller/converter/StringToFilterCriteriaGenericConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
import de.digitalcollections.model.list.filtering.FilterLogicalOperator;
import de.digitalcollections.model.list.filtering.FilterOperation;
import de.digitalcollections.model.list.filtering.Filtering;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
Expand Down Expand Up @@ -52,7 +50,6 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
}
if (!(source instanceof String sourceString))
throw new IllegalArgumentException("`source` parameter must be of type `String`.");
sourceString = URLDecoder.decode(sourceString, StandardCharsets.UTF_8);
if (!StringUtils.hasText(sourceString)) {
return null;
} else if (!sourceString.contains(":")) {
Expand Down
8 changes: 6 additions & 2 deletions ...r/webapp/src/test/java/io/github/dbmdz/metadata/server/controller/BaseControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
package io.github.dbmdz.metadata.server.controller;

import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

import de.digitalcollections.model.list.paging.PageRequest;
import de.digitalcollections.model.list.paging.PageResponse;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.nio.file.Files;
Expand Down Expand Up @@ -140,7 +144,7 @@ protected void testJson(String path) throws Exception {
*/
protected void testJson(String path, String expectedJsonPath) throws Exception {
mockMvc
.perform(get(path))
.perform(get(new URI(path)))
.andExpect(status().isOk())
.andExpect(content().contentType(ContentType.APPLICATION_JSON.getMimeType()))
.andExpect(content().json(getJsonFromFileResource(expectedJsonPath)));
Expand Down
6 changes: 5 additions & 1 deletion ...bmdz/metadata/server/controller/converter/StringToFilterCriteriaGenericConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import io.github.dbmdz.metadata.server.business.api.service.identifiable.IdentifiableService;
import io.github.dbmdz.metadata.server.business.api.service.identifiable.alias.UrlAliasService;
import io.github.dbmdz.metadata.server.controller.identifiable.IdentifiableController;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -55,7 +57,9 @@ void testFiltering() {
"%7B$OR;label.de-Latn:like:some+%5C%7B+text+%5C%7D;description.de-Latn:like:some%5C%5C%3B+text%7D;%7BlastModified:gt:2020-01-01%7D";
Object actual =
converter.convert(
source, TypeDescriptor.forObject(source), TypeDescriptor.valueOf(Filtering.class));
URLDecoder.decode(source, StandardCharsets.UTF_8),
TypeDescriptor.forObject(source),
TypeDescriptor.valueOf(Filtering.class));
assertThat(actual instanceof Filtering).isTrue();
assertThat(actual).isEqualTo(expected);
}
Expand Down
Loading