Merge pull request #138 from Arquisoft/fixes-friends

Arreglado error de duplicación al agregar amigo
Arquisoft · Apr 24, 2024 · a806370 · a806370
2 parents f69f88c + f4377d1
commit a806370
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 18 deletions.
diff --git a/users/userservice/user-service.js b/users/userservice/user-service.js
@@ -101,6 +101,7 @@ app.post("/adduser", async (req, res) => {
 app.get("/users", async (req, res) => {
   try {
     const users = await User.find();
+    console.log(users);
     res.status(200).json(users);
   } catch (error) {
     res.status(500).json({ error: "Internal Server Error" });
@@ -219,6 +220,7 @@ app.get("/friends", async (req, res) => {
     }
     // Devuelve la lista de amigos
     res.status(200).json({ friends: user.friends });
+
   } catch (error) {
     res.status(500).json({ error: "Internal Server Error" });
   }

diff --git a/webapp/e2e/steps/add-friend.steps.js b/webapp/e2e/steps/add-friend.steps.js
@@ -22,10 +22,11 @@ defineFeature(feature, (test) => {
   });
   let username;
   let password;
+  let userCountBefore;
   test("The user can add a friend", ({ given, when, then }) => {
     given("A logged-in user and another user", async () => {
       await expect(page).toClick("a", { text: "Regístrate" });
-      username="friend";
+      username="Friend";
       password="Friend123";
       await page.waitForSelector('#register-username');
       await page.type('#register-username', username);
@@ -59,23 +60,19 @@ defineFeature(feature, (test) => {
       //await page.waitForNavigation({ waitUntil: "networkidle0" });
       await page.waitForTimeout(1000);
 
+      const userRowsBefore = await page.$$('[data-testid^="user-row-"]');
+      userCountBefore = userRowsBefore.length;
+
       await page.waitForSelector('[data-testid^="add-friend-button-"]');
       await page.click('[data-testid^="add-friend-button-"]');
 
   });
 
     then("The user should disappear from the Users page", async () => {
-      await page.waitForTimeout(1000);
-
-      const userRowsBefore = await page.$$('[data-testid^="user-row-"]');
-      const userCountBefore = userRowsBefore.length;
-
-      await page.waitForSelector('[data-testid^="add-friend-button-"]');
-      const addFriendButtons = await page.$$('[data-testid^="add-friend-button-"]');
-      await addFriendButtons[0].click();
 
       await page.waitForTimeout(1000);
-
+      await page.reload({ waitUntil: ["networkidle0", "domcontentloaded"] });
+
       const userRowsAfter = await page.$$('[data-testid^="user-row-"]');
       const userCountAfter = userRowsAfter.length;
 

diff --git a/webapp/src/locales/en.json b/webapp/src/locales/en.json
@@ -191,10 +191,10 @@
       "home": "Back to Home"
     },
     "userspage": {
-      "list": "User List",
+      "list": "Application users",
       "user": "User",
       "actions": "Actions",
-      "friend": "Friend",
+      "friend": "Already friends",
       "addFriend": "Add Friend",
       "loading": "Loading users...",
       "error": "Error loading users: "

diff --git a/webapp/src/locales/es.json b/webapp/src/locales/es.json
@@ -191,10 +191,10 @@
       "home": "Volver al inicio"
     },
     "userspage": {
-      "list": "Lista de usuarios",
+      "list": "Usuarios de la aplicación",
       "user": "Usuario",
       "actions": "Acciones",
-      "friend": "Amigo",
+      "friend": "Ya sois amigos",
       "addFriend": "Añadir amigo",
       "loading": "Cargando usuarios ...",
       "error": "Error al cargar los usuarios: "

diff --git a/webapp/src/pages/Social/UsersPage.js b/webapp/src/pages/Social/UsersPage.js
@@ -103,9 +103,6 @@ const UsersPage = () => {
         throw new Error("Error al agregar amigo");
       }
 
-      // Agregar el usuario a la lista de amigos localmente
-      setUsers((prevFriends) => [...prevFriends, user]);
-      // Actualizar el estado de isFriend del usuario
       setUsers((prevUsers) => {
         return prevUsers.map((u) => {
           if (u._id === user._id) {
@@ -116,7 +113,6 @@ const UsersPage = () => {
       });
     } catch (error) {
       console.error("Error al agregar amigo:", error);
-      // Manejar el error según sea necesario
     }
   };