Merge pull request #100 from Arquisoft/rankings

Rankings
Arquisoft · Apr 7, 2024 · 626c3b0 · 626c3b0
2 parents b5b4eff + 747e829
commit 626c3b0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 21 deletions.
diff --git a/users/userservice/package-lock.json b/users/userservice/package-lock.json
diff --git a/users/userservice/package.json b/users/userservice/package.json
@@ -21,8 +21,7 @@
     "bcrypt": "^5.1.1",
     "body-parser": "^1.20.2",
     "express": "^4.18.2",
-    "mongoose": "^8.0.4",
-    "ramda": "^0.29.1"
+    "mongoose": "^8.0.4"
   },
   "devDependencies": {
     "jest": "^29.7.0",

diff --git a/users/userservice/user-service.js b/users/userservice/user-service.js
@@ -3,7 +3,6 @@ const express = require('express');
 const mongoose = require('mongoose');
 const bcrypt = require('bcrypt');
 const bodyParser = require('body-parser');
-const R = require('ramda');
 
 const User = require('./user-model')
 
@@ -45,10 +44,8 @@ app.get('/rankings/:filter', async (req, res) => {
     const userRanking = getRankingFor(loggedUser) */
 
     const category = req.params.filter;
-    const usersRanking = (await User.find());
-    const ascendingUsers = R.sortBy(R.prop("ranking." + category + ".points"), usersRanking);
-    const sortedUsers = R.reverse(ascendingUsers);
-    const sortedRanking = sortedUsers.map( (user, index) => {
+    const usersRanking = (await User.find()).sort((a, b) => b.ranking[category].points - a.ranking[category].points)
+    .map((user, index) => {
       return {
         // User global data
         name: user.username,
@@ -61,7 +58,7 @@ app.get('/rankings/:filter', async (req, res) => {
     })
 
     //res.json(userRanking, usersRanking)
-    res.json(sortedRanking)
+    res.status(200).json(usersRanking)
   } catch (error) {
     res.status(400).json({ error: error.message }); 
   }

diff --git a/webapp/src/components/ranking/RankingLayout.jsx b/webapp/src/components/ranking/RankingLayout.jsx
@@ -34,8 +34,12 @@ const RankingsLayout = () => {
                             Monuments
                         </button>
                         <button className="flex items-center px-4 py-2 text-gray-100 rounded-lg hover:bg-[#73689b]"
-                            onClick={() => handleFilterClick('food')}>
-                            Food
+                            onClick={() => handleFilterClick('foods')}>
+                            Foods
+                        </button>
+                        <button className="flex items-center px-4 py-2 text-gray-100 rounded-lg hover:bg-[#73689b]"
+                            onClick={() => handleFilterClick('tourist_attractions')}>
+                            Attractions
                         </button>
                     </nav>
                 </div>