diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml
index 4398421..b091060 100644
--- a/config/packages/doctrine.yaml
+++ b/config/packages/doctrine.yaml
@@ -12,8 +12,8 @@ doctrine:
         mappings:
             App:
                 is_bundle: false
-                dir: '%kernel.project_dir%/src/Composant'
-                prefix: 'App\Composant'
+                dir: '%kernel.project_dir%/src/Component'
+                prefix: 'App\Component'
                 alias: App
 
 when@test:
diff --git a/migrations/Version20220407211354.php b/migrations/Version20220407211354.php
new file mode 100644
index 0000000..6b33597
--- /dev/null
+++ b/migrations/Version20220407211354.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20220407211354 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE TABLE roles (id INT AUTO_INCREMENT NOT NULL, name VARCHAR(255) NOT NULL, created DATETIME NOT NULL, updated DATETIME NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE users (id INT AUTO_INCREMENT NOT NULL, lastname VARCHAR(255) NOT NULL, firstname VARCHAR(255) NOT NULL, kwh_price NUMERIC(2, 0) NOT NULL, hourly_cost NUMERIC(2, 0) NOT NULL, created DATETIME NOT NULL, updated DATETIME NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('DROP TABLE roles');
+        $this->addSql('DROP TABLE users');
+    }
+}
diff --git a/src/Component/Role/Domain/Role.php b/src/Component/Role/Domain/Role.php
new file mode 100644
index 0000000..e298868
--- /dev/null
+++ b/src/Component/Role/Domain/Role.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Component\Role\Domain;
+
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\Mapping as ORM;
+
+
+#[ORM\Entity, ORM\Table(name:"roles")]
+class Role
+{
+
+    #[ORM\Id, ORM\GeneratedValue(strategy: 'AUTO')]
+    #[ORM\Column(type:Types::INTEGER)]
+    private int $id;
+
+    #[ORM\Column(type:Types::STRING, length:255)]
+    private string $name;
+
+    #[ORM\Column]
+    public \DateTime $created;
+
+    #[ORM\Column]
+    public \DateTime $updated;
+
+    public function __construct()
+    {
+    }
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param int $id
+     */
+    public function setId(int $id): void
+    {
+        $this->id = $id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @param string $name
+     */
+    public function setName(string $name): void
+    {
+        $this->name = $name;
+    }
+
+}
\ No newline at end of file
diff --git a/src/Component/Role/Domain/RoleDataMapper.php b/src/Component/Role/Domain/RoleDataMapper.php
new file mode 100644
index 0000000..2a3b53f
--- /dev/null
+++ b/src/Component/Role/Domain/RoleDataMapper.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Component\Role\Domain;
+
+interface RoleDataMapper
+{
+
+}
\ No newline at end of file
diff --git a/src/Component/Role/Domain/RoleRepository.php b/src/Component/Role/Domain/RoleRepository.php
new file mode 100644
index 0000000..2649b4e
--- /dev/null
+++ b/src/Component/Role/Domain/RoleRepository.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Component\Role\Domain;
+
+interface RoleRepository
+{
+    public function findById(int $id): Role;
+    public function findAll(): array;
+}
\ No newline at end of file
diff --git a/src/Component/Role/Infrastructure/RoleDatabaseAdapter.php b/src/Component/Role/Infrastructure/RoleDatabaseAdapter.php
new file mode 100644
index 0000000..9428928
--- /dev/null
+++ b/src/Component/Role/Infrastructure/RoleDatabaseAdapter.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Component\Role\Infrastructure;
+
+use App\Component\Role\Domain\Role;
+use App\Component\Role\Domain\RoleDataMapper;
+use App\Component\Role\Domain\RoleRepository;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+use Exception;
+
+class RoleDatabaseAdapter extends ServiceEntityRepository implements RoleDataMapper, RoleRepository
+{
+
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, Role::class);
+    }
+
+    public function findById(int $id): Role
+    {
+        $user = $this->find($id);
+
+        if (!$user)
+        {
+            throw new Exception(
+                'L\'utilisateur n\'existe pas'
+            );
+        }
+
+        return $user;
+    }
+
+    public function findAll(): array
+    {
+        // TODO: Implement findAll() method.
+    }
+}
\ No newline at end of file
diff --git a/src/Composant/User/Domain/User.php b/src/Component/User/Domain/User.php
similarity index 56%
rename from src/Composant/User/Domain/User.php
rename to src/Component/User/Domain/User.php
index b8e0fee..769243d 100644
--- a/src/Composant/User/Domain/User.php
+++ b/src/Component/User/Domain/User.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Composant\User\Domain;
+namespace App\Component\User\Domain;
 
