Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development

app/Classes/Modules/Accounts/ControllersLogic/DeleteUserLogic.php

@@ -53,15 +53,24 @@ class DeleteUserLogic extends AbstractControllerLogic
     /**
      * @param Request $request
      * @return JsonResponse
-     * @throws \App\Classes\Exceptions\AccessForbiddenException
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     * @throws \App\Classes\Exceptions\RequestValidationException
+     * @throws ErrorException
      */
     public function logic(Request $request) : JsonResponse
     {
-        $user = $this->fetchesUser->execute(['id' => $request->route('id')]);
-        $this->canDeleteUser->passes();
-        $this->deletesUser->execute($user);
+        try {
+            DB::beginTransaction();
+
+            $user = $this->fetchesUser->execute(['id' => $request->route('id')]);
+            $this->canDeleteUser->passes();
+            $this->deletesUser->execute($user);
+            
+            DB::commit();
+
+            return $this->resourceResponse(new UserResource($user));
+
+        } catch (\Exception $exception){
+            throw new ErrorException($exception->getMessage(), $exception->getCode());
+        }
     }
 
 }

app/Classes/Modules/Segments/Standards/Rules/CanCreateSegment.php

@@ -27,9 +27,9 @@ class CanCreateSegment extends AbstractRule
     protected function authorized(): bool
     {
         // TODO  Set Authorization rules
-//        if (!\Auth::user()->can('add segment')) {
-//            return false;
-//        }
+        if (!\Auth::user()->can('add segment')) {
+            return false;
+        }
 
         return true;
     }

app/Classes/Modules/Segments/Standards/Rules/CanDeleteSegment.php

@@ -14,9 +14,9 @@ class CanDeleteSegment extends AbstractRule
     {
         // TODO  Set Authorization rules
 
-//        if (!\Auth::user()->can('delete segment')) {
-//            return false;
-//        }
+        if (!\Auth::user()->can('delete segment')) {
+            return false;
+        }
 
         return true;
 

app/Classes/Modules/Segments/Standards/Rules/CanUpdateSegment.php

@@ -30,9 +30,9 @@ class CanUpdateSegment extends AbstractRule
     {
         // TODO  Set Authorization rules
 
-//        if (!\Auth::user()->can('edit segment')) {
-//            return false;
-//        }
+        if (!\Auth::user()->can('edit segment')) {
+            return false;
+        }
 
         return true;
     }