opengnsys
/
ogcore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs #1942. Updated COmmandTask logic. Created new tables and API commandTaskScript and commandTaskSchedule
testing/ogcore-api/pipeline/head There was a failure building this commit Details

develop
Manuel Aranda Rosales 2025-04-30 12:30:59 +02:00
parent 39a78feabe
commit 531c56630f
40 changed files with 1641 additions and 335 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
config/api_platform/CommandTaskSchedule.yaml 100644
View File

@ -0,0 +1,32 @@
resources:
App\Entity\CommandTaskSchedule:
processor: App\State\Processor\CommandTaskScheduleProcessor
input: App\Dto\Input\CommandTaskScheduleInput
output: App\Dto\Output\CommandTaskScheduleOutput
normalizationContext:
groups: ['default', 'command-task-schedule:read']
denormalizationContext:
groups: ['command-task-schedule:write']
operations:
ApiPlatform\Metadata\GetCollection:
provider: App\State\Provider\CommandTaskScheduleProvider
filters:
- 'api_platform.filter.command_task_schedule.order'
- 'api_platform.filter.command_task_schedule.search'
- 'api_platform.filter.command_task_schedule.boolean'
ApiPlatform\Metadata\Get:
provider: App\State\Provider\CommandTaskScheduleProvider
ApiPlatform\Metadata\Put:
provider: App\State\Provider\CommandTaskScheduleProvider
ApiPlatform\Metadata\Patch:
provider: App\State\Provider\CommandTaskScheduleProvider
ApiPlatform\Metadata\Post: ~
ApiPlatform\Metadata\Delete: ~
properties:
App\Entity\CommandTaskSchedule:
id:
identifier: false
uuid:
identifier: true

32
config/api_platform/CommandTaskScript.yaml 100644
View File

@ -0,0 +1,32 @@
resources:
App\Entity\CommandTaskScript:
processor: App\State\Processor\CommandTaskScriptProcessor
input: App\Dto\Input\CommandTaskScriptInput
output: App\Dto\Output\CommandTaskScriptOutput
normalizationContext:
groups: ['default', 'command-task-script:read']
denormalizationContext:
groups: ['command-task-script:write']
operations:
ApiPlatform\Metadata\GetCollection:
provider: App\State\Provider\CommandTaskScriptProvider
filters:
- 'api_platform.filter.command_task_script.order'
- 'api_platform.filter.command_task_script.search'
- 'api_platform.filter.command_task_script.boolean'
ApiPlatform\Metadata\Get:
provider: App\State\Provider\CommandTaskScriptProvider
ApiPlatform\Metadata\Put:
provider: App\State\Provider\CommandTaskScriptProvider
ApiPlatform\Metadata\Patch:
provider: App\State\Provider\CommandTaskScriptProvider
ApiPlatform\Metadata\Post: ~
ApiPlatform\Metadata\Delete: ~
properties:
App\Entity\CommandTaskScript:
id:
identifier: false
uuid:
identifier: true

10
config/services.yaml
View File

@ -156,3 +156,13 @@ services:
bind:
$collectionProvider: '@api_platform.doctrine.orm.state.collection_provider'
$itemProvider: '@api_platform.doctrine.orm.state.item_provider'
App\State\Provider\CommandTaskScheduleProvider:
bind:
$collectionProvider: '@api_platform.doctrine.orm.state.collection_provider'
$itemProvider: '@api_platform.doctrine.orm.state.item_provider'
App\State\Provider\CommandTaskScriptProvider:
bind:
$collectionProvider: '@api_platform.doctrine.orm.state.collection_provider'
$itemProvider: '@api_platform.doctrine.orm.state.item_provider'

31
migrations/Version20250421122715.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250421122715 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 command_task ADD parameters LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\'');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task DROP parameters');
}
}

35
migrations/Version20250422092348.php 100644
View File

@ -0,0 +1,35 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250422092348 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 network_settings ADD pxe_template_id INT DEFAULT NULL');
$this->addSql('ALTER TABLE network_settings ADD CONSTRAINT FK_48869B543BD7665C FOREIGN KEY (pxe_template_id) REFERENCES pxe_template (id)');
$this->addSql('CREATE INDEX IDX_48869B543BD7665C ON network_settings (pxe_template_id)');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE network_settings DROP FOREIGN KEY FK_48869B543BD7665C');
$this->addSql('DROP INDEX IDX_48869B543BD7665C ON network_settings');
$this->addSql('ALTER TABLE network_settings DROP pxe_template_id');
}
}

31
migrations/Version20250422140927.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250422140927 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 command_task ADD name VARCHAR(255) NOT NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task DROP name');
}
}

31
migrations/Version20250423070720.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250423070720 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 command_task DROP datetime');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task ADD datetime DATETIME NOT NULL');
}
}

35
migrations/Version20250423071243.php 100644
View File

@ -0,0 +1,35 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250423071243 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 command_task ADD organizational_unit_id INT DEFAULT NULL');
$this->addSql('ALTER TABLE command_task ADD CONSTRAINT FK_F3D475A8FB84408A FOREIGN KEY (organizational_unit_id) REFERENCES organizational_unit (id)');
$this->addSql('CREATE INDEX IDX_F3D475A8FB84408A ON command_task (organizational_unit_id)');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task DROP FOREIGN KEY FK_F3D475A8FB84408A');
$this->addSql('DROP INDEX IDX_F3D475A8FB84408A ON command_task');
$this->addSql('ALTER TABLE command_task DROP organizational_unit_id');
}
}

33
migrations/Version20250423092037.php 100644
View File

@ -0,0 +1,33 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250423092037 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 command_task_schedule (id INT AUTO_INCREMENT NOT NULL, command_task_id INT NOT NULL, uuid CHAR(36) NOT NULL COMMENT \'(DC2Type:uuid)\', migration_id VARCHAR(255) DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, created_by VARCHAR(255) DEFAULT NULL, updated_by VARCHAR(255) DEFAULT NULL, recurrence_type VARCHAR(255) NOT NULL, start_time DATETIME NOT NULL, recurrence_details JSON DEFAULT NULL COMMENT \'(DC2Type:json)\', UNIQUE INDEX UNIQ_3BEA77AD17F50A6 (uuid), INDEX IDX_3BEA77A62DC5265 (command_task_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
$this->addSql('ALTER TABLE command_task_schedule ADD CONSTRAINT FK_3BEA77A62DC5265 FOREIGN KEY (command_task_id) REFERENCES command_task (id)');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task_schedule DROP FOREIGN KEY FK_3BEA77A62DC5265');
$this->addSql('DROP TABLE command_task_schedule');
}
}

45
migrations/Version20250427110103.php 100644
View File

