Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 14 additions & 8 deletions datagouvapi/services/company_risk/company_risk.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import requests
from dateutil.relativedelta import relativedelta
from text_to_num import alpha2digit
from text_to_num import alpha2digit # type: ignore[import]

from datagouvapi.client import GouvApiClient
from datagouvapi.services.company_risk.constants import (
Expand Down Expand Up @@ -225,30 +225,36 @@ def parse_date_fin_from_complement(
"""

if not complement_jugement:
return date_parution + relativedelta(months=DELAY_RECOVERY) if date_parution else None
return (
date_parution + relativedelta(months=DELAY_RECOVERY)
if date_parution
else None
)

complement_lower = complement_jugement.lower()
complement_lower = complement_jugement.lower().replace("'", " ")
# Pattern is usually: "6 mois", "six mois", etc.
complement_lower = alpha2digit(complement_lower, "fr")
complement_numbers = alpha2digit(complement_lower, lang="fr", threshold=0)

months_pattern = r"(\d+)\s*mois"
weeks_pattern = r"(\d+)\s*semaines?"
days_pattern = r"(\d+)\s*jours?"

months_match = re.search(months_pattern, complement_lower)
months_match = re.search(months_pattern, complement_numbers)
if months_match:
months = int(months_match.group(1))
return date_parution + relativedelta(months=months) if date_parution else None

weeks_match = re.search(weeks_pattern, complement_lower)
weeks_match = re.search(weeks_pattern, complement_numbers)
if weeks_match:
weeks = int(weeks_match.group(1))
return date_parution + relativedelta(weeks=weeks) if date_parution else None

days_match = re.search(days_pattern, complement_lower)
days_match = re.search(days_pattern, complement_numbers)
if days_match:
days = int(days_match.group(1))
return date_parution + relativedelta(days=days) if date_parution else None

# Default to 2 months
return date_parution + relativedelta(months=DELAY_RECOVERY) if date_parution else None
return (
date_parution + relativedelta(months=DELAY_RECOVERY) if date_parution else None
)
14 changes: 9 additions & 5 deletions tests/feature/test_company_risk.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,8 @@ def test_parse_date_fin_from_complement_with_months():
date_parution = datetime.date(2024, 1, 15)

result = parse_date_fin_from_complement(
complement_jugement="période d'observation de 6 mois", date_parution=date_parution
complement_jugement="période d'observation de 6 mois",
date_parution=date_parution,
)
assert result == datetime.date(2024, 7, 15)

Expand All @@ -239,7 +240,8 @@ def test_parse_date_fin_from_complement_with_weeks():
date_parution = datetime.date(2024, 1, 15)

result = parse_date_fin_from_complement(
complement_jugement="période d'observation de 4 semaines", date_parution=date_parution
complement_jugement="période d'observation de 4 semaines",
date_parution=date_parution,
)
assert result == datetime.date(2024, 2, 12)

Expand Down Expand Up @@ -287,15 +289,17 @@ def test_parse_date_fin_from_complement_delai_as_text():
date_parution = datetime.date(2024, 1, 15)

result = parse_date_fin_from_complement(
complement_jugement="période d'observation de deux mois", date_parution=date_parution
complement_jugement="période d'observation de deux mois",
date_parution=date_parution,
)
assert result == datetime.date(2024, 3, 14)
assert result == datetime.date(2024, 3, 15)


def test_parse_date_fin_from_complement_delai_as_text_bis():
date_parution = datetime.date(2024, 1, 15)

result = parse_date_fin_from_complement(
complement_jugement="période d'observation d'un mois", date_parution=date_parution
complement_jugement="période d'observation d'un mois",
date_parution=date_parution,
)
assert result == datetime.date(2024, 2, 15)
Loading
Loading