Added commands and orm annotations

Author: alejandro-yakovlev

.github/workflows/test.yml

@@ -2,7 +2,7 @@ name: 'Test'
 
 on:
   push:
-#  pull_request:
+  pull_request:
 
 jobs:
   analyse:

config/packages/doctrine.yaml

@@ -27,6 +27,12 @@ doctrine:
                 dir: '%kernel.project_dir%/src/Skills/Infrastructure/Database/ORM/Aggregate'
                 prefix: 'App\Skills\Domain\Aggregate'
                 alias: Skills
+            Testing:
+                is_bundle: false
+                type: xml
+                dir: '%kernel.project_dir%/src/Testing/Infrastructure/Database/ORM/Aggregate'
+                prefix: 'App\Testing\Domain\Aggregate'
+                alias: Testing
 
 #when@test:
 #    doctrine:

deptrac-modules.yaml

@@ -9,10 +9,6 @@ parameters:
       collectors:
         - type: directory
           regex: /src/Shared/.*
-    - name: Company
-      collectors:
-        - type: directory
-          regex: /src/Company/.*
     - name: Skills
       collectors:
         - type: directory
@@ -26,8 +22,6 @@ parameters:
         - type: directory
           regex: /src/Users/.*
   ruleset:
-    Company:
-      - Shared
     Skills:
       - Shared
     Testing:

src/Company/Domain/Entity/Company/Company.php

@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Shared\Infrastructure\Database\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20231114004337 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE TABLE testing_answer_option (id VARCHAR(26) NOT NULL, question_id VARCHAR(26) DEFAULT NULL, description VARCHAR(255) NOT NULL, correct BOOLEAN NOT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_62DD1EDE1E27F6BF ON testing_answer_option (question_id)');
+        $this->addSql('CREATE TABLE testing_question (id VARCHAR(26) NOT NULL, test_id VARCHAR(26) DEFAULT NULL, name VARCHAR(255) NOT NULL, description VARCHAR(255) NOT NULL, position_number INT DEFAULT NULL, published BOOLEAN NOT NULL, type VARCHAR(255) NOT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_804A23011E5D0459 ON testing_question (test_id)');
+        $this->addSql('CREATE TABLE testing_test (id VARCHAR(26) NOT NULL, owner_id VARCHAR(26) NOT NULL, name VARCHAR(255) NOT NULL, description VARCHAR(255) NOT NULL, correct_answers_percentage INT DEFAULT 0 NOT NULL, published BOOLEAN NOT NULL, skill_id VARCHAR(26) DEFAULT NULL, difficulty_level VARCHAR(255) NOT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, deleted_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE UNIQUE INDEX UNIQ_8F8FA01C5E237E06 ON testing_test (name)');
+        $this->addSql('COMMENT ON COLUMN testing_test.created_at IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN testing_test.updated_at IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN testing_test.deleted_at IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('CREATE TABLE testing_testing_session (id VARCHAR(26) NOT NULL, test_id VARCHAR(26) DEFAULT NULL, user_id VARCHAR(26) NOT NULL, correct_answers_percentage INT DEFAULT 0 NOT NULL, is_passed_successfully BOOLEAN NOT NULL, started_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, completed_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_485F2E0A1E5D0459 ON testing_testing_session (test_id)');
+        $this->addSql('COMMENT ON COLUMN testing_testing_session.started_at IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN testing_testing_session.completed_at IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('CREATE TABLE testing_user_answer (id VARCHAR(26) NOT NULL, testing_session_id VARCHAR(26) DEFAULT NULL, question_id VARCHAR(26) DEFAULT NULL, answered_options TEXT DEFAULT \'[]\' NOT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_EE8BD7CFBBB901EE ON testing_user_answer (testing_session_id)');
+        $this->addSql('CREATE INDEX IDX_EE8BD7CF1E27F6BF ON testing_user_answer (question_id)');
+        $this->addSql('COMMENT ON COLUMN testing_user_answer.answered_options IS \'(DC2Type:array)\'');
+        $this->addSql('ALTER TABLE testing_answer_option ADD CONSTRAINT FK_62DD1EDE1E27F6BF FOREIGN KEY (question_id) REFERENCES testing_question (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE testing_question ADD CONSTRAINT FK_804A23011E5D0459 FOREIGN KEY (test_id) REFERENCES testing_test (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE testing_testing_session ADD CONSTRAINT FK_485F2E0A1E5D0459 FOREIGN KEY (test_id) REFERENCES testing_test (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE testing_user_answer ADD CONSTRAINT FK_EE8BD7CFBBB901EE FOREIGN KEY (testing_session_id) REFERENCES testing_testing_session (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE testing_user_answer ADD CONSTRAINT FK_EE8BD7CF1E27F6BF FOREIGN KEY (question_id) REFERENCES testing_question (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE SCHEMA public');
+        $this->addSql('ALTER TABLE testing_answer_option DROP CONSTRAINT FK_62DD1EDE1E27F6BF');
+        $this->addSql('ALTER TABLE testing_question DROP CONSTRAINT FK_804A23011E5D0459');
+        $this->addSql('ALTER TABLE testing_testing_session DROP CONSTRAINT FK_485F2E0A1E5D0459');
+        $this->addSql('ALTER TABLE testing_user_answer DROP CONSTRAINT FK_EE8BD7CFBBB901EE');
+        $this->addSql('ALTER TABLE testing_user_answer DROP CONSTRAINT FK_EE8BD7CF1E27F6BF');
+        $this->addSql('DROP TABLE testing_answer_option');
+        $this->addSql('DROP TABLE testing_question');
+        $this->addSql('DROP TABLE testing_test');
+        $this->addSql('DROP TABLE testing_testing_session');
+        $this->addSql('DROP TABLE testing_user_answer');
+    }
+}

src/Company/Domain/Entity/Company/ContactPerson.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Shared\Infrastructure\Database\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20231114221513 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE testing_testing_session ALTER is_passed_successfully DROP NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE SCHEMA public');
+        $this->addSql('ALTER TABLE testing_testing_session ALTER is_passed_successfully SET NOT NULL');
+    }
+}

