Small improvements for uuid, updated docs and composer dependencies.

Author: DKravtsov

composer.json

@@ -14,7 +14,7 @@
 		"Elasticsearch"
 	],
 	"homepage": "https://github.com/systemsdk/docker-symfony-api",
-	"version": "v1.3.0",
+	"version": "v1.3.1",
 	"license": "MIT",
 	"authors": [
 		{

composer.lock

@@ -77,5 +77,5 @@ doctrine:
                         datesub: DoctrineExtensions\Query\Mysql\DateSub
                         now: DoctrineExtensions\Query\Mysql\Now
                     string_functions:
-                        uuid_to_ouuid: App\General\Infrastructure\DQL\UuidToOuuid
-                        ouuid_to_uuid: App\General\Infrastructure\DQL\OuuidToUuid
+                        uuid_o_t_to_bin: App\General\Infrastructure\DQL\UuidOTToBin
+                        bin_to_uuid_o_t: App\General\Infrastructure\DQL\BinToUuidOT

config/packages/doctrine.yaml

@@ -34,6 +34,11 @@ know anything about other layers (Application/Infrastructure) or framework. In t
 for such components like Doctrine/Swagger/Serializer/Validator (for the first time) and you can find such
 dependencies inside Entities.
 
+Within this application we are using uuid v1 for the primary key inside Entities. Also we have id field as
+binary type ([details](https://uuid.ramsey.dev/en/stable/database.html#using-as-a-primary-key)). If you need to convert
+id into bin or from bin to string inside query, please use already existing dql functions `uuid_o_t_to_bin` and `bin_to_uuid_o_t`.
+For instance `... WHERE id = uuid_o_t_to_bin(:id)`, or when you need to convert uuid binary ordered time into string representative `... WHERE bin_to_uuid_o_t(id) = :id`.
+
 #### Repositories
 Repositories need to be responsible for parameter handling and query builder callbacks/joins. Should be located on
 infrastructure layer. Parameter handling can help with generic REST queries.

docs/development.md

@@ -13,8 +13,8 @@ Once your messages have been routed, it will be consumed. In case any issue just
 ### Message and Handler
 Before you can send a message, you must create it first. In order to do something when your message is dispatched, you need to create a message handler. Please follow docs in order to implement it:
 
-* [Message](https://symfony.com/doc/current/messenger.html#message)
-* [Handler](https://symfony.com/doc/current/messenger.html#registering-handlers)
+* [Message](https://symfony.com/doc/current/messenger.html#creating-a-message-handler)
+* [Handler](https://symfony.com/doc/current/messenger.html#creating-a-message-handler)
 
 ## RabbitMQ Management HTTP API
 When activated, the management plugin provides an HTTP API at http://server-name:15672/api/ by default. Browse to that location for more information on the API. For convenience the same API reference is available from GitHub:

docs/messenger.md

@@ -274,33 +274,6 @@ public function up(Schema $schema): void
         $this->addSql('ALTER TABLE user_group ADD CONSTRAINT FK_8F02BF9D57698A6A FOREIGN KEY (role) REFERENCES role (role) ON DELETE CASCADE');
         $this->addSql('ALTER TABLE user_group ADD CONSTRAINT FK_8F02BF9DB03A8386 FOREIGN KEY (created_by_id) REFERENCES user (id) ON DELETE SET NULL');
         $this->addSql('ALTER TABLE user_group ADD CONSTRAINT FK_8F02BF9D896DBBDE FOREIGN KEY (updated_by_id) REFERENCES user (id) ON DELETE SET NULL');
-
-        $sqlFunctions = <<<SQL
-DROP FUNCTION IF EXISTS ouuid_to_uuid;
-CREATE
-  FUNCTION ouuid_to_uuid(uuid BINARY(16))
-  RETURNS VARCHAR(36) CHARSET utf8mb4 COLLATE utf8mb4_general_ci
-  DETERMINISTIC
-  RETURN LOWER(CONCAT(
-  SUBSTR(HEX(uuid), 9, 8), '-',
-  SUBSTR(HEX(uuid), 5, 4), '-',
-  SUBSTR(HEX(uuid), 1, 4), '-',
-  SUBSTR(HEX(uuid), 17,4), '-',
-  SUBSTR(HEX(uuid), 21, 12 )
-));
-DROP FUNCTION IF EXISTS uuid_to_ouuid;
-CREATE
-  FUNCTION uuid_to_ouuid(uuid BINARY(36))
-  RETURNS binary(16) DETERMINISTIC
-  RETURN UNHEX(CONCAT(
-  SUBSTR(uuid, 15, 4),
-  SUBSTR(uuid, 10, 4),
-  SUBSTR(uuid, 1, 8),
-  SUBSTR(uuid, 20, 4),
-  SUBSTR(uuid, 25, 12)
-));
-SQL;
-        $this->addSql($sqlFunctions);
     }
 
     /**
@@ -345,8 +318,5 @@ public function down(Schema $schema): void
         $this->addSql('DROP TABLE user');
         $this->addSql('DROP TABLE user_has_user_group');
         $this->addSql('DROP TABLE user_group');
-
-        $this->addSql('DROP FUNCTION ouuid_to_uuid');
-        $this->addSql('DROP FUNCTION uuid_to_ouuid');
     }
 }

migrations/Version20211001194001.php

@@ -11,11 +11,11 @@
 use Doctrine\ORM\Query\SqlWalker;
 
 /**
- * Class OuuidToUuid
+ * Class BinToUuidOT
  *
  * @package App\General
  */
-class OuuidToUuid extends FunctionNode
+class BinToUuidOT extends FunctionNode
 {
     public mixed $value;
 
@@ -32,6 +32,6 @@ public function parse(Parser $parser): void
 
     public function getSql(SqlWalker $sqlWalker): string
     {
-        return 'ouuid_to_uuid(' . $this->value->dispatch($sqlWalker) . ')';
+        return 'BIN_TO_UUID(' . $this->value->dispatch($sqlWalker) . ', 1)';
     }
 }