Break down form460.py into schedule submodules

palewire · Dec 8, 2016 · 569ff83 · 569ff83
1 parent 14bec6c
commit 569ff83
Show file tree

Hide file tree

Showing 14 changed files with 2,273 additions and 2,165 deletions.
diff --git a/calaccess_processed/__init__.py b/calaccess_processed/__init__.py
@@ -20,32 +20,32 @@ def get_models_to_process():
         campaign.entities.CandidateCommittee,
         campaign.filings.form460.Form460FilingVersion,
         campaign.filings.form460.Form460Filing,
-        campaign.filings.form460.Form460ScheduleAItemVersion,
-        campaign.filings.form460.Form460ScheduleAItem,
-        campaign.filings.form460.Form460ScheduleB1ItemVersion,
-        campaign.filings.form460.Form460ScheduleB1Item,
-        campaign.filings.form460.Form460ScheduleB2ItemVersion,
-        campaign.filings.form460.Form460ScheduleB2Item,
-        campaign.filings.form460.Form460ScheduleB2ItemVersionOld,
-        campaign.filings.form460.Form460ScheduleB2ItemOld,
-        campaign.filings.form460.Form460ScheduleCItemVersion,
-        campaign.filings.form460.Form460ScheduleCItem,
-        campaign.filings.form460.Form460ScheduleDItemVersion,
-        campaign.filings.form460.Form460ScheduleDItem,
-        campaign.filings.form460.Form460ScheduleEItemVersion,
-        campaign.filings.form460.Form460ScheduleEItem,
-        campaign.filings.form460.Form460ScheduleESubItemVersion,
-        campaign.filings.form460.Form460ScheduleESubItem,
-        campaign.filings.form460.Form460ScheduleFItemVersion,
-        campaign.filings.form460.Form460ScheduleFItem,
-        campaign.filings.form460.Form460ScheduleGItemVersion,
-        campaign.filings.form460.Form460ScheduleGItem,
-        campaign.filings.form460.Form460ScheduleHItemVersion,
-        campaign.filings.form460.Form460ScheduleHItem,
-        campaign.filings.form460.Form460ScheduleH2ItemVersionOld,
-        campaign.filings.form460.Form460ScheduleH2ItemOld,
-        campaign.filings.form460.Form460ScheduleIItemVersion,
-        campaign.filings.form460.Form460ScheduleIItem,
+        campaign.filings.form460.schedules.a.Form460ScheduleAItemVersion,
+        campaign.filings.form460.schedules.a.Form460ScheduleAItem,
+        campaign.filings.form460.schedules.b.Form460ScheduleB1ItemVersion,
+        campaign.filings.form460.schedules.b.Form460ScheduleB1Item,
+        campaign.filings.form460.schedules.b.Form460ScheduleB2ItemVersion,
+        campaign.filings.form460.schedules.b.Form460ScheduleB2Item,
+        campaign.filings.form460.schedules.b.Form460ScheduleB2ItemVersionOld,
+        campaign.filings.form460.schedules.b.Form460ScheduleB2ItemOld,
+        campaign.filings.form460.schedules.c.Form460ScheduleCItemVersion,
+        campaign.filings.form460.schedules.c.Form460ScheduleCItem,
+        campaign.filings.form460.schedules.d.Form460ScheduleDItemVersion,
+        campaign.filings.form460.schedules.d.Form460ScheduleDItem,
+        campaign.filings.form460.schedules.e.Form460ScheduleEItemVersion,
+        campaign.filings.form460.schedules.e.Form460ScheduleEItem,
+        campaign.filings.form460.schedules.e.Form460ScheduleESubItemVersion,
+        campaign.filings.form460.schedules.e.Form460ScheduleESubItem,
+        campaign.filings.form460.schedules.f.Form460ScheduleFItemVersion,
+        campaign.filings.form460.schedules.f.Form460ScheduleFItem,
+        campaign.filings.form460.schedules.g.Form460ScheduleGItemVersion,
+        campaign.filings.form460.schedules.g.Form460ScheduleGItem,
+        campaign.filings.form460.schedules.h.Form460ScheduleHItemVersion,
+        campaign.filings.form460.schedules.h.Form460ScheduleHItem,
+        campaign.filings.form460.schedules.h.Form460ScheduleH2ItemVersionOld,
+        campaign.filings.form460.schedules.h.Form460ScheduleH2ItemOld,
+        campaign.filings.form460.schedules.i.Form460ScheduleIItemVersion,
+        campaign.filings.form460.schedules.i.Form460ScheduleIItem,
         campaign.filings.schedule497.Schedule497FilingVersion,
         campaign.filings.schedule497.Schedule497Filing,
         campaign.filings.schedule497.Schedule497Part1ItemVersion,

diff --git a/calaccess_processed/models/__init__.py b/calaccess_processed/models/__init__.py
@@ -17,30 +17,48 @@
 from calaccess_processed.models.campaign.filings.form460 import (
     Form460Filing,
     Form460FilingVersion,
+)
+from calaccess_processed.models.campaign.filings.form460.schedules.a import (
     Form460ScheduleAItem,
     Form460ScheduleAItemVersion,
+)
+from calaccess_processed.models.campaign.filings.form460.schedules.b import (
     Form460ScheduleB1Item,
     Form460ScheduleB1ItemVersion,
     Form460ScheduleB2Item,
     Form460ScheduleB2ItemVersion,
     Form460ScheduleB2ItemOld,
     Form460ScheduleB2ItemVersionOld,
+)
+from calaccess_processed.models.campaign.filings.form460.schedules.c import (
     Form460ScheduleCItem,
     Form460ScheduleCItemVersion,
+)
+from calaccess_processed.models.campaign.filings.form460.schedules.d import (
     Form460ScheduleDItem,
     Form460ScheduleDItemVersion,
+)
+from calaccess_processed.models.campaign.filings.form460.schedules.e import (
     Form460ScheduleEItem,
     Form460ScheduleEItemVersion,
     Form460ScheduleESubItem,
     Form460ScheduleESubItemVersion,
+)
+from calaccess_processed.models.campaign.filings.form460.schedules.f import (
     Form460ScheduleFItem,
     Form460ScheduleFItemVersion,
+)
+from calaccess_processed.models.campaign.filings.form460.schedules.g import (
     Form460ScheduleGItem,
     Form460ScheduleGItemVersion,
+)
+from calaccess_processed.models.campaign.filings.form460.schedules.h import (
     Form460ScheduleHItem,
     Form460ScheduleHItemVersion,
     Form460ScheduleH2ItemOld,
     Form460ScheduleH2ItemVersionOld,
+)
+from calaccess_processed.models.campaign.filings.form460.schedules.i import (
     Form460ScheduleIItem,
     Form460ScheduleIItemVersion,
 )