Merge pull request #347 from hanazarraa/upstream2/rooms_management

Upstream2/rooms management

hivelvet-backend/app/config/routes.ini

@@ -77,3 +77,5 @@ DELETE  @label_delete   : /labels/@id            = Actions\Labels\Delete->execut
 ; rooms routes
 GET     @rooms_index    : /rooms/@user_id        = Actions\Rooms\Index->show
 POST    @rooms_add      : /rooms                 = Actions\Rooms\Add->save
+PUT     @rooms_edit      : /rooms/@id            =  Actions\Rooms\Edit->rename
+DELETE  @room_delete   : /rooms/@id            = Actions\Rooms\Delete->execute

hivelvet-backend/app/src/Actions/Rooms/Delete.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Hivelvet open source platform - https://riadvice.tn/
+ *
+ * Copyright (c) 2022 RIADVICE SUARL and by respective authors (see below).
+ *
+ * This program is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 3.0 of the License, or (at your option) any later
+ * version.
+ *
+ * Hivelvet is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with Hivelvet; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Actions\Rooms;
+
+use Actions\Delete as DeleteAction;
+use Actions\RequirePrivilegeTrait;
+
+/**
+ * Class Delete.
+ */
+class Delete extends DeleteAction
+{
+    use RequirePrivilegeTrait;
+
+    protected $deleteMethodName = 'delete';
+}

hivelvet-backend/app/src/Actions/Rooms/Edit.php

@@ -0,0 +1,84 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Hivelvet open source platform - https://riadvice.tn/
+ *
+ * Copyright (c) 2022 RIADVICE SUARL and by respective authors (see below).
+ *
+ * This program is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation; either version 3.0 of the License, or (at your option) any later
+ * version.
+ *
+ * Hivelvet is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along
+ * with Hivelvet; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Actions\Rooms;
+
+use Actions\Base as BaseAction;
+use Actions\RequirePrivilegeTrait;
+use Enum\ResponseCode;
+use Models\Room;
+use Respect\Validation\Validator;
+use Validation\DataChecker;
+
+class Edit extends BaseAction
+{
+    use RequirePrivilegeTrait;
+
+    /**
+     * @param \Base $f3
+     * @param array $params
+     */
+    public function rename($f3, $params): void
+    {
+        $body = $this->getDecodedBody();
+        $form = $body['data'];
+
+        $id          = $params['id'];
+        $dataChecker = new DataChecker();
+
+        $dataChecker->verify($form['name'], Validator::notEmpty()->setName('name'));
+        $dataChecker->verify($id, Validator::notEmpty()->setName('id'));
+
+        $errorMessage = 'Room could not be updated';
+
+        $room = new Room();
+        $room = $room->getById($id);
+        if ($room->valid()) {
+            if ($dataChecker->allValid()) {
+                $checkRoom  = new Room();
+                $room->name = $form['name'];
+
+                if ($checkRoom->nameExists($room->name, $room->user_id, $room->id)) {
+                    $this->logger->error($errorMessage, ['error' => 'Name already exists']);
+                    $this->renderJson(['errors' => ['name' => 'Name already exists']], ResponseCode::HTTP_PRECONDITION_FAILED);
+                } else {
+                    try {
+                        $room->save();
+                    } catch (\Exception $e) {
+                        $this->logger->error($errorMessage, ['error' => $e->getMessage()]);
+                        $this->renderJson(['errors' => $e->getMessage()], ResponseCode::HTTP_INTERNAL_SERVER_ERROR);
+
+                        return;
+                    }
+                    $this->logger->info('room successfully updated', ['room' => $room->toArray()]);
+                    $this->renderJson(['result' => 'success', 'room' => $room->getRoomInfos($room->id)]);
+                }
+            } else {
+                $this->logger->error($errorMessage, ['errors' => $dataChecker->getErrors()]);
+                $this->renderJson(['errors' => $dataChecker->getErrors()], ResponseCode::HTTP_UNPROCESSABLE_ENTITY);
+            }
+        } else {
+            $this->logger->error($errorMessage);
+            $this->renderJson([], ResponseCode::HTTP_NOT_FOUND);
+        }
+    }
+}

hivelvet-backend/app/src/Models/Room.php

