Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Model cleanup #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Model cleanup #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb59a3a
Refactor shared model creation helpers.
jmcarp May 27, 2018
229db83
Simplify table creation.
jmcarp May 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
269 changes: 58 additions & 211 deletions courtutils/databases/postgres.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
import collections
from datetime import datetime, date
from sqlalchemy import (create_engine, Boolean, Column,
Date, DateTime, Integer, BigInteger,
Expand All @@ -12,6 +13,11 @@

Base = declarative_base()

RelatedModelFetcher = collections.namedtuple(
'RelatedModelFetcher',
['key', 'attribute'],
)

class Court():
id = Column(Integer, primary_key=True)
name = Column(String)
Expand Down Expand Up @@ -80,9 +86,39 @@ class Case():
collected = Column(Date)
CaseNumber = Column(String)

related_model_fetchers = []

@classmethod
def create(cls, case):
details = case['details']

related_values = {
fetcher.key: details.pop(fetcher.key, [])
for fetcher in cls.related_model_fetchers
}

row = cls(**details)
row.fips = int(case['fips'])
row.details_fetched_for_hearing_date = case['details_fetched_for_hearing_date']
row.collected = case['collected']

for fetcher in cls.related_model_fetchers:
related_model = cls.__mapper__._props[fetcher.attribute].mapper.class_
related_rows = [related_model(**each) for each in related_values[fetcher.key]]
setattr(row, fetcher.attribute, related_rows)

return row


class CircuitCriminalCase(Base, Case):
prefix = CIRCUIT_CRIMINAL
__tablename__ = prefix + 'Case'
related_model_fetchers = [
RelatedModelFetcher('Hearings', 'Hearings'),
RelatedModelFetcher('Pleadings', 'Pleadings'),
RelatedModelFetcher('Services', 'Services'),
]

Hearings = relationship(prefix + 'Hearing')
Pleadings = relationship(prefix + 'Pleading')
Services = relationship(prefix + 'Service')
Expand Down Expand Up @@ -140,43 +176,16 @@ class CircuitCriminalCase(Base, Case):

AppealedDate = Column(Date)

@staticmethod
def create(case):
details = case['details']
hearings = []
pleadings = []
services = []

if 'Hearings' in details:
hearings = details['Hearings']
del details['Hearings']
if 'Pleadings' in details:
pleadings = details['Pleadings']
del details['Pleadings']
if 'Services' in details:
services = details['Services']
del details['Services']

db_case = CircuitCriminalCase(**details)
db_case.fips = int(case['fips'])
db_case.details_fetched_for_hearing_date = case['details_fetched_for_hearing_date']
db_case.collected = case['collected']

db_case.Hearings = [
CircuitCriminalHearing(**hearing)
for hearing in hearings
]
db_case.Pleadings = [
CircuitCriminalPleading(**pleading)
for pleading in pleadings
]
db_case.Services = [
CircuitCriminalService(**service)
for service in services
]
return db_case

class CircuitCivilCase(Base, Case):
related_model_fetchers = [
RelatedModelFetcher('Hearings', 'Hearings'),
RelatedModelFetcher('Pleadings', 'Pleadings'),
RelatedModelFetcher('Services', 'Services'),
RelatedModelFetcher('Plaintiffs', 'Plaintiffs'),
RelatedModelFetcher('Defendants', 'Defendants'),
]

prefix = CIRCUIT_CIVIL
__tablename__ = prefix + 'Case'
Hearings = relationship(prefix + 'Hearing')
Expand All @@ -201,61 +210,15 @@ class CircuitCivilCase(Base, Case):
AppealedDate = Column(Date)
ConcludedBy = Column(String)

@staticmethod
def create(case):
details = case['details']
hearings = []
pleadings = []
services = []
plaintiffs = []
defendants = []

if 'Hearings' in details:
hearings = details['Hearings']
del details['Hearings']
if 'Pleadings' in details:
pleadings = details['Pleadings']
del details['Pleadings']
if 'Services' in details:
services = details['Services']
del details['Services']
if 'Plaintiffs' in details:
plaintiffs = details['Plaintiffs']
del details['Plaintiffs']
if 'Defendants' in details:
defendants = details['Defendants']
del details['Defendants']

db_case = CircuitCivilCase(**details)
db_case.fips = int(case['fips'])
db_case.details_fetched_for_hearing_date = case['details_fetched_for_hearing_date']
db_case.collected = case['collected']

db_case.Hearings = [
CircuitCivilHearing(**hearing)
for hearing in hearings
]
db_case.Pleadings = [
CircuitCivilPleading(**pleading)
for pleading in pleadings
]
db_case.Services = [
CircuitCivilService(**service)
for service in services
]
db_case.Plaintiffs = [
CircuitCivilPlaintiff(**plaintiff)
for plaintiff in plaintiffs
]
db_case.Defendants = [
CircuitCivilDefendant(**defendant)
for defendant in defendants
]
return db_case

class DistrictCriminalCase(Base, Case):
prefix = DISTRICT_CRIMINAL
__tablename__ = prefix + 'Case'
related_model_fetchers = [
RelatedModelFetcher('Hearings', 'Hearings'),
RelatedModelFetcher('Services', 'Services'),
]

Hearings = relationship(prefix + 'Hearing')
Services = relationship(prefix + 'Service')

Expand Down Expand Up @@ -301,37 +264,18 @@ class DistrictCriminalCase(Base, Case):
FineCostsPaidDate = Column(Date)
VASAP = Column(Boolean)

@staticmethod
def create(case):
details = case['details']
hearings = []
services = []

if 'Hearings' in details:
hearings = details['Hearings']
del details['Hearings']
if 'Services' in details:
services = details['Services']
del details['Services']

db_case = DistrictCriminalCase(**details)
db_case.fips = int(case['fips'])
db_case.details_fetched_for_hearing_date = case['details_fetched_for_hearing_date']
db_case.collected = case['collected']

db_case.Hearings = [
DistrictCriminalHearing(**hearing)
for hearing in hearings
]
db_case.Services = [
DistrictCriminalService(**service)
for service in services
]
return db_case

class DistrictCivilCase(Base, Case):
prefix = DISTRICT_CIVIL
__tablename__ = prefix + 'Case'
related_model_fetchers = [
RelatedModelFetcher('Hearings', 'Hearings'),
RelatedModelFetcher('Services', 'Services'),
RelatedModelFetcher('Reports', 'Reports'),
RelatedModelFetcher('Plaintiffs', 'Plaintiffs'),
RelatedModelFetcher('Defendants', 'Defendants'),
]

Hearings = relationship(prefix + 'Hearing')
Services = relationship(prefix + 'Service')
Reports = relationship(prefix + 'Report')
Expand Down Expand Up @@ -365,57 +309,6 @@ class DistrictCivilCase(Base, Case):
AppealDate = Column(Date)
AppealedBy = Column(String)

@staticmethod
def create(case):
details = case['details']
hearings = []
services = []
reports = []
plaintiffs = []
defendants = []

if 'Hearings' in details:
hearings = details['Hearings']
del details['Hearings']
if 'Services' in details:
services = details['Services']
del details['Services']
if 'Reports' in details:
reports = details['Reports']
del details['Reports']
if 'Plaintiffs' in details:
plaintiffs = details['Plaintiffs']
del details['Plaintiffs']
if 'Defendants' in details:
defendants = details['Defendants']
del details['Defendants']

db_case = DistrictCivilCase(**details)
db_case.fips = int(case['fips'])
db_case.details_fetched_for_hearing_date = case['details_fetched_for_hearing_date']
db_case.collected = case['collected']

db_case.Hearings = [
DistrictCivilHearing(**hearing)
for hearing in hearings
]
db_case.Services = [
DistrictCivilService(**service)
for service in services
]
db_case.Reports = [
DistrictCivilReport(**report)
for report in reports
]
db_case.Plaintiffs = [
DistrictCivilPlaintiff(**plaintiff)
for plaintiff in plaintiffs
]
db_case.Defendants = [
DistrictCivilDefendant(**defendant)
for defendant in defendants
]
return db_case

#
# Hearing Tables
Expand Down Expand Up @@ -582,51 +475,6 @@ class DistrictCivilDefendant(Base, DistrictCivilParty):
case_id = Column(BigInteger, ForeignKey(prefix + 'Case.id', ondelete='CASCADE'))


TABLES = [
# Courts
CircuitCourt,
DistrictCourt,

# Tasks
CircuitCourtDateTask,
DistrictCourtDateTask,
CircuitCourtActiveDateTask,
DistrictCourtActiveDateTask,

# Searches
CircuitCourtDateSearch,
DistrictCourtDateSearch,

# Cases
CircuitCriminalCase,
CircuitCivilCase,
DistrictCriminalCase,
DistrictCivilCase,

# Hearings
CircuitCriminalHearing,
CircuitCivilHearing,
DistrictCriminalHearing,
DistrictCivilHearing,

# Pleadings
CircuitCriminalPleading,
CircuitCivilPleading,

# Services
CircuitCriminalService,
CircuitCivilService,
DistrictCriminalService,
DistrictCivilService,

# Reports and Parties
DistrictCivilReport,
DistrictCivilPlaintiff,
DistrictCivilDefendant,
CircuitCivilPlaintiff,
CircuitCivilDefendant
]

#
# Database class
#
Expand All @@ -644,8 +492,7 @@ def __init__(self, court_type):
DistrictCourtActiveDateTask.__table__.c.casetype,
unique=True)

for table in TABLES:
table.__table__.create(self.engine, checkfirst=True) #pylint: disable=E1101
Base.metadata.create_all(self.engine)

self.court_type = court_type
if court_type == 'circuit':
Expand Down