From 706166fa26631cd3c298818ef320468ec12c9c39 Mon Sep 17 00:00:00 2001
From: Xantxo COQUILLARD <xantxo.coquillard@outlook.fr>
Date: Thu, 7 Apr 2022 22:47:34 +0200
Subject: [PATCH] Correction norme

---
 src/Composant/User/Domain/User.php            | 25 ++++++++-----------
 src/Composant/User/Domain/UserDataMapper.php  |  3 +--
 src/Composant/User/Domain/UserRepository.php  |  9 +++++++
 ...ctrineUser.php => UserDatabaseAdapter.php} |  3 ++-
 .../{test.php => TestController.php}          | 14 +++++------
 5 files changed, 30 insertions(+), 24 deletions(-)
 create mode 100644 src/Composant/User/Domain/UserRepository.php
 rename src/Composant/User/Infrastructure/{DoctrineUser.php => UserDatabaseAdapter.php} (83%)
 rename src/Controller/{test.php => TestController.php} (57%)

diff --git a/src/Composant/User/Domain/User.php b/src/Composant/User/Domain/User.php
index 1d86309..b8e0fee 100644
--- a/src/Composant/User/Domain/User.php
+++ b/src/Composant/User/Domain/User.php
@@ -2,31 +2,28 @@
 
 namespace App\Composant\User\Domain;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Entity
- * @ORM\Table(name="users")
- */
+
+#[ORM\Entity, ORM\Table(name:"users")]
 class User
 {
 
-    /**
-     * @ORM\Id()
-     * @ORM\GeneratedValue()
-     * @ORM\Column(type="integer")
-     */
+    #[ORM\Id, ORM\GeneratedValue(strategy: 'AUTO')]
+    #[ORM\Column(type:Types::INTEGER)]
     private int $id;
 
-    /**
-     * @ORM\Column(type="string", length=255)
-     */
+    #[ORM\Column(type:Types::STRING, length:255)]
     private string $lastname;
 
-    //finir le reste xD
     private string $firstname;
+
     private int $roleId;
-    private float $kwhPrice, $hourlyCost;
+
+    private float $kwhPrice;
+
+    private float $hourlyCost;
 
     public function __construct()
     {
diff --git a/src/Composant/User/Domain/UserDataMapper.php b/src/Composant/User/Domain/UserDataMapper.php
index 59c53f3..21e178b 100644
--- a/src/Composant/User/Domain/UserDataMapper.php
+++ b/src/Composant/User/Domain/UserDataMapper.php
@@ -4,6 +4,5 @@ namespace App\Composant\User\Domain;
 
 interface UserDataMapper
 {
-    public function findById(int $id): User;
-    public function findAll(): array;
+
 }
\ No newline at end of file
diff --git a/src/Composant/User/Domain/UserRepository.php b/src/Composant/User/Domain/UserRepository.php
new file mode 100644
index 0000000..8a678c5
--- /dev/null
+++ b/src/Composant/User/Domain/UserRepository.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Composant\User\Domain;
+
+interface UserRepository
+{
+    public function findById(int $id): User;
+    public function findAll(): array;
+}
\ No newline at end of file
diff --git a/src/Composant/User/Infrastructure/DoctrineUser.php b/src/Composant/User/Infrastructure/UserDatabaseAdapter.php
similarity index 83%
rename from src/Composant/User/Infrastructure/DoctrineUser.php
rename to src/Composant/User/Infrastructure/UserDatabaseAdapter.php
index 424878f..9cf023d 100644
--- a/src/Composant/User/Infrastructure/DoctrineUser.php
+++ b/src/Composant/User/Infrastructure/UserDatabaseAdapter.php
@@ -4,11 +4,12 @@ namespace App\Composant\User\Infrastructure;
 
 use App\Composant\User\Domain\User;
 use App\Composant\User\Domain\UserDataMapper;
+use App\Composant\User\Domain\UserRepository;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Exception;
 
-class DoctrineUser extends ServiceEntityRepository implements UserDataMapper
+class UserDatabaseAdapter extends ServiceEntityRepository implements UserDataMapper, UserRepository
 {
 
     public function __construct(ManagerRegistry $registry)
diff --git a/src/Controller/test.php b/src/Controller/TestController.php
similarity index 57%
rename from src/Controller/test.php
rename to src/Controller/TestController.php
index e19da42..58ebd3c 100644
--- a/src/Controller/test.php
+++ b/src/Controller/TestController.php
@@ -2,27 +2,27 @@
 
 namespace App\Controller;
 
-use App\Composant\User\Infrastructure\DoctrineUser;
+use App\Composant\User\Infrastructure\UserDatabaseAdapter;
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
 use function dd;
 
-class test extends AbstractController
+class TestController extends AbstractController
 {
 
     public function __construct()
     {
     }
 
-    #[Route('/foo', name: 'contact')]
+    #[Route('/foo')]
     public function index(ManagerRegistry $registry): Response
     {
-        $DoctrineUser = new DoctrineUser($registry);
-        $User = $DoctrineUser->findById(1);
-        dd($User);
+        $DoctrineUser = new UserDatabaseAdapter($registry);
+        $user = $DoctrineUser->findById(1);
         return new Response(
-            "",
+            $user->getId(). " " .$user->getLastname(),
             Response::HTTP_OK,
             ['content-type' => 'text/html']
         );