Moved test projects

example/custom/database/cpl.json

@@ -0,0 +1,40 @@
+{
+  "Project": {
+    "Name": "database",
+    "Version": {
+      "Major": "0",
+      "Minor": "0",
+      "Micro": "0"
+    },
+    "Author": "",
+    "AuthorEmail": "",
+    "Description": "",
+    "LongDescription": "",
+    "URL": "",
+    "CopyrightDate": "",
+    "CopyrightName": "",
+    "LicenseName": "",
+    "LicenseDescription": "",
+    "Dependencies": [
+      "sh_cpl==2021.4.2.dev1"
+    ],
+    "PythonVersion": ">=3.9.2",
+    "PythonPath": {},
+    "Classifiers": []
+  },
+  "Build": {
+    "ProjectType": "console",
+    "SourcePath": "src",
+    "OutputPath": "dist",
+    "Main": "main",
+    "EntryPoint": "database",
+    "IncludePackageData": false,
+    "Included": [],
+    "Excluded": [
+      "*/__pycache__",
+      "*/logs",
+      "*/tests"
+    ],
+    "PackageData": {}
+  }
+}

example/custom/database/src/application.py

@@ -0,0 +1,39 @@
+from cpl.application.abc import ApplicationABC
+from cpl.auth.keycloak import KeycloakAdmin
+from cpl.core.console import Console
+from cpl.core.environment import Environment
+from cpl.core.log import LoggerABC
+from cpl.dependency import ServiceProviderABC
+from model.city import City
+from model.city_dao import CityDao
+from model.user import User
+from model.user_dao import UserDao
+
+
+class Application(ApplicationABC):
+    def __init__(self, services: ServiceProviderABC):
+        ApplicationABC.__init__(self, services)
+
+        self._logger = services.get_service(LoggerABC)
+
+    async def test_daos(self):
+        userDao: UserDao = self._services.get_service(UserDao)
+        cityDao: CityDao = self._services.get_service(CityDao)
+
+        Console.write_line(await userDao.get_all())
+
+        if len(await cityDao.get_all()) == 0:
+            city_id = await cityDao.create(City(0, "Haren", "49733"))
+            await userDao.create(User(0, "NewUser", city_id))
+
+        Console.write_line(await userDao.get_all())
+
+    async def main(self):
+        self._logger.debug(f"Host: {Environment.get_host_name()}")
+        self._logger.debug(f"Environment: {Environment.get_environment()}")
+
+        await self.test_daos()
+
+        kc_admin: KeycloakAdmin = self._services.get_service(KeycloakAdmin)
+        x = kc_admin.get_users()
+        Console.write_line(x)

example/custom/database/src/appsettings.development.json

@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "Path": "logs/",
+    "Filename": "log_$start_time.log",
+    "ConsoleLevel": "TRACE",
+    "Level": "TRACE"
+  }
+}

example/custom/database/src/appsettings.edrafts-lapi.json

@@ -0,0 +1,22 @@
+{
+  "TimeFormat": {
+    "DateFormat": "%Y-%m-%d",
+    "TimeFormat": "%H:%M:%S",
+    "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f",
+    "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S"
+  },
+
+  "Log": {
+    "Path": "logs/",
+    "Filename": "log_$start_time.log",
+    "ConsoleLevel": "TRACE",
+    "Level": "TRACE"
+  },
+
+  "Database": {
+    "AuthPlugin": "mysql_native_password",
+    "ConnectionString": "mysql+mysqlconnector://cpl:$credentials@localhost/cpl",
+    "Credentials": "Y3Bs",
+    "Encoding": "utf8mb4"
+  }
+}

example/custom/database/src/appsettings.edrafts-pc.json

@@ -0,0 +1,26 @@
+{
+  "TimeFormat": {
+    "DateFormat": "%Y-%m-%d",
+    "TimeFormat": "%H:%M:%S",
+    "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f",
+    "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S"
+  },
+
+  "Log": {
+    "Path": "logs/",
+    "Filename": "log_$start_time.log",
+    "ConsoleLevel": "TRACE",
+    "Level": "TRACE"
+  },
+
+  "Database": {
+    "Host": "localhost",
+    "User": "cpl",
+    "Port": 3306,
+    "Password": "cpl",
+    "Database": "cpl",
+    "Charset": "utf8mb4",
+    "UseUnicode": "true",
+    "Buffered": "true"
+  }
+}

example/custom/database/src/appsettings.json

@@ -0,0 +1,15 @@
+{
+  "TimeFormat": {
+    "DateFormat": "%Y-%m-%d",
+    "TimeFormat": "%H:%M:%S",
+    "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f",
+    "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S"
+  },
+
+  "Log": {
+    "Path": "logs/",
+    "Filename": "log_$start_time.log",
+    "ConsoleLevel": "ERROR",
+    "Level": "WARNING"
+  }
+}

example/custom/database/src/custom_permissions.py

@@ -0,0 +1,5 @@
+from enum import Enum
+
+
+class CustomPermissions(Enum):
+    test = "test"

example/custom/database/src/main.py

@@ -0,0 +1,19 @@
+from application import Application
+from cpl.application import ApplicationBuilder
+from custom_permissions import CustomPermissions
+from startup import Startup
+
+
+def main():
+    builder = ApplicationBuilder(Application).with_startup(Startup)
+    app = builder.build()
+
+    app.with_logging()
+    app.with_permissions(CustomPermissions)
+    app.with_migrations("./scripts")
+    app.with_seeders()
+    app.run()
+
+
+if __name__ == "__main__":
+    main()

example/custom/database/src/main_simplified.py

