change all responses to switch to types.ApiResponse

Author: RachitKumar205

backend/internal/controllers/game.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"labyrinth/internal/router"
+	"labyrinth/internal/types"
 	"net/http"
 )
 
@@ -32,7 +33,14 @@ func GameConfigHandler(rtr *router.Router) http.HandlerFunc {
 			return
 		}
 
-		err = json.NewEncoder(w).Encode(gameConfig)
+		responsePayload, _ := json.Marshal(gameConfig)
+		apiResponse := types.ApiResponse{
+			Success: true,
+			Message: "",
+			Payload: responsePayload,
+		}
+
+		err = json.NewEncoder(w).Encode(apiResponse)
 		if err != nil {
 			//http.Error(w, "internal server error", http.StatusInternalServerError)
 			w.WriteHeader(http.StatusInternalServerError)

backend/internal/controllers/team.go

@@ -40,7 +40,7 @@ func TeamCreationHandler(rtr *router.Router) http.HandlerFunc {
 		if err := json.NewDecoder(r.Body).Decode(&t); err != nil {
 
 			//http.Error(w, "error reading teamName field, invalid json payload", http.StatusBadRequest)
-			w.WriteHeader(http.StatusBadRequest)
+			//w.WriteHeader(http.StatusBadRequest)
 			apiResponse := types.ApiResponse{
 				Success: false,
 				Message: "invalid json payload",
@@ -94,9 +94,15 @@ func TeamCreationHandler(rtr *router.Router) http.HandlerFunc {
 
 		go teamChannel.Start()
 
-		json.NewEncoder(w).Encode(map[string]string{
-			"team_id": teamId,
-		})
+		payload, _ := json.Marshal(map[string]string{"team_id": teamId})
+
+		apiResponse := types.ApiResponse{
+			Success: true,
+			Message: "success",
+			Payload: payload,
+		}
+
+		json.NewEncoder(w).Encode(apiResponse)
 
 	})
 
@@ -126,7 +132,16 @@ func TeamUpdateHandler(rtr *router.Router) http.HandlerFunc {
 
 		if err := json.NewDecoder(r.Body).Decode(&t); err != nil {
 
-			http.Error(w, "error getting team_id field, invalid json payload", http.StatusBadRequest)
+			//http.Error(w, "error getting team_id field, invalid json payload", http.StatusBadRequest)
+
+			apiResponse := types.ApiResponse{
+				Success: false,
+				Message: "error getting team_id from json payload",
+				Payload: nil,
+			}
+
+			json.NewEncoder(w).Encode(apiResponse)
+
 			return
 
 		}
@@ -155,7 +170,15 @@ func TeamUpdateHandler(rtr *router.Router) http.HandlerFunc {
 		teamChannel := rtr.State.ChanPool.GetChannel(team.ID)
 		teamChannel.Broadcast(protocol.Packet{Type: "BackgroundMessage", BackgroundMessage: protocol.BackgroundMessage{Relay: fmt.Sprintf("teamId:%s -> %s joined the team", team.ID, profile.Email), MsgContext: "channel_creation"}})
 
-		if err := json.NewEncoder(w).Encode(team); err != nil {
+		payload, _ := json.Marshal(team)
+
+		apiResponse := types.ApiResponse{
+			Success: true,
+			Message: "Member added to team successfully!",
+			Payload: payload,
+		}
+
+		if err := json.NewEncoder(w).Encode(apiResponse); err != nil {
 			http.Error(w, "error encoding response", http.StatusInternalServerError)
 		}
 
@@ -186,10 +209,18 @@ func GetTeamHandler(rtr *router.Router) http.HandlerFunc {
 
 		if teamId == "" && userId == "" {
 			//http.Error(w, "Either user_id or team_id must be provided", http.StatusBadRequest)
-			w.WriteHeader(http.StatusBadRequest)
-			json.NewEncoder(w).Encode(map[string]string{
-				"error": "either used_id or team_id not provided",
-			})
+			//w.WriteHeader(http.StatusBadRequest)
+			//json.NewEncoder(w).Encode(map[string]string{
+			//	"error": "either user_id or team_id not provided",
+			//})
+
+			apiResponse := types.ApiResponse{
+				Success: false,
+				Message: "either user_id or team_id not provided",
+				Payload: nil,
+			}
+			json.NewEncoder(w).Encode(apiResponse)
+
 			return
 		}
 
@@ -202,18 +233,26 @@ func GetTeamHandler(rtr *router.Router) http.HandlerFunc {
 			parsedId, parseErr := uuid.Parse(userId)
 			if parseErr != nil {
 				//http.Error(w, "invalid player_id format", http.StatusBadRequest)
-				w.WriteHeader(http.StatusBadRequest)
-				json.NewEncoder(w).Encode(map[string]string{
-					"error": "player id format is invalid, should be uuid string",
-				})
+				//w.WriteHeader(http.StatusBadRequest)
+				//json.NewEncoder(w).Encode(map[string]string{
+				//	"error": "player id format is invalid, should be uuid string",
+				//})
+
+				apiResponse := types.ApiResponse{
+					Success: false,
+					Message: "player id format is invalid, should be uuid string",
+					Payload: nil,
+				}
+				json.NewEncoder(w).Encode(apiResponse)
+
 			}
 			team, err = rtr.State.DB.GetTeamByUserId(context.Background(), parsedId)
 		}
 
 		if err != nil {
 			rtr.Logger.Error("failed to fetch team", slog.String("error", err.Error()))
 			//http.Error(w, "internal server error", http.StatusInternalServerError)
-			w.WriteHeader(http.StatusBadRequest)
+			w.WriteHeader(http.StatusInternalServerError)
 			json.NewEncoder(w).Encode(map[string]string{
 				"error": "internal server error",
 			})

backend/internal/controllers/user.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"labyrinth/internal/router"
+	"labyrinth/internal/types"
 	"net/http"
 )
 
@@ -31,10 +32,19 @@ func TeamMemberStatusUpdateHandler(rtr *router.Router) http.HandlerFunc {
 
 		if err := json.NewDecoder(r.Body).Decode(&payload); err != nil {
 			//http.Error(w, "error reading userStatus field, invalid json payload", http.StatusBadRequest)
-			w.WriteHeader(http.StatusBadRequest)
-			json.NewEncoder(w).Encode(map[string]string{
-				"error": "invalid json payload",
-			})
+			//w.WriteHeader(http.StatusBadRequest)
+			//json.NewEncoder(w).Encode(map[string]string{
+			//	"error": "invalid json payload",
+			//})
+
+			apiResponse := types.ApiResponse{
+				Success: false,
+				Message: "invalid json payload",
+				Payload: nil,
+			}
+
+			json.NewEncoder(w).Encode(apiResponse)
+
 			return
 		}
 
@@ -71,7 +81,16 @@ func TeamMemberStatusUpdateHandler(rtr *router.Router) http.HandlerFunc {
 			return
 		}
 
-		err = json.NewEncoder(w).Encode(team)
+		responsePayload, _ := json.Marshal(team)
+
+		apiResponse := types.ApiResponse{
+			Success: true,
+			Message: "Successfully updated ready status!",
+			Payload: responsePayload,
+		}
+
+		err = json.NewEncoder(w).Encode(apiResponse)
+
 		if err != nil {
 			//http.Error(w, "error encoding json", http.StatusInternalServerError)
 			w.WriteHeader(http.StatusInternalServerError)

backend/internal/protocol/protocol.go

@@ -7,6 +7,11 @@ type Packet struct {
 	GameMessage         `json:"gameMessage"`
 }
 
+type TeamPacket struct {
+	Relay      string `json:"message"`
+	MsgContext string `json:"msgcontext"`
+}
+
 type BackgroundMessage struct {
 	Relay      string `json:"message"`
 	MsgContext string `json:"msgcontext"`

backend/internal/types/response.go

@@ -1,7 +1,9 @@
 package types
 
+import "encoding/json"
+
 type ApiResponse struct {
-	Success bool                   `json:"success"`
-	Message string                 `json:"message"`
-	Payload map[string]interface{} `json:"payload"`
+	Success bool            `json:"success"`
+	Message string          `json:"message"`
+	Payload json.RawMessage `json:"payload,omitempty"`
 }