Skip to content

boilerplate new index #622

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

Open
sondrev wants to merge 2 commits into
base: main
Choose a base branch
from
Open

boilerplate new index #622

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
75edfe1
boilerplate new index
sondrev Dec 23, 2024
4e1e175
fix tests
sondrev Dec 23, 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: 3 additions & 0 deletions indexing-handlers/src/main/java/no/unit/nva/indexing/handlers/DeleteIndicesHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static no.unit.nva.constants.Words.MESSAGES_INDEX;
import static no.unit.nva.constants.Words.PUBLISHING_REQUESTS_INDEX;
import static no.unit.nva.constants.Words.RESOURCES;
import static no.unit.nva.constants.Words.RESOURCES_20241201;
import static no.unit.nva.constants.Words.TICKETS;

import static nva.commons.core.attempt.Try.attempt;
Expand Down Expand Up @@ -38,6 +39,8 @@ public String handleRequest(Object input, Context context) {

attempt(() -> indexingClient.deleteIndex(RESOURCES))
.orElse(fail -> logError(fail.getException()));
attempt(() -> indexingClient.deleteIndex(RESOURCES_20241201))
.orElse(fail -> logError(fail.getException()));
attempt(() -> indexingClient.deleteIndex(DOIREQUESTS_INDEX))
.orElse(fail -> logError(fail.getException()));
attempt(() -> indexingClient.deleteIndex(MESSAGES_INDEX))
Expand Down
9 changes: 9 additions & 0 deletions indexing-handlers/src/main/java/no/unit/nva/indexing/handlers/InitHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static no.unit.nva.constants.Words.MESSAGES_INDEX;
import static no.unit.nva.constants.Words.PUBLISHING_REQUESTS_INDEX;
import static no.unit.nva.constants.Words.RESOURCES;
import static no.unit.nva.constants.Words.RESOURCES_20241201;
import static no.unit.nva.constants.Words.TICKETS;
import static no.unit.nva.indexingclient.IndexingClient.defaultIndexingClient;

Expand Down Expand Up @@ -34,11 +35,19 @@ public class InitHandler implements RequestHandler<Object, String> {
IoUtils.stringFromResources(Path.of("ticket_mappings.json"));
private static final String RESOURCE_MAPPINGS =
IoUtils.stringFromResources(Path.of("resource_mappings.json"));
private static final String RESOURCE_20241201_MAPPINGS =
IoUtils.stringFromResources(Path.of("resource_20241201_mappings.json"));
private static final String RESOURCE_SETTINGS =
IoUtils.stringFromResources(Path.of("resource_settings.json"));
private static final String RESOURCE_20241201_SETTINGS =
IoUtils.stringFromResources(Path.of("resource_20241201_settings.json"));

private static final List<IndexRequest> INDEXES =
List.of(
new IndexRequest(
RESOURCES_20241201,
RESOURCE_20241201_MAPPINGS,
RESOURCE_20241201_SETTINGS),
new IndexRequest(RESOURCES, RESOURCE_MAPPINGS, RESOURCE_SETTINGS),
new IndexRequest(DOIREQUESTS_INDEX),
new IndexRequest(MESSAGES_INDEX),
Expand Down
5 changes: 5 additions & 0 deletions indexing-handlers/src/main/resources/resource_20241201_mappings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"properties": {

Copy link
Contributor Author

@sondrev sondrev Dec 23, 2024

Choose a reason for hiding this comment

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

Add fields during https://sikt.atlassian.net/browse/NP-48279

}
}
40 changes: 40 additions & 0 deletions indexing-handlers/src/main/resources/resource_20241201_settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"mapping": {
"total_fields": {
"limit": "1100"
}
},
"analysis": {
"char_filter": {
"quote": {
"type": "mapping",
"mappings": [
"« => \"",
"» => \"",
"\"\" => \""
]
}
},
"filter": {
"standard_nva_filter": {
"type": "asciifolding",
"preserve_original": true
}
},
"analyzer": {
"default": {
"type": "custom",
"tokenizer": "standard",
"char_filter": [
"html_strip",
"quote"
],
"filter": [
"lowercase",
"standard_nva_filter",
"scandinavian_normalization"
]
}
}
}
}
2 changes: 2 additions & 0 deletions indexing-handlers/src/test/java/no/unit/nva/indexing/handlers/DeleteIndicesHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import static no.unit.nva.constants.Words.MESSAGES_INDEX;
import static no.unit.nva.constants.Words.PUBLISHING_REQUESTS_INDEX;
import static no.unit.nva.constants.Words.RESOURCES;
import static no.unit.nva.constants.Words.RESOURCES_20241201;
import static no.unit.nva.constants.Words.TICKETS;
import static no.unit.nva.testutils.RandomDataGenerator.randomString;

Expand All @@ -28,6 +29,7 @@ class DeleteIndicesHandlerTest {
private static final List<String> ALL_INDICES =
List.of(
RESOURCES,
RESOURCES_20241201,
DOIREQUESTS_INDEX,
MESSAGES_INDEX,
TICKETS,
Expand Down
1 change: 1 addition & 0 deletions search-commons/src/main/java/no/unit/nva/constants/Words.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ public final class Words {
public static final String REFERENCE = "reference";
public static final String RELEVANCE_KEY_NAME = "relevance";
public static final String RESOURCES = "resources";
public static final String RESOURCES_20241201 = "resources-20241201";
public static final String RESOURCE_OWNER = "resourceOwner";
public static final String ROLE = "role";
public static final String ROOT = "root";
Expand Down
Loading