diff --git a/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/SqlColumnExecutor.java b/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/SqlColumnExecutor.java index aedbb7e370..36152f8f9d 100644 --- a/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/SqlColumnExecutor.java +++ b/backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/SqlColumnExecutor.java @@ -311,6 +311,9 @@ public static TableMetadata getOntologyTableDefinition( // constraint so we can ensure unique labels on each level .setDescription("User-friendly label for this term. Should be unique in parent") .setSemantics("http://purl.obolibrary.org/obo/NCIT_C45561"), + column("tags") + .setType(STRING_ARRAY) + .setDescription("Any tags that you might need to slice and dice the ontology"), column("parent") // .setKey(2) when we upgrade to psql 15 so we can allow parent == null in // constraint diff --git a/backend/molgenis-emx2-typescript/src/test/resources/expected-types.ts b/backend/molgenis-emx2-typescript/src/test/resources/expected-types.ts index 03f7f535fc..348c31f611 100644 --- a/backend/molgenis-emx2-typescript/src/test/resources/expected-types.ts +++ b/backend/molgenis-emx2-typescript/src/test/resources/expected-types.ts @@ -49,6 +49,7 @@ export interface ITag { order?: number; name: string; label?: string; + tags?: string[]; parent?: ITag; codesystem?: string; code?: string; diff --git a/backend/molgenis-emx2-webapi/src/test/java/org.molgenis.emx2.web/WebApiSmokeTests.java b/backend/molgenis-emx2-webapi/src/test/java/org.molgenis.emx2.web/WebApiSmokeTests.java index 77c02fcd03..031bc1927a 100644 --- a/backend/molgenis-emx2-webapi/src/test/java/org.molgenis.emx2.web/WebApiSmokeTests.java +++ b/backend/molgenis-emx2-webapi/src/test/java/org.molgenis.emx2.web/WebApiSmokeTests.java @@ -538,7 +538,7 @@ public void testCsvApi_tableCsvUploadDownload() { String path = "/pet store/api/csv/Tag"; String result = given().sessionId(SESSION_ID).accept(ACCEPT_CSV).when().get(path).asString(); - assertTrue(result.contains("green,,colors")); + assertTrue(result.contains("green,,,colors")); String update = "name,parent\r\nyellow,colors\r\n"; given().sessionId(SESSION_ID).body(update).when().post(path).then().statusCode(200); @@ -549,7 +549,7 @@ public void testCsvApi_tableCsvUploadDownload() { given().sessionId(SESSION_ID).body(update).when().delete(path).then().statusCode(200); result = given().sessionId(SESSION_ID).accept(ACCEPT_CSV).when().get(path).asString(); - assertTrue(result.contains("green,,colors")); + assertTrue(result.contains("green,,,colors")); } @Test