Merge branch 'hotfix/class-order'

biodiversitydata-se · Nov 4, 2024 · 8376695 · 8376695
2 parents 94a9713 + d058ea9
commit 8376695
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/db/db-api-schema.sql b/db/db-api-schema.sql
@@ -109,8 +109,8 @@ SELECT ds.pid AS dataset_pid,
     ta.taxon_rank AS "taxonRank",
     ta.kingdom,
     ta.phylum,
-    ta.oorder AS "order",
     ta.class,
+    ta.oorder AS "order",
     ta.family,
     ta.genus,
     ta.specific_epithet AS specificepithet,
@@ -120,7 +120,7 @@ SELECT ds.pid AS dataset_pid,
     ta.date_identified AS "dateIdentified",
     ta.identification_references AS "identificationReferences",
     concat_ws(' '::text, ta.annotation_algorithm, 'annotation against', ta.reference_db::text || ';'::text, 'confidence at lowest specified (ASV portal) taxon:', ta.annotation_confidence) AS "identificationRemarks",
-    (('By data provider: '::text || oc.previous_identifications::text) || '; By ASV portal: '::text) || concat_ws('|'::text, ta.kingdom, ta.phylum, ta.oorder, ta.class, ta.family, ta.genus, ta.specific_epithet, ta.infraspecific_epithet, ta.otu) AS "previousIdentifications",
+    (('By data provider: '::text || oc.previous_identifications::text) || '; By ASV portal: '::text) || concat_ws('|'::text, ta.kingdom, ta.phylum, ta.class, ta.oorder, ta.family, ta.genus, ta.specific_epithet, ta.infraspecific_epithet, ta.otu) AS "previousIdentifications",
     '' AS "dynamicProperties"
 FROM :data_schema.sampling_event se
     JOIN :data_schema.occurrence oc ON oc.event_pid = se.pid
@@ -494,8 +494,8 @@ SELECT ds_asv.dataset_pid,
     ta.taxon_rank AS "taxonRank",
     ta.kingdom,
     ta.phylum,
-    ta.oorder AS "order",
     ta.class,
+    ta.oorder AS "order",
     ta.family,
     ta.genus,
     ta.specific_epithet AS "specificEpithet",

diff --git a/molmod/requirements.txt b/molmod/requirements.txt
@@ -14,6 +14,7 @@ requests==2.31.0
 urllib3==1.26.18
 Werkzeug==3.0.1
 WTForms==3.0.1
+numpy==1.26.4
 pandas==1.5.0
 psycopg2-binary==2.9.3
 openpyxl==3.0.10