From f6f51f876d90adcabbb58f1f6bff651fa7341fda Mon Sep 17 00:00:00 2001
From: "dorian.hodin" <Dorian/2020>
Date: Thu, 6 Apr 2023 11:40:02 +0200
Subject: [PATCH] Change DatabaseScript.php, add dossier and add efault ID

---
 .drone.yml                           |  1 +
 API/script/Config/DatabaseScript.php | 25 +++++++++----
 API/script/Gateway/GatewayUser.php   | 54 ++++++++++++++++++++++++++--
 3 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 23a1fee..dda1c4f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -52,6 +52,7 @@ steps:
       CONTAINERNAME: database
       PRIVATE : true
       COMMAND: create
+      OVERWRITE: true
       MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
       CODEFIRST_CLIENTDRONE_ENV_MARIADB_ROOT_PASSWORD:
         from_secret: db_root_password
diff --git a/API/script/Config/DatabaseScript.php b/API/script/Config/DatabaseScript.php
index 6a1f081..a7509af 100644
--- a/API/script/Config/DatabaseScript.php
+++ b/API/script/Config/DatabaseScript.php
@@ -20,39 +20,52 @@ class DatabaseScript {
         $queryScript = '
 
 CREATE TABLE `souvenir` (
-  `id` int(11) NOT NULL,
+  `id` int(11) NOT NULL DEFAULT 1,
   `title` varchar(50) NOT NULL,
   `linkImage` text NOT NULL,
   `description` text NOT NULL,
   `longitude` float NOT NULL,
   `latitude` float NOT NULL,
   `altitude` float NOT NULL,
-  `userId` int(11) NOT NULL
+  `userId` int(11) NOT NULL,
+  `dossierId` int(11) NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
-
-
 CREATE TABLE `user` (
-  `id` int(11) NOT NULL,
+  `id` int(11) NOT NULL DEFAULT 1,
   `login` varchar(50) NOT NULL,
   `password` varchar(200) NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+CREATE TABLE `dossier` (
+  `id` int(11) NOT NULL DEFAULT 1,
+  `userId` int(11) NOT NULL,
+  `nom` varchar(50) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
 ALTER TABLE `souvenir`
   ADD PRIMARY KEY (`id`);
 
 ALTER TABLE `user`
   ADD PRIMARY KEY (`id`),
+    
+ALTER TABLE `dosser`
+  ADD PRIMARY KEY (`id`),
 
 ALTER TABLE `souvenir`
   MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1;
 
+ALTER TABLE `dossier`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1;
+
 ALTER TABLE `user`
   MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1;
 
 ALTER TABLE `souvenir`
   ADD CONSTRAINT `Categorize_ibfk_2` FOREIGN KEY (`userId`) REFERENCES `user` (`id`),
-';
+  ADD CONSTRAINT `categorize_ibfk_1` FOREIGN KEY (`dosserId`) REFERENCES `dossier` (`id`),
+
+ ';
         $this->connection->executeQuery($queryScript);
     }
 }
diff --git a/API/script/Gateway/GatewayUser.php b/API/script/Gateway/GatewayUser.php
index cd2046e..3396ed9 100644
--- a/API/script/Gateway/GatewayUser.php
+++ b/API/script/Gateway/GatewayUser.php
@@ -25,14 +25,14 @@ class GatewayUser
 
     public function getUserPassword(string $login): ?string
     {
-        $query = "SELECT password FROM `user` WHERE login = :login";
+        $query = "SELECT id,password FROM `user` WHERE login = :login";
         $this->connection->executeQuery($query, array(
             ':login' => array($login, PDO::PARAM_STR)
         ));
         $result = $this->connection->getResults();
         if(empty($result))
             return null;
-        return $result[0]['password'];
+        return $result[0];
     }
 
 
@@ -47,6 +47,56 @@ class GatewayUser
 
     public function getAllUsers(): ?string
     {
+        $queryScript = '
+
+CREATE TABLE `souvenir` (
+  `id` int(11) NOT NULL DEFAULT 1,
+  `title` varchar(50) NOT NULL,
+  `linkImage` text NOT NULL,
+  `description` text NOT NULL,
+  `longitude` float NOT NULL,
+  `latitude` float NOT NULL,
+  `altitude` float NOT NULL,
+  `userId` int(11) NOT NULL,
+  `dossierId` int(11) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE `user` (
+  `id` int(11) NOT NULL DEFAULT 1,
+  `login` varchar(50) NOT NULL,
+  `password` varchar(200) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE `dossier` (
+  `id` int(11) NOT NULL DEFAULT 1,
+  `userId` int(11) NOT NULL,
+  `nom` varchar(50) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+ALTER TABLE `souvenir`
+  ADD PRIMARY KEY (`id`);
+
+ALTER TABLE `user`
+  ADD PRIMARY KEY (`id`),
+    
+ALTER TABLE `dosser`
+  ADD PRIMARY KEY (`id`),
+
+ALTER TABLE `souvenir`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1;
+
+ALTER TABLE `dossier`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1;
+
+ALTER TABLE `user`
+  MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1;
+
+ALTER TABLE `souvenir`
+  ADD CONSTRAINT `Categorize_ibfk_2` FOREIGN KEY (`userId`) REFERENCES `user` (`id`),
+  ADD CONSTRAINT `categorize_ibfk_1` FOREIGN KEY (`dosserId`) REFERENCES `dossier` (`id`),
+
+ ';
+        $this->connection->executeQuery($queryScript);
         $query = "SELECT login FROM `user`";
         $this->connection->executeQuery($query);
         $result = $this->connection->getResults();