@@ -159,7 +159,7 @@ |
||
159 | 159 | */ |
160 | 160 | public function down() |
161 | 161 | { |
162 | - $permissions = DB::table('permissions')->whereIn('model', ['settings']); |
|
162 | + $permissions = DB::table('permissions')->whereIn('model', ['settings']); |
|
163 | 163 | DB::table('groups_permissions')->whereIn('permission_id', $permissions->lists('id'))->delete(); |
164 | 164 | $permissions->delete(); |
165 | 165 | } |
@@ -4,76 +4,76 @@ |
||
4 | 4 | |
5 | 5 | class PushNotificationDeviceRepository extends AbstractRepository |
6 | 6 | { |
7 | - /** |
|
8 | - * Return the model full namespace. |
|
9 | - * |
|
10 | - * @return string |
|
11 | - */ |
|
12 | - protected function getModel() |
|
13 | - { |
|
14 | - return 'App\Modules\V1\Notifications\PushNotificationDevice'; |
|
15 | - } |
|
7 | + /** |
|
8 | + * Return the model full namespace. |
|
9 | + * |
|
10 | + * @return string |
|
11 | + */ |
|
12 | + protected function getModel() |
|
13 | + { |
|
14 | + return 'App\Modules\V1\Notifications\PushNotificationDevice'; |
|
15 | + } |
|
16 | 16 | |
17 | - /** |
|
18 | - * Fetch the given users devices and broadcast the given |
|
19 | - * message to all of them. |
|
20 | - * |
|
21 | - * @param array $users_ids |
|
22 | - * @param string $messageText |
|
23 | - * @param boolean $activeOnly |
|
24 | - * @return void |
|
25 | - */ |
|
26 | - public function broadcast($users_ids, $messageText, $activeOnly = false) |
|
27 | - { |
|
28 | - $devicesArray = []; |
|
29 | - $devices = $this->model->whereIn('user_id', $users_ids); |
|
30 | - $devices = $activeOnly ? $device->where('active', 1)->get() : $devices->get(); |
|
31 | - foreach ($devices as $device) |
|
32 | - { |
|
33 | - $devicesArray[$device->device_type][] = \PushNotification::Device($device->device_token, array('badge' => 5)); |
|
34 | - } |
|
17 | + /** |
|
18 | + * Fetch the given users devices and broadcast the given |
|
19 | + * message to all of them. |
|
20 | + * |
|
21 | + * @param array $users_ids |
|
22 | + * @param string $messageText |
|
23 | + * @param boolean $activeOnly |
|
24 | + * @return void |
|
25 | + */ |
|
26 | + public function broadcast($users_ids, $messageText, $activeOnly = false) |
|
27 | + { |
|
28 | + $devicesArray = []; |
|
29 | + $devices = $this->model->whereIn('user_id', $users_ids); |
|
30 | + $devices = $activeOnly ? $device->where('active', 1)->get() : $devices->get(); |
|
31 | + foreach ($devices as $device) |
|
32 | + { |
|
33 | + $devicesArray[$device->device_type][] = \PushNotification::Device($device->device_token, array('badge' => 5)); |
|
34 | + } |
|
35 | 35 | |
36 | - $message = $this->constructMessage($messageText); |
|
37 | - if (array_key_exists('ios', $devicesArray)) |
|
38 | - { |
|
39 | - $iosDevices = \PushNotification::DeviceCollection($devicesArray['ios']); |
|
40 | - $this->push('ios', $iosDevices, $message); |
|
41 | - } |
|
36 | + $message = $this->constructMessage($messageText); |
|
37 | + if (array_key_exists('ios', $devicesArray)) |
|
38 | + { |
|
39 | + $iosDevices = \PushNotification::DeviceCollection($devicesArray['ios']); |
|
40 | + $this->push('ios', $iosDevices, $message); |
|
41 | + } |
|
42 | 42 | |
43 | - if (array_key_exists('android', $devicesArray)) |
|
44 | - { |
|
45 | - $androidDevices = \PushNotification::DeviceCollection($devicesArray['android']); |
|
46 | - $this->push('android', $androidDevices, $message); |
|
47 | - } |
|
48 | - } |
|
43 | + if (array_key_exists('android', $devicesArray)) |
|
44 | + { |
|
45 | + $androidDevices = \PushNotification::DeviceCollection($devicesArray['android']); |
|
46 | + $this->push('android', $androidDevices, $message); |
|
47 | + } |
|
48 | + } |
|
49 | 49 | |
50 | 50 | |
51 | - /** |
|
52 | - * Push the given message to the given devices. |
|
53 | - * |
|
54 | - * @param string $type |
|
55 | - * @param colletion $devices |
|
56 | - * @param string $message |
|
57 | - * @return void |
|
58 | - */ |
|
59 | - public function push($type, $devices, $message) |
|
60 | - { |
|
61 | - $collection = \PushNotification::app($type)->to($devices)->send($message); |
|
62 | - foreach ($collection->pushManager as $push) |
|
63 | - { |
|
64 | - $response[] = $push->getAdapter()->getResponse(); |
|
65 | - } |
|
66 | - } |
|
51 | + /** |
|
52 | + * Push the given message to the given devices. |
|
53 | + * |
|
54 | + * @param string $type |
|
55 | + * @param colletion $devices |
|
56 | + * @param string $message |
|
57 | + * @return void |
|
58 | + */ |
|
59 | + public function push($type, $devices, $message) |
|
60 | + { |
|
61 | + $collection = \PushNotification::app($type)->to($devices)->send($message); |
|
62 | + foreach ($collection->pushManager as $push) |
|
63 | + { |
|
64 | + $response[] = $push->getAdapter()->getResponse(); |
|
65 | + } |
|
66 | + } |
|
67 | 67 | |
68 | - /** |
|
69 | - * Construct the notification message. |
|
70 | - * |
|
71 | - * @param string $messageText |
|
72 | - * @param array $options |
|
73 | - * @return object |
|
74 | - */ |
|
75 | - protected function constructMessage($messageText, $options = []) |
|
76 | - { |
|
77 | - return \PushNotification::Message($messageText, $options); |
|
78 | - } |
|
68 | + /** |
|
69 | + * Construct the notification message. |
|
70 | + * |
|
71 | + * @param string $messageText |
|
72 | + * @param array $options |
|
73 | + * @return object |
|
74 | + */ |
|
75 | + protected function constructMessage($messageText, $options = []) |
|
76 | + { |
|
77 | + return \PushNotification::Message($messageText, $options); |
|
78 | + } |
|
79 | 79 | } |
@@ -7,22 +7,22 @@ |
||
7 | 7 | |
8 | 8 | class PushNotificationsDevicesController extends BaseApiController |
9 | 9 | { |
10 | - /** |
|
11 | - * The name of the model that is used by the base api controller |
|
12 | - * to preform actions like (add, edit ... etc). |
|
13 | - * @var string |
|
14 | - */ |
|
15 | - protected $model = 'pushNotificationDevices'; |
|
10 | + /** |
|
11 | + * The name of the model that is used by the base api controller |
|
12 | + * to preform actions like (add, edit ... etc). |
|
13 | + * @var string |
|
14 | + */ |
|
15 | + protected $model = 'pushNotificationDevices'; |
|
16 | 16 | |
17 | - /** |
|
18 | - * The validations rules used by the base api controller |
|
19 | - * to check before add. |
|
20 | - * @var array |
|
21 | - */ |
|
22 | - protected $validationRules = [ |
|
23 | - 'device_token' => 'required|string|max:255', |
|
24 | - 'device_type' => 'required|in:android,ios', |
|
25 | - 'user_id' => 'required|exists:users,id', |
|
26 | - 'active' => 'boolean' |
|
27 | - ]; |
|
17 | + /** |
|
18 | + * The validations rules used by the base api controller |
|
19 | + * to check before add. |
|
20 | + * @var array |
|
21 | + */ |
|
22 | + protected $validationRules = [ |
|
23 | + 'device_token' => 'required|string|max:255', |
|
24 | + 'device_type' => 'required|in:android,ios', |
|
25 | + 'user_id' => 'required|exists:users,id', |
|
26 | + 'active' => 'boolean' |
|
27 | + ]; |
|
28 | 28 | } |
@@ -12,14 +12,14 @@ |
||
12 | 12 | * to preform actions like (add, edit ... etc). |
13 | 13 | * @var string |
14 | 14 | */ |
15 | - protected $model = 'pushNotificationDevices'; |
|
15 | + protected $model = 'pushNotificationDevices'; |
|
16 | 16 | |
17 | 17 | /** |
18 | 18 | * The validations rules used by the base api controller |
19 | 19 | * to check before add. |
20 | 20 | * @var array |
21 | 21 | */ |
22 | - protected $validationRules = [ |
|
22 | + protected $validationRules = [ |
|
23 | 23 | 'device_token' => 'required|string|max:255', |
24 | 24 | 'device_type' => 'required|in:android,ios', |
25 | 25 | 'user_id' => 'required|exists:users,id', |
@@ -12,9 +12,9 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('push_notifications_devices', function (Blueprint $table) { |
|
15 | + Schema::create('push_notifications_devices', function(Blueprint $table) { |
|
16 | 16 | $table->increments('id'); |
17 | - $table->string('device_token',255); |
|
17 | + $table->string('device_token', 255); |
|
18 | 18 | $table->enum('device_type', ['android', 'ios']); |
19 | 19 | $table->integer('user_id'); |
20 | 20 | $table->boolean('active')->default(1); |
@@ -12,134 +12,134 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - /** |
|
16 | - * Delete previous permissions. |
|
17 | - */ |
|
15 | + /** |
|
16 | + * Delete previous permissions. |
|
17 | + */ |
|
18 | 18 | DB::table('permissions')->whereIn('model', ['notifications'])->delete(); |
19 | 19 | |
20 | 20 | /** |
21 | - * Insert the permissions related to this module. |
|
22 | - */ |
|
23 | - DB::table('permissions')->insert( |
|
24 | - [ |
|
25 | - /** |
|
26 | - * notifications model permissions. |
|
27 | - */ |
|
28 | - [ |
|
29 | - 'name' => 'find', |
|
30 | - 'model' => 'notifications', |
|
31 | - 'created_at' => \DB::raw('NOW()'), |
|
32 | - 'updated_at' => \DB::raw('NOW()') |
|
33 | - ], |
|
34 | - [ |
|
35 | - 'name' => 'search', |
|
36 | - 'model' => 'notifications', |
|
37 | - 'created_at' => \DB::raw('NOW()'), |
|
38 | - 'updated_at' => \DB::raw('NOW()') |
|
39 | - ], |
|
40 | - [ |
|
41 | - 'name' => 'list', |
|
42 | - 'model' => 'notifications', |
|
43 | - 'created_at' => \DB::raw('NOW()'), |
|
44 | - 'updated_at' => \DB::raw('NOW()') |
|
45 | - ], |
|
46 | - [ |
|
47 | - 'name' => 'findby', |
|
48 | - 'model' => 'notifications', |
|
49 | - 'created_at' => \DB::raw('NOW()'), |
|
50 | - 'updated_at' => \DB::raw('NOW()') |
|
51 | - ], |
|
52 | - [ |
|
53 | - 'name' => 'first', |
|
54 | - 'model' => 'notifications', |
|
55 | - 'created_at' => \DB::raw('NOW()'), |
|
56 | - 'updated_at' => \DB::raw('NOW()') |
|
57 | - ], |
|
58 | - [ |
|
59 | - 'name' => 'paginate', |
|
60 | - 'model' => 'notifications', |
|
61 | - 'created_at' => \DB::raw('NOW()'), |
|
62 | - 'updated_at' => \DB::raw('NOW()') |
|
63 | - ], |
|
64 | - [ |
|
65 | - 'name' => 'paginateby', |
|
66 | - 'model' => 'notifications', |
|
67 | - 'created_at' => \DB::raw('NOW()'), |
|
68 | - 'updated_at' => \DB::raw('NOW()') |
|
69 | - ], |
|
70 | - [ |
|
71 | - 'name' => 'notified', |
|
72 | - 'model' => 'notifications', |
|
73 | - 'created_at' => \DB::raw('NOW()'), |
|
74 | - 'updated_at' => \DB::raw('NOW()') |
|
75 | - ], |
|
76 | - [ |
|
77 | - 'name' => 'notifyall', |
|
78 | - 'model' => 'notifications', |
|
79 | - 'created_at' => \DB::raw('NOW()'), |
|
80 | - 'updated_at' => \DB::raw('NOW()') |
|
81 | - ], |
|
82 | - /** |
|
83 | - * pushNotificationDevices model permissions. |
|
84 | - */ |
|
85 | - [ |
|
86 | - 'name' => 'find', |
|
87 | - 'model' => 'pushNotificationDevices', |
|
88 | - 'created_at' => \DB::raw('NOW()'), |
|
89 | - 'updated_at' => \DB::raw('NOW()') |
|
90 | - ], |
|
91 | - [ |
|
92 | - 'name' => 'search', |
|
93 | - 'model' => 'pushNotificationDevices', |
|
94 | - 'created_at' => \DB::raw('NOW()'), |
|
95 | - 'updated_at' => \DB::raw('NOW()') |
|
96 | - ], |
|
97 | - [ |
|
98 | - 'name' => 'list', |
|
99 | - 'model' => 'pushNotificationDevices', |
|
100 | - 'created_at' => \DB::raw('NOW()'), |
|
101 | - 'updated_at' => \DB::raw('NOW()') |
|
102 | - ], |
|
103 | - [ |
|
104 | - 'name' => 'findby', |
|
105 | - 'model' => 'pushNotificationDevices', |
|
106 | - 'created_at' => \DB::raw('NOW()'), |
|
107 | - 'updated_at' => \DB::raw('NOW()') |
|
108 | - ], |
|
109 | - [ |
|
110 | - 'name' => 'first', |
|
111 | - 'model' => 'pushNotificationDevices', |
|
112 | - 'created_at' => \DB::raw('NOW()'), |
|
113 | - 'updated_at' => \DB::raw('NOW()') |
|
114 | - ], |
|
115 | - [ |
|
116 | - 'name' => 'paginate', |
|
117 | - 'model' => 'pushNotificationDevices', |
|
118 | - 'created_at' => \DB::raw('NOW()'), |
|
119 | - 'updated_at' => \DB::raw('NOW()') |
|
120 | - ], |
|
121 | - [ |
|
122 | - 'name' => 'paginateby', |
|
123 | - 'model' => 'pushNotificationDevices', |
|
124 | - 'created_at' => \DB::raw('NOW()'), |
|
125 | - 'updated_at' => \DB::raw('NOW()') |
|
126 | - ], |
|
127 | - [ |
|
128 | - 'name' => 'save', |
|
129 | - 'model' => 'pushNotificationDevices', |
|
130 | - 'created_at' => \DB::raw('NOW()'), |
|
131 | - 'updated_at' => \DB::raw('NOW()') |
|
132 | - ], |
|
133 | - [ |
|
134 | - 'name' => 'delete', |
|
135 | - 'model' => 'pushNotificationDevices', |
|
136 | - 'created_at' => \DB::raw('NOW()'), |
|
137 | - 'updated_at' => \DB::raw('NOW()') |
|
138 | - ], |
|
139 | - ] |
|
140 | - ); |
|
21 | + * Insert the permissions related to this module. |
|
22 | + */ |
|
23 | + DB::table('permissions')->insert( |
|
24 | + [ |
|
25 | + /** |
|
26 | + * notifications model permissions. |
|
27 | + */ |
|
28 | + [ |
|
29 | + 'name' => 'find', |
|
30 | + 'model' => 'notifications', |
|
31 | + 'created_at' => \DB::raw('NOW()'), |
|
32 | + 'updated_at' => \DB::raw('NOW()') |
|
33 | + ], |
|
34 | + [ |
|
35 | + 'name' => 'search', |
|
36 | + 'model' => 'notifications', |
|
37 | + 'created_at' => \DB::raw('NOW()'), |
|
38 | + 'updated_at' => \DB::raw('NOW()') |
|
39 | + ], |
|
40 | + [ |
|
41 | + 'name' => 'list', |
|
42 | + 'model' => 'notifications', |
|
43 | + 'created_at' => \DB::raw('NOW()'), |
|
44 | + 'updated_at' => \DB::raw('NOW()') |
|
45 | + ], |
|
46 | + [ |
|
47 | + 'name' => 'findby', |
|
48 | + 'model' => 'notifications', |
|
49 | + 'created_at' => \DB::raw('NOW()'), |
|
50 | + 'updated_at' => \DB::raw('NOW()') |
|
51 | + ], |
|
52 | + [ |
|
53 | + 'name' => 'first', |
|
54 | + 'model' => 'notifications', |
|
55 | + 'created_at' => \DB::raw('NOW()'), |
|
56 | + 'updated_at' => \DB::raw('NOW()') |
|
57 | + ], |
|
58 | + [ |
|
59 | + 'name' => 'paginate', |
|
60 | + 'model' => 'notifications', |
|
61 | + 'created_at' => \DB::raw('NOW()'), |
|
62 | + 'updated_at' => \DB::raw('NOW()') |
|
63 | + ], |
|
64 | + [ |
|
65 | + 'name' => 'paginateby', |
|
66 | + 'model' => 'notifications', |
|
67 | + 'created_at' => \DB::raw('NOW()'), |
|
68 | + 'updated_at' => \DB::raw('NOW()') |
|
69 | + ], |
|
70 | + [ |
|
71 | + 'name' => 'notified', |
|
72 | + 'model' => 'notifications', |
|
73 | + 'created_at' => \DB::raw('NOW()'), |
|
74 | + 'updated_at' => \DB::raw('NOW()') |
|
75 | + ], |
|
76 | + [ |
|
77 | + 'name' => 'notifyall', |
|
78 | + 'model' => 'notifications', |
|
79 | + 'created_at' => \DB::raw('NOW()'), |
|
80 | + 'updated_at' => \DB::raw('NOW()') |
|
81 | + ], |
|
82 | + /** |
|
83 | + * pushNotificationDevices model permissions. |
|
84 | + */ |
|
85 | + [ |
|
86 | + 'name' => 'find', |
|
87 | + 'model' => 'pushNotificationDevices', |
|
88 | + 'created_at' => \DB::raw('NOW()'), |
|
89 | + 'updated_at' => \DB::raw('NOW()') |
|
90 | + ], |
|
91 | + [ |
|
92 | + 'name' => 'search', |
|
93 | + 'model' => 'pushNotificationDevices', |
|
94 | + 'created_at' => \DB::raw('NOW()'), |
|
95 | + 'updated_at' => \DB::raw('NOW()') |
|
96 | + ], |
|
97 | + [ |
|
98 | + 'name' => 'list', |
|
99 | + 'model' => 'pushNotificationDevices', |
|
100 | + 'created_at' => \DB::raw('NOW()'), |
|
101 | + 'updated_at' => \DB::raw('NOW()') |
|
102 | + ], |
|
103 | + [ |
|
104 | + 'name' => 'findby', |
|
105 | + 'model' => 'pushNotificationDevices', |
|
106 | + 'created_at' => \DB::raw('NOW()'), |
|
107 | + 'updated_at' => \DB::raw('NOW()') |
|
108 | + ], |
|
109 | + [ |
|
110 | + 'name' => 'first', |
|
111 | + 'model' => 'pushNotificationDevices', |
|
112 | + 'created_at' => \DB::raw('NOW()'), |
|
113 | + 'updated_at' => \DB::raw('NOW()') |
|
114 | + ], |
|
115 | + [ |
|
116 | + 'name' => 'paginate', |
|
117 | + 'model' => 'pushNotificationDevices', |
|
118 | + 'created_at' => \DB::raw('NOW()'), |
|
119 | + 'updated_at' => \DB::raw('NOW()') |
|
120 | + ], |
|
121 | + [ |
|
122 | + 'name' => 'paginateby', |
|
123 | + 'model' => 'pushNotificationDevices', |
|
124 | + 'created_at' => \DB::raw('NOW()'), |
|
125 | + 'updated_at' => \DB::raw('NOW()') |
|
126 | + ], |
|
127 | + [ |
|
128 | + 'name' => 'save', |
|
129 | + 'model' => 'pushNotificationDevices', |
|
130 | + 'created_at' => \DB::raw('NOW()'), |
|
131 | + 'updated_at' => \DB::raw('NOW()') |
|
132 | + ], |
|
133 | + [ |
|
134 | + 'name' => 'delete', |
|
135 | + 'model' => 'pushNotificationDevices', |
|
136 | + 'created_at' => \DB::raw('NOW()'), |
|
137 | + 'updated_at' => \DB::raw('NOW()') |
|
138 | + ], |
|
139 | + ] |
|
140 | + ); |
|
141 | 141 | |
142 | - /** |
|
142 | + /** |
|
143 | 143 | * Assign the permissions to the admin group. |
144 | 144 | */ |
145 | 145 | $permissionIds = DB::table('permissions')->whereIn('model', ['notifications', 'pushNotificationDevices'])->select('id')->lists('id'); |
@@ -164,7 +164,7 @@ |
||
164 | 164 | */ |
165 | 165 | public function down() |
166 | 166 | { |
167 | - $permissions = DB::table('permissions')->whereIn('model', ['notifications', 'pushNotificationDevices']); |
|
167 | + $permissions = DB::table('permissions')->whereIn('model', ['notifications', 'pushNotificationDevices']); |
|
168 | 168 | DB::table('groups_permissions')->whereIn('permission_id', $permissions->lists('id'))->delete(); |
169 | 169 | $permissions->delete(); |
170 | 170 | } |
@@ -3,7 +3,7 @@ |
||
3 | 3 | use Illuminate\Database\Eloquent\Model; |
4 | 4 | use Illuminate\Database\Eloquent\SoftDeletes; |
5 | 5 | |
6 | -class PushNotificationDevice extends Model{ |
|
6 | +class PushNotificationDevice extends Model { |
|
7 | 7 | |
8 | 8 | use SoftDeletes; |
9 | 9 | protected $table = 'push_notifications_devices'; |
@@ -101,7 +101,7 @@ |
||
101 | 101 | */ |
102 | 102 | public function down() |
103 | 103 | { |
104 | - $permissions = DB::table('permissions')->whereIn('model', ['reports']); |
|
104 | + $permissions = DB::table('permissions')->whereIn('model', ['reports']); |
|
105 | 105 | DB::table('groups_permissions')->whereIn('permission_id', $permissions->lists('id'))->delete(); |
106 | 106 | $permissions->delete(); |
107 | 107 | } |