From 59dfbc78ffebf674591ecc6e7cbda32ee667381b Mon Sep 17 00:00:00 2001 From: Yoggzo Date: Wed, 24 Feb 2016 14:51:23 +0100 Subject: [PATCH] add some error cases --- server/core/Image.php | 108 +++++++++++++++++++++++++++++++++++------- 1 file changed, 91 insertions(+), 17 deletions(-) diff --git a/server/core/Image.php b/server/core/Image.php index 85a245f..dba92ff 100644 --- a/server/core/Image.php +++ b/server/core/Image.php @@ -29,10 +29,6 @@ class image { /** @var OpenStack\Identity $libClass protected, contains the library Identity object */ protected $libClass; - /** @var array $actions protected, contains the functions which can be call by the front-end */ - protected $actions = array(); - - /** * Image constructor * @@ -71,19 +67,33 @@ class image { * **/ public function createImage(array $opt){ + if(!isset($opt)){ // Renvoyer erreur } + try{ // VOIR SI MAUVAIS TYPE $options = Array(); - if(isset($opt['name'])){ // string, rendre le nom obligatoire, vérifier nom pas déjà pris + if(isset($opt['name'])){ // if the image name already exists -> error + $imagesList = listImage(); + if(isset($images)){ + foreach($imagesList as $image){ + if(strcmp($image->name, $opt['name']) == 0){ + + } + } + } + } else{ //ERROR } if(isset($opt['id'])){ // UUID : nnnnnnnn-nnnn-nnnn-nnnn-nnnnnnnnnnnn + if($this->libClass->getImage($opt['id']) != null){ // if the id already exists -> error + + } $options['id'] = $opt['id']; } if(isset($opt['visibility'])){ // public, private @@ -131,8 +141,10 @@ class image { */ public function listImage(){ try{ - // vérifier si au moins une image $l = $this->libClass->listImages(); + if(!isset($l)){ // if the list is empty there is no images + + } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ @@ -157,11 +169,13 @@ class image { if(!isset($id)){ // Renvoyer erreur } - try{ - //vérifier existence image $service = $this->libClass; $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } + return $image; }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -190,11 +204,15 @@ class image { if(!isset($opt)){ // Renvoyer erreur } - + try{ //vérifier existence image $service = $this->libClass; $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } + $options = Array(); // Voir vérification des types @@ -241,9 +259,14 @@ class image { if(!isset($id)){ // Renvoyer erreur } + try{ $service = $this->libClass; - $service->getImage($id)->delete(); + $image = $this->libClass->getImage($id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } + $image->delete(); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ @@ -270,6 +293,9 @@ class image { // vérifier existence image $service = $this->libClass; $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } $image->reactivate(); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -296,6 +322,9 @@ class image { // vérifier existence image $service = $this->libClass; $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } $image->deactivate(); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -328,6 +357,9 @@ class image { // vérifier existence image $service = $this->libClass; $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } $stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r')); // A VOIR $image->uploadData($stream); }catch(BadResponseError $e){ @@ -355,6 +387,9 @@ class image { // vérifier existence image $service = $this->libClass; $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } $stream = $image->downloadData(); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); @@ -388,8 +423,14 @@ class image { // vérifier existence image // on doit être le proprio de l'image // vérifier membre existe - $service = $this->libClass; - $member_id = $service>getImage($image_id)->addMember($member_id); + $service = $this->libClass; + + $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } + + $member_id = $image->addMember($member_id); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ @@ -419,7 +460,13 @@ class image { // vérifier existence image $service = $this->libClass; $image = $service->getImage($image_id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } $members = $image->listMembers(); + if($member == null){ // if the image don't exists -> error + // Renvoyer erreur + } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ @@ -452,8 +499,17 @@ class image { // vérifier existence image // on doit être le proprio de l'image // vérifier membre existe - $service = $this->libClass; - $member = $service>getImage($image_id)->getMember($member_id); + $service = $this->libClass; + + $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } + + $member = $image->getMember($member_id); + if($member == null){ // if the image don't exists -> error + // Renvoyer erreur + } }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ @@ -486,8 +542,17 @@ class image { // vérifier existence image // on doit être le proprio de l'image // vérifier membre existe - $service = $this->libClass; - $service>getImage($image_id)->getMember($member_id)->delete(); + $service = $this->libClass; + + $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } + $member = $image->getMember($member_id); + if($member == null){ // if the image don't exists -> error + // Renvoyer erreur + } + $member->delete(); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){ @@ -523,7 +588,16 @@ class image { // on doit être le proprio de l'image // vérifier membre existe $service = $this->libClass; - $member = $service>getImage($image_id)->getMember($member_id)->updateStatus($status); + + $image = $service->getImage($id); + if($image == null){ // if the image don't exists -> error + // Renvoyer erreur + } + $member = $image->getMember($member_id); + if($member == null){ // if the image don't exists -> error + // Renvoyer erreur + } + $member->updateStatus($status); }catch(BadResponseError $e){ $this->app->getErrorInstance()->BadResponseHandler($e); }catch(UserInputError $e){