+use App\Component\Role\Domain\Role;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
@@ -17,112 +18,160 @@ class User
     #[ORM\Column(type:Types::STRING, length:255)]
     private string $lastname;
 
+    #[ORM\Column(type:Types::STRING, length:255)]
     private string $firstname;
 
-    private int $roleId;
+    #[ORM\OneToOne(mappedBy:"role", targetEntity: Role::class)]
+    #[ORM\JoinTable(name:"roles")]
+    #[ORM\JoinColumn(name: "role_id", referencedColumnName: "id")]
+    #[ORM\InverseJoinColumn(name: "id", referencedColumnName: "role_id")]
+    protected Role $role;
 
+    #[ORM\Column(type:Types::DECIMAL,length:10, precision:2)]
     private float $kwhPrice;
 
+    #[ORM\Column(type:Types::DECIMAL,length:10, precision:2)]
     private float $hourlyCost;
 
+    #[ORM\Column]
+    public \DateTime $created;
+
+    #[ORM\Column]
+    public \DateTime $updated;
+
     public function __construct()
     {
+        $this->created = new \DateTime();
+        $this->updated = new \DateTime();
     }
 
     /**
-     * @return float
+     * @return int
      */
-    public function getKwhPrice(): float
+    public function getId(): int
     {
-        return $this->kwhPrice;
+        return $this->id;
     }
 
     /**
-     * @param float $kwhPrice
+     * @param int $id
      */
-    public function setKwhPrice(float $kwhPrice): void
+    public function setId(int $id): void
     {
-        $this->kwhPrice = $kwhPrice;
+        $this->id = $id;
     }
 
     /**
-     * @return float
+     * @return string
      */
-    public function getHourlyCost(): float
+    public function getLastname(): string
     {
-        return $this->hourlyCost;
+        return $this->lastname;
     }
 
     /**
-     * @param float $hourlyCost
+     * @param string $lastname
      */
-    public function setHourlyCost(float $hourlyCost): void
+    public function setLastname(string $lastname): void
     {
-        $this->hourlyCost = $hourlyCost;
+        $this->lastname = $lastname;
     }
 
     /**
-     * @return int
+     * @return string
      */
-    public function getRoleId(): int
+    public function getFirstname(): string
     {
-        return $this->roleId;
+        return $this->firstname;
     }
 
     /**
-     * @param int $roleId
+     * @param string $firstname
      */
-    public function setRoleId(int $roleId): void
+    public function setFirstname(string $firstname): void
     {
-        $this->roleId = $roleId;
+        $this->firstname = $firstname;
     }
 
     /**
-     * @return string
+     * @return Role
      */
-    public function getLastname(): string
+    public function getRole(): Role
     {
-        return $this->lastname;
+        return $this->role;
     }
 
     /**
-     * @param string $lastname
+     * @param Role $role
      */
-    public function setLastname(string $lastname): void
+    public function setRole(Role $role): void
     {
-        $this->lastname = $lastname;
+        $this->role = $role;
     }
 
     /**
-     * @return string
+     * @return float
      */
-    public function getFirstname(): string
+    public function getKwhPrice(): float
     {
-        return $this->firstname;
+        return $this->kwhPrice;
     }
 
     /**
-     * @param string $firstname
+     * @param float $kwhPrice
      */
-    public function setFirstname(string $firstname): void
+    public function setKwhPrice(float $kwhPrice): void
     {
-        $this->firstname = $firstname;
+        $this->kwhPrice = $kwhPrice;
     }
 
     /**
-     * @return int
+     * @return float
      */
