@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | * |
41 | 41 | * @param array $relations |
42 | 42 | * @param string $sortBy |
43 | - * @param boolean $desc |
|
43 | + * @param integer $desc |
|
44 | 44 | * @param array $columns |
45 | 45 | * @return collection |
46 | 46 | */ |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | * @param integer $perPage |
61 | 61 | * @param array $relations |
62 | 62 | * @param string $sortBy |
63 | - * @param boolean $desc |
|
63 | + * @param integer $desc |
|
64 | 64 | * @param array $columns |
65 | 65 | * @return collection |
66 | 66 | */ |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | * @param integer $perPage |
80 | 80 | * @param array $relations |
81 | 81 | * @param string $sortBy |
82 | - * @param boolean $desc |
|
82 | + * @param integer $desc |
|
83 | 83 | * @param array $columns |
84 | 84 | * @return collection |
85 | 85 | */ |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | * @param integer $perPage |
101 | 101 | * @param array $relations |
102 | 102 | * @param string $sortBy |
103 | - * @param boolean $desc |
|
103 | + * @param integer $desc |
|
104 | 104 | * @param array $columns |
105 | 105 | * @return collection |
106 | 106 | */ |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | * @param array $conditions array of conditions |
180 | 180 | * @param array $relations |
181 | 181 | * @param string $sortBy |
182 | - * @param boolean $desc |
|
182 | + * @param integer $desc |
|
183 | 183 | * @param array $columns |
184 | 184 | * @return collection |
185 | 185 | */ |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | * @param array $conditions array of conditions |
215 | 215 | * @param integer $perPage |
216 | 216 | * @param string $sortBy |
217 | - * @param boolean $desc |
|
217 | + * @param integer $desc |
|
218 | 218 | * @param array $columns |
219 | 219 | * @return collection |
220 | 220 | */ |
@@ -4,251 +4,251 @@ |
||
4 | 4 | |
5 | 5 | class CachingDecorator implements RepositoryInterface |
6 | 6 | { |
7 | - /** |
|
8 | - * The repo implementation. |
|
9 | - * |
|
10 | - * @var repo |
|
11 | - */ |
|
12 | - protected $repo; |
|
7 | + /** |
|
8 | + * The repo implementation. |
|
9 | + * |
|
10 | + * @var repo |
|
11 | + */ |
|
12 | + protected $repo; |
|
13 | 13 | |
14 | - /** |
|
15 | - * The cache implementation. |
|
16 | - * |
|
17 | - * @var cache |
|
18 | - */ |
|
19 | - protected $cache; |
|
14 | + /** |
|
15 | + * The cache implementation. |
|
16 | + * |
|
17 | + * @var cache |
|
18 | + */ |
|
19 | + protected $cache; |
|
20 | 20 | |
21 | - /** |
|
22 | - * The model implementation. |
|
23 | - * |
|
24 | - * @var model |
|
25 | - */ |
|
26 | - public $model; |
|
21 | + /** |
|
22 | + * The model implementation. |
|
23 | + * |
|
24 | + * @var model |
|
25 | + */ |
|
26 | + public $model; |
|
27 | 27 | |
28 | - /** |
|
29 | - * Create new CachingDecorator instance. |
|
30 | - */ |
|
31 | - public function __construct($repo, $cache) |
|
32 | - { |
|
33 | - $this->repo = $repo; |
|
34 | - $this->cache = $cache; |
|
35 | - $this->model = get_class($this->repo->model); |
|
36 | - } |
|
28 | + /** |
|
29 | + * Create new CachingDecorator instance. |
|
30 | + */ |
|
31 | + public function __construct($repo, $cache) |
|
32 | + { |
|
33 | + $this->repo = $repo; |
|
34 | + $this->cache = $cache; |
|
35 | + $this->model = get_class($this->repo->model); |
|
36 | + } |
|
37 | 37 | |
38 | - /** |
|
39 | - * Fetch all records with relations from the storage. |
|
40 | - * |
|
41 | - * @param array $relations |
|
42 | - * @param string $sortBy |
|
43 | - * @param boolean $desc |
|
44 | - * @param array $columns |
|
45 | - * @return collection |
|
46 | - */ |
|
47 | - public function all($relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*')) |
|
48 | - { |
|
49 | - $cacheKey = 'all'; |
|
50 | - return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($relations, $sortBy, $desc, $columns) { |
|
51 | - return $this->repo->all($relations, $sortBy, $desc, $columns); |
|
52 | - }); |
|
53 | - } |
|
38 | + /** |
|
39 | + * Fetch all records with relations from the storage. |
|
40 | + * |
|
41 | + * @param array $relations |
|
42 | + * @param string $sortBy |
|
43 | + * @param boolean $desc |
|
44 | + * @param array $columns |
|
45 | + * @return collection |
|
46 | + */ |
|
47 | + public function all($relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*')) |
|
48 | + { |
|
49 | + $cacheKey = 'all'; |
|
50 | + return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($relations, $sortBy, $desc, $columns) { |
|
51 | + return $this->repo->all($relations, $sortBy, $desc, $columns); |
|
52 | + }); |
|
53 | + } |
|
54 | 54 | |
55 | - /** |
|
56 | - * Fetch all records with relations from storage in pages |
|
57 | - * that matche the given query. |
|
58 | - * |
|
59 | - * @param string $query |
|
60 | - * @param integer $perPage |
|
61 | - * @param array $relations |
|
62 | - * @param string $sortBy |
|
63 | - * @param boolean $desc |
|
64 | - * @param array $columns |
|
65 | - * @return collection |
|
66 | - */ |
|
67 | - public function search($query, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*')) |
|
68 | - { |
|
69 | - $page = \Request::get('page') ?? '1'; |
|
70 | - $cacheKey = 'search.' . $perPage . '.' . $query . '.' . $page; |
|
71 | - return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($query, $perPage, $relations, $sortBy, $desc, $columns) { |
|
72 | - return $this->repo->search($query, $perPage, $relations, $sortBy, $desc, $columns); |
|
73 | - }); |
|
74 | - } |
|
55 | + /** |
|
56 | + * Fetch all records with relations from storage in pages |
|
57 | + * that matche the given query. |
|
58 | + * |
|
59 | + * @param string $query |
|
60 | + * @param integer $perPage |
|
61 | + * @param array $relations |
|
62 | + * @param string $sortBy |
|
63 | + * @param boolean $desc |
|
64 | + * @param array $columns |
|
65 | + * @return collection |
|
66 | + */ |
|
67 | + public function search($query, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*')) |
|
68 | + { |
|
69 | + $page = \Request::get('page') ?? '1'; |
|
70 | + $cacheKey = 'search.' . $perPage . '.' . $query . '.' . $page; |
|
71 | + return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($query, $perPage, $relations, $sortBy, $desc, $columns) { |
|
72 | + return $this->repo->search($query, $perPage, $relations, $sortBy, $desc, $columns); |
|
73 | + }); |
|
74 | + } |
|
75 | 75 | |
76 | - /** |
|
77 | - * Fetch all records with relations from storage in pages. |
|
78 | - * |
|
79 | - * @param integer $perPage |
|
80 | - * @param array $relations |
|
81 | - * @param string $sortBy |
|
82 | - * @param boolean $desc |
|
83 | - * @param array $columns |
|
84 | - * @return collection |
|
85 | - */ |
|
86 | - public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*')) |
|
87 | - { |
|
88 | - $page = \Request::get('page') ?? '1'; |
|
89 | - $cacheKey = 'paginate.' . $perPage . '.' . $page; |
|
90 | - return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($perPage, $relations, $sortBy, $desc, $columns) { |
|
91 | - return $this->repo->paginate($perPage, $relations, $sortBy, $desc, $columns); |
|
92 | - }); |
|
93 | - } |
|
76 | + /** |
|
77 | + * Fetch all records with relations from storage in pages. |
|
78 | + * |
|
79 | + * @param integer $perPage |
|
80 | + * @param array $relations |
|
81 | + * @param string $sortBy |
|
82 | + * @param boolean $desc |
|
83 | + * @param array $columns |
|
84 | + * @return collection |
|
85 | + */ |
|
86 | + public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*')) |
|
87 | + { |
|
88 | + $page = \Request::get('page') ?? '1'; |
|
89 | + $cacheKey = 'paginate.' . $perPage . '.' . $page; |
|
90 | + return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($perPage, $relations, $sortBy, $desc, $columns) { |
|
91 | + return $this->repo->paginate($perPage, $relations, $sortBy, $desc, $columns); |
|
92 | + }); |
|
93 | + } |
|
94 | 94 | |
95 | - /** |
|
96 | - * Fetch all records with relations based on |
|
97 | - * the given condition from storage in pages. |
|
98 | - * |
|
99 | - * @param array $conditions array of conditions |
|
100 | - * @param integer $perPage |
|
101 | - * @param array $relations |
|
102 | - * @param string $sortBy |
|
103 | - * @param boolean $desc |
|
104 | - * @param array $columns |
|
105 | - * @return collection |
|
106 | - */ |
|
107 | - public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*')) |
|
108 | - { |
|
109 | - $page = \Request::get('page') ?? '1'; |
|
110 | - $cacheKey = 'paginateBy.' . $perPage . '.' . $page . '.' . serialize($conditions); |
|
111 | - return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($conditions, $perPage, $relations, $sortBy, $desc, $columns) { |
|
112 | - return $this->repo->paginateBy($conditions, $perPage, $relations, $sortBy, $desc, $columns); |
|
113 | - }); |
|
114 | - } |
|
95 | + /** |
|
96 | + * Fetch all records with relations based on |
|
97 | + * the given condition from storage in pages. |
|
98 | + * |
|
99 | + * @param array $conditions array of conditions |
|
100 | + * @param integer $perPage |
|
101 | + * @param array $relations |
|
102 | + * @param string $sortBy |
|
103 | + * @param boolean $desc |
|
104 | + * @param array $columns |
|
105 | + * @return collection |
|
106 | + */ |
|
107 | + public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*')) |
|
108 | + { |
|
109 | + $page = \Request::get('page') ?? '1'; |
|
110 | + $cacheKey = 'paginateBy.' . $perPage . '.' . $page . '.' . serialize($conditions); |
|
111 | + return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($conditions, $perPage, $relations, $sortBy, $desc, $columns) { |
|
112 | + return $this->repo->paginateBy($conditions, $perPage, $relations, $sortBy, $desc, $columns); |
|
113 | + }); |
|
114 | + } |
|
115 | 115 | |
116 | - /** |
|
117 | - * Save the given model to the storage. |
|
118 | - * |
|
119 | - * @param array $data |
|
120 | - * @param boolean $saveLog |
|
121 | - * @return void |
|
122 | - */ |
|
123 | - public function save(array $data, $saveLog = true) |
|
124 | - { |
|
125 | - $this->cache->tags([$this->model])->flush(); |
|
126 | - return $this->repo->save($data, $saveLog); |
|
127 | - } |
|
116 | + /** |
|
117 | + * Save the given model to the storage. |
|
118 | + * |
|
119 | + * @param array $data |
|
120 | + * @param boolean $saveLog |
|
121 | + * @return void |
|
122 | + */ |
|
123 | + public function save(array $data, $saveLog = true) |
|
124 | + { |
|
125 | + $this->cache->tags([$this->model])->flush(); |
|
126 | + return $this->repo->save($data, $saveLog); |
|
127 | + } |
|
128 | 128 | |
129 | - /** |
|
130 | - * Update record in the storage based on the given |
|
131 | - * condition. |
|
132 | - * |
|
133 | - * @param var $value condition value |
|
134 | - * @param array $data |
|
135 | - * @param string $attribute condition column name |
|
136 | - * @return void |
|
137 | - */ |
|
138 | - public function update($value, array $data, $attribute = 'id', $saveLog = true) |
|
139 | - { |
|
140 | - $this->cache->tags([$this->model])->flush(); |
|
141 | - return $this->repo->update($value, $data, $attribute, $saveLog); |
|
142 | - } |
|
129 | + /** |
|
130 | + * Update record in the storage based on the given |
|
131 | + * condition. |
|
132 | + * |
|
133 | + * @param var $value condition value |
|
134 | + * @param array $data |
|
135 | + * @param string $attribute condition column name |
|
136 | + * @return void |
|
137 | + */ |
|
138 | + public function update($value, array $data, $attribute = 'id', $saveLog = true) |
|
139 | + { |
|
140 | + $this->cache->tags([$this->model])->flush(); |
|
141 | + return $this->repo->update($value, $data, $attribute, $saveLog); |
|
142 | + } |
|
143 | 143 | |
144 | - /** |
|
145 | - * Delete record from the storage based on the given |
|
146 | - * condition. |
|
147 | - * |
|
148 | - * @param var $value condition value |
|
149 | - * @param string $attribute condition column name |
|
150 | - * @return void |
|
151 | - */ |
|
152 | - public function delete($value, $attribute = 'id', $saveLog = true) |
|
153 | - { |
|
154 | - $this->cache->tags([$this->model])->flush(); |
|
155 | - return $this->repo->delete($value, $attribute, $saveLog); |
|
156 | - } |
|
144 | + /** |
|
145 | + * Delete record from the storage based on the given |
|
146 | + * condition. |
|
147 | + * |
|
148 | + * @param var $value condition value |
|
149 | + * @param string $attribute condition column name |
|
150 | + * @return void |
|
151 | + */ |
|
152 | + public function delete($value, $attribute = 'id', $saveLog = true) |
|
153 | + { |
|
154 | + $this->cache->tags([$this->model])->flush(); |
|
155 | + return $this->repo->delete($value, $attribute, $saveLog); |
|
156 | + } |
|
157 | 157 | |
158 | - /** |
|
159 | - * Fetch records from the storage based on the given |
|
160 | - * id. |
|
161 | - * |
|
162 | - * @param integer $id |
|
163 | - * @param array $relations |
|
164 | - * @param array $columns |
|
165 | - * @return object |
|
166 | - */ |
|
167 | - public function find($id, $relations = [], $columns = array('*')) |
|
168 | - { |
|
169 | - $cacheKey = 'find.' . $id; |
|
170 | - return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($id, $relations, $columns) { |
|
171 | - return $this->repo->find($id, $relations, $columns); |
|
172 | - }); |
|
173 | - } |
|
158 | + /** |
|
159 | + * Fetch records from the storage based on the given |
|
160 | + * id. |
|
161 | + * |
|
162 | + * @param integer $id |
|
163 | + * @param array $relations |
|
164 | + * @param array $columns |
|
165 | + * @return object |
|
166 | + */ |
|
167 | + public function find($id, $relations = [], $columns = array('*')) |
|
168 | + { |
|
169 | + $cacheKey = 'find.' . $id; |
|
170 | + return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($id, $relations, $columns) { |
|
171 | + return $this->repo->find($id, $relations, $columns); |
|
172 | + }); |
|
173 | + } |
|
174 | 174 | |
175 | - /** |
|
176 | - * Fetch records from the storage based on the given |
|
177 | - * condition. |
|
178 | - * |
|
179 | - * @param array $conditions array of conditions |
|
180 | - * @param array $relations |
|
181 | - * @param string $sortBy |
|
182 | - * @param boolean $desc |
|
183 | - * @param array $columns |
|
184 | - * @return collection |
|
185 | - */ |
|
186 | - public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*')) |
|
187 | - { |
|
188 | - $cacheKey = 'findBy.' . serialize($conditions); |
|
189 | - return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($conditions, $relations, $sortBy, $desc, $columns) { |
|
190 | - return $this->repo->findBy($conditions, $relations, $sortBy, $desc, $columns); |
|
191 | - }); |
|
192 | - } |
|
175 | + /** |
|
176 | + * Fetch records from the storage based on the given |
|
177 | + * condition. |
|
178 | + * |
|
179 | + * @param array $conditions array of conditions |
|
180 | + * @param array $relations |
|
181 | + * @param string $sortBy |
|
182 | + * @param boolean $desc |
|
183 | + * @param array $columns |
|
184 | + * @return collection |
|
185 | + */ |
|
186 | + public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*')) |
|
187 | + { |
|
188 | + $cacheKey = 'findBy.' . serialize($conditions); |
|
189 | + return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($conditions, $relations, $sortBy, $desc, $columns) { |
|
190 | + return $this->repo->findBy($conditions, $relations, $sortBy, $desc, $columns); |
|
191 | + }); |
|
192 | + } |
|
193 | 193 | |
194 | - /** |
|
195 | - * Fetch the first record from the storage based on the given |
|
196 | - * condition. |
|
197 | - * |
|
198 | - * @param array $conditions array of conditions |
|
199 | - * @param array $relations |
|
200 | - * @param array $columns |
|
201 | - * @return object |
|
202 | - */ |
|
203 | - public function first($conditions, $relations = [], $columns = array('*')) |
|
204 | - { |
|
205 | - $cacheKey = 'first.' . serialize($conditions); |
|
206 | - return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($conditions, $relations, $columns) { |
|
207 | - return $this->repo->first($conditions, $relations, $columns); |
|
208 | - }); |
|
209 | - } |
|
194 | + /** |
|
195 | + * Fetch the first record from the storage based on the given |
|
196 | + * condition. |
|
197 | + * |
|
198 | + * @param array $conditions array of conditions |
|
199 | + * @param array $relations |
|
200 | + * @param array $columns |
|
201 | + * @return object |
|
202 | + */ |
|
203 | + public function first($conditions, $relations = [], $columns = array('*')) |
|
204 | + { |
|
205 | + $cacheKey = 'first.' . serialize($conditions); |
|
206 | + return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($conditions, $relations, $columns) { |
|
207 | + return $this->repo->first($conditions, $relations, $columns); |
|
208 | + }); |
|
209 | + } |
|
210 | 210 | |
211 | - /** |
|
212 | - * Return the deleted models in pages based on the given conditions. |
|
213 | - * |
|
214 | - * @param array $conditions array of conditions |
|
215 | - * @param integer $perPage |
|
216 | - * @param string $sortBy |
|
217 | - * @param boolean $desc |
|
218 | - * @param array $columns |
|
219 | - * @return collection |
|
220 | - */ |
|
221 | - public function deleted($conditions, $perPage = 15, $sortBy = 'created_at', $desc = 1, $columns = array('*')) |
|
222 | - { |
|
223 | - $page = \Request::get('page') ?? '1'; |
|
224 | - $cacheKey = 'deleted.' . $perPage . '.' . $page . '.' . serialize($conditions); |
|
225 | - return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($conditions, $perPage, $sortBy, $desc, $columns) { |
|
226 | - return $this->repo->deleted($conditions, $perPage, $sortBy, $desc, $columns); |
|
227 | - }); |
|
228 | - } |
|
211 | + /** |
|
212 | + * Return the deleted models in pages based on the given conditions. |
|
213 | + * |
|
214 | + * @param array $conditions array of conditions |
|
215 | + * @param integer $perPage |
|
216 | + * @param string $sortBy |
|
217 | + * @param boolean $desc |
|
218 | + * @param array $columns |
|
219 | + * @return collection |
|
220 | + */ |
|
221 | + public function deleted($conditions, $perPage = 15, $sortBy = 'created_at', $desc = 1, $columns = array('*')) |
|
222 | + { |
|
223 | + $page = \Request::get('page') ?? '1'; |
|
224 | + $cacheKey = 'deleted.' . $perPage . '.' . $page . '.' . serialize($conditions); |
|
225 | + return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($conditions, $perPage, $sortBy, $desc, $columns) { |
|
226 | + return $this->repo->deleted($conditions, $perPage, $sortBy, $desc, $columns); |
|
227 | + }); |
|
228 | + } |
|
229 | 229 | |
230 | - /** |
|
231 | - * Restore the deleted model. |
|
232 | - * |
|
233 | - * @param integer $id |
|
234 | - * @return void |
|
235 | - */ |
|
236 | - public function restore($id) |
|
237 | - { |
|
238 | - $this->cache->tags([$this->model])->flush(); |
|
239 | - return $this->repo->restore($id); |
|
240 | - } |
|
230 | + /** |
|
231 | + * Restore the deleted model. |
|
232 | + * |
|
233 | + * @param integer $id |
|
234 | + * @return void |
|
235 | + */ |
|
236 | + public function restore($id) |
|
237 | + { |
|
238 | + $this->cache->tags([$this->model])->flush(); |
|
239 | + return $this->repo->restore($id); |
|
240 | + } |
|
241 | 241 | |
242 | - /** |
|
243 | - * Handle calling methods that is not implemented in the |
|
244 | - * abstract repository. |
|
245 | - * |
|
246 | - * @param string $name the called method name |
|
247 | - * @param array $arguments the method arguments |
|
248 | - * @return object |
|
249 | - */ |
|
250 | - public function __call($name, $arguments) |
|
251 | - { |
|
252 | - return call_user_func_array([$this->repo, $name], $arguments); |
|
253 | - } |
|
242 | + /** |
|
243 | + * Handle calling methods that is not implemented in the |
|
244 | + * abstract repository. |
|
245 | + * |
|
246 | + * @param string $name the called method name |
|
247 | + * @param array $arguments the method arguments |
|
248 | + * @return object |
|
249 | + */ |
|
250 | + public function __call($name, $arguments) |
|
251 | + { |
|
252 | + return call_user_func_array([$this->repo, $name], $arguments); |
|
253 | + } |
|
254 | 254 | } |
255 | 255 | \ No newline at end of file |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | public function search($query, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*')) |
68 | 68 | { |
69 | 69 | $page = \Request::get('page') ?? '1'; |
70 | - $cacheKey = 'search.' . $perPage . '.' . $query . '.' . $page; |
|
70 | + $cacheKey = 'search.'.$perPage.'.'.$query.'.'.$page; |
|
71 | 71 | return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($query, $perPage, $relations, $sortBy, $desc, $columns) { |
72 | 72 | return $this->repo->search($query, $perPage, $relations, $sortBy, $desc, $columns); |
73 | 73 | }); |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*')) |
87 | 87 | { |
88 | 88 | $page = \Request::get('page') ?? '1'; |
89 | - $cacheKey = 'paginate.' . $perPage . '.' . $page; |
|
89 | + $cacheKey = 'paginate.'.$perPage.'.'.$page; |
|
90 | 90 | return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($perPage, $relations, $sortBy, $desc, $columns) { |
91 | 91 | return $this->repo->paginate($perPage, $relations, $sortBy, $desc, $columns); |
92 | 92 | }); |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*')) |
108 | 108 | { |
109 | 109 | $page = \Request::get('page') ?? '1'; |
110 | - $cacheKey = 'paginateBy.' . $perPage . '.' . $page . '.' . serialize($conditions); |
|
110 | + $cacheKey = 'paginateBy.'.$perPage.'.'.$page.'.'.serialize($conditions); |
|
111 | 111 | return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($conditions, $perPage, $relations, $sortBy, $desc, $columns) { |
112 | 112 | return $this->repo->paginateBy($conditions, $perPage, $relations, $sortBy, $desc, $columns); |
113 | 113 | }); |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | */ |
167 | 167 | public function find($id, $relations = [], $columns = array('*')) |
168 | 168 | { |
169 | - $cacheKey = 'find.' . $id; |
|
169 | + $cacheKey = 'find.'.$id; |
|
170 | 170 | return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($id, $relations, $columns) { |
171 | 171 | return $this->repo->find($id, $relations, $columns); |
172 | 172 | }); |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | */ |
186 | 186 | public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*')) |
187 | 187 | { |
188 | - $cacheKey = 'findBy.' . serialize($conditions); |
|
188 | + $cacheKey = 'findBy.'.serialize($conditions); |
|
189 | 189 | return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($conditions, $relations, $sortBy, $desc, $columns) { |
190 | 190 | return $this->repo->findBy($conditions, $relations, $sortBy, $desc, $columns); |
191 | 191 | }); |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | */ |
203 | 203 | public function first($conditions, $relations = [], $columns = array('*')) |
204 | 204 | { |
205 | - $cacheKey = 'first.' . serialize($conditions); |
|
205 | + $cacheKey = 'first.'.serialize($conditions); |
|
206 | 206 | return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($conditions, $relations, $columns) { |
207 | 207 | return $this->repo->first($conditions, $relations, $columns); |
208 | 208 | }); |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | public function deleted($conditions, $perPage = 15, $sortBy = 'created_at', $desc = 1, $columns = array('*')) |
222 | 222 | { |
223 | 223 | $page = \Request::get('page') ?? '1'; |
224 | - $cacheKey = 'deleted.' . $perPage . '.' . $page . '.' . serialize($conditions); |
|
224 | + $cacheKey = 'deleted.'.$perPage.'.'.$page.'.'.serialize($conditions); |
|
225 | 225 | return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($conditions, $perPage, $sortBy, $desc, $columns) { |
226 | 226 | return $this->repo->deleted($conditions, $perPage, $sortBy, $desc, $columns); |
227 | 227 | }); |
@@ -4,39 +4,39 @@ |
||
4 | 4 | |
5 | 5 | abstract class AbstractRepositoryContainer implements RepositoryContainerInterface |
6 | 6 | { |
7 | - /** |
|
8 | - * Construct the repository class name based on |
|
9 | - * the method name called, search in the |
|
10 | - * given namespaces for the class and |
|
11 | - * return an instance. |
|
12 | - * |
|
13 | - * @param string $name the called method name |
|
14 | - * @param array $arguments the method arguments |
|
15 | - * @return object |
|
16 | - */ |
|
17 | - public function __call($name, $arguments) |
|
18 | - { |
|
19 | - foreach ($this->getRepoNameSpace() as $repoNameSpace) |
|
20 | - { |
|
21 | - $class = rtrim($repoNameSpace, '\\') . '\\' . ucfirst(str_singular($name)) . 'Repository'; |
|
22 | - if (class_exists($class)) |
|
23 | - { |
|
24 | - \App::singleton($class, function ($app) use ($class) { |
|
7 | + /** |
|
8 | + * Construct the repository class name based on |
|
9 | + * the method name called, search in the |
|
10 | + * given namespaces for the class and |
|
11 | + * return an instance. |
|
12 | + * |
|
13 | + * @param string $name the called method name |
|
14 | + * @param array $arguments the method arguments |
|
15 | + * @return object |
|
16 | + */ |
|
17 | + public function __call($name, $arguments) |
|
18 | + { |
|
19 | + foreach ($this->getRepoNameSpace() as $repoNameSpace) |
|
20 | + { |
|
21 | + $class = rtrim($repoNameSpace, '\\') . '\\' . ucfirst(str_singular($name)) . 'Repository'; |
|
22 | + if (class_exists($class)) |
|
23 | + { |
|
24 | + \App::singleton($class, function ($app) use ($class) { |
|
25 | 25 | |
26 | - return new \App\Modules\V1\Core\Decorators\CachingDecorator(new $class, $app['cache.store']); |
|
27 | - }); |
|
26 | + return new \App\Modules\V1\Core\Decorators\CachingDecorator(new $class, $app['cache.store']); |
|
27 | + }); |
|
28 | 28 | |
29 | - return \App::make($class); |
|
30 | - } |
|
31 | - } |
|
32 | - } |
|
29 | + return \App::make($class); |
|
30 | + } |
|
31 | + } |
|
32 | + } |
|
33 | 33 | |
34 | - /** |
|
35 | - * Abstract methods that return the necessary |
|
36 | - * information (repositories namespaces) |
|
37 | - * needed to preform the previous actions. |
|
38 | - * |
|
39 | - * @return array |
|
40 | - */ |
|
41 | - abstract protected function getRepoNameSpace(); |
|
34 | + /** |
|
35 | + * Abstract methods that return the necessary |
|
36 | + * information (repositories namespaces) |
|
37 | + * needed to preform the previous actions. |
|
38 | + * |
|
39 | + * @return array |
|
40 | + */ |
|
41 | + abstract protected function getRepoNameSpace(); |
|
42 | 42 | } |
43 | 43 | \ No newline at end of file |
@@ -18,10 +18,10 @@ |
||
18 | 18 | { |
19 | 19 | foreach ($this->getRepoNameSpace() as $repoNameSpace) |
20 | 20 | { |
21 | - $class = rtrim($repoNameSpace, '\\') . '\\' . ucfirst(str_singular($name)) . 'Repository'; |
|
21 | + $class = rtrim($repoNameSpace, '\\').'\\'.ucfirst(str_singular($name)).'Repository'; |
|
22 | 22 | if (class_exists($class)) |
23 | 23 | { |
24 | - \App::singleton($class, function ($app) use ($class) { |
|
24 | + \App::singleton($class, function($app) use ($class) { |
|
25 | 25 | |
26 | 26 | return new \App\Modules\V1\Core\Decorators\CachingDecorator(new $class, $app['cache.store']); |
27 | 27 | }); |
@@ -13,13 +13,13 @@ |
||
13 | 13 | public function up() |
14 | 14 | { |
15 | 15 | Schema::create('settings', function (Blueprint $table) { |
16 | - $table->increments('id'); |
|
17 | - $table->string('name',100); |
|
18 | - $table->string('key',100)->unique(); |
|
19 | - $table->text('value')->nullable(); |
|
20 | - $table->softDeletes(); |
|
21 | - $table->timestamps(); |
|
22 | - }); |
|
16 | + $table->increments('id'); |
|
17 | + $table->string('name',100); |
|
18 | + $table->string('key',100)->unique(); |
|
19 | + $table->text('value')->nullable(); |
|
20 | + $table->softDeletes(); |
|
21 | + $table->timestamps(); |
|
22 | + }); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | /** |
@@ -12,10 +12,10 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('settings', function (Blueprint $table) { |
|
15 | + Schema::create('settings', function(Blueprint $table) { |
|
16 | 16 | $table->increments('id'); |
17 | - $table->string('name',100); |
|
18 | - $table->string('key',100)->unique(); |
|
17 | + $table->string('name', 100); |
|
18 | + $table->string('key', 100)->unique(); |
|
19 | 19 | $table->text('value')->nullable(); |
20 | 20 | $table->softDeletes(); |
21 | 21 | $table->timestamps(); |
@@ -8,20 +8,20 @@ |
||
8 | 8 | |
9 | 9 | class SettingsController extends BaseApiController |
10 | 10 | { |
11 | - /** |
|
12 | - * The name of the model that is used by the base api controller |
|
13 | - * to preform actions like (add, edit ... etc). |
|
14 | - * @var string |
|
15 | - */ |
|
16 | - protected $model = 'settings'; |
|
11 | + /** |
|
12 | + * The name of the model that is used by the base api controller |
|
13 | + * to preform actions like (add, edit ... etc). |
|
14 | + * @var string |
|
15 | + */ |
|
16 | + protected $model = 'settings'; |
|
17 | 17 | |
18 | - /** |
|
19 | - * The validations rules used by the base api controller |
|
20 | - * to check before add. |
|
21 | - * @var array |
|
22 | - */ |
|
23 | - protected $validationRules = [ |
|
24 | - 'name' => 'required|string|max:100', |
|
25 | - 'value' => 'required|string' |
|
26 | - ]; |
|
18 | + /** |
|
19 | + * The validations rules used by the base api controller |
|
20 | + * to check before add. |
|
21 | + * @var array |
|
22 | + */ |
|
23 | + protected $validationRules = [ |
|
24 | + 'name' => 'required|string|max:100', |
|
25 | + 'value' => 'required|string' |
|
26 | + ]; |
|
27 | 27 | } |
@@ -13,14 +13,14 @@ |
||
13 | 13 | * to preform actions like (add, edit ... etc). |
14 | 14 | * @var string |
15 | 15 | */ |
16 | - protected $model = 'settings'; |
|
16 | + protected $model = 'settings'; |
|
17 | 17 | |
18 | 18 | /** |
19 | 19 | * The validations rules used by the base api controller |
20 | 20 | * to check before add. |
21 | 21 | * @var array |
22 | 22 | */ |
23 | - protected $validationRules = [ |
|
23 | + protected $validationRules = [ |
|
24 | 24 | 'name' => 'required|string|max:100', |
25 | 25 | 'value' => 'required|string' |
26 | 26 | ]; |