(cloud) Should make searching function again for
This commit is contained in:
@@ -11,11 +11,14 @@
|
||||
enum->keyword
|
||||
is-admin?
|
||||
result->page]]
|
||||
[auto-ap.search :as search]
|
||||
[auto-ap.utils :refer [heartbeat]]
|
||||
[clojure.set :as set]
|
||||
[clojure.string :as str]
|
||||
[clojure.tools.logging :as log]
|
||||
[datomic.client.api :as dc]
|
||||
[auto-ap.search :as search]))
|
||||
[yang.scheduler :as scheduler]
|
||||
[mount.core :as mount]))
|
||||
|
||||
(defn can-user-edit-vendor? [vendor-id id]
|
||||
(if (is-admin? id)
|
||||
@@ -183,30 +186,27 @@
|
||||
matches))
|
||||
|
||||
(defn search [context args _]
|
||||
(comment (let [search-query (cleanse-query (:query args))]
|
||||
(for [[id name] (search/search (cond-> {:q search-query}
|
||||
(not (is-admin? (:id context))) (assoc :hidden false))
|
||||
"vendors")]
|
||||
{:name name
|
||||
:id (Long/parseLong id)})
|
||||
))
|
||||
(if-let [search-query (cleanse-query (:query args))]
|
||||
(let [data (if (is-admin? (:id context))
|
||||
(dc/q '[:find ?n ?i ?s
|
||||
:in $ ?q
|
||||
:where [(fulltext $ :vendor/search-terms ?q) [[?i ?n _ ?s]]]]
|
||||
(dc/db conn)
|
||||
search-query)
|
||||
(dc/q '[:find ?n ?i ?s
|
||||
:in $ ?q
|
||||
:where [(fulltext $ :vendor/search-terms ?q) [[?i ?n _ ?s]]]
|
||||
(not [?i :vendor/hidden true])]
|
||||
(dc/db conn)
|
||||
search-query))]
|
||||
(->> data
|
||||
(sort-by (comp - last))
|
||||
(partial-match-first (:query args))
|
||||
(map (fn [[n i]]
|
||||
{:name n
|
||||
:id i}))))
|
||||
[]))
|
||||
(let [search-query (cleanse-query (:query args))]
|
||||
(for [[id name] (search/search (cond-> {:q search-query}
|
||||
(not (is-admin? (:id context))) (assoc :hidden false))
|
||||
"vendor")]
|
||||
{:name name
|
||||
:id id})
|
||||
))
|
||||
|
||||
(defn rebuild-search-index []
|
||||
(search/full-index-query
|
||||
(for [result (map first (dc/qseq '[:find (pull ?v [:vendor/search-terms :db/id :vendor/name :vendor/hidden])
|
||||
:in $
|
||||
:where [?v :vendor/search-terms ]]
|
||||
(dc/db conn)))]
|
||||
{:id (:db/id result)
|
||||
:text (or (first (:vendor/search-terms result))
|
||||
(:vendor/name result))
|
||||
:hidden (boolean (:vendor/hidden result))})
|
||||
"vendor"))
|
||||
|
||||
#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
|
||||
(mount/defstate indexer
|
||||
:start (scheduler/every (* 5 60 1000) (heartbeat rebuild-search-index "rebuild-search-index"))
|
||||
:stop (scheduler/stop indexer))
|
||||
|
||||
Reference in New Issue
Block a user