Skip to content

Commit

Permalink
Mise à jour champ adresse et nom dans l'API (#1199)
Browse files Browse the repository at this point in the history
Format adresse and nom field for jagis, rest api
  • Loading branch information
fabienheureux authored Jan 15, 2025
1 parent 4c554dc commit 19d2ae2
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
8 changes: 5 additions & 3 deletions qfdmo/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,10 @@ class ActeurSchema(ModelSchema):
..., alias="acteur_type", description="Le type d'acteur"
)
distance: Optional[float] = None

# (..., description="Distance en mètres")
nom: str = Field(..., alias="libelle", description="Le nom d'affichage de l'acteur")
adresse: str = Field(
..., alias="adresse_display", description="l'adresse complète de l'acteur"
)

@staticmethod
def resolve_distance(obj):
Expand All @@ -87,7 +89,7 @@ def resolve_distance(obj):

class Meta:
model = DisplayedActeur
fields = ["nom", "nom_commercial", "adresse", "identifiant_unique", "siret"]
fields = ["nom_commercial", "identifiant_unique", "siret"]


class ActeurFilterSchema(FilterSchema):
Expand Down
10 changes: 10 additions & 0 deletions qfdmo/models/acteur.py
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,16 @@ def sorted_acteur_services_libelles(self) -> list[str]:
.distinct()
)

@property
def adresse_display(self):
parts = []
fields = ["adresse", "adresse_complement", "code_postal", "ville"]
for field in fields:
if part := getattr(self, field):
parts.append(part)

return ", ".join(parts)

@cached_property
def acteur_services_display(self):
return ", ".join(self.sorted_acteur_services_libelles)
Expand Down

0 comments on commit 19d2ae2

Please sign in to comment.