Subroutes: strains

datastore/strains.go

@@ -1,6 +1,8 @@
 package datastore
 
 import (
+	"fmt"
+	"strings"
 	"time"
 
 	"github.com/thermokarst/bactdb/models"
@@ -39,8 +41,27 @@ func (s *strainsStore) List(opt *models.StrainListOptions) ([]*models.Strain, er
 	if opt == nil {
 		opt = &models.StrainListOptions{}
 	}
+
+	sql := `SELECT * FROM strains`
+
+	var conds []string
+	var vals []interface{}
+
+	if opt.Genus != "" {
+		conds = append(conds, `species_id IN (SELECT s.id FROM species s
+		INNER JOIN genera g ON g.id = s.genus_id WHERE lower(g.genus_name) = $1)`)
+		vals = append(vals, opt.Genus)
+	}
+
+	if len(conds) > 0 {
+		sql += " WHERE (" + strings.Join(conds, ") AND (") + ")"
+	}
+
+	sql += fmt.Sprintf(" LIMIT $%v OFFSET $%v;", len(conds)+1, len(conds)+2)
+	vals = append(vals, opt.PerPageOrDefault(), opt.Offset())
+
 	var strains []*models.Strain
-	err := s.dbh.Select(&strains, `SELECT * FROM strains LIMIT $1 OFFSET $2;`, opt.PerPageOrDefault(), opt.Offset())
+	err := s.dbh.Select(&strains, sql, vals...)
 	if err != nil {
 		return nil, err
 	}

datastore/strains_test.go

@@ -1,6 +1,7 @@
 package datastore
 
 import (
+	"database/sql"
 	"reflect"
 	"testing"
 
@@ -21,9 +22,24 @@ func insertStrain(t *testing.T, tx *modl.Transaction) *models.Strain {
 func newStrain(t *testing.T, tx *modl.Transaction) *models.Strain {
 	// we want to create and insert a species (and genus) record too
 	species := insertSpecies(t, tx)
-	return &models.Strain{SpeciesId: species.Id, StrainName: "Test Strain",
-		StrainType: "Test Type", Etymology: "Test Etymology",
-		AccessionBanks: "Test Bank", GenbankEmblDdb: "Test Genbank"}
+	return &models.Strain{
+		SpeciesId:  species.Id,
+		StrainName: "Test Strain",
+		StrainType: "Test Type",
+		Etymology: models.NullString{
+			sql.NullString{
+				String: "Test Etymology",
+				Valid:  true,
+			},
+		},
+		AccessionBanks: "Test Bank",
+		GenbankEmblDdb: models.NullString{
+			sql.NullString{
+				String: "Test Genbank",
+				Valid:  true,
+			},
+		},
+	}
 }
 
 func TestStrainsStore_Get_db(t *testing.T) {