Merge 0ac6155 into 10893e6

griffithlab · Jul 26, 2019 · 72e7b02 · 72e7b02
2 parents 10893e6 + 0ac6155
commit 72e7b02
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/app/jobs/set_allele_registry_ids.rb b/app/jobs/set_allele_registry_ids.rb
@@ -5,9 +5,14 @@ def perform(recurring = true)
     begin
       Variant.where(allele_registry_id: nil).each do |v|
         allele_registry_id = get_allele_registry_id(v)
-        v.allele_registry_id = allele_registry_id
-        v.save
-        add_allele_registry_link(allele_registry_id)
+        if allele_registry_id == '_:CA'
+          v.allele_registry_is = 'unregistered'
+          v.save
+        else
+          v.allele_registry_id = allele_registry_id
+          v.save
+          add_allele_registry_link(allele_registry_id)
+        end
       end
     ensure
       reschedule if recurring

diff --git a/app/jobs/update_allele_registry_ids.rb b/app/jobs/update_allele_registry_ids.rb
@@ -7,12 +7,19 @@ def perform(recurring = true)
         old_allele_registry_id = v.allele_registry_id
         allele_registry_id = get_allele_registry_id(v)
         if allele_registry_id != old_allele_registry_id
-          v.allele_registry_id = allele_registry_id
-          v.save
-          add_allele_registry_link(allele_registry_id)
+          if allele_registry_id == '_:CA'
+            v.allele_registry_is = 'unregistered'
+            v.save
+          else
+            v.allele_registry_id = allele_registry_id
+            v.save
+            add_allele_registry_link(allele_registry_id)
+          end
           #delete the linkout if no other variant has this allele registry ID
-          if Variant.where(allele_registry_id: old_allele_registry_id).exists?
+          unless Variant.where(allele_registry_id: old_allele_registry_id).exists?
+            if old_allele_registry != '_:CA' and old_allele_registry != 'undefined'
               delete_allele_registry_link(old_allele_registry_id)
+            end
           end
         end
       end