Merge remote-tracking branch 'origin/feature/28' into feature/28

src/clj/youyesyet/db/core.clj

@@ -17,12 +17,14 @@
             Timestamp
             PreparedStatement]))
 
+;; (def ^:dynamic *db* {:name "java:comp/env/jdbc/EmployeeDB"})
 (defstate ^:dynamic *db*
-            :start (conman/connect! {:jdbc-url (env :database-url)
-                                     :driver-class-name "org.postgresql.Driver"})
-            :stop (conman/disconnect! *db*))
+           :start (conman/connect! {:jdbc-url-env (env :database-url)
+                                    :jdbc-url "jdbc:postgresql://127.0.0.1/youyesyet_dev?user=youyesyet&password=thisisnotsecure"
+                                    :driver-class-name "org.postgresql.Driver"})
+           :stop (conman/disconnect! *db*))
 
-(conman/bind-connection *db* "sql/queries.sql")
+(conman/bind-connection *db* "sql/queries.auto.sql")
 
 (defn to-date [^java.sql.Date sql-date]
   (-> sql-date (.getTime) (java.util.Date.)))

src/clj/youyesyet/handler.clj

@@ -6,6 +6,7 @@
             [youyesyet.routes.authenticated :refer [authenticated-routes]]
             [youyesyet.routes.home :refer [home-routes]]
             [youyesyet.routes.oauth :refer [oauth-routes]]
+            [youyesyet.routes.auto-json-routes :refer [auto-rest-routes]]
             [compojure.route :as route]
             [youyesyet.env :refer [defaults]]
             [mount.core :as mount]
@@ -63,6 +64,9 @@
     (-> #'home-routes
         (wrap-routes middleware/wrap-csrf)
         (wrap-routes middleware/wrap-formats))
+    (-> #'auto-rest-routes
+        (wrap-routes middleware/wrap-csrf)
+        (wrap-routes middleware/wrap-formats))
     #'oauth-routes
     #'authenticated-routes
     (route/not-found
@@ -71,4 +75,5 @@
                      :title "page not found"})))))
 
 
-(def app (middleware/wrap-base #'app-routes))
+(def app #'app-routes)
+  ;;(middleware/wrap-base #'app-routes))

src/clj/youyesyet/routes/rest.clj

@@ -40,7 +40,7 @@
 
 (defn get-issues
   "Get current issues. No arguments expected."
-  [request]
+  [request])
 
 (defroutes rest-routes
   (GET "/rest/get-local-data" request (route/restricted (get-local-data request)))