@@ -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 | } |
@@ -34,17 +34,17 @@ |
||
| 34 | 34 | return $this->pageId; |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | - public function title():?string |
|
| 37 | + public function title(): ?string |
|
| 38 | 38 | { |
| 39 | 39 | return $this->title; |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | - public function type():?string |
|
| 42 | + public function type(): ?string |
|
| 43 | 43 | { |
| 44 | 44 | return $this->type; |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - public function icon():?string |
|
| 47 | + public function icon(): ?string |
|
| 48 | 48 | { |
| 49 | 49 | return $this->icon; |
| 50 | 50 | } |
@@ -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 | } |
@@ -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(), |