Merge pull request #241 from NDLANO/10-chars-in-context

10 chars in context
NDLANO · Mar 18, 2024 · 80a4cbc · 80a4cbc
2 parents d0dfe70 + b7979fe
commit 80a4cbc
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 17 deletions.
diff --git a/src/main/java/no/ndla/taxonomy/service/ContextUpdaterServiceImpl.java b/src/main/java/no/ndla/taxonomy/service/ContextUpdaterServiceImpl.java
@@ -71,7 +71,7 @@ private Set<Context> createContexts(Node node) {
                                                 .flatMap(relevance -> Optional.of(
                                                         relevance.getPublicId().toString()))
                                                 .orElse("urn:relevance:core"),
-                                        HashUtil.semiHash(parentContext.rootId() + parentConnection.getPublicId()),
+                                        HashUtil.mediumHash(parentContext.contextId() + parentConnection.getPublicId()),
                                         parentConnection.getRank(),
                                         parentConnection.getPublicId().toString());
                             })

diff --git a/src/main/java/no/ndla/taxonomy/service/NodeService.java b/src/main/java/no/ndla/taxonomy/service/NodeService.java
@@ -515,11 +515,7 @@ public List<TaxonomyContextDTO> getContextByPath(Optional<String> path, String l
         if (path.isPresent()) {
             String contextId = TitleUtil.getHashFromPath(path.get());
             List<Integer> ids = nodeRepository.findIdsByContextId(Optional.of(contextId));
-            var nodes = ids.stream()
-                    .map(nodeRepository::findById)
-                    .filter(Optional::isPresent)
-                    .map(Optional::get)
-                    .toList();
+            var nodes = nodeRepository.findByIds(ids);
             var contexts = nodesToContexts(nodes, false, language);
             return contexts.stream()
                     .filter(c -> c.contextId().equals(contextId))

diff --git a/src/main/java/no/ndla/taxonomy/util/HashUtil.java b/src/main/java/no/ndla/taxonomy/util/HashUtil.java
@@ -24,7 +24,7 @@ public static String shortHash(Object original) {
     }
 
     public static String mediumHash(Object original) {
-        return generateHash(original, 8);
+        return generateHash(original, 10);
     }
 
     public static String semiHash(Object original) {

diff --git a/src/test/java/no/ndla/taxonomy/rest/v1/QueryTest.java b/src/test/java/no/ndla/taxonomy/rest/v1/QueryTest.java
@@ -17,7 +17,6 @@
 import no.ndla.taxonomy.rest.v1.dtos.searchapi.LanguageFieldDTO;
 import no.ndla.taxonomy.rest.v1.dtos.searchapi.TaxonomyContextDTO;
 import no.ndla.taxonomy.service.dtos.NodeDTO;
-import no.ndla.taxonomy.util.HashUtil;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.mock.web.MockHttpServletResponse;
@@ -402,14 +401,10 @@ public void that_contexts_can_be_found_by_path() throws Exception {
                                 .contentUri("urn:article:1")
                                 .publicId("urn:resource:1"))));
         Node resource = nodeRepository.getByPublicId(URI.create("urn:resource:1"));
-        String hash = HashUtil.semiHash(root.getPublicId().toString()
-                + resource.getParentConnections().stream()
-                        .findFirst()
-                        .get()
-                        .getPublicId()
-                        .toString());
-
-        var response = testUtils.getResource("/v1/queries/path?path=" + String.format("/one-fine-resource__%s", hash));
+        var response = testUtils.getResource("/v1/queries/path?path="
+                + String.format(
+                        "/one-fine-resource__%s",
+                        resource.getContexts().stream().findFirst().get().contextId()));
         var result = testUtils.getObject(TaxonomyContextDTO[].class, response);
 
         assertEquals(1, result.length);

diff --git a/src/test/java/no/ndla/taxonomy/util/HashUtilTest.java b/src/test/java/no/ndla/taxonomy/util/HashUtilTest.java
@@ -22,7 +22,7 @@ public void get_different_length_hashes() {
         String fullHash = HashUtil.fullHash("original");
 
         assertEquals(4, shortHash.length());
-        assertEquals(8, mediumHash.length());
+        assertEquals(10, mediumHash.length());
         assertEquals(12, semiHash.length());
         assertEquals(16, longHash.length());
         assertTrue(fullHash.length() > 16);