Closer, but still not recording requests.
This commit is contained in:
parent
046aa2660f
commit
c22c34ff16
|
@ -36,6 +36,7 @@
|
||||||
[org.webjars/bootstrap "4.1.2"]
|
[org.webjars/bootstrap "4.1.2"]
|
||||||
[org.webjars/font-awesome "5.1.0"]
|
[org.webjars/font-awesome "5.1.0"]
|
||||||
[org.webjars.bower/tether "1.4.4"]
|
[org.webjars.bower/tether "1.4.4"]
|
||||||
|
[postgre-types "0.0.4"]
|
||||||
[re-frame "0.10.5"]
|
[re-frame "0.10.5"]
|
||||||
[reagent "0.8.1"]
|
[reagent "0.8.1"]
|
||||||
[reagent-utils "0.3.1"]
|
[reagent-utils "0.3.1"]
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
[conman.core :as conman]
|
[conman.core :as conman]
|
||||||
[hugsql.core :as hugsql]
|
[hugsql.core :as hugsql]
|
||||||
[mount.core :refer [defstate]]
|
[mount.core :refer [defstate]]
|
||||||
|
[postgre-types.json :refer [add-json-type add-jsonb-type]]
|
||||||
[youyesyet.config :refer [env]])
|
[youyesyet.config :refer [env]])
|
||||||
(:import org.postgresql.util.PGobject
|
(:import org.postgresql.util.PGobject
|
||||||
java.sql.Array
|
java.sql.Array
|
||||||
|
@ -23,6 +24,10 @@
|
||||||
:driver-class-name "org.postgresql.Driver"})
|
:driver-class-name "org.postgresql.Driver"})
|
||||||
:stop (conman/disconnect! *db*))
|
: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")
|
(conman/bind-connection *db* "sql/queries.auto.sql" "sql/queries.sql")
|
||||||
(hugsql/def-sqlvec-fns "sql/queries.auto.sql")
|
(hugsql/def-sqlvec-fns "sql/queries.auto.sql")
|
||||||
|
|
||||||
|
|
|
@ -102,17 +102,17 @@
|
||||||
[request]
|
[request]
|
||||||
(let [last-visit (last-visit-by-current-user request)
|
(let [last-visit (last-visit-by-current-user request)
|
||||||
params (massage-params request)]
|
params (massage-params request)]
|
||||||
|
(log/debug "rest/current-visit-id: type of address_id is: " (type (:address_id params)))
|
||||||
(if
|
(if
|
||||||
(=
|
(=
|
||||||
(:address_id params)
|
(:address_id params)
|
||||||
(:address_id last-visit))
|
(:address_id last-visit))
|
||||||
(:id last-visit)
|
(:id last-visit)
|
||||||
(db/create-visit!
|
(db/create-visit!
|
||||||
db/*db*
|
db/*db*
|
||||||
(assoc
|
{:address_id (:address_id params)
|
||||||
params
|
:canvasser_id (-> request :session :user :id)
|
||||||
: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!
|
(defn create-intention-and-visit!
|
||||||
|
|
|
@ -540,10 +540,15 @@
|
||||||
(fn [db [_ response]]
|
(fn [db [_ response]]
|
||||||
(case
|
(case
|
||||||
(:status response)
|
(:status response)
|
||||||
(400 403 500)
|
(400 403 404 500)
|
||||||
(do
|
(let [error (str
|
||||||
(js/console.log "Server responded " (:status response) " - " (:response response) "; not requeueing")
|
"Transmission failed "
|
||||||
(assoc db :error (:response response)))
|
(:status response)
|
||||||
|
" - "
|
||||||
|
(:response response)
|
||||||
|
"; not requeueing")]
|
||||||
|
(js/console.log error)
|
||||||
|
(assoc (clear-messages db) :error error))
|
||||||
;; default
|
;; default
|
||||||
(do
|
(do
|
||||||
(js/console.log (str "Transmission failed (" response "), requeueing" (:tx-item db)))
|
(js/console.log (str "Transmission failed (" response "), requeueing" (:tx-item db)))
|
||||||
|
|
Loading…
Reference in a new issue