Merge branch 'master' into feature/iss-304-other-names

WormBase · Sep 7, 2020 · da65b93 · da65b93
2 parents bb3df6e + 2fc1495
commit da65b93
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Change-log
 
 ## [current-beta]
+ - Fixed batch split API new-biotype argument processing (#319)
 
 ## [1.4.3]
  - Improved & complemented docs

diff --git a/ids/src/wormbase/ids/core.clj b/ids/src/wormbase/ids/core.clj
@@ -185,11 +185,9 @@
                       xs)]
     (some->> xs
              (mapcat (fn [{:keys [from-id new-biotype product-sequence-name]}]
-                       (let [from-gene (pull-from-gene from-id)
-                             curr-bt (d/entid db (->> (find pull-attr-specs :gene/biotype)
-                                                      (flatten)
-                                                      (get-in from-gene)))
-                             new-bt (or (d/entid db new-biotype) curr-bt)]
-                         [[:db/add from-id :gene/splits product-sequence-name]
-                          [:db/add from-id :gene/biotype curr-bt new-bt]])))
+                       (let [new-split-tx [[:db/add from-id :gene/splits product-sequence-name]]]
+                         (if-let [new-bt (d/entid db new-biotype)]
+                           (conj new-split-tx
+                                 [:db/add from-id :gene/biotype new-bt])
+                           new-split-tx))))
              (cons ['wormbase.ids.core/new id-template :gene/id new-data]))))