BitPrepared /
d1b0
@@ -53,15 +53,14 @@ discard block |
||
| 53 | 53 | "clientId"=>$user->id |
| 54 | 54 | ]; |
| 55 | 55 | $response = JsonResponse::create($res, 200, $headers)->setSharedMaxAge(300); |
| 56 | - }else { |
|
| 56 | + } else { |
|
| 57 | 57 | $headers = []; |
| 58 | 58 | $res = [ |
| 59 | 59 | "errore"=>"sbagliato password o user" //TODO roba |
| 60 | 60 | ]; |
| 61 | 61 | $response = JsonResponse::create($res, 401, $headers)->setSharedMaxAge(300); |
| 62 | 62 | } |
| 63 | - } |
|
| 64 | - else { |
|
| 63 | + } else { |
|
| 65 | 64 | //Facebook Redirect |
| 66 | 65 | } |
| 67 | 66 | return $response; // JsonResponse::create($output, 200, $headers)->setSharedMaxAge(300); |
@@ -82,14 +81,14 @@ discard block |
||
| 82 | 81 | if (!$bean->id) { |
| 83 | 82 | //TODO mettere un controllo agli IP che forzano le richieste di token falsi |
| 84 | 83 | $response = "<html><head></head><body>Token non esistente!</body></html>"; |
| 85 | - }else { |
|
| 84 | + } else { |
|
| 86 | 85 | if (strtotime($verify->inserttime) < strtotime("-15 minutes")) { |
| 87 | 86 | $user = R::load('user', $verify->user); |
| 88 | 87 | $user->status = "enabled"; |
| 89 | 88 | $user->updatetime = date('Y-m-d H:i:s'); |
| 90 | 89 | $id = R::store($user); |
| 91 | 90 | $response = "<html><head></head><body>Account attivato complimenti!</body></html>"; |
| 92 | - }else { |
|
| 91 | + } else { |
|
| 93 | 92 | $response = "<html><head></head><body>Impossibile attivare account inserire mail e password per richiedere un nuovo token!</body></html>"; |
| 94 | 93 | } |
| 95 | 94 | } |
@@ -106,11 +106,11 @@ |
||
| 106 | 106 | $user->updatetime = date('Y-m-d G:i:s'); |
| 107 | 107 | $id = R::store($user); |
| 108 | 108 | $res = (object)["id" => $id]; |
| 109 | - }catch (Exception $e) { |
|
| 109 | + } catch (Exception $e) { |
|
| 110 | 110 | echo $e; |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | - }else { |
|
| 113 | + } else { |
|
| 114 | 114 | |
| 115 | 115 | } |
| 116 | 116 | |
@@ -28,11 +28,11 @@ |
||
| 28 | 28 | $filter = $request->get('filterBy'); |
| 29 | 29 | echo $filter; |
| 30 | 30 | |
| 31 | - $badge = R::findAll("badge","type = ? AND enable = 1",[$filter]); |
|
| 31 | + $badge = R::findAll("badge", "type = ? AND enable = 1", [$filter]); |
|
| 32 | 32 | |
| 33 | 33 | $res = []; |
| 34 | - foreach($badge as $b){ |
|
| 35 | - array_push($res,[ |
|
| 34 | + foreach ($badge as $b) { |
|
| 35 | + array_push($res, [ |
|
| 36 | 36 | "id"=>$b->id, |
| 37 | 37 | "name"=>$b->name, |
| 38 | 38 | "descritpion"=>$b->description, |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace Tests; |
| 4 | 4 | |
| 5 | 5 | use Silex\WebTestCase; |
| 6 | -use JsonSchema\Validator; |
|
| 7 | 6 | |
| 8 | 7 | class WorkspaceTest extends WebTestCase |
| 9 | 8 | { |
@@ -81,12 +81,12 @@ |
||
| 81 | 81 | |
| 82 | 82 | |
| 83 | 83 | $client->request( |
| 84 | - 'POST', |
|
| 85 | - '/api/v1/workspace/', |
|
| 86 | - [], |
|
| 87 | - [], |
|
| 88 | - ['CONTENT_TYPE' => 'application/json'], |
|
| 89 | - '{ |
|
| 84 | + 'POST', |
|
| 85 | + '/api/v1/workspace/', |
|
| 86 | + [], |
|
| 87 | + [], |
|
| 88 | + ['CONTENT_TYPE' => 'application/json'], |
|
| 89 | + '{ |
|
| 90 | 90 | "title":"Sopraelevata", |
| 91 | 91 | "description":"I Sarchiaponi sono pronti a lanciarsi nella costruzione di una sopraelevata", |
| 92 | 92 | "environment": 22, |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | { |
| 10 | 10 | use AbstractAppTest; |
| 11 | 11 | |
| 12 | - public function testGetWorkSpace(){ |
|
| 12 | + public function testGetWorkSpace() { |
|
| 13 | 13 | $schema = __DIR__.'/../../../../api/schemas/workspace.json'; |
| 14 | 14 | |
| 15 | 15 | $client = $this->createClient(); |
@@ -18,12 +18,12 @@ discard block |
||
| 18 | 18 | $crawler = $client->request('GET', '/api/v1/workspace/1'); |
| 19 | 19 | $response = $client->getResponse(); |
| 20 | 20 | $data = $client->getResponse()->getContent(); |
| 21 | - $validator = $this->askValidation($data,$schema); |
|
| 21 | + $validator = $this->askValidation($data, $schema); |
|
| 22 | 22 | |
| 23 | 23 | $assert = $this->evalValidation($validator); |
| 24 | 24 | $this->assertTrue($assert); |
| 25 | 25 | } |
| 26 | - public function testGetWorkspaceList(){ |
|
| 26 | + public function testGetWorkspaceList() { |
|
| 27 | 27 | $schema = __DIR__.'/../../../../api/schemas/workspaceList.json'; |
| 28 | 28 | |
| 29 | 29 | $client = $this->createClient(); |
@@ -33,13 +33,13 @@ discard block |
||
| 33 | 33 | $response = $client->getResponse(); |
| 34 | 34 | |
| 35 | 35 | $data = $client->getResponse()->getContent(); |
| 36 | - $validator = $this->askValidation($data,$schema); |
|
| 36 | + $validator = $this->askValidation($data, $schema); |
|
| 37 | 37 | |
| 38 | 38 | $assert = $this->evalValidation($validator); |
| 39 | 39 | $this->assertTrue($assert); |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | - public function testGetWorkspaceShare(){ |
|
| 42 | + public function testGetWorkspaceShare() { |
|
| 43 | 43 | $schema = __DIR__.'/../../../../api/schemas/workspaceShare.json'; |
| 44 | 44 | |
| 45 | 45 | $client = $this->createClient(); |
@@ -50,12 +50,12 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | //print_r($response); |
| 52 | 52 | $data = $client->getResponse()->getContent(); |
| 53 | - $validator = $this->askValidation($data,$schema); |
|
| 53 | + $validator = $this->askValidation($data, $schema); |
|
| 54 | 54 | |
| 55 | 55 | $assert = $this->evalValidation($validator); |
| 56 | 56 | $this->assertTrue($assert); |
| 57 | 57 | } |
| 58 | - public function testGetWorkspacePart(){ |
|
| 58 | + public function testGetWorkspacePart() { |
|
| 59 | 59 | $schema = __DIR__.'/../../../../api/schemas/part.json'; |
| 60 | 60 | |
| 61 | 61 | $client = $this->createClient(); |
@@ -66,13 +66,13 @@ discard block |
||
| 66 | 66 | |
| 67 | 67 | //print_r($response); |
| 68 | 68 | $data = $client->getResponse()->getContent(); |
| 69 | - $validator = $this->askValidation($data,$schema); |
|
| 69 | + $validator = $this->askValidation($data, $schema); |
|
| 70 | 70 | |
| 71 | 71 | $assert = $this->evalValidation($validator); |
| 72 | 72 | $this->assertTrue($assert); |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - public function testPostWorkspace(){ |
|
| 75 | + public function testPostWorkspace() { |
|
| 76 | 76 | //$schema = __DIR__.'/../../../../api/schemas/workspace.json'; |
| 77 | 77 | |
| 78 | 78 | $client = $this->createClient(); |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | $data = $client->getResponse()->getContent(); |
| 104 | 104 | $id = json_decode($data); |
| 105 | 105 | |
| 106 | - $id=$id->id; |
|
| 106 | + $id = $id->id; |
|
| 107 | 107 | |
| 108 | 108 | $this->assertTrue(is_numeric($id)); |
| 109 | 109 | } |
@@ -26,8 +26,10 @@ |
||
| 26 | 26 | $app['log.level'] = Monolog\Logger::DEBUG; //ERROR in prod |
| 27 | 27 | $app['api.version'] = "v1"; |
| 28 | 28 | $app['api.endpoint'] = "/api"; |
| 29 | -if (!defined('ROOT_PATH')) |
|
| 30 | - define('ROOT_PATH', __DIR__); //solo in dev va bene |
|
| 29 | +if (!defined('ROOT_PATH')) { |
|
| 30 | + define('ROOT_PATH', __DIR__); |
|
| 31 | +} |
|
| 32 | +//solo in dev va bene |
|
| 31 | 33 | // @remember: https://{enviroment}.{domain}/{contextPath}/api/v1 |
| 32 | 34 | |
| 33 | 35 | // manca il contesto , FIXME: da pensare le ACL di haproxy come saranno da qui si decide come usare come mountpoint |
@@ -24,12 +24,12 @@ |
||
| 24 | 24 | public function logIn($client) |
| 25 | 25 | { |
| 26 | 26 | $client->request( |
| 27 | - 'POST', |
|
| 28 | - '/api/v1/security/login', |
|
| 29 | - [], |
|
| 30 | - [], |
|
| 31 | - ['CONTENT_TYPE' => 'application/json'], |
|
| 32 | - '{"authMode":"Email","email":"[email protected]","name":"ugo","surname":"ugo","password":"cane"}'); |
|
| 27 | + 'POST', |
|
| 28 | + '/api/v1/security/login', |
|
| 29 | + [], |
|
| 30 | + [], |
|
| 31 | + ['CONTENT_TYPE' => 'application/json'], |
|
| 32 | + '{"authMode":"Email","email":"[email protected]","name":"ugo","surname":"ugo","password":"cane"}'); |
|
| 33 | 33 | return $client; |
| 34 | 34 | } |
| 35 | 35 | |
@@ -33,6 +33,9 @@ |
||
| 33 | 33 | return $client; |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | + /** |
|
| 37 | + * @param string $schema |
|
| 38 | + */ |
|
| 36 | 39 | public function askValidation($data, $schema) |
| 37 | 40 | { |
| 38 | 41 | $validator = new \JsonSchema\Validator; |
@@ -2,11 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Tests; |
| 4 | 4 | |
| 5 | -use JsonSchema\Constraints\Constraint; |
|
| 6 | -use JsonSchema\SchemaStorage; |
|
| 7 | -use JsonSchema\Uri\UriResolver; |
|
| 8 | 5 | use JsonSchema\Validator; |
| 9 | -use Prophecy\Argument; |
|
| 10 | 6 | |
| 11 | 7 | trait AbstractAppTest |
| 12 | 8 | { |
@@ -36,17 +36,17 @@ |
||
| 36 | 36 | public function askValidation($data, $schema) |
| 37 | 37 | { |
| 38 | 38 | $validator = new \JsonSchema\Validator; |
| 39 | - $js_schema = (object)['$ref' => 'file://' . $schema]; |
|
| 39 | + $js_schema = (object)['$ref' => 'file://'.$schema]; |
|
| 40 | 40 | $validator->check(json_decode($data), $js_schema); |
| 41 | 41 | return $validator; |
| 42 | 42 | } |
| 43 | 43 | |
| 44 | - public function evalValidation($validator){ |
|
| 44 | + public function evalValidation($validator) { |
|
| 45 | 45 | $assert = false; |
| 46 | 46 | if ($validator->isValid()) { |
| 47 | 47 | echo "The supplied JSON validates against the schema.\n"; |
| 48 | 48 | $assert = true; |
| 49 | - } else { |
|
| 49 | + }else { |
|
| 50 | 50 | echo "JSON does not validate. Violations:\n"; |
| 51 | 51 | foreach ($validator->getErrors() as $error) { |
| 52 | 52 | echo "[{$error['property']}] {$error['message']}\n"; |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | return JsonResponse::create($res, 201, $headers)->setSharedMaxAge(300); |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | - public function putWorkspace($id,Request $request) |
|
| 135 | + public function putWorkspace($id, Request $request) |
|
| 136 | 136 | { |
| 137 | 137 | $user_id = $this->getSessionId(); |
| 138 | 138 | $data = json_decode($request->getContent(), true); |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | $unit = $data['team']['unit']; |
| 147 | 147 | $group = $data['team']['group']; |
| 148 | 148 | |
| 149 | - $wp = R::load("workspace",$id); |
|
| 149 | + $wp = R::load("workspace", $id); |
|
| 150 | 150 | $ws->title = $title; |
| 151 | 151 | $ws->description = $description; |
| 152 | 152 | $ws->environment = $environment; |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | $id = R::store($ws); |
| 156 | 156 | |
| 157 | 157 | //save the team |
| 158 | - $team = R::findOne("team","workspace = ?",[$id]); |
|
| 158 | + $team = R::findOne("team", "workspace = ?", [$id]); |
|
| 159 | 159 | $team->patrol = $patrol; |
| 160 | 160 | $team->unit = $unit; |
| 161 | 161 | $team->group = $group; |
@@ -207,12 +207,12 @@ discard block |
||
| 207 | 207 | return JsonResponse::create($res, 201, $headers)->setSharedMaxAge(300); |
| 208 | 208 | } |
| 209 | 209 | |
| 210 | - public function deleteWorkspace($id,Request $request) |
|
| 210 | + public function deleteWorkspace($id, Request $request) |
|
| 211 | 211 | { |
| 212 | 212 | //Disassocia un utente da un workspace |
| 213 | 213 | $user_id = $this->getSessionId(); |
| 214 | 214 | |
| 215 | - $wp = R::findOne("userworkspace",["workspace = ?"],[$id]); |
|
| 215 | + $wp = R::findOne("userworkspace", ["workspace = ?"], [$id]); |
|
| 216 | 216 | R::trash($ws); |
| 217 | 217 | |
| 218 | 218 | $response = new Response(); |
@@ -257,16 +257,16 @@ discard block |
||
| 257 | 257 | |
| 258 | 258 | $key = $data['key']; |
| 259 | 259 | |
| 260 | - $share = R::findOne("share","key = ?",[$key]); |
|
| 260 | + $share = R::findOne("share", "key = ?", [$key]); |
|
| 261 | 261 | echo $share->inserttime; |
| 262 | - if($share !== NULL){ |
|
| 262 | + if ($share !== NULL) { |
|
| 263 | 263 | $date = new \DateTime(); |
| 264 | 264 | date_sub($date, date_interval_create_from_date_string('15 minutes')); |
| 265 | 265 | |
| 266 | - $wp_id=$share['workspace']; |
|
| 266 | + $wp_id = $share['workspace']; |
|
| 267 | 267 | |
| 268 | 268 | $dateOld = new \DateTime($share->inserttime); |
| 269 | - if($dateOld > $date){ |
|
| 269 | + if ($dateOld > $date) { |
|
| 270 | 270 | $usw = R::dispense("userworkspace"); |
| 271 | 271 | $usw->user = $user_id; |
| 272 | 272 | $usw->workspace = $wp_id; |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | $headers = []; |
| 276 | 276 | $response = JsonResponse::create(["id"=>$wp_id], 200, $headers)->setSharedMaxAge(300); |
| 277 | 277 | |
| 278 | - }else{ |
|
| 278 | + }else { |
|
| 279 | 279 | $headers = []; |
| 280 | 280 | $response = JsonResponse::create(["message"=>"Key no more valid"], 498, $headers)->setSharedMaxAge(300); |
| 281 | 281 | } |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | $part->totalpoint = 0; |
| 298 | 298 | $part_id = R::store($part); |
| 299 | 299 | |
| 300 | - foreach($data['part'] as $r){ //TODO va fixato nelle api |
|
| 300 | + foreach ($data['part'] as $r) { //TODO va fixato nelle api |
|
| 301 | 301 | $resource = R::dispense("resource"); |
| 302 | 302 | $resource->part = $part_id; |
| 303 | 303 | $resource->inserttime = date($this->DATE_FORMAT); |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | $resource_id = R::store($resource); |
| 310 | 310 | } |
| 311 | 311 | |
| 312 | - foreach($data['badges'] as $badge_id){ //TODO va fixato nelle api |
|
| 312 | + foreach ($data['badges'] as $badge_id) { //TODO va fixato nelle api |
|
| 313 | 313 | $pb = R::dispense("partbadge"); |
| 314 | 314 | $pb->badge = $badge_id; |
| 315 | 315 | $pb->part = $part_id; |
@@ -322,21 +322,21 @@ discard block |
||
| 322 | 322 | return JsonResponse::create($res, 201, $headers)->setSharedMaxAge(300); |
| 323 | 323 | } |
| 324 | 324 | |
| 325 | - public function getPart($id,$part_id, Request $request) { |
|
| 325 | + public function getPart($id, $part_id, Request $request) { |
|
| 326 | 326 | $user_id = $this->getSessionId(); |
| 327 | 327 | |
| 328 | 328 | $data = json_decode($request->getContent(), true); |
| 329 | 329 | |
| 330 | - $part = R::findOne("part","id = ?",[$part_id]); |
|
| 330 | + $part = R::findOne("part", "id = ?", [$part_id]); |
|
| 331 | 331 | |
| 332 | - $resource = R::findAll("resource","part = ?",[$part_id]); |
|
| 332 | + $resource = R::findAll("resource", "part = ?", [$part_id]); |
|
| 333 | 333 | |
| 334 | - $partecipants = R::findAll("cero","part = ?",[$part_id]); |
|
| 334 | + $partecipants = R::findAll("cero", "part = ?", [$part_id]); |
|
| 335 | 335 | |
| 336 | - $badges = R::findAll("partbadge","part = ? AND deleted = 0",[$part_id]); |
|
| 336 | + $badges = R::findAll("partbadge", "part = ? AND deleted = 0", [$part_id]); |
|
| 337 | 337 | |
| 338 | 338 | $checked = false; |
| 339 | - $res= [ |
|
| 339 | + $res = [ |
|
| 340 | 340 | "id"=>intval($part->id), |
| 341 | 341 | "creation"=>$part->inserttime, |
| 342 | 342 | "points"=>intval($part->points), |
@@ -345,20 +345,20 @@ discard block |
||
| 345 | 345 | "partecipants"=>[] |
| 346 | 346 | ]; |
| 347 | 347 | |
| 348 | - foreach($badges as $b){ |
|
| 349 | - array_push($res['badges'],$b->id); |
|
| 348 | + foreach ($badges as $b) { |
|
| 349 | + array_push($res['badges'], $b->id); |
|
| 350 | 350 | } |
| 351 | - foreach($resource as $r){ |
|
| 352 | - array_push($res['part'],[ |
|
| 351 | + foreach ($resource as $r) { |
|
| 352 | + array_push($res['part'], [ |
|
| 353 | 353 | "type"=>$r->type, |
| 354 | 354 | "hash"=>$r->hash, |
| 355 | 355 | "ref"=>$r->ref |
| 356 | 356 | ]); |
| 357 | 357 | |
| 358 | 358 | } |
| 359 | - foreach($partecipants as $p){ |
|
| 360 | - array_push($res['partecipants'],$p->user);//TODO forse va usato l'id del c'ero e non l'id dell'utente |
|
| 361 | - if($user_id == $r['id']) |
|
| 359 | + foreach ($partecipants as $p) { |
|
| 360 | + array_push($res['partecipants'], $p->user); //TODO forse va usato l'id del c'ero e non l'id dell'utente |
|
| 361 | + if ($user_id == $r['id']) |
|
| 362 | 362 | $checked = true; |
| 363 | 363 | } |
| 364 | 364 | $res['present'] = true; |
@@ -367,10 +367,10 @@ discard block |
||
| 367 | 367 | return JsonResponse::create($res, 201, $headers)->setSharedMaxAge(300); |
| 368 | 368 | } |
| 369 | 369 | |
| 370 | - private function getPositionInArray($array,$id){ |
|
| 371 | - $count =0; |
|
| 372 | - foreach($array as $a){ |
|
| 373 | - if($a->id === $id){ |
|
| 370 | + private function getPositionInArray($array, $id) { |
|
| 371 | + $count = 0; |
|
| 372 | + foreach ($array as $a) { |
|
| 373 | + if ($a->id === $id) { |
|
| 374 | 374 | return $count; |
| 375 | 375 | } |
| 376 | 376 | $count = $count + 1; |
@@ -378,22 +378,22 @@ discard block |
||
| 378 | 378 | return -1; |
| 379 | 379 | } |
| 380 | 380 | |
| 381 | - public function putPart($id,$part_id, Request $request) { |
|
| 381 | + public function putPart($id, $part_id, Request $request) { |
|
| 382 | 382 | $user_id = $this->getSessionId(); |
| 383 | 383 | |
| 384 | 384 | $data = json_decode($request->getContent(), true); |
| 385 | 385 | |
| 386 | - $part = R::load("part",$part_id); |
|
| 386 | + $part = R::load("part", $part_id); |
|
| 387 | 387 | $part->workspace = $id; |
| 388 | 388 | $part->user = $user_id; |
| 389 | 389 | $part->lastupdatetime = date($this->DATE_FORMAT); |
| 390 | 390 | $part->totalpoint = 0; |
| 391 | 391 | $part_id = R::store($part); |
| 392 | 392 | |
| 393 | - $delete_res=R::findAll("resource","WHERE part = ?",[$part_id]); |
|
| 393 | + $delete_res = R::findAll("resource", "WHERE part = ?", [$part_id]); |
|
| 394 | 394 | |
| 395 | - foreach($data['part'] as $r){ //TODO va fixato nelle api |
|
| 396 | - $resource = R::findOne("resource","WHERE hash = ? AND deleted = 0",[$r->hash]);//TODO BISOGNA FARE IL DIFF TRA QUELLE PRESENTI E QUELLE NON PRESENTI |
|
| 395 | + foreach ($data['part'] as $r) { //TODO va fixato nelle api |
|
| 396 | + $resource = R::findOne("resource", "WHERE hash = ? AND deleted = 0", [$r->hash]); //TODO BISOGNA FARE IL DIFF TRA QUELLE PRESENTI E QUELLE NON PRESENTI |
|
| 397 | 397 | $resource->part = $part_id; |
| 398 | 398 | $resource->updatetime = date($this->DATE_FORMAT); |
| 399 | 399 | $resource->type = $r->type; |
@@ -401,34 +401,34 @@ discard block |
||
| 401 | 401 | $resource->hash = $r->hash; |
| 402 | 402 | $resource->totalpoint = 0; |
| 403 | 403 | $resource_id = R::store($resource); |
| 404 | - $rem_id=getPositionInArray($delete_res,$resource_id); |
|
| 405 | - if($rem_id != 0) |
|
| 406 | - array_splice($delete_res,$rem_id,1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
| 404 | + $rem_id = getPositionInArray($delete_res, $resource_id); |
|
| 405 | + if ($rem_id != 0) |
|
| 406 | + array_splice($delete_res, $rem_id, 1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
| 407 | 407 | } |
| 408 | 408 | |
| 409 | - foreach($delete_res as $d){ |
|
| 409 | + foreach ($delete_res as $d) { |
|
| 410 | 410 | //RIMUOVO REALMENTE DAL DB LE COSE CHE HO LASCIATO FUORI DALLA PUT (PRESENTI NEL DB MA NON NELLA NUOVA VERSIONE ODIO LE PUT) |
| 411 | - $resource = R::load("resource",[$d->id]); |
|
| 412 | - $resource->deleted=true; |
|
| 411 | + $resource = R::load("resource", [$d->id]); |
|
| 412 | + $resource->deleted = true; |
|
| 413 | 413 | R::store($resource); |
| 414 | 414 | } |
| 415 | 415 | |
| 416 | - $delete_badge=R::findAll("partbadge","WHERE part = ? AND deleted = 0",[$part_id]); |
|
| 416 | + $delete_badge = R::findAll("partbadge", "WHERE part = ? AND deleted = 0", [$part_id]); |
|
| 417 | 417 | |
| 418 | - foreach($data['badges'] as $badge_id){ |
|
| 419 | - $pb = R::load("partbadge",$badge_id); |
|
| 418 | + foreach ($data['badges'] as $badge_id) { |
|
| 419 | + $pb = R::load("partbadge", $badge_id); |
|
| 420 | 420 | $pb->badge = $badge_id; |
| 421 | 421 | $pb->part = $part_id; |
| 422 | 422 | $tmp = R::store($pb); |
| 423 | - $rem_id=getPositionInArray($delete_badge,$tmp); |
|
| 424 | - if($rem_id != 0) |
|
| 425 | - array_splice($delete_badge,$rem_id,1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
| 423 | + $rem_id = getPositionInArray($delete_badge, $tmp); |
|
| 424 | + if ($rem_id != 0) |
|
| 425 | + array_splice($delete_badge, $rem_id, 1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
| 426 | 426 | } |
| 427 | 427 | |
| 428 | - foreach($delete_badge as $d){ |
|
| 428 | + foreach ($delete_badge as $d) { |
|
| 429 | 429 | //RIMUOVO REALMENTE DAL DB LE COSE CHE HO LASCIATO FUORI DALLA PUT (PRESENTI NEL DB MA NON NELLA NUOVA VERSIONE ODIO LE PUT) |
| 430 | - $badge = R::load("partbadge",[$d->id]);//FORSE RILOADARLI NON È NECESSARIO |
|
| 431 | - $badge->deleted=true; |
|
| 430 | + $badge = R::load("partbadge", [$d->id]); //FORSE RILOADARLI NON È NECESSARIO |
|
| 431 | + $badge->deleted = true; |
|
| 432 | 432 | R::store($badge); |
| 433 | 433 | } |
| 434 | 434 | |
@@ -437,17 +437,17 @@ discard block |
||
| 437 | 437 | return JsonResponse::create($res, 201, $headers)->setSharedMaxAge(300); |
| 438 | 438 | } |
| 439 | 439 | |
| 440 | - public function deletePart($id,$part_id, Request $request) { |
|
| 440 | + public function deletePart($id, $part_id, Request $request) { |
|
| 441 | 441 | $user_id = $this->getSessionId(); |
| 442 | - $part = R::load("part",$part_id); |
|
| 443 | - $part->deleted=true; |
|
| 442 | + $part = R::load("part", $part_id); |
|
| 443 | + $part->deleted = true; |
|
| 444 | 444 | R::store($part); |
| 445 | 445 | |
| 446 | 446 | |
| 447 | - $delete_badge=R::findAll("partbadge","WHERE part = ?",[$part_id]); |
|
| 448 | - foreach($delete_badge as $d){ |
|
| 449 | - $badge = R::load("partbadge",[$d->id]);//FORSE RILOADARLI NON È NECESSARIO BASTA FARE $d->deleted=true; e store($d) |
|
| 450 | - $badge->deleted=true; |
|
| 447 | + $delete_badge = R::findAll("partbadge", "WHERE part = ?", [$part_id]); |
|
| 448 | + foreach ($delete_badge as $d) { |
|
| 449 | + $badge = R::load("partbadge", [$d->id]); //FORSE RILOADARLI NON È NECESSARIO BASTA FARE $d->deleted=true; e store($d) |
|
| 450 | + $badge->deleted = true; |
|
| 451 | 451 | R::store($badge); |
| 452 | 452 | } |
| 453 | 453 | |
@@ -459,13 +459,13 @@ discard block |
||
| 459 | 459 | $response->setSharedMaxAge(300); |
| 460 | 460 | } |
| 461 | 461 | |
| 462 | - private function getPoint($badge_id,$badges){ |
|
| 463 | - foreach($badges as $b){ |
|
| 464 | - if($b->id === $badge_id){ |
|
| 465 | - if($b->completed === True){ |
|
| 462 | + private function getPoint($badge_id, $badges) { |
|
| 463 | + foreach ($badges as $b) { |
|
| 464 | + if ($b->id === $badge_id) { |
|
| 465 | + if ($b->completed === True) { |
|
| 466 | 466 | echo "CASO 1;<BR />"; |
| 467 | 467 | return $this->POINT_FOR_USING_A_CONQUERED_BADGE; |
| 468 | - }else{ |
|
| 468 | + }else { |
|
| 469 | 469 | echo "CASO 2;<BR />"; |
| 470 | 470 | return $this->POINT_FOR_USING_A_BADGE; |
| 471 | 471 | } |
@@ -474,16 +474,16 @@ discard block |
||
| 474 | 474 | echo "CASO 3;<BR />"; |
| 475 | 475 | return $this->POINT_DEFAULT; |
| 476 | 476 | } |
| 477 | - public function checkin($id,$part_id, Request $request) { |
|
| 477 | + public function checkin($id, $part_id, Request $request) { |
|
| 478 | 478 | $user_id = $this->getSessionId(); |
| 479 | 479 | |
| 480 | - $badges = R::findAll("partbadge","part = ? AND deleted = 0",[$part_id]); |
|
| 481 | - $u_badges = R::findAll("userbadge","user = ? AND deleted = 0",[$user_id]); |
|
| 480 | + $badges = R::findAll("partbadge", "part = ? AND deleted = 0", [$part_id]); |
|
| 481 | + $u_badges = R::findAll("userbadge", "user = ? AND deleted = 0", [$user_id]); |
|
| 482 | 482 | |
| 483 | 483 | $point_earned = 0; |
| 484 | - foreach($badges as $b){ //SE CI SONO DEI BADGE |
|
| 485 | - $point = $this->getPoint($b->id,$u_badges); |
|
| 486 | - if($point != $this->POINT_DEFAULT){ //SE SEI IN CAMMINO PER QUEI BADGE O SE LI POSSIEDI GIÀ |
|
| 484 | + foreach ($badges as $b) { //SE CI SONO DEI BADGE |
|
| 485 | + $point = $this->getPoint($b->id, $u_badges); |
|
| 486 | + if ($point != $this->POINT_DEFAULT) { //SE SEI IN CAMMINO PER QUEI BADGE O SE LI POSSIEDI GIÀ |
|
| 487 | 487 | echo "PUNTI:".$point; |
| 488 | 488 | $point_earned = $point_earned + $point; |
| 489 | 489 | $pb = R::dispense("cero"); |
@@ -494,7 +494,7 @@ discard block |
||
| 494 | 494 | $pb->points = $point; |
| 495 | 495 | $tmp = R::store($pb); |
| 496 | 496 | |
| 497 | - if($point === $this->POINT_FOR_USING_A_BADGE){ //SE SEI IN CAMMINO MA NON LI HAI ANCORA RAGGIUNTI |
|
| 497 | + if ($point === $this->POINT_FOR_USING_A_BADGE) { //SE SEI IN CAMMINO MA NON LI HAI ANCORA RAGGIUNTI |
|
| 498 | 498 | $ubc = R::dispense("userbadgeclove"); |
| 499 | 499 | $ubc->user = $user_id; |
| 500 | 500 | $ubc->badge = $b->id; |
@@ -505,7 +505,7 @@ discard block |
||
| 505 | 505 | } |
| 506 | 506 | } |
| 507 | 507 | |
| 508 | - if($point_earned <= 0){ //SE NON CI SONO BADGE O SE TU NON SEI IN CAMMINO PER NESSUNO DI LORO |
|
| 508 | + if ($point_earned <= 0) { //SE NON CI SONO BADGE O SE TU NON SEI IN CAMMINO PER NESSUNO DI LORO |
|
| 509 | 509 | $pb = R::dispense("cero"); |
| 510 | 510 | $pb->user = $user_id; |
| 511 | 511 | $pb->part = $part_id; |
@@ -519,13 +519,13 @@ discard block |
||
| 519 | 519 | |
| 520 | 520 | } |
| 521 | 521 | |
| 522 | - public function deleteCheckin($id,$part_id, Request $request) { |
|
| 522 | + public function deleteCheckin($id, $part_id, Request $request) { |
|
| 523 | 523 | $user_id = $this->getSessionId(); |
| 524 | 524 | |
| 525 | - $u_badges = R::findAll("userbadge","user = ? AND part = ?",[$user_id,$part_id]); |
|
| 525 | + $u_badges = R::findAll("userbadge", "user = ? AND part = ?", [$user_id, $part_id]); |
|
| 526 | 526 | R::trashAll($u_badges); |
| 527 | 527 | |
| 528 | - $cero = R::findAll("cero","user = ? AND part = ?",[$user_id,$part_id]); |
|
| 528 | + $cero = R::findAll("cero", "user = ? AND part = ?", [$user_id, $part_id]); |
|
| 529 | 529 | R::trashAll($cero); |
| 530 | 530 | |
| 531 | 531 | $response = new Response(); |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | $headers = []; |
| 276 | 276 | $response = JsonResponse::create(["id"=>$wp_id], 200, $headers)->setSharedMaxAge(300); |
| 277 | 277 | |
| 278 | - }else{ |
|
| 278 | + } else{ |
|
| 279 | 279 | $headers = []; |
| 280 | 280 | $response = JsonResponse::create(["message"=>"Key no more valid"], 498, $headers)->setSharedMaxAge(300); |
| 281 | 281 | } |
@@ -358,8 +358,9 @@ discard block |
||
| 358 | 358 | } |
| 359 | 359 | foreach($partecipants as $p){ |
| 360 | 360 | array_push($res['partecipants'],$p->user);//TODO forse va usato l'id del c'ero e non l'id dell'utente |
| 361 | - if($user_id == $r['id']) |
|
| 362 | - $checked = true; |
|
| 361 | + if($user_id == $r['id']) { |
|
| 362 | + $checked = true; |
|
| 363 | + } |
|
| 363 | 364 | } |
| 364 | 365 | $res['present'] = true; |
| 365 | 366 | |
@@ -402,8 +403,10 @@ discard block |
||
| 402 | 403 | $resource->totalpoint = 0; |
| 403 | 404 | $resource_id = R::store($resource); |
| 404 | 405 | $rem_id=getPositionInArray($delete_res,$resource_id); |
| 405 | - if($rem_id != 0) |
|
| 406 | - array_splice($delete_res,$rem_id,1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
| 406 | + if($rem_id != 0) { |
|
| 407 | + array_splice($delete_res,$rem_id,1); |
|
| 408 | + } |
|
| 409 | + //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
| 407 | 410 | } |
| 408 | 411 | |
| 409 | 412 | foreach($delete_res as $d){ |
@@ -421,8 +424,10 @@ discard block |
||
| 421 | 424 | $pb->part = $part_id; |
| 422 | 425 | $tmp = R::store($pb); |
| 423 | 426 | $rem_id=getPositionInArray($delete_badge,$tmp); |
| 424 | - if($rem_id != 0) |
|
| 425 | - array_splice($delete_badge,$rem_id,1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
| 427 | + if($rem_id != 0) { |
|
| 428 | + array_splice($delete_badge,$rem_id,1); |
|
| 429 | + } |
|
| 430 | + //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
| 426 | 431 | } |
| 427 | 432 | |
| 428 | 433 | foreach($delete_badge as $d){ |
@@ -465,7 +470,7 @@ discard block |
||
| 465 | 470 | if($b->completed === True){ |
| 466 | 471 | echo "CASO 1;<BR />"; |
| 467 | 472 | return $this->POINT_FOR_USING_A_CONQUERED_BADGE; |
| 468 | - }else{ |
|
| 473 | + } else{ |
|
| 469 | 474 | echo "CASO 2;<BR />"; |
| 470 | 475 | return $this->POINT_FOR_USING_A_BADGE; |
| 471 | 476 | } |
