Merge pull request #11 from openstates/update-event-model

Revert change to event model

Author: alexobaseki

models/event.sql

@@ -15,8 +15,8 @@ MODEL (
 SELECT
     name::TEXT AS name,
     all_day::BOOLEAN AS all_day,
-    NULLIF(start_date, NULL)::TIMESTAMP AS start_date,
-    NULLIF(end_date, NULL)::TIMESTAMP AS end_date,
+    NULLIF(start_date, '')::TIMESTAMP AS start_date,
+    NULLIF(end_date, '')::TIMESTAMP AS end_date,
     status::TEXT AS status,
     classification::TEXT AS classification,
     description::TEXT AS description,

models/vote_event.sql

@@ -21,7 +21,10 @@ SELECT
     identifier::TEXT AS identifier,
     motion_text::TEXT AS motion_text,
     motion_classification::TEXT[] AS motion_classification,
-    NULLIF(start_date, NULL)::TIMESTAMP AS start_date,
+    CASE
+      WHEN CAST("start_date" AS VARCHAR) = '' THEN NULL
+      ELSE STRPTIME(CAST("start_date" AS VARCHAR), '%Y-%m-%d')
+    END AS start_date,
     result::TEXT AS result,
     organization::TEXT AS organization,
     legislative_session::TEXT AS legislative_session,

schema.yaml

@@ -29,7 +29,7 @@
     name: TEXT
     all_day: BOOLEAN
     start_date: TIMESTAMP
-    end_date: TEXT
+    end_date: TIMESTAMP
     status: TEXT
     classification: TEXT
     description: TEXT
@@ -61,4 +61,6 @@
     counts: STRUCT(option TEXT, value INTEGER)[]
     sources: STRUCT(url TEXT, note TEXT)[]
     extras: JSON
+    jurisdiction: STRUCT(id TEXT, name TEXT, classification TEXT, division_id TEXT)
+    scraped_at: TIMESTAMP
     _id: UUID