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

Éligibilité : Prise en compte du forçage de dateFin à null par l’API Particulier #5337

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Éligibilité : Prise en compte du forçage de dateFin à null par l’API Particulier #5337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions itou/eligibility/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import datetime
import logging
from json import JSONDecodeError

Expand Down Expand Up @@ -77,8 +78,11 @@ def certify_criteria(eligibility_diagnosis):
criterion.certified_at = timezone.now()
criterion.data_returned_by_api = data["raw_response"]
criterion.certification_period = None
start_at, end_at = data["start_at"], data["end_at"]
if start_at and end_at:
if criterion.certified:
start_at = data["start_at"]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Je me suis demandé si on ne voulait pas utiliser timezone.localdate(criterion.certified_at) ici aussi, mais ça cacherait une partie des informations disponibles (la date d’ouverture des droits du bénéficiaire).

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Je suis d'accord avec toi. C'est dommage de se priver de la date d'ouverture des droits alors que la date de certification est déjà dans criterion.certified_at.
Il y a maintenant deux dates de démarrage possibles : la date d'ouverture des droits ou la date de certification. En conservant les deux, il sera facile de les comparer et éventuellement d'en déduire les prolongations.

end_at = timezone.localdate(criterion.certified_at) + datetime.timedelta(
days=criterion.CERTIFICATION_GRACE_PERIOD_DAYS
)
criterion.certification_period = InclusiveDateRange(start_at, end_at)
SelectedAdministrativeCriteria.objects.bulk_update(
criteria,
Expand Down
13 changes: 4 additions & 9 deletions itou/utils/apis/api_particulier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@ def client():
)


def _parse_date(date: str) -> datetime.date | None:
if date:
return datetime.date.fromisoformat(date)
return None


def _build_params_from(job_seeker):
jobseeker_profile = job_seeker.jobseeker_profile
params = {
Expand Down Expand Up @@ -58,9 +52,10 @@ def has_required_info(job_seeker):

def revenu_solidarite_active(client, job_seeker):
response = _request(client, "/v2/revenu-solidarite-active", job_seeker)
certified = response["status"] == "beneficiaire"
return {
"start_at": _parse_date(response["dateDebut"]),
"end_at": _parse_date(response["dateFin"]),
"is_certified": response["status"] == "beneficiaire",
"start_at": datetime.date.fromisoformat(response["dateDebut"]) if certified else None,
# Do not expose end_at, it’s always null.
"is_certified": certified,
"raw_response": response,
}
2 changes: 1 addition & 1 deletion itou/utils/mocks/api_particulier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
def rsa_certified_mocker():
# https://github.com/etalab/siade_staging_data/blob/develop/payloads/api_particulier_v2_cnav_revenu_solidarite_active/200_beneficiaire_majoration.yaml
return {"status": "beneficiaire", "majoration": True, "dateDebut": "2024-08-01", "dateFin": "2024-10-31"}
return {"status": "beneficiaire", "majoration": True, "dateDebut": "2024-08-01", "dateFin": None}


def rsa_not_certified_mocker():
Expand Down
6 changes: 3 additions & 3 deletions tests/eligibility/test_iae.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ def test_eligibility_diagnosis_certify_criteria(mocker, EligibilityDiagnosisFact
assert criterion.certified is True
assert criterion.certified_at == timezone.now()
assert criterion.data_returned_by_api == rsa_certified_mocker()
assert criterion.certification_period == InclusiveDateRange(datetime.date(2024, 8, 1), datetime.date(2024, 10, 31))
assert criterion.certification_period == InclusiveDateRange(datetime.date(2024, 8, 1), datetime.date(2024, 12, 13))


@pytest.mark.parametrize(
Expand Down Expand Up @@ -589,7 +589,7 @@ def test_eligibility_diagnosis_certify_criteria_missing_info(respx_mock, Eligibi
pytest.param(
partial(IAEEligibilityDiagnosisFactory, from_employer=True),
{
"certification_period": InclusiveDateRange(datetime.date(2024, 8, 1), datetime.date(2024, 10, 31)),
"certification_period": InclusiveDateRange(datetime.date(2024, 8, 1), datetime.date(2024, 12, 13)),
"certified": True,
"certified_at": datetime.datetime(2024, 9, 12, tzinfo=datetime.UTC),
"data_returned_by_api": rsa_certified_mocker(),
Expand All @@ -601,7 +601,7 @@ def test_eligibility_diagnosis_certify_criteria_missing_info(respx_mock, Eligibi
pytest.param(
partial(GEIQEligibilityDiagnosisFactory, from_geiq=True),
{
"certification_period": InclusiveDateRange(datetime.date(2024, 8, 1), datetime.date(2024, 10, 31)),
"certification_period": InclusiveDateRange(datetime.date(2024, 8, 1), datetime.date(2024, 12, 13)),
"certified": True,
"certified_at": datetime.datetime(2024, 9, 12, tzinfo=datetime.UTC),
"data_returned_by_api": rsa_certified_mocker(),
Expand Down
3 changes: 2 additions & 1 deletion tests/eligibility/test_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ def geiq_eligibility_factory():
],
)
class TestCertifyCriteria:
@freeze_time("2025-01-06")
def test_queue_task(self, factory, respx_mock):
eligibility_diagnosis = factory()
respx_mock.get(f"{settings.API_PARTICULIER_BASE_URL}v2/revenu-solidarite-active").respond(
Expand All @@ -54,7 +55,7 @@ def test_queue_task(self, factory, respx_mock):
assert criterion.certified_at is not None
assert criterion.data_returned_by_api == rsa_certified_mocker()
assert criterion.certification_period == InclusiveDateRange(
datetime.date(2024, 8, 1), datetime.date(2024, 10, 31)
datetime.date(2024, 8, 1), datetime.date(2025, 4, 8)
)

def test_retry_task_rate_limits(self, factory, respx_mock):
Expand Down
4 changes: 2 additions & 2 deletions tests/www/apply/test_process.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2569,7 +2569,7 @@ def test_accept_iae__criteria_can_be_certified(self, client, mocker):
assert criterion.certified
assert criterion.data_returned_by_api == rsa_certified_mocker()
assert criterion.certification_period == InclusiveDateRange(
datetime.date(2024, 8, 1), datetime.date(2024, 10, 31)
datetime.date(2024, 8, 1), datetime.date(2024, 12, 12)
)
assert criterion.certified_at

Expand Down Expand Up @@ -2634,7 +2634,7 @@ def test_accept_geiq__criteria_can_be_certified(self, client, mocker):
assert criterion.certified
assert criterion.data_returned_by_api == rsa_certified_mocker()
assert criterion.certification_period == InclusiveDateRange(
datetime.date(2024, 8, 1), datetime.date(2024, 10, 31)
datetime.date(2024, 8, 1), datetime.date(2024, 12, 12)
)
assert criterion.certified_at

Expand Down
Loading