Require that user selects the family.

1 files changed, 24 insertions, 12 deletions

diff --git a/uploader/species/models.py b/uploader/species/models.py
index cea3549..4426b64 100644
--- a/uploader/species/models.py
+++ b/uploader/species/models.py
@@ -46,6 +46,7 @@ def species_by_id(conn: mdb.Connection, speciesid) -> dict:
 def save_species(conn: mdb.Connection,
                  common_name: str,
                  scientific_name: str,
+                 family: str,
                  taxon_id: Optional[str] = None) -> int:
     """
     Save a new species to the database.
@@ -58,20 +59,27 @@ def save_species(conn: mdb.Connection,
     scientific_name; The species' scientific name.
     """
     genus, species = scientific_name.split(" ")
-    species = {
-        "common_name": common_name,
-        "common_name_lower": common_name.lower(),
-        "menu_name": f"{common_name} ({genus[0]}. {species.lower()})",
-        "scientific_name": scientific_name,
-        "taxon_id": taxon_id
-    }
+    families = species_families(conn)
     with conn.cursor() as cursor:
+        cursor.execute("SELECT MAX(OrderId) FROM Species")
+        species = {
+            "common_name": common_name,
+            "common_name_lower": common_name.lower(),
+            "menu_name": f"{common_name} ({genus[0]}. {species.lower()})",
+            "scientific_name": scientific_name,
+            "family": family,
+            "family_order": families[family],
+            "taxon_id": taxon_id,
+            "species_order": cursor.fetchone()[0] + 5
+        }
         cursor.execute(
             "INSERT INTO Species("
-            "SpeciesName, Name, MenuName, FullName, TaxonomyId"
+            "SpeciesName, Name, MenuName, FullName, Family, FamilyOrderId, "
+            "TaxonomyId, OrderId"
             ") VALUES ("
             "%(common_name)s, %(common_name_lower)s, %(menu_name)s, "
-            "%(scientific_name)s, %(taxon_id)s"
+            "%(scientific_name)s, %(family)s, %(family_order)s, %(taxon_id)s, "
+            "%(species_order)s"
             ")",
             species)
         species_id = cursor.lastrowid
@@ -83,9 +91,13 @@ def save_species(conn: mdb.Connection,
         }
 
 
-def species_families(conn: mdb.Connection) -> tuple:
+def species_families(conn: mdb.Connection) -> dict:
     """Retrieve the families under which species are grouped."""
     with conn.cursor(cursorclass=DictCursor) as cursor:
         cursor.execute(
-            "SELECT DISTINCT(Family) FROM Species WHERE Family IS NOT NULL")
-        return tuple(fam["Family"] for fam in cursor.fetchall())
+            "SELECT DISTINCT(Family), FamilyOrderId FROM Species "
+            "WHERE Family IS NOT NULL")
+        return {
+            fam["Family"]: fam["FamilyOrderId"]
+            for fam in cursor.fetchall()
+        }