@@ -22,6 +22,7 @@
 
 namespace Models;
 
+use Enum\ResponseCode;
 use Models\Base as BaseModel;
 
 /**
@@ -51,6 +52,20 @@ public function nameExists($name, $userId, $id = null)
         return $this->load(['lower(name) = ? and user_id = ? and id != ?', mb_strtolower($name), $userId, $id]);
     }
 
+    /**
+     * Get room record by id value.
+     *
+     * @param mixed $id
+     *
+     * @return $this
+     */
+    public function getById($id): self
+    {
+        $this->load(['id = ?', $id]);
+
+        return $this;
+    }
+
     public function collectAllByUserId($userId): array
     {
         return $this->db->exec('SELECT id, name, short_link, preset_id FROM rooms where user_id =?', $userId);
@@ -116,4 +131,49 @@ public function getLabels($room): array
 
         return $lbs;
     }
+
+    /**
+     * Delete a room if it's allowed and  removing its associated roomlabels.
+     *
+     * @return Array[2](Array[], ResponsCode)
+     */
+    public function delete(): array
+    {
+        // delete associated roomslabels
+        $result = $this->deleteRoomsLabels();
+
+        if ($result) {
+            try {
+                $this->erase();
+                $this->logger->info('Room successfully deleted', ['room' => $this->toArray()]);
+            } catch (\Exception $e) {
+                $this->logger->error('room could not be deleted', ['room' => $this->toArray(), 'error' => $e->getMessage()]);
+
+                throw $e;
+            }
+
+            return [['result' => 'success'], ResponseCode::HTTP_OK];
+        }
+
+        return [[], ResponseCode::HTTP_FORBIDDEN];
+    }
+
+    public function deleteRoomsLabels(): bool
+    {
+        $this->logger->info('Starting delete rooms labels transaction.');
+        $this->db->begin();
+        $roomId = $this->id;
+
+        $roomlabel    = new RoomLabel();
+        $deleteResult = $roomlabel->erase(['room_id = ?', $roomId]);
+        if ($deleteResult) {
+            $this->logger->info('All Rooms Labels successfully deleted');
+            $this->db->commit();
+            $this->logger->info('Delete rooms and its associations transaction successfully commit.');
+
+            return true;
+        }
+
+        return false;
+    }
 }

hivelvet-backend/tests/src/Actions/Settings/EditTest.php

@@ -36,10 +36,9 @@ final class EditTest extends Scenario
     final protected const EDIT_SETTINGS_ROUTE = 'PUT /settings';
     protected $group                          = 'Action Setting Edit';
 
-/**
+    /**
      * @param mixed $f3
      *
-
      * @return array
      *
      * @throws \ReflectionException

hivelvet-frontend/src/components/AddLabelForm.tsx

@@ -26,7 +26,7 @@ import { DataContext } from 'lib/RoomsContext';
 import labelsService from 'services/labels.service';
 import Notifications from './Notifications';
 import { FormInstance } from 'antd/lib/form';
-import { PaginationType } from '../types/PaginationType';
+
 type Props = {
     isLogin?: boolean;
     errors?: string[];

hivelvet-frontend/src/components/Install.tsx

@@ -198,7 +198,7 @@ const Install = () => {
         const stepsData: formType = stepForm.getFieldsValue(true);
         if (activeStep == 0) {
             UsersService.collect_users(stepsData)
-                .then((result) => {
+                .then(() => {
                     next();
                 })
                 .catch((error) => {

hivelvet-frontend/src/components/Presets.tsx

@@ -488,7 +488,8 @@ const Presets = () => {
     //delete
     const deletePreset = (id) => {
         PresetsService.delete_preset(id)
-            .then(() => {
+            .then((response) => {
+                console.log(response);
                 setMyPresets(myPresets.filter((p) => p.id != id));
                 const indexPreset = dataContext.dataPresets.findIndex((item) => id === item.id);
                 if (indexPreset !== -1) {

hivelvet-frontend/src/components/Roles.tsx

@@ -84,6 +84,7 @@ const Roles = () => {
     const getPrivileges = () => {
         RolesService.list_permissions()
             .then((response) => {
+                console.log(response);
                 const privileges = response.data;
                 if (privileges instanceof Object) {
                     setAllPrivileges(privileges);