feat: message stats and user stats

Author: oxalorg

src/clojurians_log/db/queries.clj

@@ -137,16 +137,23 @@
                [?emoji :emoji/url ?url]]
              db)))
 
-(defn message-stats-between-days [db from-date to-date]
-  (d/q '[:find ?msg ?day
-         :in $ ?from-date ?to-date
+(defn unique-users-between-days [db from-day to-day]
+  (d/q '[:find (count ?user)
+         :in $ ?from-day ?to-day
          :where
+         [?msg :message/user ?user]
          [?msg :message/day ?day]
-         [(> ?day ?from-date)]
-         [(< ?day ?to-date)]]
+         [(> ?day ?from-day)]
+         [(< ?day ?to-day)]]
        db
-       from-date
-       to-date))
+       from-day
+       to-day))
+
+(defn message-stats-between-days [from-day to-day]
+  (letfn [(day-chan-cnt [] (:day-chan-cnt @!indexes))
+          (day-total [day] (apply + (vals (get (day-chan-cnt) day))))
+          (days-total [days] (transduce (map day-total) + 0 days))]
+    (mapv #(hash-map :day % :msg-count (day-total %)) (time-util/range-of-days from-day to-day))))
 
 #_
 (doseq [v [#'clojurians-log.db.queries/user-names

src/clojurians_log/routes.clj

@@ -145,12 +145,11 @@
         response/xml-render)))
 
 (defn message-stats-route [{:keys [endpoint] :as request}]
-  (let [config                    @(get-in endpoint [:config :value])
-        db (db-from-endpoint endpoint)
+  (let [config @(get-in endpoint [:config :value])
         {:keys [from-date to-date]} (:path-params request)]
     (-> request
         make-context
-        (assoc :data/message-stats (queries/message-stats-between-days db from-date to-date))
+        (assoc :data/message-stats (queries/message-stats-between-days from-date to-date))
         views/message-stats-page
         response/render)))
 

src/clojurians_log/time_util.clj

@@ -2,7 +2,7 @@
   (:require [java-time :as jt]
             [java-time.local :as jt.l]
             [clojure.string :as str])
-  (:import [java.time Instant]
+  (:import [java.time Instant LocalDate]
            [java.time.format DateTimeFormatter]))
 
 (defn ts->inst
@@ -81,3 +81,14 @@
          ret# ~expr]
      (prn (str ~label ": " (/ (double (- (. System (nanoTime)) start#)) 1000000.0) " msecs"))
      ret#))
+
+(defn range-of-local-dates [^LocalDate ld1 ^LocalDate ld2]
+  (when (.isBefore ld1 (.plusDays ld2 1))
+    (cons ld1 (lazy-seq (range-of-local-dates (.plusDays ld1 1) ld2)))))
+
+(defn range-of-days 
+  "Takes 2 day values as a strings and returns range of all days between them inclusive of both"
+  [from-day to-day]
+  (let [ld1 (java.time.LocalDate/parse from-day)
+        ld2 (java.time.LocalDate/parse to-day)]
+    (map str (range-of-local-dates ld1 ld2))))

src/clojurians_log/views.clj

@@ -288,7 +288,18 @@
 
 (defn- message-stats-page-html [{:data/keys [message-stats] :as context}]
   [:div
-    (for [[a b] message-stats] [:p a b])])
+   [:h3 (str "Showing message stats between " 
+             (:day (first message-stats)) 
+             " to "
+             (:day (last message-stats)))]
+   [:table
+    [:thead
+     [:tr
+      [:th "Day"]
+      [:th "Message count"]]]
+    [:tbody
+     (for [day-stat message-stats] [:tr [:td (:day day-stat)] [:td (:msg-count day-stat)]])]]
+   [:h4 "Total message count: " (reduce #(+ %1 (:msg-count %2)) 0 message-stats)]])
 
 (defn log-page [context]
   (assoc context :response/html (log-page-html context)))