From d85461f2d7887965fb86a105455ff80bb4bc38d2 Mon Sep 17 00:00:00 2001 From: Olga Avdeeva Date: Mon, 26 Aug 2024 11:36:32 +0200 Subject: [PATCH] revert last changes --- src/api/services/analytics.py | 8 +++----- src/core/depends/api_services.py | 1 - 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/api/services/analytics.py b/src/api/services/analytics.py index dc4fcdbf..e77a8c92 100644 --- a/src/api/services/analytics.py +++ b/src/api/services/analytics.py @@ -1,7 +1,7 @@ from datetime import timedelta from src.api.constants import DAYS_NUMBER_FOR_USERS_STATISTIC -from src.core.db.repository import ExternalSiteUserRepository, UnsubscribeReasonRepository, UserRepository +from src.core.db.repository import UnsubscribeReasonRepository, UserRepository class AnalyticsService: @@ -11,11 +11,9 @@ def __init__( self, user_repository: UserRepository, unsubscribe_reason_repository: UnsubscribeReasonRepository, - site_user_repository: ExternalSiteUserRepository, ) -> None: self._user_repository: UserRepository = user_repository self._unsubscribe_reason_repository: UnsubscribeReasonRepository = unsubscribe_reason_repository - self._site_user_repository: ExternalSiteUserRepository = site_user_repository async def get_user_number(self) -> None: return await self._user_repository.count_all() @@ -31,8 +29,8 @@ async def get_added_users_statistic(self, date_limit) -> dict[str, int]: async def get_added_external_users_statistic(self, date_limit) -> dict[str, int]: date_begin = date_limit - timedelta(days=DAYS_NUMBER_FOR_USERS_STATISTIC - 1) - added_external_users = await self._site_user_repository.get_statistics_by_days( - date_begin, date_limit, "created_at" + added_external_users = await self._user_repository.get_statistics_by_days( + date_begin, date_limit, "external_signup_date" ) return added_external_users diff --git a/src/core/depends/api_services.py b/src/core/depends/api_services.py index 182b4d2c..41b69872 100644 --- a/src/core/depends/api_services.py +++ b/src/core/depends/api_services.py @@ -49,7 +49,6 @@ class APIServicesContainer(containers.DeclarativeContainer): AnalyticsService, user_repository=repositories.user_repository, unsubscribe_reason_repository=repositories.unsubscribe_reason_repository, - site_user_repository=repositories.site_user_repository, ) health_check_service = providers.Factory( HealthCheckService,