feat: log more details when sending event notifications

CSCfi · Apr 20, 2020 · 9604f5d · 9604f5d
1 parent 425e04b
commit 9604f5d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/clj/rems/event_notification.clj b/src/clj/rems/event_notification.clj
@@ -15,11 +15,12 @@
 (def ^:private default-timeout 60)
 
 (defn- notify! [target body]
-  (log/info "Sending event notification to" (:url target))
+  (log/info "Sending event notification for event" (select-keys body [:application/id :event/type :event/time])
+            "to" (:url target))
   (try
     (let [timeout-ms (* 1000 (get target :timeout default-timeout))
           response (http/put (getx target :url)
-                             {:body body
+                             {:body (json/generate-string body)
                               :throw-exceptions false
                               :content-type :json
                               :headers (get target :headers)
@@ -68,9 +69,7 @@
     (is (true? (wants? target {:event/type :application.event/approved})))))
 
 (defn- notification-body [event]
-  (-> event
-      (assoc :event/application (applications/get-application (:application/id event)))
-      json/generate-string))
+  (assoc event :event/application (applications/get-application (:application/id event))))
 
 (defn queue-notifications! [events]
   (when-let [targets (seq (get rems.config/env :event-notification-targets))]

diff --git a/test/clj/rems/test_event_notification.clj b/test/clj/rems/test_event_notification.clj
@@ -20,7 +20,7 @@
   (with-open [server (stub/start! {"/ok" {:status 200}
                                    "/broken" {:status 500}
                                    "/timeout" {:status 200 :delay 5000}})]
-    (let [body "body"]
+    (let [body {:value 1}]
       (testing "success"
         (is (nil? (#'event-notification/notify! {:url (str (:uri server) "/ok")
                                                  :headers {"additional-header" "value"}}
@@ -29,9 +29,10 @@
           (is (empty? more))
           (is (= {:method "PUT"
                   :path "/ok"
-                  :body {"content" body}}
+                  :body {"content" (json/generate-string body)}}
                  (select-keys req [:method :path :body])))
-          (is (= "value" (get-in req [:headers :additional-header])))))
+          (is (= "value" (get-in req [:headers :additional-header])))
+          ))
       (testing "error code"
         (is (= "failed: 500" (#'event-notification/notify! {:url (str (:uri server) "/broken")}
                                                            body))))