Simplify target filtering implementation in queries

Author: bjorn3

openleadr-vtn/src/data_source/postgres/event.rs

@@ -215,18 +215,8 @@ impl Crud for PgEventStorage {
             SELECT e.*
             FROM event e
               JOIN program p on p.id = e.program_id
-              LEFT JOIN LATERAL (
-
-                    SELECT targets.e_id,
-                           (t ?| $2) AS target_test
-                    FROM (SELECT event.id                            AS e_id,
-                                 event.targets AS t
-                          FROM event) AS targets
-
-                  )
-                  ON e.id = e_id
             WHERE ($1::text IS NULL OR e.program_id like $1)
-              AND ($2 IS NULL OR target_test)
+              AND ($2::text[] IS NULL OR e.targets ?| $2)
               AND ($3 AND ($4::text[] IS NULL OR p.business_id = ANY ($4)))
             GROUP BY e.id, e.priority, e.created_date_time
             ORDER BY priority ASC , created_date_time DESC

openleadr-vtn/src/data_source/postgres/program.rs

@@ -259,17 +259,7 @@ impl Crud for PgProgramStorage {
                    p.payload_descriptors,
                    p.targets
             FROM program p
-              LEFT JOIN LATERAL (
-
-                  SELECT targets.p_id,
-                           (t ?| $1) AS target_test
-                    FROM (SELECT program.id                            AS p_id,
-                                 program.targets AS t
-                          FROM program) AS targets
-
-                  )
-                  ON p.id = p_id
-            WHERE ($1 IS NULL OR target_test)
+            WHERE ($1::text[] IS NULL OR p.targets ?| $1)
             GROUP BY p.id, p.created_date_time
             ORDER BY p.created_date_time DESC
             OFFSET $2 LIMIT $3

openleadr-vtn/src/data_source/postgres/resource.rs

@@ -166,19 +166,9 @@ impl VenScopedCrud for PgResourceStorage {
                 r.attributes,
                 r.targets
             FROM resource r
-              LEFT JOIN LATERAL (
-
-                    SELECT targets.r_id,
-                           (t ?| $3) AS target_test
-                    FROM (SELECT resource.id                            AS r_id,
-                                 resource.targets AS t
-                          FROM resource) AS targets
-
-                   )
-                  ON r.id = r_id
             WHERE r.ven_id = $1
                 AND ($2::text IS NULL OR r.resource_name = $2)
-                AND ($3 IS NULL OR target_test)
+                AND ($3::text[] IS NULL OR r.targets ?| $3)
             ORDER BY r.created_date_time
             OFFSET $4 LIMIT $5
             "#,

openleadr-vtn/src/data_source/postgres/ven.rs

@@ -168,19 +168,8 @@ impl Crud for PgVenStorage {
                 v.targets
             FROM ven v
               LEFT JOIN resource r ON r.ven_id = v.id
-              LEFT JOIN LATERAL (
-
-                    -- FIXME simplify
-                    SELECT targets.v_id,
-                           (t ?| $2) AS target_test
-                    FROM (SELECT ven.id                            AS v_id,
-                                 ven.targets AS t
-                          FROM ven) AS targets
-
-                   )
-                  ON v.id = v_id
             WHERE ($1::text IS NULL OR v.ven_name = $1)
-              AND ($2 IS NULL OR target_test)
+              AND ($2::text[] IS NULL OR v.targets ?| $2)
               AND ($3::text[] IS NULL OR v.id = ANY($3))
             ORDER BY v.created_date_time DESC
             OFFSET $4 LIMIT $5