@@ -0,0 +1,27 @@
+from application import Application
+from cpl.application import ApplicationBuilder
+from cpl.auth.permission.permissions_registry import PermissionsRegistry
+from cpl.core.console import Console
+from cpl.core.log import LogLevel
+from custom_permissions import CustomPermissions
+from startup import Startup
+
+
+def main():
+    builder = ApplicationBuilder(Application).with_startup(Startup)
+    builder.services.add_logging()
+
+    app = builder.build()
+
+    app.with_logging(LogLevel.trace)
+    app.with_permissions(CustomPermissions)
+    app.with_migrations("./scripts")
+    app.with_seeders()
+
+    Console.write_line(CustomPermissions.test.value in PermissionsRegistry.get())
+    app.run()
+    Console.write_line("Hello from main_simplified.py!")
+
+
+if __name__ == "__main__":
+    main()

example/custom/database/src/model/city.py

@@ -0,0 +1,29 @@
+from datetime import datetime
+from typing import Optional
+
+from cpl.core.typing import SerialId
+from cpl.database.abc.db_model_abc import DbModelABC
+
+
+class City(DbModelABC):
+    def __init__(
+        self,
+        id: int,
+        name: str,
+        zip: str,
+        deleted: bool = False,
+        editor_id: Optional[SerialId] = None,
+        created: Optional[datetime] = None,
+        updated: Optional[datetime] = None,
+    ):
+        DbModelABC.__init__(self, id, deleted, editor_id, created, updated)
+        self._name = name
+        self._zip = zip
+
+    @property
+    def name(self) -> str:
+        return self._name
+
+    @property
+    def zip(self) -> str:
+        return self._zip

example/custom/database/src/model/city_dao.py

@@ -0,0 +1,11 @@
+from cpl.database.abc import DbModelDaoABC
+from model.city import City
+
+
+class CityDao(DbModelDaoABC[City]):
+
+    def __init__(self):
+        DbModelDaoABC.__init__(self, City, "city")
+
+        self.attribute(City.name, str)
+        self.attribute(City.zip, int)

example/custom/database/src/model/user.py

@@ -0,0 +1,30 @@
+from datetime import datetime
+from typing import Optional
+
+from cpl.core.typing import SerialId
+from cpl.database.abc.db_model_abc import DbModelABC
+
+
+class User(DbModelABC):
+
+    def __init__(
+        self,
+        id: int,
+        name: str,
+        city_id: int = 0,
+        deleted: bool = False,
+        editor_id: Optional[SerialId] = None,
+        created: Optional[datetime] = None,
+        updated: Optional[datetime] = None,
+    ):
+        DbModelABC.__init__(self, id, deleted, editor_id, created, updated)
+        self._name = name
+        self._city_id = city_id
+
+    @property
+    def name(self) -> str:
+        return self._name
+
+    @property
+    def city_id(self) -> int:
+        return self._city_id

example/custom/database/src/model/user_dao.py

@@ -0,0 +1,13 @@
+from cpl.database.abc import DbModelDaoABC
+from model.user import User
+
+
+class UserDao(DbModelDaoABC[User]):
+
+    def __init__(self):
+        DbModelDaoABC.__init__(self, User, "users")
+
+        self.attribute(User.name, str)
+        self.attribute(User.city_id, int, db_name="CityId")
+
+        self.reference("city", "id", User.city_id, "city")

example/custom/database/src/scripts/0-initial.sql

@@ -0,0 +1,22 @@
+CREATE TABLE IF NOT EXISTS `city` (
+    `id` INT(30) NOT NULL AUTO_INCREMENT,
+    `name` VARCHAR(64) NOT NULL,
+    `zip` VARCHAR(5) NOT NULL,
+    deleted BOOLEAN NOT NULL DEFAULT FALSE,
+    editorId INT NULL,
+    created TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    PRIMARY KEY(`id`)
+);
+
+CREATE TABLE IF NOT EXISTS `users` (
+    `id` INT(30) NOT NULL AUTO_INCREMENT,
+    `name` VARCHAR(64) NOT NULL,
+    `cityId` INT(30),
+    deleted BOOLEAN NOT NULL DEFAULT FALSE,
+    editorId INT NULL,
+    created TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    FOREIGN KEY (`cityId`) REFERENCES city(`id`),
+    PRIMARY KEY(`id`)
+);

example/custom/database/src/startup.py

@@ -0,0 +1,31 @@
+from cpl import auth
+from cpl.application.abc.startup_abc import StartupABC
+from cpl.auth import permission
+from cpl.core.configuration import Configuration
+from cpl.core.environment import Environment
+from cpl.core.log import Logger, LoggerABC
+from cpl.database import mysql
+from cpl.database.abc.data_access_object_abc import DataAccessObjectABC
+from cpl.dependency import ServiceCollection
+from model.city_dao import CityDao
+from model.user_dao import UserDao
+
+
+class Startup(StartupABC):
+
+    @staticmethod
+    async def configure_configuration():
+        Configuration.add_json_file(f"appsettings.json")
+        Configuration.add_json_file(f"appsettings.{Environment.get_environment()}.json")
+        Configuration.add_json_file(f"appsettings.{Environment.get_host_name()}.json", optional=True)
+
+    @staticmethod
+    async def configure_services(services: ServiceCollection):
+        services.add_module(mysql)
+        services.add_module(auth)
+        services.add_module(permission)
+
+        services.add_transient(DataAccessObjectABC, UserDao)
+        services.add_transient(DataAccessObjectABC, CityDao)
+
+        services.add_singleton(LoggerABC, Logger)