more specs.

src/clj/auto_ap/routes/auth.clj

@@ -1,11 +1,10 @@
 (ns auto-ap.routes.auth
-  (:require
-   [compojure.core :refer [defroutes GET ]]
-   [auto-ap.db.users :as users]
-   [buddy.sign.jwt :as jwt]
-   [clj-http.client :as http]
-   [config.core :refer [env]]
-   [clj-time.core :as time]))
+  (:require [auto-ap.db.users :as users]
+            [buddy.sign.jwt :as jwt]
+            [clj-http.client :as http]
+            [clj-time.core :as time]
+            [compojure.core :refer [GET defroutes]]
+            [config.core :refer [env]]))
 
 (def google-client-id "264081895820-0nndcfo3pbtqf30sro82vgq5r27h8736.apps.googleusercontent.com")
 (def google-client-secret "OC-WemHurPXYpuIw5cT-B90g")

src/clj/auto_ap/routes/companies.clj

@@ -1,7 +1,11 @@
 (ns auto-ap.routes.companies
-  (:require [compojure.core :refer [context GET PUT defroutes wrap-routes]]
-            [auto-ap.db.companies :as companies]
-            [auto-ap.routes.utils :refer [wrap-secure]]))
+  (:require [auto-ap.db.companies :as companies]
+            [auto-ap.routes.utils :refer [wrap-secure wrap-spec]]
+            [auto-ap.entities.companies :as entity]
+            [clojure.spec.alpha :as s]
+            [compojure.core :refer [GET PUT context defroutes
+                                    wrap-routes]]))
+
 
 (defroutes routes
   (wrap-routes
@@ -10,8 +14,10 @@
                  {:status 200
                   :body (pr-str (companies/get-all))
                   :headers {"Content-Type" "application/edn"}})
-            (PUT "/:id" {:keys [edn-params] {:keys [id]} :route-params :as r}
-                 {:status 200
-                  :body (pr-str (companies/upsert id edn-params))
-                  :headers {"Content-Type" "application/edn"}}))
+            (wrap-spec
+             (PUT "/:id" {:keys [edn-params] {:keys [id]} :route-params :as r}
+                  {:status 200
+                   :body (pr-str (companies/upsert id edn-params))
+                   :headers {"Content-Type" "application/edn"}})
+             ::entity/company))
    wrap-secure))

src/clj/auto_ap/routes/invoices.clj

@@ -1,9 +1,10 @@
 (ns auto-ap.routes.invoices
-  (:require [compojure.core :refer [context GET PUT POST defroutes wrap-routes]]
+  (:require [auto-ap.db.companies :as companies]
             [auto-ap.db.invoices :as invoices]
-            [auto-ap.db.companies :as companies]
             [auto-ap.parse :as parse]
-            [auto-ap.routes.utils :refer [wrap-secure]]))
+            [auto-ap.routes.utils :refer [wrap-secure]]
+            [compojure.core :refer [GET POST context defroutes
+                                    wrap-routes]]))
 
 (defroutes routes
   (wrap-routes

src/clj/auto_ap/routes/reminders.clj

@@ -1,20 +1,17 @@
 (ns auto-ap.routes.reminders
-  (:require [compojure.core :refer [context GET POST defroutes wrap-routes]]
-            [auto-ap.db.vendors :as vendors]
+  (:require [amazonica.aws.simpleemail :as ses]
             [auto-ap.db.reminders :as reminders]
+            [auto-ap.db.vendors :as vendors]
             [auto-ap.routes.utils :refer [wrap-secure]]
-            [amazonica.aws.simpleemail :as ses]
-            [clj-time.core :as time]
-            [clj-time.coerce :as c]
-            [clj-time.predicates :as pred]
-            [clj-time.periodic :as p]
-            [clj-time.local :as l]
-            [clj-time.jdbc]
             [clj-http.client :as http]
+            [clj-time.coerce :as c]
+            [clj-time.core :as time]
+            [clj-time.periodic :as p]
+            [clj-time.predicates :as pred]
             [clojure.data.json :as json]
-            [ring.middleware.json :refer [wrap-json-body]]
-            )
-  (:import [org.joda.time DateTime]))
+            [compojure.core :refer [GET POST context defroutes
+                                    wrap-routes]])
+  (:import (org.joda.time DateTime)))
 
 (defn next-sunday []
   (let [sunday (->> (p/periodic-seq (time/plus (time/today) (time/days 1)) (time/days 1))

src/clj/auto_ap/routes/utils.clj

@@ -1,5 +1,6 @@
 (ns auto-ap.routes.utils
-  (:require [buddy.auth :refer [authenticated?]]))
+  (:require [clojure.spec.alpha :as s]
+            [buddy.auth :refer [authenticated?]]))
 
 (defn wrap-secure [handler]
   (fn [request]
@@ -7,3 +8,11 @@
       (handler request)
       {:status 401
        :body "not authenticated"})))
+
+(defn wrap-spec [handler spec]
+  (fn [request]
+    (if (not (s/valid? spec (:edn-params request)))
+      {:status 400
+       :body (pr-str (s/explain-data spec (:edn-params request)))
+       :headers {"Content-Type" "application/edn"}}
+      (handler request))))

src/clj/auto_ap/routes/vendors.clj

@@ -1,9 +1,10 @@
 (ns auto-ap.routes.vendors
-  (:require [compojure.core :refer [context GET PUT POST defroutes wrap-routes]]
-            [auto-ap.db.vendors :as vendors]
-            [auto-ap.routes.utils :refer [wrap-secure]]
+  (:require [auto-ap.db.vendors :as vendors]
+            [auto-ap.routes.utils :refer [wrap-secure wrap-spec]]
             [auto-ap.entities.vendors :as entity]
-            [clojure.spec.alpha :as s]))
+            [clojure.spec.alpha :as s]
+            [compojure.core :refer [GET POST PUT context defroutes
+                                    wrap-routes]]))
 
 (defroutes routes
   (wrap-routes
@@ -12,16 +13,17 @@
                  {:status 200
                   :body (pr-str (vendors/get-all))
                   :headers {"Content-Type" "application/edn"}})
-            (PUT "/:id" {:keys [edn-params] {:keys [id]} :route-params :as r}
-                 (println edn-params)
-                 (println (s/valid? ::entity/vendor edn-params))
-                 (println (s/explain ::entity/vendor edn-params))
-                 {:status 200
-                  :body (pr-str (vendors/upsert id edn-params))
-                  :headers {"Content-Type" "application/edn"}})
-            (POST "/" {:keys [edn-params] :as r}
-                  (println (s/valid? ::entity/vendor edn-params))
+            (wrap-spec
+             (PUT "/:id" {:keys [edn-params] {:keys [id]} :route-params :as r}
                   {:status 200
-                   :body (pr-str (vendors/insert edn-params))
-                   :headers {"Content-Type" "application/edn"}}))
+                   :body (pr-str (vendors/upsert id edn-params))
+                   :headers {"Content-Type" "application/edn"}})
+             ::entity/vendor)
+            (wrap-spec
+             (POST "/" {:keys [edn-params] :as r}
+                             
+                             {:status 200
+                              :body (pr-str (vendors/insert edn-params))
+                              :headers {"Content-Type" "application/edn"}})
+             ::entity/vendor))
    wrap-secure))