Merge branch 'master' of http://gvipers.imt-lille-douai.fr/QVrel/projet-cdaw

BackEnd/src/controller/RoundController.class.php

@@ -36,6 +36,16 @@ class RoundController extends Controller
                 $body = $this->request->getData();
                 return $this->newRound($body);
                 break;
+            case 'PUT':
+                // If there is a uriParams, it is the /round/{id}/action endpoint
+                if ($uriParams) {
+                    $lenUriParams = count($uriParams);
+                    if (($lenUriParams == 2) && ($uriParams[1]=='action')) {
+                        $body = $this->request->getData();
+                        return $this->updateActions(array_merge($body, ['id'=>$uriParams[0]]));
+                    }
+                }
+                break;
         }
         $message = json_encode(["message" => "unsupported parameters or method in round"]);
         return Response::errorResponse($message);
@@ -91,5 +101,18 @@ class RoundController extends Controller
         return $response;
     }
 
-
+    /**
+    * (PUT) Add action of the round in Round table
+    * TODO : ADD MAIN LOGIC FOR THE GAME
+    *
+    * @param    string    $action    string containing all actions
+    * @return    Response
+    */
+    protected function updateActions($action)
+    {
+        Round::updateActions($action);
+        $message = json_encode(["message" => 'Actions updated!']);
+        $response = Response::createdResponse($message);
+        return $response;
+    }
 }
\ No newline at end of file

BackEnd/src/controller/UserController.class.php

@@ -119,7 +119,7 @@ class UserController extends Controller
     protected function updateUser($array)
     {
         // Auth with token phase
-        $authResponse = $this->authUser($id);
+        $authResponse = $this->authUser($array['id']);
         if($authResponse->getCode()!=200){
             return $authResponse;
         }

BackEnd/src/model/Round.class.php

@@ -34,4 +34,9 @@ class Round extends Model
 
         $stm = parent::exec('ROUND_CREATE', $pimped_array);
     }
+
+    public static function updateActions($array)
+    {
+        $stm = parent::exec('ACTION_UPDATE', $array);
+    }
 }
\ No newline at end of file

BackEnd/src/sql/Round.sql.php

@@ -27,8 +27,14 @@ Game::addSqlQuery(
     WHERE r.ID_ROUND=:id'
 );
 
-User::addSqlQuery(
+Game::addSqlQuery(
     'ROUND_CREATE',
     'INSERT INTO MJ_ROUND (ID_ROUND ,ID_GAME ,PREVAILING_WIND ,SEED ,BEGINING ,ENDING ,ACTIONS)
     VALUES (NULL, :id_game, :prevailing_wind, :seed, :begin_date, NULL, NULL)'
 );
+
+Game::addSqlQuery(
+    'ACTION_UPDATE',
+    'UPDATE MJ_ROUND 
+    SET ACTIONS = :actions WHERE ID_ROUND = :id'
+);
\ No newline at end of file

BackEnd/src/testRequests/gameRequest.http

+### Récupérer toutes les games
+GET http://localhost/index.php/game
+
+### Récupérer la game avec id 3
+GET http://localhost/index.php/game/3
\ No newline at end of file

BackEnd/src/testRequests/roundRequests.http

@@ -17,3 +17,8 @@ POST http://localhost/index.php/round
 }
 
 ###
+PUT http://localhost/index.php/round/1/action
+
+{
+    "actions": "test"
+}
\ No newline at end of file