@ -0,0 +1,45 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250427110103 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 command_task_scripts (id INT AUTO_INCREMENT NOT NULL, command_task_id INT NOT NULL, uuid CHAR(36) NOT NULL COMMENT \'(DC2Type:uuid)\', migration_id VARCHAR(255) DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, created_by VARCHAR(255) DEFAULT NULL, updated_by VARCHAR(255) DEFAULT NULL, content VARCHAR(255) NOT NULL, execution_order INT NOT NULL, UNIQUE INDEX UNIQ_E8950142D17F50A6 (uuid), INDEX IDX_E895014262DC5265 (command_task_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
$this->addSql('ALTER TABLE command_task_scripts ADD CONSTRAINT FK_E895014262DC5265 FOREIGN KEY (command_task_id) REFERENCES command_task (id)');
$this->addSql('ALTER TABLE command_task_command_group DROP FOREIGN KEY FK_C43618BD62DC5265');
$this->addSql('ALTER TABLE command_task_command_group DROP FOREIGN KEY FK_C43618BDC7B800D6');
$this->addSql('ALTER TABLE command_task_command DROP FOREIGN KEY FK_BB417CA862DC5265');
$this->addSql('ALTER TABLE command_task_command DROP FOREIGN KEY FK_BB417CA833E1689A');
$this->addSql('DROP TABLE command_task_command_group');
$this->addSql('DROP TABLE command_task_command');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE TABLE command_task_command_group (command_task_id INT NOT NULL, command_group_id INT NOT NULL, INDEX IDX_C43618BD62DC5265 (command_task_id), INDEX IDX_C43618BDC7B800D6 (command_group_id), PRIMARY KEY(command_task_id, command_group_id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB COMMENT = \'\' ');
$this->addSql('CREATE TABLE command_task_command (command_task_id INT NOT NULL, command_id INT NOT NULL, INDEX IDX_BB417CA862DC5265 (command_task_id), INDEX IDX_BB417CA833E1689A (command_id), PRIMARY KEY(command_task_id, command_id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB COMMENT = \'\' ');
$this->addSql('ALTER TABLE command_task_command_group ADD CONSTRAINT FK_C43618BD62DC5265 FOREIGN KEY (command_task_id) REFERENCES command_task (id) ON DELETE CASCADE');
$this->addSql('ALTER TABLE command_task_command_group ADD CONSTRAINT FK_C43618BDC7B800D6 FOREIGN KEY (command_group_id) REFERENCES command_group (id) ON DELETE CASCADE');
$this->addSql('ALTER TABLE command_task_command ADD CONSTRAINT FK_BB417CA862DC5265 FOREIGN KEY (command_task_id) REFERENCES command_task (id) ON DELETE CASCADE');
$this->addSql('ALTER TABLE command_task_command ADD CONSTRAINT FK_BB417CA833E1689A FOREIGN KEY (command_id) REFERENCES command (id) ON DELETE CASCADE');
$this->addSql('ALTER TABLE command_task_scripts DROP FOREIGN KEY FK_E895014262DC5265');
$this->addSql('DROP TABLE command_task_scripts');
}
}

37
migrations/Version20250427125746.php 100644
View File

