Merge branch 'datomic' of bitbucket.org:brycecovertoperations/integreat into datomic
This commit is contained in:
@@ -2,7 +2,9 @@
|
|||||||
(:require [datomic.api :as d]
|
(:require [datomic.api :as d]
|
||||||
[auto-ap.datomic :refer [uri]]
|
[auto-ap.datomic :refer [uri]]
|
||||||
[clj-time.coerce :as c]
|
[clj-time.coerce :as c]
|
||||||
[clojure.set :refer [rename-keys]]))
|
[clojure.set :refer [rename-keys]]
|
||||||
|
[clojure.string :as str]))
|
||||||
|
|
||||||
|
|
||||||
(defn add-arg [query name value where & rest]
|
(defn add-arg [query name value where & rest]
|
||||||
(let [query (-> query
|
(let [query (-> query
|
||||||
@@ -97,17 +99,20 @@
|
|||||||
)
|
)
|
||||||
(<-datomic)))
|
(<-datomic)))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
(defn find-conflicting [{:keys [:invoice/invoice-number :invoice/vendor :invoice/client :db/id]}]
|
(defn find-conflicting [{:keys [:invoice/invoice-number :invoice/vendor :invoice/client :db/id]}]
|
||||||
(println invoice-number vendor client id)
|
|
||||||
(->> (doto (d/query
|
(->> (d/query
|
||||||
(cond-> {:query {:find [default-read]
|
(cond-> {:query {:find [default-read]
|
||||||
:in ['$ '?invoice-number '?vendor '?client '?invoice-id]
|
:in ['$ '?invoice-number '?vendor '?client '?invoice-id]
|
||||||
:where '[[?e :invoice/invoice-number ?invoice-number]
|
:where '[[?e :invoice/invoice-number ?invoice-number]
|
||||||
[?e :invoice/vendor ?vendor]
|
[?e :invoice/vendor ?vendor]
|
||||||
[?e :invoice/client ?client]
|
[?e :invoice/client ?client]
|
||||||
[(not= ?e ?invoice-id)]]}
|
[(not= ?e ?invoice-id)]
|
||||||
:args [(d/db (d/connect uri)) invoice-number vendor client id]}))
|
]}
|
||||||
println)
|
|
||||||
|
:args [(d/db (d/connect uri)) invoice-number vendor client (or id 0)]}))
|
||||||
(map first)
|
(map first)
|
||||||
|
|
||||||
(<-datomic)))
|
(<-datomic)))
|
||||||
|
|||||||
Reference in New Issue
Block a user