@@ -2,9 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace Tests; |
4 | 4 | |
5 | -use Silex\WebTestCase; |
|
6 | -use JsonSchema\Validator; |
|
7 | - |
|
8 | 5 | class PartTest extends WorkspaceTest |
9 | 6 | { |
10 | 7 | use AbstractAppTest; |
@@ -61,12 +61,12 @@ discard block |
||
61 | 61 | "badges":[13,28]}'; |
62 | 62 | |
63 | 63 | $client->request( |
64 | - 'POST', |
|
65 | - '/api/v1/workspace/'.$id.'/part', |
|
66 | - [], |
|
67 | - [], |
|
68 | - ['CONTENT_TYPE' => 'application/json'], |
|
69 | - $part); |
|
64 | + 'POST', |
|
65 | + '/api/v1/workspace/'.$id.'/part', |
|
66 | + [], |
|
67 | + [], |
|
68 | + ['CONTENT_TYPE' => 'application/json'], |
|
69 | + $part); |
|
70 | 70 | |
71 | 71 | $response = $client->getResponse(); |
72 | 72 | |
@@ -107,12 +107,12 @@ discard block |
||
107 | 107 | "badges":[13,30]}'; |
108 | 108 | |
109 | 109 | $client->request( |
110 | - 'PUT', |
|
111 | - '/api/v1/workspace/'.$id.'/part/'.$part_id.'', |
|
112 | - [], |
|
113 | - [], |
|
114 | - ['CONTENT_TYPE' => 'application/json'], |
|
115 | - $part); |
|
110 | + 'PUT', |
|
111 | + '/api/v1/workspace/'.$id.'/part/'.$part_id.'', |
|
112 | + [], |
|
113 | + [], |
|
114 | + ['CONTENT_TYPE' => 'application/json'], |
|
115 | + $part); |
|
116 | 116 | |
117 | 117 | $response = $client->getResponse(); |
118 | 118 | $data = $client->getResponse()->getContent(); |
@@ -131,12 +131,12 @@ discard block |
||
131 | 131 | $part_id = $this->testPostWorkspacePart(); |
132 | 132 | |
133 | 133 | $client->request( |
134 | - 'DELETE', |
|
135 | - '/api/v1/workspace/'.$id.'/part/'.$part_id.'', |
|
136 | - [], |
|
137 | - [], |
|
138 | - [], |
|
139 | - ''); |
|
134 | + 'DELETE', |
|
135 | + '/api/v1/workspace/'.$id.'/part/'.$part_id.'', |
|
136 | + [], |
|
137 | + [], |
|
138 | + [], |
|
139 | + ''); |
|
140 | 140 | |
141 | 141 | $response = $client->getResponse(); |
142 | 142 | $this->assertTrue($response->isOk()); |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | |
12 | 12 | |
13 | 13 | /*verifico che una parte si possa scaricare correttamente*/ |
14 | - public function testGetWorkspacePart(){ |
|
14 | + public function testGetWorkspacePart() { |
|
15 | 15 | $schema = __DIR__.'/../../../../api/schemas/part.json'; |
16 | 16 | |
17 | 17 | $client = $this->createClient(); |
@@ -22,40 +22,40 @@ discard block |
||
22 | 22 | |
23 | 23 | //print_r($response); |
24 | 24 | $data = $client->getResponse()->getContent(); |
25 | - $validator = $this->askValidation($data,$schema); |
|
25 | + $validator = $this->askValidation($data, $schema); |
|
26 | 26 | |
27 | 27 | $assert = $this->evalValidation($validator); |
28 | 28 | $this->assertTrue($assert); |
29 | 29 | } |
30 | 30 | |
31 | 31 | |
32 | - public function testPostWorkspacePart(){ |
|
32 | + public function testPostWorkspacePart() { |
|
33 | 33 | //$schema = __DIR__.'/../../../../api/schemas/part.json'; |
34 | 34 | |
35 | 35 | $client = $this->createClient(); |
36 | 36 | $client = $this->logIn($client); |
37 | 37 | |
38 | 38 | $id = $this->testPostWorkspace(); |
39 | - $part ='{"part":[ |
|
39 | + $part = '{"part":[ |
|
40 | 40 | { |
41 | 41 | "type": "image", |
42 | 42 | "ref": "afaifnanabnawnfawba", |
43 | - "hash":"'.hash("md5",$id."prova0").'" |
|
43 | + "hash":"'.hash("md5", $id."prova0").'" |
|
44 | 44 | }, |
45 | 45 | { |
46 | 46 | "type": "image", |
47 | 47 | "ref": "awfaowapaegbgepng", |
48 | - "hash":"'.hash("md5",$id."prova1").'" |
|
48 | + "hash":"'.hash("md5", $id."prova1").'" |
|
49 | 49 | }, |
50 | 50 | { |
51 | 51 | "type": "text", |
52 | 52 | "ref": "afaafaafafafifnanabnawnfawba", |
53 | - "hash":"'.hash("md5",$id."prova2").'" |
|
53 | + "hash":"'.hash("md5", $id."prova2").'" |
|
54 | 54 | }, |
55 | 55 | { |
56 | 56 | "type": "video", |
57 | 57 | "ref": "aaafawafaggagaagegaa", |
58 | - "hash":"'.hash("md5",$id."prova3").'" |
|
58 | + "hash":"'.hash("md5", $id."prova3").'" |
|
59 | 59 | } |
60 | 60 | ], |
61 | 61 | "badges":[13,28]}'; |
@@ -73,35 +73,35 @@ discard block |
||
73 | 73 | $data = $client->getResponse()->getContent(); |
74 | 74 | $id = json_decode($data); |
75 | 75 | |
76 | - $id=$id->id; |
|
76 | + $id = $id->id; |
|
77 | 77 | |
78 | 78 | $this->assertTrue(is_numeric($id)); |
79 | 79 | return $id; |
80 | 80 | } |
81 | 81 | |
82 | - public function testPutWorkspacePart(){ |
|
82 | + public function testPutWorkspacePart() { |
|
83 | 83 | $client = $this->createClient(); |
84 | 84 | $client = $this->logIn($client); |
85 | 85 | |
86 | 86 | $id = $this->testPostWorkspace(); |
87 | 87 | $part_id = $this->testPostWorkspacePart(); |
88 | - $part ='{ |
|
88 | + $part = '{ |
|
89 | 89 | "id":'.$part_id.', |
90 | 90 | "part":[ |
91 | 91 | { |
92 | 92 | "type": "image", |
93 | 93 | "ref": "afaifnanabnawnfawba", |
94 | - "hash":"'.hash("md5",$id."prova0").'" |
|
94 | + "hash":"'.hash("md5", $id."prova0").'" |
|
95 | 95 | }, |
96 | 96 | { |
97 | 97 | "type": "image", |
98 | 98 | "ref": "awfaowapaegbgepng", |
99 | - "hash":"'.hash("md5",$id."prova1").'" |
|
99 | + "hash":"'.hash("md5", $id."prova1").'" |
|
100 | 100 | }, |
101 | 101 | { |
102 | 102 | "type": "text", |
103 | 103 | "ref": "blablablablabla", |
104 | - "hash":"'.hash("md5",$id."prova2").'" |
|
104 | + "hash":"'.hash("md5", $id."prova2").'" |
|
105 | 105 | } |
106 | 106 | ], |
107 | 107 | "badges":[13,30]}'; |
@@ -118,12 +118,12 @@ discard block |
||
118 | 118 | $data = $client->getResponse()->getContent(); |
119 | 119 | $id = json_decode($data); |
120 | 120 | |
121 | - $res_id=$id->id; |
|
121 | + $res_id = $id->id; |
|
122 | 122 | |
123 | - $this->assertEquals($part_id,$res_id); |
|
123 | + $this->assertEquals($part_id, $res_id); |
|
124 | 124 | } |
125 | 125 | |
126 | - public function testDeleteWorkspacePart(){ |
|
126 | + public function testDeleteWorkspacePart() { |
|
127 | 127 | $client = $this->createClient(); |
128 | 128 | $client = $this->logIn($client); |
129 | 129 | |
@@ -149,9 +149,9 @@ discard block |
||
149 | 149 | $js = json_decode($data); |
150 | 150 | $trovato = false; |
151 | 151 | |
152 | - foreach($js->parts as $w){ |
|
153 | - if($w === $part_id){ |
|
154 | - $trovato=true; |
|
152 | + foreach ($js->parts as $w) { |
|
153 | + if ($w === $part_id) { |
|
154 | + $trovato = true; |
|
155 | 155 | } |
156 | 156 | } |
157 | 157 | $this->assertTrue(!$trovato); |
@@ -27,6 +27,10 @@ |
||
27 | 27 | return $data; |
28 | 28 | } |
29 | 29 | /*Verifico che l'elenco dei workspace si possa scaricare correttamente*/ |
30 | + |
|
31 | + /** |
|
32 | + * @return string |
|
33 | + */ |
|
30 | 34 | public function testGetWorkspaceList(){ |
31 | 35 | $schema = __DIR__.'/../../../../api/schemas/workspaceList.json'; |
32 | 36 |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | use AbstractAppTest; |
11 | 11 | |
12 | 12 | /*Verifico che il Workspace si possa scaricare correttamente*/ |
13 | - public function testGetWorkSpace(){ |
|
13 | + public function testGetWorkSpace() { |
|
14 | 14 | $schema = __DIR__.'/../../../../api/schemas/workspace.json'; |
15 | 15 | |
16 | 16 | $client = $this->createClient(); |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | $crawler = $client->request('GET', '/api/v1/workspace/1'); |
20 | 20 | $response = $client->getResponse(); |
21 | 21 | $data = $client->getResponse()->getContent(); |
22 | - $validator = $this->askValidation($data,$schema); |
|
22 | + $validator = $this->askValidation($data, $schema); |
|
23 | 23 | |
24 | 24 | $assert = $this->evalValidation($validator); |
25 | 25 | $this->assertTrue($assert); |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | return $data; |
28 | 28 | } |
29 | 29 | /*Verifico che l'elenco dei workspace si possa scaricare correttamente*/ |
30 | - public function testGetWorkspaceList(){ |
|
30 | + public function testGetWorkspaceList() { |
|
31 | 31 | $schema = __DIR__.'/../../../../api/schemas/workspaceList.json'; |
32 | 32 | |
33 | 33 | $client = $this->createClient(); |
@@ -37,14 +37,14 @@ discard block |
||
37 | 37 | $response = $client->getResponse(); |
38 | 38 | |
39 | 39 | $data = $client->getResponse()->getContent(); |
40 | - $validator = $this->askValidation($data,$schema); |
|
40 | + $validator = $this->askValidation($data, $schema); |
|
41 | 41 | |
42 | 42 | $assert = $this->evalValidation($validator); |
43 | 43 | $this->assertTrue($assert); |
44 | 44 | return $data; |
45 | 45 | } |
46 | 46 | /*verifico che si possa condividere il workspace */ |
47 | - public function testGetWorkspaceShare(){ |
|
47 | + public function testGetWorkspaceShare() { |
|
48 | 48 | $schema = __DIR__.'/../../../../api/schemas/workspaceShare.json'; |
49 | 49 | |
50 | 50 | $client = $this->createClient(); |
@@ -55,19 +55,19 @@ discard block |
||
55 | 55 | |
56 | 56 | //print_r($response); |
57 | 57 | $data = $client->getResponse()->getContent(); |
58 | - $validator = $this->askValidation($data,$schema); |
|
58 | + $validator = $this->askValidation($data, $schema); |
|
59 | 59 | |
60 | 60 | $assert = $this->evalValidation($validator); |
61 | 61 | $this->assertTrue($assert); |
62 | 62 | } |
63 | 63 | |
64 | - public function testPostWorkspace(){ |
|
64 | + public function testPostWorkspace() { |
|
65 | 65 | //$schema = __DIR__.'/../../../../api/schemas/workspace.json'; |
66 | 66 | |
67 | 67 | $client = $this->createClient(); |
68 | 68 | $client = $this->logIn($client); |
69 | 69 | |
70 | - $wp ='{ |
|
70 | + $wp = '{ |
|
71 | 71 | "title":"Sopraelevata", |
72 | 72 | "description":"I Sarchiaponi sono pronti a lanciarsi nella costruzione di una sopraelevata", |
73 | 73 | "environment": 22, |
@@ -92,17 +92,17 @@ discard block |
||
92 | 92 | $data = $client->getResponse()->getContent(); |
93 | 93 | $id = json_decode($data); |
94 | 94 | |
95 | - $id=$id->id; |
|
95 | + $id = $id->id; |
|
96 | 96 | |
97 | 97 | $this->assertTrue(is_numeric($id)); |
98 | 98 | |
99 | 99 | return $id; |
100 | 100 | } |
101 | - public function testPutWorkspace(){ |
|
101 | + public function testPutWorkspace() { |
|
102 | 102 | //$schema = __DIR__.'/../../../../api/schemas/workspace.json'; |
103 | 103 | |
104 | 104 | $id = $this->testPostWorkspace(); |
105 | - $wp ='{ |
|
105 | + $wp = '{ |
|
106 | 106 | "id":'.$id.', |
107 | 107 | "title":"Sopraelevata_EDIT", |
108 | 108 | "description":"I Sarchiaponi sono pronti a lanciarsi nella costruzione di una sopraelevata", |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | |
137 | 137 | $this->assertTrue($response->isOk()); |
138 | 138 | } |
139 | - public function testDeleteWorkspace(){ |
|
139 | + public function testDeleteWorkspace() { |
|
140 | 140 | //$schema = __DIR__.'/../../../../api/schemas/workspace.json'; |
141 | 141 | $id = $this->testPostWorkspace(); |
142 | 142 | $client = $this->createClient(); |
@@ -154,11 +154,11 @@ discard block |
||
154 | 154 | $this->assertTrue($response->isOk()); |
155 | 155 | |
156 | 156 | $data = $this->testGetWorkspaceList(); |
157 | - $js= json_decode($data); |
|
157 | + $js = json_decode($data); |
|
158 | 158 | $trovato = false; |
159 | - foreach($js as $w){ |
|
160 | - if($w->id === $id){ |
|
161 | - $trovato=true; |
|
159 | + foreach ($js as $w) { |
|
160 | + if ($w->id === $id) { |
|
161 | + $trovato = true; |
|
162 | 162 | } |
163 | 163 | } |
164 | 164 | $this->assertTrue(!$trovato); |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | return JsonResponse::create($res, 201, $headers)->setSharedMaxAge(300); |
134 | 134 | } |
135 | 135 | |
136 | - public function putWorkspace($id,Request $request) |
|
136 | + public function putWorkspace($id, Request $request) |
|
137 | 137 | { |
138 | 138 | $user_id = $this->getSessionId(); |
139 | 139 | $data = json_decode($request->getContent(), true); |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | $unit = $data['team']['unit']; |
148 | 148 | $group = $data['team']['group']; |
149 | 149 | |
150 | - $ws = R::load("workspace",intval($id)); |
|
150 | + $ws = R::load("workspace", intval($id)); |
|
151 | 151 | $ws->title = $title; |
152 | 152 | $ws->description = $description; |
153 | 153 | $ws->environment = $environment; |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | $id = R::store($ws); |
157 | 157 | |
158 | 158 | //save the team |
159 | - $team = R::findOne("team","workspace = ?",[$id]); |
|
159 | + $team = R::findOne("team", "workspace = ?", [$id]); |
|
160 | 160 | $team->patrol = $patrol; |
161 | 161 | $team->unit = $unit; |
162 | 162 | $team->group = $group; |
@@ -208,12 +208,12 @@ discard block |
||
208 | 208 | return JsonResponse::create($res, 201, $headers)->setSharedMaxAge(300); |
209 | 209 | } |
210 | 210 | |
211 | - public function deleteWorkspace($id,Request $request) |
|
211 | + public function deleteWorkspace($id, Request $request) |
|
212 | 212 | { |
213 | 213 | //Disassocia un utente da un workspace |
214 | 214 | $user_id = $this->getSessionId(); |
215 | 215 | |
216 | - $wp = R::findOne("userworkspace","workspace = ? AND user = ?",[$id,$user_id]); |
|
216 | + $wp = R::findOne("userworkspace", "workspace = ? AND user = ?", [$id, $user_id]); |
|
217 | 217 | R::trash($wp); |
218 | 218 | |
219 | 219 | $response = new Response(); |
@@ -258,16 +258,16 @@ discard block |
||
258 | 258 | |
259 | 259 | $key = $data['key']; |
260 | 260 | |
261 | - $share = R::findOne("share","key = ?",[$key]); |
|
261 | + $share = R::findOne("share", "key = ?", [$key]); |
|
262 | 262 | echo $share->inserttime; |
263 | - if($share !== NULL){ |
|
263 | + if ($share !== NULL) { |
|
264 | 264 | $date = new \DateTime(); |
265 | 265 | date_sub($date, date_interval_create_from_date_string('15 minutes')); |
266 | 266 | |
267 | - $wp_id=$share['workspace']; |
|
267 | + $wp_id = $share['workspace']; |
|
268 | 268 | |
269 | 269 | $dateOld = new \DateTime($share->inserttime); |
270 | - if($dateOld > $date){ |
|
270 | + if ($dateOld > $date) { |
|
271 | 271 | $usw = R::dispense("userworkspace"); |
272 | 272 | $usw->user = $user_id; |
273 | 273 | $usw->workspace = $wp_id; |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | $headers = []; |
277 | 277 | $response = JsonResponse::create(["id"=>$wp_id], 200, $headers)->setSharedMaxAge(300); |
278 | 278 | |
279 | - }else{ |
|
279 | + }else { |
|
280 | 280 | $headers = []; |
281 | 281 | $response = JsonResponse::create(["message"=>"Key no more valid"], 498, $headers)->setSharedMaxAge(300); |
282 | 282 | } |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | $part_id = R::store($part); |
300 | 300 | |
301 | 301 | |
302 | - foreach($data['part'] as $r){ //TODO va fixato nelle api |
|
302 | + foreach ($data['part'] as $r) { //TODO va fixato nelle api |
|
303 | 303 | $resource = R::dispense("resource"); |
304 | 304 | $resource->part = $part_id; |
305 | 305 | $resource->inserttime = date($this->DATE_FORMAT); |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | $resource_id = R::store($resource); |
313 | 313 | } |
314 | 314 | |
315 | - foreach($data['badges'] as $badge_id){ //TODO va fixato nelle api |
|
315 | + foreach ($data['badges'] as $badge_id) { //TODO va fixato nelle api |
|
316 | 316 | $pb = R::dispense("partbadge"); |
317 | 317 | $pb->badge = $badge_id; |
318 | 318 | $pb->part = $part_id; |
@@ -325,21 +325,21 @@ discard block |
||
325 | 325 | return JsonResponse::create($res, 201, $headers)->setSharedMaxAge(300); |
326 | 326 | } |
327 | 327 | |
328 | - public function getPart($id,$part_id, Request $request) { |
|
328 | + public function getPart($id, $part_id, Request $request) { |
|
329 | 329 | $user_id = $this->getSessionId(); |
330 | 330 | |
331 | 331 | $data = json_decode($request->getContent(), true); |
332 | 332 | |
333 | - $part = R::findOne("part","id = ?",[$part_id]); |
|
333 | + $part = R::findOne("part", "id = ?", [$part_id]); |
|
334 | 334 | |
335 | - $resource = R::findAll("resource","part = ?",[$part_id]); |
|
335 | + $resource = R::findAll("resource", "part = ?", [$part_id]); |
|
336 | 336 | |
337 | - $partecipants = R::findAll("cero","part = ?",[$part_id]); |
|
337 | + $partecipants = R::findAll("cero", "part = ?", [$part_id]); |
|
338 | 338 | |
339 | - $badges = R::findAll("partbadge","part = ? AND deleted = 0",[$part_id]); |
|
339 | + $badges = R::findAll("partbadge", "part = ? AND deleted = 0", [$part_id]); |
|
340 | 340 | |
341 | 341 | $checked = false; |
342 | - $res= [ |
|
342 | + $res = [ |
|
343 | 343 | "id"=>intval($part->id), |
344 | 344 | "creation"=>$part->inserttime, |
345 | 345 | "points"=>intval($part->points), |
@@ -348,20 +348,20 @@ discard block |
||
348 | 348 | "partecipants"=>[] |
349 | 349 | ]; |
350 | 350 | |
351 | - foreach($badges as $b){ |
|
352 | - array_push($res['badges'],$b->id); |
|
351 | + foreach ($badges as $b) { |
|
352 | + array_push($res['badges'], $b->id); |
|
353 | 353 | } |
354 | - foreach($resource as $r){ |
|
355 | - array_push($res['part'],[ |
|
354 | + foreach ($resource as $r) { |
|
355 | + array_push($res['part'], [ |
|
356 | 356 | "type"=>$r->type, |
357 | 357 | "hash"=>$r->hash, |
358 | 358 | "ref"=>$r->ref |
359 | 359 | ]); |
360 | 360 | |
361 | 361 | } |
362 | - foreach($partecipants as $p){ |
|
363 | - array_push($res['partecipants'],$p->user);//TODO forse va usato l'id del c'ero e non l'id dell'utente |
|
364 | - if($user_id == $r['id']) |
|
362 | + foreach ($partecipants as $p) { |
|
363 | + array_push($res['partecipants'], $p->user); //TODO forse va usato l'id del c'ero e non l'id dell'utente |
|
364 | + if ($user_id == $r['id']) |
|
365 | 365 | $checked = true; |
366 | 366 | } |
367 | 367 | $res['present'] = true; |
@@ -370,10 +370,10 @@ discard block |
||
370 | 370 | return JsonResponse::create($res, 201, $headers)->setSharedMaxAge(300); |
371 | 371 | } |
372 | 372 | |
373 | - private function getPositionInArray($array,$id){ |
|
374 | - $count =0; |
|
375 | - foreach($array as $a){ |
|
376 | - if($a->id === $id){ |
|
373 | + private function getPositionInArray($array, $id) { |
|
374 | + $count = 0; |
|
375 | + foreach ($array as $a) { |
|
376 | + if ($a->id === $id) { |
|
377 | 377 | return $count; |
378 | 378 | } |
379 | 379 | $count = $count + 1; |
@@ -381,24 +381,24 @@ discard block |
||
381 | 381 | return -1; |
382 | 382 | } |
383 | 383 | |
384 | - public function putPart($id,$part_id, Request $request) { |
|
384 | + public function putPart($id, $part_id, Request $request) { |
|
385 | 385 | $user_id = $this->getSessionId(); |
386 | 386 | |
387 | 387 | $data = json_decode($request->getContent(), true); |
388 | 388 | |
389 | 389 | |
390 | - $part = R::load("part",$part_id); |
|
390 | + $part = R::load("part", $part_id); |
|
391 | 391 | $part->workspace = $id; |
392 | 392 | $part->user = $user_id; |
393 | 393 | $part->lastupdatetime = date($this->DATE_FORMAT); |
394 | 394 | $part->totalpoint = 0; |
395 | 395 | $part_id = R::store($part); |
396 | 396 | |
397 | - $delete_res=R::findAll("resource","WHERE part = ?",[$part_id]); |
|
397 | + $delete_res = R::findAll("resource", "WHERE part = ?", [$part_id]); |
|
398 | 398 | |
399 | - foreach($data['part'] as $r){ //TODO va fixato nelle api |
|
400 | - $resource = R::findOne("resource","WHERE hash = ? AND deleted = 0",[$r['hash']]);//TODO BISOGNA FARE IL DIFF TRA QUELLE PRESENTI E QUELLE NON PRESENTI |
|
401 | - if($resource == 0){ |
|
399 | + foreach ($data['part'] as $r) { //TODO va fixato nelle api |
|
400 | + $resource = R::findOne("resource", "WHERE hash = ? AND deleted = 0", [$r['hash']]); //TODO BISOGNA FARE IL DIFF TRA QUELLE PRESENTI E QUELLE NON PRESENTI |
|
401 | + if ($resource == 0) { |
|
402 | 402 | $resource = R::dispense("resource"); |
403 | 403 | $resource->available = false; |
404 | 404 | $resource->inserttime = date($this->DATE_FORMAT); |
@@ -410,34 +410,34 @@ discard block |
||
410 | 410 | $resource->hash = $r['hash']; |
411 | 411 | $resource->totalpoint = 0; |
412 | 412 | $resource_id = R::store($resource); |
413 | - $rem_id=$this->getPositionInArray($delete_res,$resource_id); |
|
414 | - if($rem_id != 0) |
|
415 | - array_splice($delete_res,$rem_id,1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
413 | + $rem_id = $this->getPositionInArray($delete_res, $resource_id); |
|
414 | + if ($rem_id != 0) |
|
415 | + array_splice($delete_res, $rem_id, 1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
416 | 416 | } |
417 | 417 | |
418 | - foreach($delete_res as $d){ |
|
418 | + foreach ($delete_res as $d) { |
|
419 | 419 | //RIMUOVO REALMENTE DAL DB LE COSE CHE HO LASCIATO FUORI DALLA PUT (PRESENTI NEL DB MA NON NELLA NUOVA VERSIONE ODIO LE PUT) |
420 | - $resource = R::load("resource",$d->id); |
|
421 | - $resource->deleted=true; |
|
420 | + $resource = R::load("resource", $d->id); |
|
421 | + $resource->deleted = true; |
|
422 | 422 | R::store($resource); |
423 | 423 | } |
424 | 424 | |
425 | - $delete_badge=R::findAll("partbadge","WHERE part = ? AND deleted = 0",[$part_id]); |
|
425 | + $delete_badge = R::findAll("partbadge", "WHERE part = ? AND deleted = 0", [$part_id]); |
|
426 | 426 | |
427 | - foreach($data['badges'] as $badge_id){ |
|
428 | - $pb = R::load("partbadge",$badge_id); |
|
427 | + foreach ($data['badges'] as $badge_id) { |
|
428 | + $pb = R::load("partbadge", $badge_id); |
|
429 | 429 | $pb->badge = $badge_id; |
430 | 430 | $pb->part = $part_id; |
431 | 431 | $tmp = R::store($pb); |
432 | - $rem_id=$this->getPositionInArray($delete_badge,$tmp); |
|
433 | - if($rem_id != 0) |
|
434 | - array_splice($delete_badge,$rem_id,1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
432 | + $rem_id = $this->getPositionInArray($delete_badge, $tmp); |
|
433 | + if ($rem_id != 0) |
|
434 | + array_splice($delete_badge, $rem_id, 1); //RIMUOVO GLI ELEMENTI CHE HO MODIFICATO |
|
435 | 435 | } |
436 | 436 | |
437 | - foreach($delete_badge as $d){ |
|
437 | + foreach ($delete_badge as $d) { |
|
438 | 438 | //RIMUOVO REALMENTE DAL DB LE COSE CHE HO LASCIATO FUORI DALLA PUT (PRESENTI NEL DB MA NON NELLA NUOVA VERSIONE ODIO LE PUT) |
439 | - $badge = R::load("partbadge",$d['id']);//FORSE RILOADARLI NON È NECESSARIO |
|
440 | - $badge->deleted=true; |
|
439 | + $badge = R::load("partbadge", $d['id']); //FORSE RILOADARLI NON È NECESSARIO |
|
440 | + $badge->deleted = true; |
|
441 | 441 | R::store($badge); |
442 | 442 | } |
443 | 443 | |
@@ -446,17 +446,17 @@ discard block |
||
446 | 446 | return JsonResponse::create($res, 201, $headers)->setSharedMaxAge(300); |
447 | 447 | } |
448 | 448 | |
449 | - public function deletePart($id,$part_id, Request $request) { |
|
449 | + public function deletePart($id, $part_id, Request $request) { |
|
450 | 450 | $user_id = $this->getSessionId(); |
451 | - $part = R::load("part",$part_id); |
|
452 | - $part->deleted=true; |
|
451 | + $part = R::load("part", $part_id); |
|
452 | + $part->deleted = true; |
|
453 | 453 | R::store($part); |
454 | 454 | |
455 | 455 | |
456 | - $delete_badge=R::findAll("partbadge","WHERE part = ?",[$part_id]); |
|
457 | - foreach($delete_badge as $d){ |
|
458 | - $badge = R::load("partbadge",[$d->id]);//FORSE RILOADARLI NON È NECESSARIO BASTA FARE $d->deleted=true; e store($d) |
|
459 | - $badge->deleted=true; |
|
456 | + $delete_badge = R::findAll("partbadge", "WHERE part = ?", [$part_id]); |
|
457 | + foreach ($delete_badge as $d) { |
|
458 | + $badge = R::load("partbadge", [$d->id]); //FORSE RILOADARLI NON È NECESSARIO BASTA FARE $d->deleted=true; e store($d) |
|
459 | + $badge->deleted = true; |
|
460 | 460 | R::store($badge); |
461 | 461 | } |
462 | 462 | |
@@ -468,13 +468,13 @@ discard block |
||
468 | 468 | $response->setSharedMaxAge(300); |
469 | 469 | } |
470 | 470 | |
471 | - private function getPoint($badge_id,$badges){ |
|
472 | - foreach($badges as $b){ |
|
473 | - if($b->id === $badge_id){ |
|
474 | - if($b->completed === True){ |
|
471 | + private function getPoint($badge_id, $badges) { |
|
472 | + foreach ($badges as $b) { |
|
473 | + if ($b->id === $badge_id) { |
|
474 | + if ($b->completed === True) { |
|
475 | 475 | echo "CASO 1;<BR />"; |
476 | 476 | return $this->POINT_FOR_USING_A_CONQUERED_BADGE; |
477 | - }else{ |
|
477 | + }else { |
|
478 | 478 | echo "CASO 2;<BR />"; |
479 | 479 | return $this->POINT_FOR_USING_A_BADGE; |
480 | 480 | } |
@@ -483,16 +483,16 @@ discard block |
||
483 | 483 | echo "CASO 3;<BR />"; |
484 | 484 | return $this->POINT_DEFAULT; |
485 | 485 | } |
486 | - public function checkin($id,$part_id, Request $request) { |
|
486 | + public function checkin($id, $part_id, Request $request) { |
|
487 | 487 | $user_id = $this->getSessionId(); |
488 | 488 | |
489 | - $badges = R::findAll("partbadge","part = ? AND deleted = 0",[$part_id]); |
|
490 | - $u_badges = R::findAll("userbadge","user = ? AND deleted = 0",[$user_id]); |
|
489 | + $badges = R::findAll("partbadge", "part = ? AND deleted = 0", [$part_id]); |
|
490 | + $u_badges = R::findAll("userbadge", "user = ? AND deleted = 0", [$user_id]); |
|
491 | 491 | |
492 | 492 | $point_earned = 0; |
493 | - foreach($badges as $b){ //SE CI SONO DEI BADGE |
|
494 | - $point = $this->getPoint($b->id,$u_badges); |
|
495 | - if($point != $this->POINT_DEFAULT){ //SE SEI IN CAMMINO PER QUEI BADGE O SE LI POSSIEDI GIÀ |
|
493 | + foreach ($badges as $b) { //SE CI SONO DEI BADGE |
|
494 | + $point = $this->getPoint($b->id, $u_badges); |
|
495 | + if ($point != $this->POINT_DEFAULT) { //SE SEI IN CAMMINO PER QUEI BADGE O SE LI POSSIEDI GIÀ |
|
496 | 496 | echo "PUNTI:".$point; |
497 | 497 | $point_earned = $point_earned + $point; |
498 | 498 | $pb = R::dispense("cero"); |
@@ -503,7 +503,7 @@ discard block |
||
503 | 503 | $pb->points = $point; |
504 | 504 | $tmp = R::store($pb); |
505 | 505 | |
506 | - if($point === $this->POINT_FOR_USING_A_BADGE){ //SE SEI IN CAMMINO MA NON LI HAI ANCORA RAGGIUNTI |
|
506 | + if ($point === $this->POINT_FOR_USING_A_BADGE) { //SE SEI IN CAMMINO MA NON LI HAI ANCORA RAGGIUNTI |
|
507 | 507 | $ubc = R::dispense("userbadgeclove"); |
508 | 508 | $ubc->user = $user_id; |
509 | 509 | $ubc->badge = $b->id; |
@@ -514,7 +514,7 @@ discard block |
||
514 | 514 | } |
515 | 515 | } |
516 | 516 | |
517 | - if($point_earned <= 0){ //SE NON CI SONO BADGE O SE TU NON SEI IN CAMMINO PER NESSUNO DI LORO |
|
517 | + if ($point_earned <= 0) { //SE NON CI SONO BADGE O SE TU NON SEI IN CAMMINO PER NESSUNO DI LORO |
|
518 | 518 | $pb = R::dispense("cero"); |
519 | 519 | $pb->user = $user_id; |
520 | 520 | $pb->part = $part_id; |
@@ -528,13 +528,13 @@ discard block |
||
528 | 528 | |
529 | 529 | } |
530 | 530 | |
531 | - public function deleteCheckin($id,$part_id, Request $request) { |
|
531 | + public function deleteCheckin($id, $part_id, Request $request) { |
|
532 | 532 | $user_id = $this->getSessionId(); |
533 | 533 | |
534 | - $u_badges = R::findAll("userbadge","user = ? AND part = ?",[$user_id,$part_id]); |
|
534 | + $u_badges = R::findAll("userbadge", "user = ? AND part = ?", [$user_id, $part_id]); |
|
535 | 535 | R::trashAll($u_badges); |
536 | 536 | |
537 | - $cero = R::findAll("cero","user = ? AND part = ?",[$user_id,$part_id]); |
|
537 | + $cero = R::findAll("cero", "user = ? AND part = ?", [$user_id, $part_id]); |
|
538 | 538 | R::trashAll($cero); |
539 | 539 | |
540 | 540 | $response = new Response(); |