Aircraft can be added without subfleet/block subfleet deletion if still in use #128

app/Http/Controllers/Admin/AircraftController.php

@@ -23,6 +23,7 @@ class AircraftController extends BaseController
 
     /**
      * Display a listing of the Aircraft.
+     * @throws \Prettus\Repository\Exceptions\RepositoryException
      */
     public function index(Request $request)
     {
@@ -46,11 +47,12 @@ class AircraftController extends BaseController
 
     /**
      * Store a newly created Aircraft in storage.
+     * @throws \Prettus\Validator\Exceptions\ValidatorException
      */
     public function store(CreateAircraftRequest $request)
     {
         $input = $request->all();
-        $aircraft = $this->aircraftRepository->create($input);
+        $this->aircraftRepository->create($input);
 
         Flash::success('Aircraft saved successfully.');
         return redirect(route('admin.aircraft.index'));
@@ -93,6 +95,7 @@ class AircraftController extends BaseController
 
     /**
      * Update the specified Aircraft in storage.
+     * @throws \Prettus\Validator\Exceptions\ValidatorException
      */
     public function update($id, UpdateAircraftRequest $request)
     {
@@ -126,5 +129,4 @@ class AircraftController extends BaseController
         Flash::success('Aircraft deleted successfully.');
         return redirect(route('admin.aircraft.index'));
     }
-
 }

app/Http/Controllers/Admin/SubfleetController.php

@@ -15,6 +15,7 @@ use App\Models\Subfleet;
 use App\Http\Requests\CreateSubfleetRequest;
 use App\Http\Requests\UpdateSubfleetRequest;
 
+use App\Repositories\AircraftRepository;
 use App\Repositories\FareRepository;
 use App\Repositories\SubfleetRepository;
 
@@ -23,19 +24,23 @@ use App\Services\FareService;
 class SubfleetController extends BaseController
 {
     /** @var  SubfleetRepository */
-    private $subfleetRepo, $fareRepo, $fareSvc;
+    private $aircraftRepo, $subfleetRepo, $fareRepo, $fareSvc;
 
     /**
      * SubfleetController constructor.
      *
+     * @param AircraftRepository $aircraftRepo
      * @param SubfleetRepository $subfleetRepo
-     * @param FareRepository     $fareRepo
+     * @param FareRepository $fareRepo
+     * @param FareService $fareSvc
      */
     public function __construct(
+        AircraftRepository $aircraftRepo,
         SubfleetRepository $subfleetRepo,
         FareRepository $fareRepo,
         FareService $fareSvc
     ) {
+        $this->aircraftRepo = $aircraftRepo;
         $this->subfleetRepo = $subfleetRepo;
         $this->fareRepo = $fareRepo;
         $this->fareSvc = $fareSvc;
@@ -183,6 +188,14 @@ class SubfleetController extends BaseController
             return redirect(route('admin.subfleets.index'));
         }
 
+        # Make sure no aircraft are assigned to this subfleet
+        # before trying to delete it, or else things might go boom
+        $aircraft = $this->aircraftRepo->findWhere(['subfleet_id' => $id], ['id']);
+        if($aircraft->count() > 0) {
+            Flash::error('There are aircraft still assigned to this subfleet, you can\'t delete it!')->important();
+            return redirect(route('admin.subfleets.index'));
+        }
+
         $this->subfleetRepo->delete($id);
 
         Flash::success('Subfleet deleted successfully.');