@@ -11,7 +11,7 @@ |
||
11 | 11 | public function getByType(string $type, bool $isMain):array; |
12 | 12 | public function getAllByType(string $type):array; |
13 | 13 | public function save(Characteristic $c); |
14 | - public function getBy(array $conditions):?Characteristic; |
|
14 | + public function getBy(array $conditions): ?Characteristic; |
|
15 | 15 | public function search(string $type, string $search):array; |
16 | - public function getByPageId(int $pageId):?Characteristic; |
|
16 | + public function getByPageId(int $pageId): ?Characteristic; |
|
17 | 17 | } |
@@ -45,12 +45,12 @@ |
||
45 | 45 | return $this->visible; |
46 | 46 | } |
47 | 47 | |
48 | - public function icon():? string |
|
48 | + public function icon(): ? string |
|
49 | 49 | { |
50 | 50 | return $this->icon; |
51 | 51 | } |
52 | 52 | |
53 | - public function pageId():? int |
|
53 | + public function pageId(): ? int |
|
54 | 54 | { |
55 | 55 | return $this->pageId; |
56 | 56 | } |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | $allCharacteristics = app(GetAllCharacteristics::class)->get(); |
36 | 36 | try { |
37 | 37 | $context = $contextQueryByUser->execute(Auth::user()->uuid)->toArray(); |
38 | - }catch (\Throwable $e){ |
|
38 | + } catch (\Throwable $e){ |
|
39 | 39 | Log::emergency($e->getMessage().' '.$e->getLine().' '.$e->getFile().' '.$e->getTraceAsString()); |
40 | 40 | return redirect()->route('wizard.profile'); |
41 | 41 | } |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | { |
67 | 67 | try { |
68 | 68 | $user = app(GetUser::class)->get($userId)->toArray(); |
69 | - }catch (UserNotFound $e){ |
|
69 | + } catch (UserNotFound $e){ |
|
70 | 70 | throw new NotFoundHttpException(); |
71 | 71 | } |
72 | 72 |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | $allCharacteristics = app(GetAllCharacteristics::class)->get(); |
36 | 36 | try { |
37 | 37 | $context = $contextQueryByUser->execute(Auth::user()->uuid)->toArray(); |
38 | - }catch (\Throwable $e){ |
|
38 | + } catch (\Throwable $e) { |
|
39 | 39 | Log::emergency($e->getMessage().' '.$e->getLine().' '.$e->getFile().' '.$e->getTraceAsString()); |
40 | 40 | return redirect()->route('wizard.profile'); |
41 | 41 | } |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | $roles = app(GetUserRole::class)->get()->toArray(); |
44 | 44 | $practises = app(GetUserPractises::class)->get(Auth::user()->uuid); |
45 | 45 | $interactions = app(InteractionsQueryByUser::class)->get(Auth::user()->uuid); |
46 | - $usersCharacteristics = array_merge($context['productions'], $context['characteristics'], $context['characteristicsDepartement']); |
|
46 | + $usersCharacteristics = array_merge($context['productions'], $context['characteristics'], $context['characteristicsDepartement']); |
|
47 | 47 | $uuidsUserCharacteristics = array_column($usersCharacteristics, 'uuid'); |
48 | 48 | $role = last($user['roles']); |
49 | 49 | $routeComment = route('profile.comments.show'); |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | { |
69 | 69 | try { |
70 | 70 | $user = app(GetUser::class)->get($userId)->toArray(); |
71 | - }catch (UserNotFound $e){ |
|
71 | + } catch (UserNotFound $e) { |
|
72 | 72 | throw new NotFoundHttpException(); |
73 | 73 | } |
74 | 74 | |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | $roles = app(GetUserRole::class)->get()->toArray(); |
78 | 78 | $practises = app(GetUserPractises::class)->get($userId); |
79 | 79 | $interactions = app(InteractionsQueryByUser::class)->get($userId); |
80 | - $usersCharacteristics = array_merge($context['productions'], $context['characteristics']); |
|
80 | + $usersCharacteristics = array_merge($context['productions'], $context['characteristics']); |
|
81 | 81 | $uuidsUserCharacteristics = array_column($usersCharacteristics, 'uuid'); |
82 | 82 | $role = last($user['roles']); |
83 | 83 | |
@@ -143,9 +143,9 @@ discard block |
||
143 | 143 | $uri = config('wiki.api_uri').'?action=query&list=search&srwhat=text&srsearch='.$qry.'&srqiprofile=classic_noboostlinks&srnamespace=3000&format=json'; |
144 | 144 | $response = $client->get($uri); |
145 | 145 | $content = json_decode($response->getBody()->getContents(), true); |
146 | - if(isset($content['query']['search'])){ |
|
146 | + if (isset($content['query']['search'])) { |
|
147 | 147 | $results = array_column($content['query']['search'], 'title'); |
148 | - return array_map(function ($item){ |
|
148 | + return array_map(function($item) { |
|
149 | 149 | return str_replace('Structure:', '', $item); |
150 | 150 | }, $results); |
151 | 151 | } |
@@ -38,9 +38,9 @@ |
||
38 | 38 | $pages = $this->pageRepository->getByIds($pagesIds); |
39 | 39 | |
40 | 40 | $characteristics = []; |
41 | - foreach ($pages as $page){ |
|
41 | + foreach ($pages as $page) { |
|
42 | 42 | $characteristic = $this->characteristicsRepository->getByPageId($page->pageId()); |
43 | - if(!isset($characteristic)){ |
|
43 | + if (!isset($characteristic)) { |
|
44 | 44 | $type = $page->type() === 'Culture' ? Characteristic::FARMING_TYPE : Characteristic::CROPPING_SYSTEM; |
45 | 45 | $characteristic = new Characteristic( |
46 | 46 | Uuid::uuid4(), |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | ->where('page_id', $interaction->pageId()) |
27 | 27 | ->first(); |
28 | 28 | |
29 | - if($interactionModel === null) { |
|
29 | + if ($interactionModel === null) { |
|
30 | 30 | $interactionModel = new InteractionModel(); |
31 | 31 | $interactionModel->{$canInteract->key()} = isset($user->id) ? $user->id : $canInteract->identifier(); |
32 | 32 | } |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | |
39 | 39 | public function getByInteractUser(CanInteract $canInteract, int $pageId): ?Interaction |
40 | 40 | { |
41 | - if($canInteract->key() == 'user_id') { |
|
41 | + if ($canInteract->key() == 'user_id') { |
|
42 | 42 | $user = User::query()->where('uuid', $canInteract->identifier())->first(); |
43 | 43 | } |
44 | 44 | |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | ->where('page_id', $pageId) |
48 | 48 | ->first(); |
49 | 49 | |
50 | - if(!isset($interactionModel)){ |
|
50 | + if (!isset($interactionModel)) { |
|
51 | 51 | return null; |
52 | 52 | } |
53 | 53 | |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | ->orderBy('updated_at', 'desc') |
84 | 84 | ->get(); |
85 | 85 | |
86 | - foreach($interactionsModel as $interaction) { |
|
86 | + foreach ($interactionsModel as $interaction) { |
|
87 | 87 | $page = PageModel::query()->where('page_id', $interaction->page_id)->first(); |
88 | 88 | $applause = InteractionModel::query()->where('page_id', $interaction->page_id)->where('applause', true)->count(); |
89 | 89 | if ($interaction->follow) { |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | ->where('user_id', $user->id) |
106 | 106 | ->where('done', true) |
107 | 107 | ->get(); |
108 | - foreach ($records as $record){ |
|
108 | + foreach ($records as $record) { |
|
109 | 109 | $practises[] = new PractiseVo( |
110 | 110 | $record->page_id, |
111 | 111 | $record->page->title ?? '', |
@@ -134,15 +134,15 @@ discard block |
||
134 | 134 | { |
135 | 135 | return InteractionModel::query() |
136 | 136 | ->with('user.context') |
137 | - ->when($type == 'follow', function ($query) { |
|
137 | + ->when($type == 'follow', function($query) { |
|
138 | 138 | $query->where('follow', true); |
139 | 139 | }) |
140 | - ->when($type == 'do', function ($query) { |
|
140 | + ->when($type == 'do', function($query) { |
|
141 | 141 | $query->where('done', true); |
142 | 142 | }) |
143 | - ->when($characteristicId !== null, function ($query) use($characteristicId) { |
|
143 | + ->when($characteristicId !== null, function($query) use($characteristicId) { |
|
144 | 144 | $characteristic = CharacteristicsModel::query()->where('uuid', $characteristicId)->first(); |
145 | - if(!isset($characteristic)){ |
|
145 | + if (!isset($characteristic)) { |
|
146 | 146 | return; |
147 | 147 | } |
148 | 148 | $query->whereRaw( |
@@ -150,9 +150,9 @@ discard block |
||
150 | 150 | $characteristic->id |
151 | 151 | ); |
152 | 152 | }) |
153 | - ->when($characteristicIdCroppingSystem !== null, function ($query) use($characteristicIdCroppingSystem) { |
|
153 | + ->when($characteristicIdCroppingSystem !== null, function($query) use($characteristicIdCroppingSystem) { |
|
154 | 154 | $characteristic = CharacteristicsModel::query()->where('uuid', $characteristicIdCroppingSystem)->first(); |
155 | - if(!isset($characteristic)){ |
|
155 | + if (!isset($characteristic)) { |
|
156 | 156 | return; |
157 | 157 | } |
158 | 158 | $query->whereRaw( |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | $characteristic->id |
161 | 161 | ); |
162 | 162 | }) |
163 | - ->when($cp !== null, function ($query) use($cp) { |
|
163 | + ->when($cp !== null, function($query) use($cp) { |
|
164 | 164 | $query->join('users', 'users.id', 'interactions.user_id') |
165 | 165 | ->join('contexts', 'users.context_id', 'contexts.id') |
166 | 166 | ->where('contexts.postal_code', $cp); |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | ->where('page_id', $pageId) |
169 | 169 | ->whereNotNull('interactions.user_id') |
170 | 170 | ->paginate() |
171 | - ->through(function ($item){ |
|
171 | + ->through(function($item) { |
|
172 | 172 | return $item->user->context->toDto(); |
173 | 173 | }) |
174 | 174 | ; |
@@ -15,11 +15,11 @@ discard block |
||
15 | 15 | |
16 | 16 | class ContextRepositorySql implements ContextRepository |
17 | 17 | { |
18 | - public function getByUser(string $userId):?Context |
|
18 | + public function getByUser(string $userId): ?Context |
|
19 | 19 | { |
20 | 20 | $user = User::where('uuid', $userId)->first(); |
21 | 21 | $context = DB::table('contexts')->where('id', $user->context_id)->first(); |
22 | - if($context == null){ |
|
22 | + if ($context == null) { |
|
23 | 23 | return null; |
24 | 24 | } |
25 | 25 | return new Context( |
@@ -38,8 +38,8 @@ discard block |
||
38 | 38 | $user = User::where('uuid', $userId)->first(); |
39 | 39 | |
40 | 40 | $farmings = $contextData->get('farmings'); |
41 | - foreach($farmings as $farming){ |
|
42 | - $characteristic = CharacteristicsModel::where('uuid', (string)$farming)->first(); |
|
41 | + foreach ($farmings as $farming) { |
|
42 | + $characteristic = CharacteristicsModel::where('uuid', (string) $farming)->first(); |
|
43 | 43 | $user->characteristics()->save($characteristic); |
44 | 44 | } |
45 | 45 | |
@@ -51,21 +51,21 @@ discard block |
||
51 | 51 | public function getByUserDto(string $userId): ?ContextDto |
52 | 52 | { |
53 | 53 | $user = User::where('uuid', $userId)->first(); |
54 | - if($user == null){ |
|
54 | + if ($user == null) { |
|
55 | 55 | return null; |
56 | 56 | } |
57 | 57 | $context = ContextModel::find($user->context_id); |
58 | - if($context == null){ |
|
58 | + if ($context == null) { |
|
59 | 59 | return null; |
60 | 60 | } |
61 | - $characteristics = $user->characteristics()->get()->transform(function(CharacteristicsModel $item){ |
|
61 | + $characteristics = $user->characteristics()->get()->transform(function(CharacteristicsModel $item) { |
|
62 | 62 | return $item->toDto(); |
63 | 63 | }); |
64 | 64 | |
65 | 65 | $numberDepartment = (new PostalCode($context->postal_code))->department(); |
66 | 66 | $characteristicDepartment = CharacteristicsModel::query()->where('code', $numberDepartment)->first(); |
67 | 67 | |
68 | - if(isset($characteristicDepartment)){ |
|
68 | + if (isset($characteristicDepartment)) { |
|
69 | 69 | $characteristics->push($characteristicDepartment->toDto()); |
70 | 70 | } |
71 | 71 | |
@@ -83,12 +83,12 @@ discard block |
||
83 | 83 | public function update(Context $context, string $userId) |
84 | 84 | { |
85 | 85 | $user = User::where('uuid', $userId)->first(); |
86 | - if($user == null){ |
|
86 | + if ($user == null) { |
|
87 | 87 | return null; |
88 | 88 | } |
89 | 89 | |
90 | 90 | $contextModel = ContextModel::where('uuid', $context->id())->first(); |
91 | - if($contextModel == null){ |
|
91 | + if ($contextModel == null) { |
|
92 | 92 | return null; |
93 | 93 | } |
94 | 94 | $contextData = collect($context->toArray()); |
@@ -96,9 +96,9 @@ discard block |
||
96 | 96 | |
97 | 97 | $farmings = $contextData->get('farmings'); |
98 | 98 | $characteristics = []; |
99 | - foreach($farmings as $farming){ |
|
100 | - $characteristicModel = CharacteristicsModel::where('uuid', (string)$farming)->first(); |
|
101 | - if(isset($characteristicModel)) { |
|
99 | + foreach ($farmings as $farming) { |
|
100 | + $characteristicModel = CharacteristicsModel::where('uuid', (string) $farming)->first(); |
|
101 | + if (isset($characteristicModel)) { |
|
102 | 102 | $characteristics[] = $characteristicModel->id; |
103 | 103 | } |
104 | 104 | } |
@@ -19,7 +19,7 @@ |
||
19 | 19 | { |
20 | 20 | $practisesToReturn = []; |
21 | 21 | $practises = $this->interactionsRepository->getDoneByUser($userId); |
22 | - foreach ($practises as $practise){ |
|
22 | + foreach ($practises as $practise) { |
|
23 | 23 | $year = $practise->doneAt() !== null ? $practise->doneAt()->format('Y') : 'Non datée'; |
24 | 24 | $practisesToReturn[$year][] = $practise->toArray(); |
25 | 25 | } |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | { |
25 | 25 | $httpClient = new Client(); |
26 | 26 | |
27 | - PageModel::query()->where('dry', true)->chunkById(50, function ($items, $count) use($httpClient){ |
|
27 | + PageModel::query()->where('dry', true)->chunkById(50, function($items, $count) use($httpClient){ |
|
28 | 28 | $this->info(($count*50).' Pages'); |
29 | 29 | $pages = $items->pluck('page_id')->toArray(); |
30 | 30 | $pagesApiUri = config('wiki.api_uri').$this->queryPages.implode('|', $pages); |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | $content = json_decode($response->getBody()->getContents(), true); |
33 | 33 | $wikiPages = $content['query']['pages']; |
34 | 34 | |
35 | - foreach($wikiPages as $page){ |
|
35 | + foreach ($wikiPages as $page) { |
|
36 | 36 | $pageModel = PageModel::query()->where('page_id', $page['pageid'])->first(); |
37 | 37 | |
38 | 38 | if (!isset($page['title'])) |
@@ -18,11 +18,11 @@ discard block |
||
18 | 18 | ') |
19 | 19 | ->join('users', 'users.id', 'interactions.user_id') |
20 | 20 | ->join('contexts', 'users.context_id', 'contexts.id') |
21 | - ->when($type === 'follow', function ($query) { |
|
21 | + ->when($type === 'follow', function($query) { |
|
22 | 22 | $query->where('follow', true); |
23 | 23 | $query->orWhere('done', true); |
24 | 24 | }) |
25 | - ->when($type === 'do', function ($query) { |
|
25 | + ->when($type === 'do', function($query) { |
|
26 | 26 | $query->where('done', true); |
27 | 27 | }) |
28 | 28 | ->where('interactions.page_id', $pageId) |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | ->get(); |
32 | 32 | |
33 | 33 | $interactionsToReturn = []; |
34 | - foreach($interactions as $interaction){ |
|
34 | + foreach ($interactions as $interaction) { |
|
35 | 35 | $characteristicsModel = CharacteristicsModel::query()->where('code', $interaction->department)->first(); |
36 | 36 | $interaction->departmentData = $characteristicsModel; |
37 | 37 | $interactionsToReturn[] = $interaction->toArray(); |
@@ -50,11 +50,11 @@ discard block |
||
50 | 50 | ->join('contexts', 'users.context_id', 'contexts.id') |
51 | 51 | ->join('user_characteristics', 'user_characteristics.user_id', 'users.id') |
52 | 52 | ->join('characteristics', 'characteristics.id', 'user_characteristics.characteristic_id') |
53 | - ->when($type === 'follow', function ($query) { |
|
53 | + ->when($type === 'follow', function($query) { |
|
54 | 54 | $query->where('follow', true); |
55 | 55 | $query->orWhere('done', true); |
56 | 56 | }) |
57 | - ->when($type === 'do', function ($query) { |
|
57 | + ->when($type === 'do', function($query) { |
|
58 | 58 | $query->where('done', true); |
59 | 59 | }) |
60 | 60 | ->where('interactions.page_id', $pageId) |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | ->get(); |
67 | 67 | |
68 | 68 | $characteristicsToReturn = []; |
69 | - foreach($characteristicsCount as $characteristicCount){ |
|
69 | + foreach ($characteristicsCount as $characteristicCount) { |
|
70 | 70 | $characteristic = CharacteristicsModel::query()->find($characteristicCount->characteristic_id); |
71 | 71 | $characteristic->count = $characteristicCount->count; |
72 | 72 | $characteristicsToReturn[] = $characteristic->toArray(); |