zf

commit fcc120a6d1d79ebbcc863d37be0190957a080189
parent f09244deaca0b11f5bf049eb29ea5bec65fede65
Author: srfsh <dev@srf.sh>
Date:   Tue, 15 Nov 2022 02:02:09 +0300

Zenflows.VF.Proposal.Query: tiny fixes

Diffstat:
M
src/zenflows/vf/proposal/query.ex
 | 
20
+++++++++++---------

1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/zenflows/vf/proposal/query.ex b/src/zenflows/vf/proposal/query.ex
@@ -66,7 +66,7 @@ end
 defp all_f(q, {:primary_intents_resource_inventoried_as_name, v}) do
 	q
 	|> join(:primary_intents_resource_inventoried_as)
-	|> where([primary_intents_resource_inventoried_as: r], ilike(r.name, ^"%#{v}%"))
+	|> where([primary_intents_resource_inventoried_as: r], ilike(r.name, ^v))
 end
 defp all_f(q, {:or_primary_intents_resource_inventoried_as_name, v}) do
 	q
@@ -129,24 +129,26 @@ defp all_validate(params) do
 	]a)
 	|> Validate.class(:primary_intents_resource_inventoried_as_conforms_to)
 	|> Validate.class(:or_primary_intents_resource_inventoried_as_conforms_to)
-	|> Validate.class(:primary_intents_resource_inventoried_as_primary_accountable)
-	|> Validate.class(:or_primary_intents_resource_inventoried_as_primary_accountable)
-	|> Validate.class(:primary_intents_resource_inventoried_as_classified_as)
-	|> Validate.class(:or_primary_intents_resource_inventoried_as_classified_as)
-	|> Validate.name(:primary_intents_resource_inventoried_as_name)
-	|> Validate.name(:or_primary_intents_resource_inventoried_as_name)
 	|> Validate.exist_nand([:primary_intents_resource_inventoried_as_conforms_to,
 		:or_primary_intents_resource_inventoried_as_conforms_to])
+	|> Validate.class(:primary_intents_resource_inventoried_as_primary_accountable)
+	|> Validate.class(:or_primary_intents_resource_inventoried_as_primary_accountable)
 	|> Validate.exist_nand([:primary_intents_resource_inventoried_as_primary_accountable,
 		:or_primary_intents_resource_inventoried_as_primary_accountable])
+	|> Validate.class(:primary_intents_resource_inventoried_as_classified_as)
+	|> Validate.class(:or_primary_intents_resource_inventoried_as_classified_as)
 	|> Validate.exist_nand([:primary_intents_resource_inventoried_as_classified_as,
 		:or_primary_intents_resource_inventoried_as_classified_as])
+	|> Validate.escape_like(:primary_intents_resource_inventoried_as_name)
+	|> Validate.escape_like(:or_primary_intents_resource_inventoried)
+	|> Validate.name(:primary_intents_resource_inventoried_as_name)
+	|> Validate.name(:or_primary_intents_resource_inventoried_as_name)
 	|> Validate.exist_nand([:primary_intents_resource_inventoried_as_name,
 		:or_primary_intents_resource_inventoried_as_name])
+	|> Validate.class(:primary_intents_resource_inventoried_as_id)
+	|> Validate.class(:or_primary_intents_resource_inventoried_as_id)
 	|> Validate.exist_nand([:primary_intents_resource_inventoried_as_id,
 		:or_primary_intents_resource_inventoried_as_id])
-	|> Validate.escape_like(:primary_intents_resource_inventoried_as_name)
-	|> Validate.escape_like(:or_primary_intents_resource_inventoried)
 	|> Changeset.apply_action(nil)
 end
 end