♻️ Migrate to common spec namespace.

This commit is contained in:
Andrey Antukh 2020-01-11 20:25:50 +01:00
parent 32131c5aa7
commit c88602c7ab
33 changed files with 111 additions and 260 deletions

View file

@ -8,11 +8,11 @@
(:require
[clojure.spec.alpha :as s]
[promesa.core :as p]
[uxbox.common.exceptions :as ex]
[uxbox.common.spec :as us]
[uxbox.db :as db]
[uxbox.services.queries :as sq]
[uxbox.util.blob :as blob]
[uxbox.util.exceptions :as ex]
[uxbox.util.spec :as us]))
[uxbox.util.blob :as blob]))
;; --- Helpers & Specs

View file

@ -9,6 +9,8 @@
[clojure.spec.alpha :as s]
[promesa.core :as p]
[promesa.exec :as px]
[uxbox.common.exceptions :as ex]
[uxbox.common.spec :as us]
[uxbox.db :as db]
[uxbox.media :as media]
[uxbox.images :as images]
@ -16,8 +18,6 @@
[uxbox.services.util :as su]
[uxbox.util.blob :as blob]
[uxbox.util.data :as data]
[uxbox.util.exceptions :as ex]
[uxbox.util.spec :as us]
[uxbox.util.uuid :as uuid]
[vertx.core :as vc]))
@ -75,8 +75,9 @@
and deleted_at is null;"]
(db/query-one conn [sql id])))
(s/def ::id ::us/uuid)
(s/def ::image-by-id
(s/keys :req-un [::user ::us/id]))
(s/keys :req-un [::user ::id]))
(sq/defquery ::image-by-id
[params]

View file

@ -9,11 +9,11 @@
[clojure.spec.alpha :as s]
[cuerdas.core :as str]
[promesa.core :as p]
[uxbox.common.spec :as us]
[uxbox.db :as db]
[uxbox.services.queries :as sq]
[uxbox.services.util :as su]
[uxbox.util.blob :as blob]
[uxbox.util.spec :as us]))
[uxbox.util.blob :as blob]))
(declare decode-row)

View file

@ -8,11 +8,11 @@
(:require
[clojure.spec.alpha :as s]
[promesa.core :as p]
[uxbox.common.spec :as us]
[uxbox.db :as db]
[uxbox.services.queries :as sq]
[uxbox.services.util :as su]
[uxbox.util.blob :as blob]
[uxbox.util.spec :as us]
[uxbox.util.sql :as sql]))
;; --- Helpers & Specs

View file

@ -8,11 +8,11 @@
(:require
[clojure.spec.alpha :as s]
[promesa.core :as p]
[uxbox.common.spec :as us]
[uxbox.db :as db]
[uxbox.services.queries :as sq]
[uxbox.services.util :as su]
[uxbox.util.blob :as blob]
[uxbox.util.spec :as us]))
[uxbox.util.blob :as blob]))
(declare decode-row)

View file

@ -8,11 +8,11 @@
(:require
[clojure.spec.alpha :as s]
[promesa.core :as p]
[uxbox.common.spec :as us]
[uxbox.db :as db]
[uxbox.services.queries :as sq]
[uxbox.services.util :as su]
[uxbox.util.blob :as blob]
[uxbox.util.spec :as us]))
[uxbox.util.blob :as blob]))
(defn decode-row
[{:keys [val] :as row}]
@ -20,6 +20,9 @@
(cond-> row
val (assoc :val (blob/decode val)))))
(s/def ::key ::us/string)
(s/def ::user ::us/uuid)
(s/def ::user-attr
(s/keys :req-un [::key ::user]))

View file

@ -9,12 +9,12 @@
[clojure.spec.alpha :as s]
[promesa.core :as p]
[promesa.exec :as px]
[uxbox.common.spec :as us]
[uxbox.db :as db]
[uxbox.images :as images]
[uxbox.services.queries :as sq]
[uxbox.services.util :as su]
[uxbox.util.blob :as blob]
[uxbox.util.spec :as us]))
[uxbox.util.blob :as blob]))
;; --- Helpers & Specs