Refactor and add importer to Installer module #443 (#444)

* Refactor and add importer to Installer module #443

* Refactor for finances to use in import

* Import groups into roles

* Formatting

* Formatting

* Add interface in installer for import

* Notes about importing

* Check for installer folder

* Formatting

* Fix pirep->user mapping

* Unused import

* Formatting

app/Http/Controllers/Admin/DashboardController.php

@@ -79,7 +79,8 @@ class DashboardController extends Controller
         $this->checkNewVersion();
 
         return view('admin.dashboard.index', [
-            'news'           => $this->newsRepo->getLatest(),
+            'news' => $this->newsRepo->getLatest(),
+//            'installer_enabled' => $installerEnabled,
             'pending_pireps' => $this->pirepRepo->getPendingCount(),
             'pending_users'  => $this->userRepo->getPendingCount(),
         ]);

app/Http/Controllers/Admin/RolesController.php

@@ -7,29 +7,33 @@ use App\Http\Requests\CreateRoleRequest;
 use App\Http\Requests\UpdateRoleRequest;
 use App\Repositories\PermissionsRepository;
 use App\Repositories\RoleRepository;
-use Flash;
+use App\Services\RoleService;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Laracasts\Flash\Flash;
 use Prettus\Repository\Criteria\RequestCriteria;
-use Response;
 
-/**
- * Class AirlinesController
- */
 class RolesController extends Controller
 {
     private $permsRepo;
     private $rolesRepo;
+    private $roleSvc;
 
     /**
      * AirlinesController constructor.
      *
      * @param PermissionsRepository $permsRepo
      * @param RoleRepository        $rolesRepo
+     * @param                       $roleSvc
      */
-    public function __construct(PermissionsRepository $permsRepo, RoleRepository $rolesRepo)
-    {
+    public function __construct(
+        PermissionsRepository $permsRepo,
+        RoleRepository $rolesRepo,
+        RoleService $roleSvc
+    ) {
         $this->permsRepo = $permsRepo;
         $this->rolesRepo = $rolesRepo;
+        $this->roleSvc = $roleSvc;
     }
 
     /**
@@ -132,8 +136,6 @@ class RolesController extends Controller
      * @param int               $id
      * @param UpdateRoleRequest $request
      *
-     * @throws \Prettus\Validator\Exceptions\ValidatorException
-     *
      * @return Response
      */
     public function update($id, UpdateRoleRequest $request)
@@ -145,14 +147,8 @@ class RolesController extends Controller
             return redirect(route('admin.roles.index'));
         }
 
-        $this->rolesRepo->update($request->all(), $id);
-
-        // Update the permissions, filter out null/invalid values
-        $perms = collect($request->permissions)->filter(static function ($v, $k) {
-            return $v;
-        });
-
-        $role->permissions()->sync($perms);
+        $this->roleSvc->updateRole($role, $request->all());
+        $this->roleSvc->setPermissionsForRole($role, $request->permissions);
 
         Flash::success('Roles updated successfully.');
         return redirect(route('admin.roles.index'));