update db appender

Author: tamizhvendan

clojure/wheel/resources/db/migration/V201910180025__alter_event.sql

@@ -0,0 +1,6 @@
+CREATE TYPE event_type AS ENUM ('domain', 'oms', 'system');
+
+ALTER TABLE event ALTER COLUMN channel_id DROP NOT NULL;
+ALTER TABLE event ALTER COLUMN channel_name DROP NOT NULL;
+ALTER TABLE event ADD COLUMN type event_type NOT NULL DEFAULT 'domain';
+ALTER TABLE event ADD COLUMN payload JSONB NOT NULL DEFAULT '{}';

clojure/wheel/src/wheel/infra/database.clj

@@ -3,6 +3,7 @@
             [mount.core :as mount]
             [hikari-cp.core :as hikari]
             [toucan.db :as db]
+            [cheshire.core :as json]
             [toucan.models :as models])
   (:import [org.flywaydb.core Flyway]
            [org.postgresql.util PGobject]))
@@ -25,7 +26,12 @@
   (fn [value]
     (doto (PGobject.)
       (.setType pg-enum-type)
-      (.setValue (name value)))))
+      (.setValue (if value (name value) value)))))
+
+(defn- to-pg-jsonb [value]
+  (doto (PGobject.)
+    (.setType "jsonb")
+    (.setValue (json/generate-string value))))
 
 (defn- configure-toucan []
   (db/set-default-db-connection! {:datasource datasource})
@@ -36,7 +42,13 @@
                     :out keyword)
   (models/add-type! :channel-name
                     :in (pg-object-fn "channel_name")
-                    :out keyword))
+                    :out keyword)
+  (models/add-type! :event-type
+                    :in (pg-object-fn "event_type")
+                    :out keyword)
+  (models/add-type! :jsonb
+                    :in to-pg-jsonb
+                    :out #(json/parse-string (.getValue %) true)))
 
 (mount/defstate toucan
   :start (configure-toucan))

clojure/wheel/src/wheel/infra/log_appender/database.clj

@@ -3,10 +3,9 @@
 
 (defn- append-to-db [{:keys [msg_]}]
   (let [evnt (read-string (force msg_))]
-    (when (= :domain (:type evnt))
-      (event/create! evnt))))
+    (event/create! evnt)))
 
-(def appender {:enabled? true
+(def appender {:enabled?  true
                :output-fn :inherit
-               :async? true
-               :fn append-to-db})
+               :async?    true
+               :fn        append-to-db})

clojure/wheel/src/wheel/model/event.clj

@@ -9,26 +9,35 @@
 (models/defmodel Event :event
   models/IModel
   (types [_]
-         {:name :keyword
+         {:name         :keyword
           :channel-name :channel-name
-          :level :event-level}))
+          :level        :event-level
+          :type         :event-type
+          :payload      :jsonb}))
 
 (defn- timestamp->offset-date-time [timestamp]
   (OffsetDateTime/parse timestamp DateTimeFormatter/ISO_OFFSET_DATE_TIME))
 
 (defn create! [new-event]
-  {:pre [(s/assert ::event/event new-event)
-         (s/assert event/domain? new-event)]}
-  (as-> new-event evt
-    (update evt :timestamp timestamp->offset-date-time)
-    (dissoc evt :type)
-    (db/insert! Event evt)))
+  {:pre [(s/assert ::event/event new-event)]}
+  (try
+    (db/insert! Event
+                (update new-event :timestamp timestamp->offset-date-time))
+    (catch Throwable ex
+      (prn "<<>>>" ex))))
 
 (comment
- (create! {:name :ranging/succeeded
-           :type :domain
-           :channel-id "UA"
-           :level :info
-           :timestamp "2019-10-01T12:30+05:30"
-           :id (java.util.UUID/randomUUID)
-           :channel-name :tata-cliq}))
+  (db/insert! Event {:id        #uuid "a3c18c62-2795-4511-859d-58f56b006f91"
+                     :timestamp "2019-10-18T00:48:46.354+05:30"
+                     :name      :oms/items-ranged
+                     :level     :info
+                     :type      :oms
+                     :payload   {:message "<EXTNChannelList>   <EXTNChannelItemList>     <EXTNChannelItem ChannelID=\"UA\" EAN=\"EAN_1\" ItemID=\"SKU1\" RangeFlag=\"Y\"/>   </EXTNChannelItemList> </EXTNChannelList>"
+                                 :type    :oms/items-ranged}})
+  (create! {:name         :ranging/succeeded
+            :type         :domain
+            :channel-id   "UA"
+            :level        :info
+            :timestamp    "2019-10-01T12:30+05:30"
+            :id           (java.util.UUID/randomUUID)
+            :channel-name :tata-cliq}))