Merge branch 'master' into 196-frontend-post-sorting-options

skydread1 · Jul 25, 2023 · 12158d9 · 12158d9
2 parents d06b307 + 91b325b
commit 12158d9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/server/src/flybot/server/core/handler/operation.clj b/server/src/flybot/server/core/handler/operation.clj
@@ -78,7 +78,10 @@
     (let [updated-user (assoc user :user/name name :user/picture picture)]
     ;; already in db so update user (name or picture could have changed).
       {:response updated-user
-       :effects  {:db {:payload [updated-user]}}
+       :effects  {:db {:payload [(select-keys updated-user [:user/id
+                                                            :user/email
+                                                            :user/name
+                                                            :user/picture])]}}
        :session  {:user-id    id
                   :user-roles (map :role/name roles)}})
     ;; first login so create user

diff --git a/server/src/flybot/server/core/init_data.clj b/server/src/flybot/server/core/init_data.clj
@@ -94,8 +94,8 @@
           :css-class "welcome"
           :creation-date (u/mk-date)
           :last-edit-date (u/mk-date)
-          :author bob-user
-          :last-editor alice-user
+          :author (select-keys bob-user [:user/id])
+          :last-editor (select-keys alice-user [:user/id])
           :md-content (slurp-md "blog" "welcome.md")
           :image-beside #:image{:src "/assets/flybot-logo.png"
                                 :src-dark "/assets/flybot-logo.png"
@@ -105,8 +105,8 @@
           :css-class "md-example"
           :creation-date (u/mk-date)
           :last-edit-date (u/mk-date)
-          :author owner-user
-          :last-editor owner-user
+          :author (select-keys owner-user [:user/id])
+          :last-editor (select-keys owner-user [:user/id])
           :md-content (slurp-md "blog" "mdsample.md")
           :image-beside #:image{:src "https://octodex.github.com/images/dojocat.jpg"
                                 :src-dark "https://octodex.github.com/images/stormtroopocat.jpg"
@@ -154,4 +154,4 @@
   (concat home-posts apply-posts about-posts blog-posts))
 
 (def init-data
-  (concat posts users))
+  (concat posts users))
diff --git a/server/test/flybot/server/core/handler/operation_test.clj b/server/test/flybot/server/core/handler/operation_test.clj
@@ -73,9 +73,13 @@
 (deftest register-user
   (let [db-conn (-> test-system :db-conn :conn)]
     (testing "The user exists so update it and add to session."
-      (let [new-bob (assoc s/bob-user :user/name "Bobby" :user/picture "bob-new-pic")]
+      (let [new-bob (assoc s/bob-user :user/name "Bobby" :user/picture "bob-new-pic")
+            new-bob-shortened (select-keys new-bob [:user/id
+                                                    :user/email
+                                                    :user/name
+                                                    :user/picture])]
         (is (= {:response new-bob
-                :effects  {:db {:payload [new-bob]}}
+                :effects  {:db {:payload [new-bob-shortened]}}
                 :session  {:user-id    s/bob-id
                            :user-roles [:admin :editor]}}
                (sut/register-user (d/db db-conn) s/bob-id ::NOUSE "Bobby" "bob-new-pic")))))