From 10529c77da3186fa680b9918659c8ace3879112c Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 5 Mar 2024 16:46:50 +0100 Subject: [PATCH] product fix --- migrations/Version20240304164555.php | 57 ------------------------- migrations/Version20240305152901.php | 39 +++++++++++++++++ src/Factory/ProductFactory.php | 1 - src/Mapper/ProductEntityToApiMapper.php | 3 +- 4 files changed, 40 insertions(+), 60 deletions(-) delete mode 100644 migrations/Version20240304164555.php create mode 100644 migrations/Version20240305152901.php diff --git a/migrations/Version20240304164555.php b/migrations/Version20240304164555.php deleted file mode 100644 index 98b4bf2..0000000 --- a/migrations/Version20240304164555.php +++ /dev/null @@ -1,57 +0,0 @@ -addSql('CREATE TABLE comment (id INT AUTO_INCREMENT NOT NULL, owner_id INT NOT NULL, posting_id INT NOT NULL, message LONGTEXT NOT NULL, created_at DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', INDEX IDX_9474526C7E3C61F9 (owner_id), INDEX IDX_9474526C9AE985F6 (posting_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB'); - $this->addSql('CREATE TABLE contact (id INT AUTO_INCREMENT NOT NULL, partner_id INT NOT NULL, image_id INT DEFAULT NULL, first_name VARCHAR(255) NOT NULL, last_name VARCHAR(255) NOT NULL, birthday DATE DEFAULT NULL, position VARCHAR(255) DEFAULT NULL, phone VARCHAR(255) DEFAULT NULL, email VARCHAR(255) DEFAULT NULL, created_at DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', INDEX IDX_4C62E6389393F8FE (partner_id), INDEX IDX_4C62E6383DA5256D (image_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB'); - $this->addSql('CREATE TABLE media_object (id INT AUTO_INCREMENT NOT NULL, file_path VARCHAR(255) DEFAULT NULL, created_at DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB'); - $this->addSql('CREATE TABLE partner (id INT AUTO_INCREMENT NOT NULL, logo_id INT DEFAULT NULL, name VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, street VARCHAR(255) DEFAULT NULL, street_no VARCHAR(255) DEFAULT NULL, zip VARCHAR(255) DEFAULT NULL, city VARCHAR(255) DEFAULT NULL, country VARCHAR(255) DEFAULT NULL, website VARCHAR(255) DEFAULT NULL, created_at DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', INDEX IDX_312B3E16F98F144A (logo_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB'); - $this->addSql('CREATE TABLE posting (id INT AUTO_INCREMENT NOT NULL, owner_id INT NOT NULL, partner_id INT NOT NULL, contact_id INT DEFAULT NULL, headline VARCHAR(255) NOT NULL, message LONGTEXT NOT NULL, created_at DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', INDEX IDX_BD275D737E3C61F9 (owner_id), INDEX IDX_BD275D739393F8FE (partner_id), INDEX IDX_BD275D73E7A1254A (contact_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB'); - $this->addSql('CREATE TABLE `user` (id INT AUTO_INCREMENT NOT NULL, email VARCHAR(180) NOT NULL, first_name VARCHAR(255) NOT NULL, last_name VARCHAR(255) NOT NULL, roles JSON NOT NULL COMMENT \'(DC2Type:json)\', password VARCHAR(255) NOT NULL, active TINYINT(1) NOT NULL, created_at DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', UNIQUE INDEX UNIQ_8D93D649E7927C74 (email), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB'); - $this->addSql('ALTER TABLE comment ADD CONSTRAINT FK_9474526C7E3C61F9 FOREIGN KEY (owner_id) REFERENCES `user` (id)'); - $this->addSql('ALTER TABLE comment ADD CONSTRAINT FK_9474526C9AE985F6 FOREIGN KEY (posting_id) REFERENCES posting (id)'); - $this->addSql('ALTER TABLE contact ADD CONSTRAINT FK_4C62E6389393F8FE FOREIGN KEY (partner_id) REFERENCES partner (id)'); - $this->addSql('ALTER TABLE contact ADD CONSTRAINT FK_4C62E6383DA5256D FOREIGN KEY (image_id) REFERENCES media_object (id) ON DELETE SET NULL'); - $this->addSql('ALTER TABLE partner ADD CONSTRAINT FK_312B3E16F98F144A FOREIGN KEY (logo_id) REFERENCES media_object (id) ON DELETE SET NULL'); - $this->addSql('ALTER TABLE posting ADD CONSTRAINT FK_BD275D737E3C61F9 FOREIGN KEY (owner_id) REFERENCES `user` (id)'); - $this->addSql('ALTER TABLE posting ADD CONSTRAINT FK_BD275D739393F8FE FOREIGN KEY (partner_id) REFERENCES partner (id)'); - $this->addSql('ALTER TABLE posting ADD CONSTRAINT FK_BD275D73E7A1254A FOREIGN KEY (contact_id) REFERENCES contact (id)'); - } - - public function down(Schema $schema): void - { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE comment DROP FOREIGN KEY FK_9474526C7E3C61F9'); - $this->addSql('ALTER TABLE comment DROP FOREIGN KEY FK_9474526C9AE985F6'); - $this->addSql('ALTER TABLE contact DROP FOREIGN KEY FK_4C62E6389393F8FE'); - $this->addSql('ALTER TABLE contact DROP FOREIGN KEY FK_4C62E6383DA5256D'); - $this->addSql('ALTER TABLE partner DROP FOREIGN KEY FK_312B3E16F98F144A'); - $this->addSql('ALTER TABLE posting DROP FOREIGN KEY FK_BD275D737E3C61F9'); - $this->addSql('ALTER TABLE posting DROP FOREIGN KEY FK_BD275D739393F8FE'); - $this->addSql('ALTER TABLE posting DROP FOREIGN KEY FK_BD275D73E7A1254A'); - $this->addSql('DROP TABLE comment'); - $this->addSql('DROP TABLE contact'); - $this->addSql('DROP TABLE media_object'); - $this->addSql('DROP TABLE partner'); - $this->addSql('DROP TABLE posting'); - $this->addSql('DROP TABLE `user`'); - } -} diff --git a/migrations/Version20240305152901.php b/migrations/Version20240305152901.php new file mode 100644 index 0000000..ff1fa0b --- /dev/null +++ b/migrations/Version20240305152901.php @@ -0,0 +1,39 @@ +addSql('CREATE TABLE product (id INT AUTO_INCREMENT NOT NULL, image_id INT DEFAULT NULL, name VARCHAR(255) NOT NULL, description LONGTEXT DEFAULT NULL, created_at DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', INDEX IDX_D34A04AD3DA5256D (image_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB'); + $this->addSql('ALTER TABLE product ADD CONSTRAINT FK_D34A04AD3DA5256D FOREIGN KEY (image_id) REFERENCES media_object (id)'); + $this->addSql('ALTER TABLE user ADD image_id INT DEFAULT NULL'); + $this->addSql('ALTER TABLE user ADD CONSTRAINT FK_8D93D6493DA5256D FOREIGN KEY (image_id) REFERENCES media_object (id)'); + $this->addSql('CREATE INDEX IDX_8D93D6493DA5256D ON user (image_id)'); + } + + public function down(Schema $schema): void + { + // this down() migration is auto-generated, please modify it to your needs + $this->addSql('ALTER TABLE product DROP FOREIGN KEY FK_D34A04AD3DA5256D'); + $this->addSql('DROP TABLE product'); + $this->addSql('ALTER TABLE `user` DROP FOREIGN KEY FK_8D93D6493DA5256D'); + $this->addSql('DROP INDEX IDX_8D93D6493DA5256D ON `user`'); + $this->addSql('ALTER TABLE `user` DROP image_id'); + } +} diff --git a/src/Factory/ProductFactory.php b/src/Factory/ProductFactory.php index 70efcd7..2de7927 100644 --- a/src/Factory/ProductFactory.php +++ b/src/Factory/ProductFactory.php @@ -51,7 +51,6 @@ final class ProductFactory extends ModelFactory 'name' => self::faker()->randomElement(FakeValues::PRODUCTS), 'description' => self::faker()->text(), 'image' => MediaObjectProductFactory::random(), - 'createdAt' => \DateTimeImmutable::createFromMutable(self::faker()->dateTime()), ]; } diff --git a/src/Mapper/ProductEntityToApiMapper.php b/src/Mapper/ProductEntityToApiMapper.php index 300a4c4..356521c 100644 --- a/src/Mapper/ProductEntityToApiMapper.php +++ b/src/Mapper/ProductEntityToApiMapper.php @@ -2,7 +2,6 @@ namespace App\Mapper; -use App\ApiResource\PartnerApi; use App\ApiResource\ProductApi; use App\Entity\Product; use App\Service\FileUrlService; @@ -22,7 +21,7 @@ class ProductEntityToApiMapper implements MapperInterface $entity = $from; assert($entity instanceof Product); - $dto = new PartnerApi(); + $dto = new ProductApi(); $dto->id = $entity->getId(); return $dto;