Merge pull request #6668 from hotosm/fastapi-refactor

User statistics refactored.
hotosm · Dec 30, 2024 · ebfd533 · ebfd533
2 parents e2a11d9 + 33d10db
commit ebfd533
Show file tree

Hide file tree

Showing 3 changed files with 134 additions and 178 deletions.
diff --git a/backend/api/users/statistics.py b/backend/api/users/statistics.py
@@ -59,7 +59,7 @@ async def get(
             description: Internal Server Error
     """
     stats_dto = await UserService.get_detailed_stats(username, db)
-    return stats_dto.model_dump(by_alias=True)
+    return stats_dto
 
 
 @router.get("/{user_id}/statistics/interests/")

diff --git a/backend/models/dtos/user_dto.py b/backend/models/dtos/user_dto.py
@@ -103,13 +103,12 @@ class UserCountryContributed(BaseModel):
 class UserCountriesContributed(BaseModel):
     """DTO for countries a user has contributed"""
 
-    def __init__(self):
-        super().__init__()
-        self.countries_contributed = []
-
     countries_contributed: List[UserCountryContributed] = Field([], alias="countries")
     total: int = Field(None)
 
+    class Config:
+        populate_by_name = True
+
 
 class UserContributionDTO(BaseModel):
     date: datetime