From 014f78b04022ef78b1c413a9446be353bf32cb07 Mon Sep 17 00:00:00 2001 From: Settel Date: Mon, 12 Dec 2022 22:58:48 +0100 Subject: [PATCH] refactor: renamed deletePlayer -> removePlayer for consistency --- client/src/components/admin/PlayersTile.vue | 2 +- client/src/composables/engine/gameManagement.ts | 4 ++-- client/src/composables/useEngine.ts | 6 +++--- server/src/application/{deletePlayer.go => removePlayer.go} | 4 ++-- server/src/game/player.go | 2 +- server/src/knowyt.go | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) rename server/src/application/{deletePlayer.go => removePlayer.go} (92%) diff --git a/client/src/components/admin/PlayersTile.vue b/client/src/components/admin/PlayersTile.vue index 0191ee3..e99310e 100644 --- a/client/src/components/admin/PlayersTile.vue +++ b/client/src/components/admin/PlayersTile.vue @@ -100,7 +100,7 @@ const playerDialogSubmit = async (action: ButtonAction): Promise => { break case 'delete': if (confirm(`"${playerDialogPlayer.value.name}" löschen?`)) { - await useEngine().deletePlayer(playerDialogPlayer.value.id) + await useEngine().removePlayer(playerDialogPlayer.value.id) emit('update') } break diff --git a/client/src/composables/engine/gameManagement.ts b/client/src/composables/engine/gameManagement.ts index f94d7b5..8e6ff7c 100644 --- a/client/src/composables/engine/gameManagement.ts +++ b/client/src/composables/engine/gameManagement.ts @@ -36,9 +36,9 @@ export async function savePlayer(this: EngineContext, player: PlayerEdit): Promi }) } -export async function deletePlayer(this: EngineContext, id: string): Promise { +export async function removePlayer(this: EngineContext, id: string): Promise { const userInfoStore = useUserinfoStore() - await this.callApi('/api/deletePlayer', { + await this.callApi('/api/removePlayer', { g: userInfoStore.gameId, id, }) diff --git a/client/src/composables/useEngine.ts b/client/src/composables/useEngine.ts index 0d41cbc..bf281a6 100644 --- a/client/src/composables/useEngine.ts +++ b/client/src/composables/useEngine.ts @@ -3,7 +3,7 @@ import { callApi, QueryParams } from '@/composables/engine/callApi' import { start, stop } from '@/composables/engine/startStop' import { fetchUpdate } from '@/composables/engine/fetchUpdate' import { loadQuotes, getQuotesRef, deleteQuote, saveQuote } from '@/composables/engine/quotes' -import { fetchGameInfo, fetchGameInfos, setGameLang, setGameName, savePlayer, deletePlayer, createGame, cameo, logoutCameo } from '@/composables/engine/gameManagement' +import { fetchGameInfo, fetchGameInfos, setGameLang, setGameName, savePlayer, removePlayer, createGame, cameo, logoutCameo } from '@/composables/engine/gameManagement' import { collectQuotes, startGame, continueGame, resetGame, finishGame, disableGame, removeGame } from '@/composables/engine/gameState' import { saveSelection } from '@/composables/engine/play' import type { Quotes, GameInfo, GameInfos, PlayerEdit, Lang, CreateGameStatus } from '@/composables/engine.d' @@ -44,7 +44,7 @@ export interface useEngine { setGameLang: (lang: string) => Promise setGameName: (name: string) => Promise savePlayer: (player: PlayerEdit) => Promise - deletePlayer: (id: string) => Promise + removePlayer: (id: string) => Promise createGame: (name: string, teamname: string, lang: Lang) => Promise cameo: (authcode: string) => Promise logoutCameo: () => Promise @@ -88,7 +88,7 @@ export default (): useEngine => { setGameLang: (lang: string) => setGameLang.apply(context, [lang]), setGameName: (name: string) => setGameName.apply(context, [name]), savePlayer: (player: PlayerEdit) => savePlayer.apply(context, [player]), - deletePlayer: (id: string) => deletePlayer.apply(context, [id]), + removePlayer: (id: string) => removePlayer.apply(context, [id]), createGame: (name: string, teamname: string, lang: Lang) => createGame.apply(context, [name, teamname, lang]), cameo: (authcode: string) => cameo.apply(context,[authcode]), logoutCameo: () => logoutCameo.apply(context), diff --git a/server/src/application/deletePlayer.go b/server/src/application/removePlayer.go similarity index 92% rename from server/src/application/deletePlayer.go rename to server/src/application/removePlayer.go index f42abb1..b4d2ec2 100644 --- a/server/src/application/deletePlayer.go +++ b/server/src/application/removePlayer.go @@ -8,7 +8,7 @@ import ( "sirlab.de/go/knowyt/user" ) -func (app *Application) DeletePlayer(usr *user.User, w http.ResponseWriter, r *http.Request) { +func (app *Application) RemovePlayer(usr *user.User, w http.ResponseWriter, r *http.Request) { gameRef := r.URL.Query().Get("g") gm, err := app.GetGameById(gameRef) if err != nil { @@ -44,7 +44,7 @@ func (app *Application) DeletePlayer(usr *user.User, w http.ResponseWriter, r *h fmt.Fprintf(w, "internal server error") return } - gm.DeletePlayer(deleteUser) + gm.RemovePlayer(deleteUser) delete(app.users, id) fmt.Fprintf(w, "ok") diff --git a/server/src/game/player.go b/server/src/game/player.go index 7d1e1c5..31148ec 100644 --- a/server/src/game/player.go +++ b/server/src/game/player.go @@ -86,7 +86,7 @@ func (gm *Game) UpdatePlayer(usr *user.User) { gm.players[usrId] = player } -func (gm *Game) DeletePlayer(usr *user.User) { +func (gm *Game) RemovePlayer(usr *user.User) { usrId := usr.GetId() gm.mu.Lock() diff --git a/server/src/knowyt.go b/server/src/knowyt.go index 42fb9d9..89293a6 100644 --- a/server/src/knowyt.go +++ b/server/src/knowyt.go @@ -29,7 +29,7 @@ func main() { mux.PrivateHandleFunc("/api/setGameName", app.SetGameName) mux.PrivateHandleFunc("/api/setGameLang", app.SetGameLang) mux.PrivateHandleFunc("/api/savePlayer", app.SavePlayer) - mux.PrivateHandleFunc("/api/deletePlayer", app.DeletePlayer) + mux.PrivateHandleFunc("/api/removePlayer", app.RemovePlayer) mux.PrivateHandleFunc("/api/sync", app.SyncHandler) mux.PrivateHandleFunc("/api/collectQuotes", app.CollectQuotes) mux.PrivateHandleFunc("/api/startGame", app.StartGame)