Merge pull request #127 from Lukasdotcom/bug-fix

Fixes bug that allows player to be moved to the bench during purchase
Lukasdotcom · Aug 18, 2022 · 7ff76d0 · 7ff76d0
2 parents 9381f03 + 6794679
commit 7ff76d0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/cypress/e2e/invite.cy.js b/cypress/e2e/invite.cy.js
@@ -84,6 +84,9 @@ describe("Invite User into league and change some league Settings and run throug
     cy.contains("Move to Field").click();
     cy.contains("Star").click();
     cy.contains("Move to Bench").click();
+    // Makes sure the player can be moved back to the bench
+    cy.contains("Move to Field").click();
+    cy.contains("Star").click();
     cy.contains("Buying");
     // Switches to user 2
     cy.contains("Standings")
@@ -110,13 +113,17 @@ describe("Invite User into league and change some league Settings and run throug
     cy.contains("You need 19.3 M");
     cy.contains("Money left: 13.4M");
     // Moves the squad slightly
+    cy.intercept("/api/player/87963521baf120631131").as("loadNkunku");
     cy.contains("Squad").click();
-    cy.contains("Christopher Nkunku")
-      .parent()
-      .parent()
-      .children(".playerButton")
-      .children("button")
-      .click();
+    cy.wait("@loadNkunku").then(() =>
+      cy
+        .contains("Christopher Nkunku")
+        .parent()
+        .parent()
+        .children(".playerButton")
+        .children("button")
+        .click()
+    );
     cy.contains("Buying");
     // Starts the matchday
     cy.exec("export NODE_ENV=test; node cypress/e2e/invite2.mjs").then(() => {

diff --git a/pages/api/squad/[league].js b/pages/api/squad/[league].js
@@ -211,7 +211,6 @@ export default async function handler(req, res) {
                               [league, user, e]
                             )
                       );
-                    console.log(e);
                     // Checks if the player is owned by the user
                     if (position.length > 0) {
                       // Checks what position the player is
@@ -289,7 +288,7 @@ export default async function handler(req, res) {
                           [league, user, e]
                         );
                         connection.query(
-                          "UPDATE transfers SET position='bench', starred=0 WHERE leagueID=? and user=? and playeruid=?",
+                          "UPDATE transfers SET position='bench', starred=0 WHERE leagueID=? and buyer=? and playeruid=?",
                           [league, user, e]
                         );
                         console.log(`User ${user} moved player ${e} to bench`);