Merge branch '1468-homomultimer-information-not-available-via-minerva-api' into 'master'

Resolve "Homomultimer information not available via MINERVA API"

Closes #1468

See merge request !1290

CHANGELOG

+minerva (16.0.0~alpha.1) stable; urgency=medium
+  * Small improvement: homomultimer information is provided in API (#1468)
+
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Fri, 19 Mar 2021 10:00:00 +0200
+
 minerva (16.0.0~alpha.1) stable; urgency=medium
   * Backward incompatibility: deprecated columns in data overlays are no longer
     supported (#958)

rest-api/src/main/java/lcsb/mapviewer/api/projects/models/bioEntities/elements/ElementsRestImpl.java

@@ -213,6 +213,13 @@ public class ElementsRestImpl extends BaseRestImpl {
       case "synonyms":
         value = element.getSynonyms();
         break;
+      case "homomultimer":
+        if (element instanceof Species) {
+          value = ((Species) element).getHomodimer();
+        } else {
+          value = null;
+        }
+        break;
       case "formula":
         value = element.getFormula();
         break;
@@ -385,6 +392,7 @@ public class ElementsRestImpl extends BaseRestImpl {
     result.add("activity");
     result.add("initialAmount");
     result.add("glyph");
+    result.add("homomultimer");
     return result;
   }
 

web/src/test/java/lcsb/mapviewer/web/MapControllerIntegrationTest.java

@@ -203,6 +203,10 @@ public class MapControllerIntegrationTest extends ControllerIntegrationTest {
             .description("is the element hypothetical")
             .type("boolean")
             .optional(),
+        fieldWithPath("[].homomultimer")
+            .description("multimer value")
+            .type("int")
+            .optional(),
         subsectionWithPath("[].other")
             .description("list of oher properties")
             .type("object")
@@ -340,7 +344,7 @@ public class MapControllerIntegrationTest extends ControllerIntegrationTest {
   }
 
   @Test
-  public void testGetAllElementsFiltereByType() throws Exception {
+  public void testGetAllElementsFilteredByType() throws Exception {
     RequestBuilder request = get(
         "/projects/{projectId}/models/{mapId}/bioEntities/elements/?columns=name,complexId&type=Protein",
         TEST_PROJECT, "*");