From f6fb673058fbaeda8617e0e217b0de57eda2d9e2 Mon Sep 17 00:00:00 2001 From: Marius Peter Date: Sun, 30 Nov 2025 12:22:27 +0100 Subject: Tidy up model modules. --- models/nutrient-measurement.rkt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'models/nutrient-measurement.rkt') diff --git a/models/nutrient-measurement.rkt b/models/nutrient-measurement.rkt index 1f8bd7b..fd797e9 100644 --- a/models/nutrient-measurement.rkt +++ b/models/nutrient-measurement.rkt @@ -9,9 +9,7 @@ [create-nutrient-measurement! (-> string? nutrient-value-hash/c nutrient-measurement?)] [get-nutrient-measurements (-> (listof nutrient-measurement?))] [get-nutrient-measurement - (->* () - (#:id exact-nonnegative-integer? #:date string?) - (or/c nutrient-measurement? #f))] + (->* () (#:id exact-nonnegative-integer? #:date string?) (or/c nutrient-measurement? #f))] [get-nutrient-measurement-values (-> nutrient-measurement-or-id/c nutrient-value-hash/c)] [get-nutrient-measurement-value (-> nutrient-measurement-or-id/c nutrient? maybe-nutrient-value?)] @@ -40,7 +38,6 @@ (~a v #:max-width 6 #:align 'right))))) (define nutrient-measurement-id? exact-nonnegative-integer?) - (define nutrient-measurement-or-id/c (or/c nutrient-measurement? nutrient-measurement-id?)) (define (->nm-id nm-or-id) @@ -54,10 +51,12 @@ (or (get-nutrient-measurement #:date measurement-date) (with-tx - (query-exec (current-conn) (insert #:into nutrient_measurements #:set [measurement_date ,measurement-date])) + (query-exec (current-conn) + (insert #:into nutrient_measurements #:set [measurement_date ,measurement-date])) (define nm-id - (query-value (current-conn) - (select id #:from nutrient_measurements #:where (= measurement_date ,measurement-date)))) + (query-value + (current-conn) + (select id #:from nutrient_measurements #:where (= measurement_date ,measurement-date)))) (query-exec (current-conn) (insert #:into nutrient_value_sets #:set [nutrient_measurement_id ,nm-id])) (define nvs-id -- cgit v1.2.3