From b26b7a2706d9b1ff180731011df6bfd2988f0581 Mon Sep 17 00:00:00 2001 From: LenaertsJ Date: Tue, 5 Dec 2023 16:26:06 +0000 Subject: [PATCH] Notification: avoid the comment's content to be null --- .../unreleased/Fixed-20231129-113458.yaml | 5 +++ .../Entity/AccompanyingPeriod/Comment.php | 2 +- .../Form/AccompanyingCourseCommentType.php | 1 + .../migrations/Version20231128143534.php | 36 +++++++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 .changes/unreleased/Fixed-20231129-113458.yaml create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20231128143534.php diff --git a/.changes/unreleased/Fixed-20231129-113458.yaml b/.changes/unreleased/Fixed-20231129-113458.yaml new file mode 100644 index 000000000..e2d74d98e --- /dev/null +++ b/.changes/unreleased/Fixed-20231129-113458.yaml @@ -0,0 +1,5 @@ +kind: Fixed +body: Fix error when posting an empty comment on an accompanying period. +time: 2023-11-29T11:34:58.986983057+01:00 +custom: + Issue: "214" diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php index 81a84c64a..c972f453a 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php @@ -41,7 +41,7 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface private ?AccompanyingPeriod $accompanyingPeriod = null; /** - * @ORM\Column(type="text") + * @ORM\Column(type="text", nullable=false, options={"default":""}) * * @Groups({"read", "write", "docgen:read"}) * diff --git a/src/Bundle/ChillPersonBundle/Form/AccompanyingCourseCommentType.php b/src/Bundle/ChillPersonBundle/Form/AccompanyingCourseCommentType.php index 9107ef61e..897fa36c0 100644 --- a/src/Bundle/ChillPersonBundle/Form/AccompanyingCourseCommentType.php +++ b/src/Bundle/ChillPersonBundle/Form/AccompanyingCourseCommentType.php @@ -26,6 +26,7 @@ class AccompanyingCourseCommentType extends AbstractType { $builder->add('content', ChillTextareaType::class, [ 'required' => false, + 'empty_data' => '', ]); } diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20231128143534.php b/src/Bundle/ChillPersonBundle/migrations/Version20231128143534.php new file mode 100644 index 000000000..5ec19392a --- /dev/null +++ b/src/Bundle/ChillPersonBundle/migrations/Version20231128143534.php @@ -0,0 +1,36 @@ +addSql("UPDATE chill_person_accompanying_period_comment SET content='' WHERE content IS NULL"); + $this->addSql('ALTER TABLE chill_person_accompanying_period_comment ALTER COLUMN content SET NOT NULL'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_comment ALTER COLUMN content SET DEFAULT \'\''); + } + + public function down(Schema $schema): void + { + $this->addSql('ALTER TABLE chill_person_accompanying_period_comment ALTER COLUMN content DROP DEFAULT'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_comment ALTER COLUMN content DROP NOT NULL'); + } +}