src/Shared/Domain/Entity/Aggregate.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Shared\Infrastructure\Database\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20231114224929 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE TABLE skills_skill_confirmation (id VARCHAR(26) NOT NULL, specialist_id VARCHAR(26) DEFAULT NULL, skill_id VARCHAR(26) DEFAULT NULL, level VARCHAR(50) NOT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_722F1C197B100C1A ON skills_skill_confirmation (specialist_id)');
+        $this->addSql('CREATE INDEX IDX_722F1C195585C142 ON skills_skill_confirmation (skill_id)');
+        $this->addSql('CREATE TABLE skills_skill_confirmation_proof (id VARCHAR(26) NOT NULL, skill_confirmation_id VARCHAR(26) DEFAULT NULL, test_id VARCHAR(26) NOT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_5F2C86C75D6D96DB ON skills_skill_confirmation_proof (skill_confirmation_id)');
+        $this->addSql('ALTER TABLE skills_skill_confirmation ADD CONSTRAINT FK_722F1C197B100C1A FOREIGN KEY (specialist_id) REFERENCES skills_specialist (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE skills_skill_confirmation ADD CONSTRAINT FK_722F1C195585C142 FOREIGN KEY (skill_id) REFERENCES skills_skill (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE skills_skill_confirmation_proof ADD CONSTRAINT FK_5F2C86C75D6D96DB FOREIGN KEY (skill_confirmation_id) REFERENCES skills_skill_confirmation (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE SCHEMA public');
+        $this->addSql('ALTER TABLE skills_skill_confirmation DROP CONSTRAINT FK_722F1C197B100C1A');
+        $this->addSql('ALTER TABLE skills_skill_confirmation DROP CONSTRAINT FK_722F1C195585C142');
+        $this->addSql('ALTER TABLE skills_skill_confirmation_proof DROP CONSTRAINT FK_5F2C86C75D6D96DB');
+        $this->addSql('DROP TABLE skills_skill_confirmation');
+        $this->addSql('DROP TABLE skills_skill_confirmation_proof');
+    }
+}

src/Shared/Infrastructure/Database/Migrations/Version20231114004337.php

@@ -6,8 +6,8 @@
 
 use App\Shared\Domain\Security\AuthUserInterface;
 use App\Shared\Domain\Security\UserFetcherInterface;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-use Symfony\Component\Security\Core\Security;
 use Webmozart\Assert\Assert;
 
 readonly class UserFetcher implements UserFetcherInterface

src/Shared/Infrastructure/Database/Migrations/Version20231114221513.php

@@ -8,19 +8,12 @@
 use App\Shared\Domain\Security\UserFetcherInterface;
 use App\Shared\Domain\Service\AssertService;
 use App\Skills\Application\Shared\Service\AccessControl\SkillAccessControl;
