Merge pull request #20 from rrudakov/users-unit-tests

Add some unit tests for users API

Author: Roman Rudakov

README.md

@@ -1,6 +1,7 @@
 # Education API
 
 ![Clojure CI](https://github.com/rrudakov/ring_leart/workflows/Clojure%20CI/badge.svg?branch=master)
+[![codecov](https://codecov.io/gh/rrudakov/education_api/branch/master/graph/badge.svg)](https://codecov.io/gh/rrudakov/education_api)
 
 A Clojure ring-based application.
 
@@ -10,7 +11,7 @@ It runs automatically on heroku.
 
 ## License
 
-Copyright © 2020 FIXME
+Copyright © 2020 Roman Rudakov
 
 This program and the accompanying materials are made available under the
 terms of the Eclipse Public License 2.0 which is available at

src/education/config.clj

@@ -1,9 +1,7 @@
 (ns education.config
   (:require [aero.core :refer [read-config]]
-            [buddy.auth :refer [throw-unauthorized]]
             [buddy.auth.backends.token :refer [jws-backend]]
-            [clojure.java.io :as io]
-            [next.jdbc.result-set :as rs]))
+            [clojure.java.io :as io]))
 
 (defn config
   "Read application config from resources."

src/education/database/component.clj

@@ -1,7 +1,6 @@
 (ns education.database.component
   (:require [com.stuartsierra.component :as component]
             [education.config :as config]
-            [next.jdbc :as j]
             [next.jdbc.connection :as connection]
             [ragtime.jdbc :as jdbc]
             [ragtime.repl :as repl])

src/education/database/roles.clj

@@ -1,8 +1,7 @@
 (ns education.database.roles
   (:require [clojure.string :as str]
-            [next.jdbc.sql :as sql]
-            [next.jdbc.result-set :as rs]
-            [honeysql.core :as hsql]))
+            [honeysql.core :as hsql]
+            [next.jdbc.sql :as sql]))
 
 (defn get-all-roles
   "Fetch all roles from database."

src/education/database/users.clj

@@ -39,9 +39,9 @@
 (defn- enrich-user-with-roles
   "Fetch roles for `user` and assoc `:roles` key with them."
   [conn user]
-  (->> user
-       (roles/get-user-roles conn)
-       (assoc user :users/roles)))
+  (-> user
+      (assoc :users/roles (roles/get-user-roles conn user))
+      (dissoc :users/user_password)))
 
 (defn get-user
   "Fetch user from database by `id`."
@@ -74,7 +74,7 @@
     (jdbc/with-transaction [tx conn]
       (let [{:keys [roles]} user
             new-roles (->> available-roles
-                           (filter #(some #{(:roles/role_name %)} roles))
+                           (filter #(some #{(:roles/role_name %)} (map keyword roles)))
                            (map :roles/id))]
         (sql/delete! tx :user_roles {:user_id id})
         (sql/insert-multi! tx :user_roles

src/education/http/component.clj

@@ -3,6 +3,7 @@
             [com.stuartsierra.component :as component]
             [education.config :as config]
             [education.http.routes :refer [api-routes]]
+            [muuntaja.middleware :refer [wrap-format]]
             [org.httpkit.server :as server]
             [ring.middleware.cors :refer [wrap-cors]]
             [ring.middleware.defaults :refer [api-defaults wrap-defaults]]))
@@ -13,7 +14,7 @@
   (start [this]
     (if srv
       this
-      (let [port (config/application-port config)
+      (let [port         (config/application-port config)
             auth-backend (config/auth-backend config)]
         (println (str ";; Running web server at http://127.0.0.1:" port "/"))
         (assoc this :srv
@@ -25,7 +26,7 @@
                                :access-control-allow-methods [:get :post :patch :put :delete])
                     (wrap-authorization auth-backend)
                     (wrap-authentication auth-backend)
-                    (muuntaja.middleware/wrap-format)
+                    (wrap-format)
                     (wrap-defaults api-defaults))
                 {:port port})))))
 

src/education/http/endpoints/articles.clj

@@ -1,14 +1,11 @@
 (ns education.http.endpoints.articles
   (:require [compojure.api.sweet :refer [context DELETE GET PATCH POST]]
             [education.database.articles :as articlesdb]
-            [education.http.constants :refer :all]
+            [education.http.constants :as const]
             [education.http.restructure :refer [require-roles]]
             [education.specs.articles :as specs]
             [education.specs.error :as err]
-            [ring.swagger.schema :refer [describe]]
-            [ring.util.http-response
-             :refer
-             [created internal-server-error no-content not-found ok forbidden]]))
+            [ring.util.http-response :as status]))
 
 ;; Converters
 (defn to-short-article-response
@@ -40,18 +37,18 @@
   (fn [{:keys [identity]}]
     (let [user   (:user identity)
           new-id (str (articlesdb/add-article db user article))]
-      (created (str "/articles/" new-id) {:id new-id}))))
+      (status/created (str "/articles/" new-id) {:id new-id}))))
 
 (defn- update-article-handler
   "Update existing article handler."
   [db article-id article]
   (fn [{:keys [identity]}]
     (if (articlesdb/can-update? db (:user identity) article-id)
       (case (articlesdb/update-article db article-id article)
-        1 (no-content)
-        0 (not-found {:message not-found-error-message})
-        (internal-server-error {:message server-error-message}))
-      (forbidden {:message no-access-error-message}))))
+        1 (status/no-content)
+        0 (status/not-found {:message const/not-found-error-message})
+        (status/internal-server-error {:message const/server-error-message}))
+      (status/forbidden {:message const/no-access-error-message}))))
 
 (defn- get-all-articles-handler
   "Get all recent articles handler."
@@ -61,49 +58,49 @@
                    (articlesdb/get-user-articles db user-id limit))]
     (->> articles
          (map to-short-article-response)
-         ok)))
+         status/ok)))
 
 (defn- get-latest-full-articles-handler
   "Get latest full articles handler."
   [db number]
   (let [articles (articlesdb/get-latest-full-sized-articles db number)]
     (->> articles
          (map to-full-article-response)
-         ok)))
+         status/ok)))
 
 (defn- get-article-by-id-handler
   "Get article by `article-id` handler."
   [db article-id]
   (let [article (articlesdb/get-article-by-id db article-id)]
     (if (nil? article)
-      (not-found {:message not-found-error-message})
-      (ok (to-full-article-response article)))))
+      (status/not-found {:message const/not-found-error-message})
+      (status/ok (to-full-article-response article)))))
 
 (defn- get-last-main-featured-article-handler
   "Get last main featured article handler."
   [db]
   (let [mf-article (articlesdb/get-last-featured-article db)]
     (if (nil? mf-article)
-      (not-found {:message not-found-error-message})
-      (ok (to-short-article-response mf-article)))))
+      (status/not-found {:message const/not-found-error-message})
+      (status/ok (to-short-article-response mf-article)))))
 
 (defn- get-last-featured-articles-handler
   "Get last featured articles handler."
   [db limit]
   (->> (articlesdb/get-last-featured-articles db limit)
        (map to-short-article-response)
-       ok))
+       status/ok))
 
 (defn- delete-article-handler
   "Delete article by `article-id` handler."
   [db article-id]
   (fn [{:keys [identity]}]
     (if (articlesdb/can-update? db (:user identity) article-id)
       (case (articlesdb/delete-article db article-id)
-        1 (no-content)
-        0 (not-found {:message not-found-error-message})
-        (internal-server-error {:message server-error-message}))
-      (forbidden {:message no-access-error-message}))))
+        1 (status/no-content)
+        0 (status/not-found {:message const/not-found-error-message})
+        (status/internal-server-error {:message const/server-error-message}))
+      (status/forbidden {:message const/no-access-error-message}))))
 
 ;; Define routes
 (defn articles-routes

src/education/http/endpoints/roles.clj

@@ -27,9 +27,9 @@
   (context "" []
     :tags ["roles"]
     (GET "/roles" []
-        :middleware [[require-roles #{:admin}]]
-        :return ::specs/roles-response
-        :summary "Return list of all available roles"
-        :responses {401 {:description "Access denied!"
-                         :schema ::err/error-response}}
-        (roles-handler db))))
+      :middleware [[require-roles #{:admin}]]
+      :return ::specs/roles-response
+      :summary "Return list of all available roles"
+      :responses {401 {:description "Access denied!"
+                       :schema ::err/error-response}}
+      (roles-handler db))))