Merge pull request #9 from wayofdev/feat/labels

Makefile

@@ -124,7 +124,7 @@ prepare:
 # ------------------------------------------------------------------------------------
 up: # Creates and starts containers, defined in docker-compose and override file
 	$(DOCKER_COMPOSE) up --remove-orphans -d
-	$(DOCKER_COMPOSE) exec app wait4x tcp database:5432 -t 1m
+	$(DOCKER_COMPOSE) exec app wait4x postgresql 'postgres://${DB_USERNAME}:${DB_PASSWORD}@database:5432/${DB_DATABASE}?sslmode=disable' -t 1m
 .PHONY: up
 
 down: # Stops and removes containers of this project

app/config/auth.php

@@ -52,14 +52,9 @@
      */
     'providers' => [
         'users' => [
-            'driver' => 'eloquent',
-            'model' => \Domain\User\Models\User::class,
+            'driver' => 'database',
+            'table' => 'users',
         ],
-
-        // 'users' => [
-        //     'driver' => 'database',
-        //     'table' => 'users',
-        // ],
     ],
 
     /*

app/config/cycle.php

@@ -0,0 +1,238 @@
+<?php
+
+declare(strict_types=1);
+
+use Cycle\Annotated;
+use Cycle\Database\Config;
+use Cycle\Database\Driver;
+use Cycle\ORM\Collection;
+use Cycle\ORM\SchemaInterface;
+use Cycle\Schema;
+use WayOfDev\Cycle\Contracts\GeneratorLoader;
+
+return [
+    /*
+     * Where ClassLocator should search for entities and embeddings.
+     * Important: By default, Laravel's application skeleton has its Model classes in the app/Models folder.
+     * With Cycle you'll need to create a dedicated folder for your Entities and point your config/cycle.php
+     * paths array to it. If you don't, Cycle will scan your whole app/ folder for files,
+     * which will have a huge impact on performance!
+     */
+    'tokenizer' => [
+        /*
+         * Where should class locator scan for entities?
+         */
+        'directories' => [
+            __DIR__ . '/../src/Domain',
+        ],
+
+        /*
+         * Directories, to exclude from Entity search
+         */
+        'exclude' => [
+            'Console',
+            'Exceptions',
+            'Http',
+            'Providers',
+        ],
+
+        /*
+         * Scopes to use when searching for entities
+         */
+        'scopes' => [],
+
+        /*
+         * Should class locator scan for entities in debug mode?
+         */
+        'debug' => env('APP_DEBUG', false),
+
+        /*
+         * Should class locator cache the results?
+         */
+        'cache' => [
+            'directory' => null,
+            'enabled' => false,
+        ],
+    ],
+
+    'database' => [
+        /*
+         * Default database connection
+         */
+        'default' => env('DB_DEFAULT_CONNECTION', 'default'),
+
+        /*
+         * The Cycle/Database module provides support to manage multiple databases
+         * in one application, use read/write connections and logically separate
+         * multiple databases within one connection using prefixes.
+         *
+         * To register a new database simply add a new one into
+         * "databases" section below.
+         */
+        'databases' => [
+            'default' => [
+                'driver' => env('DB_CONNECTION', 'sqlite'),
+            ],
+        ],
+
+        /*
+         * Configuring connections, see:
+         * https://cycle-orm.dev/docs/database-connect/2.x/en
+         *
+         * Each database instance must have an associated connection object.
+         * Connections used to provide low-level functionality and wrap different
+         * database drivers. To register a new connection you have to specify
+         * the driver class and its connection options.
+         */
+        'drivers' => [
+            /*
+             * Setup sqlite database in-memory for testing purposes
+             */
+            'sqlite' => new Config\SQLiteDriverConfig(
+                connection: new Config\SQLite\MemoryConnectionConfig(),
+                queryCache: true
+            ),
+
+            'pgsql' => new Config\PostgresDriverConfig(
+                connection: new Config\Postgres\TcpConnectionConfig(
+                    database: env('DB_DATABASE', 'wod'),
+                    host: env('DB_HOST', '127.0.0.1'),
+                    port: env('DB_PORT', 5432),
+                    user: env('DB_USERNAME', 'wod'),
+                    password: env('DB_PASSWORD', '')
+                ),
+                schema: Config\PostgresDriverConfig::DEFAULT_SCHEMA,
+                driver: Driver\Postgres\PostgresDriver::class,
+                reconnect: true,
+                timezone: 'UTC',
+                queryCache: true
+            ),
+
+            'mysql' => new Config\MySQLDriverConfig(
+                connection: new Config\MySQL\TcpConnectionConfig(
+                    database: env('DB_DATABASE', 'wod'),
+                    host: env('DB_HOST', '127.0.0.1'),
+                    port: env('DB_PORT', 3306),
+                    user: env('DB_USERNAME', 'wod'),
+                    password: env('DB_PASSWORD', '')
+                ),
+                driver: Driver\MySQL\MySQLDriver::class,
+                reconnect: true,
+                timezone: 'UTC',
+                queryCache: true,
+            ),
+
+            'sqlserver' => new Config\SQLServerDriverConfig(
+                connection: new Config\SQLServer\TcpConnectionConfig(
+                    database: env('DB_DATABASE', 'wod'),
+                    host: env('DB_HOST', '127.0.0.1'),
+                    port: env('DB_PORT', 1433),
+                    user: env('DB_USERNAME', 'wod'),
+                    password: env('DB_PASSWORD', '')
+                ),
+                driver: Driver\SQLServer\SQLServerDriver::class,
+                reconnect: true,
+                timezone: 'UTC',
+                queryCache: true,
+            ),
+        ],
+    ],
+
+    'schema' => [
+        /*
+         * true (Default) - Schema will be stored in a cache after compilation.
+         * It won't be changed after entity modification. Use `php app.php cycle` to update schema.
+         *
+         * false - Schema won't be stored in a cache after compilation.
+         * It will be automatically changed after entity modification. (Development mode)
+         */
+        'cache' => [
+            'enabled' => env('CYCLE_SCHEMA_CACHE', true),
+            'store' => env('CACHE_DRIVER', 'file'),
+        ],
+
+        /*
+         * The CycleORM provides the ability to manage default settings for
+         * every schema with not defined segments
+         */
+        'defaults' => [
+            SchemaInterface::MAPPER => \Cycle\ORM\Mapper\Mapper::class,
+            SchemaInterface::REPOSITORY => \Cycle\ORM\Select\Repository::class,
+            SchemaInterface::SCOPE => null,
+            SchemaInterface::TYPECAST_HANDLER => [
+                // \Cycle\ORM\Parser\Typecast::class,  \App\Infrastructure\CycleORM\Typecaster\UuidTypecast::class,
+            ],
+        ],
+
+        'collections' => [
+            'default' => env('DB_DEFAULT_COLLECTION', 'illuminate'),
+            'factories' => [
+                'array' => Collection\ArrayCollectionFactory::class,
+                'illuminate' => Collection\IlluminateCollectionFactory::class,
+                'doctrine' => Collection\DoctrineCollectionFactory::class,
+            ],
+        ],
+
+        /*
+         * Schema generators (Optional)
+         * null (default) - Will be used schema generators defined in bootloaders
+         */
+        'generators' => [
+            GeneratorLoader::GROUP_INDEX => [
+                // Register embeddable entities
+                Annotated\Embeddings::class,
+                // Register annotated entities
+                Annotated\Entities::class,
+                // Register STI/JTI
+                Annotated\TableInheritance::class,
+                // Add @Table column declarations
+                Annotated\MergeColumns::class,
+            ],
+            GeneratorLoader::GROUP_RENDER => [
+                // Re-declared table schemas (remove columns)
+                Schema\Generator\ResetTables::class,
+                // Generate entity relations
+                Schema\Generator\GenerateRelations::class,
+                // Generate changes from schema modifiers
+                Schema\Generator\GenerateModifiers::class,
+                // Make sure all entity schemas are correct
+                Schema\Generator\ValidateEntities::class,
+                // Declare table schemas
+                Schema\Generator\RenderTables::class,
+                // Declare relation keys and indexes
+                Schema\Generator\RenderRelations::class,
+                // Render all schema modifiers
+                Schema\Generator\RenderModifiers::class,
+                // Add @Table column declarations
+                Annotated\MergeIndexes::class,
+            ],
+            GeneratorLoader::GROUP_POSTPROCESS => [
+                // Typecast non string columns
+                Schema\Generator\GenerateTypecast::class,
+            ],
+        ],
+    ],
+
+    'migrations' => [
+        'directory' => database_path('migrations/cycle'),
+
+        'table' => env('DB_MIGRATIONS_TABLE', 'cycle_migrations'),
+
+        'safe' => env('APP_ENV') !== 'production',
+    ],
+
+    /*
+     * Enable schema cache warmup
+     */
+    'warmup' => env('CYCLE_SCHEMA_WARMUP', false),
+
+    /*
+     * Custom relation types for entities
+     */
+    'customRelations' => [
+        // \Cycle\ORM\Relation::EMBEDDED => [
+        //     \Cycle\ORM\Config\RelationConfig::LOADER => \Cycle\ORM\Select\Loader\EmbeddedLoader::class,
+        //     \Cycle\ORM\Config\RelationConfig::RELATION => \Cycle\ORM\Relation\Embedded::class,
+        // ],
+    ],
+];

