update paul's branch with database link on search user

.gitignore

@@ -6,6 +6,7 @@ dist
 *.swo
 .env
 
+loginDatabase.php
 # Cache file on macOS
 .DS_Store
 

Documents/Diagramme/DiagrammeDeClasses/README_accesDonnees.md

@@ -36,7 +36,7 @@ abstract class IGenericRepository {
     + addItem(item) : void
     + deleteItem(item) : bool
 }
-abstract class IUserRepository extends IGenericRepository {
+interface IUserRepository extends IGenericRepository {
 }
 interface INotificationRepository extends IGenericRepository {
 }

Sources/composer.json

@@ -24,7 +24,8 @@
             "Shared\\Exception\\": "src/shared/exception",
             "Shared\\Attributes\\": "src/shared/attributes",
             "App\\Views\\Directives\\" : "src/app/views/directives",
-            "Data\\Core\\": "src/data/core/" 
+            "Data\\Core\\": "src/data/core/",
+            "Database\\": "src/data/core/database"
         }
     },
     "require": {
@@ -32,7 +33,9 @@
         "altorouter/altorouter": "1.1.0",
         "vlucas/phpdotenv": "^5.5",
         "psr/container": "^2.0",
-        "adriangibbons/php-fit-file-analysis": "^3.2.0"
+        "adriangibbons/php-fit-file-analysis": "^3.2.0",
+      "ext-couchbase": "*",
+        "ext-pdo": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "*"

Sources/public/js/script2.js

@@ -0,0 +1,34 @@
+/*!
+* Start Bootstrap - New Age v6.0.7 (https://startbootstrap.com/theme/new-age)
+* Copyright 2013-2023 Start Bootstrap
+* Licensed under MIT (https://github.com/StartBootstrap/startbootstrap-new-age/blob/master/LICENSE)
+*/
+//
+// Scripts
+//
+
+window.addEventListener('DOMContentLoaded', event => {
+
+    // Activate Bootstrap scrollspy on the main nav element
+    const mainNav = document.body.querySelector('#mainNav');
+    if (mainNav) {
+        new bootstrap.ScrollSpy(document.body, {
+            target: '#mainNav',
+            offset: 74,
+        });
+    };
+
+    // Collapse responsive navbar when toggler is visible
+    const navbarToggler = document.body.querySelector('.navbar-toggler');
+    const responsiveNavItems = [].slice.call(
+        document.querySelectorAll('#navbarResponsive .nav-link')
+    );
+    responsiveNavItems.map(function (responsiveNavItem) {
+        responsiveNavItem.addEventListener('click', () => {
+            if (window.getComputedStyle(navbarToggler).display !== 'none') {
+                navbarToggler.click();
+            }
+        });
+    });
+
+});

Sources/public/js/scripts2.js

@@ -0,0 +1,34 @@
+/*!
+* Start Bootstrap - New Age v6.0.7 (https://startbootstrap.com/theme/new-age)
+* Copyright 2013-2023 Start Bootstrap
+* Licensed under MIT (https://github.com/StartBootstrap/startbootstrap-new-age/blob/master/LICENSE)
+*/
+//
+// Scripts
+// 
+
+window.addEventListener('DOMContentLoaded', event => {
+
+    // Activate Bootstrap scrollspy on the main nav element
+    const mainNav = document.body.querySelector('#mainNav');
+    if (mainNav) {
+        new bootstrap.ScrollSpy(document.body, {
+            target: '#mainNav',
+            offset: 74,
+        });
+    };
+
+    // Collapse responsive navbar when toggler is visible
+    const navbarToggler = document.body.querySelector('.navbar-toggler');
+    const responsiveNavItems = [].slice.call(
+        document.querySelectorAll('#navbarResponsive .nav-link')
+    );
+    responsiveNavItems.map(function (responsiveNavItem) {
+        responsiveNavItem.addEventListener('click', () => {
+            if (window.getComputedStyle(navbarToggler).display !== 'none') {
+                navbarToggler.click();
+            }
+        });
+    });
+
+});

Sources/src/app/controller/AthleteController.php

@@ -2,6 +2,8 @@
 
 namespace App\Controller;
 
+use Database\AthleteMapper;
+use Shared\Validation;
 use App\Container;
 use App\Router\Request\IRequest;
 use App\Router\Response\Response;
@@ -9,62 +11,132 @@ use Shared\Attributes\Route;
 use Twig\Environment;
 use Data\Core\Preferences;
 use Shared\Log;
+use Manager\UserManager;
+use Database\Connexion;
+use Database\AthleteGateway;
 
 class AthleteController extends BaseController
 {
 
-    #[Route(path: '/search-ath', name: 'search-ath', methods: ['GET'])]
+    private Environment $twig;
+    protected Preferences $preference;
+
+    public function __construct()
+    {
+       //session_start();
+       $this->preference = new Preferences();
+    }
+
+//    #[Route(path: '/search-user', name: 'search-user', methods: ['GET'])]
+//    public function searchUser(string $username, IRequest $req): Response
+//    {
+//        $taberror = [];
+//        if(!Validation::val_string($username)){
+//            print("Nom invalide.");
+//        }
+//        else {
+//            try {
+//                $athleteGateway = new AthleteGateway(new Connexion("mysql:host=localhost;dbname=sae_3", "Perederii", ""));
+////                $listSearch=$this->container->get(UserManager::class)->searchUsersByName($username);
+//                $listSearch = $athleteGateway->getAthlete();
+//                $map = new AthleteMapper ();
+//                $athleteEntity = $map->athleteSqlToEntity($listSearch);
+//                foreach ($athleteEntity as $entity) {
+//                    $users = $map->athleteEntityToModel($entity);
+//                    $listUsers[$i++]=['nom' => $users->getNom(), 'prenom'=>$users->getPrenom(), 'img'=>'john_doe'];
+//                }
+//
+//                $i=0;
+//                foreach ($users as $user){
+//                    echo "<h1> HELLO </h1>";
+//                    $listUsers[$i++]=['nom' => $user->getNom(), 'prenom'=>$user->getPrenom(), 'img'=>'john_doe', 'username'=>$user->getUsername()];
+//                }
+//                echo "<h1> HEllO </h1>";
+//                //$currentUser=$this->container->get(UserManager::class)->getCurrentUser();
+//                //$currentUser=$_SESSION['user'];
+//                $response = $this->render('./page/addfriend.html.twig',[
+//                    'css' => $_COOKIE['preferences'],
+//                    'pp' => "test",
+//                    'user' => 'johndoe',//$currentUser->getUsername(),
+//                    'role' => 'Athlete',//$currentUser->getRole(),
+//                    'users' => $listUsers
+//                ]);
+//            } catch (\Throwable $th) {
+//                throw $th;
+//                return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
+//            }
+//        }
+//        return $response;
+//
+//    }
+
+    #[Route(path: '/search-user', name: 'search-user', methods: ['GET'])]
     public function searchUser(string $username, IRequest $req): Response
     {
         $taberror = [];
-        $utiliArray = [
+        if (!Validation::val_string($username)) {
-            [
+            print("Nom invalide.");
-                'nom' => 'John',
+        } else {
-                'prenom' => 'Doe',
+            try {
-                'img' => 'john_doe',
+                $athleteGateway = new AthleteGateway(new Connexion("pgsql:host=localhost;dbname=sae_3", "Perederii", ""));
-                'username' => 'johndoe',
+                $listSearch = $athleteGateway->getAthlete($username);
-            ],
+                $map = new AthleteMapper();
-            [
+                $athleteEntity = $map->athleteSqlToEntity($listSearch);
-                'nom' => 'Alice',
-                'prenom' => 'Smith',
-                'img' => 'alice_smith',
-                'username' => 'alicesmith',
-            ],
-        ];
-        // if(!Validation::val_string($name)){
-        try {
-            //code...
-            //     $model->userMgr->getUser($name);
-            return $this->render('./page/addfriend.html.twig', [
-                'css' => $this->preference->getCookie(),
-                'pp' => "test2",
-                'user' => "Doe",
-                'role' => "Athlète",
-                'friendship' => [],
-                'analyzes' => [],
-                'mails' => [],
-                'users' => $utiliArray,
-                'infoUser' => [],
-                'exos' => [],
-                'member' => [],
-                'responce' => "Notification d'ajout envoyée à $username"
-            ]);
-        } catch (\Throwable $th) {
-            //throw $th;
-            // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
-        }
-        // }
 
+                $listUsers = [];
+                $i = 0;
+                foreach ($athleteEntity as $entity) {
+                    $user = $map->athleteEntityToModel($entity);
+                    $listUsers[$i] = ['idathlete' => number_format($user->getId(), 1), 'nom' => $user->getNom(),
+                        'prenom' => $user->getPrenom(),'email' => $user->getEmail(), 'sexe' => $user->getSexe(),
+                        'taille' => $user->getTaille(), 'poids' => $user->getPoids(), 'motdepasse' => $user->getMotDePasse(),
+                        'datenaissance' => $user->getDateNaissance(), 'iscoach' => $user->getRole(), 'img' => 'test',
+                        'username' => $user->getUsername()];
+                    $i++;
+                }
+
+                $response = $this->render('./page/addfriend.html.twig',[
+                    'css' => $_COOKIE['preferences'],
+                    'pp' => 'test',
+                    'user' => 'johndoe',//$currentUser->getUsername(),
+                    'role' => 'Athlete',//$currentUser->getRole(),
+                    'users' => $listUsers
+                ]);
+
+            } catch (\Throwable $th) {
+                throw $th;
+                return $this->render("addfriend.html.twig", ['tabError' => $taberror]);
+            }
+        }
+        return $response;
     }
 
     #[Route(path: '/analyses', name: 'analyses', methods: ['GET'])]
     public function analyses(): Response
     {
-        return $this->render('./page/analyze.html.twig', [
+        return $this->render('./page/analyze.html.twig',[
             'css' => $this->preference->getCookie(),
             'pp' => "test2",
-            'user' => "Doe",
+            'user' => 'johndoe',//$currentUser->getUsername(),
-            'role' => "Athlète",
+            'role' => 'Athlete',//$currentUser->getRole(),
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => []
+        ]);
+    }
+
+    #[Route(path: '/activity', name: 'activity', methods: ['GET'])]
+    public function activity(): Response
+    {
+        return $this->render('./page/activity.html.twig',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test",
+            'user' => 'johndoe',//$currentUser->getUsername(),
+            'role' => 'Athlete',//$currentUser->getRole(),
             'friendship' => [],
             'analyzes' => [],
             'mails' => [],
@@ -79,11 +151,11 @@ class AthleteController extends BaseController
     #[Route(path: '/exercice', name: 'exercice', methods: ['GET'])] // 8
     public function exercice(): Response
     {
-        return $this->render('./page/exercice.html.twig', [
+        return $this->render('./page/exercice.html.twig',[
             'css' => $this->preference->getCookie(),
             'pp' => "test2",
-            'user' => "Doe",
+            'user' => 'johndoe',//$currentUser->getUsername(),
-            'role' => "Athlète",
+            'role' => 'Athlete',//$currentUser->getRole(),
             'friendship' => [],
             'analyzes' => [],
             'mails' => [],
@@ -94,57 +166,84 @@ class AthleteController extends BaseController
         ]);
     }
 
-    #[Route(path: '/add-friend', name: 'add-friend', methods: ['POST'])]
+    #[Route(path: '/exercices', name: 'exercices', methods: ['POST'])] // 8
-    public function addFriend(string $username, IRequest $req): Response
+    public function exercices(String $type, String $intensite, String $date, IRequest $req): Response
     {
-        $taberror = [];
+        $exercicesArray = [
-        $utiliArray = [
             [
-                'nom' => 'John',
+                'date' => $date,
-                'prenom' => 'Doe',
+                'type' => $type,
-                'img' => 'john_doe',
+                'intensite' => $intensite,
-                'username' => 'johndoe',
+                'status' => 'A venir',
-            ],
+            ]
-            [
-                'nom' => 'Alice',
-                'prenom' => 'Smith',
-                'img' => 'alice_smith',
-                'username' => 'alicesmith',
-            ],
         ];
-        // if(!Validation::val_string($name)){
+        return $this->render('./page/exercice.html.twig',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => 'johndoe',//$currentUser->getUsername(),
+            'role' => 'Athlete',//$currentUser->getRole(),
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => $exercicesArray,
+            'member' => []
+        ]);
+    }
+
+    #[Route(path: '/add-friend', name: 'add-friend', methods: ['POST'])]
+    public function addFriend(string $username, IRequest $req): Response
+    {
         try {
-            //code...
+            //Ajouter la personne sur laquelle on a clique dans la liste de currentuser
-            //     $model->userMgr->addFriend($name);
+            $listSearch=$this->container->get(UserManager::class)->searchUsersByName($username);
-            return $this->render('./page/addfriend.html.twig', [
+            $i=0;
+            foreach ($listSearch as $user){
+                $listUsers[$i++]=['nom' => $user->getNom(), 'prenom'=>$user->getPrenom(), 'img'=>'test', 'username'=>$user->getUsername()];
+            }
+            return $this->render('./page/addfriend.html.twig',[
                 'css' => $this->preference->getCookie(),
                 'pp' => "test2",
-                'user' => "Doe",
+                'user' => 'johndoe',//$currentUser->getUsername(),
-                'role' => "Athlète",
+                'role' => 'Athlete',//$currentUser->getRole(),
                 'friendship' => [],
                 'analyzes' => [],
                 'mails' => [],
-                'users' => $utiliArray,
+                'users' => $listUsers,
                 'infoUser' => [],
                 'exos' => [],
                 'member' => [],
                 'responce' => "Notification d'ajout envoyée à $username"
             ]);
         } catch (\Throwable $th) {
-            //throw $th;
+            throw $th;
-            // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
+            return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
         }        
-        // }
-
     }
 
-
-
-    
     #[Route(path: '/friend', name: 'friend', methods: ['GET'])]
     public function friend(): Response
     {
-        $utiliArray = [
+        return $this->render('./page/addfriend.html.twig',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => 'John',//$currentUser->getUsername(),
+            'role' => 'Athlete',//$currentUser->getRole(),
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => [],
+        ]);
+    }
+
+    /*#[Route(path: '/friendlist', name: 'friendlist', methods: ['POST'])]
+    public function friendlist(string $username, IRequest $req): Response
+    {
+        $friendList = [
             [
                 'nom' => 'John',
                 'prenom' => 'Doe',
@@ -158,19 +257,40 @@ class AthleteController extends BaseController
                 'username' => 'alicesmith',
             ],
         ];
-        return $this->render('./page/addfriend.html.twig',[
+        // TODO 
+
+        // -> Enlever ou bloquer un utilisateur en fonction de son username
+        //$friendList = currentUser->getFriends();
+        return $this->render('./page/friend.html.twig',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => 'johndoe',//$currentUser->getUsername(),
+            'role' => 'Athlete',//$currentUser->getRole(),
+            'friendship' => $friendList,
+        ]);
+    }*/
+
+    #[Route(path: '/friendlist', name: 'friendlist2', methods: ['GET'])]
+    public function friendlist2(): Response
+    {
+        $friendList = $this->container->get(UserManager::class)->getFriends();//$currentUser->getFriends();
+        return $this->render('./page/friend.html.twig',[
             'css' => $this->preference->getCookie(),
             'pp' => "test2",
             'user' => "Doe",
             'role' => "Athlète",
-            'friendship' => [],
+            'friendship' => $friendList,
             'analyzes' => [],
             'mails' => [],
-            'users' => $utiliArray,
+            'users' => [],
             'infoUser' => [],
             'exos' => [],
             'member' => [],
         ]);
     }
 
+    // #[Route(path: '/delete-friend', name: 'delete-friend', methods: ['POST'])]
+    
 }
+
+?>

Sources/src/app/controller/AuthController.php

@@ -5,11 +5,7 @@ namespace App\Controller;
 use App\Container;
 use App\Router\Request\IRequest;
 use App\Router\Response\Response;
-use App\Router\Response\IResponse;
-
-use Couchbase\UserManager;
 use Shared\Attributes\Route;
-use Shared\Validation;
 use Twig\Environment;
 use Data\Core\Preferences;
 use Shared\Log;
@@ -17,34 +13,105 @@ use Shared\Log;
 class AuthController extends BaseController
 {
     
+    protected Preferences $preference;
 
-    #[Route('/login', name: 'login',methods: ['POST'])]
+    public function __construct(){
-    public function login(IRequest $request): IResponse {
+        $this->preference = new Preferences();
+    }
 
-        $error = [];
+    #[Route('/login', name: 'login')]
-        try {
+    public function login(?string $username, ?string $password ,IRequest $request): Response {
-            $log=Validation::clean_string($request->getBody()['email']);
+        // if user is already logged in, don't display the login page again
-            $mdp=Validation::clean_string($request->getBody()['password']);
+        if ($user) {
-        } catch (\Throwable $th) {
+            return $this->redirectToRoute('blog_index');
-            $error = "Wrong cred";
         }
 
-        if($this->container->get(UserManager::class)->login($log,$mdp)){
+        // this statement solves an edge-case: if you change the locale in the login
-            return $this->redirectToRoute('/');
+        // page, after a successful login you are redirected to a page in the previous
-        }
+        // locale. This code regenerates the referrer URL whenever the login page is
-        else{
+        // browsed, to ensure that its locale is always the current one.
-            $error [] = "Erreur de connexion. Essayez encore"; 
+        $this->saveTargetPath($request->getSession(), 'main', $this->generateUrl('admin_index'));
-        }
+
-        return $this->render('./page/login.html.twig', ['error' => $error]);
+        return $this->render('security/login.html.twig', [
+            // last username entered by the user (if any)
+            'last_username' => $helper->getLastUsername(),
+            // last authentication error (if any)
+            'error' => $helper->getLastAuthenticationError(),
+        ]);
+    }
 
+    // #[Route('/login', name: 'login')]
+    // public function login(?string $username, ?string $password ,IRequest $request): Response {
+    //     // if user is already logged in, don't display the login page again
+    //     if ($user) {
+    //         return $this->redirectToRoute('blog_index');
+    //     }
+
+    //     // this statement solves an edge-case: if you change the locale in the login
+    //     // page, after a successful login you are redirected to a page in the previous
+    //     // locale. This code regenerates the referrer URL whenever the login page is
+    //     // browsed, to ensure that its locale is always the current one.
+    //     $this->saveTargetPath($request->getSession(), 'main', $this->generateUrl('admin_index'));
+
+    //     return $this->render('security/login.html.twig', [
+    //         // last username entered by the user (if any)
+    //         'last_username' => $helper->getLastUsername(),
+    //         // last authentication error (if any)
+    //         'error' => $helper->getLastAuthenticationError(),
+    //     ]);
+    // }
+
+    #[Route(path: '/register', name: 'register', methods: ['POST'])]
+    public function register(string $username,string $mdp,string $confirmMdp,string $nom,string $prenom,string $dateNaissance,string $sexe,string $taille,string $poids, IRequest $req): Response
+    {
         
+       // CONFIRMER LES DONNESS !!!!! IMPORTANT
 
+        return $this->render('./page/home.html.twig',[
+            'css' => $this->preference->getCookie()
+        ]);
     }
 
-    #[Route('/log', name: 'baseLog',methods: ['GET'])]
+    #[Route(path: '/regist', name: 'regist', methods: ['GET'])]
-    public function index(IRequest $request): IResponse { 
+    public function register2(): Response
+    {
         
-        return $this->render('./page/login.html.twig',[
+       // CONFIRMER LES DONNESS !!!!! IMPORTANT
+
+        return $this->render('./page/register.html.twig',[
+            'css' => $this->preference->getCookie()
+        ]);
+    }
+
+    
+    function inscription() {
+        $model = new ModelVisitor();
+        $log=Validation::clean_string($_POST['pseudo']);
+        $mdp=Validation::clean_string($_POST['password']);
+        if($model->createAUser($log,$mdp)){
+            if(ModelUser::login($log, $mdp)){
+                UserControler::displayView();
+            }
+        }
+    }
+    function connexion(){
+        $model = new ModelVisitor();
+        if(!isset($_POST['pseudo']) || !isset($_POST['password'])) throw new Exception(" some wrong with credentials !!!!!");
+        $log=Validation::clean_string($_POST['pseudo']);
+        $mdp=Validation::clean_string($_POST['password']);
+            if(ModelUser::login($log, $mdp)){
+                UserControler::displayView();
+            }
+        
+    }
+
+    #[Route(path: '/pass', name: 'pass', methods: ['GET'])]
+    public function pass(): Response
+    {
+        
+       // CONFIRMER LES DONNESS !!!!! IMPORTANT
+
+        return $this->render('./page/password.html.twig',[
             'css' => $this->preference->getCookie(),
             'pp' => "test2",
             'user' => "Doe",
@@ -57,74 +124,36 @@ class AuthController extends BaseController
             'exos' => [],
             'member' => []
         ]);
-
     }
 
-    #[Route('/register', name: 'register' , methods:['GET'])]
+    #[Route(path: '/log', name: 'log', methods: ['GET'])]
-    public function register(IRequest $request): IResponse
+    public function login2(): Response
     {
-        if ($request->getMethod() == 'POST') {
-            $nom = $request->getBody()['nom'];
-    
-            $prenom = $request->getBody()['prenom'];
-    
-            $username = $request->getBody()['username'];
         
-            $email = $request->getBody()['email'];
+       // CONFIRMER LES DONNESS !!!!! IMPORTANT
-    
-            $motDePasse = $request->getBody()['motDePasse'];
-    
-            $sexe = $request->getBody()['sexe'];
-    
-            $taille = $request->getBody()['taille'];
-    
-            $poids = $request->getBody()['poids'];
-    
-            $dateNaissanceStr = $request->getBody()['nom'];
-            $dateNaissance = new \DateTime($dateNaissanceStr);
-    
-    
-            if (!$dateNaissance) {
-                throw new \Exception("Date de naissance non valide. Format attendu : YYYY-MM-DD");
-            }
-    
-            $roleName = $request->getBody()['roleName'];
-
-
-            $registrationData = [
-                'nom' => $nom,
-                'prenom' => $prenom,
-                'username' => $username,
-                'email' => $email,
-                'sexe' => $sexe,
-                'taille' => $taille,
-                'poids' => $poids,
-                'dateNaissance' => $dateNaissance,
-                'roleName' => $roleName
-            ];
-
-            try {
-                if ($this->container->get(UserManager::class)->register($email, $motDePasse, $registrationData)) {
-                    return $this->redirectToRoute('/');
-                } else {
-            
-                    $error [] = 'L\'inscription a échoué. Veuillez réessayer.';
-                }
-            } catch (\Exception $e) {
-                $error [] = 'Erreur lors de l\'inscription: ' . $e->getMessage(); 
-            }
-        }
 
-        return $this->render('/register.html.twig');
+        return $this->render('./page/login.html.twig',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => "Doe",
+            'role' => "Athlète",
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => []
+        ]);
     }
 
-    #[Route(path: '/mdp', name: 'mdp', methods: ['POST'])]
+    #[Route(path: '/password', name: 'password', methods: ['POST'])]
-    public function mdp(string $ancienMotDePasse,string $nouveauMotDePasse,string $confirmerMotDePasse, IRequest $req): Response
+    public function password(string $email, IRequest $req): Response
     {
         
        // CONFIRMER LES DONNESS !!!!! IMPORTANT
 
-        return $this->render('./page/settings.html.twig',[
+        return $this->render('./page/login.html.twig',[
             'css' => $this->preference->getCookie(),
             'pp' => "test2",
             'user' => "Doe",
@@ -140,8 +169,6 @@ class AuthController extends BaseController
     }
 
     
-   
-
-    
 }
+
 ?>

Sources/src/app/controller/CoachController.php

@@ -1,49 +1,34 @@
 <?php
 
-// namespace App\Controller;
+namespace App\Controller;
 
-// use App\Container;
+use App\Container;
-// use App\Router\Request\IRequest;
+use App\Router\Request\IRequest;
-// use App\Router\Response\Response;
+use App\Router\Response\Response;
-// use App\Router\Response\IResponse;
+use App\Router\Response\IResponse;
 
-// use Shared\Attributes\Route;
+use Shared\Attributes\Route;
-// use Twig\Environment;
+use Twig\Environment;
-// use Data\Core\Preferences;
+use Data\Core\Preferences;
-// use Shared\Log;
+use Shared\Log;
 
 
+class CoachController extends BaseController
+{
 
-// #[Route(path: '/coach', name: 'coach')]
+    private ICoachManager $coachManager;
-// class CoachController extends BaseController
+    private $security;
-// {
+    private Environment $twig;
+    protected Preferences $preference;
 
-//     private ICoachManager $coachManager;
+    public function __construct(DataManager $dataManager, Security $security)
-//     private $security;
+    {
+        session_start();
+        $this->coachManager = $dataManager->coachMgr;
+        $this->security = $security;
+        $this->preference = new Preferences();
+    }
 
-//     public function __construct(DataManager $dataManager, Security $security)
-//     {
-//         $this->coachManager = $dataManager->coachMgr;
-//         $this->security = $security;
-//     }
-
-//     #[Route(path: '/', name: 'home', methods: ['GET'])]
-//     public function index(): Response
-//     {
-//         return $this->render('./page/home.html.twig',[
-//             'css' => $this->preference->getCookie(),
-//             'pp' => "test2",
-//             'user' => "Doe",
-//             'role' => "Athlète",
-//             'friendship' => [],
-//             'analyzes' => [],
-//             'mails' => [],
-//             'users' => [],
-//             'infoUser' => [],
-//             'exos' => [],
-//             'member' => []
-//         ]);
-//     }
 //     #[Route('/global-stats', name: 'coach_global_stats', methods: ['GET'])]
 //     public function globalStats(): Response
 //     {
@@ -51,41 +36,145 @@
 //         return $this->render('coach/global_stats.html.twig');
 //     }
 
-// #[Route(path: '/exercice', name: 'exercice', methods: ['GET'])] // 8
-//     public function exercice(): Response
-//     {
-//         return $this->render('./page/exercice.html.twig',[
-//             'css' => $this->preference->getCookie(),
-//             'pp' => "test2",
-//             'user' => "Doe",
-//             'role' => "Athlète",
-//             'friendship' => [],
-//             'analyzes' => [],
-//             'mails' => [],
-//             'users' => [],
-//             'infoUser' => [],
-//             'exos' => [],
-//             'member' => []
-//         ]);
-//     }
 
-// #[Route(path: '/coaching', name: 'coaching', methods: ['GET'])]
+    #[Route(path: '/coaching', name: 'coaching', methods: ['GET'])]
-// public function coaching(): Response
+    public function coaching(): Response
-// {
+    {
-//     return $this->render('./page/coaching.html.twig',[
+        return $this->render('./page/coaching.html.twig',[
-//         'css' => $this->preference->getCookie(),
+            'css' => $this->preference->getCookie(),
-//         'pp' => "test2",
+            'pp' => "test2",
-//         'user' => "Doe",
+            'user' => "Doe",
-//         'role' => "Athlète",
+            'role' => "Coach",
-//         'friendship' => [],
+            'friendship' => [],
-//         'analyzes' => [],
+            'analyzes' => [],
-//         'mails' => [],
+            'mails' => [],
-//         'users' => [],
+            'users' => [],
-//         'infoUser' => [],
+            'infoUser' => [],
-//         'exos' => [],
+            'exos' => [],
-//         'member' => []
+            'member' => []
-//     ]);
+        ]);
-// }
+    }
+
+    #[Route(path: '/search-member', name: 'search-member', methods: ['GET'])]
+    public function searchMember(string $username, IRequest $req): Response
+    {
+        $taberror = [];
+        // FILTER 
+        $utiliArray = [
+            [
+                'nom' => 'John',
+                'prenom' => 'Doe',
+                'img' => 'john_doe',
+                'username' => 'johndoe',
+            ],
+            [
+                'nom' => 'Alice',
+                'prenom' => 'Smith',
+                'img' => 'alice_smith',
+                'username' => 'alicesmith',
+            ],
+        ];
+        // if(!Validation::val_string($name)){
+        try {
+                //code...
+                //     $model->userMgr->addFriend($name);
+                return $this->render('./page/addmember.html.twig',[
+                    'css' => $this->preference->getCookie(),
+                    'pp' => "test2",
+                    'user' => "Doe",
+                    'role' => "Athlète",
+                    'friendship' => [],
+                    'analyzes' => [],
+                    'mails' => [],
+                    'users' => $utiliArray,
+                    'infoUser' => [],
+                    'exos' => [],
+                    'member' => [],
+                    'responce' => "Notification d'ajout envoyée à $username"
+                ]);
+            } catch (\Throwable $th) {
+                //throw $th;
+                // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
+            }
+        // }
+        
+    }
+
+    #[Route(path: '/add-member', name: 'add-member', methods: ['POST'])]
+    public function addmember(string $username, IRequest $req): Response
+    {
+        $taberror = [];
+        $utiliArray = [
+            [
+                'nom' => 'John',
+                'prenom' => 'Doe',
+                'img' => 'john_doe',
+                'username' => 'johndoe',
+            ],
+            [
+                'nom' => 'Alice',
+                'prenom' => 'Smith',
+                'img' => 'alice_smith',
+                'username' => 'alicesmith',
+            ],
+        ];
+        // if(!Validation::val_string($name)){
+        try {
+                //code...
+                //     $model->userMgr->addFriend($name);
+                return $this->render('./page/addmember.html.twig',[
+                    'css' => $this->preference->getCookie(),
+                    'pp' => "test2",
+                    'user' => "Doe",
+                    'role' => "Athlète",
+                    'friendship' => [],
+                    'analyzes' => [],
+                    'mails' => [],
+                    'users' => $utiliArray,
+                    'infoUser' => [],
+                    'exos' => [],
+                    'member' => [],
+                    'responce' => "Notification d'ajout envoyée à $username"
+                ]);
+            } catch (\Throwable $th) {
+                //throw $th;
+                // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
+            }
+        // }
+        
+    }
+
+    #[Route(path: '/member', name: 'member', methods: ['GET'])]
+    public function member(): Response
+    {
+        $utiliArray = [
+            [
+                'nom' => 'John',
+                'prenom' => 'Doe',
+                'img' => 'john_doe',
+                'username' => 'johndoe',
+            ],
+            [
+                'nom' => 'Alice',
+                'prenom' => 'Smith',
+                'img' => 'alice_smith',
+                'username' => 'alicesmith',
+            ],
+        ];
+        return $this->render('./page/addmember.html.twig',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => "Doe",
+            'role' => "Athlète",
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => $utiliArray,
+            'infoUser' => [],
+            'exos' => [],
+            'member' => [],
+        ]);
+    }
 
 //     #[Route('/list-athletes', name: 'coach_list_athletes')]
 //     public function listAthletes(): Response
@@ -121,4 +210,4 @@
 //     // }
 
     
-// }
+}

Sources/src/app/controller/HeartRateController.php

@@ -1,36 +1,45 @@
 <?php
 
-// namespace App\Controller;
+namespace App\Controller;
-
+
-// use App\Container;
+use App\Container;
-// use App\Router\Request\IRequest;
+use App\Router\Request\IRequest;
-// use App\Router\Response\Response;
+use App\Router\Response\Response;
-// use Shared\Attributes\Route;
+use Shared\Attributes\Route;
-// use Twig\Environment;
+use Twig\Environment;
-// use Data\Core\Preferences;
+use Data\Core\Preferences;
-// use Shared\Log;
+use Shared\Log;
-
+
-// class HeartRateController extends BaseController
+class HeartRateController extends BaseController
-// {
+{
-
+
-
+    private Environment $twig;
-//     #[Route(path: '/import', name: 'import', methods: ['GET'])]
+    protected Preferences $preference;
-//     public function import(): Response
+
-//     {
+    public function __construct()
-//         return $this->render('./page/import.html.twig',[
+    {
-//             'css' => $this->preference->getCookie(),
+       session_start();
-//             'pp' => "test2",
+       $this->preference = new Preferences();
-//             'user' => "Doe",
+    }
-//             'role' => "Athlète",
+
-//             'friendship' => [],
+
-//             'analyzes' => [],
+    #[Route(path: '/import', name: 'import', methods: ['GET'])]
-//             'mails' => [],
+    public function import(): Response
-//             'users' => [],
+    {
-//             'infoUser' => [],
+        return $this->render('./page/import.html.twig',[
-//             'exos' => [],
+            'css' => $this->preference->getCookie(),
-//             'member' => []
+            'pp' => "test2",
-//         ]);
+            'user' => "Doe",
-//     }
+            'role' => "Athlète",
-
+            'friendship' => [],
-    
+            'analyzes' => [],
-// }
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => []
+        ]);
+    }
+
+    
+}

Sources/src/app/controller/SocialController.php

@@ -1,19 +1,45 @@
 <?php
 
-// namespace App\Controller;
+namespace App\Controller;
 
-// use App\Container;
+use App\Container;
-// use App\Router\Request\IRequest;
+use App\Router\Request\IRequest;
-// use App\Router\Response\Response;
+use App\Router\Response\Response;
-// use App\Router\Response\IResponse;
+use Shared\Attributes\Route;
+use Twig\Environment;
+use Data\Core\Preferences;
+use Shared\Log;
 
-// use Shared\Attributes\Route;
+class SocialController extends BaseController
-// use Twig\Environment;
+{
-// use Data\Core\Preferences;
-// use Shared\Log;
 
+    private Environment $twig;
+    protected Preferences $preference;
 
+    public function __construct()
+    {
+       session_start();
+       $this->preference = new Preferences();
+    }
 
-// #[Route(path: '/coach', name: 'coach')]
+
-// class CoachController extends BaseController
+    #[Route(path: '/mail', name: 'mail', methods: ['GET'])]
-// {
+    public function mail(): Response
+    {
+        return $this->render('./page/mail.html.twig',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => "Doe",
+            'role' => "Athlète",
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => []
+        ]);
+    }
+
+    
+}

Sources/src/app/controller/UserController.php

@@ -13,11 +13,37 @@ use Shared\Log;
 class UserController extends BaseController
 {
 
+    private Environment $twig;
+    protected Preferences $preference;
 
-    #[Route(path: '/', name: 'home', methods: ['GET'])]
+    public function __construct()
+    {
+       session_start();
+       $this->preference = new Preferences();
+    }
+
+
+    #[Route(path: '/', name: 'index', methods: ['GET'])]
     public function index(): Response
     {
+        return $this->render('./page/index.html',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => "Doe",
+            'role' => "Athlète",
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => []
+        ]);
+    }
 
+    #[Route(path: '/home', name: 'home', methods: ['GET'])]
+    public function home(): Response
+    {
         return $this->render('./page/home.html.twig',[
             'css' => $this->preference->getCookie(),
             'pp' => "test2",
@@ -52,10 +78,28 @@ class UserController extends BaseController
         ]);
     }
 
+    #[Route(path: '/profile', name: 'profile', methods: ['GET'])]
+    public function profile(): Response
+    {
+        return $this->render('./page/profile.html.twig',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => "Doe",
+            'role' => "Athlète",
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => []
+        ]);
+    }
 
     #[Route(path: '/preferences', name: 'preferences', methods: ['POST'])]
     public function preferences(string $theme, IRequest $req): Response
     {
+        /*TODO*/
 
         //  VALIDER LES DONNEES
         $this->preference->majCookie($theme);
@@ -75,4 +119,45 @@ class UserController extends BaseController
         ]);
     }
 
+    #[Route(path: '/psettings', name: 'psettings', methods: ['POST'])]
+    public function psettings(string $nom,string $prenom,string $dateNaissance,string $mail,string $tel, IRequest $req): Response
+    {
+        
+       
+        return $this->render('./page/settings.html.twig',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => $prenom,
+            'role' => "Athlète",
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => []
+        ]);
+    }
+
+    #[Route(path: '/mdp', name: 'mdp', methods: ['POST'])]
+    public function mdp(string $ancienMotDePasse,string $nouveauMotDePasse,string $confirmerMotDePasse, IRequest $req): Response
+    {
+        
+       // CONFIRMER LES DONNESS !!!!! IMPORTANT
+
+        return $this->render('./page/settings.html.twig',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => "Doe",
+            'role' => "Athlète",
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => []
+        ]);
+    }
+    
 }

Sources/src/app/views/Templates/authbase.html.twig

@@ -1,71 +1,71 @@
 <!DOCTYPE html>
 <html lang="en">
-    <head>
+<head>
-        <meta charset="utf-8" />
+    <meta charset="utf-8" />
-        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-        <meta name="description" content="" />
+    <meta name="description" content="" />
-        <meta name="author" content="" />
+    <meta name="author" content="" />
-        <title>{% block title %}{% endblock %}</title>
+    <title>{% block title %}{% endblock %}</title>
-        <link href="/css/{% block css %}base_theme{% endblock %}.css" rel="stylesheet" />
+    <link href="/css/{% block css %}base_theme{% endblock %}.css" rel="stylesheet" />
-        <script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
+    <script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
-    </head>
+</head>
-    <body class="bg-primary">
+<body class="bg-primary">
-        <div id="layoutAuthentication">
+<div id="layoutAuthentication">
-            <div id="layoutAuthentication_content">
+    <div id="layoutAuthentication_content">
-                <main>
+        <main>
-                {% block main %}
+            {% block main %}
-                    <div class="container">
+                <div class="container">
-                        <div class="row justify-content-center">
+                    <div class="row justify-content-center">
-                            <div class="col-lg-5">
+                        <div class="col-lg-5">
-                                <div class="card shadow-lg border-0 rounded-lg mt-5">
+                            <div class="card shadow-lg border-0 rounded-lg mt-5">
-                                    <div class="card-header"><h3 class="text-center font-weight-light my-4">Connexion</h3></div>
+                                <div class="card-header"><h3 class="text-center font-weight-light my-4">Connexion</h3></div>
-                                    <div class="card-body">
+                                <div class="card-body">
-                                        <form>
+                                    <form>
-                                            <div class="form-floating mb-3">
+                                        <div class="form-floating mb-3">
-                                                <input class="form-control" id="inputEmail" type="email" placeholder="nom@exemple.com" />
+                                            <input class="form-control" id="inputEmail" type="email" placeholder="nom@exemple.com" />
-                                                <label for="inputEmail">Adresse eMail</label>
+                                            <label for="inputEmail">Adresse eMail</label>
-                                            </div>
+                                        </div>
-                                            <div class="form-floating mb-3">
+                                        <div class="form-floating mb-3">
-                                                <input class="form-control" id="inputPassword" type="password" placeholder="Mot de passe" />
+                                            <input class="form-control" id="inputPassword" type="password" placeholder="Mot de passe" />
-                                                <label for="inputPassword">Mot de passe</label>
+                                            <label for="inputPassword">Mot de passe</label>
-                                            </div>
+                                        </div>
-                                            <div class="form-check mb-3">
+                                        <div class="form-check mb-3">
-                                                <input class="form-check-input" id="inputRememberPassword" type="checkbox" value="" />
+                                            <input class="form-check-input" id="inputRememberPassword" type="checkbox" value="" />
-                                                <label class="form-check-label" for="inputRememberPassword">Mémoriser le mot de passe</label>
+                                            <label class="form-check-label" for="inputRememberPassword">Mémoriser le mot de passe</label>
-                                            </div>
+                                        </div>
-                                            <div class="d-flex align-items-center justify-content-between mt-4 mb-0">
+                                        <div class="d-flex align-items-center justify-content-between mt-4 mb-0">
-                                                <a class="small" href="password.html">Mot de passe oublié ?</a>
+                                            <a class="small" href="password.html">Mot de passe oublié ?</a>
-                                                <a class="btn btn-primary" href="index.html">Se connecter</a>
+                                            <a class="btn btn-primary" href="index.html">Se connecter</a>
-                                            </div>
+                                        </div>
-                                        </form>
+                                    </form>
-                                    </div>
+                                </div>
-                                    <div class="card-footer text-center py-3">
+                                <div class="card-footer text-center py-3">
-                                        <div class="small"><a href="register.html">Besoin d'un compte ? Inscrivez-vous !</a></div>
+                                    <div class="small"><a href="register.html">Besoin d'un compte ? Inscrivez-vous !</a></div>
-                                    </div>
                                 </div>
                             </div>
                         </div>
                     </div>
-                    {% endblock %}
+                </div>
-                </main>
+            {% endblock %}
-            </div>
+        </main>
-            <div id="layoutAuthentication_footer">
+    </div>
-                <footer class="py-4 bg-light mt-auto">
+    <div id="layoutAuthentication_footer">
-                    <div class="container-fluid px-4">
+        <footer class="py-4 bg-light mt-auto">
-                        <div class="d-flex align-items-center justify-content-between small">
+            <div class="container-fluid px-4">
-                            <div class="text-muted">Copyright &copy; HeartTrack 2023</div>
+                <div class="d-flex align-items-center justify-content-between small">
-                            <div>
+                    <div class="text-muted">Copyright &copy; HeartTrack 2023</div>
-                                <a href="#">Politique de confidentialité</a>
+                    <div>
-                                &middot;
+                        <a href="#">Politique de confidentialité</a>
-                                <a href="#">Termes &amp; Conditions d'utilisations</a>
+                        &middot;
-                            </div>
+                        <a href="#">Termes &amp; Conditions d'utilisations</a>
-                        </div>
                     </div>
-                </footer>
+                </div>
             </div>
-        </div>
+        </footer>
-        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
+    </div>
-        <script src="js/scripts.js"></script>
+</div>
-    </body>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
+<script src="js/scripts.js"></script>
+</body>
 </html>

Sources/src/app/views/Templates/base.html.twig

@@ -8,7 +8,7 @@
         <meta name="author" content="PINAGOT Antoine" />
         <title>{% block title %}{% endblock %}</title>
         <link href="https://cdn.jsdelivr.net/npm/simple-datatables@7.1.2/dist/style.min.css" rel="stylesheet" />
-        <link href="/css/{% block css %}style{% endblock %}.css" rel="stylesheet" />
+        <link href="/css/{% block css %}styles{% endblock %}.css" rel="stylesheet" />
         <script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
     </head>
 <body class="sb-nav-fixed">
@@ -35,7 +35,7 @@
                         <li><a class="dropdown-item" href="/profile">Profile</a></li>
                         <li><a class="dropdown-item" href="/settings">Paramètres</a></li>
                         <li><hr class="dropdown-divider" /></li>
-                        <li><a class="dropdown-item" href="/logout">Déconnexion</a></li>
+                        <li><a class="dropdown-item" href="/">Déconnexion</a></li>
                     </ul>
                 </li>
             </ul>
@@ -46,7 +46,7 @@
                     <div class="sb-sidenav-menu">
                         <div class="nav">
                             <div class="sb-sidenav-menu-heading">Menu</div>
-                            <a class="nav-link" href="/">
+                            <a class="nav-link" href="/home">
                                 <div class="sb-nav-link-icon"><img src="/assets/img/house.png"></div>
                                 Accueil
                             </a>

Sources/src/app/views/Templates/page/index.html

@@ -1 +1,292 @@
-<a  href="/log">Se connecter</button>
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+        <meta name="description" content="index page du site web" />
+        <meta name="author" content="PINAGOT Antoine" />
+        <title>HeartTrack - Getting Started</title>
+        <link rel="icon" type="image/x-icon" href="assets/favicon.ico" />
+        <!-- Bootstrap icons-->
+        <link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.5.0/font/bootstrap-icons.css" rel="stylesheet" />
+        <!-- Google fonts-->
+        <link rel="preconnect" href="https://fonts.gstatic.com" />
+        <link href="https://fonts.googleapis.com/css2?family=Newsreader:ital,wght@0,600;1,600&amp;display=swap" rel="stylesheet" />
+        <link href="https://fonts.googleapis.com/css2?family=Mulish:ital,wght@0,300;0,500;0,600;0,700;1,300;1,500;1,600;1,700&amp;display=swap" rel="stylesheet" />
+        <link href="https://fonts.googleapis.com/css2?family=Kanit:ital,wght@0,400;1,400&amp;display=swap" rel="stylesheet" />
+        <!-- Core theme CSS (includes Bootstrap)-->
+        <link href="css/styles2.css" rel="stylesheet" />
+    </head>
+    <body id="page-top">
+        <!-- Navigation-->
+        <nav class="navbar navbar-expand-lg navbar-light fixed-top shadow-sm" id="mainNav">
+            <div class="container px-5">
+                <a class="navbar-brand fw-bold" href="/">HeartTrack</a>
+                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
+                    Menu
+                    <i class="bi-list"></i>
+                </button>
+                <div class="collapse navbar-collapse" id="navbarResponsive">
+                    <ul class="navbar-nav ms-auto me-4 my-3 my-lg-0">
+                        <li class="nav-item"><a class="nav-link me-lg-3" href="/log">Se connecter</a></li>
+                        <li class="nav-item"><a class="nav-link me-lg-3" href="/regist">S'inscire</a></li>
+                    </ul>
+                    <button class="btn btn-primary rounded-pill px-3 mb-2 mb-lg-0" data-bs-toggle="modal" data-bs-target="#feedbackModal">
+                        <span class="d-flex align-items-center">
+                            <i class="bi-chat-text-fill me-2"></i>
+                            <span class="small">Donnez votre avis</span>
+                        </span>
+                    </button>
+                </div>
+            </div>
+        </nav>
+        <!-- Mashead header-->
+        <header class="masthead">
+            <div class="container px-5">
+                <div class="row gx-5 align-items-center">
+                    <div class="col-lg-6">
+                        <!-- Mashead text and app badges-->
+                        <div class="mb-5 mb-lg-0 text-center text-lg-start">
+                            <h1 class="display-1 lh-1 mb-3">HeartTrack pour mobile !</h1>
+                            <p class="lead fw-normal text-muted mb-5">Une application pour suivre vos analyses en direct, est en cours de développement.</p>
+                            <!-- <div class="d-flex flex-column flex-lg-row align-items-center">
+                                <a class="me-lg-3 mb-4 mb-lg-0" href="#!"><img class="app-badge" src="assets/img/google-play-badge.svg" alt="..." /></a>
+                                <a href="#!"><img class="app-badge" src="assets/img/app-store-badge.svg" alt="..." /></a>
+                            </div> -->
+                        </div>
+                    </div>
+                    <div class="col-lg-6">
+                        <!-- Masthead device mockup feature-->
+                        <div class="masthead-device-mockup">
+                            <svg class="circle" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+                                <defs>
+                                    <linearGradient id="circleGradient" gradientTransform="rotate(45)">
+                                        <stop class="gradient-start-color" offset="0%"></stop>
+                                        <stop class="gradient-end-color" offset="100%"></stop>
+                                    </linearGradient>
+                                </defs>
+                                <circle cx="50" cy="50" r="50"></circle></svg
+                            ><svg class="shape-1 d-none d-sm-block" viewBox="0 0 240.83 240.83" xmlns="http://www.w3.org/2000/svg">
+                                <rect x="-32.54" y="78.39" width="305.92" height="84.05" rx="42.03" transform="translate(120.42 -49.88) rotate(45)"></rect>
+                                <rect x="-32.54" y="78.39" width="305.92" height="84.05" rx="42.03" transform="translate(-49.88 120.42) rotate(-45)"></rect></svg
+                            ><svg class="shape-2 d-none d-sm-block" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg"><circle cx="50" cy="50" r="50"></circle></svg>
+                            <div class="device-wrapper">
+                                <div class="device" data-device="iPhoneX" data-orientation="portrait" data-color="black">
+                                    <div class="screen bg-black">
+                                        <!-- PUT CONTENTS HERE:-->
+                                        <!-- * * This can be a video, image, or just about anything else.-->
+                                        <!-- * * Set the max width of your media to 100% and the height to-->
+                                        <!-- * * 100% like the demo example below.-->
+                                        <video muted="muted" autoplay="" loop="" style="max-width: 100%; height: 100%"><source src="assets/img/demo-screen.mp4" type="video/mp4" /></video>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </header>
+        <!-- Quote/testimonial aside-->
+        <aside class="text-center bg-gradient-primary-to-secondary">
+            <div class="container px-5">
+                <div class="row gx-5 justify-content-center">
+                    <div class="col-xl-8">
+                        <div class="h2 fs-1 text-white mb-4">"Une solution gratuite pour analyser vos données de fréquences cardiaques !"</div>
+                        <img src="assets/img/tnw-logo.svg" alt="..." style="height: 3rem" />
+                    </div>
+                </div>
+            </div>
+        </aside>
+        <!-- App features section-->
+        <section id="features">
+            <div class="container px-5">
+                <div class="row gx-5 align-items-center">
+                    <div class="col-lg-8 order-lg-1 mb-5 mb-lg-0">
+                        <div class="container-fluid px-5">
+                            <div class="row gx-5">
+                                <div class="col-md-6 mb-5">
+                                    <!-- Feature item-->
+                                    <div class="text-center">
+                                        <i class="bi-phone icon-feature text-gradient d-block mb-3"></i>
+                                        <h3 class="font-alt">Web/Mobile</h3>
+                                        <p class="text-muted mb-0">Gardez les informations tant bien dans l'application que sur le site web avec la synchronisation des données !</p>
+                                    </div>
+                                </div>
+                                <div class="col-md-6 mb-5">
+                                    <!-- Feature item-->
+                                    <div class="text-center">
+                                        <i class="bi-cast icon-feature text-gradient d-block mb-3"></i>
+                                        <h3 class="font-alt">Importez vos données</h3>
+                                        <p class="text-muted mb-0">Importez vos données directement depuis un fichier .FIT !</p>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-md-6 mb-5 mb-md-0">
+                                    <!-- Feature item-->
+                                    <div class="text-center">
+                                        <i class="bi-gift icon-feature text-gradient d-block mb-3"></i>
+                                        <h3 class="font-alt">Gratuit</h3>
+                                        <p class="text-muted mb-0">Ce site et cette application sont entièrement gratuites !</p>
+                                    </div>
+                                </div>
+                                <div class="col-md-6">
+                                    <!-- Feature item-->
+                                    <div class="text-center">
+                                        <i class="bi-patch-check icon-feature text-gradient d-block mb-3"></i>
+                                        <h3 class="font-alt">Open Source</h3>
+                                        <p class="text-muted mb-0">Ce projet est fait en Open Source, tout le monde peut y accéder !</p>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-lg-4 order-lg-0">
+                        <!-- Features section device mockup-->
+                        <div class="features-device-mockup">
+                            <svg class="circle" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+                                <defs>
+                                    <linearGradient id="circleGradient" gradientTransform="rotate(45)">
+                                        <stop class="gradient-start-color" offset="0%"></stop>
+                                        <stop class="gradient-end-color" offset="100%"></stop>
+                                    </linearGradient>
+                                </defs>
+                                <circle cx="50" cy="50" r="50"></circle></svg
+                            ><svg class="shape-1 d-none d-sm-block" viewBox="0 0 240.83 240.83" xmlns="http://www.w3.org/2000/svg">
+                                <rect x="-32.54" y="78.39" width="305.92" height="84.05" rx="42.03" transform="translate(120.42 -49.88) rotate(45)"></rect>
+                                <rect x="-32.54" y="78.39" width="305.92" height="84.05" rx="42.03" transform="translate(-49.88 120.42) rotate(-45)"></rect></svg
+                            ><svg class="shape-2 d-none d-sm-block" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg"><circle cx="50" cy="50" r="50"></circle></svg>
+                            <div class="device-wrapper">
+                                <div class="device" data-device="iPhoneX" data-orientation="portrait" data-color="black">
+                                    <div class="screen bg-black">
+                                        <!-- PUT CONTENTS HERE:-->
+                                        <!-- * * This can be a video, image, or just about anything else.-->
+                                        <!-- * * Set the max width of your media to 100% and the height to-->
+                                        <!-- * * 100% like the demo example below.-->
+                                        <video muted="muted" autoplay="" loop="" style="max-width: 100%; height: 100%"><source src="assets/img/demo-screen.mp4" type="video/mp4" /></video>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </section>
+        <!-- Basic features section-->
+        <section class="bg-light">
+            <div class="container px-5">
+                <div class="row gx-5 align-items-center justify-content-center justify-content-lg-between">
+                    <div class="col-12 col-lg-5">
+                        <h2 class="display-4 lh-1 mb-4">Fonctionnalité supplémentaire de notre application</h2>
+                        <p class="lead fw-normal text-muted mb-5 mb-lg-0">Notre application propose un service de coaching personnalisé en fonction du besoin que vous avez en tant qu'athelète. Vous pouvez aussi fournir un service de coaching aux autres utilisateurs en vous inscrivant en tant que coach sportif.</p>
+                    </div>
+                    <div class="col-sm-8 col-md-6">
+                        <div class="px-5 px-sm-0"><img class="img-fluid rounded-circle" src="./assets/img/bg1.png" alt="..." /></div>
+                    </div>
+                </div>
+            </div>
+        </section>
+        <!-- Call to action section-->
+        <section class="cta">
+            <div class="cta-content">
+                <div class="container px-5">
+                    <h2 class="text-white display-1 lh-1 mb-4">
+                        Arrêtez d'attendre...
+                        <br />
+                        Inscrivez-vous !
+                    </h2>
+                    <!-- <a class="btn btn-outline-light py-3 px-4 rounded-pill" href="#" target="_blank">Download for free</a> -->
+                </div>
+            </div>
+        </section>
+        <!-- App badge section-->
+        <section class="bg-gradient-primary-to-secondary" id="download">
+            <div class="container px-5">
+                <h2 class="text-center text-white font-alt mb-4">Application bientôt disponible !</h2>
+                <!-- <div class="d-flex flex-column flex-lg-row align-items-center justify-content-center">
+                    <a class="me-lg-3 mb-4 mb-lg-0" href="#!"><img class="app-badge" src="assets/img/google-play-badge.svg" alt="..." /></a>
+                    <a href="#!"><img class="app-badge" src="assets/img/app-store-badge.svg" alt="..." /></a>
+                </div> -->
+            </div>
+        </section>
+        <!-- Footer-->
+        <footer class="bg-black text-center py-5">
+            <div class="container px-5">
+                <div class="text-white-50 small">
+                    <div class="mb-2">&copy; HeartTrack 2023. Tous droits réservé.</div>
+                    <a href="#!">Politique de confidentialité</a>
+                    <span class="mx-1">&middot;</span>
+                    <a href="#!">Termes & Conditions d'utilisation</a>
+                </div>
+            </div>
+        </footer>
+        <!-- Feedback Modal-->
+        <div class="modal fade" id="feedbackModal" tabindex="-1" aria-labelledby="feedbackModalLabel" aria-hidden="true">
+            <div class="modal-dialog modal-dialog-centered">
+                <div class="modal-content">
+                    <div class="modal-header bg-gradient-primary-to-secondary p-4">
+                        <h5 class="modal-title font-alt text-white" id="feedbackModalLabel">Envoyez votre avis</h5>
+                        <button class="btn-close btn-close-white" type="button" data-bs-dismiss="modal" aria-label="Close"></button>
+                    </div>
+                    <div class="modal-body border-0 p-4">
+                        <!-- * * * * * * * * * * * * * * *-->
+                        <!-- * * SB Forms Contact Form * *-->
+                        <!-- * * * * * * * * * * * * * * *-->
+                        <!-- This form is pre-integrated with SB Forms.-->
+                        <!-- To make this form functional, sign up at-->
+                        <!-- https://startbootstrap.com/solution/contact-forms-->
+                        <!-- to get an API token!-->
+                        <form id="contactForm" data-sb-form-api-token="API_TOKEN">
+                            <!-- Name input-->
+                            <div class="form-floating mb-3">
+                                <input class="form-control" id="name" type="text" placeholder="Entrez votre nom complet..." data-sb-validations="required" />
+                                <label for="name">Nom complet</label>
+                                <div class="invalid-feedback" data-sb-feedback="name:required">Un nom est requis.</div>
+                            </div>
+                            <!-- Email address input-->
+                            <div class="form-floating mb-3">
+                                <input class="form-control" id="email" type="email" placeholder="nom@exemple.com" data-sb-validations="required,email" />
+                                <label for="email">Adresse email</label>
+                                <div class="invalid-feedback" data-sb-feedback="email:required">Adresse email requis.</div>
+                                <div class="invalid-feedback" data-sb-feedback="email:email">L'adresse email n'est pas valide.</div>
+                            </div>
+                            <!-- Phone number input-->
+                            <div class="form-floating mb-3">
+                                <input class="form-control" id="phone" type="tel" placeholder="06 12 34 56 78" data-sb-validations="required" />
+                                <label for="phone">Numéro de téléphone</label>
+                                <div class="invalid-feedback" data-sb-feedback="phone:required">Numéro de téléphone requis.</div>
+                            </div>
+                            <!-- Message input-->
+                            <div class="form-floating mb-3">
+                                <textarea class="form-control" id="message" type="text" placeholder="Entrez votre message..." style="height: 10rem" data-sb-validations="required"></textarea>
+                                <label for="message">Message</label>
+                                <div class="invalid-feedback" data-sb-feedback="message:required">Un message est requis.</div>
+                            </div>
+                            <!-- Submit success message-->
+                            <!---->
+                            <!-- This is what your users will see when the form-->
+                            <!-- has successfully submitted-->
+                            <div class="d-none" id="submitSuccessMessage">
+                                <div class="text-center mb-3">
+                                    <div class="fw-bolder">Avis envoyé !</div>
+                                </div>
+                            </div>
+                            <!-- Submit error message-->
+                            <!---->
+                            <!-- This is what your users will see when there is-->
+                            <!-- an error submitting the form-->
+                            <div class="d-none" id="submitErrorMessage"><div class="text-center text-danger mb-3">Erreur du formulaire !</div></div>
+                            <!-- Submit Button-->
+                            <div class="d-grid"><button class="btn btn-primary rounded-pill btn-lg disabled" id="submitButton" type="submit">Envoyer</button></div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- Bootstrap core JS-->
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js"></script>
+        <!-- Core theme JS-->
+        <script src="js/scripts2.js"></script>
+        <script src="https://cdn.startbootstrap.com/sb-forms-latest.js"></script>
+    </body>
+</html>

Sources/src/app/views/Templates/page/login.html.twig

@@ -25,13 +25,13 @@
                                                 <label class="form-check-label" for="inputRememberPassword">Mémoriser le mot de passe</label>
                                             </div>
                                             <div class="d-flex align-items-center justify-content-between mt-4 mb-0">
-                                                <a class="small" href="password.html">Mot de passe oublié ?</a>
+                                                <a class="small" href="/pass">Mot de passe oublié ?</a>
-                                                <a class="btn btn-primary" href="index.html">Se connecter</a>
+                                                <a class="btn btn-primary" href="/home">Se connecter</a>
                                             </div>
                                         </form>
                                     </div>
                                     <div class="card-footer text-center py-3">
-                                        <div class="small"><a href="register.html">Besoin d'un compte ? Inscrivez-vous !</a></div>
+                                        <div class="small"><a href="/regist">Besoin d'un compte ? Inscrivez-vous !</a></div>
                                     </div>
                                 </div>
                             </div>

Sources/src/app/views/Templates/page/password.html.twig

@@ -19,7 +19,7 @@
                                             </div>
                                             <div class="d-flex align-items-center justify-content-between mt-4 mb-0">
                                                 <a class="small" href="/log">Retour à la connexion</a>
-                                                <button class="btn btn-primary" type="submit">Réinitialiser votre mot de passe</a>
+                                                <button class="btn btn-primary" type="submit">Réinitialiser votre mot de passe</button>
                                             </div>
                                         </form>
                                     </div>

Sources/src/app/views/Templates/page/register.html.twig

@@ -81,12 +81,12 @@
                                                 </div>
                                             </div>
                                             <div class="mt-4 mb-0">
-                                                <div class="d-grid"><a class="btn btn-primary btn-block" href="login.html.twig">Créer un compte</a></div>
+                                                <div class="d-grid"><a class="btn btn-primary btn-block" href="/log">Créer un compte</a></div>
                                             </div>
                                         </form>
                                     </div>
                                     <div class="card-footer text-center py-3">
-                                        <div class="small"><a href="login.html.twig">Avez-vous déjà un compte ? Connectez-vous ?</a></div>
+                                        <div class="small"><a href="/log">Avez-vous déjà un compte ? Connectez-vous ?</a></div>
                                     </div>
                                 </div>
                             </div>

Sources/src/data/core/database/ActiviteGateway.php

@@ -1,38 +1,39 @@
 <?php
 
 namespace Database;
+use \PDO;
 
-class ActiviteGateway {
+class ActivityGateway {
-    private $connection;
+    private Connexion $connection;
 
-    public function __construct(Connection $connection) {
+    public function __construct(Connexion $connection) {
         $this->connection = $connection;
     }
 
-    public function getActivite() {
+    public function getActivity() {
         $query = "SELECT * FROM Activite";
         return $this->connection->executeWithErrorHandling($query);
     }
 
-    public function getActiviteById(int $activiteId) {
+    public function getActivityById(int $activityId) {
         $query = "SELECT * FROM Activite WHERE idActivite = :id";
-        $params = [':id' => [$activiteId, PDO::PARAM_INT]];
+        $params = [':id' => [$activityId, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getActiviteByType(string $type) {
+    public function getActivityByType(string $type) {
         $query = "SELECT * FROM Activite WHERE type = :type";
         $params = [':type' => [$type, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getActiviteByDate(string $date) {
+    public function getActivityByDate(string $date) {
         $query = "SELECT * FROM Activite WHERE date = :date";
         $params = [':date' => [$date, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getActiviteByTimeRange(string $startTime, string $endTime) {
+    public function getActivityByTimeRange(string $startTime, string $endTime) {
         $query = "SELECT * FROM Activite WHERE heureDebut >= :startTime AND heureFin <= :endTime";
         $params = [
             ':startTime' => [$startTime, PDO::PARAM_STR],
@@ -41,76 +42,76 @@ class ActiviteGateway {
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getActiviteByEffort(int $effortRessenti) {
+    public function getActivityByEffort(int $effortRessenti) {
         $query = "SELECT * FROM Activite WHERE effortRessenti = :effort";
         $params = [':effort' => [$effortRessenti, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getActiviteByVariability(int $variabilite) {
+    public function getActivityByVariability(int $variabilite) {
         $query = "SELECT * FROM Activite WHERE variabilite = :variability";
         $params = [':variability' => [$variabilite, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getActiviteByTemperature(int $temperatureMoyenne) {
+    public function getActivityByTemperature(int $temperatureMoyenne) {
         $query = "SELECT * FROM Activite WHERE temperatureMoyenne = :temperature";
         $params = [':temperature' => [$temperatureMoyenne, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function addActivite(ActiviteEntity $activite) {
+    public function addActivity(ActivityEntity $activity) {
         $query = "INSERT INTO Activite (type, date, heureDebut, heureDeFin, effortRessenti, variabilite, variance, ecartType, moyenne, maximum, minimum, temperatureMoyenne) 
                   VALUES (:type, :date, :heureDebut, :heureDeFin, :effortRessenti, :variabilite, :variance, :ecartType, :moyenne, :maximum, :minimum, :temperatureMoyenne)";
 
         $params = [
-            ':type' => $activite->getType(),
+            ':type' => $activity->getType(),
-            ':date' => $activite->getDate()->format('Y-m-d'), // Format date pour SQL
+            ':date' => $activity->getDate()->format('Y-m-d'), // Format date pour SQL
-            ':heureDebut' => $activite->getHeureDebut()->format('H:i:s'), // Format heure pour SQL
+            ':heureDebut' => $activity->getHeureDebut()->format('H:i:s'), // Format heure pour SQL
-            ':heureDeFin' => $activite->getHeureFin()->format('H:i:s'), // Format heure pour SQL
+            ':heureDeFin' => $activity->getHeureFin()->format('H:i:s'), // Format heure pour SQL
-            ':effortRessenti' => $activite->getEffortRessenti(),
+            ':effortRessenti' => $activity->getEffortRessenti(),
-            ':variabilite' => $activite->getVariabilite(),
+            ':variabilite' => $activity->getVariabilite(),
-            ':variance' => $activite->getVariance(),
+            ':variance' => $activity->getVariance(),
-            ':ecartType' => $activite->getEcartType(),
+            ':ecartType' => $activity->getEcartType(),
-            ':moyenne' => $activite->getMoyenne(),
+            ':moyenne' => $activity->getMoyenne(),
-            ':maximum' => $activite->getMaximum(),
+            ':maximum' => $activity->getMaximum(),
-            ':minimum' => $activite->getMinimum(),
+            ':minimum' => $activity->getMinimum(),
-            ':temperatureMoyenne' => $activite->getTemperatureMoyenne(),
+            ':temperatureMoyenne' => $activity->getTemperatureMoyenne(),
         ];
 
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function updateActivite(ActiviteEntity $oldActivite, ActiviteEntity $newActivite) {
+    public function updateActivity(ActivityEntity $oldActivity, ActivityEntity $newActivity) {
         $query = "UPDATE Activite
                   SET type = :type, date = :date, heureDebut = :heureDebut, heureDeFin = :heureDeFin,
                   effortRessenti = :effortRessenti, variabilite = :variabilite, variance = :variance, ecartType = :ecartType, moyenne = :moyenne, maximum = :maximum, minimum = :minimum, temperatureMoyenne = :temperatureMoyenne
                   WHERE idActivite = :idActivite";
 
         $params = [
-            ':idActivite' => $oldActivite->getIdActivite(),
+            ':idActivite' => $oldActivity->getIdActivity(),
-            ':type' => $newActivite->getType(),
+            ':type' => $newActivity->getType(),
-            ':date' => $newActivite->getDate()->format('Y-m-d'), // Format date pour SQL
+            ':date' => $newActivity->getDate()->format('Y-m-d'), // Format date pour SQL
-            ':heureDebut' => $newActivite->getHeureDebut()->format('H:i:s'), // Format heure pour SQL
+            ':heureDebut' => $newActivity->getHeureDebut()->format('H:i:s'), // Format heure pour SQL
-            ':heureDeFin' => $newActivite->getHeureFin()->format('H:i:s'), // Format heure pour SQL
+            ':heureDeFin' => $newActivity->getHeureFin()->format('H:i:s'), // Format heure pour SQL
-            ':effortRessenti' => $newActivite->getEffortRessenti(),
+            ':effortRessenti' => $newActivity->getEffortRessenti(),
-            ':variabilite' => $newActivite->getVariabilite(),
+            ':variabilite' => $newActivity->getVariabilite(),
-            ':variance' => $newActivite->getVariance(),
+            ':variance' => $newActivity->getVariance(),
-            ':ecartType' => $newActivite->getEcartType(),
+            ':ecartType' => $newActivity->getEcartType(),
-            ':moyenne' => $newActivite->getMoyenne(),
+            ':moyenne' => $newActivity->getMoyenne(),
-            ':maximum' => $newActivite->getMaximum(),
+            ':maximum' => $newActivity->getMaximum(),
-            ':minimum' => $newActivite->getMinimum(),
+            ':minimum' => $newActivity->getMinimum(),
-            ':temperatureMoyenne' => $newActivite->getTemperatureMoyenne(),
+            ':temperatureMoyenne' => $newActivity->getTemperatureMoyenne(),
         ];
 
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function deleteActivite(int $idActivite) {
+    public function deleteActivity(int $idActivity) {
-        $query = "DELETE FROM Activite WHERE idActivite = :idActivite";
+        $query = "DELETE FROM Activite WHERE idActivite = :idActivity";
 
         $params = [
-            ':idActivite' => $idActivite,
+            ':idActivity' => $idActivity,
         ];
 
         return $this->connection->executeWithErrorHandling($query, $params);

Sources/src/data/core/database/ActiviteMapper.php

@@ -1,34 +1,81 @@
 <?php
 
 namespace Database;
-use Model\Activite;
+use Model\Activity;
-
+
-class ActiviteMapper {
+class ActivityMapper {
-    public function map(array $data):ActiviteEntity {
+    public function activitySqlToEntity(array $data):array
-        $activite = new ActiviteEntity();
+    {
-        $activite->setIdActivite($data['idActivite']);
+        $activityEntities = [];
-        $activite->setType($data['type']);
+
-        $activite->setDate($data['date']);
+        foreach ($data as $activityData) {
-        $activite->setHeureDebut($data['heureDebut']);
+            $activity = new ActivityEntity();
-        $activite->setHeureFin($data['heureFin']);
+
-        $activite->setEffortRessenti($data['effortRessenti']);
+            if (isset($activityData['idActivity'])) {
-        $activite->setVariabilite($data['variabilite']);
+                $activity->setIdActivity($data['idActivity']);
-        $activite->setVariance($data['variance']);
+            }
-        $activite->setEcartType($data['ecartType']);
+
-        $activite->setMoyenne($data['moyenne']);
+            if (isset($activityData['type'])) {
-        $activite->setMaximum($data['maximum']);
+                $activity->setType($data['type']);
-        $activite->setMinimum($data['minimum']);
+            }
-        $activite->setTemperatureMoyenne($data['temperatureMoyenne']);
+
-
+            if (isset($activityData['date'])) {
-        return $activite;
+                $activity->setDate($data['date']);
-    }
+            }
+
+            if (isset($activityData['heureDebut'])) {
+                $activity->setHeureDebut($data['heureDebut']);
+            }
+
+            if (isset($activityData['heureFin'])) {
+                $activity->setHeureFin($data['heureFin']);
+            }
+
+            if (isset($activityData['effortRessenti'])) {
+                $activity->setEffortRessenti($data['effortRessenti']);
+            }
+
+            if (isset($activityData['variabilite'])) {
+                $activity->setVariabilite($data['variabilite']);
+            }
+
+            if (isset($activityData['variance'])) {
+                $activity->setVariance($data['variance']);
+            }
+
+            if (isset($activityData['ecartType'])) {
+                $activity->setEcartType($data['ecartType']);
+            }
 
-    //public function ActiviteEntityToModel(ActiviteEntity entity): Activite;
+            if (isset($activityData['moyenne'])) {
+                $activity->setMoyenne($data['moyenne']);
+            }
 
-    public function ActiviteEntityToModel(ActiviteEntity $activiteEntity):Activite{
+            if (isset($activityData['maximum'])) {
+                $activity->setMaximum($data['maximum']);
+            }
 
-        $act = new Activite(
+            if (isset($activityData['minimum'])) {
-            $activiteEntity->getIdActivite(),
+                $activity->setMinimum($data['minimum']);
+            }
+
+            if (isset($activityData['temperatureMoyenne'])) {
+                $activity->setTemperatureMoyenne($data['temperatureMoyenne']);
+            }
+
+            $activityEntities[] = $activity;
+        }
+
+        return $activityEntities;
+    }
+
+    /**
+     * @throws \Exception
+     */
+    public function ActivityEntityToModel(ActivityEntity $activiteEntity):Activity{
+
+        $act = new Activity(
+            $activiteEntity->getIdActivity(),
             $activiteEntity->getType(),
             $activiteEntity->getDate(),
             $activiteEntity->getHeureDebut(),
@@ -45,7 +92,27 @@ class ActiviteMapper {
 
         return $act;
     }
-    //public function ActiviteToEntity(Activite model): ActiviteEntity;
+    //public function ActivityToEntity(Activity model): ActivityEntity;
+
+    public function activityToEntity(Activity $act):ActivityEntity{
+
+        $act = new ActivityEntity();
+        $act->setIdActivity($act->getIdActivity()());
+        $act->setType($act->getType());
+        $act->setDate($act->getDate());
+        $act->setHeureDebut($act->getHeureDebut());
+        $act->setHeureFin($act->getHeureFin());
+        $act->setEffortRessenti($act->getEffortRessenti());
+        $act->setVariabilite($act->getVariabilite());
+        $act->setVariance($act->getVariance());
+        $act->setEcartType($act->getEcartType());
+        $act->setMoyenne($act->getMoyenne());
+        $act->setMaximum($act->getMaximum());
+        $act->setMinimum($act->getMinimum());
+        $act->setTemperatureMoyenne($act->getTemperatureMoyenne());
+
+        return $act;
+    }
 }
 
 ?>

Sources/src/data/core/database/ActivityEntity.php

@@ -2,8 +2,8 @@
 
 namespace Database;
 
-class ActiviteEntity {
+class ActivityEntity {
-    private $idActivite;
+    private $idActivity;
     private $type;
     private $date;
     private $heureDebut;
@@ -18,7 +18,7 @@ class ActiviteEntity {
     private $temperatureMoyenne;
 
     // Getters
-    public function getIdActivite() {
+    public function getIdActivity() {
         return $this->idActivity;
     }
 
@@ -71,7 +71,7 @@ class ActiviteEntity {
     }
 
     // Setters
-    public function setIdActivite($idActivite) {
+    public function setIdActivity($idActivity) {
         $this->idActivity = $idActivity;
     }
 

Sources/src/data/core/database/AthleteEntity.php

@@ -12,6 +12,7 @@ class AthleteEntity {
     private $poids;
     private $motDePasse;
     private $dateNaissance;
+    private $isCoach;
 
     // Getters
     public function getIdAthlete() {
@@ -50,6 +51,10 @@ class AthleteEntity {
         return $this->dateNaissance;
     }
 
+    public function getIsCoach(){
+        return $this->isCoach;
+    }
+
     // Setters
     public function setIdAthlete($idAthlete) {
         $this->idAthlete = $idAthlete;
@@ -86,6 +91,10 @@ class AthleteEntity {
     public function setDateNaissance($dateNaissance) {
         $this->dateNaissance = $dateNaissance;
     }
+
+    public function setIsCoach($isCoach){
+        $this->isCoach = $isCoach;
+    }
 }
 
 ?>

Sources/src/data/core/database/AthleteGateway.php

@@ -2,70 +2,83 @@
 
 namespace Database;
 use \PDO;
+use Shared\Log;
 
 class AthleteGateway {
-    private $connection;
+    private Connexion $connection;
 
     public function __construct(Connexion $connection) {
         $this->connection = $connection;
     }
 
-    public function getAthlete() {
+    public function getAthlete(): array
-        $query = "SELECT * FROM Athlete";
+    {
-        return $this->connection->executeWithErrorHandling($query);
+        $query = "SELECT * FROM Athlete WHERE isCoach=FALSE";
+        $res = $this->connection->executeWithErrorHandling($query);
+        return $res;
     }
 
-    public function getAthleteById(int $userId) {
+    public function getAthleteById(int $userId): array
-        $query = "SELECT * FROM Athlete WHERE idAthlete = :id";
+    {
+        $query = "SELECT * FROM Athlete WHERE idAthlete = :id AND isCoach=FALSE";
         $params = [':id' => [$userId, PDO::PARAM_INT]];
-        return $this->connection->executeWithErrorHandling($query, $params);
+        $res = $this->connection->executeWithErrorHandling($query, $params);
+        return $res;
     }
 
-    public function getAthleteByName(string $name) {
+    public function getAthleteByName(string $name): array
-        $query = "SELECT * FROM Athlete WHERE nom = :name";
+    {
+        $query = "SELECT * FROM Athlete WHERE nom = :name AND isCoach=FALSE";
         $params = [':name' => [$name, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getAthleteByFirstName(string $firstName) {
+    public function getAthleteByFirstName(string $firstName): array
-        $query = "SELECT * FROM Athlete WHERE prenom = :firstName";
+    {
+        $query = "SELECT * FROM Athlete WHERE prenom = :firstName AND isCoach=FALSE";
         $params = [':firstName' => [$firstName, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getAthleteByEmail(string $email) {
+    public function getAthleteByEmail(string $email): array
-        $query = "SELECT * FROM Athlete WHERE email = :email";
+    {
+        $query = "SELECT * FROM Athlete WHERE email = :email AND isCoach=FALSE";
         $params = [':email' => [$email, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getAthleteByGender(string $gender) {
+    public function getAthleteByGender(string $gender): array
-        $query = "SELECT * FROM Athlete WHERE sexe = :gender";
+    {
+        $query = "SELECT * FROM Athlete WHERE sexe = :gender AND isCoach=FALSE";
         $params = [':gender' => [$gender, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getAthleteByHeight(int $height) {
+    public function getAthleteByHeight(int $height): array
-        $query = "SELECT * FROM Athlete WHERE taille = :height";
+    {
+        $query = "SELECT * FROM Athlete WHERE taille = :height AND isCoach=FALSE";
         $params = [':height' => [$height, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getAthleteByWeight(int $weight) {
+    public function getAthleteByWeight(int $weight): array
-        $query = "SELECT * FROM Athlete WHERE poids = :weight";
+    {
+        $query = "SELECT * FROM Athlete WHERE poids = :weight AND isCoach=FALSE";
         $params = [':weight' => [$weight, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getAthleteByBirthDate(string $birthdate) {
+    public function getAthleteByBirthDate(string $birthdate): array
-        $query = "SELECT * FROM Athlete WHERE dateNaissance = :birthdate";
+    {
+        $query = "SELECT * FROM Athlete WHERE dateNaissance = :birthdate AND isCoach=FALSE";
         $params = [':birthdate' => [$birthdate, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function addAthlete(AthleteEntity $athlete) {
+    public function addAthlete(AthleteEntity $athlete): array
-        $query = "INSERT INTO Athlete (nom, prenom, email, sexe, taille, poids, motDePasse, dateNaissance) 
+    {
-                  VALUES (:nom, :prenom, :email, :sexe, :taille, :poids, :motDePasse, :dateNaissance)";
+        $query = "INSERT INTO Athlete (nom, prenom, email, sexe, taille, poids, motDePasse, dateNaissance, isCoach) 
+                  VALUES (:nom, :prenom, :email, :sexe, :taille, :poids, :motDePasse, :dateNaissance, :isCoach)";
 
         $params = [
             ':nom' => $athlete->getNom(),
@@ -76,15 +89,17 @@ class AthleteGateway {
             ':poids' => $athlete->getPoids(),
             ':motDePasse' => $athlete->getMotDePasse(),
             ':dateNaissance' => $athlete->getDateNaissance(),
+            ':isCoach' => $athlete->getIsCoach(),
         ];
 
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function updateAthlete(AthleteEntity $oldAthlete, AthleteEntity $newAthlete) {
+    public function updateAthlete(AthleteEntity $oldAthlete, AthleteEntity $newAthlete): array
+    {
         $query = "UPDATE Athlete 
                   SET nom = :nom, prenom = :prenom, email = :email, sexe = :sexe,
-                  taille = :taille, poids = :poids, motDePasse = :motDePasse, dateNaissance = :dateNaissance
+                  taille = :taille, poids = :poids, motDePasse = :motDePasse, dateNaissance = :dateNaissance, isCoach = :isCoach
                   WHERE idAthlete = :idAthlete";
 
         $params = [
@@ -97,12 +112,14 @@ class AthleteGateway {
             ':poids' => $newAthlete->getPoids(),
             ':motDePasse' => $newAthlete->getMotDePasse(),
             ':dateNaissance' => $newAthlete->getDateNaissance(),
+            ':isCoach' => $newAthlete->getIsCoach(),
         ];
 
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function deleteAthlete(int $idAthlete) {
+    public function deleteAthlete(int $idAthlete): array
+    {
         $query = "DELETE FROM Athlete WHERE idAthlete = :idAthlete";
 
         $params = [

Sources/src/data/core/database/AthleteMapper.php

@@ -6,16 +6,16 @@ use \PDO;
 use \DateTime;
 use Model\Role;
 use Model\Athlete;
+use Shared\Log;
 
 class AthleteMapper {
-    public function fromSqlToEntity(array $data): array {
+    public function athleteSqlToEntity(array $data): array {
         $athleteEntities = [];
 
         foreach ($data as $athleteData) {
             $athlete = new AthleteEntity();
-
+            if (isset($athleteData['idathlete'])) {
-            if (isset($athleteData['idAthlete'])) {
+                $athlete->setIdAthlete($athleteData['idathlete']);
-                $athlete->setIdAthlete($athleteData['idAthlete']);
             }
 
             if (isset($athleteData['nom'])) {
@@ -42,12 +42,16 @@ class AthleteMapper {
                 $athlete->setPoids($athleteData['poids']);
             }
 
-            if (isset($athleteData['motDePasse'])) {
+            if (isset($athleteData['motdepasse'])) {
-                $athlete->setMotDePasse($athleteData['motDePasse']);
+                $athlete->setMotDePasse($athleteData['motdepasse']);
+            }
+
+            if (isset($athleteData['datenaissance'])) {
+                $athlete->setDateNaissance($athleteData['datenaissance']);
             }
 
-            if (isset($athleteData['dateNaissance'])) {
+            if (isset($athleteData['iscoach'])) {
-                $athlete->setDateNaissance($athleteData['dateNaissance']);
+                $athlete->setIsCoach($athleteData['iscoach']);
             }
 
             $athleteEntities[] = $athlete;
@@ -58,14 +62,12 @@ class AthleteMapper {
     
     public function athleteEntityToModel(AthleteEntity $athleteEntity): User {
         $role = new Athlete(); // Utilisez la classe Athlete
-
+        $date = new DateTime($athleteEntity->getDateNaissance());
-        $dateSpecifique = $athleteEntity->getDateNaissance();
-        $date = new DateTime($dateSpecifique);
-
         $user = new User(
             $athleteEntity->getIdAthlete(),
             $athleteEntity->getNom(),
             $athleteEntity->getPrenom(),
+            "myUsername",
             $athleteEntity->getEmail(),
             $athleteEntity->getMotDePasse(),
             $athleteEntity->getSexe(),
@@ -90,6 +92,8 @@ class AthleteMapper {
         $ath->setPoids($user->getPoids());
         $ath->setMotDePasse($user->getMotDePasse());
         $ath->setDateNaissance($user->getDateNaissance());
+        $ath->setIsCoach(FALSE);
+        $ath->setCoachId(NULL);
 
         return $ath;
     }

Sources/src/data/core/database/CoachEntity.php

@@ -4,50 +4,15 @@ namespace Database;
 
 class CoachEntity {
     private $idCoach;
-    private $nom;
+    private $athleteId;
-    private $prenom;
-    private $email;
-    private $sexe;
-    private $taille;
-    private $poids;
-    private $motDePasse;
-    private $dateNaissance;
 
     // Getters
     public function getIdCoach() {
         return $this->idCoach;
     }
 
-    public function getNom() {
+    public function getAthleteId() {
-        return $this->nom;
+        return $this->athleteId;
-    }
-
-    public function getPrenom() {
-        return $this->prenom;
-    }
-
-    public function getEmail() {
-        return $this->email;
-    }
-
-    public function getSexe() {
-        return $this->sexe;
-    }
-
-    public function getTaille() {
-        return $this->taille;
-    }
-
-    public function getPoids() {
-        return $this->poids;
-    }
-
-    public function getMotDePasse() {
-        return $this->motDePasse;
-    }
-
-    public function getDateNaissance() {
-        return $this->dateNaissance;
     }
 
     // Setters
@@ -55,37 +20,10 @@ class CoachEntity {
         $this->idCoach = $idCoach;
     }
 
-    public function setNom($nom) {
+    public function setAthleteId($athleteId) {
-        $this->nom = $nom;
+        $this->athleteId = $athleteId;
     }
 
-    public function setPrenom($prenom) {
-        $this->prenom = $prenom;
-    }
-
-    public function setEmail($email) {
-        $this->email = $email;
-    }
-
-    public function setSexe($sexe) {
-        $this->sexe = $sexe;
-    }
-
-    public function setTaille($taille) {
-        $this->taille = $taille;
-    }
-
-    public function setPoids($poids) {
-        $this->poids = $poids;
-    }
-
-    public function setMotDePasse($motDePasse) {
-        $this->motDePasse = $motDePasse;
-    }
-
-    public function setDateNaissance($dateNaissance) {
-        $this->dateNaissance = $dateNaissance;
-    }
 }
 
 ?>

Sources/src/data/core/database/CoachGateway.php

@@ -10,93 +10,96 @@ class CoachGateway {
         $this->connection = $connection;
     }
 
-    public function getCoach() {
+    public function getCoach(): array
+    {
         $query = "SELECT * FROM Coach";
         return $this->connection->executeWithErrorHandling($query);
     }
 
-    public function getCoachById(int $userId) {
+    public function getCoachById(int $userId): array
+    {
         $query = "SELECT * FROM Coach WHERE idCoach = :id";
         $params = [':id' => [$userId, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getCoachByName(string $name) {
+    public function getAthleteByCoachId(int $coachId): array
-        $query = "SELECT * FROM Coach WHERE nom = :name";
+    {
+        $query = "SELECT * FROM Athlete a, Coach c WHERE a.coachId = :id AND a.isCoach = TRUE";
+        $params = [':id' => [$coachId, PDO::PARAM_INT]];
+        return $this->connection->executeWithErrorHandling($query, $params);
+    }
+
+    public function getCoachByName(string $name): array
+    {
+        $query = "SELECT * FROM Coach c, Athlete a WHERE c.athleteId = a.idAthlete AND a.nom = :name";
         $params = [':name' => [$name, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getCoachByFirstName(string $firstName) {
+    public function getCoachByFirstName(string $firstName): array
-        $query = "SELECT * FROM Coach WHERE prenom = :firstName";
+    {
+        $query = "SELECT * FROM Coach c, Athlete a WHERE c.athleteId = a.idAthlete AND a.prenom = :firstName";
         $params = [':firstName' => [$firstName, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getCoachByEmail(string $email) {
+    public function getCoachByEmail(string $email): array
-        $query = "SELECT * FROM Coach WHERE email = :email";
+    {
+        $query = "SELECT * FROM Coach c, Athlete a WHERE c.athleteId = a.idAthlete AND a.email = :email";
         $params = [':email' => [$email, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getCoachByGender(string $gender) {
+    public function getCoachByGender(string $gender): array
-        $query = "SELECT * FROM Coach WHERE sexe = :gender";
+    {
+        $query = "SELECT * FROM Coach c, Athlete a WHERE c.athleteId = a.idAthlete AND a.sexe = :gender";
         $params = [':gender' => [$gender, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getCoachByHeight(int $height) {
+    public function getCoachByHeight(int $height): array
-        $query = "SELECT * FROM Coach WHERE taille = :height";
+    {
+        $query = "SELECT * FROM Coach c, Athlete a WHERE c.athleteId = a.idAthlete AND a.taille = :height";
         $params = [':height' => [$height, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getCoachByBirthDate(string $birthdate) {
+    public function getCoachByBirthDate(string $birthdate): array
-        $query = "SELECT * FROM Coach WHERE dateNaissance = :birthdate";
+    {
+        $query = "SELECT * FROM Coach c, Athlete a WHERE c.athleteId = a.idAthlete AND a.dateNaissance = :birthdate";
         $params = [':birthdate' => [$birthdate, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function addCoach(CoachEntity $coach) {
+    public function addCoach(CoachEntity $coach): array
-        $query = "INSERT INTO Coach (nom, prenom, email, sexe, taille, poids, motDePasse, dateNaissance) 
+    {
-                  VALUES (:nom, :prenom, :email, :sexe, :taille, :poids, :motDePasse, :dateNaissance)";
+        $query = "INSERT INTO Coach (athleteId) 
+                  VALUES (:athleteId)";
 
         $params = [
-            ':nom' => $coach->getNom(),
+            ':athleteId' => $coach->getAthleteId(),
-            ':prenom' => $coach->getPrenom(),
-            ':email' => $coach->getEmail(),
-            ':sexe' => $coach->getSexe(),
-            ':taille' => $coach->getTaille(),
-            ':poids' => $coach->getPoids(),
-            ':motDePasse' => $coach->getMotDePasse(),
-            ':dateNaissance' => $coach->getDateNaissance(), 
         ];
 
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function updateCoach(CoachEntity $oldCoach, CoachEntity $newCoach) {
+    public function updateCoach(CoachEntity $oldCoach, CoachEntity $newCoach): array
+    {
         $query = "UPDATE Coach 
-                  SET nom = :nom, prenom = :prenom, email = :email, sexe = :sexe,
+                  SET athleteId = :athleteId
-                  taille = :taille, poids = :poids, motDePasse = :motDePasse, dateNaissance = :dateNaissance
                   WHERE idCoach = :idCoach";
 
         $params = [
             ':idCoach' => $oldCoach->getIdCoach(),
-            ':nom' => $newCoach->getNom(),
+            ':athleteId' => $newCoach->getAthleteId(),
-            ':prenom' => $newCoach->getPrenom(),
-            ':email' => $newCoach->getEmail(),
-            ':sexe' => $newCoach->getSexe(),
-            ':taille' => $newCoach->getTaille(),
-            ':poids' => $newCoach->getPoids(),
-            ':motDePasse' => $newCoach->getMotDePasse(),
-            ':dateNaissance' => $newCoach->getDateNaissance(), 
         ];
 
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function deleteCoach(int $idCoach) {
+    public function deleteCoach(int $idCoach): array
+    {
         $query = "DELETE FROM Coach WHERE idCoach = :idCoach";
 
         $params = [

Sources/src/data/core/database/CoachMapper.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace Database;
+use Model\CoachAthlete;
 use Model\User;
 use \PDO;
 use \DateTime;
@@ -8,34 +9,48 @@ use Model\Role;
 use Model\Coach;
 
 class CoachMapper {
-    public function map(array $data) {
+    public function coachSqlToEntity(array $data): array {
-        $coach = new CoachEntity();
+        $coachEntities = [];
-        $coach->setIdCoach($data['idCoach']);
-        $coach->setNom($data['nom']);
-        $coach->setPrenom($data['prenom']);
-        $coach->setEmail($data['email']);
-        $coach->setSexe($data['sexe']);
-        $coach->setTaille($data['taille']);
-        $coach->setPoids($data['poids']);
-        $coach->setMotDePasse($data['motDePasse']);
-        $coach->setDateNaissance($data['dateNaissance']);
 
-        return $coach;
+        foreach ($data as $coachData) {
+            $coach = new CoachEntity();
+
+            if (isset($coachData['idCoach'])) {
+                $coach->setIdCoach($coachData['idCoach']);
+            }
+
+            if (isset($coachData['athleteId'])) {
+                $coach->setAthleteId($coachData['athleteId']);
+            }
+
+            $coachEntities[] = $coach;
+        }
+
+        return $coachEntities;
     }
 
     public function CoachEntityToModel(CoachEntity $coachEntity):User{
-        $role = "Coach";
+        $role = new CoachAthlete();
+
+        $idCoach = $coachEntity->getIdCoach();
+
+        $ath = getAthleteByCoachId($idCoach);
+        $athlete = athleteSqlToEntity($ath);
+
+        $dateSpecific = $athlete->getDateNaissance();
+        $date = new DateTime($dateSpecific);
 
         $user = new User(
             $coachEntity->getIdCoach(),
-            $coachEntity->getNom(),
+            $athlete->getNom(),
-            $coachEntity->getPrenom(),
+            $athlete->getPrenom(),
-            $coachEntity->getEmail(),
+            $athlete->getEmail(),
-            $coachEntity->getMotDePasse(),
+            $athlete->getMotDePasse(),
-            $coachEntity->getSexe(),
+            $athlete->getSexe(),
-            $coachEntity->getTaille(),
+            $athlete->getTaille(),
-            $coachEntity->getPoids(),
+            $athlete->getPoids(),
-            $coachEntity->getDateNaissance(),
+            $athlete->getDateNaissance(),
+            $date,
             $role
         );
 
@@ -46,17 +61,10 @@ class CoachMapper {
 
         $coach = new CoachEntity();
         $coach->setIdCoach($user->getId());
-        $coach->setNom($user->getNom());
+        $coach->setAthleteId($user->getId());
-        $coach->setPrenom($user->getPrenom());
-        $coach->setEmail($user->getEmail());
-        $coach->setSexe($user->getSexe());
-        $coach->setTaille($user->getTaille());
-        $coach->setPoids($user->getPoids());
-        $coach->setMotDePasse($user->getMotDePasse());
-        $coach->setDateNaissance($user->getDateNaissance());
 
         return $coach;
     }
 }
-
 ?>
+

Sources/src/data/core/database/Connexion.php

@@ -2,6 +2,9 @@
 
 namespace Database;
 
+use DateTime;
+use Shared\Log;
+
 class Connexion extends \PDO {
     private $stmt;
 
@@ -15,13 +18,14 @@ class Connexion extends \PDO {
         }
     }
 
-    public function executeQuery(string $query, array $parameters = []): bool {
+    public function executeQuery(string $query, array $parameters = []) {
         $this->stmt = $this->prepare($query);
-        //foreach ($parameters as $name => $value) {
+//        foreach ($parameters as $name => $value) {
-        //    $this->stmt->bindValue($name, $value[0], $value[1]);
+//            $this->stmt->bindValue($name, $value[0], $value[1]);
-        //}
+//        }
         foreach ($parameters as $name => $value) {
-            $bindValueResult = $this->stmt->bindValue($name, $value, \PDO::PARAM_STR); 
+            $dataType = is_numeric($value) ? \PDO::PARAM_INT : \PDO::PARAM_STR;
+            $bindValueResult = $this->stmt->bindValue($name, $value, $dataType);
             if (!$bindValueResult) {
                 // Gérez l'erreur, par exemple, en lançant une exception.
                 throw new \PDOException('Failed to bind value for parameter ' . $name);
@@ -43,7 +47,15 @@ class Connexion extends \PDO {
     }
 
     public function getResults(): array {
-        return $this->stmt->fetchAll(\PDO::FETCH_ASSOC);
+        $results = $this->stmt->fetchAll(\PDO::FETCH_ASSOC);
+
+        // Convertissez les colonnes "taille" et "poids" en nombres
+        foreach ($results as &$row) {
+            $row['taille'] = floatval($row['taille']);
+            $row['poids'] = floatval($row['poids']);
+        }
+
+        return $results;
     }
 }
 ?>

Sources/src/data/core/database/db.sql

@@ -1,158 +1,132 @@
--- Athlete Table
+DROP TABLE IF EXISTS Athlete, Friendship, Notification, Statistique, Entrainement, Participe, SourceDonnee, Activite, FrequenceCardiaque CASCADE;
+
 CREATE TABLE Athlete (
-    idAthlete SERIAL PRIMARY KEY,
+                         idAthlete SERIAL PRIMARY KEY,
-    nom VARCHAR(255),
+                         nom VARCHAR(255),
-    prenom VARCHAR(255),
+                         prenom VARCHAR(255),
-    email VARCHAR(255) UNIQUE,
+                         email VARCHAR(255) UNIQUE,
-    sexe CHAR(1),
+                         sexe CHAR(1),
-    taille DECIMAL,
+                         taille DECIMAL,
-    poids DECIMAL,
+                         poids DECIMAL,
-    motDePasse VARCHAR(255),
+                         motDePasse VARCHAR(255),
-    dateNaissance DATE
+                         dateNaissance DATE,
+                         isCoach BOOLEAN
 );
 
--- Friendship Table
 CREATE TABLE Friendship (
-    idAthlete1 INT,
+                            idAthlete1 INT,
-    idAthlete2 INT,
+                            idAthlete2 INT,
-    debut DATE,
+                            debut DATE,
-    PRIMARY KEY (idAthlete1, idAthlete2),
+                            PRIMARY KEY (idAthlete1, idAthlete2),
-    FOREIGN KEY (idAthlete1) REFERENCES Athlete (idAthlete),
+                            FOREIGN KEY (idAthlete1) REFERENCES Athlete(idAthlete),
-    FOREIGN KEY (idAthlete2) REFERENCES Athlete (idAthlete)
+                            FOREIGN KEY (idAthlete2) REFERENCES Athlete(idAthlete)
 );
 
--- Notification Table
 CREATE TABLE Notification (
-    idNotif SERIAL PRIMARY KEY,
+                              idNotif INT PRIMARY KEY,
-    message TEXT,
+                              message TEXT,
-    date DATE,
+                              date DATE,
-    statut BOOLEAN,
+                              statut BOOLEAN,
-    urgence INT,
+                              urgence INT,
-    athleteId INT,
+                              athleteId INT,
-    FOREIGN KEY (athleteId) REFERENCES Athlete (idAthlete)
+                              FOREIGN KEY (athleteId) REFERENCES Athlete(idAthlete)
-);
-
--- Coach Table
-CREATE TABLE Coach (
-    idCoach SERIAL PRIMARY KEY,
-    athleteId INT,
-    FOREIGN KEY (athleteId) REFERENCES Athlete (idAthlete)
 );
 
--- Statistique Table
 CREATE TABLE Statistique (
-    idStatistique SERIAL PRIMARY KEY,
+                             idStatistique INT PRIMARY KEY,
-    poids DECIMAL,
+                             poids DECIMAL,
-    fcMoyenne DECIMAL,
+                             fcMoyenne DECIMAL,
-    fcMax DECIMAL,
+                             fcMax DECIMAL,
-    caloriesBruleesMoy DECIMAL,
+                             caloriesBruleesMoy DECIMAL,
-    date DATE,
+                             date DATE,
-    athleteId INT,
+                             athleteId INT,
-    FOREIGN KEY (athleteId) REFERENCES Athlete (idAthlete)
+                             FOREIGN KEY (athleteId) REFERENCES Athlete(idAthlete)
 );
 
--- Entrainement Table
 CREATE TABLE Entrainement (
-    idEntrainement SERIAL PRIMARY KEY,
+                              idEntrainement INT PRIMARY KEY,
-    date DATE,
+                              date DATE,
-    description TEXT,
+                              description TEXT,
-    latitude DECIMAL,
+                              latitude DECIMAL,
-    longitude DECIMAL,
+                              longitude DECIMAL,
-    feedback TEXT,
+                              feedback TEXT,
-    coachId INT,
+                              athleteId INT,
-    FOREIGN KEY (coachId) REFERENCES Coach (idCoach)
+                              FOREIGN KEY (athleteId) REFERENCES Athlete(idAthlete)
 );
 
--- Participe Table
 CREATE TABLE Participe (
-    athleteId INT,
+                           athleteId INT,
-    entrainementId INT,
+                           entrainementId INT,
-    PRIMARY KEY (athleteId, entrainementId),
+                           PRIMARY KEY (athleteId, entrainementId),
-    FOREIGN KEY (athleteId) REFERENCES Athlete (idAthlete),
+                           FOREIGN KEY (athleteId) REFERENCES Athlete(idAthlete),
-    FOREIGN KEY (entrainementId) REFERENCES Entrainement (idEntrainement)
+                           FOREIGN KEY (entrainementId) REFERENCES Entrainement(idEntrainement)
 );
 
--- SourceDonnee Table
 CREATE TABLE SourceDonnee (
-    idSource SERIAL PRIMARY KEY,
+                              idSource INT PRIMARY KEY,
-    type VARCHAR(255),
+                              type VARCHAR(255),
-    modele VARCHAR(255),
+                              modele VARCHAR(255),
-    precision DECIMAL,
+                              precision2 DECIMAL,
-    athleteId INT,
+                              athleteId INT,
-    FOREIGN KEY (athleteId) REFERENCES Athlete (idAthlete)
+                              FOREIGN KEY (athleteId) REFERENCES Athlete(idAthlete)
 );
 
--- Activite Table
 CREATE TABLE Activite (
-    idActivite SERIAL PRIMARY KEY,
+                          idActivite INT PRIMARY KEY,
-    type VARCHAR(255),
+                          type VARCHAR(255),
-    date DATE,
+                          date DATE,
-    heureDeDebut TIME,
+                          heureDeDebut TIME,
-    heureDeFin TIME,
+                          heureDeFin TIME,
-    effortRessent DECIMAL,
+                          effortRessent DECIMAL,
-    variabilite DECIMAL,
+                          variabilite DECIMAL,
-    variance DECIMAL,
+                          variance DECIMAL,
-    ecartType DECIMAL,
+                          ecartType DECIMAL,
-    moyenne DECIMAL,
+                          moyenne DECIMAL,
-    maximum DECIMAL,
+                          maximum DECIMAL,
-    minimum DECIMAL,
+                          minimum DECIMAL,
-    temperatureMoyenne DECIMAL,
+                          temperatureMoyenne DECIMAL,
-    athleteId INT,
+                          athleteId INT,
-    sourceId INT,
+                          sourceId INT,
-    FOREIGN KEY (athleteId) REFERENCES Athlete (idAthlete),
+                          FOREIGN KEY (athleteId) REFERENCES Athlete(idAthlete),
-    FOREIGN KEY (sourceId) REFERENCES SourceDonnee (idSource)
+                          FOREIGN KEY (sourceId) REFERENCES SourceDonnee(idSource)
 );
 
--- FrequenceCardiaque Table
 CREATE TABLE FrequenceCardiaque (
-    idFc SERIAL PRIMARY KEY,
+                                    idFc INT PRIMARY KEY,
-    altitude DECIMAL,
+                                    altitude DECIMAL,
-    temps TIME,
+                                    temps TIME,
-    temperature DECIMAL,
+                                    temperature DECIMAL,
-    bpm INT,
+                                    bpm INT,
-    longitude DECIMAL,
+                                    longitude DECIMAL,
-    latitude DECIMAL,
+                                    latitude DECIMAL,
-    activiteId INT,
+                                    activiteId INT,
-    FOREIGN KEY (activiteId) REFERENCES Activite (idActivite)
+                                    FOREIGN KEY (activiteId) REFERENCES Activite(idActivite)
 );
 
--- Insertion de données dans la table Athlete
+INSERT INTO Athlete (idAthlete, nom, prenom, email, sexe, taille, poids, motDePasse, dateNaissance, isCoach) VALUES
-INSERT INTO Athlete (nom, prenom, email, sexe, taille, poids, motDePasse, dateNaissance) VALUES
+                                                                                                                 (1, 'Doe', 'John', 'john.doe@example.com', 'M', 1.80, 70, 'password123', '1990-01-01', FALSE),
-('Doe', 'John', 'john.doe@example.com', 'M', 1.80, 70, 'password123', '1990-01-01'),
+                                                                                                                 (2, 'Smith', 'Jane', 'jane.smith@example.com', 'F', 1.65, 60, 'password456', '1992-02-02', TRUE);
-('Smith', 'Jane', 'jane.smith@example.com', 'F', 1.65, 60, 'password456', '1992-02-02');
 
--- Insertion de données dans la table Friendship
 INSERT INTO Friendship (idAthlete1, idAthlete2, debut) VALUES
-(1, 2, '2023-01-01');
+    (1, 2, '2023-01-01');
-
--- Insertion de données dans la table Notification
-INSERT INTO Notification (message, date, statut, urgence, athleteId) VALUES
-('Training session at 10 AM', '2023-03-10', TRUE, 1, 1);
 
--- Insertion de données dans la table Coach
+INSERT INTO Notification (idNotif, message, date, statut, urgence, athleteId) VALUES
-INSERT INTO Coach (athleteId) VALUES
+    (1, 'Training session at 10 AM', '2023-03-10', TRUE, 1, 1);
-(1);
 
--- Insertion de données dans la table Statistique
+INSERT INTO Statistique (idStatistique, poids, fcMoyenne, fcMax, caloriesBruleesMoy, date, athleteId) VALUES
-INSERT INTO Statistique (poids, fcMoyenne, fcMax, caloriesBruleesMoy, date, athleteId) VALUES
+    (1, 70, 80, 150, 500, '2023-03-10', 1);
-(70, 80, 150, 500, '2023-03-10', 1);
 
--- Insertion de données dans la table Entrainement
+INSERT INTO Entrainement (idEntrainement, date, description, latitude, longitude, feedback, athleteId) VALUES
-INSERT INTO Entrainement (date, description, latitude, longitude, feedback, coachId) VALUES
+    (1, '2023-03-12', 'Long run in the park', 40.7128, -74.0060, 'Good effort', 1);
-('2023-03-12', 'Long run in the park', 40.7128, -74.0060, 'Good effort', 1);
 
--- Insertion de données dans la table Participe
 INSERT INTO Participe (athleteId, entrainementId) VALUES
-(1, 1);
+    (1, 1);
 
--- Insertion de données dans la table SourceDonnee
+INSERT INTO SourceDonnee (idSource, type, modele, precision2, athleteId) VALUES
-INSERT INTO SourceDonnee (type, modele, precision, athleteId) VALUES
+    (1, 'Heart Rate Monitor', 'HRM-Pro', 98.5, 1);
-('Heart Rate Monitor', 'HRM-Pro', 98.5, 1);
 
--- Insertion de données dans la table Activite
+INSERT INTO Activite (idActivite, type, date, heureDeDebut, heureDeFin, effortRessent, variabilite, variance, ecartType, moyenne, maximum, minimum, temperatureMoyenne, athleteId, sourceId) VALUES
-INSERT INTO Activite (type, date, heureDeDebut, heureDeFin, effortRessent, variabilite, variance, ecartType, moyenne, maximum, minimum, temperatureMoyenne, athleteId, sourceId) VALUES
+    (1, 'Running', '2023-03-10', '08:00:00', '09:00:00', 7, 0.5, 1, 0.1, 140, 160, 120, 20, 1, 1);
-('Running', '2023-03-10', '08:00:00', '09:00:00', 7, 0.5, 1, 0.1, 140, 160, 120, 20, 1, 1);
 
--- Insertion de données dans la table FrequenceCardiaque
+INSERT INTO FrequenceCardiaque (idFc, altitude, temps, temperature, bpm, longitude, latitude, activiteId) VALUES
-INSERT INTO FrequenceCardiaque (altitude, temps, temperature, bpm, longitude, latitude, activiteId) VALUES
+    (1, 100, '08:15:00', 15, 130, -74.0060, 40.7128, 1);
-(100, '08:15:00', 15, 130, -74.0060, 40.7128, 1);

Sources/src/data/model/User.php

@@ -50,7 +50,9 @@ class User {
      * @param \DateTime $dateNaissance
      * @param \Model\Role $role
      */
-    public function __construct(int $id, string $nom, string $prenom, string $username, string $email, string $motDePasse, string $sexe, float $taille, float $poids, \DateTime $dateNaissance, Role $role)
+    public function __construct(int $id, string $nom, string $prenom, string $username, string $email,
+                                string $motDePasse, string $sexe, float $taille, float $poids, \DateTime $dateNaissance,
+                                Role $role)
     {
         $this->id = $id;
         $this->nom = $nom;

Sources/src/data/model/manager/UserManager.php

@@ -39,6 +39,7 @@ class UserManager
         $this->relationshipService = $relationshipService;
 
     }
+
     public function getCurrentUser(): ?User
     {
         return $this->currentUser;
@@ -91,7 +92,6 @@ class UserManager
         if (in_array($newFriend, $this->currentUser->getRole()->getUsersList())) {
             throw new \Exception("Already friend");
         }
-        var_dump("====================1=========================");
         if($this->relationshipService->sendRequest($this->currentUser, $newFriend)){
             return true;
         };
@@ -134,8 +134,22 @@ class UserManager
         return $this->dataManager->userRepository->getItemsByName($name, 0, 10);
     }
         
-    public function getFriends(): array{
+    public function getFriends(): array {
-        return $this->currentUser->getRole()->getUsersList();
+        return [
+            [
+                'nom' => 'John',
+                'prenom' => 'Doe',
+                'img' => 'test',
+                'username' => 'johndoe',
+            ],
+            [
+                'nom' => 'Alice',
+                'prenom' => 'Smith',
+                'img' => 'test2',
+                'username' => 'alicesmith',
+            ],
+        ];
+        //return $this->currentUser->getRole()->getUsersList();
     }
 
     // NEED TO PERSIST

Sources/src/data/stub/repository/UserRepository.php

@@ -32,6 +32,7 @@ class UserRepository implements IUserRepository {
         $this->users[] = new User(3, "Martin", "Paul","Martin", "paul.martin@example.com", "super789", 'M', 1.75, 68, new \DateTime("1988-08-20"), new CoachAthlete());
         $this->users[] = new User(4, "Brown", "Anna","Brown", "anna.brown@example.com", "test000", 'F', 1.70, 58, new \DateTime("1992-11-25"), new Athlete());
         $this->users[] = new User(5, "Lee", "Bruce","Lee", "bruce.lee@example.com", "hello321", 'M', 1.72, 70, new \DateTime("1970-02-05"), new Athlete());
+        $this->users[] = new User(5, "Truc", "Bruce","Truc", "bruce.lee@example.com", "hello321", 'M', 1.72, 70, new \DateTime("1970-02-05"), new Athlete());
     }
 
     /**

Sources/tests/GatewayTest.php

@@ -0,0 +1,215 @@
+<?php
+use PHPUnit\Framework\TestCase;
+
+
+//use Database\{Connexion, AthleteGateway,AthleteEntity};
+use Database\AthleteEntity;
+use Database\AthleteGateway;
+use Database\Connexion;
+use Database\AthleteMapper;
+use Database\CoachGateway;
+use Database\CoachEntity;
+use Database\CoachMapper;
+
+class GatewayTest extends TestCase {
+
+    //Partie concernant les Athlètes
+
+    public function testGetAthlete() {
+
+        //$dsn = "pgsql:host=londres;port=8888;dbname=dbkemonteiro2;user=kemonteiro2;password=Mdp";
+
+        require "loginDatabase.php";
+
+        $connexion = new Connexion($dsn,$username,$password);
+
+
+        $athleteGateway = new AthleteGateway($connexion);
+        $result = $athleteGateway->getAthlete();
+        //var_dump($result);
+    }
+
+    /* Fonctionne mais en commentaire pour pas add et del a chaque fois
+    public function testAddAthlete(){
+        $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
+        $username = "kemonteiro2";
+        $password = "#Phpmyadmin63";
+
+        $connexion = new Connexion($dsn,$username,$password);
+
+
+        $athleteGateway = new AthleteGateway($connexion);
+
+        $dateSpecifique = "2023-11-26";
+        $timestamp = strtotime($dateSpecifique);
+        $dateSQL = date("Y-m-d", $timestamp);
+
+        $athleteEntity = new AthleteEntity();
+        $athleteEntity->setNom('John');
+        $athleteEntity->setPrenom('Doe');
+        $athleteEntity->setIdAthlete(1234);
+        $athleteEntity->setEmail('kevin.monteiro@gmail.fr');
+        $athleteEntity->setSexe('H');
+        $athleteEntity->setTaille(169);
+        $athleteEntity->setPoids(69);
+        $athleteEntity->setMotDePasse('motdepasse');
+        $athleteEntity->setDateNaissance($dateSQL);
+
+        $result2 = $athleteGateway->addAthlete($athleteEntity);
+    }
+
+
+    public function testDeleteAthlete(){
+        $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
+        $username = "kemonteiro2";
+        $password = "#Phpmyadmin63";
+
+        $connexion = new Connexion($dsn,$username,$password);
+
+        $athleteGateway = new AthleteGateway($connexion);
+        $result = $athleteGateway->deleteAthlete( //idAthlete );
+        var_dump($result);
+
+    }*/
+
+    public function testUpdateAthlete(){
+        $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
+        $username = "kemonteiro2";
+        $password = "#Phpmyadmin63";
+
+        $connexion = new Connexion($dsn,$username,$password);
+
+        $athleteGateway = new AthleteGateway($connexion);
+
+        $dateSpecifique = "2004-08-26";
+        $timestamp = strtotime($dateSpecifique);
+        $dateSQL = date("Y-m-d", $timestamp);
+
+        $athleteEntity = new AthleteEntity();
+        $athleteEntity->setNom('John');
+        $athleteEntity->setPrenom('Doe');
+        $athleteEntity->setIdAthlete(13);
+        $athleteEntity->setEmail('kevin.monteiro@gmail.fr');
+        $athleteEntity->setSexe('H');
+        $athleteEntity->setTaille(169);
+        $athleteEntity->setPoids(69);
+        $athleteEntity->setMotDePasse('motdepasse');
+        $athleteEntity->setDateNaissance($dateSQL);
+        $athleteEntity->setIsCoach(FALSE);
+        $athleteEntity->setCoachId(NULL);
+
+        $athleteEntity2 = new AthleteEntity();
+        $athleteEntity2->setNom('Monteiro');
+        $athleteEntity2->setPrenom('Kevin');
+        $athleteEntity2->setIdAthlete(13);
+        $athleteEntity2->setEmail('kevin.monteiro@gmail.fr');
+        $athleteEntity2->setSexe('H');
+        $athleteEntity2->setTaille(169);
+        $athleteEntity2->setPoids(69);
+        $athleteEntity2->setMotDePasse('motdepasse');
+        $athleteEntity2->setDateNaissance($dateSQL);
+        $athleteEntity2->setIsCoach(TRUE);
+        $athleteEntity2->setCoachId(1);
+
+        $result = $athleteGateway->updateAthlete($athleteEntity, $athleteEntity2);
+    }
+
+    //Partie concernant les Coachs
+
+    public function testGetCoach() {
+
+        //$dsn = "pgsql:host=londres;port=8888;dbname=dbkemonteiro2;user=kemonteiro2;password=Mdp";
+
+        $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
+        $username = "kemonteiro2";
+        $password = "#Phpmyadmin63";
+
+        $connexion = new Connexion($dsn,$username,$password);
+
+
+        $coachGateway = new CoachGateway($connexion);
+        $result = $coachGateway->getCoach();
+        var_dump($result);
+    }
+    /*
+        //Fonctionne PAS A PARTIR DE LA
+        public function testAddCoach(){
+            $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
+            $username = "kemonteiro2";
+            $password = "#Phpmyadmin63";
+
+            $connexion = new Connexion($dsn,$username,$password);
+
+
+            $coachGateway = new CoachGateway($connexion);
+
+            $dateSpecifique = "2023-11-26";
+            $timestamp = strtotime($dateSpecifique);
+            $dateSQL = date("Y-m-d", $timestamp);
+
+            $coachEntity = new CoachEntity();
+            $coachEntity->setNom('John');
+            $coachEntity->setPrenom('Doe');
+            $coachEntity->setIdCoach(1234);
+            $coachEntity->setEmail('kevin.monteiro@gmail.fr');
+            $coachEntity->setSexe('H');
+            $coachEntity->setTaille(169);
+            $coachEntity->setPoids(69);
+            $coachEntity->setMotDePasse('motdepasse');
+            $coachEntity->setDateNaissance($dateSQL);
+
+            $result2 = $coachGateway->addCoach($coachEntity);
+        }
+
+
+        public function testDeleteAthlete(){
+            $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
+            $username = "kemonteiro2";
+            $password = "#Phpmyadmin63";
+
+            $connexion = new Connexion($dsn,$username,$password);
+
+            $athleteGateway = new AthleteGateway($connexion);
+            $result = $athleteGateway->deleteAthlete( //idAthlete );
+            var_dump($result);
+
+        }*/
+    /*
+        public function testUpdateAthlete(){
+            $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
+            $username = "kemonteiro2";
+            $password = "#Phpmyadmin63";
+
+            $connexion = new Connexion($dsn,$username,$password);
+
+            $athleteGateway = new AthleteGateway($connexion);
+
+            $dateSpecifique = "2004-08-26";
+            $timestamp = strtotime($dateSpecifique);
+            $dateSQL = date("Y-m-d", $timestamp);
+
+            $athleteEntity = new AthleteEntity();
+            $athleteEntity->setNom('John');
+            $athleteEntity->setPrenom('Doe');
+            $athleteEntity->setIdAthlete(13);
+            $athleteEntity->setEmail('kevin.monteiro@gmail.fr');
+            $athleteEntity->setSexe('H');
+            $athleteEntity->setTaille(169);
+            $athleteEntity->setPoids(69);
+            $athleteEntity->setMotDePasse('motdepasse');
+            $athleteEntity->setDateNaissance($dateSQL);
+
+            $athleteEntity2 = new AthleteEntity();
+            $athleteEntity2->setNom('Monteiro');
+            $athleteEntity2->setPrenom('Kevin');
+            $athleteEntity2->setIdAthlete(13);
+            $athleteEntity2->setEmail('kevin.monteiro@gmail.fr');
+            $athleteEntity2->setSexe('H');
+            $athleteEntity2->setTaille(169);
+            $athleteEntity2->setPoids(69);
+            $athleteEntity2->setMotDePasse('motdepasse');
+            $athleteEntity2->setDateNaissance($dateSQL);
+
+            $result = $athleteGateway->updateAthlete($athleteEntity, $athleteEntity2);
+        }*/
+}

Sources/tests/MapperTest.php

@@ -0,0 +1,43 @@
+<?php
+use PHPUnit\Framework\TestCase;
+
+use Model\User;
+use Database\AthleteEntity;
+use Database\AthleteGateway;
+use Database\Connexion;
+use Database\AthleteMapper;
+
+class MapperTest extends TestCase {
+
+    public function testMapperAthlete() {
+
+        //$dsn = "pgsql:host=londres;port=8888;dbname=dbkemonteiro2;user=kemonteiro2;password=Mdp";
+
+        $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
+        $username = "kemonteiro2";
+        $password = "#Phpmyadmin63";
+
+        $connexion = new Connexion($dsn,$username,$password);
+
+
+        $athleteGateway = new AthleteGateway($connexion);
+        $result = $athleteGateway->getAthlete();
+
+        $map = new AthleteMapper ();
+        //SQL To AthleteEntity
+        $athleteEntity = $map->athleteSqlToEntity($result);
+
+
+        foreach($athleteEntity as $ath){
+
+            $result = $ath->getNom();
+            var_dump($result);
+            //Pour chaque AthleteEntity : Athlete Entity To User avec Role Athlete(Model)
+            $user = $map->athleteEntityToModel($ath);
+            var_dump($user->getId());
+            //Pour chaque Athlete du Model -> Athlete Entity
+            $res = $map->athleteToEntity($user);
+            var_dump($res->getIdAthlete());
+        }
+    }
+}

Sources/tests/loginDatabase.php

@@ -0,0 +1,7 @@
+<?php
+
+$dsn = "psql:host=localhost;dbname=sae_3;";
+$username = "Perederii";
+$password = "";
+
+?>

Sources/vendor/composer/autoload_classmap.php

@@ -430,7 +430,6 @@ return array(
     'PHPUnit\\Framework\\MockObject\\Stub\\ReturnValueMap' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnValueMap.php',
     'PHPUnit\\Framework\\MockObject\\Stub\\Stub' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/Stub.php',
     'PHPUnit\\Framework\\NoChildTestSuiteException' => $vendorDir . '/phpunit/phpunit/src/Framework/Exception/NoChildTestSuiteException.php',
-    'PHPUnit\\Framework\\PhptAssertionFailedError' => $vendorDir . '/phpunit/phpunit/src/Framework/Exception/PhptAssertionFailedError.php',
     'PHPUnit\\Framework\\ProcessIsolationException' => $vendorDir . '/phpunit/phpunit/src/Framework/Exception/ProcessIsolationException.php',
     'PHPUnit\\Framework\\Reorderable' => $vendorDir . '/phpunit/phpunit/src/Framework/Reorderable.php',
     'PHPUnit\\Framework\\SelfDescribing' => $vendorDir . '/phpunit/phpunit/src/Framework/SelfDescribing.php',
@@ -956,93 +955,6 @@ return array(
     'PharIo\\Version\\VersionConstraintValue' => $vendorDir . '/phar-io/version/src/VersionConstraintValue.php',
     'PharIo\\Version\\VersionNumber' => $vendorDir . '/phar-io/version/src/VersionNumber.php',
     'PhpToken' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/PhpToken.php',
-    'SebastianBergmann\\CliParser\\AmbiguousOptionException' => $vendorDir . '/sebastian/cli-parser/src/exceptions/AmbiguousOptionException.php',
-    'SebastianBergmann\\CliParser\\Exception' => $vendorDir . '/sebastian/cli-parser/src/exceptions/Exception.php',
-    'SebastianBergmann\\CliParser\\OptionDoesNotAllowArgumentException' => $vendorDir . '/sebastian/cli-parser/src/exceptions/OptionDoesNotAllowArgumentException.php',
-    'SebastianBergmann\\CliParser\\Parser' => $vendorDir . '/sebastian/cli-parser/src/Parser.php',
-    'SebastianBergmann\\CliParser\\RequiredOptionArgumentMissingException' => $vendorDir . '/sebastian/cli-parser/src/exceptions/RequiredOptionArgumentMissingException.php',
-    'SebastianBergmann\\CliParser\\UnknownOptionException' => $vendorDir . '/sebastian/cli-parser/src/exceptions/UnknownOptionException.php',
-    'SebastianBergmann\\CodeCoverage\\BranchAndPathCoverageNotSupportedException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/BranchAndPathCoverageNotSupportedException.php',
-    'SebastianBergmann\\CodeCoverage\\CodeCoverage' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage.php',
-    'SebastianBergmann\\CodeCoverage\\Data\\ProcessedCodeCoverageData' => $vendorDir . '/phpunit/php-code-coverage/src/Data/ProcessedCodeCoverageData.php',
-    'SebastianBergmann\\CodeCoverage\\Data\\RawCodeCoverageData' => $vendorDir . '/phpunit/php-code-coverage/src/Data/RawCodeCoverageData.php',
-    'SebastianBergmann\\CodeCoverage\\DeadCodeDetectionNotSupportedException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/DeadCodeDetectionNotSupportedException.php',
-    'SebastianBergmann\\CodeCoverage\\Driver\\Driver' => $vendorDir . '/phpunit/php-code-coverage/src/Driver/Driver.php',
-    'SebastianBergmann\\CodeCoverage\\Driver\\PathExistsButIsNotDirectoryException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/PathExistsButIsNotDirectoryException.php',
-    'SebastianBergmann\\CodeCoverage\\Driver\\PcovDriver' => $vendorDir . '/phpunit/php-code-coverage/src/Driver/PcovDriver.php',
-    'SebastianBergmann\\CodeCoverage\\Driver\\PcovNotAvailableException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/PcovNotAvailableException.php',
-    'SebastianBergmann\\CodeCoverage\\Driver\\Selector' => $vendorDir . '/phpunit/php-code-coverage/src/Driver/Selector.php',
-    'SebastianBergmann\\CodeCoverage\\Driver\\WriteOperationFailedException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/WriteOperationFailedException.php',
-    'SebastianBergmann\\CodeCoverage\\Driver\\XdebugDriver' => $vendorDir . '/phpunit/php-code-coverage/src/Driver/XdebugDriver.php',
-    'SebastianBergmann\\CodeCoverage\\Driver\\XdebugNotAvailableException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/XdebugNotAvailableException.php',
-    'SebastianBergmann\\CodeCoverage\\Driver\\XdebugNotEnabledException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/XdebugNotEnabledException.php',
-    'SebastianBergmann\\CodeCoverage\\Exception' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/Exception.php',
-    'SebastianBergmann\\CodeCoverage\\FileCouldNotBeWrittenException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/FileCouldNotBeWrittenException.php',
-    'SebastianBergmann\\CodeCoverage\\Filter' => $vendorDir . '/phpunit/php-code-coverage/src/Filter.php',
-    'SebastianBergmann\\CodeCoverage\\InvalidArgumentException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/InvalidArgumentException.php',
-    'SebastianBergmann\\CodeCoverage\\NoCodeCoverageDriverAvailableException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/NoCodeCoverageDriverAvailableException.php',
-    'SebastianBergmann\\CodeCoverage\\NoCodeCoverageDriverWithPathCoverageSupportAvailableException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/NoCodeCoverageDriverWithPathCoverageSupportAvailableException.php',
-    'SebastianBergmann\\CodeCoverage\\Node\\AbstractNode' => $vendorDir . '/phpunit/php-code-coverage/src/Node/AbstractNode.php',
-    'SebastianBergmann\\CodeCoverage\\Node\\Builder' => $vendorDir . '/phpunit/php-code-coverage/src/Node/Builder.php',
-    'SebastianBergmann\\CodeCoverage\\Node\\CrapIndex' => $vendorDir . '/phpunit/php-code-coverage/src/Node/CrapIndex.php',
-    'SebastianBergmann\\CodeCoverage\\Node\\Directory' => $vendorDir . '/phpunit/php-code-coverage/src/Node/Directory.php',
-    'SebastianBergmann\\CodeCoverage\\Node\\File' => $vendorDir . '/phpunit/php-code-coverage/src/Node/File.php',
-    'SebastianBergmann\\CodeCoverage\\Node\\Iterator' => $vendorDir . '/phpunit/php-code-coverage/src/Node/Iterator.php',
-    'SebastianBergmann\\CodeCoverage\\ParserException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/ParserException.php',
-    'SebastianBergmann\\CodeCoverage\\ReflectionException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/ReflectionException.php',
-    'SebastianBergmann\\CodeCoverage\\ReportAlreadyFinalizedException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/ReportAlreadyFinalizedException.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Clover' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Clover.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Cobertura' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Cobertura.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Crap4j' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Crap4j.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Html\\Colors' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Html/Colors.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Html\\CustomCssFile' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Html/CustomCssFile.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Html\\Dashboard' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Html/Renderer/Dashboard.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Html\\Directory' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Html/Renderer/Directory.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Html\\Facade' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Html/Facade.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Html\\File' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Html/Renderer/File.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Html\\Renderer' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Html/Renderer.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\PHP' => $vendorDir . '/phpunit/php-code-coverage/src/Report/PHP.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Text' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Text.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Thresholds' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Thresholds.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\BuildInformation' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/BuildInformation.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Coverage' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/Coverage.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Directory' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/Directory.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Facade' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/Facade.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\File' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/File.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Method' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/Method.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Node' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/Node.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Project' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/Project.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Report' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/Report.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Source' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/Source.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Tests' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/Tests.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Totals' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/Totals.php',
-    'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Unit' => $vendorDir . '/phpunit/php-code-coverage/src/Report/Xml/Unit.php',
-    'SebastianBergmann\\CodeCoverage\\StaticAnalysisCacheNotConfiguredException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/StaticAnalysisCacheNotConfiguredException.php',
-    'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\CacheWarmer' => $vendorDir . '/phpunit/php-code-coverage/src/StaticAnalysis/CacheWarmer.php',
-    'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\CachingFileAnalyser' => $vendorDir . '/phpunit/php-code-coverage/src/StaticAnalysis/CachingFileAnalyser.php',
-    'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\CodeUnitFindingVisitor' => $vendorDir . '/phpunit/php-code-coverage/src/StaticAnalysis/CodeUnitFindingVisitor.php',
-    'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\ExecutableLinesFindingVisitor' => $vendorDir . '/phpunit/php-code-coverage/src/StaticAnalysis/ExecutableLinesFindingVisitor.php',
-    'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\FileAnalyser' => $vendorDir . '/phpunit/php-code-coverage/src/StaticAnalysis/FileAnalyser.php',
-    'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\IgnoredLinesFindingVisitor' => $vendorDir . '/phpunit/php-code-coverage/src/StaticAnalysis/IgnoredLinesFindingVisitor.php',
-    'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\ParsingFileAnalyser' => $vendorDir . '/phpunit/php-code-coverage/src/StaticAnalysis/ParsingFileAnalyser.php',
-    'SebastianBergmann\\CodeCoverage\\TestIdMissingException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/TestIdMissingException.php',
-    'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\Known' => $vendorDir . '/phpunit/php-code-coverage/src/TestSize/Known.php',
-    'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\Large' => $vendorDir . '/phpunit/php-code-coverage/src/TestSize/Large.php',
-    'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\Medium' => $vendorDir . '/phpunit/php-code-coverage/src/TestSize/Medium.php',
-    'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\Small' => $vendorDir . '/phpunit/php-code-coverage/src/TestSize/Small.php',
-    'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\TestSize' => $vendorDir . '/phpunit/php-code-coverage/src/TestSize/TestSize.php',
-    'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\Unknown' => $vendorDir . '/phpunit/php-code-coverage/src/TestSize/Unknown.php',
-    'SebastianBergmann\\CodeCoverage\\Test\\TestStatus\\Failure' => $vendorDir . '/phpunit/php-code-coverage/src/TestStatus/Failure.php',
-    'SebastianBergmann\\CodeCoverage\\Test\\TestStatus\\Known' => $vendorDir . '/phpunit/php-code-coverage/src/TestStatus/Known.php',
-    'SebastianBergmann\\CodeCoverage\\Test\\TestStatus\\Success' => $vendorDir . '/phpunit/php-code-coverage/src/TestStatus/Success.php',
-    'SebastianBergmann\\CodeCoverage\\Test\\TestStatus\\TestStatus' => $vendorDir . '/phpunit/php-code-coverage/src/TestStatus/TestStatus.php',
-    'SebastianBergmann\\CodeCoverage\\Test\\TestStatus\\Unknown' => $vendorDir . '/phpunit/php-code-coverage/src/TestStatus/Unknown.php',
-    'SebastianBergmann\\CodeCoverage\\UnintentionallyCoveredCodeException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/UnintentionallyCoveredCodeException.php',
-    'SebastianBergmann\\CodeCoverage\\Util\\DirectoryCouldNotBeCreatedException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/DirectoryCouldNotBeCreatedException.php',
-    'SebastianBergmann\\CodeCoverage\\Util\\Filesystem' => $vendorDir . '/phpunit/php-code-coverage/src/Util/Filesystem.php',
-    'SebastianBergmann\\CodeCoverage\\Util\\Percentage' => $vendorDir . '/phpunit/php-code-coverage/src/Util/Percentage.php',
-    'SebastianBergmann\\CodeCoverage\\Version' => $vendorDir . '/phpunit/php-code-coverage/src/Version.php',
-    'SebastianBergmann\\CodeCoverage\\XmlException' => $vendorDir . '/phpunit/php-code-coverage/src/Exception/XmlException.php',
     'SebastianBergmann\\CodeUnitReverseLookup\\Wizard' => $vendorDir . '/sebastian/code-unit-reverse-lookup/src/Wizard.php',
     'SebastianBergmann\\CodeUnit\\ClassMethodUnit' => $vendorDir . '/sebastian/code-unit/src/ClassMethodUnit.php',
     'SebastianBergmann\\CodeUnit\\ClassUnit' => $vendorDir . '/sebastian/code-unit/src/ClassUnit.php',

Sources/vendor/composer/autoload_psr4.php

@@ -12,24 +12,21 @@ return array(
     'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),
     'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'),
     'Stub\\' => array($baseDir . '/src/data/stub', $baseDir . '/src/data/stub/service', $baseDir . '/src/data/stub/repository'),
-    'Repository\\' => array($baseDir . '/src/data/model/repository'),
-    'Network\\' => array($baseDir . '/src/data/core/network'),
-    'Model\\' => array($baseDir . '/src/data/model'),
-    'Manager\\' => array($baseDir . '/src/data/model/manager'),
-    'Dotenv\\' => array($vendorDir . '/vlucas/phpdotenv/src'),
-    'Data\\' => array($baseDir . '/src/data'),
     'Shared\\Exception\\' => array($baseDir . '/src/shared/exception'),
     'Shared\\Attributes\\' => array($baseDir . '/src/shared/attributes'),
     'Shared\\' => array($baseDir . '/src/shared'),
-    'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
-    'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'),
-    'PhpOption\\' => array($vendorDir . '/phpoption/phpoption/src/PhpOption'),
     'Repository\\' => array($baseDir . '/src/data/model/repository'),
+    'Psr\\Container\\' => array($vendorDir . '/psr/container/src', $vendorDir . '/sebastian/cli-parser/src'),
+    'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'),
+    'PhpOption\\' => array($vendorDir . '/phpoption/phpoption/src/PhpOption', $vendorDir . '/phpunit/php-code-coverage/src/PhpOption'),
     'Network\\' => array($baseDir . '/src/data/core/network'),
+    'Model\\' => array($baseDir . '/src/data/model'),
+    'Manager\\' => array($baseDir . '/src/data/model/manager'),
     'Hearttrack\\' => array($baseDir . '/src'),
     'GrahamCampbell\\ResultType\\' => array($vendorDir . '/graham-campbell/result-type/src'),
     'Dotenv\\' => array($vendorDir . '/vlucas/phpdotenv/src'),
     'DeepCopy\\' => array($vendorDir . '/myclabs/deep-copy/src/DeepCopy'),
+    'Database\\' => array($baseDir . '/src/data/core/database'),
     'Data\\Core\\' => array($baseDir . '/src/data/core'),
     'Data\\' => array($baseDir . '/src/data'),
     'Console\\' => array($baseDir . '/src/console'),

Sources/vendor/composer/autoload_static.php

@@ -63,10 +63,10 @@ class ComposerStaticInit1887e85fc3cfddacf8d7e17588dae6f1
         'D' => 
         array (
             'Dotenv\\' => 7,
-            'Data\\' => 5,
-            'Doctrine\\Instantiator\\' => 22,
             'DeepCopy\\' => 9,
+            'Database\\' => 9,
             'Data\\Core\\' => 10,
+            'Data\\' => 5,
         ),
         'C' => 
         array (
@@ -130,6 +130,7 @@ class ComposerStaticInit1887e85fc3cfddacf8d7e17588dae6f1
         'Psr\\Container\\' => 
         array (
             0 => __DIR__ . '/..' . '/psr/container/src',
+            1 => __DIR__ . '/..' . '/sebastian/cli-parser/src',
         ),
         'PhpParser\\' => 
         array (
@@ -138,6 +139,7 @@ class ComposerStaticInit1887e85fc3cfddacf8d7e17588dae6f1
         'PhpOption\\' => 
         array (
             0 => __DIR__ . '/..' . '/phpoption/phpoption/src/PhpOption',
+            1 => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/PhpOption',
         ),
         'Network\\' => 
         array (
@@ -163,18 +165,14 @@ class ComposerStaticInit1887e85fc3cfddacf8d7e17588dae6f1
         array (
             0 => __DIR__ . '/..' . '/vlucas/phpdotenv/src',
         ),
-        'Doctrine\\Instantiator\\' =>
-        array (
-            0 => __DIR__ . '/..' . '/graham-campbell/result-type/src',
-        ),
-        'Dotenv\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/vlucas/phpdotenv/src',
-        ),
         'DeepCopy\\' => 
         array (
             0 => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy',
         ),
+        'Database\\' => 
+        array (
+            0 => __DIR__ . '/../..' . '/src/data/core/database',
+        ),
         'Data\\Core\\' => 
         array (
             0 => __DIR__ . '/../..' . '/src/data/core',
@@ -642,7 +640,6 @@ class ComposerStaticInit1887e85fc3cfddacf8d7e17588dae6f1
         'PHPUnit\\Framework\\MockObject\\Stub\\ReturnValueMap' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/ReturnValueMap.php',
         'PHPUnit\\Framework\\MockObject\\Stub\\Stub' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Runtime/Stub/Stub.php',
         'PHPUnit\\Framework\\NoChildTestSuiteException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Exception/NoChildTestSuiteException.php',
-        'PHPUnit\\Framework\\PhptAssertionFailedError' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Exception/PhptAssertionFailedError.php',
         'PHPUnit\\Framework\\ProcessIsolationException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Exception/ProcessIsolationException.php',
         'PHPUnit\\Framework\\Reorderable' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/Reorderable.php',
         'PHPUnit\\Framework\\SelfDescribing' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/SelfDescribing.php',
@@ -1168,93 +1165,6 @@ class ComposerStaticInit1887e85fc3cfddacf8d7e17588dae6f1
         'PharIo\\Version\\VersionConstraintValue' => __DIR__ . '/..' . '/phar-io/version/src/VersionConstraintValue.php',
         'PharIo\\Version\\VersionNumber' => __DIR__ . '/..' . '/phar-io/version/src/VersionNumber.php',
         'PhpToken' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/PhpToken.php',
-        'SebastianBergmann\\CliParser\\AmbiguousOptionException' => __DIR__ . '/..' . '/sebastian/cli-parser/src/exceptions/AmbiguousOptionException.php',
-        'SebastianBergmann\\CliParser\\Exception' => __DIR__ . '/..' . '/sebastian/cli-parser/src/exceptions/Exception.php',
-        'SebastianBergmann\\CliParser\\OptionDoesNotAllowArgumentException' => __DIR__ . '/..' . '/sebastian/cli-parser/src/exceptions/OptionDoesNotAllowArgumentException.php',
-        'SebastianBergmann\\CliParser\\Parser' => __DIR__ . '/..' . '/sebastian/cli-parser/src/Parser.php',
-        'SebastianBergmann\\CliParser\\RequiredOptionArgumentMissingException' => __DIR__ . '/..' . '/sebastian/cli-parser/src/exceptions/RequiredOptionArgumentMissingException.php',
-        'SebastianBergmann\\CliParser\\UnknownOptionException' => __DIR__ . '/..' . '/sebastian/cli-parser/src/exceptions/UnknownOptionException.php',
-        'SebastianBergmann\\CodeCoverage\\BranchAndPathCoverageNotSupportedException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/BranchAndPathCoverageNotSupportedException.php',
-        'SebastianBergmann\\CodeCoverage\\CodeCoverage' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/CodeCoverage.php',
-        'SebastianBergmann\\CodeCoverage\\Data\\ProcessedCodeCoverageData' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Data/ProcessedCodeCoverageData.php',
-        'SebastianBergmann\\CodeCoverage\\Data\\RawCodeCoverageData' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Data/RawCodeCoverageData.php',
-        'SebastianBergmann\\CodeCoverage\\DeadCodeDetectionNotSupportedException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/DeadCodeDetectionNotSupportedException.php',
-        'SebastianBergmann\\CodeCoverage\\Driver\\Driver' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Driver/Driver.php',
-        'SebastianBergmann\\CodeCoverage\\Driver\\PathExistsButIsNotDirectoryException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/PathExistsButIsNotDirectoryException.php',
-        'SebastianBergmann\\CodeCoverage\\Driver\\PcovDriver' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Driver/PcovDriver.php',
-        'SebastianBergmann\\CodeCoverage\\Driver\\PcovNotAvailableException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/PcovNotAvailableException.php',
-        'SebastianBergmann\\CodeCoverage\\Driver\\Selector' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Driver/Selector.php',
-        'SebastianBergmann\\CodeCoverage\\Driver\\WriteOperationFailedException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/WriteOperationFailedException.php',
-        'SebastianBergmann\\CodeCoverage\\Driver\\XdebugDriver' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Driver/XdebugDriver.php',
-        'SebastianBergmann\\CodeCoverage\\Driver\\XdebugNotAvailableException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/XdebugNotAvailableException.php',
-        'SebastianBergmann\\CodeCoverage\\Driver\\XdebugNotEnabledException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/XdebugNotEnabledException.php',
-        'SebastianBergmann\\CodeCoverage\\Exception' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/Exception.php',
-        'SebastianBergmann\\CodeCoverage\\FileCouldNotBeWrittenException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/FileCouldNotBeWrittenException.php',
-        'SebastianBergmann\\CodeCoverage\\Filter' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Filter.php',
-        'SebastianBergmann\\CodeCoverage\\InvalidArgumentException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/InvalidArgumentException.php',
-        'SebastianBergmann\\CodeCoverage\\NoCodeCoverageDriverAvailableException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/NoCodeCoverageDriverAvailableException.php',
-        'SebastianBergmann\\CodeCoverage\\NoCodeCoverageDriverWithPathCoverageSupportAvailableException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/NoCodeCoverageDriverWithPathCoverageSupportAvailableException.php',
-        'SebastianBergmann\\CodeCoverage\\Node\\AbstractNode' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Node/AbstractNode.php',
-        'SebastianBergmann\\CodeCoverage\\Node\\Builder' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Node/Builder.php',
-        'SebastianBergmann\\CodeCoverage\\Node\\CrapIndex' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Node/CrapIndex.php',
-        'SebastianBergmann\\CodeCoverage\\Node\\Directory' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Node/Directory.php',
-        'SebastianBergmann\\CodeCoverage\\Node\\File' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Node/File.php',
-        'SebastianBergmann\\CodeCoverage\\Node\\Iterator' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Node/Iterator.php',
-        'SebastianBergmann\\CodeCoverage\\ParserException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/ParserException.php',
-        'SebastianBergmann\\CodeCoverage\\ReflectionException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/ReflectionException.php',
-        'SebastianBergmann\\CodeCoverage\\ReportAlreadyFinalizedException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/ReportAlreadyFinalizedException.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Clover' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Clover.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Cobertura' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Cobertura.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Crap4j' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Crap4j.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Html\\Colors' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Html/Colors.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Html\\CustomCssFile' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Html/CustomCssFile.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Html\\Dashboard' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Html/Renderer/Dashboard.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Html\\Directory' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Html/Renderer/Directory.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Html\\Facade' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Html/Facade.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Html\\File' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Html/Renderer/File.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Html\\Renderer' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Html/Renderer.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\PHP' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/PHP.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Text' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Text.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Thresholds' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Thresholds.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\BuildInformation' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/BuildInformation.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Coverage' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/Coverage.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Directory' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/Directory.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Facade' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/Facade.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\File' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/File.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Method' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/Method.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Node' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/Node.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Project' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/Project.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Report' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/Report.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Source' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/Source.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Tests' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/Tests.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Totals' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/Totals.php',
-        'SebastianBergmann\\CodeCoverage\\Report\\Xml\\Unit' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Report/Xml/Unit.php',
-        'SebastianBergmann\\CodeCoverage\\StaticAnalysisCacheNotConfiguredException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/StaticAnalysisCacheNotConfiguredException.php',
-        'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\CacheWarmer' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/StaticAnalysis/CacheWarmer.php',
-        'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\CachingFileAnalyser' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/StaticAnalysis/CachingFileAnalyser.php',
-        'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\CodeUnitFindingVisitor' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/StaticAnalysis/CodeUnitFindingVisitor.php',
-        'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\ExecutableLinesFindingVisitor' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/StaticAnalysis/ExecutableLinesFindingVisitor.php',
-        'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\FileAnalyser' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/StaticAnalysis/FileAnalyser.php',
-        'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\IgnoredLinesFindingVisitor' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/StaticAnalysis/IgnoredLinesFindingVisitor.php',
-        'SebastianBergmann\\CodeCoverage\\StaticAnalysis\\ParsingFileAnalyser' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/StaticAnalysis/ParsingFileAnalyser.php',
-        'SebastianBergmann\\CodeCoverage\\TestIdMissingException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/TestIdMissingException.php',
-        'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\Known' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/TestSize/Known.php',
-        'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\Large' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/TestSize/Large.php',
-        'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\Medium' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/TestSize/Medium.php',
-        'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\Small' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/TestSize/Small.php',
-        'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\TestSize' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/TestSize/TestSize.php',
-        'SebastianBergmann\\CodeCoverage\\Test\\TestSize\\Unknown' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/TestSize/Unknown.php',
-        'SebastianBergmann\\CodeCoverage\\Test\\TestStatus\\Failure' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/TestStatus/Failure.php',
-        'SebastianBergmann\\CodeCoverage\\Test\\TestStatus\\Known' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/TestStatus/Known.php',
-        'SebastianBergmann\\CodeCoverage\\Test\\TestStatus\\Success' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/TestStatus/Success.php',
-        'SebastianBergmann\\CodeCoverage\\Test\\TestStatus\\TestStatus' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/TestStatus/TestStatus.php',
-        'SebastianBergmann\\CodeCoverage\\Test\\TestStatus\\Unknown' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/TestStatus/Unknown.php',
-        'SebastianBergmann\\CodeCoverage\\UnintentionallyCoveredCodeException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/UnintentionallyCoveredCodeException.php',
-        'SebastianBergmann\\CodeCoverage\\Util\\DirectoryCouldNotBeCreatedException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/DirectoryCouldNotBeCreatedException.php',
-        'SebastianBergmann\\CodeCoverage\\Util\\Filesystem' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Util/Filesystem.php',
-        'SebastianBergmann\\CodeCoverage\\Util\\Percentage' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Util/Percentage.php',
-        'SebastianBergmann\\CodeCoverage\\Version' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Version.php',
-        'SebastianBergmann\\CodeCoverage\\XmlException' => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/Exception/XmlException.php',
         'SebastianBergmann\\CodeUnitReverseLookup\\Wizard' => __DIR__ . '/..' . '/sebastian/code-unit-reverse-lookup/src/Wizard.php',
         'SebastianBergmann\\CodeUnit\\ClassMethodUnit' => __DIR__ . '/..' . '/sebastian/code-unit/src/ClassMethodUnit.php',
         'SebastianBergmann\\CodeUnit\\ClassUnit' => __DIR__ . '/..' . '/sebastian/code-unit/src/ClassUnit.php',