Commit 9eef61e4 by Vladislav

#20794 Сделать чтобы в целевых РК оставалась одна карточка

1 parent dac47d01
...@@ -105,6 +105,7 @@ class Advertisement extends Model ...@@ -105,6 +105,7 @@ class Advertisement extends Model
'reserve_delete_at', 'reserve_delete_at',
'deleted_at', 'deleted_at',
'updated_at',
]; ];
protected $casts = [ protected $casts = [
......
...@@ -222,7 +222,13 @@ class GoalAdvertisement extends Pivot ...@@ -222,7 +222,13 @@ class GoalAdvertisement extends Pivot
public function scopeNeedDeleted($query) public function scopeNeedDeleted($query)
{ {
return $query->where(function (Builder $query) { return $query->where(function (Builder $query) {
return $query->whereNotNull('deleted_need'); return $query->whereNotNull('deleted_need')
->orWhere(function (Builder $query) {
return $query->whereExists(function (\Illuminate\Database\Query\Builder $query) {
$query->select(DB::raw(1))->from('advertisements')
->whereNotNull('advertisements.deleted_at')
->whereColumn('goal_advertisements.advertisement_id', 'advertisements.id');
});
})->orWhere(function (Builder $query) { })->orWhere(function (Builder $query) {
return $query->whereExists(function (\Illuminate\Database\Query\Builder $query) { return $query->whereExists(function (\Illuminate\Database\Query\Builder $query) {
$query->select(DB::raw(1)) $query->select(DB::raw(1))
...@@ -234,6 +240,7 @@ class GoalAdvertisement extends Pivot ...@@ -234,6 +240,7 @@ class GoalAdvertisement extends Pivot
->whereColumn('goal_advertisements.goal_ad_group_id', 'goal_ad_groups.id'); ->whereColumn('goal_advertisements.goal_ad_group_id', 'goal_ad_groups.id');
}); });
}); });
})->whereNull('goal_advertisements.deleted_at');
} }
/** /**
......
...@@ -130,6 +130,7 @@ class GetAds extends DirectRequest ...@@ -130,6 +130,7 @@ class GetAds extends DirectRequest
'business_id' => $ad['TextAd']['BusinessId'], 'business_id' => $ad['TextAd']['BusinessId'],
'prefer_v_card_over_business' => isset($ad['TextAd']['PreferVCardOverBusiness']) ? $ad['TextAd']['PreferVCardOverBusiness'] === 'YES' : null, 'prefer_v_card_over_business' => isset($ad['TextAd']['PreferVCardOverBusiness']) ? $ad['TextAd']['PreferVCardOverBusiness'] === 'YES' : null,
'deleted_at' => null, 'deleted_at' => null,
'updated_at' => Carbon::now(),
]); ]);
$ad_extensions_array = []; $ad_extensions_array = [];
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!