Rename batch -> job-group

3 files changed, 18 insertions, 18 deletions

diff --git a/src/com/github/ivarref/yoltq.clj b/src/com/github/ivarref/yoltq.clj
index ccd9062..88a7c31 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 batch-progress [queue-name batch-name]
+(defn job-group-progress [queue-name job-group-name]
   (let [{:keys [conn]} @*config*
         db (d/db conn)]
-    (->> (d/q '[:find ?e ?qname ?bname ?status
+    (->> (d/q '[:find ?e ?qname ?jgname ?status
                 :keys :e :qname :bname :status
-                :in $ ?qname ?bname
+                :in $ ?qname ?jgname
                 :where
                 [?e :com.github.ivarref.yoltq/queue-name ?qname]
-                [?e :com.github.ivarref.yoltq/batch-name ?bname]
+                [?e :com.github.ivarref.yoltq/job-group-name ?jgname]
                 [?e :com.github.ivarref.yoltq/status ?status]]
-              db queue-name batch-name)
+              db queue-name job-group-name)
          (mapv #(select-keys % [:qname :bname :status]))
          (mapv (fn [qitem] {qitem 1}))
          (reduce (partial merge-with +) {})
          (mapv (fn [[{:keys [qname bname status]} v]]
                  (array-map
                   :qname qname
-                  :batch-name bname
+                  :job-group-name bname
                   :status status
                   :count v)))
-         (sort-by (juxt :qname :batch-name :status))
+         (sort-by (juxt :qname :job-group-name :status))
          (vec))))
 
 (defn get-errors [qname]
diff --git a/src/com/github/ivarref/yoltq/impl.clj b/src/com/github/ivarref/yoltq/impl.clj
index 6d2aa3d..e77655b 100644
--- a/src/com/github/ivarref/yoltq/impl.clj
+++ b/src/com/github/ivarref/yoltq/impl.clj
@@ -12,7 +12,7 @@
   [#:db{:ident :com.github.ivarref.yoltq/id, :cardinality :db.cardinality/one, :valueType :db.type/uuid, :unique :db.unique/identity}
    #:db{:ident :com.github.ivarref.yoltq/ext-id, :cardinality :db.cardinality/one, :valueType :db.type/string, :unique :db.unique/value}
    #:db{:ident :com.github.ivarref.yoltq/queue-name, :cardinality :db.cardinality/one, :valueType :db.type/keyword, :index true}
-   #:db{:ident :com.github.ivarref.yoltq/batch-name, :cardinality :db.cardinality/one, :valueType :db.type/keyword, :index true}
+   #:db{:ident :com.github.ivarref.yoltq/job-group-name, :cardinality :db.cardinality/one, :valueType :db.type/keyword, :index true}
    #:db{:ident :com.github.ivarref.yoltq/status, :cardinality :db.cardinality/one, :valueType :db.type/keyword, :index true}
    #:db{:ident :com.github.ivarref.yoltq/payload, :cardinality :db.cardinality/one, :valueType :db.type/string}
    #:db{:ident :com.github.ivarref.yoltq/payload-bytes, :cardinality :db.cardinality/one, :valueType :db.type/bytes}
@@ -105,8 +105,8 @@
               (throw (ex-info (str ":depends-on not found in database. Queue: " q ", id: " ext-id) opts))))
           (when-let [ext-id (:id opts)]
             {:com.github.ivarref.yoltq/ext-id (pr-str-safe :id [queue-name ext-id])})
-          (when-let [batch-name (:batch-name opts)]
-            {:com.github.ivarref.yoltq/batch-name batch-name}))))
+          (when-let [job-group-name (:job-group-name opts)]
+            {:com.github.ivarref.yoltq/job-group-name job-group-name}))))
     (do
       (log/error "Did not find registered handler for queue" queue-name)
       (throw (ex-info (str "Did not find registered handler for queue: " queue-name) {:queue queue-name})))))
diff --git a/test/com/github/ivarref/yoltq/virtual_test.clj b/test/com/github/ivarref/yoltq/virtual_test.clj
index 7621b13..d245aaa 100644
--- a/test/com/github/ivarref/yoltq/virtual_test.clj
+++ b/test/com/github/ivarref/yoltq/virtual_test.clj
@@ -451,24 +451,24 @@
     (tq/consume! :q)
     (is (= @got-work "asdf"))))
 
-(deftest batch-of-jobs-test
+(deftest job-group-test
   (let [conn (u/empty-conn)]
     (yq/init! {:conn conn})
     (yq/add-consumer! :q1 identity)
     (yq/add-consumer! :q2 identity)
-    @(d/transact conn [(yq/put :q1 {:work 123} {:batch-name :b1})
-                       (yq/put :q1 {:work 456} {:batch-name :b2})
-                       (yq/put :q2 {:work 789} {:batch-name :b1})])
+    @(d/transact conn [(yq/put :q1 {:work 123} {:job-group-name :b1})
+                       (yq/put :q1 {:work 456} {:job-group-name :b2})
+                       (yq/put :q2 {:work 789} {:job-group-name :b1})])
     (is (= [{:qname :q1
-             :batch-name :b1
+             :job-group-name :b1
              :status :init
              :count 1}]
-           (yq/batch-progress :q1 :b1)))
+           (yq/job-group-progress :q1 :b1)))
 
     (is (= {:work 123} (tq/consume! :q1)))
 
     (is (= [{:qname :q1
-             :batch-name :b1
+             :job-group-name :b1
              :status :done
              :count 1}]
-           (yq/batch-progress :q1 :b1)))))
+           (yq/job-group-progress :q1 :b1)))))