WIP: Symfony 6 project remake #2
|
@ -3,6 +3,7 @@ declare(strict_types=1);
|
||||||
|
|
||||||
namespace App\DataFixtures;
|
namespace App\DataFixtures;
|
||||||
|
|
||||||
|
use App\Enum\Blog\PostTypeEnum;
|
||||||
use Doctrine\Bundle\FixturesBundle\Fixture;
|
use Doctrine\Bundle\FixturesBundle\Fixture;
|
||||||
use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
|
use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
|
||||||
use Doctrine\Persistence\ObjectManager;
|
use Doctrine\Persistence\ObjectManager;
|
||||||
|
@ -28,31 +29,31 @@ class LoadPostData extends Fixture implements OrderedFixtureInterface
|
||||||
/** @var User $prWlUser */
|
/** @var User $prWlUser */
|
||||||
$prWlUser = $this->getReference('test_user_'.LoadUserData::USER_PRWL_ID);
|
$prWlUser = $this->getReference('test_user_'.LoadUserData::USER_PRWL_ID);
|
||||||
|
|
||||||
$longPost = (new Post(self::POST_ID_LONG, $mainUser, new \DateTime(), Post::TYPE_POST))
|
$longPost = (new Post(self::POST_ID_LONG, $mainUser, new \DateTime(), PostTypeEnum::Post))
|
||||||
->setText('Test post with many comments')
|
->setText('Test post with many comments')
|
||||||
->setPrivate(false)
|
->setPrivate(false)
|
||||||
->setDeleted(false)
|
->setDeleted(false)
|
||||||
;
|
;
|
||||||
|
|
||||||
$shortPost = (new Post(self::POST_ID_SHORT, $mainUser, new \DateTime(), Post::TYPE_POST))
|
$shortPost = (new Post(self::POST_ID_SHORT, $mainUser, new \DateTime(), PostTypeEnum::Post))
|
||||||
->setText('Test short post')
|
->setText('Test short post')
|
||||||
->setPrivate(false)
|
->setPrivate(false)
|
||||||
->setDeleted(false)
|
->setDeleted(false)
|
||||||
;
|
;
|
||||||
|
|
||||||
$privateUserPost = (new Post(self::POST_ID_PR_USER, $privateUser, new \DateTime(), Post::TYPE_POST))
|
$privateUserPost = (new Post(self::POST_ID_PR_USER, $privateUser, new \DateTime(), PostTypeEnum::Post))
|
||||||
->setText('Post from private user. Should not be visible in the public feed.')
|
->setText('Post from private user. Should not be visible in the public feed.')
|
||||||
->setPrivate(false)
|
->setPrivate(false)
|
||||||
->setDeleted(false)
|
->setDeleted(false)
|
||||||
;
|
;
|
||||||
|
|
||||||
$wlUserPost = (new Post(self::POST_ID_WL_USER, $wlUser, new \DateTime(), Post::TYPE_POST))
|
$wlUserPost = (new Post(self::POST_ID_WL_USER, $wlUser, new \DateTime(), PostTypeEnum::Post))
|
||||||
->setText('Post from whitelist-only user. Should only be visible for whitelisted users.')
|
->setText('Post from whitelist-only user. Should only be visible for whitelisted users.')
|
||||||
->setPrivate(false)
|
->setPrivate(false)
|
||||||
->setDeleted(false)
|
->setDeleted(false)
|
||||||
;
|
;
|
||||||
|
|
||||||
$privateWlUserPost = (new Post(self::POST_ID_PR_WL_USER, $prWlUser, new \DateTime(), Post::TYPE_POST))
|
$privateWlUserPost = (new Post(self::POST_ID_PR_WL_USER, $prWlUser, new \DateTime(), PostTypeEnum::Post))
|
||||||
->setText('Post from private AND whitelist-only user. Should not be visible in the public feed.')
|
->setText('Post from private AND whitelist-only user. Should not be visible in the public feed.')
|
||||||
->setPrivate(false)
|
->setPrivate(false)
|
||||||
->setDeleted(false)
|
->setDeleted(false)
|
||||||
|
|
|
@ -4,9 +4,9 @@ declare(strict_types=1);
|
||||||
namespace App\Entity\Blog;
|
namespace App\Entity\Blog;
|
||||||
|
|
||||||
use App\Entity\User;
|
use App\Entity\User;
|
||||||
|
use App\Enum\Blog\PostTypeEnum;
|
||||||
use App\Repository\Blog\TagRepository;
|
use App\Repository\Blog\TagRepository;
|
||||||
use Doctrine\Common\Collections\ArrayCollection;
|
use Doctrine\Common\Collections\{ArrayCollection, Collection};
|
||||||
use Doctrine\Common\Collections\Collection;
|
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
|
|
||||||
#[ORM\Entity(repositoryClass: TagRepository::class)]
|
#[ORM\Entity(repositoryClass: TagRepository::class)]
|
||||||
|
@ -14,9 +14,6 @@ use Doctrine\ORM\Mapping as ORM;
|
||||||
#[ORM\Table(name: 'tags', schema: 'posts')]
|
#[ORM\Table(name: 'tags', schema: 'posts')]
|
||||||
class Post
|
class Post
|
||||||
{
|
{
|
||||||
public const TYPE_POST = 'post';
|
|
||||||
public const TYPE_FEED = 'feed';
|
|
||||||
|
|
||||||
#[ORM\Id]
|
#[ORM\Id]
|
||||||
#[ORM\Column(name: 'id', type: 'text')]
|
#[ORM\Column(name: 'id', type: 'text')]
|
||||||
private string $id;
|
private string $id;
|
||||||
|
@ -30,9 +27,8 @@ class Post
|
||||||
#[ORM\Column(name: 'updated_at', type: 'datetime', nullable: true)]
|
#[ORM\Column(name: 'updated_at', type: 'datetime', nullable: true)]
|
||||||
private ?\DateTime $updatedAt;
|
private ?\DateTime $updatedAt;
|
||||||
|
|
||||||
// TODO: Native Enum
|
#[ORM\Column(name: 'type', type: 'string', length: 6, enumType: PostTypeEnum::class)]
|
||||||
#[ORM\Column(name: 'type', type: 'string', length: 6)]
|
private PostTypeEnum $type;
|
||||||
private string $type = self::TYPE_POST;
|
|
||||||
|
|
||||||
#[ORM\Column(name: 'private', type: 'boolean', nullable: true)]
|
#[ORM\Column(name: 'private', type: 'boolean', nullable: true)]
|
||||||
private bool $private;
|
private bool $private;
|
||||||
|
@ -60,7 +56,7 @@ class Post
|
||||||
private Collection $comments;
|
private Collection $comments;
|
||||||
|
|
||||||
|
|
||||||
public function __construct(string $id, User $author, \DateTime $createdAt, string $type)
|
public function __construct(string $id, User $author, \DateTime $createdAt, PostTypeEnum $type)
|
||||||
{
|
{
|
||||||
$this->id = $id;
|
$this->id = $id;
|
||||||
$this->author = $author;
|
$this->author = $author;
|
||||||
|
@ -105,7 +101,7 @@ class Post
|
||||||
return $this->updatedAt;
|
return $this->updatedAt;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getType(): string
|
public function getType(): PostTypeEnum
|
||||||
{
|
{
|
||||||
return $this->type;
|
return $this->type;
|
||||||
}
|
}
|
||||||
|
|
10
src/Enum/Blog/PostTypeEnum.php
Normal file
10
src/Enum/Blog/PostTypeEnum.php
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
<?php
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Enum\Blog;
|
||||||
|
|
||||||
|
enum PostTypeEnum: string
|
||||||
|
{
|
||||||
|
case Post = 'post';
|
||||||
|
case Feed = 'feed';
|
||||||
|
}
|
|
@ -3,6 +3,7 @@ declare(strict_types=1);
|
||||||
|
|
||||||
namespace App\Factory\Blog;
|
namespace App\Factory\Blog;
|
||||||
|
|
||||||
|
use App\Enum\Blog\PostTypeEnum;
|
||||||
use App\Factory\AbstractFactory;
|
use App\Factory\AbstractFactory;
|
||||||
use App\Factory\UserFactory;
|
use App\Factory\UserFactory;
|
||||||
use Doctrine\ORM\EntityManagerInterface;
|
use Doctrine\ORM\EntityManagerInterface;
|
||||||
|
@ -117,7 +118,7 @@ class PostFactory extends AbstractFactory
|
||||||
$postData->getId(),
|
$postData->getId(),
|
||||||
$author,
|
$author,
|
||||||
new \DateTime($postData->getCreated()),
|
new \DateTime($postData->getCreated()),
|
||||||
$postData->getType() ?: Post::TYPE_POST
|
PostTypeEnum::tryFrom($postData->getType()) ?? PostTypeEnum::Post,
|
||||||
);
|
);
|
||||||
$this->postRepository->save($post);
|
$this->postRepository->save($post);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue