BitPrepared / d1b0

applications/workspace/test/Tests/AbstractAppTest.php

Doc Comments +3 added lines

@@ -33,6 +33,9 @@
         return $client;
     }
 
+    /**
+     * @param string $schema
+     */
     public function askValidation($data, $schema)
     {
         $validator = new \JsonSchema\Validator;

Unused Use Statements -4 removed lines

@@ -2,11 +2,7 @@
 
 namespace Tests;
 
-use JsonSchema\Constraints\Constraint;
-use JsonSchema\SchemaStorage;
-use JsonSchema\Uri\UriResolver;
 use JsonSchema\Validator;
-use Prophecy\Argument;
 
 trait AbstractAppTest
 {

Spacing +3 added lines, -3 removed lines

@@ -36,17 +36,17 @@
     public function askValidation($data, $schema)
     {
         $validator = new \JsonSchema\Validator;
-        $js_schema =  (object)['$ref' => 'file://' . $schema];
+        $js_schema = (object)['$ref' => 'file://'.$schema];
         $validator->check(json_decode($data), $js_schema);
         return $validator;
     }
 
-    public function evalValidation($validator){
+    public function evalValidation($validator) {
         $assert = false;
         if ($validator->isValid()) {
             echo "The supplied JSON validates against the schema.\n";
             $assert = true;
-        } else {
+        }else {
             echo "JSON does not validate. Violations:\n";
             foreach ($validator->getErrors() as $error) {
                 echo "[{$error['property']}] {$error['message']}\n";

applications/workspace/src/BitPrepared/Bundle/D1b0Workspace/Controller/V1/WorkspaceController.php

Spacing +72 added lines, -72 removed lines

@@ -132,7 +132,7 @@ 
         return JsonResponse::create($res, 201, $headers)->setSharedMaxAge(300);
     }
 
-    public function putWorkspace($id,Request $request)
+    public function putWorkspace($id, Request $request)
     {
         $user_id = $this->getSessionId();
         $data = json_decode($request->getContent(), true);
@@ -146,7 +146,7 @@ 
         $unit = $data['team']['unit'];
         $group = $data['team']['group'];
 
-        $wp = R::load("workspace",$id);
+        $wp = R::load("workspace", $id);
             $ws->title = $title;
             $ws->description = $description;
             $ws->environment = $environment;
@@ -155,7 +155,7 @@ 
         $id = R::store($ws);
 
         //save the team
-        $team = R::findOne("team","workspace = ?",[$id]);
+        $team = R::findOne("team", "workspace = ?", [$id]);
             $team->patrol = $patrol;
             $team->unit = $unit;
             $team->group = $group;
@@ -207,12 +207,12 @@ 
         return JsonResponse::create($res, 201, $headers)->setSharedMaxAge(300);
     }
 
-    public function deleteWorkspace($id,Request $request)
+    public function deleteWorkspace($id, Request $request)
     {
         //Disassocia un utente da un workspace
         $user_id = $this->getSessionId();
 
-        $wp = R::findOne("userworkspace",["workspace = ?"],[$id]);
+        $wp = R::findOne("userworkspace", ["workspace = ?"], [$id]);
         R::trash($ws);
 
         $response = new Response();
@@ -257,16 +257,16 @@ 
 
         $key = $data['key'];
 
-        $share = R::findOne("share","key = ?",[$key]);
+        $share = R::findOne("share", "key = ?", [$key]);
         echo $share->inserttime;
-        if($share !== NULL){
+        if ($share !== NULL) {
             $date = new \DateTime();
             date_sub($date, date_interval_create_from_date_string('15 minutes'));
 
-            $wp_id=$share['workspace'];
+            $wp_id = $share['workspace'];
 
             $dateOld = new \DateTime($share->inserttime);
-            if($dateOld > $date){
+            if ($dateOld > $date) {
                 $usw = R::dispense("userworkspace");
                     $usw->user = $user_id;
                     $usw->workspace = $wp_id;
@@ -275,7 +275,7 @@ 
                 $headers = [];
                 $response = JsonResponse::create(["id"=>$wp_id], 200, $headers)->setSharedMaxAge(300);
 
-            }else{
+            }else {
                 $headers = [];
                 $response = JsonResponse::create(["message"=>"Key no more valid"], 498, $headers)->setSharedMaxAge(300);
             }
@@ -297,7 +297,7 @@ 
             $part->totalpoint = 0;
         $part_id = R::store($part);
 
-        foreach($data['part'] as $r){ //TODO va fixato nelle api
+        foreach ($data['part'] as $r) { //TODO va fixato nelle api
             $resource = R::dispense("resource");
                 $resource->part = $part_id;
                 $resource->inserttime = date($this->DATE_FORMAT);
@@ -309,7 +309,7 @@ 
             $resource_id = R::store($resource);
         }
 
-        foreach($data['badges'] as $badge_id){ //TODO va fixato nelle api
+        foreach ($data['badges'] as $badge_id) { //TODO va fixato nelle api
             $pb = R::dispense("partbadge");
                 $pb->badge = $badge_id;
                 $pb->part = $part_id;
@@ -322,21 +322,21 @@ 
         return JsonResponse::create($res, 201, $headers)->setSharedMaxAge(300);
     }
 
-    public function getPart($id,$part_id, Request $request) {
+    public function getPart($id, $part_id, Request $request) {
         $user_id = $this->getSessionId();
 
         $data = json_decode($request->getContent(), true);
 
-        $part = R::findOne("part","id = ?",[$part_id]);
+        $part = R::findOne("part", "id = ?", [$part_id]);
 
-        $resource = R::findAll("resource","part = ?",[$part_id]);
+        $resource = R::findAll("resource", "part = ?", [$part_id]);
 
-        $partecipants = R::findAll("cero","part = ?",[$part_id]);
+        $partecipants = R::findAll("cero", "part = ?", [$part_id]);
 
-        $badges = R::findAll("partbadge","part = ? AND deleted = 0",[$part_id]);
+        $badges = R::findAll("partbadge", "part = ? AND deleted = 0", [$part_id]);
 
         $checked = false;
-        $res= [
+        $res = [
             "id"=>intval($part->id),
             "creation"=>$part->inserttime,
             "points"=>intval($part->points),
@@ -345,20 +345,20 @@ 
             "partecipants"=>[]
         ];
 
-        foreach($badges as $b){
-            array_push($res['badges'],$b->id);
+        foreach ($badges as $b) {
+            array_push($res['badges'], $b->id);
         }
-        foreach($resource as $r){
-            array_push($res['part'],[
+        foreach ($resource as $r) {
+            array_push($res['part'], [
                 "type"=>$r->type,
                 "hash"=>$r->hash,
                 "ref"=>$r->ref
             ]);
 
         }
-        foreach($partecipants as $p){
-            array_push($res['partecipants'],$p->user);//TODO forse va usato l'id del c'ero e non l'id dell'utente
-            if($user_id == $r['id'])
+        foreach ($partecipants as $p) {
+            array_push($res['partecipants'], $p->user); //TODO forse va usato l'id del c'ero e non l'id dell'utente
+            if ($user_id == $r['id'])
                 $checked = true;
         }
         $res['present'] = true;
@@ -367,10 +367,10 @@ 
         return JsonResponse::create($res, 201, $headers)->setSharedMaxAge(300);
     }
 
-    private function getPositionInArray($array,$id){
-        $count =0;
-        foreach($array as $a){
-            if($a->id === $id){
+    private function getPositionInArray($array, $id) {
+        $count = 0;
+        foreach ($array as $a) {
+            if ($a->id === $id) {
                 return $count;
             }
             $count = $count + 1;
@@ -378,22 +378,22 @@ 
         return -1;
     }
 
-    public function putPart($id,$part_id, Request $request) {
+    public function putPart($id, $part_id, Request $request) {
         $user_id = $this->getSessionId();
 
         $data = json_decode($request->getContent(), true);
 
-        $part = R::load("part",$part_id);
+        $part = R::load("part", $part_id);
             $part->workspace = $id;
             $part->user = $user_id;
             $part->lastupdatetime = date($this->DATE_FORMAT);
             $part->totalpoint = 0;
         $part_id = R::store($part);
 
-        $delete_res=R::findAll("resource","WHERE part = ?",[$part_id]);
+        $delete_res = R::findAll("resource", "WHERE part = ?", [$part_id]);
 
-        foreach($data['part'] as $r){ //TODO va fixato nelle api
-            $resource = R::findOne("resource","WHERE hash = ? AND deleted = 0",[$r->hash]);//TODO BISOGNA FARE IL DIFF TRA QUELLE PRESENTI E QUELLE NON PRESENTI
+        foreach ($data['part'] as $r) { //TODO va fixato nelle api
+            $resource = R::findOne("resource", "WHERE hash = ? AND deleted = 0", [$r->hash]); //TODO BISOGNA FARE IL DIFF TRA QUELLE PRESENTI E QUELLE NON PRESENTI
                 $resource->part = $part_id;
                 $resource->updatetime = date($this->DATE_FORMAT);
                 $resource->type = $r->type;
@@ -401,34 +401,34 @@ 
                 $resource->hash = $r->hash;
                 $resource->totalpoint = 0;
             $resource_id = R::store($resource);
-            $rem_id=getPositionInArray($delete_res,$resource_id);
-            if($rem_id != 0)
-                array_splice($delete_res,$rem_id,1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO
+            $rem_id = getPositionInArray($delete_res, $resource_id);
+            if ($rem_id != 0)
+                array_splice($delete_res, $rem_id, 1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO
         }
 
-        foreach($delete_res as $d){
+        foreach ($delete_res as $d) {
             //RIMUOVO REALMENTE DAL DB LE COSE CHE HO LASCIATO FUORI DALLA PUT (PRESENTI NEL DB MA NON NELLA NUOVA VERSIONE ODIO LE PUT)
-            $resource = R::load("resource",[$d->id]);
-            $resource->deleted=true;
+            $resource = R::load("resource", [$d->id]);
+            $resource->deleted = true;
             R::store($resource);
         }
 
-        $delete_badge=R::findAll("partbadge","WHERE part = ? AND deleted = 0",[$part_id]);
+        $delete_badge = R::findAll("partbadge", "WHERE part = ? AND deleted = 0", [$part_id]);
 
-        foreach($data['badges'] as $badge_id){
-            $pb = R::load("partbadge",$badge_id);
+        foreach ($data['badges'] as $badge_id) {
+            $pb = R::load("partbadge", $badge_id);
                 $pb->badge = $badge_id;
                 $pb->part = $part_id;
             $tmp = R::store($pb);
-            $rem_id=getPositionInArray($delete_badge,$tmp);
-            if($rem_id != 0)
-                array_splice($delete_badge,$rem_id,1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO
+            $rem_id = getPositionInArray($delete_badge, $tmp);
+            if ($rem_id != 0)
+                array_splice($delete_badge, $rem_id, 1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO
         }
 
-        foreach($delete_badge as $d){
+        foreach ($delete_badge as $d) {
             //RIMUOVO REALMENTE DAL DB LE COSE CHE HO LASCIATO FUORI DALLA PUT (PRESENTI NEL DB MA NON NELLA NUOVA VERSIONE ODIO LE PUT)
-            $badge = R::load("partbadge",[$d->id]);//FORSE RILOADARLI NON È NECESSARIO
-            $badge->deleted=true;
+            $badge = R::load("partbadge", [$d->id]); //FORSE RILOADARLI NON È NECESSARIO
+            $badge->deleted = true;
             R::store($badge);
         }
 
@@ -437,17 +437,17 @@ 
         return JsonResponse::create($res, 201, $headers)->setSharedMaxAge(300);
     }
 
-    public function deletePart($id,$part_id, Request $request) {
+    public function deletePart($id, $part_id, Request $request) {
         $user_id = $this->getSessionId();
-        $part = R::load("part",$part_id);
-            $part->deleted=true;
+        $part = R::load("part", $part_id);
+            $part->deleted = true;
         R::store($part);
 
 
-        $delete_badge=R::findAll("partbadge","WHERE part = ?",[$part_id]);
-        foreach($delete_badge as $d){
-            $badge = R::load("partbadge",[$d->id]);//FORSE RILOADARLI NON È NECESSARIO BASTA FARE $d->deleted=true; e store($d)
-                $badge->deleted=true;
+        $delete_badge = R::findAll("partbadge", "WHERE part = ?", [$part_id]);
+        foreach ($delete_badge as $d) {
+            $badge = R::load("partbadge", [$d->id]); //FORSE RILOADARLI NON È NECESSARIO BASTA FARE $d->deleted=true; e store($d)
+                $badge->deleted = true;
             R::store($badge);
         }
 
@@ -459,13 +459,13 @@ 
         $response->setSharedMaxAge(300);
     }
 
-    private function getPoint($badge_id,$badges){
-        foreach($badges as $b){
-            if($b->id === $badge_id){
-                if($b->completed === True){
+    private function getPoint($badge_id, $badges) {
+        foreach ($badges as $b) {
+            if ($b->id === $badge_id) {
+                if ($b->completed === True) {
                     echo "CASO 1;<BR />";
                     return $this->POINT_FOR_USING_A_CONQUERED_BADGE;
-                }else{
+                }else {
                     echo "CASO 2;<BR />";
                     return $this->POINT_FOR_USING_A_BADGE;
                 }
@@ -474,16 +474,16 @@ 
         echo "CASO 3;<BR />";
         return $this->POINT_DEFAULT;
     }
-    public function checkin($id,$part_id, Request $request) {
+    public function checkin($id, $part_id, Request $request) {
         $user_id = $this->getSessionId();
 
-        $badges = R::findAll("partbadge","part = ? AND deleted = 0",[$part_id]);
-        $u_badges = R::findAll("userbadge","user = ? AND deleted = 0",[$user_id]);
+        $badges = R::findAll("partbadge", "part = ? AND deleted = 0", [$part_id]);
+        $u_badges = R::findAll("userbadge", "user = ? AND deleted = 0", [$user_id]);
 
         $point_earned = 0;
-        foreach($badges as $b){ //SE CI SONO DEI BADGE
-            $point = $this->getPoint($b->id,$u_badges);
-            if($point != $this->POINT_DEFAULT){ //SE SEI IN CAMMINO PER QUEI BADGE O SE LI POSSIEDI GIÀ
+        foreach ($badges as $b) { //SE CI SONO DEI BADGE
+            $point = $this->getPoint($b->id, $u_badges);
+            if ($point != $this->POINT_DEFAULT) { //SE SEI IN CAMMINO PER QUEI BADGE O SE LI POSSIEDI GIÀ
                 echo "PUNTI:".$point;
                 $point_earned = $point_earned + $point;
                 $pb = R::dispense("cero");
@@ -494,7 +494,7 @@ 
                     $pb->points = $point;
                 $tmp = R::store($pb);
 
-                if($point === $this->POINT_FOR_USING_A_BADGE){ //SE SEI IN CAMMINO MA NON LI HAI ANCORA RAGGIUNTI
+                if ($point === $this->POINT_FOR_USING_A_BADGE) { //SE SEI IN CAMMINO MA NON LI HAI ANCORA RAGGIUNTI
                     $ubc = R::dispense("userbadgeclove");
                         $ubc->user = $user_id;
                         $ubc->badge = $b->id;
@@ -505,7 +505,7 @@ 
             }
         }
 
-        if($point_earned <= 0){ //SE NON CI SONO BADGE O SE TU NON SEI IN CAMMINO PER NESSUNO DI LORO
+        if ($point_earned <= 0) { //SE NON CI SONO BADGE O SE TU NON SEI IN CAMMINO PER NESSUNO DI LORO
             $pb = R::dispense("cero");
                 $pb->user = $user_id;
                 $pb->part = $part_id;
@@ -519,13 +519,13 @@ 
 
     }
 
-    public function deleteCheckin($id,$part_id, Request $request) {
+    public function deleteCheckin($id, $part_id, Request $request) {
         $user_id = $this->getSessionId();
 
-        $u_badges = R::findAll("userbadge","user = ? AND part = ?",[$user_id,$part_id]);
+        $u_badges = R::findAll("userbadge", "user = ? AND part = ?", [$user_id, $part_id]);
         R::trashAll($u_badges);
 
-        $cero = R::findAll("cero","user = ? AND part = ?",[$user_id,$part_id]);
+        $cero = R::findAll("cero", "user = ? AND part = ?", [$user_id, $part_id]);
         R::trashAll($cero);
 
         $response = new Response();

Braces +13 added lines, -8 removed lines

@@ -275,7 +275,7 @@ 
                 $headers = [];
                 $response = JsonResponse::create(["id"=>$wp_id], 200, $headers)->setSharedMaxAge(300);
 
-            }else{
+            } else{
                 $headers = [];
                 $response = JsonResponse::create(["message"=>"Key no more valid"], 498, $headers)->setSharedMaxAge(300);
             }
@@ -358,8 +358,9 @@ 
         }
         foreach($partecipants as $p){
             array_push($res['partecipants'],$p->user);//TODO forse va usato l'id del c'ero e non l'id dell'utente
-            if($user_id == $r['id'])
-                $checked = true;
+            if($user_id == $r['id']) {
+                            $checked = true;
+            }
         }
         $res['present'] = true;
 
@@ -402,8 +403,10 @@ 
                 $resource->totalpoint = 0;
             $resource_id = R::store($resource);
             $rem_id=getPositionInArray($delete_res,$resource_id);
-            if($rem_id != 0)
-                array_splice($delete_res,$rem_id,1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO
+            if($rem_id != 0) {
+                            array_splice($delete_res,$rem_id,1);
+            }
+            //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO
         }
 
         foreach($delete_res as $d){
@@ -421,8 +424,10 @@ 
                 $pb->part = $part_id;
             $tmp = R::store($pb);
             $rem_id=getPositionInArray($delete_badge,$tmp);
-            if($rem_id != 0)
-                array_splice($delete_badge,$rem_id,1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO
+            if($rem_id != 0) {
+                            array_splice($delete_badge,$rem_id,1);
+            }
+            //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO
         }
 
         foreach($delete_badge as $d){
@@ -465,7 +470,7 @@ 
                 if($b->completed === True){
                     echo "CASO 1;<BR />";
                     return $this->POINT_FOR_USING_A_CONQUERED_BADGE;
-                }else{
+                } else{
                     echo "CASO 2;<BR />";
                     return $this->POINT_FOR_USING_A_BADGE;
                 }

applications/workspace/test/Tests/WorkspaceTest.php

Indentation +6 added lines, -6 removed lines

@@ -81,12 +81,12 @@
 
 
         $client->request(
-          'POST',
-          '/api/v1/workspace/',
-          [],
-          [],
-          ['CONTENT_TYPE' => 'application/json'],
-          '{
+            'POST',
+            '/api/v1/workspace/',
+            [],
+            [],
+            ['CONTENT_TYPE' => 'application/json'],
+            '{
                 "title":"Sopraelevata",
                 "description":"I Sarchiaponi sono pronti a lanciarsi nella costruzione di una sopraelevata",
                 "environment": 22,

Spacing +10 added lines, -10 removed lines

@@ -9,7 +9,7 @@ 
 {
     use AbstractAppTest;
 
-    public function testGetWorkSpace(){
+    public function testGetWorkSpace() {
         $schema = __DIR__.'/../../../../api/schemas/workspace.json';
 
         $client = $this->createClient();
@@ -18,12 +18,12 @@ 
         $crawler = $client->request('GET', '/api/v1/workspace/1');
         $response = $client->getResponse();
         $data = $client->getResponse()->getContent();
-        $validator = $this->askValidation($data,$schema);
+        $validator = $this->askValidation($data, $schema);
 
         $assert = $this->evalValidation($validator);
         $this->assertTrue($assert);
     }
-    public function testGetWorkspaceList(){
+    public function testGetWorkspaceList() {
         $schema = __DIR__.'/../../../../api/schemas/workspaceList.json';
 
         $client = $this->createClient();
@@ -33,13 +33,13 @@ 
         $response = $client->getResponse();
 
         $data = $client->getResponse()->getContent();
-        $validator = $this->askValidation($data,$schema);
+        $validator = $this->askValidation($data, $schema);
 
         $assert = $this->evalValidation($validator);
         $this->assertTrue($assert);
     }
 
-    public function testGetWorkspaceShare(){
+    public function testGetWorkspaceShare() {
         $schema = __DIR__.'/../../../../api/schemas/workspaceShare.json';
 
         $client = $this->createClient();
@@ -50,12 +50,12 @@ 
 
         //print_r($response);
         $data = $client->getResponse()->getContent();
-        $validator = $this->askValidation($data,$schema);
+        $validator = $this->askValidation($data, $schema);
 
         $assert = $this->evalValidation($validator);
         $this->assertTrue($assert);
     }
-    public function testGetWorkspacePart(){
+    public function testGetWorkspacePart() {
         $schema = __DIR__.'/../../../../api/schemas/part.json';
 
         $client = $this->createClient();
@@ -66,13 +66,13 @@ 
 
         //print_r($response);
         $data = $client->getResponse()->getContent();
-        $validator = $this->askValidation($data,$schema);
+        $validator = $this->askValidation($data, $schema);
 
         $assert = $this->evalValidation($validator);
         $this->assertTrue($assert);
     }
 
-    public function testPostWorkspace(){
+    public function testPostWorkspace() {
         //$schema = __DIR__.'/../../../../api/schemas/workspace.json';
 
         $client = $this->createClient();
@@ -103,7 +103,7 @@ 
         $data = $client->getResponse()->getContent();
         $id = json_decode($data);
 
-        $id=$id->id;
+        $id = $id->id;
 
         $this->assertTrue(is_numeric($id));
     }