Update Settings.py

Author: tonlls

src/configuration/Settings.py

@@ -4,46 +4,46 @@
 import os
 
 
-class MailSettings(BaseSettings):
-    username: str = Field(default="username",
-                          description="Mail service username",
-                          alias=AliasChoices("MAIL__USERNAME"))
-    password: str = Field(default="password",
-                          description="Mail service password",
-                          alias=AliasChoices("MAIL__PASSWORD"))
-    from_mail: str = Field(
-        default="from@example.com",
-        description="Email address used in the 'From' header",
-        alias=AliasChoices("MAIL__FROM")
-    )
-    port: int = Field(
-        default=587, 
-        description="Mail service port",
-        alias=AliasChoices("MAIL__PORT")
-    )
-    server: str = Field(
-        default="smtp.example.com", 
-        description="Mail service SMTP server",
-        alias=AliasChoices("MAIL__SERVER")
-    )
-    from_name: str = Field(
-        default="Example Service", 
-        description="Name used in the 'From' header",
-        alias=AliasChoices("MAIL__FROM_NAME")
-    )
-    send_mails: bool = True
+#class MailSettings(BaseSettings):
+    #username: str = Field(default="username",
+    #                      description="Mail service username",
+    #                      alias=AliasChoices("MAIL__USERNAME"))
+    #password: str = Field(default="password",
+    #                      description="Mail service password",
+    #                      alias=AliasChoices("MAIL__PASSWORD"))
+    #from_mail: str = Field(
+    #    default="from@example.com",
+    #    description="Email address used in the 'From' header",
+    #    alias=AliasChoices("MAIL__FROM")
+    #)
+    #port: int = Field(
+    #    default=587, 
+    #    description="Mail service port",
+    #    alias=AliasChoices("MAIL__PORT")
+    #)
+    #server: str = Field(
+    #    default="smtp.example.com", 
+    #    description="Mail service SMTP server",
+    #    alias=AliasChoices("MAIL__SERVER")
+    #)
+    #from_name: str = Field(
+    #    default="Example Service", 
+    #    description="Name used in the 'From' header",
+    #    alias=AliasChoices("MAIL__FROM_NAME")
+    #)
+    #send_mails: bool = True
 
 
-class DatabaseSettings(BaseSettings):
-    url: str = Field(...,
-                     description="Database connection URL",
-                     alias=AliasChoices("DATABASE__URL"))
+#class DatabaseSettings(BaseSettings):
+#    url: str = Field(...,
+#                     description="Database connection URL",
+#                     alias=AliasChoices("DATABASE__URL"))
 
 
-class ClientSettings(BaseSettings):
-    url: str = Field(...,
-                     description="Mail service URL",
-                     alias=AliasChoices("CLIENTS__MAIL_CLIENT__URL"))
+#class ClientSettings(BaseSettings):
+#    url: str = Field(...,
+#                     description="Mail service URL",
+#                     alias=AliasChoices("CLIENTS__MAIL_CLIENT__URL"))
 
 
 class Settings(BaseSettings):
@@ -54,6 +54,9 @@ class Settings(BaseSettings):
                                       extra="ignore")
 
     # General settings
+    url: str = Field(...,
+                     description="Database connection URL",
+                     alias=AliasChoices("DATABASE__URL"))
     front_url: str = Field(
         default="https://frontend.integration.lleidahack.dev/hackeps",
         description="Frontend URL",
@@ -71,21 +74,50 @@ class Settings(BaseSettings):
         default="src/templates/emails/initial.html",
         description="Path to the initial email template",
         alias=AliasChoices("INITIAL_TEMPLATES_PATH"))
-
+    username: str = Field(default="username",
+                          description="Mail service username",
+                          alias=AliasChoices("MAIL__USERNAME"))
+    password: str = Field(default="password",
+                          description="Mail service password",
+                          alias=AliasChoices("MAIL__PASSWORD"))
+    from_mail: str = Field(
+        default="from@example.com",
+        description="Email address used in the 'From' header",
+        alias=AliasChoices("MAIL__FROM")
+    )
+    port: int = Field(
+        default=587, 
+        description="Mail service port",
+        alias=AliasChoices("MAIL__PORT")
+    )
+    server: str = Field(
+        default="smtp.example.com", 
+        description="Mail service SMTP server",
+        alias=AliasChoices("MAIL__SERVER")
+    )
+    from_name: str = Field(
+        default="Example Service", 
+        description="Name used in the 'From' header",
+        alias=AliasChoices("MAIL__FROM_NAME")
+    )
+    url: str = Field(...,
+                     description="Mail service URL",
+                     alias=AliasChoices("CLIENTS__MAIL_CLIENT__URL"))
+    send_mails: bool = True
     # Nested settings
 
-    database: DatabaseSettings
-    mail: MailSettings
-    clients: ClientSettings
+    #database: DatabaseSettings
+    #mail: MailSettings
+    #clients: ClientSettings
 
     def __init__(self, **kwargs):
         # Handle environment-specific defaults
         # env = os.environ.get('ENV', 'main')
 
         super().__init__(**kwargs)
-        self.databse=DatabaseSettings()
-        self.mail=MailSettings()
-        self.clients=ClientSettings()
+#        self.databse=DatabaseSettings()
+#        self.mail=MailSettings()
+#        self.clients=ClientSettings()
 
 
 # Global settings instance