fix: adjust api change

CAS735-F23 · Dec 6, 2023 · efb3a4a · efb3a4a
1 parent 600477d
commit efb3a4a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/game-service/api/api.go b/game-service/api/api.go
@@ -11,7 +11,6 @@ import (
 
 type startQuery struct {
 	Username string       `form:"username" binding:"required"`
-	Zone     string       `form:"zone"`
 	Location dto.PointDTO `form:"location"`
 }
 
@@ -39,7 +38,7 @@ func handleGameStart(app *game.App) gin.HandlerFunc {
 			return
 		}
 
-		if err := app.StartGame(player, query.Zone, query.Location); err != nil {
+		if err := app.StartGame(player, query.Location); err != nil {
 			abortWithStatusMessage(c, http.StatusInternalServerError, err)
 			return
 		}

diff --git a/game-service/consts/consts.go b/game-service/consts/consts.go
@@ -30,11 +30,6 @@ const (
 	HRMSendAction = "SEND_HEART_RATE"
 )
 
-var AllowedZones = map[string]any{
-	"MAC":      nil,
-	"MCMASTER": nil,
-}
-
 const (
 	ReactSheltering = "SHELTERING"
 	ReactEscaping   = "ESCAPING"

diff --git a/game-service/game/core.go b/game-service/game/core.go
@@ -14,11 +14,7 @@ import (
 	"game-service/message"
 )
 
-func (app *App) StartGame(player *dto.PlayerDTO, zone string, location dto.PointDTO) error {
-
-	if _, ok := consts.AllowedZones[strings.ToUpper(zone)]; !ok {
-		return fmt.Errorf("zone is not allowed: %s", zone)
-	}
+func (app *App) StartGame(player *dto.PlayerDTO, location dto.PointDTO) error {
 
 	ctx := &context.Context{
 		Player: player,
@@ -49,7 +45,7 @@ func (app *App) StartGame(player *dto.PlayerDTO, zone string, location dto.Point
 				}
 			}
 		}{}
-		if err := app.GetService("geo-service", fmt.Sprintf("/geo/trail?zone=%s", strings.ToLower(zone)), &data); err != nil {
+		if err := app.GetService("geo-service", fmt.Sprintf("/geo/trail?username=%s", strings.ToLower(player.Username)), &data); err != nil {
 			return fmt.Errorf("get init trail failed: %v", err)
 		}