From c060dff87337c95a891e99ca2f9779e7c2aaf4d7 Mon Sep 17 00:00:00 2001
From: Kevin Frantz <mail@kevin-frantz.de>
Date: Sun, 4 Nov 2018 12:00:35 +0100
Subject: [PATCH] Optimized database schema

---
 application/src/Entity/Source/AbstractSource.php    |  3 +--
 .../src/Entity/Source/Data/AbstractDataSource.php   | 13 +++++++++++--
 application/src/Entity/Source/Data/NameSource.php   |  2 +-
 application/src/Entity/Source/Data/UserSource.php   |  2 +-
 application/src/Entity/User.php                     |  6 +++---
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/application/src/Entity/Source/AbstractSource.php b/application/src/Entity/Source/AbstractSource.php
index 96c5d93..cbec1ba 100644
--- a/application/src/Entity/Source/AbstractSource.php
+++ b/application/src/Entity/Source/AbstractSource.php
@@ -19,12 +19,11 @@ use App\Entity\Source\Collection\TreeCollectionSourceInterface;
 /**
  * @author kevinfrantz
  *
- * @see https://www.doctrine-project.org/projects/doctrine-orm/en/2.6/reference/inheritance-mapping.html
  * @ORM\Entity
  * @ORM\Table(name="source")
  * @ORM\InheritanceType("JOINED")
  * @ORM\DiscriminatorColumn(name="discr", type="string")
- * @ORM\DiscriminatorMap({"user" = "UserSource","name" = "NameSource","collection" = "App\Entity\Source\Collection\AbstractCollectionSource","operation"="App\Entity\Source\Operation\AbstractOperation"})
+ * @ORM\DiscriminatorMap({"data" = "App\Entity\Source\Data\AbstractDataSource", "collection" = "App\Entity\Source\Collection\AbstractCollectionSource","operation"="App\Entity\Source\Operation\AbstractOperation"})
  */
 abstract class AbstractSource extends AbstractEntity implements SourceInterface
 {
diff --git a/application/src/Entity/Source/Data/AbstractDataSource.php b/application/src/Entity/Source/Data/AbstractDataSource.php
index 176ca44..1b137d7 100644
--- a/application/src/Entity/Source/Data/AbstractDataSource.php
+++ b/application/src/Entity/Source/Data/AbstractDataSource.php
@@ -1,9 +1,18 @@
 <?php
 namespace App\Entity\Source\Data;
-
+use Doctrine\ORM\Mapping as ORM;
 use App\Entity\Source\AbstractSource; 
-
+/**
+ * @author kevinfrantz
+ *
+ * @ORM\Entity
+ * @ORM\Table(name="source_data")
+ * @ORM\InheritanceType("JOINED")
+ * @ORM\DiscriminatorColumn(name="discr", type="string")
+ * @ORM\DiscriminatorMap({"user" = "UserSource","name" = "NameSource"})
+ */
 abstract class AbstractDataSource extends AbstractSource implements DataSourceInterface
 {
+    
 }
 
diff --git a/application/src/Entity/Source/Data/NameSource.php b/application/src/Entity/Source/Data/NameSource.php
index fba8a54..d29c2e8 100644
--- a/application/src/Entity/Source/Data/NameSource.php
+++ b/application/src/Entity/Source/Data/NameSource.php
@@ -8,7 +8,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @author kevinfrantz
- * @ORM\Table(name="source_name")
+ * @ORM\Table(name="source_data_name")
  * @ORM\Entity(repositoryClass="App\Repository\NameSourceRepository")
  */
 final class NameSource extends AbstractDataSource implements NameSourceInterface 
diff --git a/application/src/Entity/Source/Data/UserSource.php b/application/src/Entity/Source/Data/UserSource.php
index 19e4bca..e961041 100644
--- a/application/src/Entity/Source/Data/UserSource.php
+++ b/application/src/Entity/Source/Data/UserSource.php
@@ -10,7 +10,7 @@ use App\Entity\UserInterface;
 
 /**
  * @author kevinfrantz
- * @ORM\Table(name="source_user")
+ * @ORM\Table(name="source_data_user")
  * @ORM\Entity(repositoryClass="App\Repository\UserSourceRepository")
  */
 final class UserSource extends AbstractDataSource implements UserSourceInterface
diff --git a/application/src/Entity/User.php b/application/src/Entity/User.php
index 1376183..cb4b939 100644
--- a/application/src/Entity/User.php
+++ b/application/src/Entity/User.php
@@ -7,8 +7,8 @@ use FOS\UserBundle\Model\User as BaseUser;
 use App\Entity\Attribut\SourceAttribut;
 use App\Entity\Attribut\IdAttribut;
 use App\Creator\Modificator\Entity\LawModificator;
-use App\Entity\Source\UserSourceInterface;
-use App\Entity\Source\UserSource;
+use App\Entity\Source\Data\UserSourceInterface;
+use App\Entity\Source\Data\UserSource;
 use App\Entity\Attribut\VersionAttribut;
 
 /**
@@ -22,7 +22,7 @@ class User extends BaseUser implements UserInterface
 
     /**
      * @var UserSourceInterface
-     * @ORM\OneToOne(targetEntity="App\Entity\Source\UserSource",cascade={"persist", "remove"})
+     * @ORM\OneToOne(targetEntity="App\Entity\Source\Data\UserSource",cascade={"persist", "remove"})
      * @ORM\JoinColumn(name="source_user_id", referencedColumnName="id")
      */
     protected $source;