Cleanup for mysql

tests/custom/async/src/async/startup.py

@@ -1,6 +1,6 @@
 from cpl.application.async_startup_abc import AsyncStartupABC
 from cpl.core.configuration import ConfigurationABC
-from cpl.dependency import ServiceProviderABC, ServiceCollectionABC
+from cpl.dependency import ServiceProviderABC, ServiceCollection
 from cpl.core.environment import Environment
 
 
@@ -13,5 +13,5 @@ class Startup(AsyncStartupABC):
     ) -> ConfigurationABC:
         return configuration
 
-    async def configure_services(self, services: ServiceCollectionABC, environment: Environment) -> ServiceProviderABC:
+    async def configure_services(self, services: ServiceCollection, environment: Environment) -> ServiceProviderABC:
         return services.build_service_provider()

tests/custom/database/src/model/db_context.py

@@ -1,7 +0,0 @@
-from cpl.database import DatabaseSettings
-from cpl.database.context import DatabaseContext
-
-
-class DBContext(DatabaseContext):
-    def __init__(self):
-        DatabaseContext.__init__(self)

tests/custom/database/src/model/user_repo.py

@@ -1,5 +1,5 @@
 from cpl.core.console import Console
-from cpl.database.context import DatabaseContextABC
+from cpl.database.mysql.context import DatabaseContextABC
 
 from .city_model import CityModel
 from .user_model import UserModel

tests/custom/database/src/startup.py

@@ -1,11 +1,9 @@
 from cpl.application import StartupABC
 from cpl.core.configuration import Configuration
-from cpl.database import DatabaseSettings
-from cpl.dependency import ServiceCollectionABC, ServiceProviderABC
 from cpl.core.environment import Environment
 from cpl.core.log import Logger, LoggerABC
-
-from model.db_context import DBContext
+from cpl.database import mysql
+from cpl.dependency import ServiceCollection
 from model.user_repo import UserRepo
 from model.user_repo_abc import UserRepoABC
 
@@ -23,11 +21,8 @@ class Startup(StartupABC):
 
         self._configuration = configuration
 
-    def configure_services(self, services: ServiceCollectionABC, environment: Environment):
-        # Create and connect to database
-        db_settings: DatabaseSettings = self._configuration.get(DatabaseSettings)
-        services.add_db_context(DBContext, db_settings)
+    def configure_services(self, services: ServiceCollection, environment: Environment):
+        services.add_module(mysql)
 
         services.add_singleton(UserRepoABC, UserRepo)
-
         services.add_singleton(LoggerABC, Logger)

tests/custom/di/src/di/startup.py

@@ -1,6 +1,6 @@
 from cpl.application import StartupABC
 from cpl.core.configuration import ConfigurationABC
-from cpl.dependency import ServiceProviderABC, ServiceCollectionABC
+from cpl.dependency import ServiceProviderABC, ServiceCollection
 from cpl.core.environment import Environment
 from di.test1_service import Test1Service
 from di.test2_service import Test2Service
@@ -17,7 +17,7 @@ class Startup(StartupABC):
     def configure_configuration(self, configuration: ConfigurationABC, environment: Environment) -> ConfigurationABC:
         return configuration
 
-    def configure_services(self, services: ServiceCollectionABC, environment: Environment) -> ServiceProviderABC:
+    def configure_services(self, services: ServiceCollection, environment: Environment) -> ServiceProviderABC:
         services.add_scoped(TestService)
         services.add_scoped(DITesterService)
 

tests/custom/general/src/general/startup.py

@@ -1,6 +1,7 @@
+from cpl import mail
 from cpl.application import StartupABC
 from cpl.core.configuration import Configuration
-from cpl.dependency import ServiceCollectionABC, ServiceProviderABC
+from cpl.dependency import ServiceCollection, ServiceProviderABC
 from cpl.core.environment import Environment
 from cpl.core.pipes import IPAddressPipe
 from test_service import TestService
@@ -15,8 +16,8 @@ class Startup(StartupABC):
         config.add_json_file(f"appsettings.{env.get_environment()}.json")
         config.add_json_file(f"appsettings.{env.get_host_name()}.json", optional=True)
 
-    def configure_services(self, services: ServiceCollectionABC, env: Environment):
+    def configure_services(self, services: ServiceCollection, env: Environment):
         services.add_logging()
-        services.add_mail()
+        services.add_module(mail)
         services.add_transient(IPAddressPipe)
         services.add_singleton(TestService)

tests/custom/general/src/general/test_startup_extension.py

@@ -1,7 +1,7 @@
 from cpl.application import StartupExtensionABC
 from cpl.core.configuration import Configuration
 from cpl.core.console import Console
-from cpl.dependency import ServiceCollectionABC
+from cpl.dependency import ServiceCollection
 from cpl.core.environment import Environment
 
 
@@ -12,5 +12,5 @@ class TestStartupExtension(StartupExtensionABC):
     def configure_configuration(self, config: Configuration, env: Environment):
         Console.write_line("config")
 
-    def configure_services(self, services: ServiceCollectionABC, env: Environment):
+    def configure_services(self, services: ServiceCollection, env: Environment):
         Console.write_line("services")

tests/custom/translation/src/translation/startup.py

@@ -1,6 +1,6 @@
 from cpl.application import StartupABC
 from cpl.core.configuration import ConfigurationABC
-from cpl.dependency import ServiceProviderABC, ServiceCollectionABC
+from cpl.dependency import ServiceProviderABC, ServiceCollection
 from cpl.core.environment import Environment
 
 
@@ -12,6 +12,6 @@ class Startup(StartupABC):
         configuration.add_json_file("appsettings.json")
         return configuration
 
-    def configure_services(self, services: ServiceCollectionABC, environment: Environment) -> ServiceProviderABC:
+    def configure_services(self, services: ServiceCollection, environment: Environment) -> ServiceProviderABC:
         services.add_translation()
         return services.build_service_provider()