@@ -22,7 +22,7 @@ |
||
22 | 22 | |
23 | 23 | public function toDto():ContextDto |
24 | 24 | { |
25 | - $characteristics = $this->user->characteristics()->get()->transform(function(CharacteristicsModel $item){ |
|
25 | + $characteristics = $this->user->characteristics()->get()->transform(function(CharacteristicsModel $item) { |
|
26 | 26 | return $item->toDto(); |
27 | 27 | }); |
28 | 28 | return new ContextDto( |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | public function get(string $userId) |
26 | 26 | { |
27 | 27 | $comments = Cache::get("comments_".$userId); |
28 | - if(isset($comments)){ |
|
28 | + if (isset($comments)) { |
|
29 | 29 | return json_decode($comments, true); |
30 | 30 | } |
31 | 31 | |
@@ -34,8 +34,8 @@ discard block |
||
34 | 34 | $comments = $content['query']['usercomments']; |
35 | 35 | |
36 | 36 | $commentsToRetrieved = []; |
37 | - foreach($comments as $comment){ |
|
38 | - if(!isset($commentsToRetrieved[$comment['pageid']])) { |
|
37 | + foreach ($comments as $comment) { |
|
38 | + if (!isset($commentsToRetrieved[$comment['pageid']])) { |
|
39 | 39 | $commentsToRetrieved[$comment['pageid']] = $comment; |
40 | 40 | |
41 | 41 | $realPageId = $comment['associatedid']; |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | $this->handlePages($pages); |
40 | 40 | $continue = $content['query-continue-offset'] ?? null; |
41 | 41 | |
42 | - while($continue !== null && $continue !== ''){ |
|
42 | + while ($continue !== null && $continue !== '') { |
|
43 | 43 | $this->info($continue); |
44 | 44 | |
45 | 45 | $pagesApiUri = config('wiki.api_uri').$queryPages.'|offset='.$continue; |
@@ -65,23 +65,23 @@ discard block |
||
65 | 65 | continue; |
66 | 66 | } |
67 | 67 | |
68 | - if($icon !== false) { |
|
68 | + if ($icon !== false) { |
|
69 | 69 | $picturesApiUri = config('wiki.api_uri').$this->queryPicture.$icon['fulltext']; |
70 | 70 | |
71 | 71 | $response = $this->httpClient->get($picturesApiUri); |
72 | 72 | $content = json_decode($response->getBody()->getContents(), true); |
73 | 73 | $picturesInfo = $content['query']['pages']; |
74 | - foreach($picturesInfo as $picture) { |
|
74 | + foreach ($picturesInfo as $picture) { |
|
75 | 75 | if (isset(last($picture['imageinfo'])['url'])) { |
76 | 76 | try { |
77 | 77 | $response = $this->httpClient->get(last($picture['imageinfo'])['url']); |
78 | 78 | $content = $response->getBody()->getContents(); |
79 | - $path = 'public/pages/' . $pageModel->id . '.png'; |
|
80 | - Storage::put('public/pages/' . $pageModel->id . '.png', $content); |
|
81 | - }catch (ClientException $e){ |
|
79 | + $path = 'public/pages/'.$pageModel->id.'.png'; |
|
80 | + Storage::put('public/pages/'.$pageModel->id.'.png', $content); |
|
81 | + } catch (ClientException $e) { |
|
82 | 82 | $path = ''; |
83 | 83 | } |
84 | - }else{ |
|
84 | + } else { |
|
85 | 85 | $path = ''; |
86 | 86 | } |
87 | 87 | } |
@@ -78,10 +78,10 @@ |
||
78 | 78 | $content = $response->getBody()->getContents(); |
79 | 79 | $path = 'public/pages/' . $pageModel->id . '.png'; |
80 | 80 | Storage::put('public/pages/' . $pageModel->id . '.png', $content); |
81 | - }catch (ClientException $e){ |
|
81 | + } catch (ClientException $e){ |
|
82 | 82 | $path = ''; |
83 | 83 | } |
84 | - }else{ |
|
84 | + } else{ |
|
85 | 85 | $path = ''; |
86 | 86 | } |
87 | 87 | } |
@@ -17,10 +17,10 @@ |
||
17 | 17 | |
18 | 18 | public function execute(string $type, string $search):array |
19 | 19 | { |
20 | - if($type === 'farming') { |
|
20 | + if ($type === 'farming') { |
|
21 | 21 | $type = 'culture'; |
22 | 22 | } |
23 | - if($type === 'croppingSystem') { |
|
23 | + if ($type === 'croppingSystem') { |
|
24 | 24 | $type = 'label'; |
25 | 25 | } |
26 | 26 | return $this->pageRepository->search($type, $search); |
@@ -8,7 +8,7 @@ |
||
8 | 8 | |
9 | 9 | interface PageRepository |
10 | 10 | { |
11 | - public function get(string $pageId):?Page; |
|
11 | + public function get(string $pageId): ?Page; |
|
12 | 12 | public function getByIds(array $pagesId):array; |
13 | 13 | public function save(Page $page); |
14 | 14 | } |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | public function get(string $pageId): ?Page |
15 | 15 | { |
16 | 16 | $pageModel = PageModel::where('page_id', $pageId)->first(); |
17 | - if(!isset($pageModel)){ |
|
17 | + if (!isset($pageModel)) { |
|
18 | 18 | return null; |
19 | 19 | } |
20 | 20 | return new Page($pageModel->page_id, $pageModel->dry); |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | public function save(Page $page) |
35 | 35 | { |
36 | 36 | $pageModel = PageModel::where('page_id', $page->pageId())->first(); |
37 | - if(!isset($pageModel)){ |
|
37 | + if (!isset($pageModel)) { |
|
38 | 38 | $pageModel = new PageModel(); |
39 | 39 | } |
40 | 40 | $pageModel->page_id = $page->pageId(); |
@@ -45,11 +45,11 @@ discard block |
||
45 | 45 | public function search(string $type, string $search):array |
46 | 46 | { |
47 | 47 | $pageModel = PageModel::query() |
48 | - ->where('title','LIKE', '%'.$search.'%') |
|
48 | + ->where('title', 'LIKE', '%'.$search.'%') |
|
49 | 49 | ->where('type', $type) |
50 | 50 | ->get(); |
51 | 51 | |
52 | - if(!isset($pageModel)){ |
|
52 | + if (!isset($pageModel)) { |
|
53 | 53 | return []; |
54 | 54 | } |
55 | 55 | return $pageModel->toArray(); |
@@ -32,12 +32,12 @@ discard block |
||
32 | 32 | return $list->toArray(); |
33 | 33 | } |
34 | 34 | |
35 | - public function getByPageId(int $pageId):?Characteristic |
|
35 | + public function getByPageId(int $pageId): ?Characteristic |
|
36 | 36 | { |
37 | 37 | $c = CharacteristicsModel::query() |
38 | 38 | ->where('page_id', $pageId) |
39 | 39 | ->first(); |
40 | - if(!isset($c)){ |
|
40 | + if (!isset($c)) { |
|
41 | 41 | return null; |
42 | 42 | } |
43 | 43 | return $c->toDomain(); |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | */ |
51 | 51 | public function add(array $cs) |
52 | 52 | { |
53 | - foreach ($cs as $c){ |
|
53 | + foreach ($cs as $c) { |
|
54 | 54 | $cModel = new CharacteristicsModel(); |
55 | 55 | $cModel->fill($c); |
56 | 56 | $cModel->save(); |
@@ -76,14 +76,14 @@ discard block |
||
76 | 76 | public function getBy(array $conditions): ?Characteristic |
77 | 77 | { |
78 | 78 | $characteristicModel = CharacteristicsModel::query() |
79 | - ->when(isset($conditions['type']), function ($query) use($conditions){ |
|
79 | + ->when(isset($conditions['type']), function($query) use($conditions){ |
|
80 | 80 | $query->where('type', $conditions['type']); |
81 | 81 | }) |
82 | - ->when(isset($conditions['title']), function ($query) use($conditions){ |
|
82 | + ->when(isset($conditions['title']), function($query) use($conditions){ |
|
83 | 83 | $query->where('code', $conditions['title']); |
84 | 84 | }) |
85 | 85 | ->first(); |
86 | - if(!isset($characteristicModel)){ |
|
86 | + if (!isset($characteristicModel)) { |
|
87 | 87 | return null; |
88 | 88 | } |
89 | 89 | return $characteristicModel->toDomain(); |
@@ -93,13 +93,13 @@ discard block |
||
93 | 93 | { |
94 | 94 | $characteristicModel = CharacteristicsModel::query() |
95 | 95 | ->where('type', $type) |
96 | - ->where('pretty_page_label','LIKE', '%'.$search.'%') |
|
96 | + ->where('pretty_page_label', 'LIKE', '%'.$search.'%') |
|
97 | 97 | ->get(); |
98 | 98 | |
99 | - if(!isset($characteristicModel)){ |
|
99 | + if (!isset($characteristicModel)) { |
|
100 | 100 | return []; |
101 | 101 | } |
102 | - foreach ($characteristicModel as $characteristic){ |
|
102 | + foreach ($characteristicModel as $characteristic) { |
|
103 | 103 | $characteristics[] = $characteristic->toArray(); |
104 | 104 | } |
105 | 105 | return $characteristics ?? []; |
@@ -29,7 +29,7 @@ |
||
29 | 29 | public function execute(string $id, string $type, string $title) |
30 | 30 | { |
31 | 31 | $characteristic = $this->characteristicRepository->getBy(['title' => $title, 'type' => $type]); |
32 | - if(!isset($characteristic)){ |
|
32 | + if (!isset($characteristic)) { |
|
33 | 33 | $characteristic = new Characteristic($id, $type, $title, false); |
34 | 34 | $characteristic->create(); |
35 | 35 | } |
@@ -31,7 +31,7 @@ |
||
31 | 31 | |
32 | 32 | public function create(string $icon = null) |
33 | 33 | { |
34 | - if(isset($icon)){ |
|
34 | + if (isset($icon)) { |
|
35 | 35 | copy(storage_path('app/'.$icon), storage_path('app/public/characteristics/'.$this->id.'.png')); |
36 | 36 | $this->icon = 'public/characteristics/'.$this->id.'.png'; |
37 | 37 | } |