From 6e01f77488283d28cb6c4a1a68da0c73e3d34677 Mon Sep 17 00:00:00 2001 From: Flo Date: Wed, 14 Feb 2024 20:12:27 +0100 Subject: [PATCH] first version --- .env.example | 8 +- bin/console.php | 2 +- bin/doctrine-migrations-log.php | 4 +- bin/doctrine-migrations.php | 10 +- bin/script/init | 10 +- composer.development.json | 102 +++++++++--------- composer.json | 18 ++-- config/autoload/api.global.php | 6 +- config/autoload/authorization.global.php | 2 +- config/autoload/logger.global.php | 4 +- config/config.php | 38 +++---- config/pipeline.php | 12 +-- config/routes.php | 2 +- .../homepage/Version20230922085011.php | 2 +- .../homepage/Version20230922092351.php | 2 +- .../homepage/Version20230922092754.php | 2 +- .../homepage/Version20230922101352.php | 2 +- .../homepage/Version20230922101354.php | 2 +- .../homepage/Version20230922101355.php | 2 +- .../homepage/Version20230924113403.php | 2 +- .../homepage/Version20231021103120.php | 2 +- .../homepage/Version20231021112654.php | 2 +- data/migrations/log/Version20230922150649.php | 2 +- docker/docker-compose-mac.yml | 28 ++--- docker/docker-compose.yml | 24 ++--- docker/mysql/scripts/initdb.sql | 4 +- docker/nginx/config/nginx.conf | 2 +- src/ApiDomain/Console/config/console.php | 4 +- .../Console/config/service_manager.php | 4 +- .../src/Command/InitializeDataCommand.php | 18 ++-- .../Console/src/Command/RbacUpdateCommand.php | 18 ++-- src/ApiDomain/Console/src/ConfigProvider.php | 2 +- .../External/Authentication/config/routes.php | 10 +- .../Authentication/config/service_manager.php | 8 +- .../Authentication/src/ConfigProvider.php | 2 +- .../Handler/ConfirmRegistrationHandler.php | 10 +- .../src/Handler/LoginUserHandler.php | 8 +- .../src/Handler/LogoutUserHandler.php | 10 +- .../src/Handler/RegisterUserHandler.php | 16 +-- .../External/Health/config/routes.php | 2 +- .../Health/config/service_manager.php | 2 +- .../External/Health/src/ConfigProvider.php | 2 +- .../Health/src/Handler/HealthHandler.php | 2 +- .../External/Product/config/routes.php | 51 --------- .../Product/config/service_manager.php | 25 ----- .../External/Product/src/ConfigProvider.php | 16 --- .../src/Formatter/ProductFormatter.php | 20 ---- .../src/Formatter/ProductListFormatter.php | 28 ----- .../src/Handler/CreateProductHandler.php | 41 ------- .../src/Handler/DeleteProductHandler.php | 38 ------- .../src/Handler/ProductListHandler.php | 35 ------ .../src/Handler/UpdateProductHandler.php | 43 -------- src/ApiDomain/External/User/config/routes.php | 12 +-- .../External/User/config/service_manager.php | 10 +- .../External/User/src/ConfigProvider.php | 2 +- .../User/src/Formatter/UserFormatter.php | 4 +- .../src/Handler/ChangePasswordHandler.php | 12 +-- .../src/Handler/ChangeUsernameHandler.php | 12 +-- .../User/src/Handler/CreateUserHandler.php | 8 +- .../User/src/Handler/UserStateHandler.php | 12 +-- src/DataDomain/Business/config/doctrine.php | 18 ++-- .../Business/config/service_manager.php | 20 ++-- .../Business/src/ConfigProvider.php | 2 +- .../Business/src/Entity/Permission.php | 10 +- .../Business/src/Entity/Product.php | 99 ----------------- .../Business/src/Entity/Registration.php | 6 +- src/DataDomain/Business/src/Entity/Role.php | 10 +- src/DataDomain/Business/src/Entity/User.php | 10 +- .../Business/src/Entity/UserSession.php | 8 +- .../Factory/HomepageEntityManagerFactory.php | 19 ---- .../Factory/TemplateEntityManagerFactory.php | 19 ++++ .../src/Manager/HomepageEntityManager.php | 11 -- .../src/Manager/TemplateEntityManager.php | 11 ++ .../src/Repository/PermissionRepository.php | 2 +- .../src/Repository/ProductRepository.php | 2 +- .../src/Repository/RegistrationRepository.php | 4 +- .../src/Repository/RoleRepository.php | 2 +- .../src/Repository/UserRepository.php | 4 +- .../src/Repository/UserSessionRepository.php | 6 +- src/DataDomain/Log/config/doctrine.php | 4 +- src/DataDomain/Log/config/service_manager.php | 4 +- src/DataDomain/Log/src/ConfigProvider.php | 2 +- src/DataDomain/Log/src/Entity/Log.php | 6 +- .../src/Factory/LogEntityManagerFactory.php | 4 +- .../Log/src/Manager/LogEntityManager.php | 2 +- .../Log/src/Repository/LogRepository.php | 2 +- .../Product/config/service_manager.php | 20 ++-- .../Product/src/Builder/ProductBuilder.php | 4 +- .../Product/src/ConfigProvider.php | 2 +- .../ProductNotFoundByIdException.php | 10 +- .../ProductWithIdentifierAlreadyExists.php | 10 +- .../CreateProduct/CreateProductCommand.php | 2 +- .../CreateProductCommandBuilder.php | 2 +- .../CreateProductCommandHandler.php | 12 +-- .../DeleteProduct/DeleteProductCommand.php | 2 +- .../DeleteProductCommandBuilder.php | 2 +- .../DeleteProductCommandHandler.php | 16 +-- .../UpdateProduct/UpdateProductCommand.php | 2 +- .../UpdateProductCommandBuilder.php | 2 +- .../UpdateProductCommandHandler.php | 22 ++-- .../Query/ProductList/ProductListQuery.php | 2 +- .../ProductList/ProductListQueryBuilder.php | 2 +- .../ProductList/ProductListQueryHandler.php | 12 +-- .../ProductIdentifierAlreadyExistsRule.php | 14 +-- .../Registration/config/service_manager.php | 30 +++--- .../src/Builder/RegistrationBuilder.php | 4 +- .../Registration/src/ConfigProvider.php | 2 +- .../RegistrationNotFoundByIdException.php | 10 +- ...onWithIdentifierAlreadyExistsException.php | 10 +- .../ConfirmRegistrationCommand.php | 2 +- .../ConfirmRegistrationCommandBuilder.php | 2 +- .../ConfirmRegistrationCommandHandler.php | 8 +- .../RegisterUser/RegisterUserCommand.php | 2 +- .../RegisterUserCommandBuilder.php | 2 +- .../RegisterUserCommandHandler.php | 8 +- .../ConfirmRegistrationPayload.php | 10 +- .../ConfirmRegistrationPipeline.php | 8 +- .../Step/CreateUserStep.php | 20 ++-- .../Step/LoadRegistrationStep.php | 12 +-- .../Step/SaveRegistrationAndUserStep.php | 6 +- .../RegisterUser/RegisterUserPayload.php | 6 +- .../RegisterUser/RegisterUserPipeline.php | 10 +- .../Step/BuildRegistrationStep.php | 4 +- .../RegisterUser/Step/CheckIdentifierStep.php | 10 +- .../Step/SaveRegistrationStep.php | 6 +- .../RegisterUser/Step/SendMailStep.php | 4 +- ...trationWithIdentifierAlreadyExistsRule.php | 10 +- .../RoleNotFoundByIdentifierException.php | 10 +- .../User/config/service_manager.php | 18 ++-- .../User/src/Builder/UserBuilder.php | 18 ++-- .../User/src/ConfigProvider.php | 2 +- .../UserNotFoundByIdentifierException.php | 10 +- .../UserPasswordMismatchException.php | 10 +- .../UserWithIdentifierAlreadyExists.php | 10 +- .../Exception/UserWrongPasswordException.php | 10 +- .../ChangePassword/ChangePasswordCommand.php | 4 +- .../ChangePasswordCommandBuilder.php | 4 +- .../ChangePasswordCommandHandler.php | 18 ++-- .../ChangeUsername/ChangeUsernameCommand.php | 4 +- .../ChangeUsernameCommandBuilder.php | 4 +- .../ChangeUsernameCommandHandler.php | 10 +- .../Command/CreateUser/CreateUserCommand.php | 2 +- .../CreateUser/CreateUserCommandBuilder.php | 2 +- .../CreateUser/CreateUserCommandHandler.php | 12 +-- .../User/src/Rule/UserPasswordMatchRule.php | 8 +- .../UserWithIdentifierAlreadyExistsRule.php | 10 +- .../UserSession/config/service_manager.php | 12 +-- .../src/Builder/UserSessionBuilder.php | 4 +- .../UserSession/src/ConfigProvider.php | 2 +- .../Command/LoginUser/LoginUserCommand.php | 4 +- .../LoginUser/LoginUserCommandBuilder.php | 4 +- .../LoginUser/LoginUserCommandHandler.php | 30 +++--- .../Command/LogoutUser/LogoutUserCommand.php | 4 +- .../LogoutUser/LogoutUserCommandBuilder.php | 4 +- .../LogoutUser/LogoutUserCommandHandler.php | 16 +-- .../src/Rule/UserPasswordMatchesRule.php | 6 +- .../Database/config/service_manager.php | 2 +- .../Database/src/ConfigProvider.php | 2 +- .../Database/src/ConfigServiceFactory.php | 2 +- .../config/service_manager.php | 2 +- .../src/ConfigProvider.php | 2 +- .../src/ConfigServiceFactory.php | 2 +- .../Encryption/config/service_manager.php | 2 +- .../src/Client/EncryptionClient.php | 2 +- .../Encryption/src/ConfigProvider.php | 2 +- .../Exception/config/service_manager.php | 4 +- .../Exception/src/ConfigProvider.php | 2 +- .../Exception/src/ErrorCode.php | 2 +- .../Exception/src/ErrorDomain.php | 2 +- ...ageException.php => TemplateException.php} | 8 +- ...=> TemplateExceptionHandlerMiddleware.php} | 12 +-- .../Logging/config/service_manager.php | 14 +-- .../Logging/src/ConfigProvider.php | 2 +- .../src/Factory/FileStreamHandlerFactory.php | 4 +- .../Logging/src/Factory/LoggerFactory.php | 6 +- .../src/Factory/MonologLoggerFactory.php | 6 +- .../src/Formatter/PrettyFileLogLines.php | 2 +- .../src/Handler/DoctrineLogHandler.php | 6 +- .../Logging/src/Handler/FileStreamHandler.php | 4 +- .../Logging/src/Logger/Logger.php | 8 +- .../Rbac/config/service_manager.php | 2 +- .../Rbac/src/ConfigProvider.php | 2 +- .../EnsureAuthorizationMiddleware.php | 10 +- .../Request/config/service_manager.php | 10 +- .../Request/src/ConfigProvider.php | 2 +- .../ApiIdentifierUnknownException.php | 2 +- .../ApiPropertyUndefinedException.php | 2 +- .../Exception/ApiRequestFailedException.php | 2 +- .../Exception/ApiServiceUnknownException.php | 2 +- .../src/Factory/RequestServiceFactory.php | 6 +- .../Middleware/AnalyzeHeaderMiddleware.php | 10 +- .../Middleware/InternalRequestMiddleware.php | 4 +- .../Request/src/Service/RequestService.php | 12 +-- .../Response/src/ErrorResponse.php | 6 +- .../Response/src/ForbiddenResponse.php | 2 +- .../Response/src/SuccessResponse.php | 2 +- .../Response/src/UnauthorizedResponse.php | 2 +- .../Session/config/service_manager.php | 4 +- .../Session/src/ConfigProvider.php | 2 +- .../src/Middleware/LoggedInUserMiddleware.php | 6 +- .../src/Middleware/SessionMiddleware.php | 14 +-- .../UuidGenerator/src/UuidGenerator.php | 2 +- 202 files changed, 728 insertions(+), 1124 deletions(-) delete mode 100644 src/ApiDomain/External/Product/config/routes.php delete mode 100644 src/ApiDomain/External/Product/config/service_manager.php delete mode 100644 src/ApiDomain/External/Product/src/ConfigProvider.php delete mode 100644 src/ApiDomain/External/Product/src/Formatter/ProductFormatter.php delete mode 100644 src/ApiDomain/External/Product/src/Formatter/ProductListFormatter.php delete mode 100644 src/ApiDomain/External/Product/src/Handler/CreateProductHandler.php delete mode 100644 src/ApiDomain/External/Product/src/Handler/DeleteProductHandler.php delete mode 100644 src/ApiDomain/External/Product/src/Handler/ProductListHandler.php delete mode 100644 src/ApiDomain/External/Product/src/Handler/UpdateProductHandler.php delete mode 100644 src/DataDomain/Business/src/Entity/Product.php delete mode 100644 src/DataDomain/Business/src/Factory/HomepageEntityManagerFactory.php create mode 100644 src/DataDomain/Business/src/Factory/TemplateEntityManagerFactory.php delete mode 100644 src/DataDomain/Business/src/Manager/HomepageEntityManager.php create mode 100644 src/DataDomain/Business/src/Manager/TemplateEntityManager.php rename src/Infrastructure/Exception/src/Exception/{HomepageException.php => TemplateException.php} (77%) rename src/Infrastructure/Exception/src/Middleware/{HomepageExceptionHandlerMiddleware.php => TemplateExceptionHandlerMiddleware.php} (67%) diff --git a/.env.example b/.env.example index 53d7ce1..892e582 100644 --- a/.env.example +++ b/.env.example @@ -1,10 +1,10 @@ # DB Configuration DB_DRIVER=pdo_mysql -DB_HOST=homepage-backend-mysql +DB_HOST=template-backend-mysql DB_PORT=3306 -DB_USER=homepage +DB_USER=template DB_PASSWORD=pass -DB_NAME=homepage +DB_NAME=template DB_NAME_LOG=log # API Keys @@ -14,7 +14,7 @@ FILE_API_KEY= HOMEPAGE_API_KEY= BEE_API_KEY= -# Homepage Setup +# Template Setup INIT_USER_NAME=admin INIT_USER_PASSWORD=password INIT_USER_MAIL=admin@test.com \ No newline at end of file diff --git a/bin/console.php b/bin/console.php index 206d82e..151ba0e 100644 --- a/bin/console.php +++ b/bin/console.php @@ -1,6 +1,6 @@ setMetadataDriverImpl($driver); -$entityManager = $container->get(HomepageEntityManager::class); +$entityManager = $container->get(TemplateEntityManager::class); try { $connection = DriverManager::getConnection($dbParams); diff --git a/bin/doctrine-migrations.php b/bin/doctrine-migrations.php index 2f8b013..984881f 100644 --- a/bin/doctrine-migrations.php +++ b/bin/doctrine-migrations.php @@ -3,7 +3,7 @@ require_once __DIR__ . '/../config/autoload/defines.php'; require APP_ROOT . '/vendor/autoload.php'; -use Homepage\Data\Business\Manager\HomepageEntityManager; +use Template\Data\Business\Manager\TemplateEntityManager; use Doctrine\Common\Annotations\AnnotationReader; use Doctrine\DBAL\DriverManager; use Doctrine\Migrations\Configuration\Configuration; @@ -30,17 +30,17 @@ $isDevMode = true; $container = require APP_ROOT . '/config/container.php'; $config = $container->get('config'); $doctrineConfig = $config['doctrine']; -$paths = $doctrineConfig['driver']['orm_homepage_annotation_driver']['paths']; +$paths = $doctrineConfig['driver']['orm_template_annotation_driver']['paths']; -$dbParams = $doctrineConfig['connection']['orm_homepage']['params']; -$migrationsConf = $doctrineConfig['migrations_configuration']['orm_homepage']; +$dbParams = $doctrineConfig['connection']['orm_template']['params']; +$migrationsConf = $doctrineConfig['migrations_configuration']['orm_template']; $reader = new AnnotationReader(); $driver = new AnnotationDriver($reader, $paths); $config = Setup::createAnnotationMetadataConfiguration($paths, $isDevMode); $config->setMetadataDriverImpl($driver); -$entityManager = $container->get(HomepageEntityManager::class); +$entityManager = $container->get(TemplateEntityManager::class); try { $connection = DriverManager::getConnection($dbParams); diff --git a/bin/script/init b/bin/script/init index a41c9ab..413fc2d 100755 --- a/bin/script/init +++ b/bin/script/init @@ -21,12 +21,12 @@ $SCRIPT_DIR/exec up -d source $ENV_DIR/bin/script/drun # Install PHP packages -drun homepage-backend composer install +drun template-backend composer install # Migrate databases to current version -drun homepage-backend composer dmm -drun homepage-backend composer dmlm +drun template-backend composer dmm +drun template-backend composer dmlm # Insert setup for project after this line -drun homepage-backend composer console rbac:update -drun homepage-backend composer console init:data \ No newline at end of file +drun template-backend composer console rbac:update +drun template-backend composer console init:data \ No newline at end of file diff --git a/composer.development.json b/composer.development.json index e2367b8..bd0d9df 100644 --- a/composer.development.json +++ b/composer.development.json @@ -23,46 +23,46 @@ }, "autoload": { "psr-4": { - "Homepage\\API\\Console\\": "src\/ApiDomain\/Console\/src", - "Homepage\\API\\External\\Authentication\\": "src\/ApiDomain\/External\/Authentication\/src", - "Homepage\\API\\External\\Health\\": "src\/ApiDomain\/External\/Health\/src", - "Homepage\\API\\External\\Product\\": "src\/ApiDomain\/External\/Product\/src", - "Homepage\\API\\External\\User\\": "src\/ApiDomain\/External\/User\/src", - "Homepage\\Data\\Business\\": "src\/DataDomain\/Business\/src", - "Homepage\\Data\\Log\\": "src\/DataDomain\/Log\/src", - "Homepage\\Handling\\Product\\": "src\/HandlingDomain\/Product\/src", - "Homepage\\Handling\\Registration\\": "src\/HandlingDomain\/Registration\/src", - "Homepage\\Handling\\Role\\": "src\/HandlingDomain\/Role\/src", - "Homepage\\Handling\\User\\": "src\/HandlingDomain\/User\/src", - "Homepage\\Handling\\UserSession\\": "src\/HandlingDomain\/UserSession\/src", - "Homepage\\Infrastructure\\Database\\": "src\/Infrastructure\/Database\/src", - "Homepage\\Infrastructure\\DependencyInjection\\": "src\/Infrastructure\/DependencyInjection\/src", - "Homepage\\Infrastructure\\Encryption\\": "src\/Infrastructure\/Encryption\/src", - "Homepage\\Infrastructure\\Exception\\": "src\/Infrastructure\/Exception\/src", - "Homepage\\Infrastructure\\Logging\\": "src\/Infrastructure\/Logging\/src", - "Homepage\\Infrastructure\\Rbac\\": "src\/Infrastructure\/Rbac\/src", - "Homepage\\Infrastructure\\Request\\": "src\/Infrastructure\/Request\/src", - "Homepage\\Infrastructure\\Response\\": "src\/Infrastructure\/Response\/src", - "Homepage\\Infrastructure\\Session\\": "src\/Infrastructure\/Session\/src", - "Homepage\\Infrastructure\\UuidGenerator\\": "src\/Infrastructure\/UuidGenerator\/src" + "Template\\API\\Console\\": "src\/ApiDomain\/Console\/src", + "Template\\API\\External\\Authentication\\": "src\/ApiDomain\/External\/Authentication\/src", + "Template\\API\\External\\Health\\": "src\/ApiDomain\/External\/Health\/src", + "Template\\API\\External\\Product\\": "src\/ApiDomain\/External\/Product\/src", + "Template\\API\\External\\User\\": "src\/ApiDomain\/External\/User\/src", + "Template\\Data\\Business\\": "src\/DataDomain\/Business\/src", + "Template\\Data\\Log\\": "src\/DataDomain\/Log\/src", + "Template\\Handling\\Product\\": "src\/HandlingDomain\/Product\/src", + "Template\\Handling\\Registration\\": "src\/HandlingDomain\/Registration\/src", + "Template\\Handling\\Role\\": "src\/HandlingDomain\/Role\/src", + "Template\\Handling\\User\\": "src\/HandlingDomain\/User\/src", + "Template\\Handling\\UserSession\\": "src\/HandlingDomain\/UserSession\/src", + "Template\\Infrastructure\\Database\\": "src\/Infrastructure\/Database\/src", + "Template\\Infrastructure\\DependencyInjection\\": "src\/Infrastructure\/DependencyInjection\/src", + "Template\\Infrastructure\\Encryption\\": "src\/Infrastructure\/Encryption\/src", + "Template\\Infrastructure\\Exception\\": "src\/Infrastructure\/Exception\/src", + "Template\\Infrastructure\\Logging\\": "src\/Infrastructure\/Logging\/src", + "Template\\Infrastructure\\Rbac\\": "src\/Infrastructure\/Rbac\/src", + "Template\\Infrastructure\\Request\\": "src\/Infrastructure\/Request\/src", + "Template\\Infrastructure\\Response\\": "src\/Infrastructure\/Response\/src", + "Template\\Infrastructure\\Session\\": "src\/Infrastructure\/Session\/src", + "Template\\Infrastructure\\UuidGenerator\\": "src\/Infrastructure\/UuidGenerator\/src" } }, "extra": { "teewurst\/psr4-advanced-wildcard-composer-plugin": { "autoload": { "psr-4": { - "Homepage\\API\\%s\\%s\\": "src\/ApiDomain\/{*}\/{*}\/src\/", - "Homepage\\Data\\%s\\": "src\/DataDomain\/{*}\/src\/", - "Homepage\\Handling\\%s\\": "src\/HandlingDomain\/{*}\/src\/", - "Homepage\\Infrastructure\\%s\\": "src\/Infrastructure\/{*}\/src\/" + "Template\\API\\%s\\%s\\": "src\/ApiDomain\/{*}\/{*}\/src\/", + "Template\\Data\\%s\\": "src\/DataDomain\/{*}\/src\/", + "Template\\Handling\\%s\\": "src\/HandlingDomain\/{*}\/src\/", + "Template\\Infrastructure\\%s\\": "src\/Infrastructure\/{*}\/src\/" } }, "autoload-dev": { "psr-4": { - "Homepage\\API\\%s\\%s\\": "src\/ApiDomain\/{*}\/{*}\/src\/", - "Homepage\\Data\\%s\\": "src\/DataDomain\/{*}\/src\/", - "Homepage\\Handling\\%s\\": "src\/HandlingDomain\/{*}\/src\/", - "Homepage\\Infrastructure\\%s\\": "src\/Infrastructure\/{*}\/src\/" + "Template\\API\\%s\\%s\\": "src\/ApiDomain\/{*}\/{*}\/src\/", + "Template\\Data\\%s\\": "src\/DataDomain\/{*}\/src\/", + "Template\\Handling\\%s\\": "src\/HandlingDomain\/{*}\/src\/", + "Template\\Infrastructure\\%s\\": "src\/Infrastructure\/{*}\/src\/" } } } @@ -96,27 +96,27 @@ }, "autoload-dev": { "psr-4": { - "Homepage\\API\\External\\Authentication\\": "src\/ApiDomain\/External\/Authentication\/src", - "Homepage\\API\\External\\Health\\": "src\/ApiDomain\/External\/Health\/src", - "Homepage\\API\\External\\Product\\": "src\/ApiDomain\/External\/Product\/src", - "Homepage\\API\\External\\User\\": "src\/ApiDomain\/External\/User\/src", - "Homepage\\Data\\Business\\": "src\/DataDomain\/Business\/src", - "Homepage\\Data\\Log\\": "src\/DataDomain\/Log\/src", - "Homepage\\Handling\\Product\\": "src\/HandlingDomain\/Product\/src", - "Homepage\\Handling\\Registration\\": "src\/HandlingDomain\/Registration\/src", - "Homepage\\Handling\\Role\\": "src\/HandlingDomain\/Role\/src", - "Homepage\\Handling\\User\\": "src\/HandlingDomain\/User\/src", - "Homepage\\Handling\\UserSession\\": "src\/HandlingDomain\/UserSession\/src", - "Homepage\\Infrastructure\\Database\\": "src\/Infrastructure\/Database\/src", - "Homepage\\Infrastructure\\DependencyInjection\\": "src\/Infrastructure\/DependencyInjection\/src", - "Homepage\\Infrastructure\\Encryption\\": "src\/Infrastructure\/Encryption\/src", - "Homepage\\Infrastructure\\Exception\\": "src\/Infrastructure\/Exception\/src", - "Homepage\\Infrastructure\\Logging\\": "src\/Infrastructure\/Logging\/src", - "Homepage\\Infrastructure\\Rbac\\": "src\/Infrastructure\/Rbac\/src", - "Homepage\\Infrastructure\\Request\\": "src\/Infrastructure\/Request\/src", - "Homepage\\Infrastructure\\Response\\": "src\/Infrastructure\/Response\/src", - "Homepage\\Infrastructure\\Session\\": "src\/Infrastructure\/Session\/src", - "Homepage\\Infrastructure\\UuidGenerator\\": "src\/Infrastructure\/UuidGenerator\/src" + "Template\\API\\External\\Authentication\\": "src\/ApiDomain\/External\/Authentication\/src", + "Template\\API\\External\\Health\\": "src\/ApiDomain\/External\/Health\/src", + "Template\\API\\External\\Product\\": "src\/ApiDomain\/External\/Product\/src", + "Template\\API\\External\\User\\": "src\/ApiDomain\/External\/User\/src", + "Template\\Data\\Business\\": "src\/DataDomain\/Business\/src", + "Template\\Data\\Log\\": "src\/DataDomain\/Log\/src", + "Template\\Handling\\Product\\": "src\/HandlingDomain\/Product\/src", + "Template\\Handling\\Registration\\": "src\/HandlingDomain\/Registration\/src", + "Template\\Handling\\Role\\": "src\/HandlingDomain\/Role\/src", + "Template\\Handling\\User\\": "src\/HandlingDomain\/User\/src", + "Template\\Handling\\UserSession\\": "src\/HandlingDomain\/UserSession\/src", + "Template\\Infrastructure\\Database\\": "src\/Infrastructure\/Database\/src", + "Template\\Infrastructure\\DependencyInjection\\": "src\/Infrastructure\/DependencyInjection\/src", + "Template\\Infrastructure\\Encryption\\": "src\/Infrastructure\/Encryption\/src", + "Template\\Infrastructure\\Exception\\": "src\/Infrastructure\/Exception\/src", + "Template\\Infrastructure\\Logging\\": "src\/Infrastructure\/Logging\/src", + "Template\\Infrastructure\\Rbac\\": "src\/Infrastructure\/Rbac\/src", + "Template\\Infrastructure\\Request\\": "src\/Infrastructure\/Request\/src", + "Template\\Infrastructure\\Response\\": "src\/Infrastructure\/Response\/src", + "Template\\Infrastructure\\Session\\": "src\/Infrastructure\/Session\/src", + "Template\\Infrastructure\\UuidGenerator\\": "src\/Infrastructure\/UuidGenerator\/src" } } } \ No newline at end of file diff --git a/composer.json b/composer.json index 6d4d578..cbb6b4f 100644 --- a/composer.json +++ b/composer.json @@ -23,25 +23,25 @@ }, "autoload": { "psr-4": { - "Homepage\\API\\Console\\": "src/ApiDomain/Console/src/" + "Template\\API\\Console\\": "src/ApiDomain/Console/src/" } }, "extra": { "teewurst/psr4-advanced-wildcard-composer-plugin": { "autoload": { "psr-4": { - "Homepage\\API\\%s\\%s\\": "src/ApiDomain/{*}/{*}/src/", - "Homepage\\Data\\%s\\": "src/DataDomain/{*}/src/", - "Homepage\\Handling\\%s\\": "src/HandlingDomain/{*}/src/", - "Homepage\\Infrastructure\\%s\\": "src/Infrastructure/{*}/src/" + "Template\\API\\%s\\%s\\": "src/ApiDomain/{*}/{*}/src/", + "Template\\Data\\%s\\": "src/DataDomain/{*}/src/", + "Template\\Handling\\%s\\": "src/HandlingDomain/{*}/src/", + "Template\\Infrastructure\\%s\\": "src/Infrastructure/{*}/src/" } }, "autoload-dev": { "psr-4": { - "Homepage\\API\\%s\\%s\\": "src/ApiDomain/{*}/{*}/src/", - "Homepage\\Data\\%s\\": "src/DataDomain/{*}/src/", - "Homepage\\Handling\\%s\\": "src/HandlingDomain/{*}/src/", - "Homepage\\Infrastructure\\%s\\": "src/Infrastructure/{*}/src/" + "Template\\API\\%s\\%s\\": "src/ApiDomain/{*}/{*}/src/", + "Template\\Data\\%s\\": "src/DataDomain/{*}/src/", + "Template\\Handling\\%s\\": "src/HandlingDomain/{*}/src/", + "Template\\Infrastructure\\%s\\": "src/Infrastructure/{*}/src/" } } } diff --git a/config/autoload/api.global.php b/config/autoload/api.global.php index 553b280..35e85c3 100644 --- a/config/autoload/api.global.php +++ b/config/autoload/api.global.php @@ -3,13 +3,13 @@ return [ 'api' => [ 'keys' => [ - 'homepage' => $_ENV['HOMEPAGE_API_KEY'], + 'template' => $_ENV['HOMEPAGE_API_KEY'], 'notification' => $_ENV['NOTIFICATION_API_KEY'], ], 'services' => [ - 'homepage' => [ - 'host' => 'homepage-backend-nginx', + 'template' => [ + 'host' => 'template-backend-nginx', 'apis' => [ ] diff --git a/config/autoload/authorization.global.php b/config/autoload/authorization.global.php index 48c188f..d1b8b23 100644 --- a/config/autoload/authorization.global.php +++ b/config/autoload/authorization.global.php @@ -1,7 +1,7 @@ [ + 'template-rbac' => [ 'roles' => [ 'admin', 'user', diff --git a/config/autoload/logger.global.php b/config/autoload/logger.global.php index 62e86ef..3a3fee7 100644 --- a/config/autoload/logger.global.php +++ b/config/autoload/logger.global.php @@ -6,8 +6,8 @@ use Monolog\Level; return [ 'logger' => [ - 'name' => 'homepage.backend', - 'path' => APP_ROOT . '/var/log/homepage.backend.log', + 'name' => 'template.backend', + 'path' => APP_ROOT . '/var/log/template.backend.log', 'level' => Level::Debug, 'pretty' => true, ] diff --git a/config/config.php b/config/config.php index 162c3f8..8d3f7dd 100644 --- a/config/config.php +++ b/config/config.php @@ -40,34 +40,34 @@ $aggregator = new ConfigAggregator([ // Data - \Homepage\Data\Business\ConfigProvider::class, - \Homepage\Data\Log\ConfigProvider::class, + \Template\Data\Business\ConfigProvider::class, + \Template\Data\Log\ConfigProvider::class, // Infrastructure - \Homepage\Infrastructure\Database\ConfigProvider::class, - \Homepage\Infrastructure\DependencyInjection\ConfigProvider::class, - \Homepage\Infrastructure\Encryption\ConfigProvider::class, - \Homepage\Infrastructure\Exception\ConfigProvider::class, - \Homepage\Infrastructure\Logging\ConfigProvider::class, - \Homepage\Infrastructure\Rbac\ConfigProvider::class, - \Homepage\Infrastructure\Request\ConfigProvider::class, - \Homepage\Infrastructure\Session\ConfigProvider::class, + \Template\Infrastructure\Database\ConfigProvider::class, + \Template\Infrastructure\DependencyInjection\ConfigProvider::class, + \Template\Infrastructure\Encryption\ConfigProvider::class, + \Template\Infrastructure\Exception\ConfigProvider::class, + \Template\Infrastructure\Logging\ConfigProvider::class, + \Template\Infrastructure\Rbac\ConfigProvider::class, + \Template\Infrastructure\Request\ConfigProvider::class, + \Template\Infrastructure\Session\ConfigProvider::class, // HandlingDomain - \Homepage\Handling\Product\ConfigProvider::class, - \Homepage\Handling\User\ConfigProvider::class, - \Homepage\Handling\UserSession\ConfigProvider::class, - \Homepage\Handling\Registration\ConfigProvider::class, + \Template\Handling\Product\ConfigProvider::class, + \Template\Handling\User\ConfigProvider::class, + \Template\Handling\UserSession\ConfigProvider::class, + \Template\Handling\Registration\ConfigProvider::class, // API /// Command - \Homepage\API\Console\ConfigProvider::class, + \Template\API\Console\ConfigProvider::class, /// External - \Homepage\API\External\Health\ConfigProvider::class, - \Homepage\API\External\Product\ConfigProvider::class, - \Homepage\API\External\User\ConfigProvider::class, - \Homepage\API\External\Authentication\ConfigProvider::class, + \Template\API\External\Health\ConfigProvider::class, + \Template\API\External\Product\ConfigProvider::class, + \Template\API\External\User\ConfigProvider::class, + \Template\API\External\Authentication\ConfigProvider::class, /// Internal diff --git a/config/pipeline.php b/config/pipeline.php index a6f193a..f9ee865 100644 --- a/config/pipeline.php +++ b/config/pipeline.php @@ -2,9 +2,9 @@ declare(strict_types=1); -use Homepage\Infrastructure\Exception\Middleware\HomepageExceptionHandlerMiddleware; -use Homepage\Infrastructure\Request\Middleware\AnalyzeHeaderMiddleware; -use Homepage\Infrastructure\Session\Middleware\SessionMiddleware; +use Template\Infrastructure\Exception\Middleware\TemplateExceptionHandlerMiddleware; +use Template\Infrastructure\Request\Middleware\AnalyzeHeaderMiddleware; +use Template\Infrastructure\Session\Middleware\SessionMiddleware; use Laminas\Stratigility\Middleware\ErrorHandler; use Mezzio\Application; use Mezzio\Handler\NotFoundHandler; @@ -66,11 +66,11 @@ return function (Application $app, MiddlewareFactory $factory, ContainerInterfac - //// Pre Homepage Space - $app->pipe(HomepageExceptionHandlerMiddleware::class); + //// Pre Template Space + $app->pipe(TemplateExceptionHandlerMiddleware::class); $app->pipe(AnalyzeHeaderMiddleware::class); - //// Homepage Space + //// Template Space $app->pipe(SessionMiddleware::class); diff --git a/config/routes.php b/config/routes.php index 8ea95f5..a2523a1 100644 --- a/config/routes.php +++ b/config/routes.php @@ -5,7 +5,7 @@ declare(strict_types=1); use Mezzio\Application; use Mezzio\MiddlewareFactory; use Psr\Container\ContainerInterface; -use Homepage\Infrastructure\Session\Middleware\LoggedInUserMiddleware; +use Template\Infrastructure\Session\Middleware\LoggedInUserMiddleware; /** * laminas-router route configuration diff --git a/data/migrations/homepage/Version20230922085011.php b/data/migrations/homepage/Version20230922085011.php index 2af462e..0784eb9 100644 --- a/data/migrations/homepage/Version20230922085011.php +++ b/data/migrations/homepage/Version20230922085011.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Homepage\Migrations\Homepage; +namespace Template\Migrations\Template; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; diff --git a/data/migrations/homepage/Version20230922092351.php b/data/migrations/homepage/Version20230922092351.php index 4bba491..ca2c727 100644 --- a/data/migrations/homepage/Version20230922092351.php +++ b/data/migrations/homepage/Version20230922092351.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Homepage\Migrations\Homepage; +namespace Template\Migrations\Template; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; diff --git a/data/migrations/homepage/Version20230922092754.php b/data/migrations/homepage/Version20230922092754.php index 1af30a8..2bbcb56 100644 --- a/data/migrations/homepage/Version20230922092754.php +++ b/data/migrations/homepage/Version20230922092754.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Homepage\Migrations\Homepage; +namespace Template\Migrations\Template; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; diff --git a/data/migrations/homepage/Version20230922101352.php b/data/migrations/homepage/Version20230922101352.php index c9d3fa3..44fe20f 100644 --- a/data/migrations/homepage/Version20230922101352.php +++ b/data/migrations/homepage/Version20230922101352.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Homepage\Migrations\Homepage; +namespace Template\Migrations\Template; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; diff --git a/data/migrations/homepage/Version20230922101354.php b/data/migrations/homepage/Version20230922101354.php index 246eef3..51cfcd8 100644 --- a/data/migrations/homepage/Version20230922101354.php +++ b/data/migrations/homepage/Version20230922101354.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Homepage\Migrations\Homepage; +namespace Template\Migrations\Template; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; diff --git a/data/migrations/homepage/Version20230922101355.php b/data/migrations/homepage/Version20230922101355.php index 4922356..296a9de 100644 --- a/data/migrations/homepage/Version20230922101355.php +++ b/data/migrations/homepage/Version20230922101355.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Homepage\Migrations\Homepage; +namespace Template\Migrations\Template; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; diff --git a/data/migrations/homepage/Version20230924113403.php b/data/migrations/homepage/Version20230924113403.php index 6f76185..40fe724 100644 --- a/data/migrations/homepage/Version20230924113403.php +++ b/data/migrations/homepage/Version20230924113403.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Homepage\Migrations\Homepage; +namespace Template\Migrations\Template; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; diff --git a/data/migrations/homepage/Version20231021103120.php b/data/migrations/homepage/Version20231021103120.php index e7a3cc7..5392834 100644 --- a/data/migrations/homepage/Version20231021103120.php +++ b/data/migrations/homepage/Version20231021103120.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Homepage\Migrations\Homepage; +namespace Template\Migrations\Template; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; diff --git a/data/migrations/homepage/Version20231021112654.php b/data/migrations/homepage/Version20231021112654.php index 619ea3b..efcc53d 100644 --- a/data/migrations/homepage/Version20231021112654.php +++ b/data/migrations/homepage/Version20231021112654.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Homepage\Migrations\Homepage; +namespace Template\Migrations\Template; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; diff --git a/data/migrations/log/Version20230922150649.php b/data/migrations/log/Version20230922150649.php index 4e5f169..bbc7eae 100644 --- a/data/migrations/log/Version20230922150649.php +++ b/data/migrations/log/Version20230922150649.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Homepage\Migrations\Log; +namespace Template\Migrations\Log; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; diff --git a/docker/docker-compose-mac.yml b/docker/docker-compose-mac.yml index c696adf..1f1da0c 100644 --- a/docker/docker-compose-mac.yml +++ b/docker/docker-compose-mac.yml @@ -1,18 +1,18 @@ version: '3' networks: - homepage: + template: external: true services: - homepage-backend-mysql: - image: homepage-backend-mysql + template-backend-mysql: + image: template-backend-mysql networks: - - homepage + - template build: context: ./../ dockerfile: ./docker/mysql/dockerfile volumes: - - /Users/flo/dev/backend/homepage/var/db:/var/lib/mysql:z + - /Users/flo/dev/backend/template/var/db:/var/lib/mysql:z environment: MYSQL_USER: ${DB_USER} MYSQL_PASSWORD: ${DB_PASSWORD} @@ -23,29 +23,29 @@ services: timeout: 20s retries: 10 - homepage-backend-app: - image: homepage-backend-app + template-backend-app: + image: template-backend-app networks: - - homepage + - template build: context: ./../ dockerfile: ./docker/php/dockerfile volumes: - - /Users/flo/dev/backend/homepage/:/var/www/html:z + - /Users/flo/dev/backend/template/:/var/www/html:z ports: - 9000:9000 depends_on: - homepage-backend-mysql: + template-backend-mysql: condition: service_healthy - homepage-backend-nginx: - image: homepage-backend-nginx + template-backend-nginx: + image: template-backend-nginx networks: - - homepage + - template build: context: ./../ dockerfile: ./docker/nginx/dockerfile ports: - 8080:80 depends_on: - - homepage-backend-app \ No newline at end of file + - template-backend-app \ No newline at end of file diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index b47faa1..094d233 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,13 +1,13 @@ version: '3' networks: - homepage: + template: external: true services: - homepage-backend-mysql: - image: homepage-backend-mysql + template-backend-mysql: + image: template-backend-mysql networks: - - homepage + - template build: context: ./../ dockerfile: ./docker/mysql/dockerfile @@ -23,10 +23,10 @@ services: timeout: 20s retries: 10 - homepage-backend-app: - image: homepage-backend-app + template-backend-app: + image: template-backend-app networks: - - homepage + - template build: context: ./../ dockerfile: ./docker/php/dockerfile @@ -35,17 +35,17 @@ services: ports: - 9000:9000 depends_on: - homepage-backend-mysql: + template-backend-mysql: condition: service_healthy - homepage-backend-nginx: - image: homepage-backend-nginx + template-backend-nginx: + image: template-backend-nginx networks: - - homepage + - template build: context: ./../ dockerfile: ./docker/nginx/dockerfile ports: - 8080:80 depends_on: - - homepage-backend-app \ No newline at end of file + - template-backend-app \ No newline at end of file diff --git a/docker/mysql/scripts/initdb.sql b/docker/mysql/scripts/initdb.sql index 3ce24b1..206f6e9 100644 --- a/docker/mysql/scripts/initdb.sql +++ b/docker/mysql/scripts/initdb.sql @@ -1,4 +1,4 @@ CREATE DATABASE IF NOT EXISTS `log`; -CREATE DATABASE IF NOT EXISTS `homepage`; +CREATE DATABASE IF NOT EXISTS `template`; -GRANT ALL PRIVILEGES on *.* to 'homepage'@'%'; \ No newline at end of file +GRANT ALL PRIVILEGES on *.* to 'template'@'%'; \ No newline at end of file diff --git a/docker/nginx/config/nginx.conf b/docker/nginx/config/nginx.conf index e915e62..16cb672 100644 --- a/docker/nginx/config/nginx.conf +++ b/docker/nginx/config/nginx.conf @@ -1,5 +1,5 @@ upstream host-backend-app { - server homepage-backend-app:9000; + server template-backend-app:9000; } server { diff --git a/src/ApiDomain/Console/config/console.php b/src/ApiDomain/Console/config/console.php index 0c04f3e..20093d4 100644 --- a/src/ApiDomain/Console/config/console.php +++ b/src/ApiDomain/Console/config/console.php @@ -1,7 +1,7 @@ [ diff --git a/src/ApiDomain/Console/config/service_manager.php b/src/ApiDomain/Console/config/service_manager.php index 8cc9544..9aa3afc 100644 --- a/src/ApiDomain/Console/config/service_manager.php +++ b/src/ApiDomain/Console/config/service_manager.php @@ -1,7 +1,7 @@ getName()); diff --git a/src/ApiDomain/Console/src/Command/RbacUpdateCommand.php b/src/ApiDomain/Console/src/Command/RbacUpdateCommand.php index 94b3f05..ebee2fb 100644 --- a/src/ApiDomain/Console/src/Command/RbacUpdateCommand.php +++ b/src/ApiDomain/Console/src/Command/RbacUpdateCommand.php @@ -1,13 +1,13 @@ getName()); @@ -32,7 +32,7 @@ class RbacUpdateCommand extends Command $this->roleRepository = $this->entityManager->getRepository(Role::class); $this->permissionRepository = $this->entityManager->getRepository(Permission::class); - $this->rbacConfig = $this->configService->resolve('homepage-rbac')->toArray(); + $this->rbacConfig = $this->configService->resolve('template-rbac')->toArray(); } protected function execute( diff --git a/src/ApiDomain/Console/src/ConfigProvider.php b/src/ApiDomain/Console/src/ConfigProvider.php index 8e145c3..e9a5efc 100644 --- a/src/ApiDomain/Console/src/ConfigProvider.php +++ b/src/ApiDomain/Console/src/ConfigProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Homepage\API\Console; +namespace Template\API\Console; class ConfigProvider { diff --git a/src/ApiDomain/External/Authentication/config/routes.php b/src/ApiDomain/External/Authentication/config/routes.php index 764ea59..b776574 100644 --- a/src/ApiDomain/External/Authentication/config/routes.php +++ b/src/ApiDomain/External/Authentication/config/routes.php @@ -1,10 +1,10 @@ 'product.product-list', - 'path' => '/api/product/product-list', - 'allowed_methods' => ['GET'], - 'middleware' => [ - LoggedInUserMiddleware::class, - EnsureAuthorizationMiddleware::class, - ProductListHandler::class - ], - ], - [ - 'name' => 'product.create-product', - 'path' => '/api/product/create-product', - 'allowed_methods' => ['POST'], - 'middleware' => [ - LoggedInUserMiddleware::class, - EnsureAuthorizationMiddleware::class, - CreateProductHandler::class - ], - ], - [ - 'name' => 'product.delete-product', - 'path' => '/api/product/delete-product', - 'allowed_methods' => ['POST'], - 'middleware' => [ - LoggedInUserMiddleware::class, - EnsureAuthorizationMiddleware::class, - DeleteProductHandler::class - ], - ], - [ - 'name' => 'product.update-product', - 'path' => '/api/product/update-product', - 'allowed_methods' => ['POST'], - 'middleware' => [ - LoggedInUserMiddleware::class, - EnsureAuthorizationMiddleware::class, - UpdateProductHandler::class - ], - ], -]; diff --git a/src/ApiDomain/External/Product/config/service_manager.php b/src/ApiDomain/External/Product/config/service_manager.php deleted file mode 100644 index 8c380b1..0000000 --- a/src/ApiDomain/External/Product/config/service_manager.php +++ /dev/null @@ -1,25 +0,0 @@ - [ - // Formatter - ProductFormatter::class => AutoWiringFactory::class, - ProductListFormatter::class => AutoWiringFactory::class, - - // Handler - ProductListHandler::class => AutoWiringFactory::class, - CreateProductHandler::class => AutoWiringFactory::class, - DeleteProductHandler::class => AutoWiringFactory::class, - UpdateProductHandler::class => AutoWiringFactory::class, - ], -] - -?> \ No newline at end of file diff --git a/src/ApiDomain/External/Product/src/ConfigProvider.php b/src/ApiDomain/External/Product/src/ConfigProvider.php deleted file mode 100644 index 4f5360e..0000000 --- a/src/ApiDomain/External/Product/src/ConfigProvider.php +++ /dev/null @@ -1,16 +0,0 @@ - require __DIR__ . '/./../config/service_manager.php', - 'routes' => require __DIR__ . '/./../config/routes.php', - ]; - } -} diff --git a/src/ApiDomain/External/Product/src/Formatter/ProductFormatter.php b/src/ApiDomain/External/Product/src/Formatter/ProductFormatter.php deleted file mode 100644 index 90fce79..0000000 --- a/src/ApiDomain/External/Product/src/Formatter/ProductFormatter.php +++ /dev/null @@ -1,20 +0,0 @@ - $product->getId()->toString(), - 'identifier' => $product->getIdentifier(), - 'name' => $product->getName(), - 'url' => $product->getUrl(), - 'created' => $product->getCreatedAt()->format(DateTime::ATOM), - 'updated' => $product->getUpdatedAt()->format(DateTime::ATOM) - ]; - } -} diff --git a/src/ApiDomain/External/Product/src/Formatter/ProductListFormatter.php b/src/ApiDomain/External/Product/src/Formatter/ProductListFormatter.php deleted file mode 100644 index 9348af2..0000000 --- a/src/ApiDomain/External/Product/src/Formatter/ProductListFormatter.php +++ /dev/null @@ -1,28 +0,0 @@ -productFormatter->format( - $product - ); - } - - return $list; - } -} - -?> \ No newline at end of file diff --git a/src/ApiDomain/External/Product/src/Handler/CreateProductHandler.php b/src/ApiDomain/External/Product/src/Handler/CreateProductHandler.php deleted file mode 100644 index 9268e62..0000000 --- a/src/ApiDomain/External/Product/src/Handler/CreateProductHandler.php +++ /dev/null @@ -1,41 +0,0 @@ -getBody()->getContents(), - true - ); - - $query = $this->builder->build( - $data['identifier'], - $data['name'] ?? null - ); - $result = $this->handler->execute($query); - - return new JsonResponse( - $this->productFormatter->format($result) - ); - } -} diff --git a/src/ApiDomain/External/Product/src/Handler/DeleteProductHandler.php b/src/ApiDomain/External/Product/src/Handler/DeleteProductHandler.php deleted file mode 100644 index cadd773..0000000 --- a/src/ApiDomain/External/Product/src/Handler/DeleteProductHandler.php +++ /dev/null @@ -1,38 +0,0 @@ -getBody()->getContents(), - true - ); - - $query = $this->builder->build( - $data['id'] - ); - $result = $this->handler->execute($query); - - return new JsonResponse("OK"); - } -} - -?> \ No newline at end of file diff --git a/src/ApiDomain/External/Product/src/Handler/ProductListHandler.php b/src/ApiDomain/External/Product/src/Handler/ProductListHandler.php deleted file mode 100644 index 5147ffd..0000000 --- a/src/ApiDomain/External/Product/src/Handler/ProductListHandler.php +++ /dev/null @@ -1,35 +0,0 @@ -builder->build( '*' ); - $result = $this->handler->execute($query); - - return new JsonResponse( - $this->productListFormatter->format($result) - ); - } -} - -?> \ No newline at end of file diff --git a/src/ApiDomain/External/Product/src/Handler/UpdateProductHandler.php b/src/ApiDomain/External/Product/src/Handler/UpdateProductHandler.php deleted file mode 100644 index e5a11f8..0000000 --- a/src/ApiDomain/External/Product/src/Handler/UpdateProductHandler.php +++ /dev/null @@ -1,43 +0,0 @@ -getBody()->getContents(), - true - ); - - $query = $this->builder->build( - $data['id'], - $data['identifier'], - $data['name'] ?? null, - $data['url'] ?? null - ); - $result = $this->handler->execute($query); - - return new JsonResponse( - $this->productFormatter->format($result) - ); - } -} diff --git a/src/ApiDomain/External/User/config/routes.php b/src/ApiDomain/External/User/config/routes.php index ce171c0..cdb3833 100644 --- a/src/ApiDomain/External/User/config/routes.php +++ b/src/ApiDomain/External/User/config/routes.php @@ -1,11 +1,11 @@ [ - 'orm_homepage' => [ + 'orm_template' => [ 'second_level_cache' => [ 'enabled' => false, ] @@ -14,7 +14,7 @@ return [ ], 'driver' => [ - 'orm_homepage_annotation_driver' => [ + 'orm_template_annotation_driver' => [ 'class' => AnnotationDriver::class, 'cache' => 'array', 'paths' => [ @@ -22,16 +22,16 @@ return [ ], ], - 'orm_homepage' => [ + 'orm_template' => [ 'class' => MappingDriverChain::class, 'drivers' => [ - 'Homepage\Data\Business\Entity' => 'orm_homepage_annotation_driver', + 'Template\Data\Business\Entity' => 'orm_template_annotation_driver', ], ], ], 'connection' => [ - 'orm_homepage' => [ + 'orm_template' => [ 'driverClass' => Driver::class, 'params' => [ 'driver' => $_ENV['DB_DRIVER'], @@ -45,10 +45,10 @@ return [ ], 'migrations_configuration' => [ - 'orm_homepage' => [ - 'directory' => 'data/migrations/homepage', - 'name' => 'Doctrine Database Migrations for Homepage', - 'namespace' => 'Homepage\Migrations\Homepage', + 'orm_template' => [ + 'directory' => 'data/migrations/template', + 'name' => 'Doctrine Database Migrations for Template', + 'namespace' => 'Template\Migrations\Template', 'table' => 'migrations', ], ], diff --git a/src/DataDomain/Business/config/service_manager.php b/src/DataDomain/Business/config/service_manager.php index fe73c8e..a4c36f2 100644 --- a/src/DataDomain/Business/config/service_manager.php +++ b/src/DataDomain/Business/config/service_manager.php @@ -1,21 +1,21 @@ [ - 'doctrine.entity_manager.orm_homepage' => [EntityManagerFactory::class, 'orm_homepage'], - 'doctrine.configuration.orm_homepage' => [ConfigurationFactory::class, 'orm_homepage'], - 'doctrine.connection.orm_homepage' => [ConnectionFactory::class, 'orm_homepage'], - HomepageEntityManager::class => HomepageEntityManagerFactory::class, + 'doctrine.entity_manager.orm_template' => [EntityManagerFactory::class, 'orm_template'], + 'doctrine.configuration.orm_template' => [ConfigurationFactory::class, 'orm_template'], + 'doctrine.connection.orm_template' => [ConnectionFactory::class, 'orm_template'], + TemplateEntityManager::class => TemplateEntityManagerFactory::class, - UserRepository::class => [AutowireRepositoryFactory::class, HomepageEntityManager::class, User::class], + UserRepository::class => [AutowireRepositoryFactory::class, TemplateEntityManager::class, User::class], ], ]; diff --git a/src/DataDomain/Business/src/ConfigProvider.php b/src/DataDomain/Business/src/ConfigProvider.php index eed4122..e3b2c68 100644 --- a/src/DataDomain/Business/src/ConfigProvider.php +++ b/src/DataDomain/Business/src/ConfigProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Homepage\Data\Business; +namespace Template\Data\Business; class ConfigProvider { diff --git a/src/DataDomain/Business/src/Entity/Permission.php b/src/DataDomain/Business/src/Entity/Permission.php index b6c762a..5db6c05 100644 --- a/src/DataDomain/Business/src/Entity/Permission.php +++ b/src/DataDomain/Business/src/Entity/Permission.php @@ -1,15 +1,15 @@ id = UuidGenerator::generate(); - - $now = new DateTime(); - $this->setCreatedAt($now); - $this->setUpdatedAt($now); - } - - - /** - * @ORM\PrePersist - * @ORM\PreUpdate - */ - public function updateTimestamps(): void { - $now = new DateTime(); - $this->setUpdatedAt($now); - } - - - public function getId(): UuidInterface { - return $this->id; - } - - public function getIdentifier(): string { - return $this->identifier; - } - - public function setIdentifier(string $identifier): void { - $this->identifier = $identifier; - } - - public function getName(): ?string { - return $this->name; - } - - public function setName(?string $name): void { - $this->name = $name; - } - - public function getUrl(): ?string { - return $this->url; - } - - public function setUrl(?string $url): void { - $this->url = $url; - } - - public function getCreatedAt(): DateTime { - return $this->createdAt; - } - - public function setCreatedAt(DateTime $createdAt): void { - $this->createdAt = $createdAt; - } - - public function getUpdatedAt(): DateTime { - return $this->updatedAt; - } - - public function setUpdatedAt(DateTime $updatedAt): void { - $this->updatedAt = $updatedAt; - } -} diff --git a/src/DataDomain/Business/src/Entity/Registration.php b/src/DataDomain/Business/src/Entity/Registration.php index b8c525b..08dace6 100644 --- a/src/DataDomain/Business/src/Entity/Registration.php +++ b/src/DataDomain/Business/src/Entity/Registration.php @@ -1,14 +1,14 @@ get('doctrine.entity_manager.orm_homepage') - ); - } -} diff --git a/src/DataDomain/Business/src/Factory/TemplateEntityManagerFactory.php b/src/DataDomain/Business/src/Factory/TemplateEntityManagerFactory.php new file mode 100644 index 0000000..5889a30 --- /dev/null +++ b/src/DataDomain/Business/src/Factory/TemplateEntityManagerFactory.php @@ -0,0 +1,19 @@ +get('doctrine.entity_manager.orm_template') + ); + } +} diff --git a/src/DataDomain/Business/src/Manager/HomepageEntityManager.php b/src/DataDomain/Business/src/Manager/HomepageEntityManager.php deleted file mode 100644 index 1488509..0000000 --- a/src/DataDomain/Business/src/Manager/HomepageEntityManager.php +++ /dev/null @@ -1,11 +0,0 @@ - [ 'class' => MappingDriverChain::class, 'drivers' => [ - 'Homepage\Data\Log\Entity' => 'orm_log_annotation_driver', + 'Template\Data\Log\Entity' => 'orm_log_annotation_driver', ], ], ], @@ -48,7 +48,7 @@ return [ 'orm_log' => [ 'directory' => 'data/migrations/log', 'name' => 'Doctrine Database Migrations for Log', - 'namespace' => 'Homepage\Migrations\Log', + 'namespace' => 'Template\Migrations\Log', 'table' => 'migrations', ], ], diff --git a/src/DataDomain/Log/config/service_manager.php b/src/DataDomain/Log/config/service_manager.php index ed24846..3357574 100644 --- a/src/DataDomain/Log/config/service_manager.php +++ b/src/DataDomain/Log/config/service_manager.php @@ -1,7 +1,7 @@ [ - HomepageExceptionHandlerMiddleware::class => AutoWiringFactory::class, + TemplateExceptionHandlerMiddleware::class => AutoWiringFactory::class, ], ]; diff --git a/src/Infrastructure/Exception/src/ConfigProvider.php b/src/Infrastructure/Exception/src/ConfigProvider.php index 61fddc9..96b4859 100644 --- a/src/Infrastructure/Exception/src/ConfigProvider.php +++ b/src/Infrastructure/Exception/src/ConfigProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Homepage\Infrastructure\Exception; +namespace Template\Infrastructure\Exception; class ConfigProvider { diff --git a/src/Infrastructure/Exception/src/ErrorCode.php b/src/Infrastructure/Exception/src/ErrorCode.php index e052ff0..72ad4d4 100644 --- a/src/Infrastructure/Exception/src/ErrorCode.php +++ b/src/Infrastructure/Exception/src/ErrorCode.php @@ -1,6 +1,6 @@ handle($request); - } catch (HomepageException $exception) { + } catch (TemplateException $exception) { $this->logger->exception($exception); return new ErrorResponse( diff --git a/src/Infrastructure/Logging/config/service_manager.php b/src/Infrastructure/Logging/config/service_manager.php index 56cff25..e31c445 100644 --- a/src/Infrastructure/Logging/config/service_manager.php +++ b/src/Infrastructure/Logging/config/service_manager.php @@ -2,19 +2,19 @@ declare(strict_types=1); -use Homepage\Infrastructure\Logging\Factory\FileStreamHandlerFactory; -use Homepage\Infrastructure\Logging\Factory\LoggerFactory; -use Homepage\Infrastructure\Logging\Factory\MonologLoggerFactory; -use Homepage\Infrastructure\Logging\Handler\DoctrineLogHandler; -use Homepage\Infrastructure\Logging\Handler\FileStreamHandler; -use Homepage\Infrastructure\Logging\Logger\Logger as HomepageLogger; +use Template\Infrastructure\Logging\Factory\FileStreamHandlerFactory; +use Template\Infrastructure\Logging\Factory\LoggerFactory; +use Template\Infrastructure\Logging\Factory\MonologLoggerFactory; +use Template\Infrastructure\Logging\Handler\DoctrineLogHandler; +use Template\Infrastructure\Logging\Handler\FileStreamHandler; +use Template\Infrastructure\Logging\Logger\Logger as TemplateLogger; use Monolog\Logger; use Monolog\Processor\PsrLogMessageProcessor; use Reinfi\DependencyInjection\Factory\AutoWiringFactory; return [ 'factories' => [ - HomepageLogger::class => LoggerFactory::class, + TemplateLogger::class => LoggerFactory::class, Logger::class => MonologLoggerFactory::class, FileStreamHandler::class => FileStreamHandlerFactory::class, DoctrineLogHandler::class => AutoWiringFactory::class, diff --git a/src/Infrastructure/Logging/src/ConfigProvider.php b/src/Infrastructure/Logging/src/ConfigProvider.php index 976efc4..7272673 100644 --- a/src/Infrastructure/Logging/src/ConfigProvider.php +++ b/src/Infrastructure/Logging/src/ConfigProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Homepage\Infrastructure\Logging; +namespace Template\Infrastructure\Logging; class ConfigProvider { diff --git a/src/Infrastructure/Logging/src/Factory/FileStreamHandlerFactory.php b/src/Infrastructure/Logging/src/Factory/FileStreamHandlerFactory.php index e037dfe..ff50634 100644 --- a/src/Infrastructure/Logging/src/Factory/FileStreamHandlerFactory.php +++ b/src/Infrastructure/Logging/src/Factory/FileStreamHandlerFactory.php @@ -1,8 +1,8 @@ get(Logger::class) ); } diff --git a/src/Infrastructure/Logging/src/Factory/MonologLoggerFactory.php b/src/Infrastructure/Logging/src/Factory/MonologLoggerFactory.php index 0605f6b..a493539 100644 --- a/src/Infrastructure/Logging/src/Factory/MonologLoggerFactory.php +++ b/src/Infrastructure/Logging/src/Factory/MonologLoggerFactory.php @@ -1,9 +1,9 @@ $exception->getTraceAsString() ]*/; - if ($exception instanceof HomepageException) { + if ($exception instanceof TemplateException) { $exceptionContext = array_merge([ 'errorDomain' => $exception->getErrorDomain()->value, 'errorCode' => $exception->getErrorCode()->value, diff --git a/src/Infrastructure/Rbac/config/service_manager.php b/src/Infrastructure/Rbac/config/service_manager.php index a677c9d..b231742 100644 --- a/src/Infrastructure/Rbac/config/service_manager.php +++ b/src/Infrastructure/Rbac/config/service_manager.php @@ -2,7 +2,7 @@ declare(strict_types=1); -use Homepage\Infrastructure\Rbac\Middleware\EnsureAuthorizationMiddleware; +use Template\Infrastructure\Rbac\Middleware\EnsureAuthorizationMiddleware; use Reinfi\DependencyInjection\Factory\InjectionFactory; return [ diff --git a/src/Infrastructure/Rbac/src/ConfigProvider.php b/src/Infrastructure/Rbac/src/ConfigProvider.php index 29f2bf6..582ca7d 100644 --- a/src/Infrastructure/Rbac/src/ConfigProvider.php +++ b/src/Infrastructure/Rbac/src/ConfigProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Homepage\Infrastructure\Rbac; +namespace Template\Infrastructure\Rbac; class ConfigProvider { diff --git a/src/Infrastructure/Rbac/src/Middleware/EnsureAuthorizationMiddleware.php b/src/Infrastructure/Rbac/src/Middleware/EnsureAuthorizationMiddleware.php index ad5fa20..d3b9581 100644 --- a/src/Infrastructure/Rbac/src/Middleware/EnsureAuthorizationMiddleware.php +++ b/src/Infrastructure/Rbac/src/Middleware/EnsureAuthorizationMiddleware.php @@ -1,11 +1,11 @@ get(ConfigService::class); - $apiKey = $configService->resolve("api.keys.homepage"); + $apiKey = $configService->resolve("api.keys.template"); return new RequestService( $apiKey, diff --git a/src/Infrastructure/Request/src/Middleware/AnalyzeHeaderMiddleware.php b/src/Infrastructure/Request/src/Middleware/AnalyzeHeaderMiddleware.php index 64d7220..129efc5 100644 --- a/src/Infrastructure/Request/src/Middleware/AnalyzeHeaderMiddleware.php +++ b/src/Infrastructure/Request/src/Middleware/AnalyzeHeaderMiddleware.php @@ -1,11 +1,11 @@ userSessionRepository = $this->entityManager->getRepository(UserSession::class); diff --git a/src/Infrastructure/UuidGenerator/src/UuidGenerator.php b/src/Infrastructure/UuidGenerator/src/UuidGenerator.php index 3e85b2b..bde82b3 100644 --- a/src/Infrastructure/UuidGenerator/src/UuidGenerator.php +++ b/src/Infrastructure/UuidGenerator/src/UuidGenerator.php @@ -1,6 +1,6 @@