Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Political Memory
memopol
Commits
82a3b1dc
Commit
82a3b1dc
authored
Oct 05, 2016
by
Nicolas Joyard
Browse files
Fix rep import tests (using natural keys)
parent
cf3db8a5
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
src/representatives/contrib/francedata/tests/representatives_expected.json
View file @
82a3b1dc
This diff is collapsed.
Click to expand it.
src/representatives/contrib/francedata/tests/test_francedata_import_representatives.py
View file @
82a3b1dc
import
pytest
import
os
import
copy
from
django.core.serializers.json
import
Deserializer
from
representatives.models
import
Representative
from
representatives.tests.base
import
TestBase
from
representatives.contrib.francedata
import
import_representatives
@
pytest
.
mark
.
django_db
def
test_francedata_import_representatives
():
inputjson
=
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
'representatives_input.json'
)
expected
=
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
'representatives_expected.json'
)
class
FranceDataRepresentativesTest
(
TestBase
):
def
test_francedata_import_representatives
(
self
):
inputjson
=
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
'representatives_input.json'
)
expected
=
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
'representatives_expected.json'
)
# Disable django auto fields
exclude
=
(
'id'
,
'_state'
,
'created'
,
'updated'
,
'fingerprint'
)
with
open
(
inputjson
,
'r'
)
as
f
:
import_representatives
.
main
(
f
)
with
open
(
inputjson
,
'r'
)
as
f
:
import_representatives
.
main
(
f
)
missing
=
[]
with
open
(
expected
,
'r'
)
as
f
:
for
obj
in
Deserializer
(
f
.
read
()):
compare
=
copy
.
copy
(
obj
.
object
.
__dict__
)
for
field
in
exclude
:
if
field
in
compare
:
compare
.
pop
(
field
)
try
:
type
(
obj
.
object
).
objects
.
get
(
**
compare
)
except
:
missing
.
append
(
compare
)
assert
len
(
missing
)
is
0
assert
Representative
.
objects
.
count
()
==
2
self
.
assertObjectsFromFixture
(
expected
)
assert
Representative
.
objects
.
count
()
==
2
src/representatives/contrib/parltrack/tests/representatives_expected.json
View file @
82a3b1dc
This diff is collapsed.
Click to expand it.
src/representatives/contrib/parltrack/tests/test_import_representatives.py
View file @
82a3b1dc
import
pytest
import
os
import
copy
from
django.core.serializers.json
import
Deserializer
from
representatives.models
import
Representative
from
representatives.tests.base
import
TestBase
from
representatives.contrib.parltrack
import
import_representatives
@
pytest
.
mark
.
django_db
def
test_parltrack_import_representatives
():
fixture
=
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
'representatives_fixture.json'
)
expected
=
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
'representatives_expected.json'
)
class
ParltracRepresentativesTest
(
TestBase
):
def
test_parltrack_import_representatives
(
self
):
fixture
=
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
'representatives_fixture.json'
)
expected
=
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
'representatives_expected.json'
)
# Disable django auto fields
exclude
=
(
'id'
,
'_state'
,
'created'
,
'updated'
,
'fingerprint'
)
with
open
(
fixture
,
'r'
)
as
f
:
import_representatives
.
main
(
f
)
with
open
(
fixture
,
'r'
)
as
f
:
import_representatives
.
main
(
f
)
missing
=
[]
with
open
(
expected
,
'r'
)
as
f
:
for
obj
in
Deserializer
(
f
.
read
()):
compare
=
copy
.
copy
(
obj
.
object
.
__dict__
)
for
field
in
exclude
:
if
field
in
compare
:
compare
.
pop
(
field
)
try
:
type
(
obj
.
object
).
objects
.
get
(
**
compare
)
except
:
missing
.
append
(
compare
)
assert
len
(
missing
)
is
0
assert
Representative
.
objects
.
count
()
==
2
self
.
assertObjectsFromFixture
(
expected
)
assert
Representative
.
objects
.
count
()
==
2
src/representatives/models.py
View file @
82a3b1dc
...
...
@@ -20,19 +20,36 @@ class TimeStampedModel(models.Model):
abstract
=
True
class
CountryManager
(
models
.
Manager
):
def
get_by_natural_key
(
self
,
code
):
return
self
.
get
(
code
=
code
)
class
Country
(
models
.
Model
):
objects
=
CountryManager
()
name
=
models
.
CharField
(
max_length
=
255
)
code
=
models
.
CharField
(
max_length
=
2
,
unique
=
True
)
def
__unicode__
(
self
):
return
u
'{} [{}]'
.
format
(
self
.
name
,
self
.
code
)
def
natural_key
(
self
):
return
(
self
.
code
,)
class
RepresentativeManager
(
models
.
Manager
):
def
get_by_natural_key
(
self
,
slug
):
return
self
.
get
(
slug
=
slug
)
class
Representative
(
TimeStampedModel
):
"""
Base model for representatives
"""
objects
=
RepresentativeManager
()
slug
=
models
.
SlugField
(
max_length
=
100
,
unique
=
True
)
first_name
=
models
.
CharField
(
max_length
=
255
,
blank
=
True
,
default
=
''
)
last_name
=
models
.
CharField
(
max_length
=
255
,
blank
=
True
,
default
=
''
)
...
...
@@ -52,6 +69,9 @@ class Representative(TimeStampedModel):
def
__unicode__
(
self
):
return
smart_unicode
(
self
.
full_name
)
def
natural_key
(
self
):
return
(
self
.
slug
,)
def
gender_as_str
(
self
):
genders
=
{
0
:
'N/A'
,
1
:
'F'
,
2
:
'M'
}
return
genders
[
self
.
gender
]
...
...
@@ -79,7 +99,15 @@ class WebSite(Contact):
kind
=
models
.
CharField
(
max_length
=
255
,
blank
=
True
,
default
=
''
)
class
AddressManager
(
models
.
Manager
):
def
get_by_natural_key
(
self
,
name
,
kind
,
representative_slug
):
representative
=
Representative
.
objects
.
get
(
slug
=
representative_slug
)
return
self
.
get
(
name
=
name
,
kind
=
kind
,
representative
=
representative
)
class
Address
(
Contact
):
objects
=
AddressManager
()
country
=
models
.
ForeignKey
(
Country
)
city
=
models
.
CharField
(
max_length
=
255
,
blank
=
True
,
default
=
''
)
street
=
models
.
CharField
(
max_length
=
255
,
blank
=
True
,
default
=
''
)
...
...
@@ -91,6 +119,10 @@ class Address(Contact):
name
=
models
.
CharField
(
max_length
=
255
,
blank
=
True
,
default
=
''
)
location
=
models
.
CharField
(
max_length
=
255
,
blank
=
True
,
default
=
''
)
def
natural_key
(
self
):
representative_nk
=
self
.
representative
.
natural_key
()
return
(
self
.
name
,
self
.
kind
)
+
representative_nk
class
Phone
(
Contact
):
number
=
models
.
CharField
(
max_length
=
255
,
blank
=
True
,
default
=
''
)
...
...
@@ -98,10 +130,17 @@ class Phone(Contact):
address
=
models
.
ForeignKey
(
Address
,
null
=
True
,
related_name
=
'phones'
)
class
ChamberManager
(
models
.
Manager
):
def
get_by_natural_key
(
self
,
abbreviation
):
return
self
.
get
(
abbreviation
=
abbreviation
)
class
Chamber
(
models
.
Model
):
"""
A representative chamber
"""
objects
=
ChamberManager
()
name
=
models
.
CharField
(
max_length
=
255
)
country
=
models
.
ForeignKey
(
'Country'
,
null
=
True
,
related_name
=
'chambers'
)
abbreviation
=
models
.
CharField
(
max_length
=
10
,
blank
=
True
,
default
=
''
,
...
...
@@ -110,11 +149,26 @@ class Chamber(models.Model):
def
__unicode__
(
self
):
return
u
'{} [{}]'
.
format
(
self
.
name
,
self
.
abbreviation
)
def
natural_key
(
self
):
return
(
self
.
abbreviation
,)
class
GroupManager
(
models
.
Manager
):
def
get_by_natural_key
(
self
,
name
,
kind
,
chamber_nk
):
if
chamber_nk
:
chamber
=
Chamber
.
objects
.
get_by_natural_key
(
chamber_nk
)
else
:
chamber
=
None
return
self
.
get
(
name
=
name
,
kind
=
kind
,
chamber
=
chamber
)
class
Group
(
TimeStampedModel
):
"""
An entity represented by a representative through a mandate
"""
objects
=
GroupManager
()
name
=
models
.
CharField
(
max_length
=
511
,
db_index
=
True
)
abbreviation
=
models
.
CharField
(
max_length
=
10
,
blank
=
True
,
default
=
''
,
db_index
=
True
)
...
...
@@ -128,14 +182,30 @@ class Group(TimeStampedModel):
def
__unicode__
(
self
):
return
unicode
(
self
.
name
)
def
natural_key
(
self
):
chamber_nk
=
self
.
chamber
.
natural_key
()
if
self
.
chamber
else
(
None
,)
return
(
self
.
name
,
self
.
kind
)
+
chamber_nk
class
Meta
:
ordering
=
(
'name'
,)
class
ConstituencyManager
(
models
.
Manager
):
def
get_by_natural_key
(
self
,
name
,
country_nk
):
if
country_nk
:
country
=
Country
.
objects
.
get_by_natural_key
(
country_nk
)
else
:
country
=
None
return
self
.
get
(
name
=
name
,
country
=
country
)
class
Constituency
(
TimeStampedModel
):
"""
An authority for which a representative has a mandate
"""
objects
=
ConstituencyManager
()
name
=
models
.
CharField
(
max_length
=
255
)
country
=
models
.
ForeignKey
(
'Country'
,
null
=
True
,
blank
=
True
,
related_name
=
'constituencies'
)
...
...
@@ -147,6 +217,10 @@ class Constituency(TimeStampedModel):
def
__unicode__
(
self
):
return
unicode
(
self
.
name
)
def
natural_key
(
self
):
country_nk
=
self
.
country
.
natural_key
()
if
self
.
country
else
(
None
,)
return
(
self
.
name
,)
+
country_nk
class
MandateManager
(
models
.
Manager
):
""" This satisfies repr(Mandate) """
...
...
@@ -158,8 +232,18 @@ class MandateManager(models.Manager):
'constituency'
)
class
Mandate
(
TimeStampedModel
):
class
MandateManager
(
models
.
Manager
):
def
get_by_natural_key
(
self
,
begin_date
,
end_date
,
representative_slug
,
group_name
,
group_kind
,
group_chamber_nk
):
representative
=
Representative
.
objects
.
get_by_natural_key
(
representative_slug
)
group
=
Group
.
objects
.
get_by_natural_key
(
group_name
,
group_kind
,
group_chamber_nk
)
return
self
.
get
(
begin_date
=
begin_date
,
end_date
=
end_date
,
representative
=
representative
,
group
=
group
)
class
Mandate
(
TimeStampedModel
):
objects
=
MandateManager
()
group
=
models
.
ForeignKey
(
Group
,
null
=
True
,
related_name
=
'mandates'
)
...
...
@@ -190,5 +274,13 @@ class Mandate(TimeStampedModel):
constituency
=
self
.
constituency
,
group
=
self
.
group
)
def
natural_key
(
self
):
rep_nk
=
self
.
representative
.
natural_key
()
\
if
self
.
representative
else
(
None
,)
group_nk
=
self
.
group
.
natural_key
()
\
if
self
.
group
else
(
None
,
None
,
None
)
return
(
self
.
begin_date
,
self
.
end_date
)
+
rep_nk
+
group_nk
class
Meta
:
ordering
=
(
'-end_date'
,)
src/representatives/tests/base.py
0 → 100644
View file @
82a3b1dc
import
copy
import
logging
import
re
from
django
import
test
from
django.core.serializers.json
import
Deserializer
class
TestBase
(
test
.
TestCase
):
logger
=
logging
.
getLogger
(
'representatives'
)
_exclude
=
(
'id'
,
'_state'
,
'created'
,
'updated'
,
'fingerprint'
)
_exclude_re
=
(
re
.
compile
(
r
'^_.*_cache$'
),)
def
assertObjectsFromFixture
(
self
,
fixture
):
missing
=
[]
with
open
(
fixture
,
'r'
)
as
f
:
for
obj
in
Deserializer
(
f
.
read
()):
compare
=
copy
.
copy
(
obj
.
object
.
__dict__
)
for
field
in
self
.
_exclude
:
if
field
in
compare
:
compare
.
pop
(
field
)
for
re
in
self
.
_exclude_re
:
for
field
in
compare
.
keys
():
if
re
.
match
(
field
):
compare
.
pop
(
field
)
try
:
type
(
obj
.
object
).
objects
.
get
(
**
compare
)
except
:
self
.
logger
.
warn
(
'MISSING %s
\n
%s'
%
(
type
(
obj
.
object
),
compare
))
missing
.
append
(
compare
)
assert
len
(
missing
)
is
0
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment