Refactoring

Author: BushlanovDev

.env.example

@@ -2,6 +2,8 @@ APP__DEBUG=true
 APP__PORT=8080
 APP__URL=https://my.domain
 APP__WEBHOOK_PATH=/webhook/tg
+APP__HEALTH_PATH=/healthz
+APP__WEB_APP_URL=https://my.domain/webapp
 APP__DEFAULT_LANGUAGE=en
 
 TG_BOT__TOKEN=

bot/configs/config.py

@@ -10,8 +10,8 @@ class App(BaseSettings):
     url: str = 'https://my.domain'
     webhook_path: str = '/webhook/tg'
     health_path: str = '/healthz'
+    web_app_url: str = 'https://my.domain/webapp'
     default_language: str = 'en'
-    web_app_path: str = '/webapp'
 
 
 class TgBot(BaseSettings):

main.py

@@ -105,13 +105,11 @@ def register_middlewares(dp: Dispatcher) -> None:
 
 
 def register_workflow_data(dp: Dispatcher, lexicon: Lexicon, app_settings: App) -> None:
-    base_url = app_settings.url.rstrip('/')
-    web_app_path = '/' + app_settings.web_app_path.lstrip('/')
     dp.workflow_data.update({
         'lexicon': lexicon,
         'keyboards': Keyboards(),
         'bot_service': BotService(),
-        'web_app_url': f'{base_url}{web_app_path}',
+        'web_app_url': app_settings.web_app_url,
     })
 
 
@@ -120,9 +118,9 @@ def create_app(bot: Bot, dp: Dispatcher, settings: App) -> FastAPI:
     app.add_event_handler('startup', create_startup_handler(bot, dp, settings.url + settings.webhook_path))
     app.add_event_handler('shutdown', create_shutdown_handler(bot, settings.debug))
     app.add_api_route(settings.webhook_path, create_webhook_handler(bot, dp), methods=['POST'])
-    app.add_api_route(settings.health_path, lambda: {"status": "ok"}, methods=["GET"])
+    app.add_api_route(settings.health_path, lambda: {'status': 'ok'}, methods=['GET'])
     web_app_dir = Path(__file__).resolve().parent / 'webapp'
-    app.mount(settings.web_app_path, StaticFiles(directory=web_app_dir, html=True), name='webapp')
+    app.mount('/webapp', StaticFiles(directory=web_app_dir, html=True), name='webapp')
 
     return app