Merge branch 'master' into 206-grant-admin-UI

skydread1 · Jul 26, 2023 · 76ab6b7 · 76ab6b7
2 parents a7b7b1c + f229bee
commit 76ab6b7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/server/src/flybot/server/core/handler/operation.clj b/server/src/flybot/server/core/handler/operation.clj
@@ -122,10 +122,9 @@
                    :user-email    email}}
 
           :else
-          (let [new-user (update user :user/roles conj {:role/name         role-to-grant
-                                                        :role/date-granted (utils/mk-date)})]
-            {:response new-user
-             :effects  {:db {:payload [new-user]}}}))))
+          (let [new-role {:role/name role-to-grant :role/date-granted (utils/mk-date)}]
+            {:response (update user :user/roles conj new-role)
+             :effects  {:db {:payload [(assoc user :user/roles [new-role])]}}}))))
 
 (def grant-admin-role
   #(grant-role % %2 :editor :admin))

diff --git a/server/test/flybot/server/core/handler/operation_test.clj b/server/test/flybot/server/core/handler/operation_test.clj
@@ -111,12 +111,13 @@
                         :requested-role :owner
                         :user-email editor-email}}
                (sut/grant-owner-role (d/db db-conn) editor-email)))))
-    (testing "User exits so returns user with new admin role effect."
+    (testing "User exits and has required role so returns user with new admin role effect."
       (with-redefs [utils/mk-date (constantly s/alice-date-granted)]
-        (let [updated-alice (update s/alice-user :user/roles conj {:role/name :admin
-                                                                   :role/date-granted (utils/mk-date)})]
+        (let [new-role {:role/name :admin :role/date-granted (utils/mk-date)}
+              updated-alice (update s/alice-user :user/roles conj new-role)
+              effects (assoc s/alice-user :user/roles [new-role])]
           (is (= {:response updated-alice
-                  :effects  {:db {:payload [updated-alice]}}}
+                  :effects  {:db {:payload [effects]}}}
                  (sut/grant-admin-role (d/db db-conn) (:user/email s/alice-user)))))))
     (testing "User does not exist so returns error map."
       (is (= {:error {:type    :user/not-found