add deleteGroup logic with HTML and SPECT testing | refactor handlers…

… with ASYNC-AWAIT b00tc4mp#361
abelpriem · Mar 24, 2024 · 239c2be · 239c2be
1 parent 156ce70
commit 239c2be
Show file tree

Hide file tree

Showing 24 changed files with 395 additions and 209 deletions.
diff --git a/staff/abel-prieto/PROYECT/API/README.md b/staff/abel-prieto/PROYECT/API/README.md
@@ -96,7 +96,7 @@
 - Response: 200
 - Response (error) : 500|409|406|401 "Content-Type": application/json { error, message } 
 
-`Delete Groups` 
+`Delete Groups` ✅
 - Request: DELETE /admin/groups/delete/:groupId Authorization: Bearer ${session.token}
 - Response: 200
 - Response (error) : 500|409|406|401 "Content-Type": application/json { error, message }
diff --git a/staff/abel-prieto/PROYECT/API/handlers/assignGroupsHandler.js b/staff/abel-prieto/PROYECT/API/handlers/assignGroupsHandler.js
@@ -13,6 +13,7 @@ export default async (req, res) => {
     try {
         await assignGroups(userId, selectedUserId, selectedGroupId)
         res.status(200).send()
+
     } catch (error) {
         let status = 500
 
@@ -24,11 +25,7 @@ export default async (req, res) => {
             status = 404
         }
 
-        if (error instanceof DuplicityError) {
-            status = 406
-        }
-
-        if (error instanceof TypeError || error instanceof ContentError) {
+        if (error instanceof TypeError || error instanceof ContentError || error instanceof DuplicityError) {
             status = 409
         }
 

diff --git a/staff/abel-prieto/PROYECT/API/handlers/authenticateUserHandler.js b/staff/abel-prieto/PROYECT/API/handlers/authenticateUserHandler.js
@@ -4,32 +4,26 @@ import { errors } from 'com'
 const { NotFoundError, CredentialsError, ContentError, TokenError } = errors
 const { JsonWebTokenError } = jwt
 
-export default (req, res) => {
-    try {
-        const { email, password } = req.body
-
-        authenticateUser(email, password)
-            .then(userId => {
-                const token = jwt.sign({ sub: userId }, process.env.JWT_SECRET, { expiresIn: process.env.JWT_EXPIRE })
+export default async (req, res) => {
+    const { email, password } = req.body
 
-                res.json(token)
-            })
-            .catch(error => {
-                let status = 500
-
-                if (error instanceof NotFoundError) {
-                    status = 404
-                }
+    try {
+        const userId = await authenticateUser(email, password)
+        const token = jwt.sign({ sub: userId }, process.env.JWT_SECRET, { expiresIn: process.env.JWT_EXPIRE })
 
-                if (error instanceof CredentialsError) {
-                    status = 406
-                }
+        res.json(token)
 
-                res.status(status).json({ error: error.constructor.name, message: error.message })
-            })
     } catch (error) {
         let status = 500
 
+        if (error instanceof NotFoundError) {
+            status = 404
+        }
+
+        if (error instanceof CredentialsError) {
+            status = 406
+        }
+
         if (error instanceof ContentError || error instanceof TypeError) {
             status = 409
 

diff --git a/staff/abel-prieto/PROYECT/API/handlers/changeUserEmailHandler.js b/staff/abel-prieto/PROYECT/API/handlers/changeUserEmailHandler.js
@@ -4,31 +4,27 @@ import changeUserEmail from '../logic/changeUserEmail.js'
 const { JsonWebTokenError } = jwt
 const { NotFoundError, CredentialsError, ContentError, TokenError } = errors
 
-export default (req, res) => {
+export default async (req, res) => {
     const token = req.headers.authorization.substring(7)
     const { sub: userId } = jwt.verify(token, process.env.JWT_SECRET)
 
     const { newEmail, password, againPassword } = req.body
 
     try {
-        changeUserEmail(userId, newEmail, password, againPassword)
-            .then(() => res.status(201).send())
-            .catch(error => {
-                let status = 500
+        await changeUserEmail(userId, newEmail, password, againPassword)
+        res.status(201).send()
 
-                if (error instanceof NotFoundError) {
-                    status = 404
-                }
-
-                if (error instanceof CredentialsError) {
-                    status = 406
-                }
-
-                res.status(status).json({ error: error.constructor.name, message: error.message })
-            })
     } catch (error) {
         let status = 500
 
+        if (error instanceof NotFoundError) {
+            status = 404
+        }
+
+        if (error instanceof CredentialsError) {
+            status = 406
+        }
+
         if (error instanceof TypeError || error instanceof ContentError) {
             status = 409
         }

diff --git a/staff/abel-prieto/PROYECT/API/handlers/changeUserPasswordHandler.js b/staff/abel-prieto/PROYECT/API/handlers/changeUserPasswordHandler.js
@@ -4,34 +4,30 @@ import changeUserPassword from '../logic/changeUserPassword.js'
 const { JsonWebTokenError } = jwt
 const { NotFoundError, CredentialsError, ContentError, TokenError } = errors
 
-export default (req, res) => {
+export default async (req, res) => {
     const token = req.headers.authorization.substring(7)
     const { sub: userId } = jwt.verify(token, process.env.JWT_SECRET)
 
     const { password, newPassword, againNewPassword } = req.body
 
     try {
-        changeUserPassword(userId, password, newPassword, againNewPassword)
-            .then(() => res.status(201).send())
-            .catch(error => {
-                let status = 500
+        await changeUserPassword(userId, password, newPassword, againNewPassword)
+        res.status(201).send()
 
-                if (error instanceof NotFoundError) {
-                    status = 404
-                }
-
-                if (error instanceof CredentialsError) {
-                    status = 406
-                }
-
-                res.status(status).json({ error: error.constructor.name, message: error.message })
-            })
     } catch (error) {
         let status = 500
 
+        if (error instanceof NotFoundError) {
+            status = 404
+        }
+
+        if (error instanceof CredentialsError) {
+            status = 406
+        }
+
         if (error instanceof TypeError || error instanceof ContentError) {
-            statusss = 409
-            s
+            status = 409
+
         } else if (error instanceof JsonWebTokenError) {
             status = 401
             error = new TokenError(error.message)

diff --git a/staff/abel-prieto/PROYECT/API/handlers/deleteGroupHandler.js b/staff/abel-prieto/PROYECT/API/handlers/deleteGroupHandler.js
@@ -0,0 +1,39 @@
+import jwt from 'jsonwebtoken'
+import deleteGroup from '../logic/deleteGroup.js'
+import { errors } from 'com'
+const { JsonWebTokenError } = jwt
+const { NotFoundError, AuthorizationError, TokenError, ContentError } = errors
+
+export default async (req, res) => {
+    const token = req.headers.authorization.substring(7)
+    const { sub: userId } = jwt.verify(token, process.env.JWT_SECRET)
+
+    const { groupId } = req.params
+
+    try {
+        await deleteGroup(userId, groupId)
+        res.status(200).send()
+
+    } catch (error) {
+        let status = 500
+
+        if (error instanceof AuthorizationError) {
+            status = 401
+        }
+
+        if (error instanceof NotFoundError) {
+            status = 404
+        }
+
+        if (error instanceof TypeError || error instanceof ContentError) {
+            status = 409
+        }
+
+        if (error instanceof JsonWebTokenError) {
+            status = 401
+            error = new TokenError(error.message)
+        }
+
+        res.status(status).json({ error: error.constructor.name, message: error.message })
+    }
+}
diff --git a/staff/abel-prieto/PROYECT/API/handlers/deleteUsersHandler.js b/staff/abel-prieto/PROYECT/API/handlers/deleteUsersHandler.js
@@ -19,6 +19,10 @@ export default async (req, res) => {
     } catch (error) {
         let status = 500
 
+        if (error instanceof AuthorizationError) {
+            status = 401
+        }
+
         if (error instanceof NotFoundError) {
             status = 404
         }
@@ -27,10 +31,6 @@ export default async (req, res) => {
             status = 409
         }
 
-        if (error instanceof AuthorizationError) {
-            status = 401
-        }
-
         if (error instanceof JsonWebTokenError) {
             status = 401
             error = new TokenError(error.message)

diff --git a/staff/abel-prieto/PROYECT/API/handlers/downloadFileHandler.js b/staff/abel-prieto/PROYECT/API/handlers/downloadFileHandler.js
@@ -16,9 +16,14 @@ export default async (req, res, next) => {
         const { path, originalName } = file
 
         res.download(path, originalName)
+
     } catch (error) {
         let status = 500
 
+        if (error instanceof AuthorizationError) {
+            status = 401
+        }
+
         if (error instanceof NotFoundError) {
             status = 404
         }
@@ -27,10 +32,6 @@ export default async (req, res, next) => {
             status = 409
         }
 
-        if (error instanceof AuthorizationError) {
-            status = 401
-        }
-
         if (error instanceof JsonWebTokenError) {
             status = 401
             error = new TokenError(error.message)

diff --git a/staff/abel-prieto/PROYECT/API/handlers/index.js b/staff/abel-prieto/PROYECT/API/handlers/index.js
@@ -16,6 +16,7 @@ import registerAdminHandler from './registerAdminHandler.js'
 import createGroupHandler from './createGroupHandler.js'
 import retrieveAllGroupsHandler from './retrieveAllGroupsHandler.js'
 import assignGroupsHandler from './assignGroupsHandler.js'
+import deleteGroupHandler from './deleteGroupHandler.js'
 
 export {
     authenticateUserHandler,
@@ -35,5 +36,6 @@ export {
     registerAdminHandler,
     createGroupHandler,
     retrieveAllGroupsHandler,
-    assignGroupsHandler
+    assignGroupsHandler,
+    deleteGroupHandler
 }
diff --git a/staff/abel-prieto/PROYECT/API/handlers/registerUserHandler.js b/staff/abel-prieto/PROYECT/API/handlers/registerUserHandler.js
@@ -2,25 +2,17 @@ import registerUser from '../logic/registerUser.js'
 import { errors } from 'com'
 const { DuplicityError, ContentError } = errors
 
-export default (req, res) => {
+export default async (req, res) => {
     const { username, email, password } = req.body
 
     try {
-        registerUser(username, email, password)
-            .then(() => res.status(201).send())
-            .catch(error => {
-                let status = 500
+        await registerUser(username, email, password)
+        res.status(201).send()
 
-                if (error instanceof DuplicityError) {
-                    status = 409
-                }
-
-                res.status(status).json({ error: error.constructor.name, message: error.message })
-            })
     } catch (error) {
         let status = 500
 
-        if (error instanceof ContentError || error instanceof TypeError) {
+        if (error instanceof ContentError || error instanceof TypeError || error instanceof DuplicityError) {
             status = 409
         }
 

diff --git a/staff/abel-prieto/PROYECT/API/handlers/retrieveAllGroupsHandler.js b/staff/abel-prieto/PROYECT/API/handlers/retrieveAllGroupsHandler.js
@@ -16,6 +16,10 @@ export default async (req, res) => {
     } catch (error) {
         let status = 500
 
+        if (error instanceof AuthorizationError) {
+            status = 401
+        }
+
         if (error instanceof NotFoundError) {
             status = 404
         }
@@ -24,10 +28,6 @@ export default async (req, res) => {
             status = 409
         }
 
-        if (error instanceof AuthorizationError) {
-            status = 401
-        }
-
         if (error instanceof JsonWebTokenError) {
             status = 401
             error = new TokenError(error.message)

diff --git a/staff/abel-prieto/PROYECT/API/handlers/retrieveAllUsersHandler.js b/staff/abel-prieto/PROYECT/API/handlers/retrieveAllUsersHandler.js
@@ -17,6 +17,10 @@ export default async (req, res) => {
     } catch (error) {
         let status = 500
 
+        if (error instanceof AuthorizationError) {
+            status = 401
+        }
+
         if (error instanceof NotFoundError) {
             status = 404
         }
@@ -25,10 +29,6 @@ export default async (req, res) => {
             status = 409
         }
 
-        if (error instanceof AuthorizationError) {
-            status = 401
-        }
-
         if (error instanceof JsonWebTokenError) {
             status = 401
             error = new TokenError(error.message)

diff --git a/staff/abel-prieto/PROYECT/API/handlers/retrieveGuestHandler.js b/staff/abel-prieto/PROYECT/API/handlers/retrieveGuestHandler.js
@@ -2,22 +2,18 @@ import retrieveGuest from "../logic/retrieveGuest.js"
 import { errors } from 'com'
 const { NotFoundError, ContentError } = errors
 
-export default (req, res) => {
+export default async (req, res) => {
     try {
-        retrieveGuest()
-            .then(guest => res.json(guest))
-            .catch(error => {
-                let status = 500
+        const guest = await retrieveGuest()
+        res.json(guest)
 
-                if (error instanceof NotFoundError) {
-                    status = 404
-                }
-
-                res.status(status).json({ error: error.constructor.name, message: error.message })
-            })
     } catch (error) {
         let status = 500
 
+        if (error instanceof NotFoundError) {
+            status = 404
+        }
+
         if (error instanceof ContentError || error instanceof TypeError) {
             status = 409
         }