From 250e186017ab51f8a2344db41b50e99b24103229 Mon Sep 17 00:00:00 2001 From: Kouril42 Date: Thu, 2 Feb 2023 17:09:16 +0100 Subject: [PATCH] Merging Corridor and Room in Place --- .gitignore | 4 + src/Entity/Corridor.php | 51 ----------- src/Entity/Cylinder.php | 12 +-- src/Entity/Floor.php | 30 +++--- src/Entity/Place.php | 92 ++++++++++++++++--- src/Entity/PlaceName.php | 53 ++--------- src/Entity/PolySurface.php | 12 +-- src/Entity/Polyhedron.php | 12 +-- src/Entity/Room.php | 157 -------------------------------- src/Entity/RoomUsersName.php | 30 +++--- src/Entity/ThreeDObjectFile.php | 12 +-- 11 files changed, 142 insertions(+), 323 deletions(-) delete mode 100644 src/Entity/Corridor.php delete mode 100644 src/Entity/Room.php diff --git a/.gitignore b/.gitignore index 141df9b..d8adee2 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,7 @@ # Secret keys config/secrets/prod/prod.decrypt.private.php config/secrets/dev/ + + +# Test +src/trash/ \ No newline at end of file diff --git a/src/Entity/Corridor.php b/src/Entity/Corridor.php deleted file mode 100644 index 835a226..0000000 --- a/src/Entity/Corridor.php +++ /dev/null @@ -1,51 +0,0 @@ -id; - } - - public function getType(): ?string - { - return $this->type; - } - public function setType(string $type): self - { - $this->type = $type; - return $this; - } - - public function getFloor(): ?Floor - { - return $this->floor; - } - - public function setFloor(?Floor $floor): self - { - $this->floor = $floor; - - return $this; - } -} diff --git a/src/Entity/Cylinder.php b/src/Entity/Cylinder.php index cf26c3c..274d1c4 100644 --- a/src/Entity/Cylinder.php +++ b/src/Entity/Cylinder.php @@ -20,8 +20,8 @@ class Cylinder #[ORM\JoinColumn(nullable: false)] private $cylinderbase; - #[ORM\ManyToOne(targetEntity: Room::class, inversedBy: "CylinderRepresentation")] - private $room; + #[ORM\ManyToOne(targetEntity: Place::class, inversedBy: "CylinderRepresentation")] + private $place; public function getId(): ?int { @@ -52,14 +52,14 @@ class Cylinder return $this; } - public function getRoom(): ?Room + public function getPlace(): ?Place { - return $this->room; + return $this->place; } - public function setRoom(?Room $room): self + public function setPlace(?Place $place): self { - $this->room = $room; + $this->place = $place; return $this; } diff --git a/src/Entity/Floor.php b/src/Entity/Floor.php index bcc3de4..579fd91 100644 --- a/src/Entity/Floor.php +++ b/src/Entity/Floor.php @@ -19,12 +19,12 @@ class Floor #[ORM\JoinColumn(nullable: false)] private $building; - #[ORM\OneToMany(targetEntity: Corridor::class, mappedBy: "floor")] - private $corridors; + #[ORM\ManyToMany(targetEntity: Place::class, mappedBy: "floors")] + private $places; public function __construct() { - $this->corridors = new ArrayCollection(); + $this->places = new ArrayCollection(); } public function getId(): ?int @@ -40,34 +40,32 @@ class Floor public function setBuilding(?Building $building): self { $this->building = $building; - return $this; } /** - * @return Collection + * @return Collection */ - public function getCorridors(): Collection + public function getPlaces(): Collection { - return $this->corridors; + return $this->places; } - public function addCorridor(Corridor $corridor): self + public function addPlace(Place $place): self { - if (!$this->corridors->contains($corridor)) { - $this->corridors[] = $corridor; - $corridor->setFloor($this); + if (!$this->places->contains($place)) { + $this->places[] = $place; + $place->setFloor($this); } - return $this; } - public function removeCorridor(Corridor $corridor): self + public function removePlace(Place $place): self { - if ($this->corridors->removeElement($corridor)) { + if ($this->places->removeElement($place)) { // set the owning side to null (unless already changed) - if ($corridor->getFloor() === $this) { - $corridor->setFloor(null); + if ($place->getFloor() === $this) { + $place->setFloor(null); } } diff --git a/src/Entity/Place.php b/src/Entity/Place.php index d382658..569d3b3 100644 --- a/src/Entity/Place.php +++ b/src/Entity/Place.php @@ -8,10 +8,10 @@ use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; #[ORM\Entity(repositoryClass: PlaceRepository::class)] -#[ORM\MappedSuperclass] -#[ORM\InheritanceType("JOINED")] -#[ORM\DiscriminatorColumn(name: "type", type: "string")] -#[ORM\DiscriminatorMap(["room" => Room::class, "corridor" => Corridor::class])] +// #[ORM\MappedSuperclass] +// #[ORM\InheritanceType("JOINED")] +// #[ORM\DiscriminatorColumn(name: "type", type: "string")] +// #[ORM\DiscriminatorMap(["room" => Room::class, "corridor" => Corridor::class])] class Place { #[ORM\Id] @@ -19,19 +19,33 @@ class Place #[ORM\Column(type: "integer")] private $id; + #[ORM\Type] + #[ORM\Column(type: "string")] + // Either 'C'orridor , 'S'tairs , 'E'levator or 'R'oom + private $type; + + #[ORM\OneToMany(targetEntity: PlaceName::class, mappedBy: "place")] + private $names; + + #[ORM\OneToMany(targetEntity: RoomUserName::class, mappedBy: "place")] + private $users; + + #[ORM\ManyToMany(targetEntity: Floor::class, inversedBy: "places")] + private $floors; + #[ORM\ManyToMany(targetEntity: Place::class, inversedBy: "connectedPlaces")] private $connection; #[ORM\ManyToMany(targetEntity: Place::class, mappedBy: "connection")] private $connectedPlaces; - - #[ORM\OneToMany(targetEntity: PlaceName::class, mappedBy: "place")] - private $names; public function __construct() { $this->connection = new ArrayCollection(); $this->connectedPlaces = new ArrayCollection(); + $this->names = new ArrayCollection(); + $this->users = new ArrayCollection(); + $this->floors = new ArrayCollection(); } public function getId(): ?int @@ -39,10 +53,23 @@ class Place return $this->id; } + public function getType(): ?string + { + return $this->type; + } + public function setType(string $type): bool + { + if ($type == 'C' or $type == 'S' or $type == 'E' or $type == 'R') { + $this->type = $type; + return true; + } + return false; + } + /** * @return Collection */ - public function getName(): Collection + public function getNames(): Collection { return $this->names; } @@ -52,14 +79,57 @@ class Place if (!$this->names->contains($name)) { $this->names[] = $name; } - return $this; } public function removeName(self $name): self { $this->names->removeElement($name); + return $this; + } + + /** + * @return Collection + */ + public function getRoomUsers(): Collection + { + return $this->users; + } + + public function addRoomUser(self $user): self + { + if (!$this->users->contains($user)) { + $this->users[] = $user; + } + return $this; + } + + public function removeRoomUser(self $user): self + { + $this->users->removeElement($user); + return $this; + } + + /** + * @return Collection + */ + public function getFloors(): Collection + { + return $this->floors; + } + + public function addFloor(self $floor): self + { + if (!$this->floors->contains($floor)) { + $this->floors[] = $floor; + } + return $this; + } + + public function removeFloor(self $floor): self + { + $this->floors->removeElement($floor); return $this; } /** @@ -75,14 +145,12 @@ class Place if (!$this->connection->contains($connection)) { $this->connection[] = $connection; } - return $this; } public function removeConnection(self $connection): self { $this->connection->removeElement($connection); - return $this; } @@ -100,7 +168,6 @@ class Place $this->connectedPlaces[] = $connectedPlace; $connectedPlace->addConnection($this); } - return $this; } @@ -109,7 +176,6 @@ class Place if ($this->connectedPlaces->removeElement($connectedPlace)) { $connectedPlace->removeConnection($this); } - return $this; } } diff --git a/src/Entity/PlaceName.php b/src/Entity/PlaceName.php index b99d576..7d1a08d 100644 --- a/src/Entity/PlaceName.php +++ b/src/Entity/PlaceName.php @@ -7,7 +7,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -#[ORM\Entity(repositoryClass: PlaceNamenRepository::class)] +#[ORM\Entity(repositoryClass: PlaceNameRepository::class)] class PlaceName { #[ORM\Id] @@ -18,58 +18,23 @@ class PlaceName #[ORM\Column(type: "string")] private $name; - #[ORM\ManyToOne(targetEntity: Place::class, inversedBy: "names")] - private $room; + #[ORM\ManyToOne(targetEntity: Place::class, inversedBy: "id")] + private $place; + - public function __construct() - { - $this->polyhedronface = new ArrayCollection(); - } public function getId(): ?int { return $this->id; } - /** - * @return Collection - */ - public function getPolyhedronface(): Collection + public function getPlace(): ?Place { - return $this->polyhedronface; + return $this->place; } - - public function addPolyhedronface(PlaneSurface $polyhedronface): self + public function setPlace(?Place $place): self { - if (!$this->polyhedronface->contains($polyhedronface)) { - $this->polyhedronface[] = $polyhedronface; - $polyhedronface->setPolyhedron($this); - } - - return $this; - } - - public function removePolyhedronface(PlaneSurface $polyhedronface): self - { - if ($this->polyhedronface->removeElement($polyhedronface)) { - // set the owning side to null (unless already changed) - if ($polyhedronface->getPolyhedron() === $this) { - $polyhedronface->setPolyhedron(null); - } - } - - return $this; - } - - public function getRoom(): ?Room - { - return $this->room; - } - - public function setRoom(?Room $room): self - { - $this->room = $room; - + $this->place = $place; return $this; } @@ -77,11 +42,9 @@ class PlaceName { return $this->name; } - public function setName(?string $name): self { $this->name = $name; - return $this; } } diff --git a/src/Entity/PolySurface.php b/src/Entity/PolySurface.php index c158cc7..768d6b0 100644 --- a/src/Entity/PolySurface.php +++ b/src/Entity/PolySurface.php @@ -18,8 +18,8 @@ class PolySurface #[ORM\OneToMany(targetEntity: PlaneSurface::class, mappedBy: "polySurface")] private $polysurfaceComponent; - #[ORM\ManyToOne(targetEntity: Corridor::class)] - private $SurfaceRepresentation; + #[ORM\ManyToOne(targetEntity: Place::class)] + private $place; public function __construct() { @@ -61,14 +61,14 @@ class PolySurface return $this; } - public function getSurfaceRepresentation(): ?Corridor + public function getPlace(): ?Place { - return $this->SurfaceRepresentation; + return $this->place; } - public function setSurfaceRepresentation(?Corridor $SurfaceRepresentation): self + public function setPlace(?Place $place): self { - $this->SurfaceRepresentation = $SurfaceRepresentation; + $this->place = $place; return $this; } diff --git a/src/Entity/Polyhedron.php b/src/Entity/Polyhedron.php index b092be7..4718ee9 100644 --- a/src/Entity/Polyhedron.php +++ b/src/Entity/Polyhedron.php @@ -18,8 +18,8 @@ class Polyhedron #[ORM\OneToMany(targetEntity: PlaneSurface::class, mappedBy: "polyhedron")] private $polyhedronface; - #[ORM\ManyToOne(targetEntity: Room::class, inversedBy: "PolyhedronRepresentation")] - private $room; + #[ORM\ManyToOne(targetEntity: Place::class, inversedBy: "PolyhedronRepresentation")] + private $place; public function __construct() { @@ -61,14 +61,14 @@ class Polyhedron return $this; } - public function getRoom(): ?Room + public function getPlace(): ?Place { - return $this->room; + return $this->place; } - public function setRoom(?Room $room): self + public function setPlace(?Place $place): self { - $this->room = $room; + $this->place = $place; return $this; } diff --git a/src/Entity/Room.php b/src/Entity/Room.php deleted file mode 100644 index 62bfda2..0000000 --- a/src/Entity/Room.php +++ /dev/null @@ -1,157 +0,0 @@ -ComplexRepresentation = new ArrayCollection(); - $this->PolyhedronRepresentation = new ArrayCollection(); - $this->CylinderRepresentation = new ArrayCollection(); - } - - public function getId(): ?int - { - return $this->id; - } - - /** - * @return Collection - */ - public function getUser(): Collection - { - return $this->users; - } - - public function addUser(self $user): self - { - if (!$this->users->contains($user)) { - $this->users[] = $user; - } - - return $this; - } - - public function removeUser(self $user): self - { - $this->users->removeElement($user); - - return $this; - } - - - /** - * @return Collection - */ - public function getComplexRepresentation(): Collection - { - return $this->ComplexRepresentation; - } - - public function addComplexRepresentation(ThreeDObjectFile $complexRepresentation): self - { - if (!$this->ComplexRepresentation->contains($complexRepresentation)) { - $this->ComplexRepresentation[] = $complexRepresentation; - $complexRepresentation->setRoom($this); - } - - return $this; - } - - public function removeComplexRepresentation(ThreeDObjectFile $complexRepresentation): self - { - if ($this->ComplexRepresentation->removeElement($complexRepresentation)) { - // set the owning side to null (unless already changed) - if ($complexRepresentation->getRoom() === $this) { - $complexRepresentation->setRoom(null); - } - } - - return $this; - } - - /** - * @return Collection - */ - public function getPolyhedronRepresentation(): Collection - { - return $this->PolyhedronRepresentation; - } - - public function addPolyhedronRepresentation(Polyhedron $polyhedronRepresentation): self - { - if (!$this->PolyhedronRepresentation->contains($polyhedronRepresentation)) { - $this->PolyhedronRepresentation[] = $polyhedronRepresentation; - $polyhedronRepresentation->setRoom($this); - } - - return $this; - } - - public function removePolyhedronRepresentation(Polyhedron $polyhedronRepresentation): self - { - if ($this->PolyhedronRepresentation->removeElement($polyhedronRepresentation)) { - // set the owning side to null (unless already changed) - if ($polyhedronRepresentation->getRoom() === $this) { - $polyhedronRepresentation->setRoom(null); - } - } - - return $this; - } - - /** - * @return Collection - */ - public function getCylinderRepresentation(): Collection - { - return $this->CylinderRepresentation; - } - - public function addCylinderRepresentation(Cylinder $cylinderRepresentation): self - { - if (!$this->CylinderRepresentation->contains($cylinderRepresentation)) { - $this->CylinderRepresentation[] = $cylinderRepresentation; - $cylinderRepresentation->setRoom($this); - } - - return $this; - } - - public function removeCylinderRepresentation(Cylinder $cylinderRepresentation): self - { - if ($this->CylinderRepresentation->removeElement($cylinderRepresentation)) { - // set the owning side to null (unless already changed) - if ($cylinderRepresentation->getRoom() === $this) { - $cylinderRepresentation->setRoom(null); - } - } - - return $this; - } -} diff --git a/src/Entity/RoomUsersName.php b/src/Entity/RoomUsersName.php index e9541ae..4f4930a 100644 --- a/src/Entity/RoomUsersName.php +++ b/src/Entity/RoomUsersName.php @@ -2,13 +2,12 @@ namespace App\Entity; -use App\Repository\PolyhedronRepository; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -#[ORM\Entity(repositoryClass: RoomRepository::class)] -class RoomUsersName +#[ORM\Entity(repositoryClass: RoomUserRepository::class)] +class RoomUserName { #[ORM\Id] #[ORM\GeneratedValue] @@ -16,38 +15,35 @@ class RoomUsersName private $id; #[ORM\Column(type: "string")] - private $usersName; + private $userName; - #[ORM\ManyToOne(targetEntity: Room::class, inversedBy: "id")] - private $room; + #[ORM\ManyToOne(targetEntity: Place::class, inversedBy: "id")] + private $place; public function getId(): ?int { return $this->id; } - - public function getRoom(): ?Room + public function getPlace(): ?Place { - return $this->room; + return $this->place; } - public function setRoom(?Room $room): self + public function setPlace(?Place $place): self { - $this->room = $room; - + $this->place = $place; return $this; } - public function getUsersName(): ?string + public function getUserName(): ?string { - return $this->usersName; + return $this->userName; } - public function setUsersName(?string $name): self + public function setUserName(?string $name): self { - $this->usersName = $name; - + $this->userName = $name; return $this; } } diff --git a/src/Entity/ThreeDObjectFile.php b/src/Entity/ThreeDObjectFile.php index 79d293a..d4b638e 100644 --- a/src/Entity/ThreeDObjectFile.php +++ b/src/Entity/ThreeDObjectFile.php @@ -16,8 +16,8 @@ class ThreeDObjectFile #[ORM\Column(type: "string", length: 255)] private $filename; - #[ORM\ManyToOne(targetEntity: Room::class, inversedBy: "ComplexRepresentation")] - private $room; + #[ORM\ManyToOne(targetEntity: Place::class, inversedBy: "ComplexRepresentation")] + private $place; public function getId(): ?int { @@ -36,14 +36,14 @@ class ThreeDObjectFile return $this; } - public function getRoom(): ?Room + public function getPlace(): ?Place { - return $this->room; + return $this->place; } - public function setRoom(?Room $room): self + public function setPlace(?Place $place): self { - $this->room = $room; + $this->place = $place; return $this; }