Grab only first week of april; icp ids ending in 17

py/downkwh.py

     FROM
     (
         SELECT read_time 
-        FROM GENERATE_SERIES('2017-04-01 00:30:00'::timestamp, '2017-05-01 00:00:00'::timestamp, 
+        FROM GENERATE_SERIES('2017-04-01 00:30:00'::timestamp, '2017-04-08 00:00:00'::timestamp, 
             '30 minutes'::interval) read_time
     ) AS tsdata CROSS JOIN
     (
             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'
+                AND icp_id LIKE '%%17'
             GROUP BY icp_id
         ) AS cir 
         WHERE data_days >= 360
 ON comb.read_time = tall_timestamp.read_time AND comb.icp_id = tall_timestamp.icp_id;
 """
 
-pickleQuery(query, "../data/April.pkl")
+pickleQuery(query, "../data/Aprilw1.pkl")