update queries to support multiple same ops on single key

src/route_craft/handlers.clj

@@ -1,6 +1,7 @@
 (ns route-craft.handlers
   (:require
     [next.jdbc.sql :as sql]
+    [route-craft.queries :as queries]
     [ring.util.http-response :as http-response]))
 
 ;; ===================HANDLERS===================
@@ -71,6 +72,12 @@
                  {pk-key id})
     (http-response/ok [pk-key id])))
 
+(defn query-handler
+  [{:keys []
+    :as   opts}
+   request]
+  #_(queries/rc-query->query-map))
+
 (defmulti generate-handler (fn [_opts handler] handler))
 
 (defn malli-type
@@ -105,11 +112,11 @@
   ([opts table ignore-primary-key?] (table->malli-map opts table ignore-primary-key? {:force-optional? false}))
   ([{:keys [malli-type-mappings]} {:keys [columns column-order]} ignore-primary-key? column-key-opts]
    (reduce
-     (fn [out column-key]
+     (fn [acc column-key]
        (let [{:keys [primary-key?] :as column} (get columns column-key)]
          (if (and primary-key? ignore-primary-key?)
-           out
-           (conj out (malli-column-key malli-type-mappings column-key column column-key-opts)))))
+           acc
+           (conj acc (malli-column-key malli-type-mappings column-key column column-key-opts)))))
      [:map]
      column-order)))
 
@@ -147,6 +154,10 @@
 ;; - delete by query
 ;; - generic query
 
+(defmethod generate-handler :get-by-query
+  [{:keys [] :as opts} _]
+  )
+
 (defmethod generate-handler :default
   [_ handler]
   (throw (ex-info "Unsupported handler" {:type    ::unsupported-handler

src/route_craft/querying.clj → src/route_craft/queries.clj

@@ -1,4 +1,4 @@
-(ns route-craft.querying
+(ns route-craft.queries
   (:require
     [clojure.string :as string]))
 
@@ -29,9 +29,9 @@
 (defn assoc-joins
   [query-map {:keys [base-table columns]} joins]
   (reduce-kv
-    (fn [out column-kw join-type]
+    (fn [acc column-kw join-type]
       (if-let [[target-table target-column] (get-in columns [column-kw :refers-to])]
-        (assoc out (get honeysql-joins join-type) [target-table [:=
+        (assoc acc (get honeysql-joins join-type) [target-table [:=
                                                                  (keyword (str (name target-table) "." (name target-column)))
                                                                  (keyword (str (name base-table) "." (name column-kw)))]])
         (throw (ex-info "No foreign key to join on" {:column column-kw
@@ -53,17 +53,31 @@
    :in     :in
    :nin    :not-in})
 
+(defn honeysql-where-cond
+  [base-table column-key op value]
+  [(get honeysql-ops op)
+   (qualified-column-kw base-table column-key)
+   value])
+
+(defn map->honeysql-where-cond
+  [base-table column-key acc v]
+  (reduce-kv
+    (fn [acc op value]
+      (conj acc (honeysql-where-cond base-table column-key op value)))
+    acc v))
+
 (defn rc-where->hsql-where
   [{:keys [base-table]} where-map]
   (reduce-kv
-    (fn [out column-key v]
-      (reduce-kv
-        (fn [acc op value]
-          (conj acc
-                [(get honeysql-ops op)
-                 (qualified-column-kw base-table column-key)
-                 value]))
-        out v))
+    (fn [acc column-key v]
+      (if (map? v)
+        (map->honeysql-where-cond base-table column-key acc v)
+        (reduce
+          (fn [acc entries]
+            (map->honeysql-where-cond base-table column-key acc entries))
+          acc
+          v))
+      )
     [:and]
     where-map))
 
@@ -72,8 +86,8 @@
   (mapcat
     (fn [order-map]
       (reduce-kv
-       (fn [out column-kw order-direction]
-         (conj out [(qualified-column-kw base-table column-kw) (keyword order-direction)]))
+       (fn [acc column-kw order-direction]
+         (conj acc [(qualified-column-kw base-table column-kw) (keyword order-direction)]))
        []
        order-map))
     orders))
@@ -92,12 +106,21 @@
 ;; TODO: maybe this ns is candidate for memoization if enabled via config
 
 (comment
+  (def ctx
+    {:datasource (jdbc/get-datasource {:jdbcUrl "jdbc:postgresql://127.0.0.1:5432/rc?user=rc&password=rc"})})
+  (def x (xray-ext/extend-db-xray (dbx/xray (jdbc/get-connection (:datasource ctx)))))
 
   (q/rc-where->hsql-where
     {:base-table :companies
      :columns (get-in x [:companies :columns])}
     {:name {:eq "asdf"}
      :address.care_of {:eq "qwer"}})
+  (q/rc-where->hsql-where
+    {:base-table :companies
+     :columns (get-in x [:companies :columns])}
+    {:name            [{:eq "asdf"}
+                       {:eq "qwer"}]
+     :address.care_of {:eq "qwer"}})
   (q/rc-columns->select
     {:base-table :companies
      :columns (get-in x [:companies :columns])}

src/route_craft/routes.clj

@@ -35,10 +35,10 @@
 
 (defn get-pk-from-table
   [{:keys [columns]}]
-  (let [pk-cols (reduce-kv (fn [out k {:keys [primary-key?]}]
+  (let [pk-cols (reduce-kv (fn [acc k {:keys [primary-key?]}]
                              (if primary-key?
-                               (conj out k)
-                               out))
+                               (conj acc k)
+                               acc))
                            #{}
                            columns)]
     (if (= 1 (count pk-cols))
@@ -64,15 +64,15 @@
                                                                              :pk-key              pk-key
                                                                              :malli-type-mappings malli-type-mappings})]
                  (->> (reduce
-                        (fn [out handler]
+                        (fn [acc handler]
                           (let [path (case handler
                                        :insert-one ["" :post]
                                        :get-by-pk [pk-key-path :get]
                                        :update-by-pk [pk-key-path :put]
                                        :delete-by-pk [pk-key-path :delete]
                                        (throw (ex-info "Unsupported handler" {:type    ::unsupported-handler
                                                                               :handler handler})))]
-                            (assoc-in out path (generate-handler-fn handler))))
+                            (assoc-in acc path (generate-handler-fn handler))))
                         {}
                         handlers)
                       (vec)

src/route_craft/xray_ext.clj

@@ -17,6 +17,7 @@
     columns))
 
 ;; TODO: refactor, test
+;; TODO: limit rc/permitted-columns
 (defn extend-db-xray
   [db-xray]
   (update db-xray :tables