From a1eb237f7fccbcc6598f056c598463c0c26a56e3 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Tue, 7 Jul 2015 08:53:29 -0800
Subject: [PATCH] Genus ID helper (fixes species PUT regression)

---
 species.go | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/species.go b/species.go
index 3e82688..47305bd 100644
--- a/species.go
+++ b/species.go
@@ -136,6 +136,12 @@ func (s SpeciesService) update(id int64, e *entity, claims Claims) *appError {
 	species.UpdatedAt = currentTime()
 	species.Id = id
 
+	genus_id, err := genusIdFromName(species.GenusName)
+	if err != nil {
+		return newJSONError(err, http.StatusInternalServerError)
+	}
+	species.SpeciesBase.GenusID = genus_id
+
 	count, err := DBH.Update(species.SpeciesBase)
 	if err != nil {
 		return newJSONError(err, http.StatusInternalServerError)
@@ -154,16 +160,24 @@ func (s SpeciesService) create(e *entity, claims Claims) *appError {
 	species.UpdatedBy = claims.Sub
 	species.UpdatedAt = ct
 
-	var genus_id struct{ Id int64 }
-	q := `SELECT id FROM genera WHERE LOWER(genus_name) = LOWER($1);`
-	if err := DBH.SelectOne(&genus_id, q, species.GenusName); err != nil {
+	genus_id, err := genusIdFromName(species.GenusName)
+	if err != nil {
 		return newJSONError(err, http.StatusInternalServerError)
 	}
-	species.SpeciesBase.GenusID = genus_id.Id
+	species.SpeciesBase.GenusID = genus_id
 
-	err := DBH.Insert(species.SpeciesBase)
+	err = DBH.Insert(species.SpeciesBase)
 	if err != nil {
 		return newJSONError(err, http.StatusInternalServerError)
 	}
 	return nil
 }
+
+func genusIdFromName(genus_name string) (int64, error) {
+	var genus_id struct{ Id int64 }
+	q := `SELECT id FROM genera WHERE LOWER(genus_name) = LOWER($1);`
+	if err := DBH.SelectOne(&genus_id, q, genus_name); err != nil {
+		return 0, err
+	}
+	return genus_id.Id, nil
+}