def fetch_amendements(context: LectureResource, request: Request) -> Response:
lecture = context.model()
amendements, errored = get_amendements(
chambre=lecture.chambre,
session=lecture.session,
texte=lecture.num_texte,
organe=lecture.organe,
)
if errored:
request.session.flash((
"warning",
f"Les amendements {', '.join(errored)} n’ont pu être récupérés.",
))
if amendements:
added, updated, unchanged = _add_or_update_amendements(amendements)
assert added + updated + unchanged == len(amendements)
_set_flash_messages(request, added, updated, unchanged)
else:
request.session.flash(
("danger", "Aucun amendement n’a pu être trouvé."))
return HTTPFound(location=request.resource_url(context))
def test_fetch_amendements_with_emptiness(app, lecture_an, article1_an,
amendements_an):
from zam_repondeur.fetch import get_amendements
from zam_repondeur.models import Amendement, DBSession
DBSession.add(lecture_an)
with setup_mock_responses(
lecture=lecture_an,
liste=dedent("""\
<?xml version="1.0" encoding="UTF-8"?>
<amdtsParOrdreDeDiscussion></amdtsParOrdreDeDiscussion>
"""),
amendements=(),
):
amendements, created, errored = get_amendements(lecture_an)
assert amendements == []
assert created == 0
assert errored == []
assert DBSession.query(Amendement).count() == len(amendements_an) == 2
def test_fetch_amendements_with_errored(app, lecture_an, article1_an,
amendements_an):
from zam_repondeur.fetch import get_amendements
from zam_repondeur.models import Amendement, DBSession
from zam_repondeur.fetch.exceptions import NotFound
DBSession.add(lecture_an)
with patch("zam_repondeur.fetch.an.amendements.fetch_discussion_list"
) as mock_fetch_discussion_list, patch(
"zam_repondeur.fetch.an.amendements._retrieve_amendement"
) as mock_retrieve_amendement:
mock_fetch_discussion_list.return_value = [
{
"@numero": "6",
"@discussionCommune": "",
"@discussionIdentique": ""
},
{
"@numero": "7",
"@discussionCommune": "",
"@discussionIdentique": ""
},
{
"@numero": "9",
"@discussionCommune": "",
"@discussionIdentique": ""
},
]
mock_retrieve_amendement.side_effect = NotFound
amendements, created, errored = get_amendements(lecture_an)
assert amendements == []
assert created == 0
assert errored == ["6", "7", "9"]
assert DBSession.query(Amendement).count() == len(amendements_an) == 2
def fetch_amendements(lecture_pk: int) -> None:
with transaction.manager, huey.lock_task(f"fetch-{lecture_pk}"):
lecture = DBSession.query(Lecture).with_for_update().get(lecture_pk)
if lecture is None:
logger.error(f"Lecture {lecture_pk} introuvable")
return
amendements, created, errored = get_amendements(lecture)
if not amendements:
AmendementsNonTrouves.create(request=None, lecture=lecture)
if created:
AmendementsRecuperes.create(request=None,
lecture=lecture,
count=created)
if errored:
AmendementsNonRecuperes.create(request=None,
lecture=lecture,
missings=errored)
if amendements and not (created or errored):
AmendementsAJour.create(request=None, lecture=lecture)
def test_fetch_amendements_senat(app, lecture_senat, article1_senat,
amendements_senat):
from zam_repondeur.fetch import get_amendements
from zam_repondeur.models import Amendement, DBSession
from zam_repondeur.fetch.senat.senateurs.models import Senateur
# Add a response to one of the amendements
with transaction.manager:
amendement = amendements_senat[1]
amendement.user_content.avis = "Favorable"
amendement.user_content.objet = "Objet"
amendement.user_content.reponse = "Réponse"
# The object is no longer bound to a session here, as it was created in a
# previous transaction, so we add it to the current session to make sure that
# our changes will be committed with the current transaction
DBSession.add(amendement)
# Update amendements
with patch(
"zam_repondeur.fetch.senat.amendements._fetch_all"
) as mock_fetch_all, patch(
"zam_repondeur.fetch.senat.derouleur._fetch_discussion_details"
) as mock_fetch_discussion_details, patch(
"zam_repondeur.fetch.senat.amendements.fetch_and_parse_senateurs"
) as mock_fetch_and_parse_senateurs:
mock_fetch_all.return_value = (
{
"Numéro ": "6666",
"Subdivision ": "Article 1",
"Alinéa": "1",
"Auteur ": "LE GOUVERNEMENT",
"Date de dépôt ": "2017-11-13",
"Fiche Sénateur": "",
"Sort ": "Adopté",
"Dispositif ": "",
"Objet ": "",
},
{
"Numéro ": "7777",
"Subdivision ": "Article 1",
"Alinéa": "1",
"Auteur ": "LE GOUVERNEMENT",
"Date de dépôt ": "2017-11-13",
"Fiche Sénateur": "",
"Sort ": "Adopté",
"Dispositif ": "",
"Objet ": "",
},
{
"Numéro ": "9999",
"Subdivision ": "Article 1",
"Alinéa": "1",
"Auteur ": "LE GOUVERNEMENT",
"Date de dépôt ": "2017-11-13",
"Fiche Sénateur": "",
"Sort ": "Adopté",
"Dispositif ": "",
"Objet ": "",
},
)
mock_fetch_discussion_details.return_value = [{
"info_generales": {
"natureLoi": "Projet de loi",
"intituleLoi": "Financement de la sécurité sociale pour 2018",
"lecture": "1ère lecture",
"tsgenhtml": "1531427548000",
"idtxt": "103021",
"nbAmdtsDeposes": "595",
"nbAmdtsAExaminer": "0",
"doslegsignet": "plfss2018",
},
"Subdivisions": [{
"libelle_subdivision":
"Article 1",
"id_subdivision":
"151610",
"signet":
"../../textes/2017-2018/63.html#AMELI_SUB_4__Article_3", # noqa
"Amendements": [
{
"idAmendement": "1103376",
"posder": "1",
"subpos": "0",
"isSousAmendement": "false",
"idAmendementPere": "0",
"urlAmdt": "Amdt_31.html",
"typeAmdt": "Amt",
"num": "6666",
"libelleAlinea": "Al. 8",
"urlAuteur": "vanlerenberghe_jean_marie01034p.html",
"auteur": "M. VANLERENBERGHE",
"isDiscussionCommune": "false",
"isDiscussionCommuneIsolee": "false",
"isIdentique": "false",
"sort": "Adopté",
"isAdopte": "true",
"isRejete": "false",
},
{
"idAmendement": "1103376",
"posder": "1",
"subpos": "0",
"isSousAmendement": "false",
"idAmendementPere": "0",
"urlAmdt": "Amdt_31.html",
"typeAmdt": "Amt",
"num": "7777",
"libelleAlinea": "Al. 8",
"urlAuteur": "vanlerenberghe_jean_marie01034p.html",
"auteur": "M. VANLERENBERGHE",
"isDiscussionCommune": "false",
"isDiscussionCommuneIsolee": "false",
"isIdentique": "false",
"sort": "Adopté",
"isAdopte": "true",
"isRejete": "false",
},
{
"idAmendement": "1103376",
"posder": "1",
"subpos": "0",
"isSousAmendement": "false",
"idAmendementPere": "0",
"urlAmdt": "Amdt_31.html",
"typeAmdt": "Amt",
"num": "9999",
"libelleAlinea": "Al. 8",
"urlAuteur": "vanlerenberghe_jean_marie01034p.html",
"auteur": "M. VANLERENBERGHE",
"isDiscussionCommune": "false",
"isDiscussionCommuneIsolee": "false",
"isIdentique": "false",
"sort": "Adopté",
"isAdopte": "true",
"isRejete": "false",
},
],
}],
}]
mock_fetch_and_parse_senateurs.return_value = {
"01034P":
Senateur(
matricule="01034P",
qualite="M.",
nom="Vanlerenberghe",
prenom="Jean-Marie",
groupe="UC",
)
}
DBSession.add(lecture_senat)
amendements, created, errored = get_amendements(lecture_senat)
assert [amendement.num for amendement in amendements] == [6666, 7777, 9999]
assert created == 1
assert errored == []
# Check that the response was preserved on the updated amendement
amendement = DBSession.query(Amendement).filter(
Amendement.num == 9999).one()
assert amendement.user_content.avis == "Favorable"
assert amendement.user_content.objet == "Objet"
assert amendement.user_content.reponse == "Réponse"
# Check that the position was changed on the updated amendement
assert amendement.position == 3
# Check that the position is set for the new amendement
amendement = DBSession.query(Amendement).filter(
Amendement.num == 7777).one()
assert amendement.position == 2
def test_fetch_amendements_an_without_auteur_key(app, lecture_an, article1_an,
caplog):
from zam_repondeur.fetch import get_amendements
from zam_repondeur.models import Amendement, DBSession
amendement_6 = Amendement.create(lecture=lecture_an,
article=article1_an,
num=6,
position=1)
DBSession.add(amendement_6)
amendement_9 = Amendement.create(
lecture=lecture_an,
article=article1_an,
num=9,
position=2,
avis="Favorable",
objet="Objet",
reponse="Réponse",
)
DBSession.add(amendement_9)
with patch("zam_repondeur.fetch.an.amendements.fetch_discussion_list"
) as mock_fetch_discussion_list, patch(
"zam_repondeur.fetch.an.amendements._retrieve_amendement"
) as mock_retrieve_amendement:
mock_fetch_discussion_list.return_value = [
{
"@numero": "6",
"@discussionCommune": "",
"@discussionIdentique": ""
},
{
"@numero": "7",
"@discussionCommune": "",
"@discussionIdentique": ""
},
{
"@numero": "9",
"@discussionCommune": "",
"@discussionIdentique": ""
},
]
def dynamic_return_value(lecture, numero_prefixe):
from zam_repondeur.fetch.exceptions import NotFound
if numero_prefixe not in {"6", "7", "9"}:
raise NotFound
return {
"division": {
"titre": "Article 1",
"type": "ARTICLE",
"avantApres": "",
"divisionRattache": "ARTICLE 1",
},
"numero": numero_prefixe,
"numeroLong": numero_prefixe,
# No auteur key.
"exposeSommaire": "<p>Amendement rédactionnel.</p>",
"dispositif":
"<p>À l’alinéa 8, substituer</p>",
"numeroParent": OrderedDict({"@xsi:nil": "true"}),
"sortEnSeance": OrderedDict({"@xsi:nil": "true"}),
"etat": "AC",
"retireAvantPublication": "0",
}
mock_retrieve_amendement.side_effect = dynamic_return_value
amendements, created, errored = get_amendements(lecture_an)
assert [amendement.num for amendement in amendements] == [6, 7, 9]
assert created == 1
assert errored == []
for num in [6, 7, 9]:
assert any(record.levelname == "WARNING" and record.message.startswith(
f"Unknown auteur for amendement {num}")
for record in caplog.records)
amendement_9 = DBSession.query(Amendement).filter(
Amendement.num == 9).one()
# Check that the missing auteur key leads to empty strings
assert amendement_9.matricule == ""
assert amendement_9.groupe == ""
assert amendement_9.auteur == ""
def test_fetch_amendements_an(app, lecture_an, article1_an):
from zam_repondeur.fetch import get_amendements
from zam_repondeur.models import Amendement, DBSession
Amendement.create(lecture=lecture_an,
article=article1_an,
num=6,
position=1)
amendement_9 = Amendement.create(
lecture=lecture_an,
article=article1_an,
num=9,
position=2,
avis="Favorable",
objet="Objet",
reponse="Réponse",
)
with patch("zam_repondeur.fetch.an.amendements.fetch_discussion_list"
) as mock_fetch_discussion_list, patch(
"zam_repondeur.fetch.an.amendements._retrieve_amendement"
) as mock_retrieve_amendement:
mock_fetch_discussion_list.return_value = [
{
"@numero": "6",
"@discussionCommune": "",
"@discussionIdentique": ""
},
{
"@numero": "7",
"@discussionCommune": "",
"@discussionIdentique": ""
},
{
"@numero": "9",
"@discussionCommune": "",
"@discussionIdentique": ""
},
]
def dynamic_return_value(lecture, numero_prefixe):
from zam_repondeur.fetch.exceptions import NotFound
if numero_prefixe not in {"6", "7", "9"}:
raise NotFound
return {
"division": {
"titre": "Article 1",
"type": "ARTICLE",
"avantApres": "",
"divisionRattache": "ARTICLE 1",
},
"numero": numero_prefixe,
"numeroLong": numero_prefixe,
"auteur": {
"tribunId": "642788",
"groupeTribunId": "730964",
"estGouvernement": "0",
"nom": "Véran",
"prenom": "Olivier",
},
"exposeSommaire": "<p>Amendement rédactionnel.</p>",
"dispositif":
"<p>À l’alinéa 8, substituer</p>",
"numeroParent": OrderedDict({"@xsi:nil": "true"}),
"sortEnSeance": OrderedDict({"@xsi:nil": "true"}),
"etat": "AC",
"retireAvantPublication": "0",
}
mock_retrieve_amendement.side_effect = dynamic_return_value
amendements, created, errored = get_amendements(lecture_an)
assert [amendement.num for amendement in amendements] == [6, 7, 9]
assert created == 1
assert errored == []
amendement_9 = DBSession.query(Amendement).filter(
Amendement.num == 9).one()
# Check that the response was preserved on the updated amendement
assert amendement_9.user_content.avis == "Favorable"
assert amendement_9.user_content.objet == "Objet"
assert amendement_9.user_content.reponse == "Réponse"
# Check that the auteur key leads to matricule, groupe and auteur filling
assert amendement_9.matricule == "642788"
assert amendement_9.groupe == "La République en Marche"
assert amendement_9.auteur == "Véran Olivier"
# Check that the position was changed on the updated amendement
assert amendement_9.position == 3
# Check that the position was set for the new amendement
amendement_7 = DBSession.query(Amendement).filter(
Amendement.num == 7).one()
assert amendement_7.position == 2