From ad6a8644789d7356040e2283339ac911ff83e132 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Fri, 14 Jun 2024 08:22:36 +0200 Subject: [PATCH] :fire: Replace spec with schema on search RPC methods --- backend/src/app/rpc/commands/search.clj | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/backend/src/app/rpc/commands/search.clj b/backend/src/app/rpc/commands/search.clj index 571015645..1a25a6dcf 100644 --- a/backend/src/app/rpc/commands/search.clj +++ b/backend/src/app/rpc/commands/search.clj @@ -6,13 +6,12 @@ (ns app.rpc.commands.search (:require - [app.common.spec :as us] + [app.common.schema :as sm] [app.db :as db] [app.rpc :as-alias rpc] [app.rpc.commands.files :refer [resolve-public-uri]] [app.rpc.doc :as-alias doc] - [app.util.services :as sv] - [clojure.spec.alpha :as s])) + [app.util.services :as sv])) (def ^:private sql:search-files "with projects as ( @@ -65,16 +64,14 @@ (assoc :thumbnail-uri (resolve-public-uri media-id))) (dissoc row :media-id)))))) -(s/def ::team-id ::us/uuid) -(s/def ::search-files ::us/string) - -(s/def ::search-files - (s/keys :req [::rpc/profile-id] - :req-un [::team-id] - :opt-un [::search-term])) +(def ^:private schema:search-files + [:map {:title "search-files"} + [:team-id ::sm/uuid] + [:search-term {:optional true} :string]]) (sv/defmethod ::search-files {::doc/added "1.17" - ::doc/module :files} + ::doc/module :files + ::sm/params schema:search-files} [{:keys [::db/pool]} {:keys [::rpc/profile-id team-id search-term]}] (some->> search-term (search-files pool profile-id team-id)))