lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix model validations

Browse Source
This commit is contained in:
James Brooks
2016-10-19 12:29:16 +01:00
parent a7e8ba3697
commit ebf3c8656f
12 changed files with 53 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Models/Subscription.php
View File

@@ -45,8 +45,8 @@ class Subscription extends Model
* @var string[]
*/
public $rules = [
'subscriber_id' => 'int|required',
'component_id' => 'int',
'subscriber_id' => 'required|int',
'component_id' => 'nullable|int',
];
/**
@@ -79,7 +79,7 @@ class Subscription extends Model
*/
public function scopeForSubscriber(Builder $query, $subscriber_id)
{
return $query->where('subscriber_id', $subscriber_id);
return $query->where('subscriber_id', '=', $subscriber_id);
}
/**
@@ -92,7 +92,7 @@ class Subscription extends Model
*/
public function scopeForComponent(Builder $query, $component_id)
{
return $query->where('component_id', $component_id);
return $query->where('component_id', '=', $component_id);
}
/**
@@ -108,7 +108,7 @@ class Subscription extends Model
return $query->select('subscriptions.*')
->join('subscribers', 'subscriptions.subscriber_id', '=', 'subscribers.id')
->where(function ($query) {
$query->where('subscriptions.component_id', $component_id)
$query->where('subscriptions.component_id', '=', $component_id)
->orWhere('subscribers.global');
})
->whereNotNull('subscribers.verified_at');