Merge pull request #52 from waterflow80/level_1_repr_fix

fixed the level 1 representation for the get endpoint
EBIvariation · Sep 25, 2023 · 3199dc5 · 3199dc5
2 parents c7b9ebc + 23c51f3
commit 3199dc5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/uk/ac/ebi/eva/evaseqcol/controller/seqcol/SeqColController.java b/src/main/java/uk/ac/ebi/eva/evaseqcol/controller/seqcol/SeqColController.java
@@ -58,7 +58,7 @@ public ResponseEntity<?> getSeqColByDigestAndLevel(
                 case "1":
                     Optional<SeqColLevelOneEntity> levelOneEntity = (Optional<SeqColLevelOneEntity>) seqColService.getSeqColByDigestAndLevel(digest, 1);
                     if (levelOneEntity.isPresent()) {
-                        return ResponseEntity.ok(levelOneEntity.get());
+                        return ResponseEntity.ok(levelOneEntity.get().getSeqColLevel1Object());
                     }
                     break;
                 case "2":

diff --git a/src/test/java/uk/ac/ebi/eva/evaseqcol/controller/SeqColControllerIntegrationTest.java b/src/test/java/uk/ac/ebi/eva/evaseqcol/controller/SeqColControllerIntegrationTest.java
@@ -83,7 +83,8 @@ void getSeqColByDigestTest() {
         Map<String, List<String>> levelTwoEntity = restTemplate.getForObject(finalRequest + level_2_path, Map.class);
         assertNotNull(levelOneEntity);
         assertNotNull(levelTwoEntity);
-        assertNotNull(levelOneEntity.get("digest"));
+        assertNotNull(levelTwoEntity.get("names"));
+        assertNotNull(levelOneEntity.get("lengths"));
         assertNotNull(levelTwoEntity.get("sequences"));
     }