diff --git a/app/config.py b/app/config.py index b3861efb..cccc32fc 100644 --- a/app/config.py +++ b/app/config.py @@ -1336,13 +1336,13 @@ class Settings(BaseSettings): packages = [] config_str = self.TRAFFIC_PACKAGES_CONFIG.strip() - logger.info(f"CONFIG STRING: '{config_str}'") - + logger.debug(f"CONFIG STRING: '{config_str}'") + if not config_str: - logger.info("CONFIG EMPTY, USING FALLBACK") + logger.debug("CONFIG EMPTY, USING FALLBACK") return self._get_fallback_traffic_packages() - - logger.info("PARSING CONFIG...") + + logger.debug("PARSING CONFIG...") for package_config in config_str.split(','): package_config = package_config.strip() @@ -1366,7 +1366,7 @@ class Settings(BaseSettings): except ValueError: continue - logger.info(f"PARSED {len(packages)} packages from config") + logger.debug(f"PARSED {len(packages)} packages from config") return packages if packages else self._get_fallback_traffic_packages() except Exception as e: diff --git a/app/database/crud/subscription.py b/app/database/crud/subscription.py index 1744175e..0ba9f72e 100644 --- a/app/database/crud/subscription.py +++ b/app/database/crud/subscription.py @@ -988,8 +988,8 @@ async def calculate_subscription_total_cost( ] } - logger.info(f"πŸ“Š РасчСт стоимости подписки Π½Π° {period_days} Π΄Π½Π΅ΠΉ ({months_in_period} мСс):") - logger.info(f" Π‘Π°Π·ΠΎΠ²Ρ‹ΠΉ ΠΏΠ΅Ρ€ΠΈΠΎΠ΄: {base_price/100}β‚½") + logger.debug(f"πŸ“Š РасчСт стоимости подписки Π½Π° {period_days} Π΄Π½Π΅ΠΉ ({months_in_period} мСс):") + logger.debug(f" Π‘Π°Π·ΠΎΠ²Ρ‹ΠΉ ΠΏΠ΅Ρ€ΠΈΠΎΠ΄: {base_price/100}β‚½") if total_traffic_price > 0: message = ( f" Π’Ρ€Π°Ρ„ΠΈΠΊ: {traffic_price_per_month/100}β‚½/мСс Γ— {months_in_period} = {total_traffic_price/100}β‚½" @@ -998,7 +998,7 @@ async def calculate_subscription_total_cost( message += ( f" (скидка {traffic_discount_percent}%: -{total_traffic_discount/100}β‚½)" ) - logger.info(message) + logger.debug(message) if total_servers_price > 0: message = ( f" Π‘Π΅Ρ€Π²Π΅Ρ€Ρ‹: {servers_price_per_month/100}β‚½/мСс Γ— {months_in_period} = {total_servers_price/100}β‚½" @@ -1007,7 +1007,7 @@ async def calculate_subscription_total_cost( message += ( f" (скидка {servers_discount_percent}%: -{total_servers_discount/100}β‚½)" ) - logger.info(message) + logger.debug(message) if total_devices_price > 0: message = ( f" Устройства: {devices_price_per_month/100}β‚½/мСс Γ— {months_in_period} = {total_devices_price/100}β‚½" @@ -1016,8 +1016,8 @@ async def calculate_subscription_total_cost( message += ( f" (скидка {devices_discount_percent}%: -{total_devices_discount/100}β‚½)" ) - logger.info(message) - logger.info(f" Π˜Π’ΠžΠ“Πž: {total_cost/100}β‚½") + logger.debug(message) + logger.debug(f" Π˜Π’ΠžΠ“Πž: {total_cost/100}β‚½") return total_cost, details diff --git a/app/services/subscription_service.py b/app/services/subscription_service.py index aaaa37e2..623aeaf9 100644 --- a/app/services/subscription_service.py +++ b/app/services/subscription_service.py @@ -521,36 +521,36 @@ class SubscriptionService: total_price = base_price + discounted_traffic_price + total_servers_price + discounted_devices_price - logger.info(f"РасчСт стоимости Π½ΠΎΠ²ΠΎΠΉ подписки:") + logger.debug("РасчСт стоимости Π½ΠΎΠ²ΠΎΠΉ подписки:") base_log = f" ΠŸΠ΅Ρ€ΠΈΠΎΠ΄ {period_days} Π΄Π½Π΅ΠΉ: {base_price_original/100}β‚½" if base_discount_total > 0: base_log += ( f" β†’ {base_price/100}β‚½" f" (скидка {period_discount_percent}%: -{base_discount_total/100}β‚½)" ) - logger.info(base_log) + logger.debug(base_log) if discounted_traffic_price > 0: message = f" Π’Ρ€Π°Ρ„ΠΈΠΊ {traffic_gb} Π“Π‘: {traffic_price/100}β‚½" if traffic_discount > 0: message += ( f" (скидка {traffic_discount_percent}%: -{traffic_discount/100}β‚½ β†’ {discounted_traffic_price/100}β‚½)" ) - logger.info(message) + logger.debug(message) if total_servers_price > 0: message = f" Π‘Π΅Ρ€Π²Π΅Ρ€Ρ‹ ({len(server_squad_ids)}): {total_servers_price/100}β‚½" if servers_discount_percent > 0: message += ( f" (скидка {servers_discount_percent}% примСняСтся ΠΊΠΎ всСм сСрвСрам)" ) - logger.info(message) + logger.debug(message) if discounted_devices_price > 0: message = f" Устройства ({devices}): {devices_price/100}β‚½" if devices_discount > 0: message += ( f" (скидка {devices_discount_percent}%: -{devices_discount/100}β‚½ β†’ {discounted_devices_price/100}β‚½)" ) - logger.info(message) - logger.info(f" Π˜Π’ΠžΠ“Πž: {total_price/100}β‚½") + logger.debug(message) + logger.debug(f" Π˜Π’ΠžΠ“Πž: {total_price/100}β‚½") return total_price, server_prices @@ -634,36 +634,36 @@ class SubscriptionService: + discounted_traffic_price ) - logger.info(f"πŸ’° РасчСт стоимости продлСния для подписки {subscription.id} (ΠΏΠΎ Ρ‚Π΅ΠΊΡƒΡ‰ΠΈΠΌ Ρ†Π΅Π½Π°ΠΌ):") + logger.debug(f"πŸ’° РасчСт стоимости продлСния для подписки {subscription.id} (ΠΏΠΎ Ρ‚Π΅ΠΊΡƒΡ‰ΠΈΠΌ Ρ†Π΅Π½Π°ΠΌ):") base_log = f" πŸ“… ΠŸΠ΅Ρ€ΠΈΠΎΠ΄ {period_days} Π΄Π½Π΅ΠΉ: {base_price_original/100}β‚½" if base_discount_total > 0: base_log += ( f" β†’ {base_price/100}β‚½" f" (скидка {period_discount_percent}%: -{base_discount_total/100}β‚½)" ) - logger.info(base_log) + logger.debug(base_log) if servers_price > 0: message = f" 🌍 Π‘Π΅Ρ€Π²Π΅Ρ€Ρ‹ ({len(subscription.connected_squads)}) ΠΏΠΎ Ρ‚Π΅ΠΊΡƒΡ‰ΠΈΠΌ Ρ†Π΅Π½Π°ΠΌ: {discounted_servers_price/100}β‚½" if servers_discount > 0: message += ( f" (скидка {servers_discount_percent}%: -{servers_discount/100}β‚½ ΠΎΡ‚ {servers_price/100}β‚½)" ) - logger.info(message) + logger.debug(message) if devices_price > 0: message = f" πŸ“± Устройства ({device_limit}): {discounted_devices_price/100}β‚½" if devices_discount > 0: message += ( f" (скидка {devices_discount_percent}%: -{devices_discount/100}β‚½ ΠΎΡ‚ {devices_price/100}β‚½)" ) - logger.info(message) + logger.debug(message) if traffic_price > 0: message = f" πŸ“Š Π’Ρ€Π°Ρ„ΠΈΠΊ ({subscription.traffic_limit_gb} Π“Π‘): {discounted_traffic_price/100}β‚½" if traffic_discount > 0: message += ( f" (скидка {traffic_discount_percent}%: -{traffic_discount/100}β‚½ ΠΎΡ‚ {traffic_price/100}β‚½)" ) - logger.info(message) - logger.info(f" πŸ’Ž Π˜Π’ΠžΠ“Πž: {total_price/100}β‚½") + logger.debug(message) + logger.debug(f" πŸ’Ž Π˜Π’ΠžΠ“Πž: {total_price/100}β‚½") return total_price @@ -855,14 +855,14 @@ class SubscriptionService: total_price = base_price + total_traffic_price + total_servers_price + total_devices_price - logger.info(f"РасчСт стоимости Π½ΠΎΠ²ΠΎΠΉ подписки Π½Π° {period_days} Π΄Π½Π΅ΠΉ ({months_in_period} мСс):") + logger.debug(f"РасчСт стоимости Π½ΠΎΠ²ΠΎΠΉ подписки Π½Π° {period_days} Π΄Π½Π΅ΠΉ ({months_in_period} мСс):") base_log = f" ΠŸΠ΅Ρ€ΠΈΠΎΠ΄ {period_days} Π΄Π½Π΅ΠΉ: {base_price_original/100}β‚½" if base_discount_total > 0: base_log += ( f" β†’ {base_price/100}β‚½" f" (скидка {period_discount_percent}%: -{base_discount_total/100}β‚½)" ) - logger.info(base_log) + logger.debug(base_log) if total_traffic_price > 0: message = ( f" Π’Ρ€Π°Ρ„ΠΈΠΊ {traffic_gb} Π“Π‘: {traffic_price_per_month/100}β‚½/мСс x {months_in_period} = {total_traffic_price/100}β‚½" @@ -871,14 +871,14 @@ class SubscriptionService: message += ( f" (скидка {traffic_discount_percent}%: -{traffic_discount_per_month * months_in_period/100}β‚½)" ) - logger.info(message) + logger.debug(message) if total_servers_price > 0: message = f" Π‘Π΅Ρ€Π²Π΅Ρ€Ρ‹ ({len(server_squad_ids)}): {total_servers_price/100}β‚½" if servers_discount_percent > 0: message += ( f" (скидка {servers_discount_percent}% примСняСтся ΠΊΠΎ всСм сСрвСрам)" ) - logger.info(message) + logger.debug(message) if total_devices_price > 0: message = ( f" Устройства ({additional_devices}): {devices_price_per_month/100}β‚½/мСс x {months_in_period} = {total_devices_price/100}β‚½" @@ -887,8 +887,8 @@ class SubscriptionService: message += ( f" (скидка {devices_discount_percent}%: -{devices_discount_per_month * months_in_period/100}β‚½)" ) - logger.info(message) - logger.info(f" Π˜Π’ΠžΠ“Πž: {total_price/100}β‚½") + logger.debug(message) + logger.debug(f" Π˜Π’ΠžΠ“Πž: {total_price/100}β‚½") return total_price, server_prices @@ -972,14 +972,14 @@ class SubscriptionService: total_price = base_price + total_servers_price + total_devices_price + total_traffic_price - logger.info(f"πŸ’° РасчСт стоимости продлСния подписки {subscription.id} Π½Π° {period_days} Π΄Π½Π΅ΠΉ ({months_in_period} мСс):") + logger.debug(f"πŸ’° РасчСт стоимости продлСния подписки {subscription.id} Π½Π° {period_days} Π΄Π½Π΅ΠΉ ({months_in_period} мСс):") base_log = f" πŸ“… ΠŸΠ΅Ρ€ΠΈΠΎΠ΄ {period_days} Π΄Π½Π΅ΠΉ: {base_price_original/100}β‚½" if base_discount_total > 0: base_log += ( f" β†’ {base_price/100}β‚½" f" (скидка {period_discount_percent}%: -{base_discount_total/100}β‚½)" ) - logger.info(base_log) + logger.debug(base_log) if total_servers_price > 0: message = ( f" 🌍 Π‘Π΅Ρ€Π²Π΅Ρ€Ρ‹: {servers_price_per_month/100}β‚½/мСс x {months_in_period} = {total_servers_price/100}β‚½" @@ -988,7 +988,7 @@ class SubscriptionService: message += ( f" (скидка {servers_discount_percent}%: -{servers_discount_per_month * months_in_period/100}β‚½)" ) - logger.info(message) + logger.debug(message) if total_devices_price > 0: message = ( f" πŸ“± Устройства: {devices_price_per_month/100}β‚½/мСс x {months_in_period} = {total_devices_price/100}β‚½" @@ -997,7 +997,7 @@ class SubscriptionService: message += ( f" (скидка {devices_discount_percent}%: -{devices_discount_per_month * months_in_period/100}β‚½)" ) - logger.info(message) + logger.debug(message) if total_traffic_price > 0: message = ( f" πŸ“Š Π’Ρ€Π°Ρ„ΠΈΠΊ: {traffic_price_per_month/100}β‚½/мСс x {months_in_period} = {total_traffic_price/100}β‚½" @@ -1006,8 +1006,8 @@ class SubscriptionService: message += ( f" (скидка {traffic_discount_percent}%: -{traffic_discount_per_month * months_in_period/100}β‚½)" ) - logger.info(message) - logger.info(f" πŸ’Ž Π˜Π’ΠžΠ“Πž: {total_price/100}β‚½") + logger.debug(message) + logger.debug(f" πŸ’Ž Π˜Π’ΠžΠ“Πž: {total_price/100}β‚½") return total_price