app/database/migrations/cycle/20230517.185454_0_0_default_create_roles_create_users.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Migration;
+
+use Cycle\Migrations\Migration;
+
+class OrmDefault9296507f0aee2fd6fb380d0901b971a3 extends Migration
+{
+    protected const DATABASE = 'default';
+
+    public function up(): void
+    {
+        $this->table('users')
+            ->addColumn('incremental_id', 'bigInteger', ['nullable' => false, 'default' => null])
+            ->addColumn('email', 'string', ['nullable' => true, 'default' => null, 'size' => 255])
+            ->addColumn('company', 'string', ['nullable' => true, 'default' => null, 'size' => 255])
+            ->addColumn('name', 'string', ['nullable' => false, 'default' => null, 'size' => 255])
+            ->setPrimaryKeys(['incremental_id'])
+            ->create();
+        $this->table('roles')
+            ->addColumn('id', 'primary', ['nullable' => false, 'default' => null])
+            ->addColumn('name', 'string', ['nullable' => false, 'default' => null, 'size' => 255])
+            ->addColumn('user_incrementalId', 'bigInteger', ['nullable' => false, 'default' => null])
+            ->addIndex(['user_incrementalId'], ['name' => 'roles_index_user_incrementalid_646522feb8e5f', 'unique' => false])
+            ->addForeignKey(['user_incrementalId'], 'users', ['incremental_id'], [
+                'name' => 'roles_foreign_user_incrementalid_646522feb8e6c',
+                'delete' => 'CASCADE',
+                'update' => 'CASCADE',
+                'indexCreate' => true,
+            ])
+            ->setPrimaryKeys(['id'])
+            ->create();
+    }
+
+    public function down(): void
+    {
+        $this->table('roles')->drop();
+        $this->table('users')->drop();
+    }
+}

app/src/Bridge/Laravel/Providers/RouteServiceProvider.php

@@ -27,7 +27,7 @@ final class RouteServiceProvider extends ServiceProvider
     public function boot(): void
     {
         RateLimiter::for('api', function (Request $request) {
-            return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
+            return Limit::perMinute(60)->by($request->user()?->incrementalId ?: $request->ip());
         });
 
         $this->routes(function (): void {

app/src/Domain/Role/Role.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Domain\Role;
+
+use Cycle\Annotated\Annotation\Column;
+use Cycle\Annotated\Annotation\Entity;
+
+#[Entity(repository: RoleRepository::class)]
+class Role
+{
+    #[Column(type: 'primary')]
+    public int $id;
+
+    #[Column(type: 'string')]
+    public string $name;
+
+    public function __construct(string $name)
+    {
+        $this->name = $name;
+    }
+}

app/src/Domain/Role/RoleRepository.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Domain\Role;
+
+use Cycle\ORM\RepositoryInterface;
+
+interface RoleRepository extends RepositoryInterface
+{
+    public function findById(string $id): ?object;
+}