@ -0,0 +1,37 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250427125746 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 command_task_script (id INT AUTO_INCREMENT NOT NULL, command_task_id INT NOT NULL, uuid CHAR(36) NOT NULL COMMENT \'(DC2Type:uuid)\', migration_id VARCHAR(255) DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, created_by VARCHAR(255) DEFAULT NULL, updated_by VARCHAR(255) DEFAULT NULL, content VARCHAR(255) NOT NULL, execution_order INT NOT NULL, UNIQUE INDEX UNIQ_22BF0112D17F50A6 (uuid), INDEX IDX_22BF011262DC5265 (command_task_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
$this->addSql('ALTER TABLE command_task_script ADD CONSTRAINT FK_22BF011262DC5265 FOREIGN KEY (command_task_id) REFERENCES command_task (id)');
$this->addSql('ALTER TABLE command_task_scripts DROP FOREIGN KEY FK_E895014262DC5265');
$this->addSql('DROP TABLE command_task_scripts');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE TABLE command_task_scripts (id INT AUTO_INCREMENT NOT NULL, command_task_id INT NOT NULL, uuid CHAR(36) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci` COMMENT \'(DC2Type:uuid)\', migration_id VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, created_by VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, updated_by VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, content VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, execution_order INT NOT NULL, INDEX IDX_E895014262DC5265 (command_task_id), UNIQUE INDEX UNIQ_E8950142D17F50A6 (uuid), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB COMMENT = \'\' ');
$this->addSql('ALTER TABLE command_task_scripts ADD CONSTRAINT FK_E895014262DC5265 FOREIGN KEY (command_task_id) REFERENCES command_task (id)');
$this->addSql('ALTER TABLE command_task_script DROP FOREIGN KEY FK_22BF011262DC5265');
$this->addSql('DROP TABLE command_task_script');
}
}

31
migrations/Version20250428065311.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250428065311 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 command_task_schedule ADD execution_date DATE NOT NULL, ADD execution_time TIME NOT NULL, DROP start_time');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task_schedule ADD start_time DATETIME NOT NULL, DROP execution_date, DROP execution_time');
}
}

31
migrations/Version20250428065937.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250428065937 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 command_task_schedule ADD enabled TINYINT(1) NOT NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task_schedule DROP enabled');
}
}

31
migrations/Version20250428070851.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250428070851 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 command_task_schedule CHANGE execution_date execution_date DATE DEFAULT NULL, CHANGE execution_time execution_time TIME DEFAULT NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task_schedule CHANGE execution_date execution_date DATE NOT NULL, CHANGE execution_time execution_time TIME NOT NULL');
}
}

31
migrations/Version20250429065612.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250429065612 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 command_task ADD last_execution DATETIME DEFAULT NULL, ADD next_execution DATETIME DEFAULT NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task DROP last_execution, DROP next_execution');
}
}

31
migrations/Version20250429091808.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250429091808 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 command_task ADD scope VARCHAR(255) NOT NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task DROP scope');
}
}

31
migrations/Version20250430052434.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250430052434 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 command_task_script ADD type VARCHAR(255) NOT NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task_script DROP type');
}
}

31
migrations/Version20250430053742.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250430053742 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 command_task_script ADD parameters LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\'');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task_script DROP parameters');
}
}

31
migrations/Version20250430054513.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250430054513 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 command_task_script CHANGE content content VARCHAR(255) DEFAULT NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task_script CHANGE content content VARCHAR(255) NOT NULL');
}
}

31
migrations/Version20250430094459.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250430094459 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 command_task DROP status');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task ADD status VARCHAR(255) NOT NULL');
}
}

85
src/Dto/Input/CommandTaskInput.php
View File

@ -6,6 +6,7 @@ use ApiPlatform\Metadata\ApiProperty;
use App\Dto\Output\ClientOutput;
use App\Dto\Output\CommandGroupOutput;
use App\Dto\Output\CommandOutput;
use App\Dto\Output\OrganizationalUnitOutput;
use App\Entity\CommandTask;
use App\Model\CommandTaskStatus;
use phpDocumentor\Reflection\Types\Boolean;
@ -14,25 +15,12 @@ use Symfony\Component\Validator\Constraints as Assert;
final class CommandTaskInput
{
/**
* @var CommandOutput[]
*/
#[Groups(['command-task:write'])]
#[ApiProperty(
description: 'Los comandos de la tarea',
example: 'Comandos de la tarea',
description: 'El nombre de la tarea',
example: 'Tarea 1',
)]
public array $commands = [];
/**
* @var CommandGroupOutput[]
*/
#[Groups(['command-task:write'])]
#[ApiProperty(
description: 'Los grupos de comandos de la tarea',
example: 'Grupos de comandos de la tarea',
)]
public array $commandGroups = [];
public ?string $name = null;
/**
* @var ClientOutput[]
@ -44,38 +32,37 @@ final class CommandTaskInput
)]
public array $clients = [];
#[Assert\NotBlank(message: 'validators.command_task.datetime.not_blank')]
#[Groups(['command-task:write'])]
#[ApiProperty(
description: 'La fecha y hora de la tarea',
example: '2021-10-01T00:00:00+00:00',
)]
public ?\DateTimeInterface $dateTime = null;
#[Groups(['command-task:write'])]
#[ApiProperty(
description: 'Los comentarios de la tarea',
example: 'Comentarios de la tarea',
example: 'Ambito de la tarea',
)]
public ?string $notes = null;
#[Groups(['command-task:write'])]
#[ApiProperty(
description: 'El ambito de la tarea',
example: 'Comentarios de la tarea',
)]
public ?string $scope = null;
#[Groups(['command-task:write'])]
public ?OrganizationalUnitOutput $organizationalUnit = null;
#[Groups(['command-task:write'])]
#[ApiProperty(
description: 'Los parámetros de la tarea',
example: 'Parámetros de la tarea',
)]
public ?array $content = null;
public function __construct(?CommandTask $commandTask = null)
{
if (!$commandTask) {
return;
}
if ($commandTask->getCommands()) {
foreach ($commandTask->getCommands() as $command) {
$this->commands[] = new CommandOutput($command);
}
}
if ($commandTask->getCommandGroups()) {
foreach ($commandTask->getCommandGroups() as $commandGroup) {
$this->commandGroups[] = new CommandGroupOutput($commandGroup);
}
}
$this->name = $commandTask->getName();
if ($commandTask->getClients()) {
foreach ($commandTask->getClients() as $client) {
@ -83,37 +70,33 @@ final class CommandTaskInput
}
}
$this->dateTime = $commandTask->getDatetime();
$this->organizationalUnit = new OrganizationalUnitOutput($commandTask->getOrganizationalUnit());
$this->notes = $commandTask->getNotes();
$this->scope = $commandTask->getScope();
$this->content = $commandTask->getParameters();
}
/**
* @throws \Exception
*/
public function createOrUpdateEntity(?CommandTask $commandTask = null): CommandTask
{
if (!$commandTask) {
$commandTask = new CommandTask();
}
foreach ($this->commands as $command) {
$commandsToAdd[] = $command->getEntity();
}
$commandTask->setCommands( $commandsToAdd ?? [] );
foreach ($this->commandGroups as $commandGroup) {
$commandGroupsToAdd[] = $commandGroup->getEntity();
}
$commandTask->setCommandGroups( $commandGroupsToAdd ?? [] );
$commandTask->setName($this->name);
foreach ($this->clients as $client) {
$clientsToAdd[] = $client->getEntity();
}
$commandTask->setOrganizationalUnit($this->organizationalUnit->getEntity());
$commandTask->setClients( $clientsToAdd ?? [] );
$commandTask->setDatetime($this->dateTime);
$commandTask->setStatus(CommandTaskStatus::PENDING);
$commandTask->setNotes($this->notes);
$commandTask->setParameters($this->content);
$commandTask->setScope($this->scope);
$commandTask->setNextExecution($commandTask->calculateNextExecutionDate());
return $commandTask;
}

66
src/Dto/Input/CommandTaskScheduleInput.php 100644
View File

@ -0,0 +1,66 @@
<?php
namespace App\Dto\Input;
use App\Dto\Output\CommandTaskOutput;
use App\Dto\Output\CommandTaskScheduleOutput;
use App\Entity\CommandTaskSchedule;
use Symfony\Component\Serializer\Annotation\Groups;
final class CommandTaskScheduleInput
{
#[Groups(['command-task-schedule:write'])]
public ?CommandTaskOutput $commandTask = null;
#[Groups(['command-task-schedule:write'])]
public ?string $recurrenceType = null;
#[Groups(['command-task-schedule:write'])]
public ?\DateTimeInterface $executionDate = null;
#[Groups(['command-task-schedule:write'])]
public ?\DateTimeInterface $executionTime = null;
#[Groups(['command-task-schedule:write'])]
public ?array $recurrenceDetails = null;
#[Groups(['command-task-schedule:write'])]
public ?bool $enabled = null;
public function __construct(?CommandTaskSchedule $commandTaskSchedule = null)
{
if (!$commandTaskSchedule) {
return;
}
$this->commandTask = new CommandTaskOutput($commandTaskSchedule->getCommandTask());
$this->recurrenceType = $commandTaskSchedule->getRecurrenceType();
$this->executionDate = $commandTaskSchedule->getExecutionDate();
$this->executionTime = $commandTaskSchedule->getExecutionTime();
$this->recurrenceDetails = $commandTaskSchedule->getRecurrenceDetails();
$this->enabled = $commandTaskSchedule->isEnabled();
}
/**
* @throws \Exception
*/
public function createOrUpdateEntity(?CommandTaskSchedule $commandTaskSchedule = null): CommandTaskSchedule
{
if (!$commandTaskSchedule) {
$commandTaskSchedule = new CommandTaskSchedule();
}
if ($this->commandTask) {
$commandTaskSchedule->setCommandTask($this->commandTask->getEntity());
}
$commandTaskSchedule->setRecurrenceType($this->recurrenceType);
$commandTaskSchedule->setExecutionTime($this->executionTime);
$commandTaskSchedule->setExecutionDate($this->executionDate);
$commandTaskSchedule->setRecurrenceDetails($this->recurrenceDetails);
$commandTaskSchedule->setEnabled($this->enabled);
return $commandTaskSchedule;
}
}

57
src/Dto/Input/CommandTaskScriptInput.php 100644
View File

@ -0,0 +1,57 @@
<?php
namespace App\Dto\Input;
use App\Dto\Output\CommandTaskOutput;
use App\Dto\Output\CommandTaskScheduleOutput;
use App\Entity\CommandTaskSchedule;
use App\Entity\CommandTaskScript;
use Symfony\Component\Serializer\Annotation\Groups;
final class CommandTaskScriptInput
{
#[Groups(['command-task-script:write'])]
public ?string $content = null;
#[Groups(['command-task-script:write'])]
public ?string $type = null;
#[Groups(['command-task-script:write'])]
public ?array $parameters = null;
#[Groups(['command-task-script:write'])]
public ?CommandTaskOutput $commandTask = null;
#[Groups(['command-task-script:write'])]
public ?int $order = null;
public function __construct(?CommandTaskScript $commandTaskScript = null)
{
if (!$commandTaskScript) {
return;
}
$this->content = $commandTaskScript->getContent();
$this->type = $commandTaskScript->getType();
$this->order = $commandTaskScript->getExecutionOrder();
$this->parameters = $commandTaskScript->getParameters();
$this->commandTask = new CommandTaskOutput($commandTaskScript->getCommandTask());
}
public function createOrUpdateEntity(?CommandTaskScript $commandTaskScript = null): CommandTaskScript
{
if (!$commandTaskScript) {
$commandTaskScript = new CommandTaskScript();
}
if ($this->commandTask) {
$commandTaskScript->setCommandTask($this->commandTask->getEntity());
}
$commandTaskScript->setType($this->type);
$commandTaskScript->setParameters($this->parameters);
$commandTaskScript->setContent($this->content);
$commandTaskScript->setExecutionOrder($this->order);
return $commandTaskScript;
}
}

29
src/Dto/Output/CommandTaskOutput.php
View File

@ -13,22 +13,25 @@ use Symfony\Component\Serializer\Annotation\Groups;
final class CommandTaskOutput extends AbstractOutput
{
#[Groups(['command-task:read'])]
public array $commands = [];
#[Groups(['command-task:read'])]
public array $commandGroups = [];
public ?string $name = null;
#[Groups(['command-task:read'])]
public array $clients = [];
#[Groups(['command-task:read'])]
public \DateTimeInterface $dateTime;
public ?OrganizationalUnitOutput $organizationalUnit = null;
#[Groups(['command-task:read'])]
public ?\DateTimeInterface $lastExecution = null;
#[Groups(['command-task:read'])]
public ?\DateTimeInterface $nextExecution = null;
#[Groups(['command-task:read'])]
public ?string $notes = null;
#[Groups(['command-task:read'])]
public ?string $status = null;
public ?string $scope = null;
#[Groups(['command-task:read'])]
public \DateTime $createdAt;
@ -41,21 +44,17 @@ final class CommandTaskOutput extends AbstractOutput
{
parent::__construct($commandTask);
$this->commands = $commandTask->getCommands()->map(
fn(Command $command) => new CommandOutput($command)
)->toArray();
$this->commandGroups = $commandTask->getCommandGroups()->map(
fn(CommandGroup $commandGroup) => new CommandGroupOutput($commandGroup)
)->toArray();
$this->name = $commandTask->getName();
$this->clients = $commandTask->getClients()->map(
fn(Client $client) => new ClientOutput($client)
)->toArray();
$this->dateTime = $commandTask->getDateTime();
$this->organizationalUnit = new OrganizationalUnitOutput($commandTask->getOrganizationalUnit());
$this->notes = $commandTask->getNotes();
$this->status = $commandTask->getStatus();
$this->scope = $commandTask->getScope();
$this->lastExecution = $commandTask->getLastExecution();
$this->nextExecution = $commandTask->getNextExecution();
$this->createdAt = $commandTask->getCreatedAt();
$this->createdBy = $commandTask->getCreatedBy();
}

41
src/Dto/Output/CommandTaskScheduleOutput.php 100644
View File

@ -0,0 +1,41 @@
<?php
namespace App\Dto\Output;
use ApiPlatform\Metadata\Get;
use App\Entity\CommandTaskSchedule;
use Symfony\Component\Serializer\Annotation\Groups;
#[Get(shortName: 'CommandTaskSchedule')]
class CommandTaskScheduleOutput extends AbstractOutput
{
#[Groups(['command-task-schedule:read'])]
public ?string $recurrenceType = null;
#[Groups(['command-task-schedule:read'])]
public ?\DateTimeInterface $executionDate = null;
#[Groups(['command-task-schedule:read'])]
public ?\DateTimeInterface $executionTime = null;
#[Groups(['command-task-schedule:read'])]
public ?array $recurrenceDetails = null;
#[Groups(['command-task-schedule:read'])]
public ?bool $enabled = null;
public function __construct(?CommandTaskSchedule $commandTaskSchedule = null)
{
parent::__construct($commandTaskSchedule);
if (!$commandTaskSchedule) {
return;
}
$this->recurrenceType = $commandTaskSchedule->getRecurrenceType();
$this->executionTime = $commandTaskSchedule->getExecutionTime();
$this->executionDate = $commandTaskSchedule->getExecutionDate();
$this->recurrenceDetails = $commandTaskSchedule->getRecurrenceDetails();
$this->enabled = $commandTaskSchedule->isEnabled();
}
}

42
src/Dto/Output/CommandTaskScriptOutput.php 100644
View File

@ -0,0 +1,42 @@
<?php
namespace App\Dto\Output;
use ApiPlatform\Metadata\Get;
use App\Entity\CommandTaskSchedule;
use App\Entity\CommandTaskScript;
use Symfony\Component\Serializer\Annotation\Groups;
#[Get(shortName: 'CommandTaskScript')]
class CommandTaskScriptOutput extends AbstractOutput
{
#[Groups(['command-task-script:read'])]
public ?string $content = null;
#[Groups(['command-task-script:read'])]
public ?string $type = null;
#[Groups(['command-task-script:read'])]
public ?array $parameters = null;
#[Groups(['command-task-script:read'])]
public ?CommandTaskOutput $commandTaskOutput = null;
#[Groups(['command-task-script:read'])]
public ?int $order = null;
public function __construct(?CommandTaskScript $commandTaskScript = null)
{
parent::__construct($commandTaskScript);
if (!$commandTaskScript) {
return;
}
$this->content = $commandTaskScript->getContent();
$this->order = $commandTaskScript->getExecutionOrder();
$this->type = $commandTaskScript->getType();
$this->parameters = $commandTaskScript->getParameters();
$this->commandTaskOutput = new CommandTaskOutput($commandTaskScript->getCommandTask());
}
}

7
src/Entity/Command.php
View File

@ -29,12 +29,6 @@ class Command extends AbstractEntity
#[ORM\ManyToMany(targetEntity: CommandGroup::class, mappedBy: 'commands')]
private Collection $commandGroups;
/**
* @var Collection<int, CommandTask>
*/
#[ORM\ManyToMany(targetEntity: CommandTask::class, mappedBy: 'commands')]
private Collection $commandTasks;
#[ORM\Column(nullable: true)]
private ?bool $parameters = null;
@ -42,7 +36,6 @@ class Command extends AbstractEntity
{
parent::__construct();
$this->commandGroups = new ArrayCollection();
$this->commandTasks = new ArrayCollection();
}
public function getScript(): ?string

339
src/Entity/CommandTask.php
View File

@ -11,122 +11,51 @@ use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity(repositoryClass: CommandTaskRepository::class)]
class CommandTask extends AbstractEntity
{
/**
* @var Collection<int, Command>
*/
#[ORM\ManyToMany(targetEntity: Command::class, inversedBy: 'commandTasks')]
private Collection $commands;
/**
* @var Collection<int, CommandGroup>
*/
#[ORM\ManyToMany(targetEntity: CommandGroup::class, inversedBy: 'commandTasks')]
private Collection $commandGroups;
#[ORM\Column(type: Types::DATETIME_MUTABLE)]
private ?\DateTimeInterface $datetime = null;
use NameableTrait;
#[ORM\Column(length: 255, nullable: true)]
private ?string $notes = null;
#[ORM\Column(length: 255)]
private ?string $status = null;
/**
* @var Collection<int, Client>
*/
#[ORM\ManyToMany(targetEntity: Client::class)]
private Collection $clients;
#[ORM\Column(type: Types::ARRAY, nullable: true)]
private ?array $parameters = null;
#[ORM\ManyToOne]
private ?OrganizationalUnit $organizationalUnit = null;
/**
* @var Collection<int, CommandTaskSchedule>
*/
#[ORM\OneToMany(mappedBy: 'commandTask', targetEntity: CommandTaskSchedule::class, cascade: ['persist'], orphanRemoval: true)]
private Collection $commandTaskSchedules;
/**
* @var Collection<int, CommandTaskScript>
*/
#[ORM\OneToMany(mappedBy: 'commandTask', targetEntity: CommandTaskScript::class, cascade: ['persist'], orphanRemoval: true)]
private Collection $commandTaskScripts;
#[ORM\Column(type: Types::DATETIME_MUTABLE, nullable: true)]
private ?\DateTimeInterface $lastExecution = null;
#[ORM\Column(type: Types::DATETIME_MUTABLE, nullable: true)]
private ?\DateTimeInterface $nextExecution = null;
#[ORM\Column(length: 255)]
private ?string $scope = null;
public function __construct()
{
parent::__construct();
$this->commands = new ArrayCollection();
$this->commandGroups = new ArrayCollection();
$this->clients = new ArrayCollection();
}
/**
* @return Collection<int, Command>
*/
public function getCommands(): Collection
{
return $this->commands;
}
public function setCommands(array $commands): static
{
$this->commands->clear();
foreach ($commands as $command){
$this->addCommand($command);
}
return $this;
}
public function addCommand(Command $command): static
{
if (!$this->commands->contains($command)) {
$this->commands->add($command);
}
return $this;
}
public function removeCommand(Command $command): static
{
$this->commands->removeElement($command);
return $this;
}
/**
* @return Collection<int, CommandGroup>
*/
public function getCommandGroups(): Collection
{
return $this->commandGroups;
}
public function setCommandGroups(array $commandGroups): static
{
$this->commandGroups->clear();
foreach ($commandGroups as $commandGroup){
$this->addCommandGroup($commandGroup);
}
return $this;
}
public function addCommandGroup(CommandGroup $commandGroup): static
{
if (!$this->commandGroups->contains($commandGroup)) {
$this->commandGroups->add($commandGroup);
}
return $this;
}
public function removeCommandGroup(CommandGroup $commandGroup): static
{
$this->commandGroups->removeElement($commandGroup);
return $this;
}
public function getDatetime(): ?\DateTimeInterface
{
return $this->datetime;
}
public function setDatetime(\DateTimeInterface $datetime): static
{
$this->datetime = $datetime;
return $this;
$this->commandTaskSchedules = new ArrayCollection();
$this->commandTaskScripts = new ArrayCollection();
}
public function getNotes(): ?string
@ -141,18 +70,6 @@ class CommandTask extends AbstractEntity
return $this;
}
public function getStatus(): ?string
{
return $this->status;
}
public function setStatus(string $status): static
{
$this->status = $status;
return $this;
}
/**
* @return Collection<int, Client>
*/
@ -187,4 +104,200 @@ class CommandTask extends AbstractEntity
return $this;
}
public function getParameters(): ?array
{
return $this->parameters;
}
public function setParameters(?array $parameters): static
{
$this->parameters = $parameters;
return $this;
}
public function getOrganizationalUnit(): ?OrganizationalUnit
{
return $this->organizationalUnit;
}
public function setOrganizationalUnit(?OrganizationalUnit $organizationalUnit): static
{
$this->organizationalUnit = $organizationalUnit;
return $this;
}
/**
* @return Collection<int, CommandTaskSchedule>
*/
public function getCommandTaskSchedules(): Collection
{
return $this->commandTaskSchedules;
}
public function addCommandTaskSchedule(CommandTaskSchedule $commandTaskSchedule): static
{
if (!$this->commandTaskSchedules->contains($commandTaskSchedule)) {
$this->commandTaskSchedules->add($commandTaskSchedule);
$commandTaskSchedule->setCommandTask($this);
}
return $this;
}
public function removeCommandTaskSchedule(CommandTaskSchedule $commandTaskSchedule): static
{
if ($this->commandTaskSchedules->removeElement($commandTaskSchedule)) {
// set the owning side to null (unless already changed)
if ($commandTaskSchedule->getCommandTask() === $this) {
$commandTaskSchedule->setCommandTask(null);
}
}
return $this;
}
/**
* @return Collection<int, CommandTaskScript>
*/
public function getCommandTaskScripts(): Collection
{
return $this->commandTaskScripts;
}
public function addCommandTaskScript(CommandTaskScript $commandTaskScript): static
{
if (!$this->commandTaskScripts->contains($commandTaskScript)) {
$this->commandTaskScripts->add($commandTaskScript);
$commandTaskScript->setCommandTask($this);
}
return $this;
}
public function removeCommandTaskScript(CommandTaskScript $commandTaskScript): static
{
if ($this->commandTaskScripts->removeElement($commandTaskScript)) {
// set the owning side to null (unless already changed)
if ($commandTaskScript->getCommandTask() === $this) {
$commandTaskScript->setCommandTask(null);
}
}
return $this;
}
public function getLastExecution(): ?\DateTimeInterface
{
return $this->lastExecution;
}
public function setLastExecution(?\DateTimeInterface $lastExecution): static
{
$this->lastExecution = $lastExecution;
return $this;
}
public function getNextExecution(): ?\DateTimeInterface
{
return $this->nextExecution;
}
public function setNextExecution(?\DateTimeInterface $nextExecution): static
{
$this->nextExecution = $nextExecution;
return $this;
}
/**
* @throws \Exception
*/
public function calculateNextExecutionDate(): ?\DateTimeInterface
{
$now = new \DateTime();
$closestDateTime = null;
foreach ($this->getCommandTaskSchedules() as $schedule) {
$type = $schedule->getRecurrenceType();
$executionTime = $schedule->getExecutionTime();
if ($type === 'none') {
$execDate = $schedule->getExecutionDate();
if ($execDate !== null && $execDate > $now) {
if ($executionTime !== null) {
$execDateTime = \DateTime::createFromFormat(
'Y-m-d H:i:s',
$execDate->format('Y-m-d') . ' ' . $executionTime->format('H:i:s')
);
} else {
$execDateTime = $execDate;
}
if ($closestDateTime === null || $execDateTime < $closestDateTime) {
$closestDateTime = $execDateTime;
}
}
} else {
$details = $schedule->getRecurrenceDetails();
if ($details === null) {
continue;
}
$init = (new \DateTime($details['initDate'] ?? 'now'))->setTime(0, 0);
$end = (new \DateTime($details['endDate'] ?? '+1 year'))->setTime(0, 0);
$validDays = array_map('mb_strtolower', $details['daysOfWeek'] ?? []);
$validMonths = array_map('mb_strtolower', $details['months'] ?? []);
$current = (new \DateTime())->setTime(0, 0);
while ($current <= $end) {
if ($current < $init) {
$current->modify('+1 day');
continue;
}
$translatedDay = mb_strtolower($current->format('l'));
$translatedMonth = mb_strtolower($current->format('F'));
if (in_array($translatedDay, $validDays, true) && in_array($translatedMonth, $validMonths, true)) {
if ($executionTime !== null) {
$execDateTime = \DateTime::createFromFormat(
'Y-m-d H:i:s',
$current->format('Y-m-d') . ' ' . $executionTime->format('H:i:s')
);
} else {
$execDateTime = clone $current;
}
if ($execDateTime > $now && ($closestDateTime === null || $execDateTime < $closestDateTime)) {
$closestDateTime = $execDateTime;
}
break;
}
$current->modify('+1 day');
}
}
}
return $closestDateTime;
}
public function getScope(): ?string
{
return $this->scope;
}
public function setScope(string $scope): static
{
$this->scope = $scope;
return $this;
}
}

89
src/Entity/CommandTaskSchedule.php 100644
View File

@ -0,0 +1,89 @@
<?php
namespace App\Entity;
use App\Repository\CommandTaskScheduleRepository;
use Doctrine\DBAL\Types\Types;
use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity(repositoryClass: CommandTaskScheduleRepository::class)]
class CommandTaskSchedule extends AbstractEntity
{
use ToggleableTrait;
#[ORM\Column(length: 255)]
private ?string $recurrenceType = null;
#[ORM\Column(type: Types::DATE_MUTABLE, nullable: true)]
private ?\DateTimeInterface $executionDate = null;
#[ORM\Column(nullable: true)]
private ?array $recurrenceDetails = null;
#[ORM\ManyToOne(cascade: ['persist'], inversedBy: 'commandTaskSchedules')]
#[ORM\JoinColumn(nullable: false)]
private ?CommandTask $commandTask = null;
#[ORM\Column(type: Types::TIME_MUTABLE, nullable: true)]
private ?\DateTimeInterface $executionTime = null;
public function getRecurrenceType(): ?string
{
return $this->recurrenceType;
}
public function setRecurrenceType(string $recurrenceType): static
{
$this->recurrenceType = $recurrenceType;
return $this;
}
public function getRecurrenceDetails(): ?array
{
return $this->recurrenceDetails;
}
public function setRecurrenceDetails(?array $recurrenceDetails): static
{
$this->recurrenceDetails = $recurrenceDetails;
return $this;
}
public function getCommandTask(): ?CommandTask
{
return $this->commandTask;
}
public function setCommandTask(?CommandTask $commandTask): static
{
$this->commandTask = $commandTask;
return $this;
}
public function getExecutionTime(): ?\DateTimeInterface
{
return $this->executionTime;
}
public function setExecutionTime(?\DateTimeInterface $executionTime): static
{
$this->executionTime = $executionTime;
return $this;
}
public function getExecutionDate(): ?\DateTimeInterface
{
return $this->executionDate;
}
public function setExecutionDate(?\DateTimeInterface $executionDate): static
{
$this->executionDate = $executionDate;
return $this;
}
}

92
src/Entity/CommandTaskScript.php 100644
View File

@ -0,0 +1,92 @@
<?php
namespace App\Entity;
use App\Repository\CommandTaskScriptRepository;
use Doctrine\DBAL\Types\Types;
use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity(repositoryClass: CommandTaskScriptRepository::class)]
class CommandTaskScript extends AbstractEntity
{
#[ORM\Column(length: 255, nullable: true)]
private ?string $content = null;
#[ORM\Column]
private ?int $executionOrder = null;
#[ORM\ManyToOne(cascade: ['persist'], inversedBy: 'commandTaskScripts')]
#[ORM\JoinColumn(nullable: false)]
private ?CommandTask $commandTask = null;
#[ORM\Column(length: 255)]
private ?string $type = null;
#[ORM\Column(type: Types::ARRAY, nullable: true)]
private ?array $parameters = null;
public function getId(): ?int
{
return $this->id;
}
public function getContent(): ?string
{
return $this->content;
}
public function setContent(?string $content): static
{
$this->content = $content;
return $this;
}
public function getExecutionOrder(): ?int
{
return $this->executionOrder;
}
public function setExecutionOrder(int $executionOrder): static
{
$this->executionOrder = $executionOrder;
return $this;
}
public function getCommandTask(): ?CommandTask
{
return $this->commandTask;
}
public function setCommandTask(?CommandTask $commandTask): static
{
$this->commandTask = $commandTask;
return $this;
}
public function getType(): ?string
{
return $this->type;
}
public function setType(string $type): static
{
$this->type = $type;
return $this;
}
public function getParameters(): ?array
{
return $this->parameters;
}
public function setParameters(?array $parameters): static
{
$this->parameters = $parameters;
return $this;
}
}

6
src/Factory/CommandTaskFactory.php
View File

@ -3,6 +3,7 @@
namespace App\Factory;
use App\Entity\CommandTask;
use App\Model\OrganizationalUnitTypes;
use App\Repository\CommandTaskRepository;
use Zenstruck\Foundry\ModelFactory;
use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
@ -38,8 +39,9 @@ final class CommandTaskFactory extends ModelFactory
{
return [
'createdAt' => self::faker()->dateTime(),
'datetime' => self::faker()->dateTime(),
'status' => self::faker()->text(255),
'name' => self::faker()->text(255),
'organizationalUnit' => OrganizationalUnitFactory::createOne(['type' => OrganizationalUnitTypes::ORGANIZATIONAL_UNIT])->_save(),
'scope' => 'organizational-unit',
'updatedAt' => self::faker()->dateTime()
];
}

18
src/Repository/CommandTaskScheduleRepository.php 100644
View File

@ -0,0 +1,18 @@
<?php
namespace App\Repository;
use App\Entity\CommandTaskSchedule;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\Persistence\ManagerRegistry;
/**
* @extends ServiceEntityRepository<CommandTaskSchedule>
*/
class CommandTaskScheduleRepository extends AbstractRepository
{
public function __construct(ManagerRegistry $registry)
{
parent::__construct($registry, CommandTaskSchedule::class);
}
}

18
src/Repository/CommandTaskScriptRepository.php 100644
View File

@ -0,0 +1,18 @@
<?php
namespace App\Repository;
use App\Entity\CommandTaskScript;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\Persistence\ManagerRegistry;
/**
* @extends ServiceEntityRepository<CommandTaskScript>
*/
class CommandTaskScriptRepository extends AbstractRepository
{
public function __construct(ManagerRegistry $registry)
{
parent::__construct($registry, CommandTaskScript::class);
}
}

4
src/State/Processor/CommandTaskProcessor.php
View File

@ -18,8 +18,7 @@ readonly class CommandTaskProcessor implements ProcessorInterface
{
public function __construct(
private CommandTaskRepository $commandTaskRepository,
private ValidatorInterface $validator,
private CreateTraceService $createTraceService
private ValidatorInterface $validator
)
{
}
@ -56,7 +55,6 @@ readonly class CommandTaskProcessor implements ProcessorInterface
$task = $data->createOrUpdateEntity($entity);
$this->validator->validate($task);
$this->commandTaskRepository->save($task);
$this->createTraceService->__invoke($task);
return new CommandTaskOutput($task);
}

70
src/State/Processor/CommandTaskScheduleProcessor.php 100644
View File

@ -0,0 +1,70 @@
<?php
namespace App\State\Processor;
use ApiPlatform\Metadata\Delete;
use ApiPlatform\Metadata\Operation;
use ApiPlatform\Metadata\Patch;
use ApiPlatform\Metadata\Post;
use ApiPlatform\Metadata\Put;
use ApiPlatform\State\ProcessorInterface;
use ApiPlatform\Validator\ValidatorInterface;
use App\Dto\Input\CommandTaskScheduleInput;
use App\Dto\Output\CommandTaskScheduleOutput;
use App\Repository\CommandTaskScheduleRepository;
use App\Service\CreateTraceService;
readonly class CommandTaskScheduleProcessor implements ProcessorInterface
{
public function __construct(
private CommandTaskScheduleRepository $commandTaskScheduleRepository,
private ValidatorInterface $validator,
)
{
}
/**
* @throws \Exception
*/
public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): CommandTaskScheduleOutput |null
{
switch ($operation){
case $operation instanceof Post:
case $operation instanceof Put:
case $operation instanceof Patch:
return $this->processCreateOrUpdate($data, $operation, $uriVariables, $context);
case $operation instanceof Delete:
return $this->processDelete($data, $operation, $uriVariables, $context);
}
}
/**
* @throws \Exception
*/
private function processCreateOrUpdate($data, Operation $operation, array $uriVariables = [], array $context = []): CommandTaskScheduleOutput
{
if (!($data instanceof CommandTaskScheduleInput)) {
throw new \Exception(sprintf('data is not instance of %s', CommandTaskScheduleInput::class));
}
$entity = null;
if (isset($uriVariables['uuid'])) {
$entity = $this->commandTaskScheduleRepository->findOneByUuid($uriVariables['uuid']);
}
$task = $data->createOrUpdateEntity($entity);
$this->validator->validate($task);
$this->commandTaskScheduleRepository->save($task);
return new CommandTaskScheduleOutput($task);
}
private function processDelete($data, Operation $operation, array $uriVariables = [], array $context = []): null
{
$user = $this->commandTaskScheduleRepository->findOneByUuid($uriVariables['uuid']);
$this->commandTaskScheduleRepository->delete($user);
return null;
}
}

70
src/State/Processor/CommandTaskScriptProcessor.php 100644
View File

@ -0,0 +1,70 @@
<?php
namespace App\State\Processor;
use ApiPlatform\Metadata\Delete;
use ApiPlatform\Metadata\Operation;
use ApiPlatform\Metadata\Patch;
use ApiPlatform\Metadata\Post;
use ApiPlatform\Metadata\Put;
use ApiPlatform\State\ProcessorInterface;
use ApiPlatform\Validator\ValidatorInterface;
use App\Dto\Input\CommandTaskScriptInput;
use App\Dto\Output\CommandTaskScriptOutput;
use App\Repository\CommandTaskScriptRepository;
use App\Service\CreateTraceService;
readonly class CommandTaskScriptProcessor implements ProcessorInterface
{
public function __construct(
private CommandTaskScriptRepository $commandTaskScriptRepository,
private ValidatorInterface $validator,
)
{
}
/**
* @throws \Exception
*/
public function process(mixed $data, Operation $operation, array $uriVariables = [], array $context = []): CommandTaskScriptOutput |null
{
switch ($operation){
case $operation instanceof Post:
case $operation instanceof Put:
case $operation instanceof Patch:
return $this->processCreateOrUpdate($data, $operation, $uriVariables, $context);
case $operation instanceof Delete:
return $this->processDelete($data, $operation, $uriVariables, $context);
}
}
/**
* @throws \Exception
*/
private function processCreateOrUpdate($data, Operation $operation, array $uriVariables = [], array $context = []): CommandTaskScriptOutput
{
if (!($data instanceof CommandTaskScriptInput)) {
throw new \Exception(sprintf('data is not instance of %s', CommandTaskScriptInput::class));
}
$entity = null;
if (isset($uriVariables['uuid'])) {
$entity = $this->commandTaskScriptRepository->findOneByUuid($uriVariables['uuid']);
}
$task = $data->createOrUpdateEntity($entity);
$this->validator->validate($task);
$this->commandTaskScriptRepository->save($task);
return new CommandTaskScriptOutput($task);
}
private function processDelete($data, Operation $operation, array $uriVariables = [], array $context = []): null
{
$user = $this->commandTaskScriptRepository->findOneByUuid($uriVariables['uuid']);
$this->commandTaskScriptRepository->delete($user);
return null;
}
}

71
src/State/Provider/CommandTaskScheduleProvider.php 100644
View File

@ -0,0 +1,71 @@
<?php
namespace App\State\Provider;
use ApiPlatform\Metadata\Get;
use ApiPlatform\Metadata\GetCollection;
use ApiPlatform\Metadata\Operation;
use ApiPlatform\Metadata\Patch;
use ApiPlatform\Metadata\Put;
use ApiPlatform\State\Pagination\TraversablePaginator;
use ApiPlatform\State\ProviderInterface;
use App\Dto\Input\CommandTaskScheduleInput;
use App\Dto\Output\CommandTaskScheduleOutput;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
readonly class CommandTaskScheduleProvider implements ProviderInterface
{
public function __construct(
private ProviderInterface $collectionProvider,
private ProviderInterface $itemProvider
)
{
}
public function provide(Operation $operation, array $uriVariables = [], array $context = []): object|array|null
{
switch ($operation){
case $operation instanceof GetCollection:
return $this->provideCollection($operation, $uriVariables, $context);
case $operation instanceof Patch:
case $operation instanceof Put:
return $this->provideInput($operation, $uriVariables, $context);
case $operation instanceof Get:
return $this->provideItem($operation, $uriVariables, $context);
}
}
private function provideCollection(Operation $operation, array $uriVariables = [], array $context = []): object|array|null
{
$paginator = $this->collectionProvider->provide($operation, $uriVariables, $context);
$items = new \ArrayObject();
foreach ($paginator->getIterator() as $item){
$items[] = new CommandTaskScheduleOutput($item);
}
return new TraversablePaginator($items, $paginator->getCurrentPage(), $paginator->getItemsPerPage(), $paginator->getTotalItems());
}
public function provideItem(Operation $operation, array $uriVariables = [], array $context = []): object|array|null
{
$item = $this->itemProvider->provide($operation, $uriVariables, $context);
if (!$item) {
throw new NotFoundHttpException('Command task not found');
}
return new CommandTaskScheduleOutput($item);
}
public function provideInput(Operation $operation, array $uriVariables = [], array $context = []): object|array|null
{
if (isset($uriVariables['uuid'])) {
$item = $this->itemProvider->provide($operation, $uriVariables, $context);
return $item !== null ? new CommandTaskScheduleInput($item) : null;
}
return new CommandTaskScheduleInput();
}
}

72
src/State/Provider/CommandTaskScriptProvider.php 100644
View File

@ -0,0 +1,72 @@
<?php
namespace App\State\Provider;
use ApiPlatform\Metadata\Get;
use ApiPlatform\Metadata\GetCollection;
use ApiPlatform\Metadata\Operation;
use ApiPlatform\Metadata\Patch;
use ApiPlatform\Metadata\Put;
use ApiPlatform\State\Pagination\TraversablePaginator;
use ApiPlatform\State\ProviderInterface;
use App\Dto\Input\CommandTaskScriptInput;
use App\Dto\Output\CommandTaskScriptOutput;
use App\Entity\CommandTaskScript;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
readonly class CommandTaskScriptProvider implements ProviderInterface
{
public function __construct(
private ProviderInterface $collectionProvider,
private ProviderInterface $itemProvider
)
{
}
public function provide(Operation $operation, array $uriVariables = [], array $context = []): object|array|null
{
switch ($operation){
case $operation instanceof GetCollection:
return $this->provideCollection($operation, $uriVariables, $context);
case $operation instanceof Patch:
case $operation instanceof Put:
return $this->provideInput($operation, $uriVariables, $context);
case $operation instanceof Get:
return $this->provideItem($operation, $uriVariables, $context);
}
}
private function provideCollection(Operation $operation, array $uriVariables = [], array $context = []): object|array|null
{
$paginator = $this->collectionProvider->provide($operation, $uriVariables, $context);
$items = new \ArrayObject();
foreach ($paginator->getIterator() as $item){
$items[] = new CommandTaskScriptOutput($item);
}
return new TraversablePaginator($items, $paginator->getCurrentPage(), $paginator->getItemsPerPage(), $paginator->getTotalItems());
}
public function provideItem(Operation $operation, array $uriVariables = [], array $context = []): object|array|null
{
$item = $this->itemProvider->provide($operation, $uriVariables, $context);
if (!$item) {
throw new NotFoundHttpException('Command task not found');
}
return new CommandTaskScriptOutput($item);
}
public function provideInput(Operation $operation, array $uriVariables = [], array $context = []): object|array|null
{
if (isset($uriVariables['uuid'])) {
$item = $this->itemProvider->provide($operation, $uriVariables, $context);
return $item !== null ? new CommandTaskScriptInput($item) : null;
}
return new CommandTaskScriptInput();
}
}

127
tests/Functional/CommandGroupTest.php
View File

@ -1,127 +0,0 @@
<?php
namespace Functional;
use App\Entity\Command;
use App\Entity\CommandGroup;
use App\Factory\CommandFactory;
use App\Factory\CommandGroupFactory;
use App\Factory\UserFactory;
use App\Model\UserGroupPermissions;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\DecodingExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
class CommandGroupTest extends AbstractTest
{
CONST string USER_ADMIN = 'ogadmin';
CONST string CMD_GROUP_CREATE = 'test-cmd-group-create';
CONST string CMD_GROUP_UPDATE = 'test-cmd-group-update';
CONST string CMD_GROUP_DELETE = 'test-cmd-group-delete';
CONST string CMD_CREATE = 'test-cmd-create';
/**
* @throws RedirectionExceptionInterface
* @throws DecodingExceptionInterface
* @throws ClientExceptionInterface
* @throws TransportExceptionInterface
* @throws ServerExceptionInterface
*/
public function testGetCollectionCommandGroup(): void
{
UserFactory::createOne(['username' => self::USER_ADMIN, 'roles'=> [UserGroupPermissions::ROLE_SUPER_ADMIN]]);
CommandGroupFactory::createMany(10);
$this->createClientWithCredentials()->request('GET', '/command-groups');
$this->assertResponseStatusCodeSame(Response::HTTP_OK);
$this->assertResponseHeaderSame('content-type', 'application/ld+json; charset=utf-8');
$this->assertJsonContains([
'@context' => '/contexts/CommandGroup',
'@id' => '/command-groups',
'@type' => 'hydra:Collection',
'hydra:totalItems' => 10,
]);
}
/**
* @throws RedirectionExceptionInterface
* @throws DecodingExceptionInterface
* @throws ClientExceptionInterface
* @throws TransportExceptionInterface
* @throws ServerExceptionInterface
*/
public function testCreateCommandGroup(): void
{
UserFactory::createOne(['username' => self::USER_ADMIN, 'roles'=> [UserGroupPermissions::ROLE_SUPER_ADMIN]]);
CommandFactory::createOne(['name' => self::CMD_CREATE]);
$commandIri = $this->findIriBy(Command::class, ['name' => self::CMD_CREATE]);
$this->createClientWithCredentials()->request('POST', '/command-groups',['json' => [
'name' => self::CMD_GROUP_CREATE,
'commands' => [
$commandIri
]
]]);
$this->assertResponseStatusCodeSame(201);
$this->assertResponseHeaderSame('content-type', 'application/ld+json; charset=utf-8');
$this->assertJsonContains([
'@context' => '/contexts/CommandGroupOutput',
'@type' => 'CommandGroup',
'name' => self::CMD_GROUP_CREATE,
]);
}
/**
* @throws RedirectionExceptionInterface
* @throws DecodingExceptionInterface
* @throws ClientExceptionInterface
* @throws TransportExceptionInterface
* @throws ServerExceptionInterface
*/
public function testUpdateCommandGroup(): void
{
UserFactory::createOne(['username' => self::USER_ADMIN, 'roles'=> [UserGroupPermissions::ROLE_SUPER_ADMIN]]);
CommandGroupFactory::createOne(['name' => self::CMD_GROUP_CREATE]);
$iri = $this->findIriBy(CommandGroup::class, ['name' => self::CMD_GROUP_CREATE]);
$this->createClientWithCredentials()->request('PUT', $iri, ['json' => [
'name' => self::CMD_GROUP_UPDATE,
]]);
$this->assertResponseIsSuccessful();
$this->assertJsonContains([
'@id' => $iri,
'name' => self::CMD_GROUP_UPDATE
]);
}
/**
* @throws TransportExceptionInterface
* @throws ServerExceptionInterface
* @throws RedirectionExceptionInterface
* @throws DecodingExceptionInterface
* @throws ClientExceptionInterface
*/
public function testDeleteCommandGroup(): void
{
UserFactory::createOne(['username' => self::USER_ADMIN, 'roles'=> [UserGroupPermissions::ROLE_SUPER_ADMIN]]);
CommandGroupFactory::createOne(['name' => self::CMD_GROUP_DELETE]);
$iri = $this->findIriBy(CommandGroup::class, ['name' => self::CMD_GROUP_DELETE]);
$this->createClientWithCredentials()->request('DELETE', $iri);
$this->assertResponseStatusCodeSame(204);
$this->assertNull(
static::getContainer()->get('doctrine')->getRepository(CommandGroup::class)->findOneBy(['name' => self::CMD_GROUP_DELETE])
);
}
}

42
tests/Functional/CommandTaskTest.php
View File

@ -4,9 +4,12 @@ namespace Functional;
use App\Entity\Command;
use App\Entity\CommandTask;
use App\Entity\OrganizationalUnit;
use App\Factory\CommandFactory;
use App\Factory\CommandTaskFactory;
use App\Factory\OrganizationalUnitFactory;
use App\Factory\UserFactory;
use App\Model\OrganizationalUnitTypes;
use App\Model\UserGroupPermissions;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
@ -59,17 +62,13 @@ class CommandTaskTest extends AbstractTest
{
UserFactory::createOne(['username' => self::USER_ADMIN, 'roles'=> [UserGroupPermissions::ROLE_SUPER_ADMIN]]);
CommandFactory::createOne(['name' => self::CMD_CREATE]);
$commandIri = $this->findIriBy(Command::class, ['name' => self::CMD_CREATE]);
$date = new \DateTimeImmutable();
OrganizationalUnitFactory::createOne(['type' => OrganizationalUnitTypes::ORGANIZATIONAL_UNIT]);
$ouIri = $this->findIriBy(OrganizationalUnit::class, ['type' => OrganizationalUnitTypes::ORGANIZATIONAL_UNIT]);
$this->createClientWithCredentials()->request('POST', '/command-tasks',['json' => [
'dateTime' => $date->format('Y-m-d H:i:s'),
'notes' => self::CMD_TASK_CREATE,
'commands' => [
$commandIri
]
'name' => self::CMD_TASK_CREATE,
'organizationalUnit' => $ouIri,
'scope' => 'organizational-unit',
]]);
$this->assertResponseStatusCodeSame(201);
@ -77,7 +76,8 @@ class CommandTaskTest extends AbstractTest
$this->assertJsonContains([
'@context' => '/contexts/CommandTaskOutput',
'@type' => 'CommandTask',
'notes' => self::CMD_TASK_CREATE,
'name' => self::CMD_TASK_CREATE,
'scope' => 'organizational-unit',
]);
}
@ -92,17 +92,23 @@ class CommandTaskTest extends AbstractTest
{
UserFactory::createOne(['username' => self::USER_ADMIN, 'roles'=> [UserGroupPermissions::ROLE_SUPER_ADMIN]]);
CommandTaskFactory::createOne(['notes' => self::CMD_TASK_CREATE]);
$iri = $this->findIriBy(CommandTask::class, ['notes' => self::CMD_TASK_CREATE]);
CommandTaskFactory::createOne(['name' => self::CMD_TASK_CREATE]);
$iri = $this->findIriBy(CommandTask::class, ['name' => self::CMD_TASK_CREATE]);
OrganizationalUnitFactory::createOne(['type' => OrganizationalUnitTypes::ORGANIZATIONAL_UNIT]);
$ouIri = $this->findIriBy(OrganizationalUnit::class, ['type' => OrganizationalUnitTypes::ORGANIZATIONAL_UNIT]);
$this->createClientWithCredentials()->request('PUT', $iri, ['json' => [
'notes' => self::CMD_TASK_UPDATE,
'name' => self::CMD_TASK_UPDATE,
'organizationalUnit' => $ouIri,
'scope' => 'organizational-unit',
]]);
$this->assertResponseIsSuccessful();
$this->assertJsonContains([
'@id' => $iri,
'notes' => self::CMD_TASK_UPDATE
'name' => self::CMD_TASK_UPDATE,
'scope' => 'organizational-unit',
]);
}
@ -117,13 +123,15 @@ class CommandTaskTest extends AbstractTest
{
UserFactory::createOne(['username' => self::USER_ADMIN, 'roles'=> [UserGroupPermissions::ROLE_SUPER_ADMIN]]);
CommandTaskFactory::createOne(['notes' => self::CMD_TASK_DELETE]);
$iri = $this->findIriBy(CommandTask::class, ['notes' => self::CMD_TASK_DELETE]);
$ou = OrganizationalUnitFactory::createOne(['type' => OrganizationalUnitTypes::ORGANIZATIONAL_UNIT]);
CommandTaskFactory::createOne(['name' => self::CMD_TASK_DELETE, 'organizationalUnit' => $ou, 'scope' => 'organizational-unit']);
$iri = $this->findIriBy(CommandTask::class, ['name' => self::CMD_TASK_DELETE]);
$this->createClientWithCredentials()->request('DELETE', $iri);
$this->assertResponseStatusCodeSame(204);
$this->assertNull(
static::getContainer()->get('doctrine')->getRepository(CommandTask::class)->findOneBy(['notes' => self::CMD_TASK_DELETE])
static::getContainer()->get('doctrine')->getRepository(CommandTask::class)->findOneBy(['name' => self::CMD_TASK_DELETE])
);
}
}