-    public function getId(): int
+    public function getHourlyCost(): float
     {
-        return $this->id;
+        return $this->hourlyCost;
     }
 
     /**
-     * @param int $id
+     * @param float $hourlyCost
      */
-    public function setId(int $id): void
+    public function setHourlyCost(float $hourlyCost): void
     {
-        $this->id = $id;
+        $this->hourlyCost = $hourlyCost;
     }
 
+    /**
+     * @return \DateTime
+     */
+    public function getCreated(): \DateTime
+    {
+        return $this->created;
+    }
+
+    /**
+     * @param \DateTime $created
+     */
+    public function setCreated(\DateTime $created): void
+    {
+        $this->created = $created;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getUpdated(): \DateTime
+    {
+        return $this->updated;
+    }
+
+    /**
+     * @param \DateTime $updated
+     */
+    public function setUpdated(\DateTime $updated): void
+    {
+        $this->updated = $updated;
+    }
+
+
 }
\ No newline at end of file
diff --git a/src/Component/User/Domain/UserDataMapper.php b/src/Component/User/Domain/UserDataMapper.php
new file mode 100644
index 0000000..6baf11d
--- /dev/null
+++ b/src/Component/User/Domain/UserDataMapper.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Component\User\Domain;
+
+interface UserDataMapper
+{
+
+}
\ No newline at end of file
diff --git a/src/Composant/User/Domain/UserRepository.php b/src/Component/User/Domain/UserRepository.php
similarity index 75%
rename from src/Composant/User/Domain/UserRepository.php
rename to src/Component/User/Domain/UserRepository.php
index 8a678c5..64aac5a 100644
--- a/src/Composant/User/Domain/UserRepository.php
+++ b/src/Component/User/Domain/UserRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Composant\User\Domain;
+namespace App\Component\User\Domain;
 
 interface UserRepository
 {
diff --git a/src/Composant/User/Infrastructure/UserDatabaseAdapter.php b/src/Component/User/Infrastructure/UserDatabaseAdapter.php
similarity index 80%
rename from src/Composant/User/Infrastructure/UserDatabaseAdapter.php
rename to src/Component/User/Infrastructure/UserDatabaseAdapter.php
index 9cf023d..18ccfd9 100644
--- a/src/Composant/User/Infrastructure/UserDatabaseAdapter.php
+++ b/src/Component/User/Infrastructure/UserDatabaseAdapter.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Composant\User\Infrastructure;
+namespace App\Component\User\Infrastructure;
 
-use App\Composant\User\Domain\User;
-use App\Composant\User\Domain\UserDataMapper;
-use App\Composant\User\Domain\UserRepository;
+use App\Component\User\Domain\User;
+use App\Component\User\Domain\UserDataMapper;
+use App\Component\User\Domain\UserRepository;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Exception;
diff --git a/src/Composant/User/Domain/UserDataMapper.php b/src/Composant/User/Domain/UserDataMapper.php
deleted file mode 100644
index 21e178b..0000000
--- a/src/Composant/User/Domain/UserDataMapper.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace App\Composant\User\Domain;
-
-interface UserDataMapper
-{
-
-}
\ No newline at end of file
diff --git a/src/Controller/TestController.php b/src/Controller/TestController.php
index 58ebd3c..b67c3c8 100644
--- a/src/Controller/TestController.php
+++ b/src/Controller/TestController.php
@@ -2,8 +2,7 @@
 
 namespace App\Controller;
 
-use App\Composant\User\Infrastructure\UserDatabaseAdapter;
-use Doctrine\Persistence\ManagerRegistry;
+use App\Component\User\Infrastructure\UserDatabaseAdapter;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
@@ -16,10 +15,9 @@ class TestController extends AbstractController
     {
     }
 
-    #[Route('/foo')]
-    public function index(ManagerRegistry $registry): Response
+    #[Route('/testUser')]
+    public function index(UserDatabaseAdapter $DoctrineUser): Response
     {
-        $DoctrineUser = new UserDatabaseAdapter($registry);
         $user = $DoctrineUser->findById(1);
         return new Response(
             $user->getId(). " " .$user->getLastname(),