backend->frontend datoms after save

Author: rotaliator

.gitignore

@@ -14,5 +14,6 @@ pom.xml.asc
 .cpcache/
 node_modules/
 .shadow-cljs/
+.clj-kondo/**
 
-/public/js/* 
+/public/js/*

src/clj/reitit_db_fun/datom.clj

@@ -67,4 +67,17 @@
 (defn resultset-into-datoms
   "Konwertuje wynik działania selecta na datomy"
   [resultset]
-  (into [] #_(sorted-set) (mapcat entity->datoms) resultset))
+  (into [] #_(sorted-set) (comp
+                           (mapcat entity->datoms)
+                           (filter last)) resultset))
+
+
+(comment
+
+  (-> [{:address/id 2000001, :article/title "Test-2"
+        :article/body "Treść artykułu 2" :user/name "Ewa"
+        :user/id 1000003, :article/author 1000003
+        :user/address 2000001, :address/street "Wróbla"
+        :article/id 3000009, :address/city "Puławy"}]
+      resultset-into-datoms)
+  )

src/clj/reitit_db_fun/main.clj

@@ -91,8 +91,10 @@
 (defn get-articles-handler [{:keys [model]}]
   {:body (reitit-db-fun.model/get-articles model)})
 
-(defn update-article-handler [{:keys [model body-params]}]
-  {:body (reitit-db-fun.model/update-article model body-params)})
+(defn update-article-handler [{:keys [model body-params sente-functions]}]
+  (let [datoms (reitit-db-fun.model/update-article model body-params)]
+    (sente-fn/send-datoms-to-all-clients sente-functions datoms)
+    {:body "Updated"}))
 
 (defn get-app-handler [{:keys [keys-to-wrap sente sente-functions]}]
   (ring/ring-handler
@@ -211,12 +213,13 @@
                         (jdbc/execute! datasource)
                         (mapv :user/id))
         app        (:app/handler @main-system)]
-    (doseq [idx (range 100)]
+    (doseq [idx (range 2)]
       (app {:request-method :post
             :uri            "/api/article"
             :body-params    {:article/title  (str "Test-" (inc idx))
                              :article/body   (str "Treść artykułu " (inc idx))
                              :article/author (rand-nth authors)}})))
+
   ;; sprawdzam pojedynczy artykuł
   (-> ((:app/handler @main-system)
        {:request-method :get
@@ -227,17 +230,18 @@
   (-> ((:app/handler @main-system)
        {:request-method :post
         :uri            "/api/article"
-        :body-params    {:article/id     "3000001"
-                         :article/title  "Title zmieniony ponownie"
+        :body-params    {:article/id     "3000002"
+                         :article/title  "Title zmieniony 2"
                          :article/body   "Treść po zmiania"
+                         :article/address "2000001"
                          :article/author "pkoza"}})
       (update :body slurp))
 
   ;; wszystkie arty
   (-> ((:app/handler @main-system)
        {:request-method :get
-        :uri            "/api/articles"})
-      :body
+        :uri            "/api/articles"}
+       :body)
       slurp)
 
   ;; Baza SQL na Datomy!
@@ -248,22 +252,33 @@
                                   :from   [:article :address :user]
                                   :where  [:and
                                            [:= :article/author :user/id]
-                                           [:= :user/address :address/id]]
+                                           [:= :user/address :address/id]
+                                           ]
                                   :limit  20})]
       (->> (jdbc/execute! datasource query)
            datom/resultset-into-datoms)))
+
+  (let [datasource (:storage/sql @main-system)
+        query      (sql/format {:select [:article/*]
+                                :from   [:article]
+                                :where  [:= :article/id 3000015]
+                                :limit  20})]
+    (->> (jdbc/execute! datasource query)
+         datom/resultset-into-datoms))
+
+
+
   ;; Datascript test db
   (def test-db (db/init-db (mapv #(apply d/datom %) initial-datoms)))
 
   (d/q '[:find (pull ?e [* {:article/author [:user/name {:user/address [*]}]}])
          :where [?e :article/id _]]
        test-db)
-
+  ;; test pojedynczego arta
 
   (do
     (stop-system main-system)
     (start-system main-system config))
 
   (-main)
-
   )

src/clj/reitit_db_fun/model_impl.clj

@@ -4,17 +4,22 @@
             [reitit-db-fun.model]
             [next.jdbc :as jdbc]
             [next.jdbc.sql :as jdbc-sql]
-            [reitit-db-fun.uuid :as uuid]))
+            [reitit-db-fun.uuid :as uuid]
+            [honey.sql :as sql]
+            [honey.sql.helpers :refer [select where from left-join]]
+            [reitit-db-fun.datom :as datom]))
 
 ;; SQL
-(def article-query (sql/format {:select [:article/* :address/* :user/*]
-                                :from   [:article :address :user]
-                                :where  [:and
-                                         [:= :article/id ]
-                                         [:= :article/author :user/id]
-                                         [:= :user/address :address/id]]}))
 
+(def article-query-full (-> (select :article/* :address/* :user/*)
+                            (from   :article)
+                            (left-join :user [:= :article/author :user/id])
+                            (left-join :address [:= :user/address :address/id])))
 
+(def article-query (-> (select :article/*)
+                       (from   :article)))
+
+(comment (sql/format article-query))
 
 (defrecord ArticleSQL [datasource]
   reitit-db-fun.model/IArticle
@@ -28,14 +33,22 @@
                    (jdbc-sql/insert! datasource :article
                                      {:title  title
                                       :author author
-                                      :body   body}))]
-      (if id
-        (jdbc-sql/query datasource ["select * from article where id = ?" id])
-        (jdbc-sql/query datasource ["select * from article where rowid = ?"
-                                    (get result (keyword "last_insert_rowid()"))]))
-      ;; na koniec pobieram resultset i przerabiam na datomy
-
-      ))
+                                      :body   body}))
+          id     (or id (get result (keyword "last_insert_rowid()")))
+          _      (println "id:" id)
+          #_     (if id
+                   (jdbc-sql/query datasource ["select * from article where id = ?" id])
+                   (jdbc-sql/query datasource ["select * from article where rowid = ?"
+                                               (get result (keyword "last_insert_rowid()"))]))
+
+          ;; na koniec pobieram resultset i przerabiam na datomy
+          query     (-> article-query (where [:= :article/id id]))
+          query-str (sql/format query)
+          _         (println query-str)
+          resultset (jdbc/execute! datasource query-str)
+          _         (println resultset)]
+      (datom/resultset-into-datoms resultset)))
+
   (get-articles [_]
     (jdbc/execute! datasource ["select * from article;"]))
   (get-article [_ article-id]

src/clj/reitit_db_fun/msg_handlers.clj

@@ -24,8 +24,8 @@
   (let [article (second event)]
     (if (m/validate v/Article article)
       (do (log/info "Saving to DB!")
-          (model/update-article model article)
-          (sente-fn/send-datoms-to-all-clients sente-functions [[:db/add 3 :author/name "Backender" 536870913]]))
+          (let [datoms (model/update-article model article)]
+            (sente-fn/send-datoms-to-all-clients sente-functions datoms)))
       (log/error "Error validating:" article
                  (-> v/Article
                      (m/explain article)

src/cljs/reitit_db_fun/db.cljs

@@ -13,8 +13,13 @@
                 (ds/transact! conn initial-data)
                 conn))
 
+(defn- add-db-add
+  "dodaje :db/add do datomów.... TODO TOFIX"
+  [datoms]
+  (into [] (map (partial concat [:db/add])) datoms))
+
 (defn save-datoms! [datoms]
-  (ds/transact! conn datoms))
+  (ds/transact! conn (add-db-add datoms)))
 
 (comment