Sync campaign orders and backfill Tableau data through Oct 7

transform_tableau.py

@@ -91,6 +91,7 @@ for raw_row in matrix[1:] if has_header else matrix:
     campaign = cell(raw_row, 'campaign').strip()
     if not pkg or not source or not campaign: continue
     date = cell(raw_row, 'date').strip() or target
+    if date != target: continue
     exp = next((meta for adping, meta in experiment.get((pkg, source), [])
                 if re.search(r'(?<!\d)' + re.escape(adping) + r'(?!\d)', campaign)), None)
     if not exp:
@@ -108,11 +109,13 @@ for raw_row in matrix[1:] if has_header else matrix:
     if not active_on(meta, date):
         continue
     required = event_names(meta.get('kpi',''))
-    if not required or (date, source) not in covered_scopes:
+    matched_events = [(date, pkg, source, campaign, name) for name in required
+                      if (date, pkg, source, campaign, name) in events]
+    if not required or (date, source) not in covered_scopes or not matched_events:
         event = None
     else:
-        event = sum(events.get((date, pkg, source, campaign, name), 0) for name in required)
-    rows.append({'date': cell(raw_row, 'date').strip() or target, 'pkg':pkg, 'geo':meta['geo'], 'source':source,
+        event = sum(events[key] for key in matched_events)
+    rows.append({'date': date, 'pkg':pkg, 'geo':meta['geo'], 'source':source,
       'group':group, 'adpingId':adping, 'campaign':shown, 'status':'Active', 'kpi':meta.get('kpi',''),
       'event':event,
       'impression':num(cell(raw_row,'impression')), 'click':num(cell(raw_row,'click')),