Improve naming: job-group is a keyword, so don't include "-name"

1 files changed, 10 insertions, 10 deletions

diff --git a/src/com/github/ivarref/yoltq.clj b/src/com/github/ivarref/yoltq.clj
index 88a7c31..8c8ca7a 100644
--- a/src/com/github/ivarref/yoltq.clj
+++ b/src/com/github/ivarref/yoltq.clj
@@ -257,27 +257,27 @@
          (sort-by (juxt :qname :status))
          (vec))))
 
-(defn job-group-progress [queue-name job-group-name]
+(defn job-group-progress [queue-name job-group]
   (let [{:keys [conn]} @*config*
         db (d/db conn)]
-    (->> (d/q '[:find ?e ?qname ?jgname ?status
-                :keys :e :qname :bname :status
-                :in $ ?qname ?jgname
+    (->> (d/q '[:find ?e ?qname ?job-group ?status
+                :keys :e :qname :job-group :status
+                :in $ ?qname ?job-group
                 :where
                 [?e :com.github.ivarref.yoltq/queue-name ?qname]
-                [?e :com.github.ivarref.yoltq/job-group-name ?jgname]
+                [?e :com.github.ivarref.yoltq/job-group ?job-group]
                 [?e :com.github.ivarref.yoltq/status ?status]]
-              db queue-name job-group-name)
-         (mapv #(select-keys % [:qname :bname :status]))
+              db queue-name job-group)
+         (mapv #(select-keys % [:qname :job-group :status]))
          (mapv (fn [qitem] {qitem 1}))
          (reduce (partial merge-with +) {})
-         (mapv (fn [[{:keys [qname bname status]} v]]
+         (mapv (fn [[{:keys [qname job-group status]} v]]
                  (array-map
                   :qname qname
-                  :job-group-name bname
+                  :job-group job-group
                   :status status
                   :count v)))
-         (sort-by (juxt :qname :job-group-name :status))
+         (sort-by (juxt :qname :job-group :status))
          (vec))))
 
 (defn get-errors [qname]