Преглед на файлове

Fix missing lists fetch in query-campaigns

Kailash Nadh преди 6 години
родител
ревизия
b078c0006c
променени са 2 файла, в които са добавени 7 реда и са изтрити 3 реда
  1. 0 2
      frontend/my/src/Campaign.js
  2. 7 1
      queries.sql

+ 0 - 2
frontend/my/src/Campaign.js

@@ -387,8 +387,6 @@ class TheFormDef extends React.PureComponent {
       }
     }
 
-    console.log(subLists)
-
     if (this.record) {
       this.props.pageTitle(record.name + " / Campaigns")
     } else {

+ 7 - 1
queries.sql

@@ -274,7 +274,13 @@ INSERT INTO campaign_lists (campaign_id, list_id, list_name)
 -- there's a COUNT() OVER() that still returns the total result count
 -- for pagination in the frontend, albeit being a field that'll repeat
 -- with every resultant row.
-SELECT COUNT(*) OVER () AS total, campaigns.*
+SELECT COUNT(*) OVER () AS total, campaigns.*, (
+        SELECT COALESCE(ARRAY_TO_JSON(ARRAY_AGG(l)), '[]') FROM (
+            SELECT COALESCE(campaign_lists.list_id, 0) AS id,
+            campaign_lists.list_name AS name
+            FROM campaign_lists WHERE campaign_lists.campaign_id = campaigns.id
+        ) l
+    ) AS lists
 FROM campaigns
 WHERE ($1 = 0 OR id = $1)
     AND status=ANY(CASE WHEN ARRAY_LENGTH($2::campaign_status[], 1) != 0 THEN $2::campaign_status[] ELSE ARRAY[status] END)