remove the redundant relation
This commit is contained in:
@@ -22,9 +22,6 @@ use Hekmatinasser\Verta\Verta;
|
|||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use App\Services\Cartables\RoadObservationTableService;
|
use App\Services\Cartables\RoadObservationTableService;
|
||||||
use Illuminate\Support\Facades\Auth;
|
|
||||||
use Illuminate\Support\Facades\Storage;
|
|
||||||
use Illuminate\Support\Str;
|
|
||||||
use Maatwebsite\Excel\Facades\Excel;
|
use Maatwebsite\Excel\Facades\Excel;
|
||||||
use SoapFault;
|
use SoapFault;
|
||||||
use Symfony\Component\HttpFoundation\BinaryFileResponse;
|
use Symfony\Component\HttpFoundation\BinaryFileResponse;
|
||||||
@@ -151,7 +148,8 @@ class RoadObservationController extends Controller
|
|||||||
|
|
||||||
public function refer(ReferRequest $request, RoadObserved $roadObserved): JsonResponse
|
public function refer(ReferRequest $request, RoadObserved $roadObserved): JsonResponse
|
||||||
{
|
{
|
||||||
$roadObserved->problemHistories()->create([
|
RoadObservationHistory::query()->create([
|
||||||
|
'id' => $roadObserved->id,
|
||||||
'user_id' => auth()->user()->id,
|
'user_id' => auth()->user()->id,
|
||||||
'action' => 'refer',
|
'action' => 'refer',
|
||||||
'description' => $request->refer_description,
|
'description' => $request->refer_description,
|
||||||
@@ -174,7 +172,9 @@ class RoadObservationController extends Controller
|
|||||||
public function referList(RoadObserved $roadObserved): JsonResponse
|
public function referList(RoadObserved $roadObserved): JsonResponse
|
||||||
{
|
{
|
||||||
$referList = [];
|
$referList = [];
|
||||||
$data = $roadObserved->problemHistories()->where('action', '=', 'refer')->get();
|
$data = RoadObservationHistory::query()
|
||||||
|
->where('road_observation_histories.id', $roadObserved->id)
|
||||||
|
->where('action', '=', 'refer')->get();
|
||||||
|
|
||||||
foreach ($data as $key => $value) {
|
foreach ($data as $key => $value) {
|
||||||
$referList[$key]['from_edareh'] = EdarateShahri::query()->find($value->from_edareh)->name_fa;
|
$referList[$key]['from_edareh'] = EdarateShahri::query()->find($value->from_edareh)->name_fa;
|
||||||
@@ -209,7 +209,8 @@ class RoadObservationController extends Controller
|
|||||||
'status_fa' => null,
|
'status_fa' => null,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$roadObserved->problemHistories()->create([
|
RoadObservationHistory::query()->create([
|
||||||
|
'id' => $roadObserved->id,
|
||||||
'user_id' => auth()->user()->id,
|
'user_id' => auth()->user()->id,
|
||||||
'action' => 'restore',
|
'action' => 'restore',
|
||||||
'description' => $request->restore_description,
|
'description' => $request->restore_description,
|
||||||
|
|||||||
Reference in New Issue
Block a user