notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

making client code visible again.

Browse Source
This commit is contained in:
Bryce Covert
2019-01-28 09:20:50 -08:00
parent 294ac40930
commit 2d0b127b4a
6 changed files with 173 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/clj/auto_ap/datomic/migrate/add_client_codes.clj
View File

@@ -38,8 +38,7 @@
:where ['[?e :client/name ?name]]}
:args [(d/db a)]})
(reduce (fn [result [name id]]
(conj result [:db/add id :client/code (name->code name)]))
[])
)])
(if (name->code name)
(conj result [:db/add id :client/code (name->code name)])
result))
[]))])

1
src/clj/auto_ap/graphql.clj
View File

@@ -256,6 +256,7 @@
:edit_client {:fields {:id {:type :id}
:name {:type 'String}
:code {:type 'String}
:email {:type 'String}
:address {:type :add_address}
:locations {:type '(list String)}

10
src/clj/auto_ap/graphql/clients.clj
View File

@@ -2,7 +2,8 @@
(:require [auto-ap.datomic.clients :as d-clients]
[datomic.api :as d]
[auto-ap.datomic :refer [uri remove-nils]]
[auto-ap.graphql.utils :refer [->graphql assert-admin can-see-client?]]))
[auto-ap.graphql.utils :refer [->graphql assert-admin can-see-client?]]
[clojure.string :as str]))
#_(def role->datomic-role {":none" :user-role/none
":admin" :user-role/admin
@@ -10,18 +11,19 @@
(defn edit-client [context {:keys [edit_client new_bank_accounts] :as args} value]
(assert-admin (:id context))
(println (:address edit_client))
(let [client (d-clients/get-by-id (:id edit_client))
#_#_new-clients (set (map #(Long/parseLong %) (:clients edit_user)))
#_#_clients-to-remove (->> (:user/clients user)
(map :db/id)
(filter #(not (new-clients %)) ))]
(println edit_client)
@(d/transact (d/connect uri)
(doto (-> [(remove-nils {:db/id (:db/id client)
:client/code (if (str/blank? (:client/code client))
(:code edit_client)
(:client/code client))
:client/name (:name edit_client)
:client/email (:email edit_client)
:client/locations (filter identity (:locations edit_client))