All tests pass again.
This commit is contained in:
@@ -129,28 +129,18 @@
|
||||
allowance
|
||||
search-pattern)
|
||||
(sequence xform))
|
||||
(->> (dc/q '[:find ?n (pull ?i pattern) ?s
|
||||
:in $ ?q ?allowance pattern
|
||||
:where [(fulltext $ :account/search-terms ?q) [[?i ?n _ ?s]]]
|
||||
[?i :account/numeric-code ?numeric-code]
|
||||
(or [?i :account/applicability :account-applicability/global]
|
||||
[?i :account/applicability :account-applicability/optional])]
|
||||
(->> (dc/q '[:find ?n (pull ?i pattern) ?s
|
||||
:in $ [[?i ?n ?s]] pattern
|
||||
:where (or [?i :account/applicability :account-applicability/global]
|
||||
[?i :account/applicability :account-applicability/optional])]
|
||||
(dc/db conn)
|
||||
query
|
||||
allowance
|
||||
(search/search {:q query} "account")
|
||||
search-pattern)
|
||||
(concat (when client
|
||||
(dc/q '[:find ?n (pull ?a pattern) ?s
|
||||
:in $ ?c ?q ?allowance pattern
|
||||
:where
|
||||
[?i :account-client-override/client ?c]
|
||||
[(fulltext $ :account-client-override/search-terms ?q) [[?i ?n _ ?s]]]
|
||||
[?a :account/client-overrides ?i]
|
||||
[?a :account/numeric-code ?numeric-code]]
|
||||
(dc/q '[:find ?n (pull ?i pattern) ?s
|
||||
:in $ [[?i ?n ?s]] pattern]
|
||||
(dc/db conn)
|
||||
client
|
||||
query
|
||||
allowance
|
||||
(search/search {:q query :client (str client)} "account-client-override")
|
||||
search-pattern)))
|
||||
(sort-by (comp - last))
|
||||
(sequence xform)))
|
||||
@@ -166,6 +156,7 @@
|
||||
(dc/db conn)))
|
||||
:when (:account/numeric-code (:account/_client-overrides result))]
|
||||
{:id (:db/id (:account/_client-overrides result))
|
||||
:account-client-override-id (:db/id result)
|
||||
:text (:account-client-override/search-terms result)
|
||||
:client (str (:db/id (:account-client-override/client result)))
|
||||
:numeric-code (:account/numeric-code (:account/_client-overrides result))
|
||||
|
||||
Reference in New Issue
Block a user