From 9640b7083990fbbf66253030f51db28b984c6fa6 Mon Sep 17 00:00:00 2001
From: "vivien.dufour" <vivien.dufour@etu.uca.fr>
Date: Wed, 22 Nov 2023 15:18:12 +0100
Subject: [PATCH] fix

---
 sql/setup-tables.sql              | 18 ------------------
 src/Controller/UserController.php | 17 +++++++++++++++++
 src/Data/Member.php               |  6 +++---
 src/Gateway/TeamGateway.php       |  4 ++--
 src/Model/TeamModel.php           |  1 +
 src/Views/display_team.html.twig  |  2 +-
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/sql/setup-tables.sql b/sql/setup-tables.sql
index 06bb32b..b13712f 100644
--- a/sql/setup-tables.sql
+++ b/sql/setup-tables.sql
@@ -24,12 +24,6 @@ CREATE TABLE Tactic
 
 CREATE TABLE FormEntries(name varchar, description varchar);
 
-CREATE TABLE AccountUser(
-    id integer PRIMARY KEY AUTOINCREMENT,
-    username varchar,
-    hash varchar,
-    email varchar unique
-);
 
 CREATE TABLE Team
 (
@@ -40,11 +34,6 @@ CREATE TABLE Team
     secondColor varchar
 );
 
-CREATE TABLE User
-(
-    id integer PRIMARY KEY AUTOINCREMENT
-);
-
 
 CREATE TABLE Member(
     idTeam integer,
@@ -53,10 +42,3 @@ CREATE TABLE Member(
     FOREIGN KEY (idTeam) REFERENCES Team (id),
     FOREIGN KEY (idMember) REFERENCES User (id)
 );
-
-CREATE TABLE TacticInfo
-(
-    id            integer PRIMARY KEY AUTOINCREMENT,
-    name          varchar,
-    creation_date timestamp DEFAULT CURRENT_TIMESTAMP
-);
diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
index 72b7d1c..b6e1431 100644
--- a/src/Controller/UserController.php
+++ b/src/Controller/UserController.php
@@ -61,5 +61,22 @@ class UserController extends VisitorController {
         return $ctrl->getTeam($id);
     }
 
+    public function addMember(): HttpResponse {
+        $model = new TeamModel(new TeamGateway(new Connexion(get_database())));
+        $ctrl = new Sub\TeamController($model);
+        if ($_SERVER['REQUEST_METHOD'] === 'GET') {
+            return $ctrl->displayAddMember($_POST);
+        }
+        return $ctrl->addMember($_POST);
+    }
+
+    public function deleteMember(): HttpResponse {
+        $model = new TeamModel(new TeamGateway(new Connexion(get_database())));
+        $ctrl = new Sub\TeamController($model);
+        if ($_SERVER['REQUEST_METHOD'] === 'GET') {
+            return $ctrl->displayDeleteMember($_POST);
+        }
+        return $ctrl->deleteMember($_POST);
+    }
 
 }
diff --git a/src/Data/Member.php b/src/Data/Member.php
index 64beb51..3049fde 100755
--- a/src/Data/Member.php
+++ b/src/Data/Member.php
@@ -9,7 +9,7 @@ class Member {
     /**
      * @var AccountUser The member's user account
      */
-    private AccountUser $user;
+    private int $userId;
 
     /**
      * @var int The member's team id
@@ -25,8 +25,8 @@ class Member {
      * @param int $userId
      * @param MemberRole $role
      */
-    public function __construct(Account $user, int $teamId, MemberRole $role) {
-        $this->user = $user;
+    public function __construct(int $userId, int $teamId, MemberRole $role) {
+        $this->userId = $userId;
         $this->teamId = $teamId;
         $this->role = $role;
     }
diff --git a/src/Gateway/TeamGateway.php b/src/Gateway/TeamGateway.php
index 6c13571..c98d803 100644
--- a/src/Gateway/TeamGateway.php
+++ b/src/Gateway/TeamGateway.php
@@ -78,7 +78,7 @@ class TeamGateway {
      */
     public function getMembersById(int $id): array {
         return $this->con->fetch(
-          "SELECT u.id,m.role,u.email,u.username FROM AccountUser u,Team t,Member m WHERE t.id = :id AND m.idTeam = t.id AND m.idMember = u.id",
+          "SELECT a.id,m.role,a.email,a.username FROM Account a,Team t,Member m WHERE t.id = :id AND m.idTeam = t.id AND m.idMember = a.id",
           [
               ":id" => [$id, PDO::PARAM_INT]
           ]
@@ -87,7 +87,7 @@ class TeamGateway {
 
     public function getMemberIdByMail($mail) : array {
         return $this->con->fetch(
-            "SELECT id FROM AccountUser WHERE email = :mail",
+            "SELECT id FROM Account WHERE email = :mail",
             [
                 ":mail" => [$mail, PDO::PARAM_STR]
             ]
diff --git a/src/Model/TeamModel.php b/src/Model/TeamModel.php
index 5a3ce5f..c936d30 100644
--- a/src/Model/TeamModel.php
+++ b/src/Model/TeamModel.php
@@ -46,6 +46,7 @@ class TeamModel {
         $result = $this->gateway->getTeamById($id)[0];
         $resultMembers = $this->gateway->getMembersById($id);
         foreach ($resultMembers as $row) {
+            var_dump($row['role']);
             if ($row['role'] == 'C') {
                 $role = MemberRole::coach();
             } else {
diff --git a/src/Views/display_team.html.twig b/src/Views/display_team.html.twig
index f1207db..474397e 100644
--- a/src/Views/display_team.html.twig
+++ b/src/Views/display_team.html.twig
@@ -76,7 +76,7 @@
 
                 {% for m in team.listMembers() %}
                     <p> {{ m.getUserId() }} </p>
-                    {% if m.getRole() == 'C' %}
+                    {% if m.getRole().isCoach() %}
                         <p> : Coach</p>
                     {% else  %}
                         <p> : Joueur</p>