Generating (UU)IDs in ctors, corrected data types of properties

AVCSH · Feb 12, 2018 · 1154910 · 1154910
1 parent bcae021
commit 1154910
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 47 deletions.
diff --git a/src/Entity/Event.php b/src/Entity/Event.php
@@ -29,7 +29,7 @@ class Event
 	/**
 	 * @var string
 	 *
-	 * @ORM\Column(type="string")
+	 * @ORM\Column(type="text")
 	 */
 	protected $description;
 
@@ -39,39 +39,28 @@ class Event
 	 */
 	protected $eventType;
 
-
-	/** 
-	 * ItemType constructor
-	 *
-	 */
-	public function __construct() {
+	public function __construct(string $title, EventType $eventType) {
 		$this->id = Uuid::uuid4();
+		$this->title = $title;
+		$this->eventType = $eventType;
+	}
+
+	public function getId(): UuidInterface {
+		return $this->id;
 	}
 
-	/**
-	 * @return string
-	 */
 	public function getTitle(): string {
 		return $this->title;
 	}
 
-	/**
-	 * @param string $title
-	 */
 	public function setTitle(string $title): void {
 		$this->title = $title;
 	}
 
-	/**
-	 * @return EventType
-	 */
 	public function getEventType(): EventType {
 		return $this->eventType;
 	}
 
-	/**
-	 * @param EventType $eventType
-	 */
 	public function setEventType(EventType $eventType): void {
 		$this->eventType = $eventType;
 	}

diff --git a/src/Entity/EventType.php b/src/Entity/EventType.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 namespace App\Entity;
 use Doctrine\ORM\Mapping as ORM;
@@ -25,41 +25,31 @@ class EventType
 
 	/**
 	 * @var string|null
-	 * @ORM\Column(type="string", nullable=true)
+	 * @ORM\Column(type="string", nullable=true, length=512)
 	 */
 	protected $comment;
 
-	/**
-	 * @param string $name
-	 * */
-	public function __construct(string $name) {
+	public function __construct(string $name, ?string $comment = null) {
 		$this->name = $name;
+		$this->comment = $comment;
+	}
+
+	public function getId(): int {
+		return $this->id;
 	}
 
-	/**
-	 * @return string
-	 */
 	public function getName(): string {
 		return $this->name;
 	}
 
-	/**
-	 * @param string $name
-	 */
 	public function setName(string $name): void {
 		$this->name = $name;
 	}
 
-	/**
-	 * @return null|string
-	 */
 	public function getComment(): ?string {
 		return $this->comment;
 	}
 
-	/**
-	 * @param null|string $comment
-	 */
 	public function setComment(?string $comment): void {
 		$this->comment = $comment;
 	}

diff --git a/src/Entity/SubEvent.php b/src/Entity/SubEvent.php
@@ -1,4 +1,4 @@
-<?php declare(strict_types=1);
+<?php declare(strict_types = 1);
 
 namespace App\Entity;
 use Doctrine\ORM\Mapping as ORM;
@@ -18,6 +18,12 @@ class SubEvent
 	 */
 	protected $id;
 
+	/**
+	 * @var Event
+	 *
+	 * @ORM\ManyToOne(targetEntity="Event")
+	 */
+	protected $parent;
 
 	/**
 	 * @var string
@@ -29,31 +35,78 @@ class SubEvent
 	/**
 	 * @var string
 	 *
-	 * @ORM\Column(type="string")
+	 * @ORM\Column(type="text")
 	 */
 	protected $description;
 
-
-
-	/** 
-	 * ItemType constructor
+	/**
+	 * @var \DateTime
 	 *
+	 * @ORM\Column(type="datetimetz")
 	 */
+	protected $startDate;
+
 	public function __construct() {
 		$this->id = Uuid::uuid4();
 	}
 
 	/**
-	 * @return string
+	 * @var \DateTime
+	 *
+	 * @ORM\Column(type="datetimetz")
 	 */
+	protected $endDate;
+
+	public function __construct(Event $parent, string $title, string $description, \DateTime $startDate, \DateTime $endDate) {
+		$this->id = Uuid::uuid4();
+		$this->parent = $parent;
+		$this->title = $title;
+		$this->description = $description;
+		$this->startDate = $startDate;
+		$this->endDate = $endDate;
+	}
+
+	public function getId(): UuidInterface {
+		return $this->id;
+	}
+
+	public function getParent(): Event {
+		return $this->parent;
+	}
+
+	public function setParent(Event $parent): void {
+		$this->parent = $parent;
+	}
+
 	public function getTitle(): string {
 		return $this->title;
 	}
 
-	/**
-	 * @param string $title
-	 */
 	public function setTitle(string $title): void {
 		$this->title = $title;
 	}
+
+	public function getDescription(): string {
+		return $this->description;
+	}
+
+	public function setDescription(string $description): void {
+		$this->description = $description;
+	}
+
+	public function getStartDate(): \DateTime {
+		return $this->startDate;
+	}
+
+	public function setStartDate(\DateTime $startDate): void {
+		$this->startDate = $startDate;
+	}
+
+	public function getEndDate(): \DateTime {
+		return $this->endDate;
+	}
+
+	public function setEndDate(\DateTime $endDate): void {
+		$this->endDate = $endDate;
+	}
 }