Skip to content

Commit 979bb2e

Browse files
committed
Fix: not nullable fields
1 parent 66465c7 commit 979bb2e

4 files changed

Lines changed: 20 additions & 28 deletions

File tree

src/Domain/Messaging/Model/ListMessage.php

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,22 @@ class ListMessage implements DomainModel, Identity, ModificationDate
2727

2828
#[ORM\ManyToOne(targetEntity: Message::class, inversedBy: 'listMessages')]
2929
#[ORM\JoinColumn(name: 'messageid', referencedColumnName: 'id', nullable: false)]
30-
private ?Message $message = null;
30+
private Message $message;
3131

3232
#[ORM\ManyToOne(targetEntity: SubscriberList::class, inversedBy: 'listMessages')]
3333
#[ORM\JoinColumn(name: 'listid', referencedColumnName: 'id', nullable: false)]
34-
private ?SubscriberList $subscriberList = null;
34+
private SubscriberList $subscriberList;
3535

3636
#[ORM\Column(name: 'entered', type: 'datetime', nullable: true)]
3737
private ?DateTimeInterface $entered = null;
3838

3939
#[ORM\Column(name: 'modified', type: 'datetime')]
4040
private ?DateTime $updatedAt = null;
4141

42-
public function __construct()
42+
public function __construct(Message $message, SubscriberList $subscriberList)
4343
{
44+
$this->message = $message;
45+
$this->subscriberList = $subscriberList;
4446
$this->updatedAt = new DateTime();
4547
$this->entered = new DateTime();
4648
}
@@ -50,28 +52,16 @@ public function getId(): ?int
5052
return $this->id;
5153
}
5254

53-
public function getMessage(): ?Message
55+
public function getMessage(): Message
5456
{
5557
return $this->message;
5658
}
5759

58-
public function setMessage(?Message $message): self
59-
{
60-
$this->message = $message;
61-
return $this;
62-
}
63-
64-
public function getList(): ?SubscriberList
60+
public function getList(): SubscriberList
6561
{
6662
return $this->subscriberList;
6763
}
6864

69-
public function setList(?SubscriberList $subscriberList): self
70-
{
71-
$this->subscriberList = $subscriberList;
72-
return $this;
73-
}
74-
7565
public function getEntered(): ?DateTimeInterface
7666
{
7767
return $this->entered;

src/Domain/Messaging/Service/Manager/ListMessageManager.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ public function __construct(
3737
*/
3838
public function associateMessageWithList(Message $message, SubscriberList $subscriberList): ListMessage
3939
{
40-
$listMessage = new ListMessage();
41-
$listMessage->setMessage($message);
42-
$listMessage->setList($subscriberList);
43-
40+
$listMessage = new ListMessage(
41+
$message,
42+
$subscriberList
43+
);
4444
$this->entityManager->persist($listMessage);
4545

4646
return $listMessage;

tests/Integration/Domain/Messaging/Repository/UserMessageBounceRepositoryTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,18 +119,18 @@ public function testGetListBounceTotalsReturnsAggregatedBouncesPerSubscriberForL
119119
self::assertSame(
120120
[
121121
[
122-
'subscriberId' => $subscriber1->getId(),
122+
'subscriber_id' => $subscriber1->getId(),
123123
'email' => 'one@example.com',
124124
'confirmed' => true,
125125
'blacklisted' => false,
126-
'totalBounces' => 2,
126+
'total_bounces' => 2,
127127
],
128128
[
129-
'subscriberId' => $subscriber2->getId(),
129+
'subscriber_id' => $subscriber2->getId(),
130130
'email' => 'two@example.com',
131131
'confirmed' => false,
132132
'blacklisted' => true,
133-
'totalBounces' => 1,
133+
'total_bounces' => 1,
134134
],
135135
],
136136
$rows

tests/Unit/Domain/Messaging/Service/Manager/MessageManagerTest.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,11 @@ public function testUpdateStatusSetsSubmittedWhenRequiredFieldsAndListArePresent
229229
owner: null
230230
);
231231

232-
$listMessage = new ListMessage();
233-
$listMessage->setMessage($message);
234-
$listMessage->setList($this->createMock(SubscriberList::class));
232+
$listMessage = new ListMessage(
233+
message: $message,
234+
subscriberList: $this->createMock(SubscriberList::class)
235+
);
236+
235237
$message->getListMessages()->add($listMessage);
236238

237239
$updated = $manager->updateStatus($message, Message\MessageStatus::Submitted);

0 commit comments

Comments
 (0)