Add created_at and updated_at columns to ft_notification_status

Added created_at and updated_at to the ft_notification_status table in order
to make it easier to track down any potential issues with the data.

Also updated the command to populate the data to take created_at and
updated_at into account and to simplify the command. This can all be done in
the same commit since the table is not being used anywhere yet and can
only be populated manually.

app/commands.py

@@ -618,30 +618,25 @@ def migrate_data_to_ft_notification_status(start_date, end_date):
         sql = \
             """
             insert into ft_notification_status (bst_date, template_id, service_id, job_id, notification_type, key_type,
-                notification_status, notification_count)
+                notification_status, created_at, notification_count)
-                select bst_date, template_id, service_id, job_id, notification_type, key_type, notification_status,
+                select
-                    sum(notification_count) as notification_count
+                    (n.created_at at time zone 'UTC' at time zone 'Europe/London')::timestamp::date as bst_date,
-                from (
+                    n.template_id,
-                    select
+                    n.service_id,
-                        da.bst_date,
+                    coalesce(n.job_id, '00000000-0000-0000-0000-000000000000') as job_id,
-                        n.template_id,
+                    n.notification_type,
-                        n.service_id,
+                    n.key_type,
-                        coalesce(n.job_id, '00000000-0000-0000-0000-000000000000') as job_id,
+                    n.notification_status,
-                        n.notification_type,
+                    now() as created_at,
-                        n.key_type,
+                    count(*) as notification_count
-                        n.notification_status,
+                from notification_history n
-                        1 as notification_count
+                where n.created_at >= (date :start + time '00:00:00') at time zone 'Europe/London' at time zone 'UTC'
-                    from public.notification_history n
+                    and n.created_at < (date :end + time '00:00:00') at time zone 'Europe/London' at time zone 'UTC'
-                    left join dm_datetime da on n.created_at >= da.utc_daytime_start
-                        and n.created_at < da.utc_daytime_end
-                    where n.created_at >= (date :start + time '00:00:00') at time zone 'Europe/London'
-                            at time zone 'UTC'
-                        and n.created_at < (date :end + time '00:00:00') at time zone 'Europe/London' at time zone 'UTC'
-                        ) as individual_record
                 group by bst_date, template_id, service_id, job_id, notification_type, key_type, notification_status
                 order by bst_date
             on conflict on constraint ft_notification_status_pkey do update set
-                notification_count = excluded.notification_count
+                notification_count = excluded.notification_count,
+                updated_at = now()
             """
         result = db.session.execute(sql, {"start": process_date, "end": process_date + timedelta(days=1)})
         db.session.commit()

app/models.py

@@ -1812,3 +1812,5 @@ class FactNotificationStatus(db.Model):
     key_type = db.Column(db.Text, primary_key=True, nullable=False)
     notification_status = db.Column(db.Text, primary_key=True, nullable=False)
     notification_count = db.Column(db.Integer(), nullable=False)
+    created_at = db.Column(db.DateTime, nullable=False, default=datetime.datetime.utcnow)
+    updated_at = db.Column(db.DateTime, nullable=True, onupdate=datetime.datetime.utcnow)

migrations/versions/0195_ft_notification_timestamps.py

@@ -0,0 +1,23 @@
+"""
+
+Revision ID: 0195_ft_notification_timestamps
+Revises: 0194_ft_billing_created_at
+Create Date: 2018-05-22 16:01:53.269137
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+revision = '0195_ft_notification_timestamps'
+down_revision = '0194_ft_billing_created_at'
+
+
+def upgrade():
+    op.add_column('ft_notification_status', sa.Column('created_at', sa.DateTime(), nullable=False))
+    op.add_column('ft_notification_status', sa.Column('updated_at', sa.DateTime(), nullable=True))
+
+
+def downgrade():
+    op.drop_column('ft_notification_status', 'updated_at')
+    op.drop_column('ft_notification_status', 'created_at')