Adding/Refactor services

jordus100 · May 10, 2024 · 3c92b4e · 3c92b4e
1 parent c10f056
commit 3c92b4e
Show file tree

Hide file tree

Showing 9 changed files with 467 additions and 303 deletions.
diff --git a/src/lists/TournamentsList.js b/src/lists/TournamentsList.js
@@ -10,45 +10,45 @@ import React, { useState, useEffect } from "react";
 function TournamentsList({ tournaments, isAuthenticated }) {
     const navigate = useNavigate();
     const currentDate = new Date();
-    const [tournamentList, setTournamentList] = useState([]);
+
+    const [upcomingTournaments, setUpcomingTournaments] = useState([]);
+    const [pastTournaments, setPastTournaments] = useState([]);
     const [message, setMessage] = useState('');
 
     useEffect(() => {
-        const fetchTournamentData = async () => {
-            try {
-                const gl = await TournamentService.getListOfTournaments();
-                setTournamentList(gl.data.data);
-            } catch (e) {
-                console.log(e);
-                setMessage('Sorry, there was a problem with fetching tournament data.Try again later');
-            }
-        };
+        TournamentService.getListOfTournaments(
+            {"page":0, "pagesize":10, "maxPlayOutDate": currentDate,})
+        .then((response) => {
+            setPastTournaments(response.data);
+        }).catch((error) => {
+            console.log(error);
+            setMessage('Sorry, there was a problem with fetching tournament data.Try again later');
+        });
 
-        fetchTournamentData();
+        TournamentService.getListOfTournaments(
+            {"page":0, "pagesize":10, "minPlayOutDate": currentDate,})
+        .then((response) => {
+            setUpcomingTournaments(response.data);
+        }).catch((error) => {
+            console.log(error);
+            setMessage('Sorry, there was a problem with fetching tournament data.Try again later');
+        });
     }, []);
 
-    const upcomingTournaments = tournamentList.filter(t => {
-        const tournamentDate = new Date(t.tournamentsDate);
-        return tournamentDate > currentDate;
-    });
-    const pastTournaments = tournamentList.filter(t => {
-        const tournamentDate = new Date(t.tournamentsDate);
-        return tournamentDate <= currentDate;
-    });;
+    const handleTournamentClick = (tournamentId) => {
+        navigate(`/tournaments/details/${tournamentId}`);
+    };
+
 
     const TournamentItem = ({ tournament }) => (
         <div className="tournament-item" onClick={() => handleTournamentClick(tournament.id)}>
-            <div className="tournament-detail">{tournament.tournamentsTitle}</div>
+            <div className="tournament-detail">{tournament.tournamentTitle}</div>
             <div className="tournament-detail">{tournament.author}</div>
             <div className="tournament-detail">{tournament.tournamentsDate}</div>
             <div className="tournament-detail">{tournament.playersLimit}</div>
         </div>
     );
 
-    const handleTournamentClick = (tournamentId) => {
-        navigate(`/tournaments/details/${tournamentId}`);
-    };
-
     return (
         <div className="tournaments-container">
             <UserButtons/>
@@ -67,13 +67,15 @@ function TournamentsList({ tournaments, isAuthenticated }) {
                     <span className="header-detail">Action</span>
                 </div>
                 <div className="tournaments-content">
-                    {upcomingTournaments.map(tournament => (
+                    {isAuthenticated ?
+                    upcomingTournaments.map(tournament => (
                         <div>
                         <TournamentItem key={tournament.id} tournament={tournament} />
-                        <DeleteTournamentButton key={tournament.id} />
+                        <DeleteTournamentButton tournamentId={tournament.id} />
                         </div>
-                    ))}
-                    {upcomingTournaments.map(tournament => (
+                    )) 
+                    : 
+                    upcomingTournaments.map(tournament => (
                         <TournamentItem key={tournament.id} tournament={tournament} />
                     ))}
                 </div>

diff --git a/src/services/Api.js b/src/services/Api.js
@@ -496,33 +496,5 @@ function ApiTest() {
 }
 
 export {
-    GetAchievementsTypes,
-    BanPlayer,
-    UnbanPlayer,
-    ResetDatabase,
-    DeleteDatabase,
-    GetGameTypes,
-    GetAvailableGameTypes,
-    GetGameType,
-    AddGameType,
-    UpdateGameType,
-    DeleteGameType,
-    RegisterPlayer,
-    LoginPlayer,
-    GetUser,
-    GetPointsForPlayer,
-    GetLeaderboard,
-    GetPointsHistoryForPlayer,
-    GetTournaments,
-    GetAllTournaments,
-    GetFilteredTournaments,
-    AddTournament,
-    UpdateTournament,
-    DeleteTournament,
-    RegisterBotForTournament,
-    UnregisterBotForTournament,
-    GetUserSettings,
-    UpdateUserSettings,
-    DeleteUserSettings,
-    ApiTest,
+    Request,
 }
diff --git a/src/services/BotService.js b/src/services/BotService.js
@@ -1,9 +1,68 @@
 import { Api } from './Api'
 export const BotService = {
-
-    getForPlayer: async function (login) {
+    getBotsForPlayer: async function (id) {
+        // Type GET
+        // Parameters:
+        //// playerId - integer - int64
         try {
-            return await Api.get(`Bot/getForPlayer?playerId=${login}`)
+            return await Api.get(`Player/getBotsForPlayer?playerId=${id}`)
+        } catch(e) {
+            return Api.processError(e)
+        }
+    },
+    addBot: async function (GameId, Language, BotFile) {
+        // Type POST
+        // Paramters:
+        //// GameId - integer - int64
+        //// Language - integer - int32
+        // Body:
+        //// BotFile - string - binary
+
+        try {
+            return await Api.post(`Bot/add?GameId=${GameId}&Language=${Language}`, {
+                BotFile: BotFile
+            })
+        } catch(e) {
+             return Api.processError(e)
+        }
+    },
+    deleteBot: async function (botId) {
+        // Type DELETE
+        // Parameters:
+        //// botId - integer - int64
+        try {
+            return await Api.delete(`Bot/delete?botId=${botId}`)
+        } catch(e) {
+             return Api.processError(e)
+        }
+    },
+    getBot: async function (botId) {
+        // Type GET
+        // Parameters:
+        //// botId - integer - int64
+        try {
+            return await Api.get(`Bot/getOne?botId=${botId}`)
+        } catch(e) {
+             return Api.processError(e)
+        }
+    },
+    getBotsForPlayer: async function (playerId) {
+        // Type GET
+        // Parameters:
+        //// playerId - integer - int64
+        try {
+            return await Api.get(`Player/getBotsForPlayer?playerId=${playerId}`)
+        } catch(e) {
+             return Api.processError(e)
+        }
+    },
+    getBotFile: async function (botId, playerId) {
+        // Type GET
+        // Parameters:
+        //// botId - integer - int64
+        //// playerId - integer - int64
+        try {
+            return await Api.get(`Bot/getBotFile?botId=${botId}&playerId=${playerId}`)
         } catch(e) {
              return Api.processError(e)
         }

diff --git a/src/services/GameService.js b/src/services/GameService.js
@@ -17,14 +17,21 @@ const currentTime = getCurrentTime();
 
 export const GameService = {
 
-    getListOfGames: async function () {
+    getListOfGames: async function (page, pagesize) {
+        // Type GET
+        // Parameters:
+        //// page - integer - int32
+        //// pagesize - integer - int32
         try {
-            return await Api.get('GameType/getAll')
+            return await Api.get(`GameType/getAll?page=${page}&pagesize=${pagesize}`)
         } catch(e) {
              return Api.processError(e)
         }
     },
     deleteGame: async function (id) {
+        // Type DELETE
+        // Parameters:
+        //// id - integer - int32
         try {
             return await Api.delete(`GameType/delete?id=${id}`);
         } catch(e) {
@@ -39,6 +46,14 @@ export const GameService = {
         }
     },
     addGameType: async function (numOfPlayers, gameFile, gameInstructions, interfaceDefinition, isAvaiableForPlay) {
+        // Type POST
+        // Body:
+        //// NumberOfPlayer - integer - int32
+        //// GameFile - string - binary
+        //// GameInstructions - string
+        //// InterfaceDefinition - string
+        //// Language - integer (typ)
+        //// IsAvaiableForPlay - boolean
         try {
             return await Api.post('GameType/add',{
                 numbersOfPlayer: numOfPlayers,
@@ -53,4 +68,72 @@ export const GameService = {
              return Api.processError(e)
         }
     },
+    getAvailableGames: async function (page, pagesize) {
+        // Type GET
+        // Parameters:
+        //// page - integer - int32
+        //// pagesize - integer - int32
+        try {
+            return await Api.get(`GameType/getAvailable?page=${page}&pagesize=${pagesize}`)
+        } catch(e) {
+             return Api.processError(e)
+        }
+    },
+    getGame: async function (id) {
+        // Type GET
+        // Parameters:
+        //// id - integer - int32
+        try {
+            return await Api.get(`GameType/get?id=${id}`)
+        } catch(e) {
+             return Api.processError(e)
+        }
+    },
+    getByName: async function (name, page, pagesize) {
+        // Type GET
+        // Parameters:
+        //// name - string
+        //// page - integer - int32
+        //// pagesize - integer - int32
+        try {
+            return await Api.get(`GameType/getByName?name=${name}&page=${page}&pagesize=${pagesize}`)
+        } catch(e) {
+             return Api.processError(e)
+        }
+    },
+    getAllForPlayer: async function (name) {
+        // Type GET
+        // Parameters:
+        //// name - string
+        try {
+            return await Api.get(`GameType/getAllForPlayer?name=${name}`)
+        } catch(e) {
+             return Api.processError(e)
+        }
+    },
+    updateGameType: async function (numOfPlayers, gameFile, gameInstructions, interfaceDefinition, isAvaiableForPlay) {
+        // Type PUT
+        // Parameters:
+        //// id - integer - int32
+        // Body:
+        //// NumberOfPlayer - integer - int32
+        //// GameFile - string - binary
+        //// GameInstructions - string
+        //// InterfaceDefinition - string
+        //// Language - integer (typ)
+        //// IsAvaiableForPlay - boolean
+        try {
+            return await Api.put('GameType/update',{
+                numbersOfPlayer: numOfPlayers,
+                lastModification: currentTime,
+                gameFile: gameFile,
+                gameInstructions: gameInstructions,
+                interfaceDefinition: interfaceDefinition,
+                isAvaiableForPlay: isAvaiableForPlay
+              })
+
+        } catch(e) {
+             return Api.processError(e)
+        }
+    },
 }
diff --git a/src/services/PointsService.js b/src/services/PointsService.js
@@ -1,9 +1,33 @@
 import { Api } from './Api'
 export const PointsService = {
 
-    getLeaderboards: async function () {
+    getLeaderboards: async function (page, pageSize) {
+        // Type GET
+        // Parameters:
+        //// page - integer - int32
+        //// pagesize - integer - int32
         try {
-            return await Api.get('Points/getLeaderboards')
+            return await Api.get(`Points/getLeaderboards?page=${page}&pageSize=${pageSize}`)
+        } catch(e) {
+             return Api.processError(e)
+        }
+    },
+    getPointsForPlayer: async function (id) {
+        // Type GET
+        // Parameters:
+        //// id - integer - int32
+        try {
+            return await Api.get(`Points/getPointsForPlayer?id=${id}`)
+        } catch(e) {
+             return Api.processError(e)
+        }
+    },
+    getPointsHistoryForPlayer: async function (id) {
+        // Type GET
+        // Parameters:
+        //// id - integer - int32
+        try {
+            return await Api.get(`Points/getPointsHistoryForPlayer?id=${id}`)
         } catch(e) {
              return Api.processError(e)
         }