diff --git a/.drone.yml b/.drone.yml index fe49e6cf..e69de29b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,65 +0,0 @@ -kind: pipeline -type: docker -name: HeartTrack - -trigger: - branch: - - master - - merged - event: - - push - -steps: - - # Test ✔️ - - name: test - image: composer:2.6 - commands: - - cd Sources - # Installe les dépendances PHP si nécessaire - - composer install --no-interaction - - ./vendor/bin/phpunit tests - - # Sonar static code analisis deployment - # TODO : use an image that already have unzip - - name: code-analysis - image: php:8.1-cli - environment: - SONAR_TOKEN: - from_secret: SONAR_TOKEN - commands: - - apt-get update && apt-get install -y curl unzip - - export SONAR_SCANNER_VERSION=4.7.0.2747 - - export SONAR_SCANNER_HOME=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION-linux - - curl --create-dirs -sSLo $HOME/.sonar/sonar-scanner.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_VERSION-linux.zip - - unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/ - - export PATH=$SONAR_SCANNER_HOME/bin:$PATH - - export SONAR_SCANNER_OPTS="-server" - - cd Sources - - sonar-scanner -D sonar.projectKey=HeartTrack -D sonar.host.url=https://codefirst.iut.uca.fr/sonar - depends_on: [ test ] - - # build image and push on the registry ✔️ - - name: docker-build-and-push - image: plugins/docker - settings: - dockerfile: Sources/config/Dockerfile - context: Sources - registry: hub.codefirst.iut.uca.fr - repo: hub.codefirst.iut.uca.fr/david.d_almeida/web - username: - from_secret: SECRET_REGISTRY_USERNAME - password: - from_secret: SECRET_REGISTRY_PASSWORD - git_auth: true - - - name: notify - image: ruby:2.1 - when: - status: [ success ] - ref: - include: - - refs/tags/*-demo - commands: - - sh ./notifymail.sh - depends_on: [ docker-build-and-push ] \ No newline at end of file diff --git a/.gitignore b/.gitignore index 7f5f2930..749e45fe 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ dist *.swo .env +loginDatabase.php # Cache file on macOS .DS_Store diff --git a/Documents/Diagramme/BDD/README_BDD.md b/Documents/Diagramme/BDD/README_BDD.md new file mode 100644 index 00000000..c40e1c0a --- /dev/null +++ b/Documents/Diagramme/BDD/README_BDD.md @@ -0,0 +1,243 @@ +[retour au README.md](../../../README.md) +[Retour aux Documents](../../README_DOCUMENTS.md) +[Retour au diagramme de classes](../README_DIAGRAMMES.md) + +# BDD + +```plantuml +@startuml +skinparam classAttributeIconSize 0 +package MLD{ +entity "Athlete" as athlete { + {static} idAthlete + username + nom + prenom + email + sexe + taille + poids + motDePasse + dateNaissance + isCoach +} + +entity "Amitie" as friendship{ +{static}# idAthlete1 +{static}# idAthlete2 +début +} + +entity "Notification" as notif { + {static} idNotif + message + date + statut + urgence + #athleteId +} + +entity "Envoi" as sendNotif{ +{static}# idAthlete +{static}# idNotif +} + +entity "Statistique" as stats { + {static} idStatistique + poids + fcMoyenne + fcMax + caloriesBruleesMoy + date + #athleteId +} + +entity "Entrainement" as training { + {static} idEntrainement + date + description + latitude + longitude + feedback + #athleteId +} + +entity "Participe" as takepart { + {static} #athleteId + {static} #entrainementId +} + +entity "Donne" as givepart { + {static} #coachId + {static} #entrainementId +} + + +entity "SourceDonnee" as source { + {static} idSource + type + modele + precision + #athleteId +} + +entity "Activite" as activity { + {static} idActivité + type + date + heureDeDebut + heureDeFin + effortRessent + variabilite + variance + ecartType + moyenne + maximum + minimum + temperatureMoyenne + #athleteId + #sourceId +} +entity "FréquenceCardiaque" as fc { + {static} idFc + altitude + temps : time + température + bpm + longitude + latitude + #activitéId +} + +} +activity --> athlete +activity --> source +activity <-- fc +athlete <-- source +stats --> athlete +takepart --> athlete +takepart --> training +givepart --> athlete +givepart --> training +sendNotif --> athlete +sendNotif --> notif +friendship --> athlete +notif --> athlete +athlete <-- friendship +@enduml +``` + +```plantuml +@startuml + +class Athlete { + idAthlete + username + nom + prenom + email + sexe + taille + poids + motDePasse + dateNaissance + isCoach +} + +class Amitie { + idAthlete1 + idAthlete2 +} + +class Notification { + idNotif + message + date + statut + urgence + athleteId +} + +class Envoi { + idAthlete + idNotif +} + +class Statistique { + idStatistique + poids + fcMoyenne + fcMax + caloriesBruleesMoy + date + athleteId +} + +class Entrainement { + idEntrainement + date + description + latitude + longitude + feedback + athleteId +} + +class Participe { + athleteId + entrainementId +} + +class Donne { + coachId + entrainementId +} + +class SourceDonnee { + idSource + type + modele + precision + athleteId +} + +class Activite { + idActivite + type + date + heureDeDebut + heureDeFin + effortRessent + variabilite + variance + ecartType + moyenne + maximum + minimum + temperatureMoyenne + athleteId + sourceId +} + +class FrequenceCardiaque { + idFc + altitude + temps + temperature + bpm + longitude + latitude + activiteId +} + +Athlete "1" --o "0..*" Amitie +Athlete "1" --o "0..*" Notification +Athlete "1" --o "0..*" Statistique +Athlete "1" --o "0..*" Entrainement +Entrainement "0..*" --o "0..*" Athlete : Participants +Entrainement "0..*" --o "0..*" Athlete : Coachs +Athlete "1" --o "0..*" SourceDonnee +Activite "1" --o "0..*" FrequenceCardiaque + +@enduml +``` \ No newline at end of file diff --git a/Documents/Images/logo.png b/Documents/Images/logo.png old mode 100755 new mode 100644 index 5294913e..9510ec12 Binary files a/Documents/Images/logo.png and b/Documents/Images/logo.png differ diff --git a/Sources/composer.json b/Sources/composer.json index 251c6129..ac9236b7 100755 --- a/Sources/composer.json +++ b/Sources/composer.json @@ -18,13 +18,14 @@ "Shared\\": "src/shared", "App\\Router\\": "src/app/router", "App\\Controller\\": "src/app/controller", - "App\\Router\\Response\\" : "src/app/router/response", - "App\\Router\\Middleware\\" : "src/app/router/middleware", - "App\\Router\\Request\\" : "src/app/router/request", + "App\\Router\\Response\\": "src/app/router/response", + "App\\Router\\Middleware\\": "src/app/router/middleware", + "App\\Router\\Request\\": "src/app/router/request", "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": { @@ -36,12 +37,15 @@ "ext-couchbase": "*", "ext-pdo": "*" }, + "config": { + "process-timeout": 2000 + }, "require-dev": { "phpunit/phpunit": "*" }, "scripts": { "dev": "php -S localhost:8080 -t public -d display_errors=1 -d error_reporting=E_ALL", "dev:console": "export APP_ENV=console && php public/index.php", - "dev:html" : "export APP_ENV=html && php -S localhost:8080 -t public -d display_errors=1 -d error_reporting=E_ALL" + "dev:html": "export APP_ENV=html && php -S localhost:8080 -t public -d display_errors=1 -d error_reporting=E_ALL" } -} +} \ No newline at end of file diff --git a/Sources/config/config.php b/Sources/config/config.php index 8ddae748..dab98bf1 100755 --- a/Sources/config/config.php +++ b/Sources/config/config.php @@ -10,12 +10,13 @@ $dotenv->safeLoad(); // const DB_DATABASE = $_ENV['DB_DATABASE'] ?? 'heartTrack'; // const DB_USER = $_ENV['DB_USER'] ?? 'toto'; // const DB_PASSWORD = $_ENV['DB_PASSWORD'] ?? 'achanger'; -define("APP_ENV", 'development'); +define("APP_ENV", getenv('APP_ENV')); +const DB_SERVER = 'mysql'; const DB_HOST = 'localhost'; -const DB_DATABASE = 'heartTrack'; -const DB_USER = 'toto'; -const DB_PASSWORD = 'achanger'; +const DB_DATABASE = 'sae_3'; +const DB_USER = 'Perederii'; +const DB_PASSWORD = ''; //const APP_ENV = 'console'; -const DSN = "mysql:host=" . DB_HOST . ";dbname=" . DB_DATABASE; +const DSN = DB_SERVER . ":host=" . DB_HOST . ";dbname=" . DB_DATABASE; diff --git a/Sources/public/index.php b/Sources/public/index.php index ea0cfb45..3cd3a5da 100755 --- a/Sources/public/index.php +++ b/Sources/public/index.php @@ -12,7 +12,7 @@ use Manager\DataManager; use Repository\IUserRepository; use Shared\ArgumentControllerResolver; use Shared\IArgumentResolver; -use Stub\AuthService; +use Network\AuthService; use Stub\NotificationRepository; use Stub\TrainingRepository; use Stub\UserRepository; @@ -30,13 +30,13 @@ use Network\RelationshipService; use Network\INotificationService; use Stub\NotificationService; - +use App\Router\Session; use Stub\StubData; use Twig\Environment; use Twig\Loader\FilesystemLoader; use Shared\IHashPassword; use Shared\HashPassword; - +use Shared\Log; $appFactory = new AppCreator(); $appFactory->registerService(IArgumentResolver::class, ArgumentControllerResolver::class); @@ -54,7 +54,6 @@ $appFactory->registerService(IUserRepository::class, UserRepository::class); - $appFactory->registerService(\Twig\Loader\LoaderInterface::class, function() { return new FilesystemLoader(__DIR__ . '/../src/app/views/Templates'); }); @@ -69,7 +68,7 @@ $app = $appFactory->create(); if (!is_null($app)){ // Ajout des Middleware /*$app->use(new LoggingMiddleware());*/ - $app->use(new AuthMiddleware()); + $app->use(new AuthMiddleware($appFactory->getDicontainer()->get(IAuthService::class) )); $app->mapControllers(); $app->run(RequestFactory::createFromGlobals()); } diff --git a/Sources/src/app/App.php b/Sources/src/app/App.php index 623e4380..071ccb52 100644 --- a/Sources/src/app/App.php +++ b/Sources/src/app/App.php @@ -29,9 +29,6 @@ class App private FrontController $frontController; - private Session $session; - - public function __construct(string $appName, int $version, \App\Container $diContainer) { $this->appName = $appName; @@ -39,7 +36,7 @@ class App $this->container = $diContainer; $this->router = new Router(""); $this->frontController = new FrontController($this->router,$this->container); - $this->session = Session::getInstance(); + Session::getInstance(); } public function use(IHttpMiddleware $middleware) @@ -140,9 +137,9 @@ class App /** @var RouteAttribute $route */ $route = $attribute->newInstance(); - + $this->router->addControllerRoute( - implode('|', $route->getMethods()), + $route->getMethods(), $prefix . $route->getPath(), $controllerClass, $method->getName(), diff --git a/Sources/src/app/AppCreator.php b/Sources/src/app/AppCreator.php index d2ac0de6..05ca5546 100644 --- a/Sources/src/app/AppCreator.php +++ b/Sources/src/app/AppCreator.php @@ -24,6 +24,13 @@ class AppCreator return $this; } + public function registerSingleton(string $serviceId, $service): self + { + $this->container->set($serviceId, $service, Container::SINGLETON); + $this->services[] = $serviceId; + return $this; + } + /** * Create an instance or perform actions based on the current application environment. * @@ -33,6 +40,7 @@ class AppCreator { // Check the application environment switch (APP_ENV) { + case 'console': // Load the Console.php file in case of the 'console' environment require_once __DIR__ . '/../console/Console.php'; @@ -40,7 +48,6 @@ class AppCreator case 'development': // Create a new instance of the App class in the 'development' environment return new App("HeartTrack", 1, $this->container); - break; case 'html': // Load the index.test.php file in case of the 'html' environment require_once __DIR__ . '/index.test.php'; @@ -53,7 +60,6 @@ class AppCreator } - function AddControllers($namespacePrefix = 'App\Controller', $pathToControllers = __DIR__ . '/controller'): self { $controllerFiles = glob($pathToControllers . '/*.php'); @@ -71,7 +77,8 @@ class AppCreator if ($reflectionClass->isSubclassOf(BaseController::class)) { // Register in DI container $this->container->set($fullClassName, function () use ($fullClassName) { - $controllerInstance = new $fullClassName(); + /** @var $controllerInstance * */ + $controllerInstance = $this->container->resolve($fullClassName); $controllerInstance->setContainer($this->container); return $controllerInstance; }); @@ -81,11 +88,15 @@ class AppCreator return $this; } - public function getServiceRegistered(): array { return $this->services; } + + public function getDicontainer() + { + return $this->container; + } } diff --git a/Sources/src/app/Container.php b/Sources/src/app/Container.php index d7c86d10..e8d647e9 100644 --- a/Sources/src/app/Container.php +++ b/Sources/src/app/Container.php @@ -11,31 +11,45 @@ class Container implements ContainerInterface { private array $entries = []; + const SINGLETON = 'singleton'; + const TRANSIENT = 'transient'; + public function get(string $id) { - if ($this->has($id)) { $entry = $this->entries[$id]; - if (is_callable($entry)) { - return $entry($this); + + if ($entry['lifecycle'] === self::SINGLETON) { + if ($entry['instance'] === null) { + $entry['instance'] = $this->resolve($entry['concrete']); + } + return $entry['instance']; + } + + if (is_callable($entry['concrete'])) { + return $entry['concrete']($this); } - $id = $entry; + return $this->resolve($entry['concrete']); } return $this->resolve($id); } + public function has(string $id): bool { return isset($this->entries[$id]); } - public function set(string $id, callable|string $concrete): void + public function set(string $id, callable|string $concrete, string $lifecycle = self::TRANSIENT): void { - $this->entries[$id] = $concrete; - + $this->entries[$id] = [ + 'concrete' => $concrete, + 'lifecycle' => $lifecycle, + 'instance' => null + ]; } public function resolve(string $id) diff --git a/Sources/src/app/controller/AthleteController.php b/Sources/src/app/controller/AthleteController.php index 91c9d6af..c5b1d9ee 100644 --- a/Sources/src/app/controller/AthleteController.php +++ b/Sources/src/app/controller/AthleteController.php @@ -1,8 +1,19 @@ preference = new Preferences(); +// $this->userMgr = $manager; } +// #[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 "

HELLO

"; +// $listUsers[$i++]=['nom' => $user->getNom(), 'prenom'=>$user->getPrenom(), 'img'=>'john_doe', 'username'=>$user->getUsername()]; +// } +// echo "

HEllO

