Skip to content
Snippets Groups Projects
Commit 6b70eebf authored by Moreau Elise's avatar Moreau Elise
Browse files

update message table

parent 1fe4e223
No related branches found
No related tags found
No related merge requests found
...@@ -5,6 +5,9 @@ namespace App\Domain\Message; ...@@ -5,6 +5,9 @@ namespace App\Domain\Message;
use JsonSerializable; use JsonSerializable;
use DateTime; use DateTime;
use App\Domain\Group\Group ;
use App\Domain\User\User ;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
...@@ -24,20 +27,22 @@ class Message implements JsonSerializable ...@@ -24,20 +27,22 @@ class Message implements JsonSerializable
private $id; private $id;
/** /**
* @var int * @var
* @ORM\OneToMany(targetEntity="App\Domain\User\User", mappedBy="username") * @ORM\ManyToOne(targetEntity="App\Domain\Group\Group")
* @ORM\JoinColumn(name="id_receiver", referencedColumnName="id")
*/ */
private $id_receiver; private $receiver;
/** /**
* @var int * @var
* @ORM\OneToMany(targetEntity="App\Domain\User\User", mappedBy="username") * @ORM\ManyToOne(targetEntity="App\Domain\User\User")
* @ORM\JoinColumn(name="id_transmitter", referencedColumnName="id")
*/ */
private $id_transmitter; private $transmitter;
/** /**
* @var string * @var string
* @ORM\Column(type="date") * @ORM\Column(type="datetime")
*/ */
private $date; private $date;
...@@ -50,19 +55,18 @@ class Message implements JsonSerializable ...@@ -50,19 +55,18 @@ class Message implements JsonSerializable
/** /**
* @param int|null $id * @param int|null $id
* @param string $id_receiver * @param Group $receiver
* @param string $id_transmitter * @param User $transmitter
* @param string $date * @param DateTime $date
* @param string $body * @param string $body
*/ */
public function __construct(?int $id, int $id_receiver, int $id_transmitter, string $date, public function __construct(?int $id, Group $receiver, User $transmitter, DateTime $date,
string $body) { string $body) {
$date_format = 'd/m/Y';
$this->id = $id; $this->id = $id;
$this->id_receiver = new ArrayCollection(); $this->receiver = $receiver;
$this->id_transmitter = new ArrayCollection(); $this->transmitter = $transmitter;
$this->date = DateTime::createFromFormat($date_format, $date); $this->date = $date;
$this->body = $body; $this->body = $body;
} }
...@@ -75,19 +79,19 @@ class Message implements JsonSerializable ...@@ -75,19 +79,19 @@ class Message implements JsonSerializable
} }
/** /**
* @return int * @return Group
*/ */
public function getIdReceiver(): int public function getReceiver(): Group
{ {
return $this->id_receiver; return $this->receiver;
} }
/** /**
* @return int * @return User
*/ */
public function getIdTransmitter(): int public function getTransmitter(): User
{ {
return $this->id_transmitter; return $this->transmitter;
} }
/** /**
...@@ -95,7 +99,7 @@ class Message implements JsonSerializable ...@@ -95,7 +99,7 @@ class Message implements JsonSerializable
*/ */
public function getDate(): string public function getDate(): string
{ {
return $this->date; return $this->date->format('d/M/Y');
} }
/** /**
...@@ -114,8 +118,8 @@ class Message implements JsonSerializable ...@@ -114,8 +118,8 @@ class Message implements JsonSerializable
{ {
return [ return [
'id' => $this->id, 'id' => $this->id,
'id_receiver' => $this->id_receiver, 'receiver' => $this->receiver,
'id_transmitter' => $this->id_transmitter, 'transmitter' => $this->transmitter,
'date' => $this->date, 'date' => $this->date,
'body' => $this->body 'body' => $this->body
]; ];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment