@@ -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 | } |
@@ -14,11 +14,11 @@ discard block |
||
| 14 | 14 | |
| 15 | 15 | class ContextRepositorySql implements ContextRepository |
| 16 | 16 | { |
| 17 | - public function getByUser(string $userId):?Context |
|
| 17 | + public function getByUser(string $userId): ?Context |
|
| 18 | 18 | { |
| 19 | 19 | $user = User::where('uuid', $userId)->first(); |
| 20 | 20 | $context = DB::table('contexts')->where('id', $user->context_id)->first(); |
| 21 | - if($context == null){ |
|
| 21 | + if ($context == null) { |
|
| 22 | 22 | return null; |
| 23 | 23 | } |
| 24 | 24 | return new Context( |
@@ -37,8 +37,8 @@ discard block |
||
| 37 | 37 | $user = User::where('uuid', $userId)->first(); |
| 38 | 38 | |
| 39 | 39 | $farmings = $contextData->get('farmings'); |
| 40 | - foreach($farmings as $farming){ |
|
| 41 | - $characteristic = CharacteristicsModel::where('uuid', (string)$farming)->first(); |
|
| 40 | + foreach ($farmings as $farming) { |
|
| 41 | + $characteristic = CharacteristicsModel::where('uuid', (string) $farming)->first(); |
|
| 42 | 42 | $user->characteristics()->save($characteristic); |
| 43 | 43 | } |
| 44 | 44 | |
@@ -50,14 +50,14 @@ discard block |
||
| 50 | 50 | public function getByUserDto(string $userId): ?ContextDto |
| 51 | 51 | { |
| 52 | 52 | $user = User::where('uuid', $userId)->first(); |
| 53 | - if($user == null){ |
|
| 53 | + if ($user == null) { |
|
| 54 | 54 | return null; |
| 55 | 55 | } |
| 56 | 56 | $context = ContextModel::find($user->context_id); |
| 57 | - if($context == null){ |
|
| 57 | + if ($context == null) { |
|
| 58 | 58 | return null; |
| 59 | 59 | } |
| 60 | - $characteristics = $user->characteristics()->get()->transform(function(CharacteristicsModel $item){ |
|
| 60 | + $characteristics = $user->characteristics()->get()->transform(function(CharacteristicsModel $item) { |
|
| 61 | 61 | return $item->toDto(); |
| 62 | 62 | }); |
| 63 | 63 | return new ContextDto( |
@@ -74,12 +74,12 @@ discard block |
||
| 74 | 74 | public function update(Context $context, string $userId) |
| 75 | 75 | { |
| 76 | 76 | $user = User::where('uuid', $userId)->first(); |
| 77 | - if($user == null){ |
|
| 77 | + if ($user == null) { |
|
| 78 | 78 | return null; |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | $contextModel = ContextModel::where('uuid', $context->id())->first(); |
| 82 | - if($contextModel == null){ |
|
| 82 | + if ($contextModel == null) { |
|
| 83 | 83 | return null; |
| 84 | 84 | } |
| 85 | 85 | $contextData = collect($context->toArray()); |
@@ -87,9 +87,9 @@ discard block |
||
| 87 | 87 | |
| 88 | 88 | $farmings = $contextData->get('farmings'); |
| 89 | 89 | $characteristics = []; |
| 90 | - foreach($farmings as $farming){ |
|
| 91 | - $characteristicModel = CharacteristicsModel::where('uuid', (string)$farming)->first(); |
|
| 92 | - if(isset($characteristicModel)) { |
|
| 90 | + foreach ($farmings as $farming) { |
|
| 91 | + $characteristicModel = CharacteristicsModel::where('uuid', (string) $farming)->first(); |
|
| 92 | + if (isset($characteristicModel)) { |
|
| 93 | 93 | $characteristics[] = $characteristicModel->id; |
| 94 | 94 | } |
| 95 | 95 | } |
@@ -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 | } |
@@ -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']); |
|
| 46 | + $usersCharacteristics = array_merge($context['productions'], $context['characteristics']); |
|
| 47 | 47 | $uuidsUserCharacteristics = array_column($usersCharacteristics, 'uuid'); |
| 48 | 48 | $role = last($user['roles']); |
| 49 | 49 | |
@@ -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 | |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | $roles = app(GetUserRole::class)->get()->toArray(); |
| 75 | 75 | $practises = app(GetUserPractises::class)->get($userId); |
| 76 | 76 | $interactions = app(InteractionsQueryByUser::class)->get($userId); |
| 77 | - $usersCharacteristics = array_merge($context['productions'], $context['characteristics']); |
|
| 77 | + $usersCharacteristics = array_merge($context['productions'], $context['characteristics']); |
|
| 78 | 78 | $uuidsUserCharacteristics = array_column($usersCharacteristics, 'uuid'); |
| 79 | 79 | $role = last($user['roles']); |
| 80 | 80 | |
@@ -139,9 +139,9 @@ discard block |
||
| 139 | 139 | $uri = config('wiki.api_uri').'?action=query&list=search&srwhat=text&srsearch='.$qry.'&srqiprofile=classic_noboostlinks&srnamespace=3000&format=json'; |
| 140 | 140 | $response = $client->get($uri); |
| 141 | 141 | $content = json_decode($response->getBody()->getContents(), true); |
| 142 | - if(isset($content['query']['search'])){ |
|
| 142 | + if (isset($content['query']['search'])) { |
|
| 143 | 143 | $results = array_column($content['query']['search'], 'title'); |
| 144 | - return array_map(function ($item){ |
|
| 144 | + return array_map(function($item) { |
|
| 145 | 145 | return str_replace('Structure:', '', $item); |
| 146 | 146 | }, $results); |
| 147 | 147 | } |
@@ -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 | |
@@ -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 | ; |