diff --git a/app/Classes/Modules/Accounts/ControllersLogic/CreateAdminUserLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/CreateAdminUserLogic.php new file mode 100644 index 00000000..ff48ebf4 --- /dev/null +++ b/app/Classes/Modules/Accounts/ControllersLogic/CreateAdminUserLogic.php @@ -0,0 +1,73 @@ + 'Created Account', + 'message' => 'You have successfully created a new Account' + ]; + } + + /** @var CanCreateUser */ + private $canCreateUser; + + /** @var CreatesUser */ + private $createsUser; + + + /** + * CreateUserLogic constructor. + * @param CanCreateUser $canCreateUser + * @param CreatesUser $createsUser + */ + public function __construct( + CanCreateUser $canCreateUser, + CreatesUser $createsUser + ) + { + $this->canCreateUser = $canCreateUser; + $this->createsUser = $createsUser; + } + + /** + * @param Request $request + * @return JsonResponse + * @throws \App\Classes\Exceptions\AccessForbiddenException + * @throws \App\Classes\Exceptions\MalformedRequestException + * @throws \App\Classes\Exceptions\RequestValidationException + */ + public function logic(Request $request) : JsonResponse + { + + $user_object = new RegistrationObject($request->input('name'), $request->input('email'), + $request->input('password'), $request->input('password_confirmation'), + RoleTypes::ADMIN, ApprovalStatus::APPROVED); + + $this->canCreateUser->passes($user_object); + + $user = $this->createsUser->execute($user_object); + + return $this->resourceResponse(new UserResource($user)); + + } +} \ No newline at end of file diff --git a/app/Classes/Modules/Accounts/ControllersLogic/DeleteUserLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/DeleteUserLogic.php new file mode 100644 index 00000000..485e9cf3 --- /dev/null +++ b/app/Classes/Modules/Accounts/ControllersLogic/DeleteUserLogic.php @@ -0,0 +1,76 @@ + 'Delete User', + 'message' => 'You have successfully deleted the User' + ]; + } + + /** @var CanDeleteUser */ + private $canDeleteUser; + + /** @var DeletesUser */ + private $deletesUser; + + /** @var FetchesUser */ + private $fetchesUser; + + + public function __construct( + CanDeleteUser $canDeleteUser, + DeletesUser $deletesUser, + FetchesUser $fetchesUser + ) + { + $this->canDeleteUser = $canDeleteUser; + $this->deletesUser = $deletesUser; + $this->fetchesUser = $fetchesUser; + } + + /** + * @param Request $request + * @return JsonResponse + * @throws ErrorException + */ + public function logic(Request $request) : JsonResponse + { + 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()); + } + } + +} \ No newline at end of file diff --git a/app/Classes/Modules/Accounts/DataTransferObjects/UserObject.php b/app/Classes/Modules/Accounts/DataTransferObjects/UserObject.php index b3988d3a..55fb5f31 100644 --- a/app/Classes/Modules/Accounts/DataTransferObjects/UserObject.php +++ b/app/Classes/Modules/Accounts/DataTransferObjects/UserObject.php @@ -3,20 +3,46 @@ namespace App\Classes\Modules\Accounts\DataTransferObjects; use App\Classes\General\Interfaces\DataTransferObject; +use App\Classes\ValueObjects\Constants\ApprovalStatus; +use App\Classes\ValueObjects\Constants\RoleTypes; class UserObject implements DataTransferObject { + /** @var string */ + private $name; /** @var string */ - private $name; + private $email; + + /** @var string */ + private $password; + + /** @var string */ + private $passwordConfirmation; + + /** @var int|null */ + private $type; + + /** @var int|null */ + private $status; /** - * NameObject constructor. + * UserObject constructor. * @param string $name + * @param string $email + * @param string $password + * @param string $passwordConfirmation + * @param int|null $type + * @param int|null $status */ - public function __construct(string $name) + public function __construct(string $name, string $email, string $password, string $passwordConfirmation, ?int $type = RoleTypes::USER, ?int $status = ApprovalStatus::PENDING_VERIFICATION) { - $this->name = $name; + $this->name = $name; + $this->email = $email; + $this->password = $password; + $this->passwordConfirmation = $passwordConfirmation; + $this->type = $type; + $this->status = $status; } /** @@ -25,6 +51,49 @@ class UserObject implements DataTransferObject public function getName(): string { return $this->name; - } + } + + /** + * @return string + */ + public function getEmail(): string + { + return $this->email; + } + + /** + * @return string + */ + public function getPassword(): string + { + return $this->password; + } + + /** + * @return string + */ + public function getPasswordConfirmation(): string + { + return $this->passwordConfirmation; + } + + /** + * @return int + */ + public function getType(): int + { + return $this->type; + } + + /** + * @return int + */ + public function getStatus(): int + { + return $this->status; + } + + + } \ No newline at end of file diff --git a/app/Classes/Modules/Accounts/Services/DeletesUser.php b/app/Classes/Modules/Accounts/Services/DeletesUser.php new file mode 100644 index 00000000..534331b0 --- /dev/null +++ b/app/Classes/Modules/Accounts/Services/DeletesUser.php @@ -0,0 +1,19 @@ +handler($model); + } +} \ No newline at end of file diff --git a/app/Classes/Modules/Accounts/Standards/Rules/CanCreateUser.php b/app/Classes/Modules/Accounts/Standards/Rules/CanCreateUser.php new file mode 100644 index 00000000..2da56844 --- /dev/null +++ b/app/Classes/Modules/Accounts/Standards/Rules/CanCreateUser.php @@ -0,0 +1,57 @@ +userCreateValidation = $userCreateValidation; + } + + + /** + * @return bool + */ + protected function authorized(): bool + { + // TODO Set Authorization rules + return true; + + } + + /** + * @param RegistrationObject $object + * @return bool + * @throws \App\Classes\Exceptions\RequestValidationException + */ + protected function validators($object): bool + { + return $this->userCreateValidation->validate($object); + + } + + + /** + * @param AddressObject $object + * @return bool + */ + protected function criteria($object): bool + { + return true; + } + +} \ No newline at end of file diff --git a/app/Classes/Modules/Accounts/Standards/Rules/CanDeleteUser.php b/app/Classes/Modules/Accounts/Standards/Rules/CanDeleteUser.php new file mode 100644 index 00000000..f106bcc7 --- /dev/null +++ b/app/Classes/Modules/Accounts/Standards/Rules/CanDeleteUser.php @@ -0,0 +1,40 @@ + $object->getName(), + 'email' => $object->getEmail(), + 'password' => $object->getPassword(), + ]; + } + + /** + * @return array + */ + protected function rules(): array + { + return [ + 'name' => 'required', + 'email' => 'required|unique:users', + 'password' => 'required', + ]; + } + + /** + * @return array + */ + protected function messages(): array + { + return []; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Accounts/CreateAdminUserController.php b/app/Http/Controllers/Accounts/CreateAdminUserController.php new file mode 100644 index 00000000..2c3a9ac7 --- /dev/null +++ b/app/Http/Controllers/Accounts/CreateAdminUserController.php @@ -0,0 +1,22 @@ +execute($request); + } + +} \ No newline at end of file diff --git a/app/Http/Controllers/Accounts/DeleteUserController.php b/app/Http/Controllers/Accounts/DeleteUserController.php new file mode 100644 index 00000000..375cdcbd --- /dev/null +++ b/app/Http/Controllers/Accounts/DeleteUserController.php @@ -0,0 +1,19 @@ +execute($request); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Bookings/DeleteBookingController.php b/app/Http/Controllers/Bookings/DeleteBookingController.php index dfbd8a01..f0bffeb2 100644 --- a/app/Http/Controllers/Bookings/DeleteBookingController.php +++ b/app/Http/Controllers/Bookings/DeleteBookingController.php @@ -1,8 +1,8 @@ -
+
-
-
-
-
- - - +
+
+
+ +
+
+
+
+
+
Name
+
+
-
-
{{this.user.full_name}}
-
-
-
{{this.user.email}}
-
+
{{item.name}}
-
-
-
-
-
-
-
-
-
-
-
-
- View Profile -
-
- -
-
-
-
-
-
-
-
- Reset Password -
-
- -
-
-
-
-
-
-
-
- Block User -
-
- -
-
-
-
-
-
-
-
- +
+
+
+
+
+
Email
+
+
+
+
+
{{item.email}}
+
+
+
+
+
+
+ + + +
@@ -82,24 +47,15 @@
+ + \ No newline at end of file diff --git a/resources/assets/vue/components/user/form/DeleteUserFormComponent.vue b/resources/assets/vue/components/user/form/DeleteUserFormComponent.vue new file mode 100644 index 00000000..cb8af386 --- /dev/null +++ b/resources/assets/vue/components/user/form/DeleteUserFormComponent.vue @@ -0,0 +1,33 @@ + + \ No newline at end of file diff --git a/resources/assets/vue/components/user/form/UserFormComponent.vue b/resources/assets/vue/components/user/form/UserFormComponent.vue new file mode 100644 index 00000000..656495d4 --- /dev/null +++ b/resources/assets/vue/components/user/form/UserFormComponent.vue @@ -0,0 +1,117 @@ + + \ No newline at end of file diff --git a/resources/views/pages/settings.blade.php b/resources/views/pages/settings.blade.php index 46956b04..288b2007 100644 --- a/resources/views/pages/settings.blade.php +++ b/resources/views/pages/settings.blade.php @@ -200,6 +200,42 @@