"; +// //$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 = []; - if(!Validation::val_string($username)){ + if (!Validation::val_string($username)) { print("Nom invalide."); - } - else { + } else { try { - $listSearch=$this->container->get(UserManager::class)->searchUsersByName($username); - $i=0; - foreach ($listSearch as $user){ - $listUsers[$i++]=['nom' => $user->getNom(), 'prenom'=>$user->getPrenom(), 'img'=>'john_doe', 'username'=>$user->getUsername()]; + $athleteGateway = new AthleteGateway(new Connexion(DSN, DB_USER, DB_PASSWORD)); + if($username==null){ + $listSearch=$athleteGateway->getAthlete(); + } else { + $listSearch = $athleteGateway->getAthleteByName($username); } - //$currentUser=$this->container->get(UserManager::class)->getCurrentUser(); - //$currentUser=$_SESSION['user']; + $map = new AthleteMapper(); + $athleteEntity = $map->athleteSqlToEntity($listSearch); + $listUsers = []; + foreach ($athleteEntity as $entity) { + $user = $map->athleteEntityToModel($entity); + $listUsers[] = ['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()]; + } + $response = $this->render('./page/addfriend.html.twig',[ 'css' => $_COOKIE['preferences'], - 'pp' => "test", - 'user' => 'johndoe',//$currentUser->getUsername(), + 'pp' => 'test', + 'user' => 'John',//$currentUser->getUsername(), 'role' => 'Athlete',//$currentUser->getRole(), 'users' => $listUsers ]); + } catch (\Throwable $th) { throw $th; - return $this->render("addfriend.html.twig", ['tabError' => $taberror ]); + return $this->render("addfriend.html.twig", ['tabError' => $taberror]); } } return $response; - } - #[Route(path: '/analyses', name: 'analyses', methods: ['GET'])] - public function analyses(): Response + #[Route(path: '/analyze', name: 'analyze_details', methods: ['GET'])] + public function activityDetails(int $id): Response { - return $this->render('./page/analyze.html.twig',[ - 'css' => $this->preference->getCookie(), - 'pp' => "test2", - 'user' => 'johndoe',//$currentUser->getUsername(), - 'role' => 'Athlete',//$currentUser->getRole(), - 'friendship' => [], - 'analyzes' => [], - 'mails' => [], - 'users' => [], - 'infoUser' => [], - 'exos' => [], - 'member' => [] - ]); + try { + // Utilisez $id pour récupérer les détails de l'activité depuis la base de données +// $activityGateway = new ActivityGateway(new Connexion(DSN, DB_USER, DB_PASSWORD)); +// $activityEntity = $activityGateway->getActivityById($id); // Assurez-vous d'avoir une méthode similaire dans votre gateway + + $analyzeGateway = new AnalyzeGateway(new Connexion(DSN, DB_USER, DB_PASSWORD)); + $analyzeEntity = $analyzeGateway->getFrequenceCardiaqueByIdActivity($id); + + $response = $this->render('./page/analyze.html.twig', [ + 'css' => $this->preference->getCookie(), + 'pp' => "test2", + 'user' => 'johndoe',//$currentUser->getUsername(), + 'role' => 'Athlete',//$currentUser->getRole(), + 'friendship' => [], + 'activity' => [], + 'analyzes' => $analyzeEntity, + ]); + } catch (\Throwable $th) { + throw $th; + return $this->render("./page/analyze.html.twig", ['tabError' => $taberror]); + } + return $response; } +// +// #[Route(path: '/analyses/{id}', name: 'analyses', methods: ['GET'])] +// public function analyses(): Response +// { +// try { +// $activityGateway = new ActivityGateway(new Connexion(DSN, DB_USER, DB_PASSWORD)); +// $listSearch = $activityGateway->getActivity(); +// $map = new ActivityMapper(); +// $activityGateway = $map->activitySqlToEntity($listSearch); +// $listActivity = []; +// foreach ($activityGateway as $entity) { +// $activity = $map->activityEntityToModel($entity); +// $listActivity[] = ['idactivity' => number_format($activity->getIdActivity(), 1), 'type' => $activity->getType(), +// 'date' => $activity->getDate()->format("D j F Y"), 'heureDebut' => $activity->getHeureDebut()->format("H\h i"), 'heureFin' => $activity->getHeureFin()->format("H\h i"), +// 'effortRessenti' => $activity->getEffortRessenti(), 'variabilite' => $activity->getVariability(), 'variance' => $activity->getVariance(), +// 'ecartType' => $activity->getStandardDeviation(), 'moyenne' => $activity->getAverage(), +// 'max' => $activity->getMaximum(), 'min' => $activity->getMinimum(), 'temperature' =>$activity->getAvrTemperature()]; +// } +// +// $response = $this->render('./page/analyze.html.twig',[ +// 'css' => $this->preference->getCookie(), +// 'pp' => "test2", +// 'user' => 'johndoe',//$currentUser->getUsername(), +// 'role' => 'Athlete',//$currentUser->getRole(), +// 'friendship' => [], +// 'analyzes' => $listActivity, +// 'mails' => [], +// 'users' => [], +// 'infoUser' => [], +// 'exos' => [], +// 'member' => [] +// ]); +// } catch (\Throwable $th) { +// throw $th; +// return $this->render("./page/analyze.html.twig", ['tabError' => $taberror]); +// } +// return $response; +// } + #[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' => [], - 'users' => [], - 'infoUser' => [], - 'exos' => [], - 'member' => [] - ]); - } + try { + $activityGateway = new ActivityGateway(new Connexion(DSN, DB_USER, DB_PASSWORD)); + $listSearch = $activityGateway->getActivity(); + $map = new ActivityMapper(); + $activityGateway = $map->activitySqlToEntity($listSearch); + $listActivity = []; + foreach ($activityGateway as $entity) { + $activity = $map->activityEntityToModel($entity); + $listActivity[] = ['idactivity' => number_format($activity->getIdActivity()), 'type' => $activity->getType(), + 'date' => $activity->getDate()->format("D j F Y"), 'heureDebut' => $activity->getHeureDebut()->format("H\h i"), 'heureFin' => $activity->getHeureFin()->format("H\h i"), + 'effortRessenti' => $activity->getEffortRessenti(), 'variabilite' => $activity->getVariability(), 'variance' => $activity->getVariance(), + 'ecartType' => $activity->getStandardDeviation(), 'moyenne' => $activity->getAverage(), + 'max' => $activity->getMaximum(), 'min' => $activity->getMinimum(), 'temperature' => $activity->getAvrTemperature()]; + } + $response = $this->render('./page/activity.html.twig', [ + 'css' => $this->preference->getCookie(), + 'pp' => "test2", + 'user' => 'johndoe',//$currentUser->getUsername(), + 'role' => 'Athlete',//$currentUser->getRole(), + 'friendship' => [], + 'analyzes' => $listActivity, + 'mails' => [], + 'users' => [], + 'infoUser' => [], + 'exos' => [], + 'member' => [] + ]); + } catch (\Throwable $th) { + throw $th; + return $this->render("./page/analyze.html.twig", ['tabError' => $taberror]); + } + return $response; + } #[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' => 'johndoe',//$currentUser->getUsername(), - 'role' => 'Athlete',//$currentUser->getRole(), - 'friendship' => [], - 'analyzes' => [], - 'mails' => [], - 'users' => [], - 'infoUser' => [], - 'exos' => [], - 'member' => [] - ]); + try { + $entrainementGateway = new EntrainementGateway(new Connexion(DSN, DB_USER, DB_PASSWORD)); + $listSearch = $entrainementGateway->getEntrainements(); + $map = new EntrainementMapper(); + $entrainementEntity = $map->entrainementSqlToEntity($listSearch); + + $listUsers = []; + foreach ($entrainementEntity as $entity) { + $training = $map->entrainementEntityToModel($entity); + $listUsers[] = ['idTraining' => number_format($training->getId(), 1), 'date' => $training->getDate()->format("D j F Y"), + 'location' => $training->getLocation(), 'description' => $training->getDescription(), + 'feedback' => $training->getFeedback()]; + } + + $response = $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' => $listUsers, + 'member' => [] + ]); + + } catch (\Throwable $th) { + throw $th; + return $this->render("addfriend.html.twig", ['tabError' => $taberror]); + } + return $response; } #[Route(path: '/exercices', name: 'exercices', methods: ['POST'])] // 8 @@ -142,12 +296,21 @@ class AthleteController extends BaseController public function addFriend(string $username, IRequest $req): Response { try { - //Ajouter la personne sur laquelle on a clique dans la liste de currentuser - $listSearch=$this->container->get(UserManager::class)->searchUsersByName($username); - $i=0; - foreach ($listSearch as $user){ - $listUsers[$i++]=['nom' => $user->getNom(), 'prenom'=>$user->getPrenom(), 'img'=>'test', 'username'=>$user->getUsername()]; + $athleteGateway = new AthleteGateway(new Connexion(DSN, DB_USER, DB_PASSWORD)); + $map = new AthleteMapper(); + $userSearched = $athleteGateway->getAthleteByFirstName("Bryan"); + $athleteEntity = $map->athleteSqlToEntity($userSearched); + $users=[]; + foreach ($athleteEntity as $user) { +// $this->userMgr->getCurrentUser()->addFriend($user); +// $currentUser->addFriend($user); + $users = ['nom' => $user->getNom(), 'prenom' => $user->getPrenom(), 'img' => 'test', 'username' => $user->getUsername()]; } + $notif = new NotificationGateway(new Connexion(DSN, DB_USER, DB_PASSWORD)); + $mapper = new NotificationMapper(); + $date = new DateTime(); + $myNotif = new Notification(21, "Demande d'ami de la part de " . $users['nom'], $date, true, 7, 1); + $notif->addNotification($mapper->notificationToEntity($myNotif)); return $this->render('./page/addfriend.html.twig',[ 'css' => $this->preference->getCookie(), 'pp' => "test2", @@ -156,7 +319,7 @@ class AthleteController extends BaseController 'friendship' => [], 'analyzes' => [], 'mails' => [], - 'users' => $listUsers, + 'users' => $users, 'infoUser' => [], 'exos' => [], 'member' => [], @@ -171,19 +334,36 @@ class AthleteController extends BaseController #[Route(path: '/friend', name: 'friend', methods: ['GET'])] public function friend(): Response { - 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' => [], - ]); + try { + $athleteGateway = new AthleteGateway(new Connexion(DSN, DB_USER, DB_PASSWORD)); + $map=new AthleteMapper(); + $friendEntity = $athleteGateway->getAthlete(); + $listUserEntity = $map->athleteSqlToEntity($friendEntity); + + $friendList = []; + foreach ($listUserEntity as $userEntity) { + $friendList[] = ['nom' => $userEntity->getNom(), 'prenom' => $userEntity->getPrenom(), 'img' => 'test', 'username' => 'test']; + } + + $response = $this->render('./page/addfriend.html.twig',[ + 'css' => $this->preference->getCookie(), + 'pp' => "test2", + 'user' => 'John',//$currentUser->getUsername(), + 'role' => 'Athlete',//$currentUser->getRole(), + 'friendship' => [], + 'analyzes' => [], + 'mails' => [], + 'users' => $friendList, + 'infoUser' => [], + 'exos' => [], + 'member' => [], + ]); + + } catch (\Throwable $th) { + throw $th; + return $this->render("addfriend.html.twig", ['tabError' => $taberror]); + } + return $response; } /*#[Route(path: '/friendlist', name: 'friendlist', methods: ['POST'])] @@ -219,20 +399,38 @@ class AthleteController extends BaseController #[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' => $friendList, - 'analyzes' => [], - 'mails' => [], - 'users' => [], - 'infoUser' => [], - 'exos' => [], - 'member' => [], - ]); + try { + $athleteGateway = new AthleteGateway(new Connexion(DSN, DB_USER, DB_PASSWORD)); + $map=new AthleteMapper(); + $friendEntity = $athleteGateway->getListIdFriends(1/*$currentUser->getId()*/); + + $friendList = []; + $listUserEntity = []; + foreach($friendEntity as $users) { + if ($users['idathlete1']==1/*$currentUser->getId()*/){ + $user=(int)$users['idathlete2']; + } else { + $user=(int)$users['idathlete1']; + } + $listUserEntity[] = $map->athleteSqlToEntity($athleteGateway->getAthleteById(1)); + } + foreach ($listUserEntity as $user) { + $friendList[] = ['nom' => $user[0]->getNom(), 'prenom' => $user[0]->getPrenom(), 'img' => 'test', 'username' => 'test']; + } + + $response = $this->render('./page/friend.html.twig',[ + 'css' => $this->preference->getCookie(), + 'pp' => "test2", + 'user' => "Doe", + 'role' => "Athlète", + 'friendship' => $friendList, + ]); + + } catch (\Throwable $th) { + throw $th; + return $this->render("addfriend.html.twig", ['tabError' => $taberror]); + } + return $response; } // #[Route(path: '/delete-friend', name: 'delete-friend', methods: ['POST'])] diff --git a/Sources/src/app/controller/AuthController.php b/Sources/src/app/controller/AuthController.php index c99af373..0c0a20ca 100644 --- a/Sources/src/app/controller/AuthController.php +++ b/Sources/src/app/controller/AuthController.php @@ -4,171 +4,179 @@ namespace App\Controller; use App\Container; use App\Router\Request\IRequest; +use App\Router\Response\RedirectResponse; use App\Router\Response\Response; +use App\Router\Response\IResponse; + +use App\Router\Session; +use Database\AthleteGateway; +use Database\AthleteMapper; +use Database\Connexion; +use Manager\UserManager; use Shared\Attributes\Route; +use Shared\Validation; use Twig\Environment; use Data\Core\Preferences; use Shared\Log; +use function PHPUnit\Framework\isEmpty; class AuthController extends BaseController { - - protected Preferences $preference; - - public function __construct(){ - $this->preference = new Preferences(); + private UserManager $userMgr; + public function __construct(UserManager $manager){ + parent::__construct(); + $this->userMgr = $manager; } - #[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('/login', name: 'login',methods: ['POST'])] + public function login(string $email,string $password, IRequest $request): IResponse { + $error = []; + + try { + $log=$email; // should check email with verrify email + $mdp=Validation::clean_string($password); + if($this->userMgr->login($log,$mdp)){ +// Log::dd($this->userMgr->getCurrentUser()); +// $athleteGateway = new AthleteGateway(new Connexion(DSN, DB_USER, DB_PASSWORD)); +// $user = $athleteGateway->getUserByEmail($email); +// $map = new AthleteMapper(); +// $userEntity = $map->athleteSqlToEntity($user); +// +// $users = ['username' => $userEntity[0]->getUsername(), 'nom' => $userEntity[0]->getNom(), +// 'prenom' => $userEntity[0]->getPrenom(),'email' => $userEntity[0]->getEmail(), 'sexe' => $userEntity[0]->getSexe(), +// 'taille' => $userEntity[0]->getTaille(), 'poids' => $userEntity[0]->getPoids(), 'motdepasse' => $userEntity[0]->getMotDePasse(), +// 'datenaissance' => $userEntity[0]->getDateNaissance(), 'iscoach' => $userEntity[0]->getIsCoach(), 'img' => 'test']; + return $this->render('./page/home.html.twig', [ + 'css' => $this->preference->getCookie(), + 'pp' => 'test', +// 'user' => $this->userMgr->getCurrentUser()->getUsername(), +// 'role' => $this->userMgr->getCurrentUser()->getRole() + ]); + } + else{ + $error [] = "Erreur de connexion. Essayez encore"; - // #[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/login.html.twig',[ + 'css' => $this->preference->getCookie(), + 'login_error'=> $error, + ]); + } - return $this->render('./page/home.html.twig',[ + // should only cath a type of Exception not all + } catch (\Throwable $th) { + $error [] =$th->getMessage(); + return $this->render('./page/login.html.twig',[ + 'css' => $this->preference->getCookie(), + 'login_error'=> $error, + ]); + + } + + } + #[Route('/login', name: 'login2',methods: ['GET'])] + public function login2(IRequest $request): IResponse { + + return $this->render('./page/login.html.twig',[ 'css' => $this->preference->getCookie() ]); - } - - #[Route(path: '/regist', name: 'regist', methods: ['GET'])] - public function register2(): Response - { - // CONFIRMER LES DONNESS !!!!! IMPORTANT - + } + #[Route('/register', name: 'register2' , methods:['GET'])] + public function register2(IRequest $request): IResponse{ 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(); + #[Route('/register', name: 'register' , methods:['POST'])] + public function register( + string $nom, + string $prenom, + string $username, + string $mail, + string $motDePasse, + string $sexe, + float $taille, + float $poids, + string $dateNaissance, + string $roleName, + IRequest $request): IResponse + { + $error = []; + + try { + $registrationData = [ + 'nom' => $nom, + 'prenom' => $prenom, + 'username' => $username, + 'email' => $mail, + 'sexe' => $sexe, + 'taille' => $taille, + 'poids' => $poids, + 'dateNaissance' => $dateNaissance, + 'roleName' => $roleName + ]; + + if ($this->userMgr->register($mail, $motDePasse, $registrationData) ) { + return new RedirectResponse('/'); + } else { + $error [] = 'L\'inscription a échoué. Veuillez réessayer.'; + + return $this->render('./page/register.html.twig',[ + 'css' => $this->preference->getCookie(), + 'register_error'=> $error, + ]); } + } catch (\Throwable $e) { + $error [] =$e->getMessage(); + + return $this->render('./page/register.html.twig', ['css' => $this->preference->getCookie(),"register_error" => $error ]); + } - } - 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 +//string $ancienMotDePasse,string $nouveauMotDePasse,string $confirmerMotDePasse, + #[Route(path: '/forgetPassword', name: 'forget-password2', methods: ['GET'])] + public function forgetPassword2(IRequest $request): IResponse + { return $this->render('./page/password.html.twig',[ 'css' => $this->preference->getCookie(), - 'pp' => "test2", - 'user' => "Doe", - 'role' => "Athlète", - 'friendship' => [], - 'analyzes' => [], - 'mails' => [], - 'users' => [], - 'infoUser' => [], - 'exos' => [], - 'member' => [] ]); } - #[Route(path: '/log', name: 'log', methods: ['GET'])] - public function login2(): Response + #[Route(path: '/forgetPassword', name: 'forget-password', methods: ['POST'])] + public function forgetPassword(string $mail, IRequest $request): IResponse { - - // CONFIRMER LES DONNESS !!!!! IMPORTANT - return $this->render('./page/login.html.twig',[ + return $this->render('./page/password.html.twig',[ 'css' => $this->preference->getCookie(), - 'pp' => "test2", - 'user' => "Doe", - 'role' => "Athlète", - 'friendship' => [], - 'analyzes' => [], - 'mails' => [], - 'users' => [], - 'infoUser' => [], - 'exos' => [], - 'member' => [] ]); } - #[Route(path: '/password', name: 'password', methods: ['POST'])] - public function password(string $email, IRequest $req): Response + + #[Route(path: '/logout', name: 'logout', methods: ['GET'])] + public function logout(IRequest $request): IResponse { - - // CONFIRMER LES DONNESS !!!!! IMPORTANT + $error = []; - 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' => [] - ]); - } + try { + + if($this->userMgr->deconnecter()){ + return new RedirectResponse('/'); + } + else{ + $error [] = "Erreur de deconnexion. Essayez encore"; + return new RedirectResponse('/'); + } + } catch (\Throwable $th) { + $error [] =$th->getMessage(); + return new RedirectResponse('/'); + } + } } - ?> \ No newline at end of file diff --git a/Sources/src/app/controller/BaseController.php b/Sources/src/app/controller/BaseController.php index da6249a1..2def46b5 100644 --- a/Sources/src/app/controller/BaseController.php +++ b/Sources/src/app/controller/BaseController.php @@ -8,13 +8,14 @@ use App\Router\Response\RedirectResponse; use App\Router\Response\Response; use Psr\Container\ContainerInterface; - +use Shared\Log; abstract class BaseController { protected Preferences $preference; public function __construct(){ + $this->preference = new Preferences(); } protected ContainerInterface $container; @@ -62,18 +63,5 @@ abstract class BaseController return new RedirectResponse($url, $status); } - protected function redirectToRoute(string $route, array $parameters = [], int $status = 302): RedirectResponse - { - return $this->redirect($this->generateUrl($route, $parameters), $status); - } - - /* - * TODO : Should hanle ierror if the route is not existing - * */ - protected function generateUrl(string $route, array $parameters = []): string - { - return $this->container->get(\App\Router\Router::class)->generate($route, $parameters); - } - } \ No newline at end of file diff --git a/Sources/src/app/controller/CoachController.php b/Sources/src/app/controller/CoachController.php index 9deb8b3d..bf409633 100644 --- a/Sources/src/app/controller/CoachController.php +++ b/Sources/src/app/controller/CoachController.php @@ -7,6 +7,7 @@ use App\Router\Request\IRequest; use App\Router\Response\Response; use App\Router\Response\IResponse; +use Manager\DataManager; use Shared\Attributes\Route; use Twig\Environment; use Data\Core\Preferences; @@ -16,16 +17,16 @@ use Shared\Log; class CoachController extends BaseController { - private ICoachManager $coachManager; - private $security; - private Environment $twig; +// private ICoachManager $coachManager; +// private $security; +// private Environment $twig; protected Preferences $preference; - public function __construct(DataManager $dataManager, Security $security) + public function __construct() { - session_start(); - $this->coachManager = $dataManager->coachMgr; - $this->security = $security; +// session_start(); +// $this->coachManager = $dataManager->coachMgr; +// $this->security = $security; $this->preference = new Preferences(); } diff --git a/Sources/src/app/controller/Controller.php b/Sources/src/app/controller/Controller.php index cebeb34f..fa4f1633 100644 --- a/Sources/src/app/controller/Controller.php +++ b/Sources/src/app/controller/Controller.php @@ -1,716 +1,423 @@ 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", - // 'user' => "Doe", - // 'role' => "Athlète", - // 'friendship' => [], - // 'analyzes' => [], - // 'mails' => [], - // 'users' => [], - // 'infoUser' => [], - // 'exos' => [], - // 'member' => [] - // ]); - // } - - // #[Route(path: '/analyses', name: 'analyses', methods: ['GET'])] - // public function analyses(): Response - // { - // return $this->render('./page/analyze.html.twig',[ - // 'css' => $this->preference->getCookie(), - // 'pp' => "test2", - // 'user' => "Doe", - // 'role' => "Athlète", - // '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' => "test2", - // 'user' => "Doe", - // 'role' => "Athlète", - // 'friendship' => [], - // 'analyzes' => [], - // 'mails' => [], - // 'users' => [], - // 'infoUser' => [], - // 'exos' => [], - // 'member' => [] - // ]); - // } - - // #[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: '/exercices', name: 'exercices', methods: ['POST'])] // 8 - // public function exercices(String $type, String $intensite, String $date, IRequest $req): Response - // { - // $exercicesArray = [ - // [ - // 'date' => $date, - // 'type' => $type, - // 'intensite' => $intensite, - // 'status' => 'A venur', - // ] - // ]; - // return $this->render('./page/exercice.html.twig',[ - // 'css' => $this->preference->getCookie(), - // 'pp' => "test2", - // 'user' => "Doe", - // 'role' => "Athlète", - // 'friendship' => [], - // 'analyzes' => [], - // 'mails' => [], - // 'users' => [], - // 'infoUser' => [], - // 'exos' => $exercicesArray, - // 'member' => [] - // ]); - // } - - // #[Route(path: '/search-user', name: 'search-user', methods: ['GET'])] - // public function searchUser(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/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 ]); - // } - // // } - - // } - - // #[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(path: '/add-friend', name: 'add-friend', methods: ['POST'])] - // public function addFriend(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/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 ]); - // } - // // } - - // } - - // #[Route(path: '/friend', name: 'friend', methods: ['GET'])] - // public function friend(): Response - // { - // $utiliArray = [ - // [ - // 'nom' => 'John', - // 'prenom' => 'Doe', - // 'img' => 'john_doe', - // 'username' => 'johndoe', - // ], - // [ - // 'nom' => 'Alice', - // 'prenom' => 'Smith', - // 'img' => 'alice_smith', - // 'username' => 'alicesmith', - // ], - // ]; - // 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' => [], - // ]); - // } - - // #[Route(path: '/friendlist', name: 'friendlist', methods: ['POST'])] - // public function friendlist(string $username, IRequest $req): Response - // { - // $utiliArray = [ - // [ - // 'nom' => 'John', - // 'prenom' => 'Doe', - // 'img' => 'john_doe', - // 'username' => 'johndoe', - // ], - // [ - // 'nom' => 'Alice', - // 'prenom' => 'Smith', - // 'img' => 'alice_smith', - // 'username' => 'alicesmith', - // ], - // ]; - // /* TODO */ - - // // -> Enlever ou bloquer un utilisateur en fonction de son username - - // return $this->render('./page/friend.html.twig',[ - // 'css' => $this->preference->getCookie(), - // 'pp' => "test2", - // 'user' => "Doe", - // 'role' => "Athlète", - // 'friendship' => $utiliArray, - // 'analyzes' => [], - // 'mails' => [], - // 'users' => [], - // 'infoUser' => [], - // 'exos' => [], - // 'member' => [], - // ]); - // } - - // #[Route(path: '/friendlist', name: 'friendlist2', methods: ['GET'])] - // public function friendlist2(): Response - // { - // $utiliArray = [ - // [ - // 'nom' => 'John', - // 'prenom' => 'Doe', - // 'img' => 'test', - // 'status' => 'johndoe', - // 'username' => 'jdoe', - // ], - // [ - // 'nom' => 'Alice', - // 'prenom' => 'Smith', - // 'img' => 'test2', - // 'status' => 'alicesmith', - // 'username' => 'asmith', - // ], - // ]; - // return $this->render('./page/friend.html.twig',[ - // 'css' => $this->preference->getCookie(), - // 'pp' => "test2", - // 'user' => "Doe", - // 'role' => "Athlète", - // 'friendship' => $utiliArray, - // 'analyzes' => [], - // 'mails' => [], - // 'users' => [], - // 'infoUser' => [], - // 'exos' => [], - // 'member' => [], - // ]); - // } - - // #[Route(path: '/coaching', name: 'coaching', methods: ['GET'])] - // public function coaching(): Response - // { - // return $this->render('./page/coaching.html.twig',[ - // 'css' => $this->preference->getCookie(), - // 'pp' => "test2", - // 'user' => "Doe", - // 'role' => "Athlète", - // 'friendship' => [], - // 'analyzes' => [], - // 'mails' => [], - // 'users' => [], - // 'infoUser' => [], - // 'exos' => [], - // 'member' => [] - // ]); - // } - - // #[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' => [] - // ]); - // } - - // #[Route(path: '/import', name: 'import', methods: ['GET'])] - // public function import(): Response - // { - // return $this->render('./page/import.html.twig',[ - // 'css' => $this->preference->getCookie(), - // 'pp' => "test2", - // 'user' => "Doe", - // 'role' => "Athlète", - // 'friendship' => [], - // 'analyzes' => [], - // 'mails' => [], - // 'users' => [], - // 'infoUser' => [], - // 'exos' => [], - // 'member' => [] - // ]); - // } - - // #[Route(path: '/settings', name: 'settings', methods: ['GET'])] - // public function settings(IRequest $req): Response - // { - // 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' => [] - // ]); - // } - - // #[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); - - // 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' => [] - // ]); - // } - - // #[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' => [] - // ]); - // } - - // #[Route(path: '/login', name: 'login', methods: ['POST'])] - // public function login(string $username,string $mdp, IRequest $req): Response - // { - - // // CONFIRMER LES DONNESS !!!!! IMPORTANT - - // 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(path: '/log', name: 'log', methods: ['GET'])] - // public function login2(): Response - // { - - // // CONFIRMER LES DONNESS !!!!! IMPORTANT - - // 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: '/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(path: '/regist', name: 'regist', methods: ['GET'])] - // public function register2(): Response - // { - - // // CONFIRMER LES DONNESS !!!!! IMPORTANT - - // return $this->render('./page/register.html.twig',[ - // 'css' => $this->preference->getCookie() - // ]); - // } - - // #[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", - // 'role' => "Athlète", - // 'friendship' => [], - // 'analyzes' => [], - // 'mails' => [], - // 'users' => [], - // 'infoUser' => [], - // 'exos' => [], - // 'member' => [] - // ]); - // } - - // #[Route(path: '/password', name: 'password', methods: ['POST'])] - // public function password(string $email, IRequest $req): Response - // { - - // // CONFIRMER LES DONNESS !!!!! IMPORTANT - - // 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' => [] - // ]); - // } - +// +//namespace App\Controller; +// +//use App\Container; +//use App\Router\Request\IRequest; +//use App\Router\Response\Response; +//use Shared\Attributes\Route; +//use Twig\Environment; +//use Data\Core\Preferences; +//use Shared\Log; +// +//// TODO : Remove this BaseClass +//class Controller extends BaseController +//{ +// +// #[Route(path: '/activity', name: 'activity', methods: ['GET'])] +// public function activity(): Response +// { +// return $this->render('./page/activity.html.twig',[ +// 'css' => $this->preference->getCookie(), +// 'pp' => "test2", +// 'user' => "Doe", +// 'role' => "Athlète", +// 'friendship' => [], +// 'analyzes' => [], +// 'mails' => [], +// 'users' => [], +// 'infoUser' => [], +// 'exos' => [], +// 'member' => [] +// ]); +// } +// +// +// #[Route(path: '/exercices', name: 'exercices', methods: ['POST'])] // 8 +// public function exercices(String $type, String $intensite, String $date, IRequest $req): Response +// { +// $exercicesArray = [ +// [ +// 'date' => $date, +// 'type' => $type, +// 'intensite' => $intensite, +// 'status' => 'A venur', +// ] +// ]; +// return $this->render('./page/exercice.html.twig',[ +// 'css' => $this->preference->getCookie(), +// 'pp' => "test2", +// 'user' => "Doe", +// 'role' => "Athlète", +// 'friendship' => [], +// 'analyzes' => [], +// 'mails' => [], +// 'users' => [], +// 'infoUser' => [], +// 'exos' => $exercicesArray, +// 'member' => [] +// ]); +// } +// +// #[Route(path: '/search-user', name: 'search-user', methods: ['GET'])] +// public function searchUser(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/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 ]); +// } +// // } +// +// } +// +// #[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(path: '/friendlist', name: 'friendlist', methods: ['POST'])] +// public function friendlist(string $username, IRequest $req): Response +// { +// $utiliArray = [ +// [ +// 'nom' => 'John', +// 'prenom' => 'Doe', +// 'img' => 'john_doe', +// 'username' => 'johndoe', +// ], +// [ +// 'nom' => 'Alice', +// 'prenom' => 'Smith', +// 'img' => 'alice_smith', +// 'username' => 'alicesmith', +// ], +// ]; +// /* TODO */ +// +// // -> Enlever ou bloquer un utilisateur en fonction de son username +// +// return $this->render('./page/friend.html.twig',[ +// 'css' => $this->preference->getCookie(), +// 'pp' => "test2", +// 'user' => "Doe", +// 'role' => "Athlète", +// 'friendship' => $utiliArray, +// 'analyzes' => [], +// 'mails' => [], +// 'users' => [], +// 'infoUser' => [], +// 'exos' => [], +// 'member' => [], +// ]); +// } +// +// #[Route(path: '/friendlist', name: 'friendlist2', methods: ['GET'])] +// public function friendlist2(): Response +// { +// $utiliArray = [ +// [ +// 'nom' => 'John', +// 'prenom' => 'Doe', +// 'img' => 'test', +// 'status' => 'johndoe', +// 'username' => 'jdoe', +// ], +// [ +// 'nom' => 'Alice', +// 'prenom' => 'Smith', +// 'img' => 'test2', +// 'status' => 'alicesmith', +// 'username' => 'asmith', +// ], +// ]; +// return $this->render('./page/friend.html.twig',[ +// 'css' => $this->preference->getCookie(), +// 'pp' => "test2", +// 'user' => "Doe", +// 'role' => "Athlète", +// 'friendship' => $utiliArray, +// 'analyzes' => [], +// 'mails' => [], +// 'users' => [], +// 'infoUser' => [], +// 'exos' => [], +// 'member' => [], +// ]); +// } +// +// #[Route(path: '/coaching', name: 'coaching', methods: ['GET'])] +// public function coaching(): Response +// { +// return $this->render('./page/coaching.html.twig',[ +// 'css' => $this->preference->getCookie(), +// 'pp' => "test2", +// 'user' => "Doe", +// 'role' => "Athlète", +// 'friendship' => [], +// 'analyzes' => [], +// 'mails' => [], +// 'users' => [], +// 'infoUser' => [], +// 'exos' => [], +// 'member' => [] +// ]); +// } +// +// #[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' => [] +// ]); +// } +// +// +// #[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: '/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: '/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", +// 'role' => "Athlète", +// 'friendship' => [], +// 'analyzes' => [], +// 'mails' => [], +// 'users' => [], +// 'infoUser' => [], +// 'exos' => [], +// 'member' => [] +// ]); +// } +// +// #[Route(path: '/password', name: 'password', methods: ['POST'])] +// public function password(string $email, IRequest $req): Response +// { +// +// // CONFIRMER LES DONNESS !!!!! IMPORTANT +// +// 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' => [] +// ]); +// } +// //} - - - +// +// +// \ No newline at end of file diff --git a/Sources/src/app/controller/FrontController.php b/Sources/src/app/controller/FrontController.php index 7676ec67..f46d694b 100644 --- a/Sources/src/app/controller/FrontController.php +++ b/Sources/src/app/controller/FrontController.php @@ -48,6 +48,7 @@ class FrontController { $this->handleError(404, $e->getMessage()); } catch(\Throwable $e){ + Log::dd($e->getLine() . $e->getFile() . $e->getMessage() ); $this->handleError(501, $e->getMessage()); } } @@ -65,7 +66,7 @@ class FrontController { // TODO : Don't work need Antoine help private function handleError(int $statusCode, $message) : void { if (!$this->container->has(\Twig\Environment::class)) { - throw new \LogicException('You cannot use the "renderView" method if the Twig Bundle is not available. Try running "composer require symfony/twig-bundle".'); + throw new \LogicException('You cannot use the "renderView" method if the Twig Bundle is not available. Try running "composer require ".'); } $response = new Response($this->container->get(\Twig\Environment::class)->render('./error/error.html.twig',['title'=> $message , "code" => $statusCode, "name" => $message, "descr" => $message ]),$statusCode); diff --git a/Sources/src/app/controller/HeartRateController.php b/Sources/src/app/controller/HeartRateController.php index 9e7090e9..02c97bc3 100644 --- a/Sources/src/app/controller/HeartRateController.php +++ b/Sources/src/app/controller/HeartRateController.php @@ -4,7 +4,10 @@ namespace App\Controller; use App\Container; use App\Router\Request\IRequest; +use App\Router\Response\IResponse; +use App\Router\Response\RedirectResponse; use App\Router\Response\Response; +use Manager\ActivityManager; use Shared\Attributes\Route; use Twig\Environment; use Data\Core\Preferences; @@ -12,21 +15,18 @@ use Shared\Log; class HeartRateController extends BaseController { + private ActivityManager $activityMgr; - private Environment $twig; - protected Preferences $preference; - - public function __construct() + public function __construct(ActivityManager $manager) { - session_start(); - $this->preference = new Preferences(); + parent::__construct(); + $this->activityMgr = $manager; } - #[Route(path: '/import', name: 'import', methods: ['GET'])] public function import(): Response { - return $this->render('./page/import.html.twig',[ + return $this->render('./page/import.html.twig', [ 'css' => $this->preference->getCookie(), 'pp' => "test2", 'user' => "Doe", @@ -40,6 +40,55 @@ class HeartRateController extends BaseController 'member' => [] ]); } - -} \ No newline at end of file + #[Route(path: '/upload', name: 'upload', methods: ['POST'])] + public function uploadFile(string $activityType, int $effort, IRequest $req): IResponse + { + $error = $this->validateRequest($effort); + if (!empty($error)) { + return $this->renderError($error); + } + + $tmp_file = $_FILES['uploaded_file']['tmp_name']; + if (!$this->isValidFile($tmp_file)) { + return $this->renderError(['Failed to get file be sure that you provide the file']); + } + + $content = file_get_contents($tmp_file); + try { + + if ($this->activityMgr->uploadFile($activityType, 5, $content)) { + return new RedirectResponse('/home'); + } + } catch (\Exception $e) { + return $this->renderError([$e->getMessage()]); + } + + return $this->renderError(['Failed to save activity.']); + } + + private function validateRequest(int $effort): array + { + $error = []; + if ($effort < 0 || $effort > 5) { + $error[] = 'Invalid effort level.'; + } + $fileExtension = pathinfo($_FILES['uploaded_file']['name'], PATHINFO_EXTENSION); + if ($fileExtension !== 'fit') { + $error[] = 'Invalid file type. Only .fit files are allowed.'; + } + return $error; + } + + private function isValidFile(string $tmp_file): bool + { + return file_exists($tmp_file) && is_uploaded_file($tmp_file); + } + + private function renderError(array $error): Response + { + // Consolidez la logique de rendu ici + return $this->render('./error/error.html.twig', ['title'=> "Failed" , "code" => 400, "name" => "error import", "descr" => $error[0] ], new Response('$error', 400)); + + } +} diff --git a/Sources/src/app/controller/SocialController.php b/Sources/src/app/controller/SocialController.php index 506eda77..f2867f55 100644 --- a/Sources/src/app/controller/SocialController.php +++ b/Sources/src/app/controller/SocialController.php @@ -5,6 +5,11 @@ namespace App\Controller; use App\Container; use App\Router\Request\IRequest; use App\Router\Response\Response; +use Database\AthleteGateway; +use Database\AthleteMapper; +use Database\Connexion; +use Database\NotificationGateway; +use Database\NotificationMapper; use Shared\Attributes\Route; use Twig\Environment; use Data\Core\Preferences; @@ -12,33 +17,49 @@ use Shared\Log; class SocialController extends BaseController { - - private Environment $twig; protected Preferences $preference; - public function __construct() - { - session_start(); - $this->preference = new Preferences(); + public function __construct(){ + $this->preference = new Preferences(); } - - #[Route(path: '/mail', name: 'mail', methods: ['GET'])] + #[Route(path: '/notification', name: 'notification', 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' => [] - ]); + try { + $notificationGateway = new NotificationGateway(new Connexion(DSN, DB_USER, DB_PASSWORD)); + $listSearch = $notificationGateway->getNotifications(); + $map = new NotificationMapper(); + $notificationEntity = $map->notificationSqlToEntity($listSearch); + + $listUsers = []; + + foreach ($notificationEntity as $entity) { + $notification = $map->notificationEntityToModel($entity); + $listUsers[] = ['idnotif' => $notification->getId(), 'message' => $notification->getMessage(), + 'date' => $notification->getDate()->format("D j F Y"),'statut' => $notification->getStatut(), 'urgence' => $notification->getUrgence(), + 'idathlete' => $notification->getToUserId()]; + } + + $response = $this->render('./page/notification.html.twig',[ + 'css' => $this->preference->getCookie(), + 'pp' => "test2", + 'user' => "Doe", + 'role' => "Athlète", + 'friendship' => [], + 'analyzes' => [], + 'mails' => $listUsers, + 'users' => [], + 'infoUser' => [], + 'exos' => [], + 'member' => [] + ]); + + } catch (\Throwable $th) { + throw $th; + return $this->render("notification.html.twig", ['tabError' => $taberror]); + } + return $response; } diff --git a/Sources/src/app/controller/UserController.php b/Sources/src/app/controller/UserController.php index 1ee0adc3..dc0c5536 100644 --- a/Sources/src/app/controller/UserController.php +++ b/Sources/src/app/controller/UserController.php @@ -4,25 +4,32 @@ namespace App\Controller; use App\Container; use App\Router\Request\IRequest; +use App\Router\Response\RedirectResponse; use App\Router\Response\Response; +use App\Router\Response\IResponse; + +use App\Router\Session; +use DateInterval; +use DateTime; +use Manager\UserManager; use Shared\Attributes\Route; +use Shared\Validation; use Twig\Environment; use Data\Core\Preferences; use Shared\Log; +use function PHPUnit\Framework\isEmpty; +use Database\Athletegateway; +use Database\Connexion; class UserController extends BaseController { - private Environment $twig; - protected Preferences $preference; - - public function __construct() - { - session_start(); - $this->preference = new Preferences(); + private UserManager $userMgr; + public function __construct(UserManager $manager){ + parent::__construct(); + $this->userMgr = $manager; } - #[Route(path: '/', name: 'index', methods: ['GET'])] public function index(): Response { @@ -44,6 +51,100 @@ class UserController extends BaseController #[Route(path: '/home', name: 'home', methods: ['GET'])] public function home(): Response { + $athleteGateway = new AthleteGateway(new Connexion(DSN, DB_USER, DB_PASSWORD)); + $activity = $athleteGateway->getListActivity('1');//$currentUser->getId() + +// $charts = []; +// $i = 0; +// while ($i <= 12) { +// if ($activity[$i]['mois'] == null) { +// $activity[$i]['mois'] = $i; +// $activity[$i]['nbactivite'] = 0; +// } elseif (($indice = intval($activity[$i]['mois'])) != $i) { +// $temp = $activity[$i]; // Stocker temporairement les données actuelles +// $activity[$i]['mois'] = $i; +// $activity[$i]['nbactivite'] = 0; +// $activity[$indice]['mois'] = $indice; +// $activity[$indice]['nbactivite'] = $temp['nbactivite']; // Restaurer les données +// } +// $charts[] = ['act' => $activity[$i]['nbactivite'], 'mois' => $activity[$i]['mois']]; +// $i++; +// } + + $charts = []; + $monthNames = [ + 'Janvier', 'Fevrier', 'Mars', 'Avril', 'Mai', 'Juin', + 'Juillet', 'Aout', 'Septembre', 'Octobre', 'Novembre', 'Decembre' + ]; + + $currentDate = new DateTime(); + $interval = new DateInterval('P1M'); // Période d'un mois + + for ($i = 0; $i < 12; $i++) { + $currentMonth = $currentDate->format('n'); // Format numérique du mois (1 à 12) + $currentMonthName = $monthNames[$currentMonth - 1]; // Mois correspondant dans le tableau + + // Recherche de l'indice du mois dans le tableau $activity + $activityIndex = null; + for ($j = 0; $j < count($activity); $j++) { + if (!empty($activity[$j]['mois']) && $activity[$j]['mois'] == $currentMonth) { + $activityIndex = $j; + break; + } + } + + // Récupération du nombre d'activités et réinitialisation à 0 + $nbActivity = isset($activityIndex) ? $activity[$activityIndex]['nbactivite'] : 0; + if (isset($activityIndex)) { + $activity[$activityIndex]['nbactivite'] = 0; + } +// Log::dd($currentMonth); + $charts[] = ['act' => $nbActivity, 'mois' => $currentMonth]; + $currentDate->sub($interval); + } + +// Inverser l'ordre des éléments si nécessaire + $charts = array_reverse($charts); + +// Log::dd($charts); + +// +// $charts = []; +// $monthNames = [ +// 'Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', +// 'Juillet', 'Août', 'Septembre', 'Octobre', 'Novembre', 'Décembre' +// ]; +// +// $currentDate = new DateTime(); +// $interval = new DateInterval('P1M'); // Période d'un mois +// +// for ($i = 0; $i < 12; $i++) { +//// $currentDate; // Soustraire un mois +//// Log::dd($currentDate); +// $currentMonth = $currentDate->format('n'); // Format numérique du mois (1 à 12) +//// Log::dd($currentMonth); +// $currentMonthName = $monthNames[$currentMonth - 1]; // Mois correspondant dans le tableau +// for($j = 12; $j > 0; $j--) { +// if(!empty($activity[$j]['mois']) || $activity[$j]['mois'] == $currentMonth) { +// $nbAct = $activity[$j]['nbactivite']; +// $activity[$j]['nbactivite'] = 0; +//// Log::dd($activity); +// break; +// } +// } +// +// $nbActivity = isset($nbAct) ? $nbAct : 0; +//// Log::dd($nbActivity); +// +// $charts[] = ['act' => $nbActivity, 'mois' => $currentMonthName]; +// $currentDate->sub($interval); +// } +// Log::dd($charts); + +// Inverser l'ordre des éléments si nécessaire +// $charts = array_reverse($charts); +// +// Log::dd($charts); return $this->render('./page/home.html.twig',[ 'css' => $this->preference->getCookie(), 'pp' => "test2", @@ -51,6 +152,7 @@ class UserController extends BaseController 'role' => "Athlète", 'friendship' => [], 'analyzes' => [], + 'charts' => $charts, 'mails' => [], 'users' => [], 'infoUser' => [], @@ -119,45 +221,25 @@ 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' => [] - ]); - } +// #[Route(path: '/logout', name: 'logout', methods: ['GET'])] +// public function logout(IRequest $request): IResponse +// { +// $error = []; +// +// try { +// +// if($this->userMgr->deconnecter()){ +// return new RedirectResponse('/'); +// } +// else{ +// $error [] = "Erreur de deconnexion. Essayez encore"; +// return new RedirectResponse('/'); +// } +// +// } catch (\Throwable $th) { +// $error [] =$th->getMessage(); +// return new RedirectResponse('/'); +// } +// } } \ No newline at end of file diff --git a/Sources/src/app/router/Router.php b/Sources/src/app/router/Router.php index 1461e7cf..dec1d043 100644 --- a/Sources/src/app/router/Router.php +++ b/Sources/src/app/router/Router.php @@ -1,12 +1,15 @@ path = $path; $this->routes = new \AltoRouter(); } - + /** * Adds a new Route to the collection. * @@ -46,28 +50,37 @@ class Router { * @param Route $route The route object. * @throws \InvalidArgumentException If method is not supported. */ - public function add(string $method, Route $route) { + public function add(string $method, Route $route) + { if (!in_array($method, self::$verbs)) { throw new \InvalidArgumentException("Method not supported"); } $this->routes->map($method, $route->getPath(), $route->getCallable(), $route->getName()); } - + /** * Adds a route for a controller action. - * - * @param string $method The HTTP method. + * TODO : the problème is that AltoRouter is a map so i can't have mutilple Route just by doing this:(i need to find a logic to resolve this beavior) #[Route('/login', name: 'login',methods: ['POST','GET'])] + * @param string|array $methods HTTP method. * @param string $path The path for the route. * @param mixed $controller The controller object. * @param string $action The action method in the controller. * @param string $name (Optional) The name of the route. * @throws \InvalidArgumentException If method is not supported. */ - public function addControllerRoute(string $method, string $path, $controller, string $action, string $name = '') { - if (!in_array($method, self::$verbs)) { - throw new \InvalidArgumentException("Method not supported"); + public function addControllerRoute(string|array $methods, string $path, $controller, string $action, string $name = '') + { + + if (is_string($methods)) { + $methods = [$methods]; // Convert to an array if it's a string + } + + foreach ($methods as $method) { + if (!in_array($method, self::$verbs)) { + throw new \InvalidArgumentException("Method not supported"); + } + $this->routes->map($method, $path, [$controller, $action], $name); } - $this->routes->map($method, $path, [$controller, $action], $name); } // TODO: Implement the extractParams method. @@ -80,7 +93,8 @@ class Router { * @param callable $callable The callback function. * @param string $name The name of the route. */ - public function get(string $path, callable $callable, $name) { + public function get(string $path, callable $callable, $name) + { $this->routes->map('GET', $path, $callable, $name); } @@ -92,7 +106,8 @@ class Router { * @param IRequest $request The request object. * @return array|null The matched route or null if no match. */ - public function match(IRequest $request): ?array { + public function match(IRequest $request): ?array + { return $this->routes->match($request->getRequestUri(), $request->getMethod()) ?: null; } @@ -101,16 +116,17 @@ class Router { * * @return array The array of routes. */ - public function getRoutes() { + public function getRoutes() + { return []; // TODO: Implement the actual logic to return routes. } - public function generate (string $routeName, array $params = array()): string + public function generate(string $routeName, array $params = array()): string { - return $this->routes->generate($routeName,$params); + return $this->routes->generate($routeName, $params); } } -?> +?> \ No newline at end of file diff --git a/Sources/src/app/router/Session.php b/Sources/src/app/router/Session.php index 3c97d606..ae615363 100644 --- a/Sources/src/app/router/Session.php +++ b/Sources/src/app/router/Session.php @@ -111,8 +111,7 @@ class Session if ( $this->sessionState == self::SESSION_STARTED ) { $this->sessionState = !session_destroy(); - unset( $_SESSION ); - + session_unset(); // Clear all session variables return !$this->sessionState; } diff --git a/Sources/src/app/router/middleware/AuthMiddleware.php b/Sources/src/app/router/middleware/AuthMiddleware.php index 806531bf..7e6cbc06 100644 --- a/Sources/src/app/router/middleware/AuthMiddleware.php +++ b/Sources/src/app/router/middleware/AuthMiddleware.php @@ -2,26 +2,24 @@ namespace App\Router\Middleware; use App\Router\Session; +use Network\IAuthService; use Shared\Log; use App\Router\Request\IRequest; use App\Router\Response\RedirectResponse; class AuthMiddleware extends Middleware { - public function handle(IRequest $request, callable $next) { - // if (isset($_SESSION['user'])) { - // $resp =new RedirectResponse("/"); - // $resp->send(); - // exit; - // } -// La page n’est pas redirigée correctement - -// Firefox a détecté que le serveur redirige la demande pour cette adresse d’une manière qui n’aboutira pas. -// La cause de ce problème peut être la désactivation ou le refus des cookies. - // if (!isset($_SESSION['user'])) { - // $resp =new RedirectResponse("/log"); - // $resp->send(); - // exit; - // } + private IAuthService $auth; + public function __construct(IAuthService $auth) { + $this->auth = $auth; + } + public function handle(IRequest $request, callable $next) { + $excludedUrls = ['/login', '/register','/forgetPassword', '/']; +// Log::dd($this->auth->getCurrentUser()); + if ($this->auth->getCurrentUser() === null && !in_array($request->getRequestUri(), $excludedUrls)) { + $resp = new RedirectResponse("/login"); + $resp->send(); + exit; + } return parent::handle($request, $next); } } \ No newline at end of file diff --git a/Sources/src/app/router/response/RedirectResponse.php b/Sources/src/app/router/response/RedirectResponse.php index 7a34037e..a077568f 100644 --- a/Sources/src/app/router/response/RedirectResponse.php +++ b/Sources/src/app/router/response/RedirectResponse.php @@ -2,6 +2,9 @@ namespace App\Router\Response; +use App\Router\Session; +use Shared\Log; + class RedirectResponse implements IResponse { private $content; @@ -49,12 +52,13 @@ class RedirectResponse implements IResponse public function send(): void { + http_response_code($this->statusCode); foreach ($this->headers as $name => $value) { header("$name: $value"); } - + header("Location: " . $this->url); // Optionally echo content if any diff --git a/Sources/src/app/router/response/Response.php b/Sources/src/app/router/response/Response.php index e3c364ac..41b259cb 100644 --- a/Sources/src/app/router/response/Response.php +++ b/Sources/src/app/router/response/Response.php @@ -1,6 +1,8 @@ - - - - - - - {% block title %}{% endblock %} - - - - -
-
-
- {% block main %} -
-
-
-
-

Connexion

-
-
-
- - -
-
- - -
-
- - -
-
- Mot de passe oublié ? - Se connecter -
-
-
-
-
Besoin d'un compte ? Inscrivez-vous !
+{#<<<<<<< HEAD#} + + + + + + + {% block title %}{% endblock %} + + + + +
+
+
+ {% block main %} +
+
+
+
+

Connexion

+
+
+
+ + +
+
+ + +
+
+ + +
+ +
+
+ +{#=======#} +{##} +{# #} +{# #} +{# #} +{# #} +{# #} +{# {% block title %}{% endblock %}#} +{# #} +{# #} +{##} +{##} +{#
#} +{#
#} +{#
#} +{# {% block main %}#} +{#
#} +{#
#} +{#
#} +{#
#} +{#

Connexion

#} +{#
#} +{#
#} +{#
#} +{# #} +{# #} +{#
#} +{#
#} +{# #} +{# #} +{#
#} +{#
#} +{# #} +{# #} +{#
#} +{#
#} +{# Mot de passe oublié ?#} +{# Se connecter#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
Besoin d'un compte ? Inscrivez-vous !
#} +{#>>>>>>> origin/merged_PLE#}
diff --git a/Sources/src/app/views/Templates/base.html.twig b/Sources/src/app/views/Templates/base.html.twig index 5c6177bb..aed11cb5 100755 --- a/Sources/src/app/views/Templates/base.html.twig +++ b/Sources/src/app/views/Templates/base.html.twig @@ -7,9 +7,12 @@ {% block title %}{% endblock %} + + +
-

{{responce}}

+
+{% endblock %} + +{% block script %} + + + + {% endblock %} \ No newline at end of file diff --git a/Sources/src/app/views/Templates/page/addfriend.html.twig b/Sources/src/app/views/Templates/page/addfriend.html.twig index 7a74ced4..507101a9 100644 --- a/Sources/src/app/views/Templates/page/addfriend.html.twig +++ b/Sources/src/app/views/Templates/page/addfriend.html.twig @@ -12,7 +12,7 @@

Liste d'ami

    -
  1. Accueil
    2. +
  2. Accueil
  3. Ami
diff --git a/Sources/src/app/views/Templates/page/addmember.html.twig b/Sources/src/app/views/Templates/page/addmember.html.twig index 5d7689db..368687fe 100644 --- a/Sources/src/app/views/Templates/page/addmember.html.twig +++ b/Sources/src/app/views/Templates/page/addmember.html.twig @@ -12,7 +12,7 @@

Coaching

    -
  1. Accueil
    2. +
  2. Accueil
  3. Coaching
diff --git a/Sources/src/app/views/Templates/page/analyze.html.twig b/Sources/src/app/views/Templates/page/analyze.html.twig index 6adc09f2..e42396bf 100755 --- a/Sources/src/app/views/Templates/page/analyze.html.twig +++ b/Sources/src/app/views/Templates/page/analyze.html.twig @@ -4,63 +4,151 @@ {% block css %}{{css}}{% endblock %} -{% block title %}Analyses - HearthTrack{% endblock %} +{% block title %}Exercices - HearthTrack{% endblock %} {% block user %}{{user}} - {{role}}{% endblock %} {% block body %} -
-

Analyses

+
+

Exercices

    -
  1. Accueil
    2. -
  2. Analyses
    3. +
  3. Accueil
    4. +
  4. Exercices
    5. +
-
-
- - - - - - - - - - - - - - - - - - - - - - - {% for analyze in analyzes %} - - - - - - - - - {% endfor %} - -
DateTypeBMPKM/HDistance
DateTypeBPMKM/HDistance
{{analyze.date}}{{analyze.type}}{{analyze.bpm}}{{analyze.kmh}} Km/H{{analyze.distance}} KmEn savoir plus
-
-
-
-
-
-{% endblock %} +
+{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# {% for analyze in analyzes %}#} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# {% endfor %}#} +{#
id FCaltitudetempsTemperaturebpmlongitudelatitudeactiviteid
{{analyze.idfc}}{{analyze.altitude}}{{analyze.temps}}{{analyze.temperature}}{{analyze.bpm}}{{analyze.longitude}}{{analyze.latitude}}{{analyze.activiteid}}Home
#} +{#
#} +{# #} +{#

Hello Fallback World

#} +{# #} +{#
#} +{# #} +{# #} +
+ +

Hello Fallback World

+ +
+ + +
+
+ - - - + {% for analyze in analyzes %} + var marker = L.marker([{{ analyze.latitude }}, {{ analyze.longitude }}]).addTo(map); + marker.bindPopup(` + Date: {{ analyze.temps }}
+ FC: {{ analyze.bpm }}
+ Altitude: {{ analyze.altitude }}
+ Temperature: {{ analyze.temperature }} + `); + {% endfor %} + }); + +
+
+
+
+
+

{{responce}}

{% endblock %} \ No newline at end of file diff --git a/Sources/src/app/views/Templates/page/coaching.html.twig b/Sources/src/app/views/Templates/page/coaching.html.twig index e1ada5ac..de35d6d6 100755 --- a/Sources/src/app/views/Templates/page/coaching.html.twig +++ b/Sources/src/app/views/Templates/page/coaching.html.twig @@ -13,7 +13,7 @@

Coaching

    -
  1. Accueil
    2. +
  2. Accueil
  3. Coaching
diff --git a/Sources/src/app/views/Templates/page/exercice.html.twig b/Sources/src/app/views/Templates/page/exercice.html.twig index 80bb86b9..07b08632 100755 --- a/Sources/src/app/views/Templates/page/exercice.html.twig +++ b/Sources/src/app/views/Templates/page/exercice.html.twig @@ -9,10 +9,11 @@ {% block user %}{{user}} - {{role}}{% endblock %} {% block body %} +

Exercices

    -
  1. Accueil
    2. +
  2. Accueil
  3. Exercices
@@ -20,23 +21,44 @@
-
+
- - - + + + + {% for exo in exos %} - - - - + + + + {% endfor %} diff --git a/Sources/src/app/views/Templates/page/friend.html.twig b/Sources/src/app/views/Templates/page/friend.html.twig index c0c4691b..03a5e4b7 100755 --- a/Sources/src/app/views/Templates/page/friend.html.twig +++ b/Sources/src/app/views/Templates/page/friend.html.twig @@ -12,7 +12,7 @@

Liste d'ami

    -
  1. Accueil
    2. +
  2. Accueil
  3. Ami
@@ -26,7 +26,7 @@
DateTypeIntensité prévueStatusDescriptionLocalisationFeedBack
{{exo.date}}{{exo.type}}{{exo.intensite}}{{exo.status}}{{ exo.date }}{{ exo.description }} +
+ + 		{{ exo.feedback }}
{% if friendship is empty %}

Vous n'avez aucun ami.

- {% else %} + {% else %} diff --git a/Sources/src/app/views/Templates/page/home.html.twig b/Sources/src/app/views/Templates/page/home.html.twig index 6ade985b..3143ca51 100755 --- a/Sources/src/app/views/Templates/page/home.html.twig +++ b/Sources/src/app/views/Templates/page/home.html.twig @@ -21,8 +21,85 @@ Stastiques globales -
- {# #} +
+ +

Hello Fallback World

+ +
+ +
diff --git a/Sources/src/app/views/Templates/page/import.html.twig b/Sources/src/app/views/Templates/page/import.html.twig index d7356cc2..4598ceb4 100644 --- a/Sources/src/app/views/Templates/page/import.html.twig +++ b/Sources/src/app/views/Templates/page/import.html.twig @@ -9,34 +9,57 @@ {% block user %}{{user}} - {{role}}{% endblock %} {% block body %} -
-

Importer

-
    -
  1. Accueil
    2. -
  2. Importer
    3. -
- -
-
-
-
- - Importer un fichier .fit -
-
- -
- -
- - - -
+
+

Importer

+
    +
  1. Accueil
    2. +
  2. Importer
    3. +
+
+
+
+

+ Importer un fichier .fit ! +

+

Let's go

+
+
+
+ + +
+
+ + +
+
+ +
+
-
+ + +

+
+

+ File type: .fit +

+
+ +
+ +
+
+
{% endblock %} \ No newline at end of file diff --git a/Sources/src/app/views/Templates/page/index.html b/Sources/src/app/views/Templates/page/index.html index fed00084..081c934c 100644 --- a/Sources/src/app/views/Templates/page/index.html +++ b/Sources/src/app/views/Templates/page/index.html @@ -1,3 +1,6 @@ + + + @@ -28,8 +31,8 @@ + +
+
+
Besoin d'un compte ? Inscrivez-vous !
- {% endblock %} \ No newline at end of file +
+
+ + +{% endblock %} diff --git a/Sources/src/app/views/Templates/page/mail.html.twig b/Sources/src/app/views/Templates/page/notification.html.twig similarity index 85% rename from Sources/src/app/views/Templates/page/mail.html.twig rename to Sources/src/app/views/Templates/page/notification.html.twig index ac667739..9f84ee37 100755 --- a/Sources/src/app/views/Templates/page/mail.html.twig +++ b/Sources/src/app/views/Templates/page/notification.html.twig @@ -23,14 +23,16 @@ + {% for mail in mails %} - - + + + {% endfor %} diff --git a/Sources/src/app/views/Templates/page/password.html.twig b/Sources/src/app/views/Templates/page/password.html.twig index 903e4739..b88658a2 100644 --- a/Sources/src/app/views/Templates/page/password.html.twig +++ b/Sources/src/app/views/Templates/page/password.html.twig @@ -12,19 +12,31 @@

Récupération du mot de passe

Entrez votre adresse eMail pour recevoir un lien pour changer de mot de passe
-
+{#<<<<<<< HEAD#} + +{#=======#} +{# #} +{#>>>>>>> origin/merged_PLE#}
- Retour à la connexion +{#<<<<<<< HEAD#} + Retour à la connexion +{#=======#} +{# Retour à la connexion#} +{#>>>>>>> origin/merged_PLE#}
-
Besoin d'un compte ? Inscrivez-vous !
+{#<<<<<<< HEAD#} +
Besoin d'un compte ? Inscrivez-vous !
+{#=======#} +{#
Besoin d'un compte ? Inscrivez-vous !
#} +{#>>>>>>> origin/merged_PLE#}
diff --git a/Sources/src/app/views/Templates/page/profile.html.twig b/Sources/src/app/views/Templates/page/profile.html.twig index 481842df..751feff0 100644 --- a/Sources/src/app/views/Templates/page/profile.html.twig +++ b/Sources/src/app/views/Templates/page/profile.html.twig @@ -12,7 +12,7 @@

Profile

    -
  1. Accueil
    2. +
  2. Accueil
  3. Profile
diff --git a/Sources/src/app/views/Templates/page/register.html.twig b/Sources/src/app/views/Templates/page/register.html.twig index 309eeed5..6fc79f54 100644 --- a/Sources/src/app/views/Templates/page/register.html.twig +++ b/Sources/src/app/views/Templates/page/register.html.twig @@ -11,82 +11,131 @@

Créer un compte

+ {# Display error message if register_error is set #} + {% if register_error %} + {% for value in register_error %} + + {% endfor %} + {% endif %}
- - + +
- - + +
- - +{#<<<<<<< HEAD#} + + +{#=======#} +{# #} +{# #} +{#>>>>>>> origin/merged_PLE#}
+
- - + + + +{#=======#} +{# #} +{#
- - + +
- - + +
- - + +
- - +{#<<<<<<< HEAD#} + + +{#=======#} +{# #} +{# #} +{#>>>>>>> origin/merged_PLE#}
- - + +
- - + +
+
+ +
+ +
+ +
+
+
+
-
Créer un compte
+{#<<<<<<< HEAD#} +
+ +
+{#=======#} +{#
Créer un compte
#} +{#>>>>>>> origin/merged_PLE#}
-
Avez-vous déjà un compte ? Connectez-vous ?
+{#<<<<<<< HEAD#} +
Avez-vous déjà un compte ? Connectez-vous ?
+{#=======#} +{#
Avez-vous déjà un compte ? Connectez-vous ?
#} +{#>>>>>>> origin/merged_PLE#}
diff --git a/Sources/src/app/views/Templates/page/settings.html.twig b/Sources/src/app/views/Templates/page/settings.html.twig index bcbe9a12..d27b6509 100644 --- a/Sources/src/app/views/Templates/page/settings.html.twig +++ b/Sources/src/app/views/Templates/page/settings.html.twig @@ -12,7 +12,7 @@

Paramètres

    -
  1. Accueil
    2. +
  2. Accueil
  3. Paramètres
diff --git a/Sources/src/console/Console.php b/Sources/src/console/Console.php index 7a621934..47327048 100755 --- a/Sources/src/console/Console.php +++ b/Sources/src/console/Console.php @@ -763,7 +763,13 @@ function profileMenu(Model $model) do { $effort = trim(fgets(STDIN)); } while ($effort < 0 || $effort > 5); - $isAddActivity = $model->activityMgr->uploadFile($typeActivity, $effort, $passFile); + try { + $isAddActivity = $model->activityMgr->uploadFile($typeActivity, $effort, $passFile); + + }catch (\Throwable $exception){ + echo $exception; + } + echo $isAddActivity ? "Activité ajoutée avec succès" : "Erreur lors de l'ajout de l'activité"; case '0': return; @@ -793,7 +799,7 @@ while (true) { }*/ break; case '2': // S'inscrire - if($model->userMgr->login("bruce.lee@example.com", "hello321")) + if($model->userMgr->login("bruce.lee@example.com", "password123")) $loggedIn = true; // if (registerUser($model)) { // $loggedIn = true; diff --git a/Sources/src/data/core/AuthService.php b/Sources/src/data/core/AuthService.php deleted file mode 100644 index 4ddfc9fa..00000000 --- a/Sources/src/data/core/AuthService.php +++ /dev/null @@ -1,86 +0,0 @@ -userRepository = $userRepository; - $this->passwordHacher = $passwordHacher; - } - - public function login(string $email, string $password): bool { - $user = $this->userRepository->getItemByEmail($email); - if ($user === null || !$this->validatePassword($password, $user->getPasswordHash())) { - return false; - } - - $this->currentUser = $user; - // Add session handling logic here - return true; - } - - public function register(string $email, string $password, array $data): bool { - if ($this->userRepository->getItemByEmail($email)) { - throw new \Exception('User already exists'); - } - - $hashedPassword = $this->passwordHacher->hashPassword($password); - $prenom = $data['prenom']; - $username = $data['username']; - $nom = $data['nom']; - $email = $data['email']; - $sexe = $data['sexe']; - $taille = $data['taille']; - $poids = $data['poids']; - $dateNaissance = $data['dateNaissance'] ; - $roleName = $data['roleName']; - $role = null; - if($roleName == "Coach"){ - $role = new CoachAthlete(); - } - else if($roleName == "Athlete"){ - $role = new Athlete(); - } - // Create a new user instance (you should expand on this with more data as needed) - $user = new User( - random_int(0, 100), - $nom, - $prenom, - $username, - $email, - $hashedPassword, - $sexe, - $taille, - $poids, - $dateNaissance, - //should use reflexion - $role - ); - $this->userRepository->addItem($user); - $this->currentUser = $user; - // Add session handling logic here - return true; - } - - public function logout(): void { - $this->currentUser = null; - // Add session handling logic here - } - - public function getCurrentUser(): ?User { - return $this->currentUser; - } - - private function validatePassword(string $password, string $hash): bool { - // Implement password validation logic (e.g., using password_verify if using bcrypt) - } -} diff --git a/Sources/src/data/core/Preferences.php b/Sources/src/data/core/Preferences.php index d7d599aa..46513a22 100644 --- a/Sources/src/data/core/Preferences.php +++ b/Sources/src/data/core/Preferences.php @@ -2,15 +2,19 @@ namespace Data\Core; + use Shared\Log; + class Preferences { - private String $cookie; - private Array $theme; + private string $cookie; + private array $theme; public function __construct(){ if (isset($_COOKIE['preferences'])){ $this->cookie = $_COOKIE['preferences']; } else { - $this->cookie = setcookie('preferences', 'base_theme', time()+(3600*24)*7); + if(setcookie('preferences', 'base_theme', time()+(3600*24)*7)){ + $this->cookie = 'base_theme'; + } } $this->theme = array( 'base_theme', @@ -19,7 +23,7 @@ ); } - public function majCookie(String $maj){ + public function majCookie(string $maj){ try{ foreach($this->theme as $t){ $this->cookie = $maj; @@ -30,8 +34,8 @@ } } - public function getCookie():String{ - return $this->cookie; + public function getCookie():string{ + return $this->cookie ?? "base_theme"; } } diff --git a/Sources/src/data/core/database/ActiviteGateway.php b/Sources/src/data/core/database/ActiviteGateway.php deleted file mode 100644 index 853cffa0..00000000 --- a/Sources/src/data/core/database/ActiviteGateway.php +++ /dev/null @@ -1,120 +0,0 @@ -connection = $connection; - } - - public function getActivite() { - $query = "SELECT * FROM Activite"; - return $this->connection->executeWithErrorHandling($query); - } - - public function getActiviteById(int $activiteId) { - $query = "SELECT * FROM Activite WHERE idActivite = :id"; - $params = [':id' => [$activiteId, PDO::PARAM_INT]]; - return $this->connection->executeWithErrorHandling($query, $params); - } - - public function getActiviteByType(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) { - $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) { - $query = "SELECT * FROM Activite WHERE heureDebut >= :startTime AND heureFin <= :endTime"; - $params = [ - ':startTime' => [$startTime, PDO::PARAM_STR], - ':endTime' => [$endTime, PDO::PARAM_STR] - ]; - return $this->connection->executeWithErrorHandling($query, $params); - } - - public function getActiviteByEffort(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) { - $query = "SELECT * FROM Activite WHERE variabilite = :variability"; - $params = [':variability' => [$variabilite, PDO::PARAM_INT]]; - return $this->connection->executeWithErrorHandling($query, $params); - } - - public function getActiviteByTemperature(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) { - $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(), - ':date' => $activite->getDate()->format('Y-m-d'), // Format date pour SQL - ':heureDebut' => $activite->getHeureDebut()->format('H:i:s'), // Format heure pour SQL - ':heureDeFin' => $activite->getHeureFin()->format('H:i:s'), // Format heure pour SQL - ':effortRessenti' => $activite->getEffortRessenti(), - ':variabilite' => $activite->getVariabilite(), - ':variance' => $activite->getVariance(), - ':ecartType' => $activite->getEcartType(), - ':moyenne' => $activite->getMoyenne(), - ':maximum' => $activite->getMaximum(), - ':minimum' => $activite->getMinimum(), - ':temperatureMoyenne' => $activite->getTemperatureMoyenne(), - ]; - - return $this->connection->executeWithErrorHandling($query, $params); - } - - public function updateActivite(ActiviteEntity $oldActivite, ActiviteEntity $newActivite) { - $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(), - ':type' => $newActivite->getType(), - ':date' => $newActivite->getDate()->format('Y-m-d'), // Format date pour SQL - ':heureDebut' => $newActivite->getHeureDebut()->format('H:i:s'), // Format heure pour SQL - ':heureDeFin' => $newActivite->getHeureFin()->format('H:i:s'), // Format heure pour SQL - ':effortRessenti' => $newActivite->getEffortRessenti(), - ':variabilite' => $newActivite->getVariabilite(), - ':variance' => $newActivite->getVariance(), - ':ecartType' => $newActivite->getEcartType(), - ':moyenne' => $newActivite->getMoyenne(), - ':maximum' => $newActivite->getMaximum(), - ':minimum' => $newActivite->getMinimum(), - ':temperatureMoyenne' => $newActivite->getTemperatureMoyenne(), - ]; - - return $this->connection->executeWithErrorHandling($query, $params); - } - - public function deleteActivite(int $idActivite) { - $query = "DELETE FROM Activite WHERE idActivite = :idActivite"; - - $params = [ - ':idActivite' => $idActivite, - ]; - - return $this->connection->executeWithErrorHandling($query, $params); - } -} - -?> diff --git a/Sources/src/data/core/database/ActiviteMapper.php b/Sources/src/data/core/database/ActiviteMapper.php deleted file mode 100644 index d2097e10..00000000 --- a/Sources/src/data/core/database/ActiviteMapper.php +++ /dev/null @@ -1,51 +0,0 @@ -setIdActivite($data['idActivite']); - $activite->setType($data['type']); - $activite->setDate($data['date']); - $activite->setHeureDebut($data['heureDebut']); - $activite->setHeureFin($data['heureFin']); - $activite->setEffortRessenti($data['effortRessenti']); - $activite->setVariabilite($data['variabilite']); - $activite->setVariance($data['variance']); - $activite->setEcartType($data['ecartType']); - $activite->setMoyenne($data['moyenne']); - $activite->setMaximum($data['maximum']); - $activite->setMinimum($data['minimum']); - $activite->setTemperatureMoyenne($data['temperatureMoyenne']); - - return $activite; - } - - //public function ActiviteEntityToModel(ActiviteEntity entity): Activite; - - public function ActiviteEntityToModel(ActiviteEntity $activiteEntity):Activite{ - - $act = new Activite( - $activiteEntity->getIdActivite(), - $activiteEntity->getType(), - $activiteEntity->getDate(), - $activiteEntity->getHeureDebut(), - $activiteEntity->getHeureFin(), - $activiteEntity->getEffortRessenti(), - $activiteEntity->getVariabilite(), - $activiteEntity->getVariance(), - $activiteEntity->getEcartType(), - $activiteEntity->getMoyenne(), - $activiteEntity->getMaximum(), - $activiteEntity->getMinimum(), - $activiteEntity->getTemperatureMoyenne() - ); - - return $act; - } - //public function ActiviteToEntity(Activite model): ActiviteEntity; -} - -?> diff --git a/Sources/src/data/core/database/ActiviteEntity.php b/Sources/src/data/core/database/ActivityEntity.php similarity index 89% rename from Sources/src/data/core/database/ActiviteEntity.php rename to Sources/src/data/core/database/ActivityEntity.php index d392751e..24022c0d 100644 --- a/Sources/src/data/core/database/ActiviteEntity.php +++ b/Sources/src/data/core/database/ActivityEntity.php @@ -2,12 +2,14 @@ namespace Database; -class ActiviteEntity { - private $idActivite; +use DateTime; + +class ActivityEntity { + private $idActivity; private $type; - private $date; - private $heureDebut; - private $heureFin; + private DateTime $date; + private DateTime $heureDebut; + private DateTime $heureFin; private $effortRessenti; private $variabilite; private $variance; @@ -18,7 +20,7 @@ class ActiviteEntity { private $temperatureMoyenne; // Getters - public function getIdActivite() { + public function getIdActivity() { return $this->idActivity; } @@ -42,7 +44,7 @@ class ActiviteEntity { return $this->effortRessenti; } - public function getVariabilite() { + public function getVariability() { return $this->variabilite; } @@ -71,7 +73,7 @@ class ActiviteEntity { } // Setters - public function setIdActivite($idActivity) { + public function setIdActivity($idActivity) { $this->idActivity = $idActivity; } diff --git a/Sources/src/data/core/database/ActivityGateway.php b/Sources/src/data/core/database/ActivityGateway.php new file mode 100644 index 00000000..8cec5ead --- /dev/null +++ b/Sources/src/data/core/database/ActivityGateway.php @@ -0,0 +1,124 @@ +connection = $connection; + } + + public function getActivity() { + $query = "SELECT * FROM Activite"; + return $this->connection->executeWithErrorHandling($query); + } + + public function getActivityById(int $activityId) { + $query = "SELECT * FROM Activite WHERE idActivite = :id"; + $params = [':id' => $activityId]; + return $this->connection->executeWithErrorHandling($query, $params); + } + + 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 getActivityByDate(string $date) { + $query = "SELECT * FROM Activite WHERE date = :date"; + $params = [':date' => [$date, PDO::PARAM_STR]]; + return $this->connection->executeWithErrorHandling($query, $params); + } + + public function getActivityByTimeRange(string $startTime, string $endTime) { + $query = "SELECT * FROM Activite WHERE heureDebut >= :startTime AND heureFin <= :endTime"; + $params = [ + ':startTime' => [$startTime, PDO::PARAM_STR], + ':endTime' => [$endTime, PDO::PARAM_STR] + ]; + return $this->connection->executeWithErrorHandling($query, $params); + } + + 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 getActivityByVariability(int $variabilite) { + $query = "SELECT * FROM Activite WHERE variabilite = :variability"; + $params = [':variability' => [$variabilite, PDO::PARAM_INT]]; + return $this->connection->executeWithErrorHandling($query, $params); + } + + 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 addActivity(ActivityEntity $activity) { + $query = "INSERT INTO Activite (idactivite, type, date, heurededebut, heuredefin, effortressent, variabilite, variance, ecarttype, moyenne, maximum, minimum, temperaturemoyenne, athleteid, sourceid) + VALUES (:idactivite, :type, :date, :heureDebut, :heureDeFin, :effortRessenti, :variabilite, :variance, :ecartType, :moyenne, :maximum, :minimum, :temperatureMoyenne, :athleteid, :sourceid)"; + $params = [ + ':idactivite' => $activity->getIdActivity(), + ':type' => $activity->getType(), + ':date' => $activity->getDate()->format('Y-m-d'), // Format date pour SQL + ':heureDebut' => $activity->getHeureDebut()->format('H:i:s'), // Format heure pour SQL + ':heureDeFin' => $activity->getHeureFin()->format('H:i:s'), // Format heure pour SQL + ':effortRessenti' => $activity->getEffortRessenti(), + ':variabilite' => $activity->getVariability(), + ':variance' => $activity->getVariance(), + ':ecartType' => $activity->getEcartType(), + ':moyenne' => $activity->getMoyenne(), + ':maximum' => $activity->getMaximum(), + ':minimum' => $activity->getMinimum(), + ':temperatureMoyenne' => $activity->getTemperatureMoyenne(), + ':athleteid' => 1, + ':sourceid' => 1, + ]; + + return $this->connection->executeWithErrorHandling($query, $params); + } + + 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' => $oldActivity->getIdActivity(), + ':type' => $newActivity->getType(), + ':date' => $newActivity->getDate()->format('Y-m-d'), // Format date pour SQL + ':heureDebut' => $newActivity->getHeureDebut()->format('H:i:s'), // Format heure pour SQL + ':heureDeFin' => $newActivity->getHeureFin()->format('H:i:s'), // Format heure pour SQL + ':effortRessenti' => $newActivity->getEffortRessenti(), + ':variabilite' => $newActivity->getVariabilite(), + ':variance' => $newActivity->getVariance(), + ':ecartType' => $newActivity->getEcartType(), + ':moyenne' => $newActivity->getMoyenne(), + ':maximum' => $newActivity->getMaximum(), + ':minimum' => $newActivity->getMinimum(), + ':temperatureMoyenne' => $newActivity->getTemperatureMoyenne(), + ]; + + return $this->connection->executeWithErrorHandling($query, $params); + } + + public function deleteActivity(int $idActivity) { + $query = "DELETE FROM Activite WHERE idActivite = :idActivity"; + + $params = [ + ':idActivity' => $idActivity, + ]; + + return $this->connection->executeWithErrorHandling($query, $params); + } +} + +?> diff --git a/Sources/src/data/core/database/ActivityMapper.php b/Sources/src/data/core/database/ActivityMapper.php new file mode 100644 index 00000000..8c6f890f --- /dev/null +++ b/Sources/src/data/core/database/ActivityMapper.php @@ -0,0 +1,126 @@ +setIdActivity($activityData['idActivite']); + } + + if (isset($activityData['type'])) { + $activity->setType($activityData['type']); + } + +// if (isset($activityData['date'])) { +// $activity->setDate(DateTime::createFromFormat('yyyy-mm--dd',$activityData['date'])); +// } + + if (isset($activityData['heureDeDebut'])) { + $activity->setHeureDebut(new DateTime($activityData['heureDeDebut'])); + } + + if (isset($activityData['heureDeFin'])) { + $activity->setHeureFin(new DateTime($activityData['heureDeFin'])); + } + + if (isset($activityData['effortRessent'])) { + $activity->setEffortRessenti($activityData['effortRessent']); + } + + if (isset($activityData['variabilite'])) { + $activity->setVariabilite($activityData['variabilite']); + } + + if (isset($activityData['variance'])) { + $activity->setVariance($activityData['variance']); + } + + if (isset($activityData['ecartType'])) { + $activity->setEcartType($activityData['ecartType']); + } + + if (isset($activityData['moyenne'])) { + $activity->setMoyenne($activityData['moyenne']); + } + + if (isset($activityData['maximum'])) { + $activity->setMaximum($activityData['maximum']); + } + + if (isset($activityData['minimum'])) { + $activity->setMinimum($activityData['minimum']); + } + + if (isset($activityData['temperatureMoyenne'])) { + $activity->setTemperatureMoyenne($activityData['temperatureMoyenne']); + } + + $activityEntities[] = $activity; + } + Log::dd($activityEntities); + return $activityEntities; + } + + /** + * @throws \Exception + */ + public function ActivityEntityToModel(ActivityEntity $activiteEntity):Activity { + $date = new DateTime($activiteEntity->getDate()); + $heureDebut = new \DateTime($activiteEntity->getHeureDebut()); + $heureFin = new \DateTime($activiteEntity->getHeureFin()); + $effortRessenti = intval($activiteEntity->getEffortRessenti()); + $variability = floatval($activiteEntity->getVariability()); + $variance = floatval($activiteEntity->getVariance()); + $ecartType = floatval($activiteEntity->getEcartType()); + + $act = new Activity( + $activiteEntity->getType(), + $date, + $heureDebut, + $heureFin, + $effortRessenti, + $variability, + $variance, + $ecartType, + $activiteEntity->getMoyenne(), + $activiteEntity->getMaximum(), + $activiteEntity->getMinimum(), + $activiteEntity->getTemperatureMoyenne(), + 'false' + ); + + return $act; + } + //public function ActivityToEntity(Activity model): ActivityEntity; + + public function activityToEntity(Activity $act):ActivityEntity{ + $actEntity = new ActivityEntity(); + $actEntity->setIdActivity($act->getIdActivity()); + $actEntity->setType($act->getType()); + $actEntity->setDate($act->getDate()); + $actEntity->setHeureDebut($act->getHeureDebut()); + $actEntity->setHeureFin($act->getHeureFin()); + $actEntity->setEffortRessenti($act->getEffortRessenti()); + $actEntity->setVariabilite($act->getVariability()); + $actEntity->setVariance($act->getVariance()); + $actEntity->setEcartType($act->getStandardDeviation()); + $actEntity->setMoyenne($act->getAverage()); + $actEntity->setMaximum($act->getMaximum()); + $actEntity->setMinimum($act->getMinimum()); + $actEntity->setTemperatureMoyenne($act->getAvrTemperature()); + + return $actEntity; + } +} + +?> diff --git a/Sources/src/data/core/database/AnalyzeEntity.php b/Sources/src/data/core/database/AnalyzeEntity.php new file mode 100644 index 00000000..4560f7b7 --- /dev/null +++ b/Sources/src/data/core/database/AnalyzeEntity.php @@ -0,0 +1,79 @@ +idFc; + } + public function getAltitude() + { + return $this->altitude; + } + public function getTime() + { + return $this->temps; + } + public function getTemperature() + { + return $this->temperature; + } + public function getBpm() + { + return $this->bpm; + } + public function getLongitude() + { + return $this->longitude; + } + public function getLatitude() + { + return $this->latitude; + } + public function getIdActivity() + { + return $this->idactivity; + } + public function setIdFC($idFc) + { + $this->idFc = $idFc; + } + public function setAltitude($altitude) + { + $this->altitude = $altitude; + } + public function setTime($time) + { + $this->time = $time; + } + public function setTemperature($temperature) + { + $this->temperature = $temperature; + } + public function setBpm($bpm) + { + $this->bpm = $bpm; + } + public function setLongitude($longitude) + { + $this->longitude = $longitude; + } + public function setLatitude($latitude) + { + $this->latitude = $latitude; + } + public function setIdActivity($idactivity) + { + $this->idactivity = $idactivity; + } +} \ No newline at end of file diff --git a/Sources/src/data/core/database/AnalyzeGateway.php b/Sources/src/data/core/database/AnalyzeGateway.php new file mode 100644 index 00000000..7dd7666a --- /dev/null +++ b/Sources/src/data/core/database/AnalyzeGateway.php @@ -0,0 +1,24 @@ +connection = $connection; + } + + public function getFrequenceCardiaque() { + $query = "SELECT * FROM FrequenceCardiaque"; + return $this->connection->executeWithErrorHandling($query); + } + public function getFrequenceCardiaqueByIdActivity(int $activityId) + { + $query = "SELECT * FROM FrequenceCardiaque WHERE activiteid = :id"; + $params = [':id' => $activityId]; + return $this->connection->executeWithErrorHandling($query, $params); + } + +} \ No newline at end of file diff --git a/Sources/src/data/core/database/AnalyzeMapper.php b/Sources/src/data/core/database/AnalyzeMapper.php new file mode 100644 index 00000000..33077162 --- /dev/null +++ b/Sources/src/data/core/database/AnalyzeMapper.php @@ -0,0 +1,125 @@ +setIdActivity($analyzeData['idactivite']); + } + + if (isset($analyzeData['type'])) { + $analyze->setType($analyzeData['type']); + } + + if (isset($analyzeData['date'])) { + $analyze->setDate($analyzeData['date']); + } + + if (isset($analyzeData['heurededebut'])) { + $analyze->setHeureDebut($analyzeData['heurededebut']); + } + + if (isset($analyzeData['heuredefin'])) { + $analyze->setHeureFin($analyzeData['heuredefin']); + } + + if (isset($analyzeData['effortressent'])) { + $analyze->setEffortRessenti($analyzeData['effortressent']); + } + + if (isset($analyzeData['variabilite'])) { + $analyze->setVariabilite($analyzeData['variabilite']); + } + + if (isset($analyzeData['variance'])) { + $analyze->setVariance($analyzeData['variance']); + } + + if (isset($analyzeData['ecarttype'])) { + $analyze->setEcartType($analyzeData['ecarttype']); + } + + if (isset($analyzeData['moyenne'])) { + $analyze->setMoyenne($analyzeData['moyenne']); + } + + if (isset($analyzeData['maximum'])) { + $analyze->setMaximum($analyzeData['maximum']); + } + + if (isset($analyzeData['minimum'])) { + $analyze->setMinimum($analyzeData['minimum']); + } + + if (isset($analyzeData['temperaturemoyenne'])) { + $analyze->setTemperatureMoyenne($analyzeData['temperaturemoyenne']); + } + + $analyzeEntities[] = $analyze; + } + return $analyzeEntities; + } + + /** + * @throws \Exception + */ +// public function ActivityEntityToModel(ActivityEntity $activiteEntity):Activity { +// $date = new DateTime($activiteEntity->getDate()); +// $heureDebut = new \DateTime($activiteEntity->getHeureDebut()); +// $heureFin = new \DateTime($activiteEntity->getHeureFin()); +// $effortRessenti = intval($activiteEntity->getEffortRessenti()); +// $variability = floatval($activiteEntity->getVariability()); +// $variance = floatval($activiteEntity->getVariance()); +// $ecartType = floatval($activiteEntity->getEcartType()); +// +// $act = new Activity( +// $activiteEntity->getIdActivity(), +// $activiteEntity->getType(), +// $date, +// $heureDebut, +// $heureFin, +// $effortRessenti, +// $variability, +// $variance, +// $ecartType, +// $activiteEntity->getMoyenne(), +// $activiteEntity->getMaximum(), +// $activiteEntity->getMinimum(), +// $activiteEntity->getTemperatureMoyenne(), +// 'false' +// ); +// +// return $act; +// } + //public function ActivityToEntity(Activity model): ActivityEntity; + +// public function activityToEntity( $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->getVariability()); +// $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; +// } +} \ No newline at end of file diff --git a/Sources/src/data/core/database/AthleteEntity.php b/Sources/src/data/core/database/AthleteEntity.php index 812543c8..6711b5c6 100644 --- a/Sources/src/data/core/database/AthleteEntity.php +++ b/Sources/src/data/core/database/AthleteEntity.php @@ -6,12 +6,14 @@ class AthleteEntity { private $idAthlete; private $nom; private $prenom; + private $username; private $email; private $sexe; private $taille; private $poids; private $motDePasse; private $dateNaissance; + private $isCoach; // Getters public function getIdAthlete() { @@ -26,6 +28,10 @@ class AthleteEntity { return $this->prenom; } + public function getUsername(){ + return $this->username; + } + public function getEmail() { return $this->email; } @@ -50,6 +56,11 @@ class AthleteEntity { return $this->dateNaissance; } + public function getIsCoach(){ + return $this->isCoach; + } + + // Setters public function setIdAthlete($idAthlete) { $this->idAthlete = $idAthlete; @@ -63,6 +74,10 @@ class AthleteEntity { $this->prenom = $prenom; } + public function setUsername($username){ + $this->username = $username; + } + public function setEmail($email) { $this->email = $email; } @@ -86,6 +101,10 @@ class AthleteEntity { public function setDateNaissance($dateNaissance) { $this->dateNaissance = $dateNaissance; } + + public function setIsCoach($isCoach){ + $this->isCoach = $isCoach; + } } ?> diff --git a/Sources/src/data/core/database/AthleteGateway.php b/Sources/src/data/core/database/AthleteGateway.php index 7b2dc45e..244f3748 100644 --- a/Sources/src/data/core/database/AthleteGateway.php +++ b/Sources/src/data/core/database/AthleteGateway.php @@ -2,70 +2,131 @@ 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() { - $query = "SELECT * FROM Athlete"; - return $this->connection->executeWithErrorHandling($query); + public function getAthlete(): array + { + $query = "SELECT * FROM Athlete WHERE isCoach=FALSE"; + $res = $this->connection->executeWithErrorHandling($query); + return $res; } - public function getAthleteById(int $userId) { - $query = "SELECT * FROM Athlete WHERE idAthlete = :id"; - $params = [':id' => [$userId, PDO::PARAM_INT]]; - return $this->connection->executeWithErrorHandling($query, $params); + public function getAthleteById(int $userId): array + { + $query = "SELECT * FROM Athlete WHERE idAthlete = :id AND isCoach=FALSE"; + $params = [':id' => $userId]; +// log::dd($params); + $res = $this->connection->executeWithErrorHandling($query, $params); + return $res; } - public function getAthleteByName(string $name) { - $query = "SELECT * FROM Athlete WHERE nom = :name"; - $params = [':name' => [$name, PDO::PARAM_STR]]; + public function getAthleteByName(string $name): array + { + $query = "SELECT * FROM Athlete WHERE nom = :name AND isCoach=FALSE"; + $params = [':name' => $name]; return $this->connection->executeWithErrorHandling($query, $params); } - public function getAthleteByFirstName(string $firstName) { - $query = "SELECT * FROM Athlete WHERE prenom = :firstName"; - $params = [':firstName' => [$firstName, PDO::PARAM_STR]]; + public function getAthleteByFirstName(string $firstName): array + { + $query = "SELECT * FROM Athlete WHERE prenom = :firstName AND isCoach=FALSE"; + $params = [':firstName' => $firstName]; return $this->connection->executeWithErrorHandling($query, $params); } - public function getAthleteByEmail(string $email) { + public function getAthleteByEmail(string $email): array + { + $query = "SELECT * FROM Athlete WHERE email = :email AND isCoach=FALSE"; + $params = [':email' => $email]; + return $this->connection->executeWithErrorHandling($query, $params); + } + public function getUserByEmail(string $email): array + { $query = "SELECT * FROM Athlete WHERE email = :email"; - $params = [':email' => [$email, PDO::PARAM_STR]]; + $params = [':email' => $email]; return $this->connection->executeWithErrorHandling($query, $params); } - public function getAthleteByGender(string $gender) { - $query = "SELECT * FROM Athlete WHERE sexe = :gender"; - $params = [':gender' => [$gender, PDO::PARAM_STR]]; + public function getAthleteByGender(string $gender): array + { + $query = "SELECT * FROM Athlete WHERE sexe = :gender AND isCoach=FALSE"; + $params = [':gender' => $gender]; return $this->connection->executeWithErrorHandling($query, $params); } - public function getAthleteByHeight(int $height) { - $query = "SELECT * FROM Athlete WHERE taille = :height"; + public function getAthleteByHeight(int $height): array + { + $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) { - $query = "SELECT * FROM Athlete WHERE poids = :weight"; + public function getAthleteByWeight(int $weight): array + { + $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) { - $query = "SELECT * FROM Athlete WHERE dateNaissance = :birthdate"; + public function getAthleteByBirthDate(string $birthdate): array + { + $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) { - $query = "INSERT INTO Athlete (nom, prenom, email, sexe, taille, poids, motDePasse, dateNaissance) - VALUES (:nom, :prenom, :email, :sexe, :taille, :poids, :motDePasse, :dateNaissance)"; + public function getListIdFriends(int $idAthlete): array + { + $query = "SELECT idAthlete1, idAthlete2 FROM Friendship WHERE idAthlete1 = :idAthlete OR idAthlete2= :idAthlete"; + + $params = [ + ':idAthlete' => $idAthlete, + ]; + + return $this->connection->executeWithErrorHandling($query, $params); + } + + public function getListActivity(int $idAthlete): array + { + /*$query = "SELECT count(ac.idActivite) AS nbActivite, EXTRACT(MONTH FROM ac.date) AS mois + FROM Athlete at, Activite ac + WHERE at.idAthlete = :idAthlete + AND ac.date > CURRENT_DATE - INTERVAL '1 YEAR' + AND ac.athleteId = at.idAthlete + GROUP BY mois";*/ + + $query = "SELECT COUNT(ac.idActivite) AS nbActivite, EXTRACT(MONTH FROM ac.date) AS mois + FROM Athlete at + JOIN Activite ac ON ac.athleteId = at.idAthlete + WHERE at.idAthlete = :idAthlete + AND ac.date > CURRENT_DATE - INTERVAL 1 YEAR + GROUP BY mois"; +// $query = "SELECT count(ac.idActivite) AS nbActivite, EXTRACT(MONTH FROM ac.date) AS mois +// FROM Athlete at, Activite ac +// WHERE at.idAthlete = :idAthlete +// AND ac.date > CURRENT_DATE - INTERVAL '1 YEAR' +// AND ac.athleteId = at.idAthlete +// GROUP BY mois"; + + $params = [ + ':idAthlete' => $idAthlete, + ]; + + return $this->connection->executeWithErrorHandling($query, $params); + } + + + public function addAthlete(AthleteEntity $athlete): array + { + $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(), @@ -75,20 +136,23 @@ class AthleteGateway { ':taille' => $athlete->getTaille(), ':poids' => $athlete->getPoids(), ':motDePasse' => $athlete->getMotDePasse(), - ':dateNaissance' => $athlete->getDateNaissance(), + ':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 + SET username = :username, nom = :nom, prenom = :prenom, email = :email, sexe = :sexe, + taille = :taille, poids = :poids, motDePasse = :motDePasse, dateNaissance = :dateNaissance, isCoach = :isCoach WHERE idAthlete = :idAthlete"; $params = [ ':idAthlete' => $oldAthlete->getIdAthlete(), + ':username' => $newAthlete->getUsername(), ':nom' => $newAthlete->getNom(), ':prenom' => $newAthlete->getPrenom(), ':email' => $newAthlete->getEmail(), @@ -96,13 +160,15 @@ class AthleteGateway { ':taille' => $newAthlete->getTaille(), ':poids' => $newAthlete->getPoids(), ':motDePasse' => $newAthlete->getMotDePasse(), - ':dateNaissance' => $newAthlete->getDateNaissance(), + ':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 = [ diff --git a/Sources/src/data/core/database/AthleteMapper.php b/Sources/src/data/core/database/AthleteMapper.php index 16f5f0be..265109c0 100644 --- a/Sources/src/data/core/database/AthleteMapper.php +++ b/Sources/src/data/core/database/AthleteMapper.php @@ -6,14 +6,14 @@ 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'])) { $athlete->setIdAthlete($athleteData['idAthlete']); } @@ -26,6 +26,10 @@ class AthleteMapper { $athlete->setPrenom($athleteData['prenom']); } + if (isset($athleteData['username'])) { + $athlete->setUsername($athleteData['username']); + } + if (isset($athleteData['email'])) { $athlete->setEmail($athleteData['email']); } @@ -50,6 +54,10 @@ class AthleteMapper { $athlete->setDateNaissance($athleteData['dateNaissance']); } + if (isset($athleteData['isCoach'])) { + $athlete->setIsCoach($athleteData['isCoach']); + } + $athleteEntities[] = $athlete; } @@ -58,19 +66,19 @@ class AthleteMapper { public function athleteEntityToModel(AthleteEntity $athleteEntity): User { $role = new Athlete(); // Utilisez la classe Athlete - - $dateSpecifique = $athleteEntity->getDateNaissance(); - $date = new DateTime($dateSpecifique); + $date = new DateTime($athleteEntity->getDateNaissance()); + $poids = floatval($athleteEntity->getPoids()); + $taille = floatval($athleteEntity->getTaille()); $user = new User( - $athleteEntity->getIdAthlete(), $athleteEntity->getNom(), $athleteEntity->getPrenom(), + $athleteEntity->getUsername(), $athleteEntity->getEmail(), $athleteEntity->getMotDePasse(), $athleteEntity->getSexe(), - $athleteEntity->getTaille(), - $athleteEntity->getPoids(), + $taille, + $poids, $date, $role ); @@ -84,12 +92,15 @@ class AthleteMapper { $ath->setIdAthlete($user->getId()); $ath->setNom($user->getNom()); $ath->setPrenom($user->getPrenom()); + $ath->setUsername($user->getUsername()); $ath->setEmail($user->getEmail()); $ath->setSexe($user->getSexe()); $ath->setTaille($user->getTaille()); $ath->setPoids($user->getPoids()); $ath->setMotDePasse($user->getMotDePasse()); $ath->setDateNaissance($user->getDateNaissance()); + $ath->setIsCoach(FALSE); + $ath->setCoachId(NULL); return $ath; } diff --git a/Sources/src/data/core/database/CoachEntity.php b/Sources/src/data/core/database/CoachEntity.php index 03af8b1c..84b0f4dc 100644 --- a/Sources/src/data/core/database/CoachEntity.php +++ b/Sources/src/data/core/database/CoachEntity.php @@ -6,12 +6,14 @@ class CoachEntity { private $idCoach; private $nom; private $prenom; + private $username; private $email; private $sexe; private $taille; private $poids; private $motDePasse; private $dateNaissance; + private $isCoach; // Getters public function getIdCoach() { @@ -26,6 +28,10 @@ class CoachEntity { return $this->prenom; } + public function getUsername(){ + return $this->username; + } + public function getEmail() { return $this->email; } @@ -50,6 +56,11 @@ class CoachEntity { return $this->dateNaissance; } + public function getIsCoach(){ + return $this->isCoach; + } + + // Setters public function setIdCoach($idCoach) { $this->idCoach = $idCoach; @@ -63,6 +74,10 @@ class CoachEntity { $this->prenom = $prenom; } + public function setUsername($username){ + $this->username = $username; + } + public function setEmail($email) { $this->email = $email; } @@ -86,6 +101,11 @@ class CoachEntity { public function setDateNaissance($dateNaissance) { $this->dateNaissance = $dateNaissance; } + + public function setIsCoach($isCoach){ + $this->isCoach = $isCoach; + } + } ?> diff --git a/Sources/src/data/core/database/CoachGateway.php b/Sources/src/data/core/database/CoachGateway.php index 5f795799..63fc9875 100644 --- a/Sources/src/data/core/database/CoachGateway.php +++ b/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) { - $query = "SELECT * FROM Coach WHERE nom = :name"; + public function getAthleteByCoachId(int $coachId): array + { + $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) { - $query = "SELECT * FROM Coach WHERE prenom = :firstName"; + public function getCoachByFirstName(string $firstName): array + { + $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) { - $query = "SELECT * FROM Coach WHERE email = :email"; + public function getCoachByEmail(string $email): array + { + $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) { - $query = "SELECT * FROM Coach WHERE sexe = :gender"; + public function getCoachByGender(string $gender): array + { + $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) { - $query = "SELECT * FROM Coach WHERE taille = :height"; + public function getCoachByHeight(int $height): array + { + $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) { - $query = "SELECT * FROM Coach WHERE dateNaissance = :birthdate"; + public function getCoachByBirthDate(string $birthdate): array + { + $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) { - $query = "INSERT INTO Coach (nom, prenom, email, sexe, taille, poids, motDePasse, dateNaissance) - VALUES (:nom, :prenom, :email, :sexe, :taille, :poids, :motDePasse, :dateNaissance)"; + public function addCoach(CoachEntity $coach): array + { + $query = "INSERT INTO Coach (athleteId) + VALUES (:athleteId)"; $params = [ - ':nom' => $coach->getNom(), - ':prenom' => $coach->getPrenom(), - ':email' => $coach->getEmail(), - ':sexe' => $coach->getSexe(), - ':taille' => $coach->getTaille(), - ':poids' => $coach->getPoids(), - ':motDePasse' => $coach->getMotDePasse(), - ':dateNaissance' => $coach->getDateNaissance(), + ':athleteId' => $coach->getAthleteId(), ]; 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, - taille = :taille, poids = :poids, motDePasse = :motDePasse, dateNaissance = :dateNaissance + SET athleteId = :athleteId WHERE idCoach = :idCoach"; $params = [ ':idCoach' => $oldCoach->getIdCoach(), - ':nom' => $newCoach->getNom(), - ':prenom' => $newCoach->getPrenom(), - ':email' => $newCoach->getEmail(), - ':sexe' => $newCoach->getSexe(), - ':taille' => $newCoach->getTaille(), - ':poids' => $newCoach->getPoids(), - ':motDePasse' => $newCoach->getMotDePasse(), - ':dateNaissance' => $newCoach->getDateNaissance(), + ':athleteId' => $newCoach->getAthleteId(), ]; 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 = [ diff --git a/Sources/src/data/core/database/CoachMapper.php b/Sources/src/data/core/database/CoachMapper.php index 76284918..79d3b21a 100644 --- a/Sources/src/data/core/database/CoachMapper.php +++ b/Sources/src/data/core/database/CoachMapper.php @@ -1,41 +1,85 @@ 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; + public function coachSqlToEntity(array $data): array { + $coachEntities = []; + + foreach ($data as $coachData) { + $coach = new CoachEntity(); + + if (isset($coachData['idAthlete'])) { + $coach->setIdCoach($coachData['idAthlete']); + } + + if (isset($coachData['nom'])) { + $coach->setNom($coachData['nom']); + } + + if (isset($coachData['prenom'])) { + $coach->setPrenom($coachData['prenom']); + } + + if (isset($coachData['username'])) { + $coach->setUsername($coachData['username']); + } + + if (isset($coachData['email'])) { + $coach->setEmail($coachData['email']); + } + + if (isset($coachData['sexe'])) { + $coach->setSexe($coachData['sexe']); + } + + if (isset($coachData['taille'])) { + $coach->setTaille($coachData['taille']); + } + + if (isset($coachData['poids'])) { + $coach->setPoids($coachData['poids']); + } + + if (isset($coachData['motDePasse'])) { + $coach->setMotDePasse($coachData['motDePasse']); + } + + if (isset($coachData['dateNaissance'])) { + $coach->setDateNaissance($coachData['dateNaissance']); + } + + if (isset($coachData['isCoach'])) { + $coach->setIsCoach($coachData['isCoach']); + } + + $coachEntities[] = $coach; + } + + return $coachEntities; } public function CoachEntityToModel(CoachEntity $coachEntity):User{ - $role = "Coach"; + $role = new CoachAthlete(); + $date = new DateTime($coachEntity->getDateNaissance()); $user = new User( - $coachEntity->getIdCoach(), $coachEntity->getNom(), $coachEntity->getPrenom(), + $coachEntity->getUsername(), $coachEntity->getEmail(), $coachEntity->getMotDePasse(), $coachEntity->getSexe(), $coachEntity->getTaille(), $coachEntity->getPoids(), - $coachEntity->getDateNaissance(), + $date, $role ); @@ -46,17 +90,10 @@ class CoachMapper { $coach = new CoachEntity(); $coach->setIdCoach($user->getId()); - $coach->setNom($user->getNom()); - $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()); + $coach->setAthleteId($user->getId()); return $coach; } } - ?> + diff --git a/Sources/src/data/core/database/Connexion.php b/Sources/src/data/core/database/Connexion.php index 9a03267b..1b3d898c 100644 --- a/Sources/src/data/core/database/Connexion.php +++ b/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,11 @@ 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) { - // $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); diff --git a/Sources/src/data/core/database/EntrainementEntity.php b/Sources/src/data/core/database/EntrainementEntity.php new file mode 100644 index 00000000..82340c2c --- /dev/null +++ b/Sources/src/data/core/database/EntrainementEntity.php @@ -0,0 +1,71 @@ +idEntrainement; + } + public function getDate() + { + return $this->date; + } + public function getDescription() + { + return $this->description; + } + public function getLatitude() + { + return $this->latitude; + } + public function getLongitude() + { + return $this->longitude; + } + public function getFeedback() + { + return $this->feedback; + } + public function getCoachId() + { + return $this->coachId; + } + public function setIdEntrainement($idEntrainement) + { + $this->idEntrainement = $idEntrainement; + } + public function setDate($date) + { + $this->date = $date; + } + public function setDescription($description) + { + $this->description = $description; + } + public function setLatitude($latitude) + { + $this->latitude = $latitude; + } + public function setLongitude($longitude) + { + $this->longitude = $longitude; + } + public function setFeedback($feedback) + { + $this->feedback = $feedback; + } + public function setCoachId($coachId) + { + $this->coachId = $coachId; + } +} \ No newline at end of file diff --git a/Sources/src/data/core/database/EntrainementGateway.php b/Sources/src/data/core/database/EntrainementGateway.php new file mode 100644 index 00000000..b0b5bf3a --- /dev/null +++ b/Sources/src/data/core/database/EntrainementGateway.php @@ -0,0 +1,21 @@ +connection = $connection; + } + + public function getEntrainements(): array + { + $query = "SELECT * FROM Entrainement"; + $res = $this->connection->executeWithErrorHandling($query); + return $res; + } +} \ No newline at end of file diff --git a/Sources/src/data/core/database/EntrainementMapper.php b/Sources/src/data/core/database/EntrainementMapper.php new file mode 100644 index 00000000..25911d7f --- /dev/null +++ b/Sources/src/data/core/database/EntrainementMapper.php @@ -0,0 +1,82 @@ +setIdEntrainement($entrainementData['identrainement']); + } + + if (isset($entrainementData['date'])) { + $entrainement->setDate($entrainementData['date']); + } + + if (isset($entrainementData['description'])) { + $entrainement->setDescription($entrainementData['description']); + } + + if (isset($entrainementData['latitude'])) { + $entrainement->setLatitude($entrainementData['latitude']); + } + + if (isset($entrainementData['longitude'])) { + $entrainement->setLongitude($entrainementData['longitude']); + } + + if (isset($entrainementData['feedback'])) { + $entrainement->setFeedback($entrainementData['feedback']); + } + + if (isset($entrainementData['athleteid'])) { + $entrainement->setCoachId($entrainementData['athleteid']); + } + + $entrainementEntities[] = $entrainement; + } + + return $entrainementEntities; + } + + public function entrainementEntityToModel(EntrainementEntity $entrainementEntity): Training { + $date = new DateTime($entrainementEntity->getDate()); + $idTraining = intval($entrainementEntity->getIdEntrainement()); + $latitude = floatval($entrainementEntity->getLatitude()); + $longitude = floatval($entrainementEntity->getLongitude()); + + return new Training( + $idTraining, + $date, + $latitude, + $longitude, + $entrainementEntity->getDescription(), + $entrainementEntity->getFeedback() + ); + } + + public function entrainementToEntity(Training $training):EntrainementEntity{ + + $train = new EntrainementEntity(); + $train->setIdEntrainement($training->getId()); + $train->setDate($training->getDate()); + $train->setDescription($training->getDescription()); + $train->setLatitude($training->getLatitude()); + $train->setLongitude($training->getLongitude()); + $train->setFeedback($training->getFeedback()); + $train->setCoachId(1); + + return $train; + } +} \ No newline at end of file diff --git a/Sources/src/data/core/database/NotificationEntity.php b/Sources/src/data/core/database/NotificationEntity.php new file mode 100644 index 00000000..69ecfbf9 --- /dev/null +++ b/Sources/src/data/core/database/NotificationEntity.php @@ -0,0 +1,64 @@ +idNotif; + } + public function getMessage() + { + return $this->message; + } + public function getDate() + { + return $this->date; + } + public function getStatut() + { + return $this->statut; + } + public function getUrgence() + { + return $this->urgence; + } + public function getIdAthlete() + { + return $this->idAthlete; + } + public function setIdNotif($idNotif) + { + $this->idNotif = $idNotif; + } + public function setMessage($message) + { + $this->message = $message; + } + public function setDate($date) + { + $this->date = $date; + } + public function setStatut($statut) + { + $this->statut = $statut; + } + public function setUrgence($urgence) + { + $this->urgence = $urgence; + } + public function setIdAthlete($idAthlete) + { + $this->idAthlete = $idAthlete; + } +} \ No newline at end of file diff --git a/Sources/src/data/core/database/NotificationGateway.php b/Sources/src/data/core/database/NotificationGateway.php new file mode 100644 index 00000000..c1050ab9 --- /dev/null +++ b/Sources/src/data/core/database/NotificationGateway.php @@ -0,0 +1,27 @@ +connection = $connection; + } + + public function getNotifications(): array + { + $query = "SELECT * FROM Notification"; + $res = $this->connection->executeWithErrorHandling($query); + return $res; + } + + public function addNotification(NotificationEntity $notif){ + $query = "INSERT INTO Notification (message, date, statut, urgence, athleteid) VALUES (:message, :date, :statut, :urgence, :idAthlete)"; + $params = [':message'=>$notif->getMessage(), ':date'=>$notif->getDate(), ':statut'=>$notif->getStatut(), ':urgence'=>$notif->getUrgence(), ':idAthlete'=>$notif->getIdAthlete()]; + return $this->connection->executeWithErrorHandling($query, $params); + } +} \ No newline at end of file diff --git a/Sources/src/data/core/database/NotificationMapper.php b/Sources/src/data/core/database/NotificationMapper.php new file mode 100644 index 00000000..51622e96 --- /dev/null +++ b/Sources/src/data/core/database/NotificationMapper.php @@ -0,0 +1,74 @@ +setIdNotif($notificationData['idnotif']); + } + + if (isset($notificationData['message'])) { + $notification->setMessage($notificationData['message']); + } + + if (isset($notificationData['date'])) { + $notification->setDate($notificationData['date']); + } + + if (isset($notificationData['statut'])) { + $notification->setStatut($notificationData['statut']); + } + + if (isset($notificationData['urgence'])) { + $notification->setUrgence($notificationData['urgence']); + } + + if (isset($notificationData['athleteid'])) { + $notification->setIdAthlete($notificationData['athleteid']); + } + + $notificationEntities[] = $notification; + } + + return $notificationEntities; + } + + public function notificationEntityToModel(NotificationEntity $notificationEntity): Notification + { + $date = new DateTime($notificationEntity->getDate()); + return new Notification( + $notificationEntity->getIdNotif(), + $notificationEntity->getMessage(), + $date, + $notificationEntity->getStatut(), + $notificationEntity->getUrgence(), + $notificationEntity->getIdAthlete() + ); + } + + public function notificationToEntity(Notification $notification): NotificationEntity + { + $notif = new NotificationEntity(); + $notif->setIdNotif($notification->getId()); + $notif->setMessage($notification->getMessage()); + $notif->setDate($notification->getDate()->format('Y-m-d H:i:s')); + $notif->setStatut($notification->getStatut()); + $notif->setUrgence($notification->getUrgence()); + $notif->setIdAthlete($notification->getToUserId()); + + return $notif; + } +} \ No newline at end of file diff --git a/Sources/src/data/core/database/UserGateway.php b/Sources/src/data/core/database/UserGateway.php new file mode 100644 index 00000000..1d73330e --- /dev/null +++ b/Sources/src/data/core/database/UserGateway.php @@ -0,0 +1,97 @@ +connection = $connection; + } + + public function getUsers(): array + { + $query = "SELECT * FROM Athlete"; + $res = $this->connection->executeWithErrorHandling($query); + return $res; + } + + public function getUserById(int $userId): array + { + $query = "SELECT * FROM Athlete WHERE idAthlete = :id"; + $params = [':id' => $userId]; + $res = $this->connection->executeWithErrorHandling($query, $params); + return $res; + } + + public function getUserByName(string $name): array + { + $query = "SELECT * FROM Athlete WHERE nom = :name"; + $params = [':name' => $name]; + return $this->connection->executeWithErrorHandling($query, $params); + } + + public function getUserByFirstName(string $firstName): array + { + $query = "SELECT * FROM Athlete WHERE prenom = :firstName"; + $params = [':firstName' => $firstName]; + return $this->connection->executeWithErrorHandling($query, $params); + } + + public function getUserByEmail(string $email): array + { + $query = "SELECT * FROM Athlete WHERE email = :email"; + $params = [':email' => $email]; + return $this->connection->executeWithErrorHandling($query, $params); + } + + public function getUserByGender(string $gender): array + { + $query = "SELECT * FROM Athlete WHERE sexe = :gender"; + $params = [':gender' => $gender]; + return $this->connection->executeWithErrorHandling($query, $params); + } + + public function getUserByHeight(int $height): array + { + $query = "SELECT * FROM Athlete WHERE taille = :height"; + $params = [':height' => [$height, PDO::PARAM_INT]]; + return $this->connection->executeWithErrorHandling($query, $params); + } + + public function getUserByWeight(int $weight): array + { + $query = "SELECT * FROM Athlete WHERE poids = :weight"; + $params = [':weight' => [$weight, PDO::PARAM_INT]]; + return $this->connection->executeWithErrorHandling($query, $params); + } + + public function getUserByBirthDate(string $birthdate): array + { + $query = "SELECT * FROM Athlete WHERE dateNaissance = :birthdate"; + $params = [':birthdate' => [$birthdate, PDO::PARAM_STR]]; + return $this->connection->executeWithErrorHandling($query, $params); + } + + public function deleteUserById(int $idAthlete): array + { + $query = "DELETE FROM Athlete WHERE idAthlete = :idAthlete"; + + $params = [ + ':idAthlete' => $idAthlete, + ]; + + return $this->connection->executeWithErrorHandling($query, $params); + } + public function deleteUserByEmail(string $email): array + { + $query = "DELETE FROM Athlete WHERE email = :email"; + + $params = [ + ':email' => $email, + ]; + + return $this->connection->executeWithErrorHandling($query, $params); + } +} \ No newline at end of file diff --git a/Sources/src/data/core/database/data/athlete.sql b/Sources/src/data/core/database/data/athlete.sql new file mode 100644 index 00000000..fbe5e854 --- /dev/null +++ b/Sources/src/data/core/database/data/athlete.sql @@ -0,0 +1,6 @@ +INSERT INTO Athlete (username, nom, prenom, email, sexe, taille, poids, motDePasse, dateNaissance, isCoach) VALUES + ('johnD63', 'Doe', 'John', 'john.doe@example.com', 'M', 1.80, 75, '$2y$10$U59ioMTGZBM2FGQv.3lcbuL0IkO4Fx1jQU7f5hF7o/hvCX2t46mby', '1985-05-15', TRUE), + ('janeS03', 'Smith', 'Jane', 'jane.smith@example.com', 'F', 1.65, 60, '$2y$10$U59ioMTGZBM2FGQv.3lcbuL0IkO4Fx1jQU7f5hF7o/hvCX2t46mby', '1990-03-10', FALSE), + ('bryanO', 'Martin', 'Paul', 'paul.martin@example.com', 'M', 1.75, 68, '$2y$10$U59ioMTGZBM2FGQv.3lcbuL0IkO4Fx1jQU7f5hF7o/hvCX2t46mby', '1988-08-20', TRUE), + ('dominicT', 'Brown', 'Anna', 'anna.brown@example.com', 'F', 1.70, 58, '$2y$10$U59ioMTGZBM2FGQv.3lcbuL0IkO4Fx1jQU7f5hF7o/hvCX2t46mby', '1992-11-25', FALSE), + ('miaT', 'Lee', 'Bruce', 'bruce.lee@example.com', 'M', 1.72, 70, '$2y$10$U59ioMTGZBM2FGQv.3lcbuL0IkO4Fx1jQU7f5hF7o/hvCX2t46mby', '1970-02-05', FALSE); \ No newline at end of file diff --git a/Sources/src/data/core/database/data/frequenceCardiaque.sql b/Sources/src/data/core/database/data/frequenceCardiaque.sql new file mode 100644 index 00000000..d9e90184 --- /dev/null +++ b/Sources/src/data/core/database/data/frequenceCardiaque.sql @@ -0,0 +1,22 @@ +INSERT INTO FrequenceCardiaque +VALUES + (1, 100, '08:15:00', 15, 130, 45.75771709151474, 3.113484980409329, 1), + (2, ROUND(RAND() * 10 + 90), '08:16:00', ROUND(RAND() * 5 + 10), ROUND(RAND() * 20 + 110), 45.75772709151474, 3.113494980409329, 1), + (3, ROUND(RAND() * 10 + 90), '08:17:00', ROUND(RAND() * 5 + 10), ROUND(RAND() * 20 + 110), 45.75773709151474, 3.113504980409329, 1), + (4, ROUND(RAND() * 10 + 90), '08:18:00', ROUND(RAND() * 5 + 10), ROUND(RAND() * 20 + 110), 45.75774709151474, 3.113514980409329, 1), + (5, ROUND(RAND() * 10 + 90), '08:19:00', ROUND(RAND() * 5 + 10), ROUND(RAND() * 20 + 110), 45.75775709151474, 3.113524980409329, 1), + (6, ROUND(RAND() * 10 + 90), '08:20:00', ROUND(RAND() * 5 + 10), ROUND(RAND() * 20 + 110), 45.75776709151474, 3.113534980409329, 1), + (7, ROUND(RAND() * 10 + 90), '08:21:00', ROUND(RAND() * 5 + 10), ROUND(RAND() * 20 + 110), 45.75777709151474, 3.113544980409329, 1), + (8, ROUND(RAND() * 10 + 90), '08:22:00', ROUND(RAND() * 5 + 10), ROUND(RAND() * 20 + 110), 45.75778709151474, 3.113554980409329, 1), + (9, ROUND(RAND() * 10 + 90), '08:23:00', ROUND(RAND() * 5 + 10), ROUND(RAND() * 20 + 110), 45.75779709151474, 3.113564980409329, 1), + (10, ROUND(RAND() * 10 + 90), '08:24:00', ROUND(RAND() * 5 + 10), ROUND(RAND() * 20 + 110), 45.75780709151474, 3.113574980409329, 1), + (11, ROUND(RAND() * 10 + 90), '08:25:00', ROUND(RAND() * 5 + 10), ROUND(RAND() * 20 + 110), 45.75781709151474, 3.113584980409329, 1), + (12, ROUND(RAND() * 10 + 90), '08:26:00', ROUND(RAND() * 5 + 10), ROUND(RAND() * 20 + 110), 45.75782709151474, 3.113594980409329, 1), + (13, ROUND(RAND() * 10 + 90), '08:27:00', ROUND(RAND() * 5 + 10), ROUND(RAND() * 20 + 110), 45.75783709151474, 3.113604980409329, 1), + (14, ROUND(RAND() * 10 + 90), '08:28:00', ROUND(RAND() * 5 + 10), ROUND(RAND() * 20 + 110), 45.75784709151474, 3.113614980409329, 1), + (15, ROUND(RAND() * 10 + 90), '08:29:00', ROUND(RAND() * 5 + 10), ROUND(RAND() * 20 + 110), 45.75785709151474, 3.113624980409329, 1), + (16, ROUND(RAND() * 10 + 90), '08:30:00', ROUND(RAND() * 5 + 10), ROUND(RAND() * 20 + 110), 45.75786709151474, 3.113634980409329, 1), + (17, ROUND(RAND() * 10 + 90), '08:31:00', ROUND(RAND() * 5 + 10), ROUND(RAND() * 20 + 110), 45.75787709151474, 3.113644980409329, 1), + (18, ROUND(RAND() * 10 + 90), '08:32:00', ROUND(RAND() * 5 + 10), ROUND(RAND() * 20 + 110), 45.75788709151474, 3.113654980409329, 1), + (19, ROUND(RAND() * 10 + 90), '08:33:00', ROUND(RAND() * 5 + 10), ROUND(RAND() * 20 + 110), 45.75789709151474, 3.113664980409329, 1), + (20, ROUND(RAND() * 10 + 90), '08:34:00', ROUND(RAND() * 5 + 10), ROUND(RAND() * 20 + 110), 45.75790709151474, 3.113674980409329, 1); diff --git a/Sources/src/data/core/database/data/friendship.sql b/Sources/src/data/core/database/data/friendship.sql new file mode 100644 index 00000000..79b7bd0f --- /dev/null +++ b/Sources/src/data/core/database/data/friendship.sql @@ -0,0 +1,26 @@ +INSERT INTO Friendship (idAthlete1, idAthlete2, debut) VALUES + (3, 4, '2023-01-01'), + (3, 5, '2023-01-12'); + +INSERT INTO Notification (idNotif, message, date, statut, urgence, athleteId) VALUES + (1, 'Training session at 10 AM', '2023-03-10', TRUE, 1, 1), + (2, 'Training session at 3 PM', '2023-05-10', TRUE, 1, 2); + +INSERT INTO Statistique (idStatistique, poids, fcMoyenne, fcMax, caloriesBruleesMoy, date, athleteId) VALUES + (1, 70, 80, 150, 500, '2023-03-10', 1), + (2, 86, 95, 170, 896, '2023-04-13', 3); + +INSERT INTO Entrainement (idEntrainement, date, description, latitude, longitude, feedback, athleteId) VALUES + (1, '2023-03-10', 'Long run in the park', 40.7128, -74.0060, 'Good effort', 1), + (2, '2023-04-13', 'Long run in the forest', 44.7128, -70.0060, 'Pretty good effort', 3); + +INSERT INTO Participe (athleteId, entrainementId) VALUES + (1, 1), + (3, 2); + +INSERT INTO SourceDonnee (idSource, type, modele, precision2, athleteId) VALUES + (1, 'Heart Rate Monitor', 'HRM-Pro', 98.5, 1); + +INSERT INTO Activite (idActivite, 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', 3, 0.5, 1, 0.1, 140, 160, 120, 20, 1, 1), + (2, 'Running Forest', '2023-04-13', '10:00:00', '12:00:00', 5, 0.5, 1, 0.1, 140, 160, 120, 20, 1, 1); diff --git a/Sources/src/data/core/database/data/tables.sql b/Sources/src/data/core/database/data/tables.sql new file mode 100644 index 00000000..6875269c --- /dev/null +++ b/Sources/src/data/core/database/data/tables.sql @@ -0,0 +1,107 @@ +DROP TABLE IF EXISTS Athlete, Friendship, Notification, Statistique, Entrainement, Participe, SourceDonnee, Activite, FrequenceCardiaque CASCADE; + +CREATE TABLE Athlete ( + idAthlete INT AUTO_INCREMENT PRIMARY KEY, + username VARCHAR(255), + nom VARCHAR(255), + prenom VARCHAR(255), + email VARCHAR(255) UNIQUE, + sexe CHAR(1), + taille DECIMAL, + poids DECIMAL, + motDePasse VARCHAR(255), + dateNaissance DATE, + isCoach BOOLEAN +); +CREATE TABLE Friendship ( + idAthlete1 INT, + idAthlete2 INT, + debut DATE, + PRIMARY KEY (idAthlete1, idAthlete2), + FOREIGN KEY (idAthlete1) REFERENCES Athlete(idAthlete), + FOREIGN KEY (idAthlete2) REFERENCES Athlete(idAthlete) +); + +CREATE TABLE Notification ( + idNotif INT AUTO_INCREMENT PRIMARY KEY, + message TEXT, + date DATE, + statut BOOLEAN, + urgence INT, + athleteId INT, + FOREIGN KEY (athleteId) REFERENCES Athlete(idAthlete) +); + +CREATE TABLE Statistique ( + idStatistique INT AUTO_INCREMENT PRIMARY KEY, + poids DECIMAL, + fcMoyenne DECIMAL, + fcMax DECIMAL, + caloriesBruleesMoy DECIMAL, + date DATE, + athleteId INT, + FOREIGN KEY (athleteId) REFERENCES Athlete(idAthlete) +); + +CREATE TABLE Entrainement ( + idEntrainement INT AUTO_INCREMENT PRIMARY KEY, + date DATE, + description TEXT, + latitude DECIMAL, + longitude DECIMAL, + feedback TEXT, + athleteId INT, + FOREIGN KEY (athleteId) REFERENCES Athlete(idAthlete) +); + +CREATE TABLE Participe ( + athleteId INT, + entrainementId INT, + PRIMARY KEY (athleteId, entrainementId), + FOREIGN KEY (athleteId) REFERENCES Athlete(idAthlete), + FOREIGN KEY (entrainementId) REFERENCES Entrainement(idEntrainement) +); + +CREATE TABLE SourceDonnee ( + idSource INT AUTO_INCREMENT PRIMARY KEY, + type VARCHAR(255), + modele VARCHAR(255), + precision DECIMAL, + athleteId INT, + FOREIGN KEY (athleteId) REFERENCES Athlete(idAthlete) +); + +CREATE TABLE Activite ( + idActivite INT AUTO_INCREMENT PRIMARY KEY, + type VARCHAR(255), + date DATE, + heureDeDebut TIME, + heureDeFin TIME, + effortRessent DECIMAL, + variabilite DECIMAL, + variance DECIMAL, + ecartType DECIMAL, + moyenne DECIMAL, + maximum DECIMAL, + minimum DECIMAL, + temperatureMoyenne DECIMAL, + athleteId INT, + sourceId INT, + FOREIGN KEY (athleteId) REFERENCES Athlete(idAthlete), + FOREIGN KEY (sourceId) REFERENCES SourceDonnee(idSource) +); + +CREATE TABLE FrequenceCardiaque ( + idFc INT AUTO_INCREMENT PRIMARY KEY, + altitude DECIMAL, + temps TIME, + temperature DECIMAL, + bpm INT, + longitude DECIMAL, + latitude DECIMAL, + activiteId INT, + FOREIGN KEY (activiteId) REFERENCES Activite(idActivite) +); + +-- \i athlete.sql +-- \i friendship.sql \ No newline at end of file diff --git a/Sources/src/data/core/network/AuthService.php b/Sources/src/data/core/network/AuthService.php new file mode 100644 index 00000000..88c407d3 --- /dev/null +++ b/Sources/src/data/core/network/AuthService.php @@ -0,0 +1,129 @@ +userRepository = $userRepository; + $this->passwordHacher = $passwordHacher; + } + + public function login(string $email, string $password): bool + { +// $user = $this->userRepository->getItemByEmail($email); + $userGateway = new UserGateway(new Connexion(DSN, DB_USER, DB_PASSWORD)); + $userRepository = $userGateway->getUserByEmail($email); +// Log::dd($userRepository[0]['isCoach']); + if($userRepository[0]['isCoach']) { + $map = new CoachMapper(); + $coachEntity = $map->coachSqlToEntity($userRepository); +// $user = []; + foreach($coachEntity as $coachs) { + $user = $map->CoachEntityToModel($coachs); + } + } else { + $map = new AthleteMapper(); + $athleteEntity = $map->athleteSqlToEntity($userRepository); + foreach($athleteEntity as $coachs) { + $user = $map->AthleteEntityToModel($coachs); + } + } + +// Log::dd($user); +// $map->athleteEntityToModel($userRepository) + +// $user = ['username' => $userEntity[0]->getUsername(), 'nom' => $userEntity[0]->getNom(), +// 'prenom' => $userEntity[0]->getPrenom(),'email' => $userEntity[0]->getEmail(), 'sexe' => $userEntity[0]->getSexe(), +// 'taille' => $userEntity[0]->getTaille(), 'poids' => $userEntity[0]->getPoids(), 'motdepasse' => $userEntity[0]->getMotDePasse(), +// 'datenaissance' => $userEntity[0]->getDateNaissance(), 'iscoach' => $userEntity[0]->getIsCoach(), 'img' => 'test']; +// Log::dd($this->passwordHacher->isPasswordValid($user->getMotDePasse(),$password)); + if ($user === null || !$this->passwordHacher->isPasswordValid($user->getMotDePasse(),$password)) { + return false; + } + $this->currentUser = $user; +// Log::dd(Session::getInstance()->__get(USER)); + Session::getInstance()->__set(USER, $this->currentUser->getId()); +// Log::dd(Session::getInstance()->__set(USER, $this->currentUser->getId())); + return true; + } + + + + public function register(string $email, string $password, $data): bool + { + if ($this->userRepository->getItemByEmail($email)) { + throw new \Exception('User already exists'); + } + + $hashedPassword = $this->passwordHacher->hashPassword($password); + $prenom = $data['prenom']; + $username = $data['username']; + $nom = $data['nom']; + $sexe = $data['sexe']; + $taille = $data['taille']; + $poids = $data['poids']; + $dateNaissance = $data['dateNaissance']; + $roleName = $data['roleName']; + $role = null; + if ($roleName == "Coach") { + $role = new CoachAthlete(); + } else if ($roleName == "Athlete") { + $role = new Athlete(); + } + + $user = new User( + $nom, + $prenom, + $username, + $email, + $hashedPassword, + $sexe, + $taille, + $poids, + $dateNaissance, + $role + ); + $this->userRepository->addItem($user); + $this->currentUser = $user; + Session::getInstance()->__set(USER,$this->currentUser->getId()); + + + return true; + } + + public function logoutUser(): bool + { + $this->currentUser = null; + Session::getInstance()->destroy(); + return true; + } + + public function getCurrentUser(): ?User + { + if (!empty(Session::getInstance()->__get(USER)) && $this->currentUser === null) { + $this->currentUser = $this->userRepository->getItemById(Session::getInstance()->__get(USER)); + } + return $this->currentUser; + } + + +} diff --git a/Sources/src/data/core/network/IAuthService.php b/Sources/src/data/core/network/IAuthService.php index abe4fd87..eee78c2d 100644 --- a/Sources/src/data/core/network/IAuthService.php +++ b/Sources/src/data/core/network/IAuthService.php @@ -33,18 +33,18 @@ interface IAuthService { /** * Register a new user. * - * @param string $username The username of the new user. + * @param string $emailUser The emailUser of the new user. * @param string $password The password of the new user. * @param $data other data {undefined} for the moment. * * @return bool True if registration is successful, false otherwise. */ - public function register(string $username, string $password, $data): bool; + public function register(string $emailUser, string $password, $data): bool; /** * Logout the currently authenticated user. * - * @return void + * @return bool */ public function logoutUser(): bool; diff --git a/Sources/src/data/model/Activity.php b/Sources/src/data/model/Activity.php index ec723b3b..a25e33fc 100644 --- a/Sources/src/data/model/Activity.php +++ b/Sources/src/data/model/Activity.php @@ -27,7 +27,7 @@ class Activity private float $variability; private float $variance; private float $standardDeviation; - private int $average; + private float $average; private int $maximum; private int $minimum; private float $avrTemperature; diff --git a/Sources/src/data/model/Notification.php b/Sources/src/data/model/Notification.php index 7472632a..406824bd 100644 --- a/Sources/src/data/model/Notification.php +++ b/Sources/src/data/model/Notification.php @@ -2,8 +2,46 @@ namespace Model; +use DateTime; + class Notification { + private static $lastId = 0; + private int $idNotif; + private string $message; + private \DateTime $date; + private bool $statut; + private string $urgence; + private int $toUserId; + /** + * @param string $type + * @param string $message + */ + public function __construct( + string $message, + DateTime $date, + string $statut, + string $urgence, + int $toUserId + ) + { + $this->idNotif = self::generateId(); + $this->message = $message; + $this->date = $date; + $this->statut = $statut; + $this->urgence = $urgence; + $this->toUserId =$toUserId; + } + private static function generateId(): int + { + self::$lastId++; + return self::$lastId; + } + + public function getId(){ return $this->idNotif;} + public function getDate(){ return $this->date;} + public function getStatut(){ return $this->statut;} + public function getUrgence(){ return $this->urgence;} /** * @return string */ @@ -36,10 +74,6 @@ class Notification $this->message = $message; } - private string $type; - private string $message; - private int $toUserId; - /** * @return int */ @@ -55,16 +89,6 @@ class Notification { $this->toUserId = $toUserId; } - /** - * @param string $type - * @param string $message - */ - public function __construct(int $toUserId,string $type, string $message) - { - $this->type = $type; - $this->toUserId =$toUserId; - $this->message = $message; - } public function __toString(): string { return var_export($this, true); diff --git a/Sources/src/data/model/Role.php b/Sources/src/data/model/Role.php index 4f0e0688..741f4610 100644 --- a/Sources/src/data/model/Role.php +++ b/Sources/src/data/model/Role.php @@ -18,7 +18,6 @@ use Stub\TrainingRepository; * @brief Classe abstraite représentant le rôle d'un utilisateur. */ abstract class Role { - protected int $id; protected array $usersList = []; protected array $usersRequests = []; protected array $trainingList = []; diff --git a/Sources/src/data/model/Training.php b/Sources/src/data/model/Training.php index 98291d77..e422bc90 100644 --- a/Sources/src/data/model/Training.php +++ b/Sources/src/data/model/Training.php @@ -4,6 +4,7 @@ namespace Model; class Training { + private static $lastId = 0; private int $idTraining; private \DateTime $date; private float $latitude; @@ -12,20 +13,24 @@ class Training private ?String $feedback; public function __construct( - int $idTraining, \DateTime $date, float $latitude, float $longitude, ?String $description = null, ?String $feedback = null ) { - $this->idTraining = $idTraining; + $this->idTraining = self::generateId(); $this->date = $date; $this->latitude = $latitude; $this->longitude = $longitude; $this->description = $description; $this->feedback = $feedback; } + private static function generateId(): int + { + self::$lastId++; + return self::$lastId; + } public function getId():int { return $this->idTraining; } @@ -33,7 +38,13 @@ class Training return $this->date; } public function getLocation(): String { - return $this->longitude . $this->latitude; + return $this->longitude . ", " . $this->latitude; + } + public function getLatitude(): float { + return $this->latitude; + } + public function getLongitude(): float { + return $this->longitude; } public function getDescription(): String { diff --git a/Sources/src/data/model/User.php b/Sources/src/data/model/User.php index ac96da73..0726aa4b 100644 --- a/Sources/src/data/model/User.php +++ b/Sources/src/data/model/User.php @@ -16,6 +16,7 @@ namespace Model; * @brief Classe représentant un utilisateur. */ class User { + private static $lastId = 0; private int $id; private String $username; private string $nom; @@ -28,14 +29,7 @@ class User { private \DateTime $dateNaissance; private Role $role; protected array $notifications = []; - - /** - * @return array - */ - public function getNotifications(): array - { - return $this->notifications; - } + private array $listFriend = []; /** * @param int $id @@ -50,9 +44,11 @@ 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(string $nom, string $prenom, string $username, string $email, + string $motDePasse, string $sexe, float $taille, float $poids, \DateTime $dateNaissance, + Role $role) { - $this->id = $id; + $this->id = self::generateId(); $this->nom = $nom; $this->prenom = $prenom; $this->username = $username; @@ -64,6 +60,18 @@ class User { $this->dateNaissance = $dateNaissance; $this->role = $role; } + private static function generateId(): int + { + self::$lastId++; + return self::$lastId; + } + /** + * @return array + */ + public function getNotifications(): array + { + return $this->notifications; + } public function addNotification($notification): void { $this->notifications[] = $notification; @@ -289,5 +297,23 @@ class User { public function __toString() { return "Athlete [ID: {$this->id}, Username : $this->username, Nom: {$this->nom}, Prénom: {$this->prenom}, Email: {$this->email}]"; } + + /** + * Donne la liste des amis de l'utilisateur + * + * @return string Les amis de l'utilisateur. + */ + public function getListFriend(): array { + return $this->listFriend; + } + + /** + * Ajoute un utilisateur a sa liste d'amis. + * + * @param User L'utilisateur a ajouter. + */ + public function addFriend(User $user){ + array_push($this->listFriend, $user); + } } ?> \ No newline at end of file diff --git a/Sources/src/data/model/manager/ActivityManager.php b/Sources/src/data/model/manager/ActivityManager.php index ef8b6df3..affd3a54 100644 --- a/Sources/src/data/model/manager/ActivityManager.php +++ b/Sources/src/data/model/manager/ActivityManager.php @@ -8,12 +8,22 @@ * * @package manager */ + namespace Manager; use adriangibbons\phpFITFileAnalysis; +use Database\ActivityGateway; +use Database\ActivityMapper; +use Database\Connexion; +use Database\NotificationGateway; +use Database\NotificationMapper; +use DateTime; use Exception; use Model\Activity; +use Model\Athlete; +use Model\Notification; use Network\IAuthService; +use Shared\Log; use Stub\AuthService; /** @@ -27,14 +37,21 @@ class ActivityManager */ private IAuthService $authService; + /** + * @var DataManager + */ + private DataManager $dataManager; + + /** * Constructeur de la classe ActivityManager. * * @param IAuthService $authService Le service d'authentification utilisé pour vérifier l'utilisateur actuel. */ - public function __construct(DataManager $dataManager,IAuthService $authService) + public function __construct(DataManager $dataManager, IAuthService $authService) { $this->authService = $authService; + $this->dataManager = $dataManager; } /** @@ -49,23 +66,22 @@ class ActivityManager try { // Extraction des données du fichier FIT $fitData = [ - 'timestamps' => $monFichierFit->data_mesgs['record']['timestamp'], - 'latitudes' => $monFichierFit->data_mesgs['record']['position_lat'], - 'longitudes' => $monFichierFit->data_mesgs['record']['position_long'], - 'altitudes' => $monFichierFit->data_mesgs['record']['altitude'], - 'heartRates' => $monFichierFit->data_mesgs['record']['heart_rate'], - 'cadences' => $monFichierFit->data_mesgs['record']['cadence'], - 'distances' => $monFichierFit->data_mesgs['record']['distance'], - 'speeds' => $monFichierFit->data_mesgs['record']['speed'], - 'powers' => $monFichierFit->data_mesgs['record']['power'], + 'timestamps' => $monFichierFit->data_mesgs['record']['timestamp'], + 'latitudes' => $monFichierFit->data_mesgs['record']['position_lat'], + 'longitudes' => $monFichierFit->data_mesgs['record']['position_long'], + 'altitudes' => $monFichierFit->data_mesgs['record']['altitude'], + 'heartRates' => $monFichierFit->data_mesgs['record']['heart_rate'], + 'cadences' => $monFichierFit->data_mesgs['record']['cadence'], + 'distances' => $monFichierFit->data_mesgs['record']['distance'], + 'speeds' => $monFichierFit->data_mesgs['record']['speed'], + 'powers' => $monFichierFit->data_mesgs['record']['power'], 'temperatures' => $monFichierFit->data_mesgs['record']['temperature'], ]; // Conversion des données en format JSON $jsonFitData = json_encode($fitData, JSON_PRETTY_PRINT); - // Enregistrement du fichier JSON - file_put_contents('/Users/Perederii/SAE/git/Web/Sources/src/data/model/fitFileSaver/jsonFiles/ActivitySave.json', $jsonFitData); + file_put_contents('./you.json', $jsonFitData); return true; } catch (\Exception $e) { @@ -85,21 +101,21 @@ class ActivityManager * @return bool Retourne true en cas de succès, sinon false. * @throws Exception En cas d'erreur lors du téléchargement, du traitement ou de l'enregistrement des données. */ - public function uploadFile($type, $effortRessenti, $file_path_or_data, ?array $options = null): bool + public function uploadFile(string $type, int $effortRessenti, string $file_path_or_data, ?array $options = null): bool { try { // Vérification des options par défaut if (empty($options)) { $options = [ - 'fix_data' => ['all'], - 'data_every_second' => false, - 'units' => 'metric', - 'pace' => true, - 'garmin_timestamps' => false, + 'input_is_data' => true, + 'fix_data' => ['all'], + 'data_every_second' => false, + 'units' => 'metric', + 'pace' => true, + 'garmin_timestamps' => false, 'overwrite_with_dev_data' => false ]; } - // Ouverture du fichier FIT if (!($monFichierFit = new phpFITFileAnalysis($file_path_or_data, $options))) { throw new Exception("Problème lors de l'ouverture du fichier FIT"); @@ -110,17 +126,25 @@ class ActivityManager $lastTimestamp = end($monFichierFit->data_mesgs['record']['timestamp']); // Conversion des timestamps en objets DateTime - $startDate = \DateTime::createFromFormat('Y-m-d', date('Y-m-d', $firstTimestamp)); - $startTime = \DateTime::createFromFormat('H:i:s', date('H:i:s', $firstTimestamp)); - $endTime = ($lastTimestamp) ? \DateTime::createFromFormat('H:i:s', date('H:i:s', $lastTimestamp)) : null; + $startDate = new DateTime(); +// $startDate = $startDate->format('Y-m-d'); + $startTime = new DateTime();//\DateTime::createFromFormat('H:i:s', date('H:i:s', $firstTimestamp)); +// $startTime = $startTime->format('H:i:s'); + $endTime = ($lastTimestamp) ? new DateTime() : null; +// if(!empty($endTime)) { +// $endTime = $endTime->format('H:i:s'); +// } // Vérification des conversions en DateTime if (!$startDate || !$startTime || ($lastTimestamp && !$endTime)) { throw new \Exception("La conversion en DateTime a échoué."); + return false; } // Extraction des autres données nécessaires - $heartRateList = $monFichierFit->data_mesgs['record']['heart_rate']; + if(!($heartRateList = $monFichierFit->data_mesgs['record']['heart_rate'])) { + throw new \InvalidArgumentException("Fichier .fit ne comportant pas de fréquences cardiaques.\n Fichier Invalide !"); + } $variability = max($heartRateList) - min($heartRateList); $average = number_format(array_sum($heartRateList) / count($heartRateList), 2); $varianceV = array_sum(array_map(fn($x) => pow($x - $average, 2), $heartRateList)) / count($heartRateList); @@ -129,13 +153,24 @@ class ActivityManager $maximum = max($heartRateList); $minimum = min($heartRateList); - $temperatureList = $monFichierFit->data_mesgs['record']['temperature']; - $averageTemperature = (!empty($temperatureList)) ? number_format(array_sum($temperatureList) / count($temperatureList), 1) : -200; + if(!empty($monFichierFit->data_mesgs['record']['temperature']) && isset($monFichierFit->data_mesgs['record']['temperature'])){ + // Extraction de la température moyenne (si disponible + $temperatureList = $monFichierFit->data_mesgs['record']['temperature']; + $averageTemperature = (!empty($temperatureList)) ? number_format(array_sum($temperatureList) / count($temperatureList), 1) : -200; + } + else{ + $averageTemperature = -200; + } - $isPaused = count($monFichierFit->isPaused()) > 0; + if($monFichierFit->data_mesgs['record']['speed']) { + $isPaused = count($monFichierFit->isPaused()) > 0; + } else { + $isPaused = false; + } // Création de l'objet Activity $newActivity = new Activity( + 15, $type, $startDate, $startTime, @@ -150,16 +185,30 @@ class ActivityManager $averageTemperature, $isPaused ); - +// $this->dataManager->activityRepository->add($newActivity); +// if ($this->saveFitFileToJSON($monFichierFit)) { // Ajout de l'activité et enregistrement du fichier FIT en JSON - if ($this->authService->getCurrentUser()->getRole()->addActivity($newActivity) && $this->saveFitFileToJSON($monFichierFit)) { + $activityGateway = new ActivityGateway(new Connexion(DSN, DB_USER, DB_PASSWORD)); + $map = new ActivityMapper(); + $activityEntity = $map->activityToEntity($newActivity); + if($activityGateway->addActivity($activityEntity)) { return true; } - } catch (\Exception $e) { + // TODO : add the activity +// if ($this->authService->getCurrentUser()->getRole()->addActivity($newActivity)) { +// return true; +// } +// } + + + return false; + } + catch(\Exception $e){ echo $e; } - return false; + } } + ?> \ No newline at end of file diff --git a/Sources/src/data/model/manager/DataManager.php b/Sources/src/data/model/manager/DataManager.php index fd10d427..92adbca2 100644 --- a/Sources/src/data/model/manager/DataManager.php +++ b/Sources/src/data/model/manager/DataManager.php @@ -11,6 +11,7 @@ abstract class DataManager { public IRelationshipRequestRepository $relationshipRequestRepository; public ITrainingRepository $trainingRepository; public INotificationRepository $notificationRepository; + public IActivityRepository $activityRepository; } ?> \ No newline at end of file diff --git a/Sources/src/data/model/manager/UserManager.php b/Sources/src/data/model/manager/UserManager.php index 8d6e2b5b..79e04dd2 100644 --- a/Sources/src/data/model/manager/UserManager.php +++ b/Sources/src/data/model/manager/UserManager.php @@ -19,7 +19,7 @@ use Network\IAuthService; use Network\IFriendRequestService; use Shared\Validation; use Stub\UserRepository; - +use Shared\Log; class UserManager { private IAuthService $authService; @@ -66,7 +66,6 @@ class UserManager return false; } - if ($this->authService->login($emailUser, $passwordUser)) { $this->currentUser = $this->authService->getCurrentUser(); // Check if the current user is correctly set @@ -82,7 +81,7 @@ class UserManager } - public function addFriend(string $newFriend): bool + /*public function addFriend(string $newFriend): bool { $newFriend = $this->dataManager->userRepository->getItemByName($newFriend, 0, 1); if ($newFriend === null) { @@ -96,6 +95,11 @@ class UserManager return true; }; return false; + }*/ + + public function addFriend(User $user1, User $user2) + { + $this->dataManager->userRepository->addFriend($user1, $user2); } public function respondToFriendRequest(int $requestId, bool $choice): bool @@ -133,22 +137,15 @@ class UserManager { return $this->dataManager->userRepository->getItemsByName($name, 0, 10); } + + public function searchUserByName(string $name): ?User + { + return $this->dataManager->userRepository->getItemByName($name, 0, 10); + } public function getFriends(): array { - return [ - [ - 'nom' => 'John', - 'prenom' => 'Doe', - 'img' => 'test', - 'username' => 'johndoe', - ], - [ - 'nom' => 'Alice', - 'prenom' => 'Smith', - 'img' => 'test2', - 'username' => 'alicesmith', - ], - ]; + $user=$this->dataManager->userRepository->getItemById(1); + return $user->getListFriend(); //return $this->currentUser->getRole()->getUsersList(); } @@ -177,7 +174,9 @@ class UserManager } // NEED TO PERSIST + /** + * @throws \Exception * Enregistre un nouvel utilisateur avec les informations fournies. * * @param string $loginUser Le nom d'utilisateur. @@ -195,6 +194,21 @@ class UserManager // } // } + $dateNaissance = new \DateTime($data['dateNaissance']); + $dateActuelle = new \DateTime(); + + // Vérifier si la date est dans le futur + if ($dateNaissance > $dateActuelle) { + throw new \Exception("La date de naissance ne peut pas être dans le futur."); + } + + // Vérifier l'âge minimum (par exemple, 18 ans) + $ageMinimum = new \DateTime('-10 years'); + if ($dateNaissance > $ageMinimum) { + throw new \Exception("Vous devez avoir au moins 18 ans pour vous inscrire."); + } + $data['dateNaissance'] = $dateNaissance; + $roleName = $data['roleName']; if ($roleName !== "Athlete" && $roleName !== "Coach") { throw new \Exception("Rôle non valide"); @@ -224,5 +238,9 @@ class UserManager return false; } + public function getUserById(int $id): ?User { + return $this->dataManager->userRepository->getItemById($id); + } + } ?> diff --git a/Sources/src/data/model/repository/IUserRepository.php b/Sources/src/data/model/repository/IUserRepository.php index 1fc2f35f..5506c1e6 100644 --- a/Sources/src/data/model/repository/IUserRepository.php +++ b/Sources/src/data/model/repository/IUserRepository.php @@ -1,9 +1,12 @@ notifications[] = new Notification(1, 'info', 'Welcome to our service!'); - $this->notifications[] = new Notification(2, 'alert', 'Your subscription is about to expire.'); - $this->notifications[] = new Notification(3, 'info', 'New features available.'); - $this->notifications[] = new Notification(1, 'reminder', 'Don’t forget your upcoming appointment.'); - $this->notifications[] = new Notification(2, 'update', 'Service update completed.'); - // Add more notifications as needed + $this->notifications[] = new Notification('info', $date,'Welcome to our service!', '1', 1); + $this->notifications[] = new Notification('info', $date,'Welcome to our service!', '1', 1); + $this->notifications[] = new Notification('info', $date,'Welcome to our service!', '1', 1); + $this->notifications[] = new Notification('info', $date,'Welcome to our service!', '1', 1); + $this->notifications[] = new Notification('info', $date,'Welcome to our service!', '1', 1); } public function getItemById(int $id) { diff --git a/Sources/src/data/stub/repository/UserRepository.php b/Sources/src/data/stub/repository/UserRepository.php index 948ce9d1..2501b87d 100644 --- a/Sources/src/data/stub/repository/UserRepository.php +++ b/Sources/src/data/stub/repository/UserRepository.php @@ -27,12 +27,27 @@ class UserRepository implements IUserRepository { * Constructeur de la classe UserRepository. */ public function __construct() { - $this->users[] = new User(1, "Doe", "John", "Doe","john.doe@example.com", "password123", 'M', 1.80, 75, new \DateTime("1985-05-15"), new CoachAthlete()); - $this->users[] = new User(2, "Smith", "Jane","Smith", "jane.smith@example.com", "secure456", 'F', 1.65, 60, new \DateTime("1990-03-10"), new Athlete()); - $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()); + $this->users[] = new User("Doe", "John", "Doe","john.doe@example.com", '$2y$10$U59ioMTGZBM2FGQv.3lcbuL0IkO4Fx1jQU7f5hF7o/hvCX2t46mby', 'M', 1.80, 75, new \DateTime("1985-05-15"), new CoachAthlete()); + $this->users[] = new User("Smith", "Jane","Smith", "jane.smith@example.com", '$2y$10$U59ioMTGZBM2FGQv.3lcbuL0IkO4Fx1jQU7f5hF7o/hvCX2t46mby', 'F', 1.65, 60, new \DateTime("1990-03-10"), new Athlete()); + $this->users[] = new User("Martin", "Paul","Martin", "paul.martin@example.com", '$2y$10$U59ioMTGZBM2FGQv.3lcbuL0IkO4Fx1jQU7f5hF7o/hvCX2t46mby', 'M', 1.75, 68, new \DateTime("1988-08-20"), new CoachAthlete()); + $this->users[] = new User("Brown", "Anna","Brown", "anna.brown@example.com", '$2y$10$U59ioMTGZBM2FGQv.3lcbuL0IkO4Fx1jQU7f5hF7o/hvCX2t46mby', 'F', 1.70, 58, new \DateTime("1992-11-25"), new Athlete()); + $this->users[] = new User("Lee", "Bruce","Lee", "bruce.lee@example.com", '$2y$10$U59ioMTGZBM2FGQv.3lcbuL0IkO4Fx1jQU7f5hF7o/hvCX2t46mby', 'M', 1.72, 70, new \DateTime("1970-02-05"), new Athlete()); +// $this->users[] = new User(1, "Doe", "John", "Doe","john.doe@example.com", "password123", 'M', 1.80, 75, new \DateTime("1985-05-15"), new CoachAthlete()); +// $this->users[] = new User(2, "Smith", "Jane","Smith", "jane.smith@example.com", "secure456", 'F', 1.65, 60, new \DateTime("1990-03-10"), new Athlete()); +// $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(6, "Truc", "Bruce","Truc", "bruce.lee@example.com", "hello321", 'M', 1.72, 70, new \DateTime("1970-02-05"), new Athlete()); +// $this->users[] = new User(1, "Doe", "John", "Doe","john.doe@example.com", "password123", 'M', 1.80, 75, new \DateTime("1985-05-15"), new CoachAthlete()); +// $this->users[] = new User(2, "Smith", "Jane","Smith", "jane.smith@example.com", "secure456", 'F', 1.65, 60, new \DateTime("1990-03-10"), new Athlete()); +// $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(1, "Doe", "John", "Doe","john.doe@example.com", '$2y$10$U59ioMTGZBM2FGQv.3lcbuL0IkO4Fx1jQU7f5hF7o/hvCX2t46mby', 'M', 1.80, 75, new \DateTime("1985-05-15"), new CoachAthlete()); +// $this->users[] = new User(2, "Smith", "Jane","Smith", "jane.smith@example.com", '$2y$10$U59ioMTGZBM2FGQv.3lcbuL0IkO4Fx1jQU7f5hF7o/hvCX2t46mby', 'F', 1.65, 60, new \DateTime("1990-03-10"), new Athlete()); +// $this->users[] = new User(3, "Martin", "Paul","Martin", "paul.martin@example.com", '$2y$10$U59ioMTGZBM2FGQv.3lcbuL0IkO4Fx1jQU7f5hF7o/hvCX2t46mby', 'M', 1.75, 68, new \DateTime("1988-08-20"), new CoachAthlete()); +// $this->users[] = new User(4, "Brown", "Anna","Brown", "anna.brown@example.com", '$2y$10$U59ioMTGZBM2FGQv.3lcbuL0IkO4Fx1jQU7f5hF7o/hvCX2t46mby', 'F', 1.70, 58, new \DateTime("1992-11-25"), new Athlete()); +// $this->users[] = new User(5, "Lee", "Bruce","Lee", "bruce.lee@example.com", '$2y$10$U59ioMTGZBM2FGQv.3lcbuL0IkO4Fx1jQU7f5hF7o/hvCX2t46mby', 'M', 1.72, 70, new \DateTime("1970-02-05"), new Athlete()); } /** @@ -164,39 +179,15 @@ class UserRepository implements IUserRepository { return false; } - /** - * Supprime un utilisateur du dépôt. - * - * @param User $username Le username de la personne qui recherche ses amis. - * @return bool Retourne la liste des amis de l'utilisateur passe en paramètre. - */ - //TODO - public function getFriends(): array { - return [ - [ - 'nom' => 'John', - 'prenom' => 'Doe', - 'img' => 'test', - 'username' => 'johndoe', - ], - [ - 'nom' => 'Alice', - 'prenom' => 'Smith', - 'img' => 'test2', - 'username' => 'alicesmith', - ], - ]; - } - public function addFriend(int $user1, int $user2) + public function deleteFriend(User $user1, User $user2) { - return true; + return true; } - - public function deleteFriend(int $user1, int $user2) + public function addFriend(User $user1, User $user2) { - return true; + $user1->addFriend($user2); } } ?> diff --git a/Sources/src/data/stub/service/AuthService.php b/Sources/src/data/stub/service/AuthService.php index eb43a533..fd82f326 100644 --- a/Sources/src/data/stub/service/AuthService.php +++ b/Sources/src/data/stub/service/AuthService.php @@ -1,5 +1,7 @@ userRepository = $userRepository; $this->passwordHacher = $passwordHacher; } - public function login(string $emailUser,string $password): bool { + public function login(string $emailUser, string $password): bool + { $user = $this->userRepository->getItemByEmail($emailUser); if (!$user instanceof User) { throw new \Exception('Unable to find user with that name'); } - if ($user->isValidPassword($password)) { - $this->currentUser = $user; - return true; + if (!$this->passwordHacher->isPasswordValid($user->getMotDePasse(), $password)) { + return false; } - return false; + $this->currentUser = $user; + return true; } + public function register(string $username, string $password, $data): bool { - + $hashedPassword = $this->passwordHacher->hashPassword($password); - + $existingUser = $this->userRepository->getItemByEmail($username); - if ($existingUser != null || $existingUser instanceof User ) { + + if ($existingUser != null || $existingUser instanceof User) { throw new \Exception('User already exists'); } - - $username = $data['username']; $prenom = $data['prenom']; $username = $data['username']; $nom = $data['nom']; @@ -48,13 +55,12 @@ class AuthService implements IAuthService { $sexe = $data['sexe']; $taille = $data['taille']; $poids = $data['poids']; - $dateNaissance = $data['dateNaissance'] ; + $dateNaissance = $data['dateNaissance']; $roleName = $data['roleName']; $role = null; - if($roleName == "Coach"){ + if ($roleName == "Coach") { $role = new CoachAthlete(); - } - else if($roleName == "Athlete"){ + } else if ($roleName == "Athlete") { $role = new Athlete(); } $user = new User( diff --git a/Sources/src/shared/ArgumentControllerResolver.php b/Sources/src/shared/ArgumentControllerResolver.php index 20bd1d1f..d57db54f 100644 --- a/Sources/src/shared/ArgumentControllerResolver.php +++ b/Sources/src/shared/ArgumentControllerResolver.php @@ -2,6 +2,8 @@ namespace Shared; use App\Router\Request\IRequest; +use InvalidArgumentException; + /** * Responsible for resolving the arguments passed to a controller action. */ @@ -14,7 +16,7 @@ class ArgumentControllerResolver implements IArgumentResolver{ * @param callable $controller The controller callable. * @return array An array of resolved arguments. * @throws \ReflectionException If the controller method does not exist. - * @throws \InvalidArgumentException If an argument cannot be resolved. + * @throws InvalidArgumentException If an argument cannot be resolved. */ public function getArguments(IRequest $request, callable $controller): array { @@ -27,10 +29,10 @@ class ArgumentControllerResolver implements IArgumentResolver{ $reflectionMethod = new \ReflectionMethod($className, $methodName); } else { // Handle other types of callables if needed - throw new \InvalidArgumentException("Invalid controller callable format."); + throw new InvalidArgumentException("Invalid controller callable format."); } } catch (\ReflectionException $e) { - throw new \InvalidArgumentException("Controller method error: " . $e->getMessage()); + throw new InvalidArgumentException("Controller method error: " . $e->getMessage()); } $args = []; @@ -42,11 +44,10 @@ class ArgumentControllerResolver implements IArgumentResolver{ $name = $param->getName(); $value = $this->getFromRequest($name, $request); - if ($value === null && $param->isDefaultValueAvailable()) { $value = $param->getDefaultValue(); } elseif ($value === null) { - throw new \InvalidArgumentException("Missing argument: $name"); + throw new InvalidArgumentException("Missing argument: $name"); } $args[] = $value; diff --git a/Sources/src/shared/Validation.php b/Sources/src/shared/Validation.php index fc316ba4..0a0687f9 100644 --- a/Sources/src/shared/Validation.php +++ b/Sources/src/shared/Validation.php @@ -26,7 +26,7 @@ final class Validation { * @throws Exception Si la chaîne n'est pas valide (tentative d'injection de code). */ public static function val_string(string $string) : bool { - if (strlen(htmlspecialchars($string, ENT_QUOTES) === 0)) { + if (!$string) {//filter_var($string, FILTER_SANITIZE_STRING) !== $string throw new Exception("$string n'est pas valide. Tentative d'injection de code (attaque sécurité)!"); } else { return true; @@ -101,7 +101,7 @@ final class Validation { * @return string La chaîne nettoyée. */ public static function clean_string(string $string) : string { - return filter_var($string, FILTER_SANITIZE_STRING); + return filter_var($string); } /** diff --git a/Sources/tests/GatewayTest.php b/Sources/tests/GatewayTest.php new file mode 100644 index 00000000..8a2a2e16 --- /dev/null +++ b/Sources/tests/GatewayTest.php @@ -0,0 +1,215 @@ +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); + }*/ +} diff --git a/Sources/tests/MapperTest.php b/Sources/tests/MapperTest.php new file mode 100644 index 00000000..2e5565a0 --- /dev/null +++ b/Sources/tests/MapperTest.php @@ -0,0 +1,43 @@ +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()); + } + } +} \ No newline at end of file diff --git a/Sources/tests/loginDatabase.php b/Sources/tests/loginDatabase.php new file mode 100644 index 00000000..97c9dc4a --- /dev/null +++ b/Sources/tests/loginDatabase.php @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/Sources/vendor/altorouter/altorouter/AltoRouter.php b/Sources/vendor/altorouter/altorouter/AltoRouter.php index 67e76abc..08423435 100644 --- a/Sources/vendor/altorouter/altorouter/AltoRouter.php +++ b/Sources/vendor/altorouter/altorouter/AltoRouter.php @@ -1,4 +1,5 @@ namedRoutes[$routeName])) { throw new \Exception("Route '{$routeName}' does not exist."); } diff --git a/Sources/vendor/composer/autoload_classmap.php b/Sources/vendor/composer/autoload_classmap.php index b61fe968..997e9208 100644 --- a/Sources/vendor/composer/autoload_classmap.php +++ b/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', diff --git a/Sources/vendor/composer/autoload_psr4.php b/Sources/vendor/composer/autoload_psr4.php index 3369793b..218aa369 100644 --- a/Sources/vendor/composer/autoload_psr4.php +++ b/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'), diff --git a/Sources/vendor/composer/autoload_static.php b/Sources/vendor/composer/autoload_static.php index ead2b76e..daa6f6ec 100644 --- a/Sources/vendor/composer/autoload_static.php +++ b/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 ( @@ -105,31 +105,32 @@ class ComposerStaticInit1887e85fc3cfddacf8d7e17588dae6f1 array ( 0 => __DIR__ . '/..' . '/symfony/polyfill-ctype', ), - 'Stub\\' => + 'Stub\\' => array ( 0 => __DIR__ . '/../..' . '/src/data/stub', 1 => __DIR__ . '/../..' . '/src/data/stub/service', 2 => __DIR__ . '/../..' . '/src/data/stub/repository', ), - 'Shared\\Exception\\' => + 'Shared\\Exception\\' => array ( 0 => __DIR__ . '/../..' . '/src/shared/exception', ), - 'Shared\\Attributes\\' => + 'Shared\\Attributes\\' => array ( 0 => __DIR__ . '/../..' . '/src/shared/attributes', ), - 'Shared\\' => + 'Shared\\' => array ( 0 => __DIR__ . '/../..' . '/src/shared', ), - 'Repository\\' => + 'Repository\\' => array ( 0 => __DIR__ . '/../..' . '/src/data/model/repository', ), - 'Psr\\Container\\' => + 'Psr\\Container\\' => array ( 0 => __DIR__ . '/..' . '/psr/container/src', + 1 => __DIR__ . '/..' . '/sebastian/cli-parser/src', ), 'PhpParser\\' => array ( @@ -138,8 +139,9 @@ class ComposerStaticInit1887e85fc3cfddacf8d7e17588dae6f1 'PhpOption\\' => array ( 0 => __DIR__ . '/..' . '/phpoption/phpoption/src/PhpOption', + 1 => __DIR__ . '/..' . '/phpunit/php-code-coverage/src/PhpOption', ), - 'Network\\' => + 'Network\\' => array ( 0 => __DIR__ . '/../..' . '/src/data/core/network', ), @@ -151,7 +153,7 @@ class ComposerStaticInit1887e85fc3cfddacf8d7e17588dae6f1 array ( 0 => __DIR__ . '/../..' . '/src/data/model/manager', ), - 'Hearttrack\\' => + 'Hearttrack\\' => array ( 0 => __DIR__ . '/../..' . '/src', ), @@ -163,19 +165,15 @@ class ComposerStaticInit1887e85fc3cfddacf8d7e17588dae6f1 array ( 0 => __DIR__ . '/..' . '/vlucas/phpdotenv/src', ), - 'Doctrine\\Instantiator\\' => + 'DeepCopy\\' => array ( - 0 => __DIR__ . '/..' . '/graham-campbell/result-type/src', - ), - 'Dotenv\\' => - array ( - 0 => __DIR__ . '/..' . '/vlucas/phpdotenv/src', + 0 => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy', ), - 'DeepCopy\\' => + 'Database\\' => array ( - 0 => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy', + 0 => __DIR__ . '/../..' . '/src/data/core/database', ), - 'Data\\Core\\' => + 'Data\\Core\\' => array ( 0 => __DIR__ . '/../..' . '/src/data/core', ), @@ -187,7 +185,7 @@ class ComposerStaticInit1887e85fc3cfddacf8d7e17588dae6f1 array ( 0 => __DIR__ . '/../..' . '/src/console', ), - 'App\\Views\\Directives\\' => + 'App\\Views\\Directives\\' => array ( 0 => __DIR__ . '/../..' . '/src/app/views/directives', ), @@ -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', diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 00000000..b143d20d --- /dev/null +++ b/package-lock.json @@ -0,0 +1,28 @@ +{ + "name": "Web", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "dependencies": { + "chart.js": "^4.4.1" + } + }, + "node_modules/@kurkle/color": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.2.tgz", + "integrity": "sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==" + }, + "node_modules/chart.js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.1.tgz", + "integrity": "sha512-C74QN1bxwV1v2PEujhmKjOZ7iUM4w6BWs23Md/6aOZZSlwMzeCIDGuZay++rBgChYru7/+QFeoQW0fQoP534Dg==", + "dependencies": { + "@kurkle/color": "^0.3.0" + }, + "engines": { + "pnpm": ">=7" + } + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 00000000..3df43b72 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "chart.js": "^4.4.1" + } +}
Lu De: DescriptionDate
{{mail.nom}} {{mail.prenom}}{{mail.idathlete}} {{mail.message}}{{ mail.date }}