Fixes and closes #911 - additional seedbank field

gbif · Jun 16, 2023 · 568f632 · 568f632
1 parent 42beccd
commit 568f632
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/...gatlas/pipelines/src/main/java/au/org/ala/pipelines/interpreters/SeedbankInterpreter.java b/...gatlas/pipelines/src/main/java/au/org/ala/pipelines/interpreters/SeedbankInterpreter.java
@@ -53,6 +53,7 @@ public class SeedbankInterpreter {
           .map(SeedbankTerm.numberTested, SeedbankInterpreter::setNumberTested)
           .map(SeedbankTerm.dateInStorage, this::interpretDateInStorage)
           .map(SeedbankTerm.dateCollected, this::interpretDateCollected)
+          .map(SeedbankTerm.numberNotViable, SeedbankInterpreter::setNumberNotViable)
           .map(SeedbankTerm.testDateStarted, this::interpretTestDateStarted);
 
   @Builder(buildMethodName = "create")
@@ -229,6 +230,14 @@ public static void setNumberTested(SeedbankRecord sr, String value) {
     }
   }
 
+  public static void setNumberNotViable(SeedbankRecord sr, String value) {
+    try {
+      sr.setNumberNotViable(Long.parseLong(value));
+    } catch (Exception e) {
+      // do nothing
+    }
+  }
+
   public void interpretDateCollected(SeedbankRecord sr, String dateCollected) {
     if (dateCollected != null) {
       String normalised =

diff --git a/livingatlas/pipelines/src/main/java/au/org/ala/term/SeedbankTerm.java b/livingatlas/pipelines/src/main/java/au/org/ala/term/SeedbankTerm.java
@@ -21,6 +21,7 @@ public enum SeedbankTerm implements Term {
   numberFull,
   numberGerminated,
   numberPlantsSampled,
+  numberNotViable,
   numberTested,
   plantForm,
   pretreatment,

diff --git a/sdks/models/src/main/avro/json/common-json-record.avsc b/sdks/models/src/main/avro/json/common-json-record.avsc
@@ -261,7 +261,8 @@
       {"name": "testDateStarted", "type": ["null", "long"], "default": null},
       {"name": "testLengthInDays", "type": ["null", "double"], "default": null},
       {"name": "thousandSeedWeight", "type": ["null", "double"], "default": null},
-      {"name": "viabilityPercentage", "type": ["null", "double"], "default": null}
+      {"name": "viabilityPercentage", "type": ["null", "double"], "default": null},
+      {"name": "numberNotViable", "type": ["null", "long"], "default": null}
     ]
   }
 ]