From ae1100c16880d4bae77513ec433ac6734da8dea4 Mon Sep 17 00:00:00 2001
From: Yoggzo <yogg@epsina.com>
Date: Mon, 29 Feb 2016 15:25:30 +0100
Subject: [PATCH] Error management
---
server/Test/AppTestClass.php | 20 ++------
server/Test/imageTests.php | 4 +-
server/core/Image.php | 92 ++++++++++++++++--------------------
3 files changed, 48 insertions(+), 68 deletions(-)
diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php
index 4d1f824..57dd422 100755
--- a/server/Test/AppTestClass.php
+++ b/server/Test/AppTestClass.php
@@ -26,15 +26,10 @@ class AppTest{
$this->pluginsApi = plugin_api::getInstance();
$this->errorClass = new errorManagement($this);
$this->output = array();
-<<<<<<< HEAD
-<<<<<<< HEAD
+
$this->errorClass = new errorManagement($this);
-=======
+
$this->postParams = $_POST;
->>>>>>> develop
-=======
- $this->postParams = $_POST;
->>>>>>> develop
}
@@ -109,17 +104,12 @@ class AppTest{
return json_encode($this->output);
}
-<<<<<<< HEAD
-<<<<<<< HEAD
+
public function getErrorInstance(){
return $this->errorClass;
}
-}
-=======
}
->>>>>>> develop
-=======
-}
->>>>>>> develop
+
+
diff --git a/server/Test/imageTests.php b/server/Test/imageTests.php
index 47a69e2..d21eefb 100644
--- a/server/Test/imageTests.php
+++ b/server/Test/imageTests.php
@@ -17,7 +17,7 @@ $opt['minRam'] = 10;
//$new_image = $image->createImage($opt);
//Liste des images
-$images = $image->listImage();
+$images = $image->action("listImage");
if(isset($images)){
echo "Images présentes :";
@@ -49,7 +49,7 @@ else{
// Détails Image
//$details = $image->imageDetails($id_image);
-$image->deleteImage('123456');
+//$image->deleteImage('123456');
//$image->desactivateImage($id_image);
//$image->reactivateImage($id_image);
diff --git a/server/core/Image.php b/server/core/Image.php
index 4d22443..4025595 100644
--- a/server/core/Image.php
+++ b/server/core/Image.php
@@ -39,7 +39,7 @@ class image implements Core{
*/
public function __construct($app){
if(!isset($app)){
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Incorrect parameter");
}
try{
$this->app = $app;
@@ -79,7 +79,7 @@ class image implements Core{
private function createImage(array $opt){
if(!isset($opt)){
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Incorrect parameter");
}
@@ -98,7 +98,7 @@ class image implements Core{
}
else{
- //ERROR
+ $this->app->setOutput("Error", "Image name already exists");
}
if(isset($opt['id'])){ // UUID : nnnnnnnn-nnnn-nnnn-nnnn-nnnnnnnnnnnn
if($this->libClass->getImage($opt['id']) != null){ // if the id already exists -> error
@@ -153,7 +153,7 @@ class image implements Core{
try{
$l = $this->libClass->listImages();
if(!isset($l)){ // if the list is empty there is no images
-
+ $this->app->setOutput("Error", "No image");
}
}catch(BadResponseError $e){
$this->app->getErrorInstance()->BadResponseHandler($e);
@@ -183,7 +183,7 @@ class image implements Core{
$service = $this->libClass;
$image = $service->getImage($id);
if($image == null){ // if the image don't exists -> error
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Image doesn't exist");
}
return $image;
@@ -209,10 +209,10 @@ class image implements Core{
**/
private function updateImage($id, array $opt){
if(!isset($id)){
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Incorrect id parameter");
}
if(!isset($opt)){
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Incorrect opt parameter");
}
try{
@@ -220,7 +220,7 @@ class image implements Core{
$service = $this->libClass;
$image = $service->getImage($id);
if($image == null){ // if the image don't exists -> error
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Image doesn't exist");
}
$options = Array();
@@ -267,14 +267,14 @@ class image implements Core{
// si protected = true, demander de le mettre a false
// vérifier existence image
if(!isset($id)){
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Image doesn't exist");
}
try{
$service = $this->libClass;
$image = $this->libClass->getImage($id);
if($image == null){ // if the image don't exists -> error
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Image doesn't exist");
}
$image->delete();
}catch(BadResponseError $e){
@@ -297,14 +297,14 @@ class image implements Core{
**/
private function reactivateImage($id){
if(!isset($id)){
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Incorrect parameter");
}
try{
// vérifier existence image
$service = $this->libClass;
$image = $service->getImage($id);
if($image == null){ // if the image don't exists -> error
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Image doesn't exist");
}
$image->reactivate();
}catch(BadResponseError $e){
@@ -326,14 +326,14 @@ class image implements Core{
**/
private function desactivateImage($id){
if(!isset($id)){
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Incorrect parameter");
}
try{
// vérifier existence image
$service = $this->libClass;
$image = $service->getImage($id);
if($image == null){ // if the image don't exists -> error
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Image doesn't exist");
}
$image->deactivate();
}catch(BadResponseError $e){
@@ -358,19 +358,19 @@ class image implements Core{
**/
private function uploadImage($id, $file_name){
if(!isset($id)){
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Incorrect id parameter");
}
if(!isset($file_name)){
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Incorrect file_name parameter");
}
try{
// vérifier existence image
$service = $this->libClass;
$image = $service->getImage($id);
if($image == null){ // if the image don't exists -> error
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Image doesn't exist");
}
- $stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r')); // A VOIR
+ $stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r'));
$image->uploadData($stream);
}catch(BadResponseError $e){
$this->app->getErrorInstance()->BadResponseHandler($e);
@@ -391,14 +391,14 @@ class image implements Core{
**/
private function downloadImage($id){
if(!isset($id)){
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Incorrect parameter");
}
try{
// vérifier existence image
$service = $this->libClass;
$image = $service->getImage($id);
if($image == null){ // if the image don't exists -> error
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Image doesn't exist");
}
$stream = $image->downloadData();
}catch(BadResponseError $e){
@@ -424,22 +424,18 @@ class image implements Core{
**/
private function addMemberImage($image_id, $member_id){
if(!isset($image_id)){
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Incorrect parameter image_id");
}
if(!isset($member_id)){
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Incorrect parameter member_id");
}
try{
- // vérifier existence image
- // on doit être le proprio de l'image
- // vérifier membre existe
$service = $this->libClass;
$image = $service->getImage($id);
if($image == null){ // if the image don't exists -> error
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Image doesn't exist");
}
-
$member_id = $image->addMember($member_id);
}catch(BadResponseError $e){
$this->app->getErrorInstance()->BadResponseHandler($e);
@@ -461,21 +457,21 @@ class image implements Core{
**/
private function listMemberImage($image_id, $member_id){
if(!isset($image_id)){
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Incorrect parameter image_id");
}
if(!isset($member_id)){
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Incorrect parameter member_id");
}
try{
// vérifier existence image
$service = $this->libClass;
$image = $service->getImage($image_id);
if($image == null){ // if the image don't exists -> error
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Image doesn't exist");
}
$members = $image->listMembers();
if($member == null){ // if the image don't exists -> error
- // Renvoyer erreur
+ $this->app->setOutput("Error", "No member");
}
}catch(BadResponseError $e){
$this->app->getErrorInstance()->BadResponseHandler($e);
@@ -500,10 +496,10 @@ class image implements Core{
**/
private function detailMemberImage($image_id, $member_id){
if(!isset($image_id)){
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Incorrect parameter image_id");
}
if(!isset($member_id)){
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Incorrect parameter member_id");
}
try{
// vérifier existence image
@@ -513,12 +509,12 @@ class image implements Core{
$image = $service->getImage($id);
if($image == null){ // if the image don't exists -> error
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Image doesn't exist");
}
$member = $image->getMember($member_id);
- if($member == null){ // if the image don't exists -> error
- // Renvoyer erreur
+ if($member == null){ // if the member don't exists -> error
+ $this->app->setOutput("Error", "Member doesn't exist");
}
}catch(BadResponseError $e){
$this->app->getErrorInstance()->BadResponseHandler($e);
@@ -543,24 +539,21 @@ class image implements Core{
**/
private function removeMemberImage($image_id, $member_id){
if(!isset($image_id)){
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Incorrect parameter image_id");
}
if(!isset($member_id)){
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Incorrect parameter member_id");
}
try{
- // vérifier existence image
- // on doit être le proprio de l'image
- // vérifier membre existe
$service = $this->libClass;
$image = $service->getImage($id);
if($image == null){ // if the image don't exists -> error
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Image doesn't exist");
}
$member = $image->getMember($member_id);
if($member == null){ // if the image don't exists -> error
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Member doesn't exist");
}
$member->delete();
}catch(BadResponseError $e){
@@ -588,24 +581,21 @@ class image implements Core{
**/
private function updateMemberImage($image_id, $member_id, $status){
if(!isset($image_id)){
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Incorrect parameter image_id");
}
if(!isset($member_id)){
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Incorrect parameter member_id");
}
try{
- // vérifier existence image
- // on doit être le proprio de l'image
- // vérifier membre existe
$service = $this->libClass;
$image = $service->getImage($id);
if($image == null){ // if the image don't exists -> error
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Image doesn't exist");
}
$member = $image->getMember($member_id);
- if($member == null){ // if the image don't exists -> error
- // Renvoyer erreur
+ if($member == null){ // if the member don't exists -> error
+ $this->app->setOutput("Error", "Member doesn't exist");
}
$member->updateStatus($status);
}catch(BadResponseError $e){