Finish query for a processed April dataset

sql/queries.pgsql

@@ -105,7 +105,8 @@ GROUP BY read_date, period
 ORDER BY read_date, period;
 
 -- Gerate timestamp list
-SELECT dd FROM GENERATE_SERIES('2017-04-01'::timestamp, '2017-04-02'::timestamp, '30 minutes'::interval) dd;
+SELECT read_date 
+FROM GENERATE_SERIES('2017-04-01'::timestamp, '2017-04-02'::timestamp, '30 minutes'::interval) read_date;
 
 -- Fraction of icp's in april with 1440 entries
 SELECT SUM(CASE WHEN isum.c = 1440 THEN 1 ELSE 0 END)::numeric / COUNT(*)::numeric As frac FROM
@@ -158,3 +159,71 @@ FROM
     GROUP BY icp_id
 ) AS cir 
 WHERE data_days >= 360;
+
+-- Gerate timestamp list for 2017
+SELECT read_date 
+FROM GENERATE_SERIES('2017-01-01 00:30:00'::timestamp, '2018-01-01 00:00:00'::timestamp, 
+    '30 minutes'::interval) read_date;
+
+
+-- --------------------------------
+-- Processed dataset for April 2017
+-- --------------------------------
+
+-- All combinations of read_time and icp_id for April
+SELECT read_time, icp_id
+FROM
+(
+    SELECT read_time 
+    FROM GENERATE_SERIES('2017-04-01 00:30:00'::timestamp, '2017-05-01 00:00:00'::timestamp, 
+        '30 minutes'::interval) read_time
+) AS tsdata CROSS JOIN
+(
+    SELECT *
+    FROM
+    (
+        SELECT icp_id, COUNT(DISTINCT read_date) AS data_days 
+        FROM coup_prd.coupdatamaster
+        WHERE read_date >= to_date('01/01/2017','dd/mm/yyyy')
+            AND read_date <  to_date('01/01/2018','dd/mm/yyyy')
+            AND content_code = 'UN'
+        GROUP BY icp_id
+    ) AS cir 
+    WHERE data_days >= 360
+) AS qual_icp;
+
+-- Creating timestamp column on April dataset
+SELECT *, read_date + CONCAT(period / 2, ':', period % 2 * 30, ':00')::time AS read_time
+FROM public.coup_tall_april;
+
+-- Combined query (for april only)
+SELECT comb.icp_id, comb.read_time, COALESCE(kwh_tot, 0) AS kwh_tot
+FROM
+(
+    SELECT read_time, icp_id
+    FROM
+    (
+        SELECT read_time 
+        FROM GENERATE_SERIES('2017-04-01 00:30:00'::timestamp, '2017-05-01 00:00:00'::timestamp, 
+            '30 minutes'::interval) read_time
+    ) AS tsdata CROSS JOIN
+    (
+        SELECT *
+        FROM
+        (
+            SELECT icp_id, COUNT(DISTINCT read_date) AS data_days 
+            FROM coup_prd.coupdatamaster
+            WHERE read_date >= to_date('01/01/2017','dd/mm/yyyy')
+                AND read_date <  to_date('01/01/2018','dd/mm/yyyy')
+                AND content_code = 'UN'
+            GROUP BY icp_id
+        ) AS cir 
+        WHERE data_days >= 360
+    ) AS qual_icp
+) AS comb
+LEFT JOIN
+(
+    SELECT *, read_date + CONCAT(period / 2, ':', period % 2 * 30, ':00')::time AS read_time
+    FROM public.coup_tall_april
+) AS tall_timestamp 
+ON comb.read_time = tall_timestamp.read_time AND comb.icp_id = tall_timestamp.icp_id;