Insist on grouped-row naming convention.

1 files changed, 4 insertions, 5 deletions

diff --git a/models/fertilizer-product.rkt b/models/fertilizer-product.rkt
index 1ada2cd..9427844 100644
--- a/models/fertilizer-product.rkt
+++ b/models/fertilizer-product.rkt
@@ -91,8 +91,8 @@
                              (as nutrients n)
                              #:on (= n.id nv.nutrient_id))))
 
-(define (grouped-row->fertilizer-product row)
-  (match-define (vector fp-id canonical-name brand-name residuals) row)
+(define (grouped-row->fertilizer-product grouped-row)
+  (match-define (vector fp-id canonical-name brand-name residuals) grouped-row)
   (fertilizer-product fp-id canonical-name (residuals->nutrient-value-hash residuals) brand-name))
 
 (define (get-fertilizer-products)
@@ -110,8 +110,7 @@
                         #:order-by fp.canonical_name
                         #:asc)
                 #:group '#(0 1 2)))
-  (for/list ([row grouped-rows])
-    (grouped-row->fertilizer-product row)))
+  (map grouped-row->fertilizer-product grouped-rows))
 
 (define (get-fertilizer-product #:id [fp-id #f] #:canonical-name [canonical-name #f])
   (define where
@@ -138,7 +137,7 @@
                 #:group '#(0 1 2)))
   (match grouped-rows
     ['() #f]
-    [(list row) (grouped-row->fertilizer-product row)]
+    [(list grouped-row) (grouped-row->fertilizer-product grouped-row)]
     [many (error 'get-fertilizer-product "expected 1 fertilizer product, got ~a" (length many))]))
 
 (define (get-fertilizer-product-values fp-or-id)