-use App\Skills\Domain\Aggregate\Speciality\Level;
-use App\Skills\Domain\Aggregate\Speciality\SpecialitySkill;
-use App\Skills\Domain\Repository\SpecialitySkillRepositoryInterface;
-use App\Skills\Domain\Service\SkillFetcher;
-use App\Skills\Domain\Service\SpecialityFetcher;
-use Webmozart\Assert\Assert;
+use App\Skills\Domain\Service\SpecialitySkillOrganizer;
 
 readonly class AddSkillToSpecialityCommandHandler implements CommandHandlerInterface
 {
     public function __construct(
-        private SkillFetcher $skillFetcher,
-        private SpecialityFetcher $specialityFetcher,
-        private SpecialitySkillRepositoryInterface $specialitySkillRepository,
+        private SpecialitySkillOrganizer $specialitySkillOrganizer,
         private SkillAccessControl $skillAccessControl,
         private UserFetcherInterface $userFetcher,
     ) {
@@ -38,15 +31,11 @@ public function __invoke(AddSkillToSpecialityCommand $command): AddSkillToSpecia
             'Запрещено'
         );
 
-        $skill = $this->skillFetcher->getRequiredSkill($command->skillId);
-        $speciality = $this->specialityFetcher->getRequiredSpeciality($command->specialityId);
-
-        $existingSpecialitySkill = $this->specialitySkillRepository
-            ->findOneBySpecialityAndSkill($speciality->getId(), $skill->getId());
-        Assert::null($existingSpecialitySkill, 'Навык уже добавлен');
-
-        $specialitySkill = new SpecialitySkill($speciality, $skill, Level::from($command->level));
-        $this->specialitySkillRepository->add($specialitySkill);
+        $specialitySkill = $this->specialitySkillOrganizer->addSkillToSpeciality(
+            $command->skillId,
+            $command->specialityId,
+            $command->level
+        );
 
         return new AddSkillToSpecialityCommandResult($specialitySkill->getId());
     }

src/Shared/Infrastructure/Database/Migrations/Version20231114224929.php

@@ -6,32 +6,23 @@
 
 use App\Shared\Application\Command\CommandHandlerInterface;
 use App\Shared\Domain\Security\UserFetcherInterface;
-use App\Skills\Domain\Factory\SkillFactory;
-use App\Skills\Domain\Repository\SkillGroupRepositoryInterface;
-use App\Skills\Domain\Repository\SkillRepositoryInterface;
-use Webmozart\Assert\Assert;
+use App\Skills\Domain\Service\SkillMaker;
 
 readonly class CreateSkillCommandHandler implements CommandHandlerInterface
 {
     public function __construct(
-        private SkillGroupRepositoryInterface $skillGroupRepository,
-        private SkillRepositoryInterface $skillRepository,
-        private SkillFactory $skillFactory,
+        private SkillMaker $skillMaker,
         private UserFetcherInterface $userFetcher
     ) {
     }
 
     public function __invoke(CreateSkillCommand $command): CreateSkillCommandResult
     {
-        $skillGroup = $this->skillGroupRepository->findOneById($command->skillGroupId);
-        Assert::notNull($skillGroup, 'Группа навыков не найдена');
-
-        $skill = $this->skillFactory->create(
+        $skill = $this->skillMaker->make(
             $command->name,
-            $skillGroup,
+            $command->skillGroupId,
             $this->userFetcher->requiredUser()->getId()
         );
-        $this->skillRepository->add($skill);
 
         return new CreateSkillCommandResult($skill->getId());
     }

src/Shared/Infrastructure/Security/UserFetcher.php

@@ -6,25 +6,22 @@
 
 use App\Shared\Application\Command\CommandHandlerInterface;
 use App\Shared\Domain\Security\UserFetcherInterface;
-use App\Skills\Domain\Factory\SkillGroupFactory;
-use App\Skills\Domain\Repository\SkillGroupRepositoryInterface;
+use App\Skills\Domain\Service\SkillGroupMaker;
 
 readonly class CreateSkillGroupCommandHandler implements CommandHandlerInterface
 {
     public function __construct(
-        private SkillGroupRepositoryInterface $skillGroupRepository,
-        private SkillGroupFactory $skillGroupFactory,
+        private SkillGroupMaker $skillGroupMaker,
         private UserFetcherInterface $userFetcher
     ) {
     }
 
     public function __invoke(CreateSkillGroupCommand $command): CreateSkillGroupCommandResult
     {
-        $skillGroup = $this->skillGroupFactory->create(
+        $skillGroup = $this->skillGroupMaker->make(
             $command->name,
             $this->userFetcher->requiredUser()->getId()
         );
-        $this->skillGroupRepository->add($skillGroup);
 
         return new CreateSkillGroupCommandResult($skillGroup->getId());
     }