Closer, but still not recording requests.

This commit is contained in:
Simon Brooke 2018-09-14 22:20:28 +01:00
parent 046aa2660f
commit c22c34ff16
4 changed files with 22 additions and 11 deletions

View file

@ -36,6 +36,7 @@
[org.webjars/bootstrap "4.1.2"]
[org.webjars/font-awesome "5.1.0"]
[org.webjars.bower/tether "1.4.4"]
[postgre-types "0.0.4"]
[re-frame "0.10.5"]
[reagent "0.8.1"]
[reagent-utils "0.3.1"]

View file

@ -6,6 +6,7 @@
[conman.core :as conman]
[hugsql.core :as hugsql]
[mount.core :refer [defstate]]
[postgre-types.json :refer [add-json-type add-jsonb-type]]
[youyesyet.config :refer [env]])
(:import org.postgresql.util.PGobject
java.sql.Array
@ -23,6 +24,10 @@
:driver-class-name "org.postgresql.Driver"})
:stop (conman/disconnect! *db*))
(add-json-type generate-string parse-string)
(add-jsonb-type generate-string parse-string)
(conman/bind-connection *db* "sql/queries.auto.sql" "sql/queries.sql")
(hugsql/def-sqlvec-fns "sql/queries.auto.sql")

View file

@ -102,6 +102,7 @@
[request]
(let [last-visit (last-visit-by-current-user request)
params (massage-params request)]
(log/debug "rest/current-visit-id: type of address_id is: " (type (:address_id params)))
(if
(=
(:address_id params)
@ -109,10 +110,9 @@
(:id last-visit)
(db/create-visit!
db/*db*
(assoc
params
{:address_id (:address_id params)
:canvasser_id (-> request :session :user :id)
:date (jt/to-sql-timestamp (jt/local-date-time)))))))
:date (jt/to-sql-timestamp (jt/local-date-time))}))))
(defn create-intention-and-visit!

View file

@ -540,10 +540,15 @@
(fn [db [_ response]]
(case
(:status response)
(400 403 500)
(do
(js/console.log "Server responded " (:status response) " - " (:response response) "; not requeueing")
(assoc db :error (:response response)))
(400 403 404 500)
(let [error (str
"Transmission failed "
(:status response)
" - "
(:response response)
"; not requeueing")]
(js/console.log error)
(assoc (clear-messages db) :error error))
;; default
(do
(js/console.log (str "Transmission failed (" response "), requeueing" (:tx-item db)))