Merge pull request #733 from molgenis/fix/linkfile-nr-of-columns-info

fix: info endpoint returns incorrect number of columns for linkfile
molgenis · May 3, 2024 · f6a6a84 · f6a6a84
2 parents 2882fe3 + 57de814
commit f6a6a84
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/armadillo/src/main/java/org/molgenis/armadillo/storage/ArmadilloLinkFile.java b/armadillo/src/main/java/org/molgenis/armadillo/storage/ArmadilloLinkFile.java
@@ -118,6 +118,10 @@ public String getProject() {
     return this.project;
   }
 
+  public Integer getNumberOfVariables() {
+    return getVariables().split(",").length;
+  }
+
   public JsonObject loadFromStream(InputStream inputStream) {
     return JsonParser.parseReader(new InputStreamReader(inputStream)).getAsJsonObject();
   }

diff --git a/armadillo/src/main/java/org/molgenis/armadillo/storage/LocalStorageService.java b/armadillo/src/main/java/org/molgenis/armadillo/storage/LocalStorageService.java
@@ -219,7 +219,7 @@ private FileInfo getFileInfoForLinkFile(
         objectName,
         fileSizeWithUnit,
         tableDimensions.get("rows"),
-        tableDimensions.get("columns"),
+        String.valueOf(linkFile.getNumberOfVariables()),
         linkFile.getSourceProject() + "/" + linkFile.getSourceObject(),
         linkFile.getVariables().split(","));
   }

diff --git a/armadillo/src/test/java/org/molgenis/armadillo/storage/ArmadilloLinkFileTest.java b/armadillo/src/test/java/org/molgenis/armadillo/storage/ArmadilloLinkFileTest.java
@@ -40,6 +40,12 @@ public void testGetFileName() {
     assertEquals("folder/link-obj.alf", actual);
   }
 
+  @Test
+  public void testGetNumberOfVariables() {
+    Integer actual = alf.getNumberOfVariables();
+    assertEquals(3, actual);
+  }
+
   @Test
   public void testLoadFromStream() {
     InputStream inputStream = new ByteArrayInputStream(testData.getBytes());