implement get user chats logic in api; change jsonBodyParser middlewa…

…re to express middleware b00tc4mp#84
Eden23 · Aug 27, 2024 · e2cea66 · e2cea66
1 parent 7ca0ce1
commit e2cea66
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 8 deletions.
diff --git a/staff/marti-herms/project/G-HUB/api/handlers/getUserChatsHandler.js b/staff/marti-herms/project/G-HUB/api/handlers/getUserChatsHandler.js
@@ -0,0 +1,15 @@
+import { logic } from 'core'
+
+export default (req, res, next) => {
+    const { userId } = req
+
+    const { targetUserId } = req.params
+
+    try {
+        logic.getUserChats(userId, targetUserId)
+            .then(chats => res.json(chats))
+            .catch(error => next(error))
+    } catch (error) {
+        next(error)
+    }
+}
diff --git a/staff/marti-herms/project/G-HUB/api/handlers/index.js b/staff/marti-herms/project/G-HUB/api/handlers/index.js
@@ -23,6 +23,7 @@ import editUserUsernameHandler from './editUserUsernameHandler.js'
 import openChatHandler from './openChatHandler.js'
 import sendMessageHandler from './sendMessageHandler.js'
 import getChatMessagesHandler from './getChatMessagesHandler.js'
+import getUserChatsHandler from './getUserChatsHandler.js'
 
 const handle = {
     authenticateUser: authenticateUserHandler,
@@ -35,6 +36,7 @@ const handle = {
     getGamesReviews: getGamesReviewsHandler,
     getUser: getUserHandler,
     getUserAvatar: getUserAvatarHandler,
+    getUserChats: getUserChatsHandler,
     getUserFavs: getUserFavsHandler,
     getUserFollowers: getUserFollowersHandler,
     getUserFollowing: getUserFollowingHandler,

diff --git a/staff/marti-herms/project/G-HUB/api/index.js b/staff/marti-herms/project/G-HUB/api/index.js
@@ -4,7 +4,7 @@ import cors from 'cors'
 
 import { mongoose } from 'core'
 
-import { jsonBodyParser, jwtVerifier, errorHandler } from './middleware/index.js'
+import { jwtVerifier, errorHandler } from './middleware/index.js'
 
 import handle from './handlers/index.js'
 
@@ -16,13 +16,15 @@ mongoose.connect(process.env.MONGODB_URI)
 
         api.use(cors())
 
-        api.post('/users', jsonBodyParser, handle.registerUser)
+        api.use(json())
 
-        api.post('/users/auth', jsonBodyParser, handle.authenticateUser)
+        api.post('/users', handle.registerUser)
 
-        api.patch('/users/username', jwtVerifier, jsonBodyParser, handle.editUserUsername)
+        api.post('/users/auth', handle.authenticateUser)
 
-        api.patch('/users/avatar', jwtVerifier, jsonBodyParser, handle.editUserAvatar)
+        api.patch('/users/username', jwtVerifier, handle.editUserUsername)
+
+        api.patch('/users/avatar', jwtVerifier, handle.editUserAvatar)
 
         api.get('/users/search', jwtVerifier, handle.searchUser)
 
@@ -38,7 +40,7 @@ mongoose.connect(process.env.MONGODB_URI)
 
         api.patch('/users/:targetUserId/follow', jwtVerifier, handle.toggleFollowUser)
 
-        api.post('/games', jwtVerifier, jsonBodyParser, handle.registerGame)
+        api.post('/games', jwtVerifier, handle.registerGame)
 
         api.get('/games/search', jwtVerifier, handle.searchGame)
 
@@ -56,16 +58,18 @@ mongoose.connect(process.env.MONGODB_URI)
 
         api.patch('/games/:gameId/favs', jwtVerifier, handle.toggleFavGame)
 
-        api.post('/games/:gameId/review', jwtVerifier, jsonBodyParser, handle.makeReview)
+        api.post('/games/:gameId/review', jwtVerifier, handle.makeReview)
 
         api.delete('/reviews/:reviewId', jwtVerifier, handle.deleteReview)
 
         api.get('/chat/:targetUserId', jwtVerifier, handle.openChat)
 
-        api.post('/chat/:chatId/messages', jwtVerifier, jsonBodyParser, handle.sendMessage)
+        api.post('/chat/:chatId/messages', jwtVerifier, handle.sendMessage)
 
         api.get('/chat/:chatId/messages', jwtVerifier, handle.getChatMessages)
 
+        api.get('/chats/:targetUserId', jwtVerifier, handle.getUserChats)
+
         api.use(errorHandler)
 
         api.listen(process.env.PORT, () => console.info(`API listening on PORT ${process.env.PORT}`))

diff --git a/staff/marti-herms/project/G-HUB/app/src/home/Game.jsx b/staff/marti-herms/project/G-HUB/app/src/home/Game.jsx
@@ -65,6 +65,8 @@ export default function Game({ makeReviewVisibility, onCancel }) {
         try {
             logic.makeReview(gameId, comment, rate || 0)
                 .then(() => {
+                    console.log('hello')
+
                     onCancel()
 
                     loadReviews()