Add endpoint to get indivudal scores for clan score

Author: Swan

cmd/api/server.go

@@ -101,6 +101,7 @@ func initializeRoutes(engine *gin.Engine) {
 
 	// Clan Scores
 	engine.GET("/v2/clan/:id/scores/:mode", handlers.CreateHandler(handlers.GetClanScoresForMode))
+	engine.GET("/v2/clan/scores/:id", handlers.CreateHandler(handlers.GetUserScoresForClanScore))
 
 	// Users
 	engine.POST("/v2/user", handlers.CreateHandler(handlers.RegisterNewUser))

db/clan_scores.go

@@ -52,6 +52,21 @@ func GetClanScore(md5 string, clanId int) (*ClanScore, error) {
 	return &score, nil
 }
 
+// GetClanScoreById Retrieves a clan score by id
+func GetClanScoreById(id int) (*ClanScore, error) {
+	var score ClanScore
+
+	result := SQL.
+		Where("id = ?", id).
+		First(&score)
+
+	if result.Error != nil {
+		return nil, result.Error
+	}
+
+	return &score, nil
+}
+
 // GetClanScoresForMode Retrieves all clan scores for a given mode
 func GetClanScoresForMode(clanId int, mode enums.GameMode) ([]*ClanScore, error) {
 	clanScores := make([]*ClanScore, 0)
@@ -90,7 +105,7 @@ func GetClanScoresForModeFull(clanId int, mode enums.GameMode, page int) ([]*Cla
 
 // CalculateClanScore Calculates a clan score for a given map
 func CalculateClanScore(md5 string, clanId int, mode enums.GameMode) (*ClanScore, error) {
-	scores, err := GetClanPlayerScoresOnMap(md5, clanId)
+	scores, err := GetClanPlayerScoresOnMap(md5, clanId, false)
 
 	if err != nil {
 		return nil, err

db/scores.go

@@ -543,7 +543,7 @@ func GetUserPersonalBestScoreRate(userId int, md5 string, mods int64) (*Score, e
 }
 
 // GetClanPlayerScoresOnMap Fetches the top 10 scores from a clan on a given map
-func GetClanPlayerScoresOnMap(md5 string, clanId int) ([]*Score, error) {
+func GetClanPlayerScoresOnMap(md5 string, clanId int, callAfterFind bool) ([]*Score, error) {
 	scores := make([]*Score, 0)
 
 	result := SQL.Raw(fmt.Sprintf(`
@@ -560,6 +560,13 @@ func GetClanPlayerScoresOnMap(md5 string, clanId int) ([]*Score, error) {
 		return nil, result.Error
 	}
 
+	if callAfterFind {
+		for _, score := range scores {
+			_ = score.AfterFind(nil)
+			_ = score.User.AfterFind(nil)
+		}
+	}
+
 	return scores, nil
 }
 

handlers/clan_scores.go

@@ -4,6 +4,7 @@ import (
 	"github.com/Quaver/api2/db"
 	"github.com/Quaver/api2/enums"
 	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
 	"net/http"
 	"strconv"
 )
@@ -38,3 +39,32 @@ func GetClanScoresForMode(c *gin.Context) *APIError {
 	c.JSON(http.StatusOK, gin.H{"scores": scores})
 	return nil
 }
+
+// GetUserScoresForClanScore Retrieves all individual scores that make up a clan score
+// Endpoint: /v2/clan/scores/:id
+func GetUserScoresForClanScore(c *gin.Context) *APIError {
+	id, err := strconv.Atoi(c.Param("id"))
+
+	if err != nil {
+		return APIErrorBadRequest("Invalid id")
+	}
+
+	clanScore, err := db.GetClanScoreById(id)
+
+	if err != nil && err != gorm.ErrRecordNotFound {
+		return APIErrorServerError("Error retrieving clan score from db", err)
+	}
+
+	if clanScore == nil {
+		return APIErrorNotFound("Clan score")
+	}
+
+	scores, err := db.GetClanPlayerScoresOnMap(clanScore.MapMD5, clanScore.ClanId, true)
+
+	if err != nil {
+		return APIErrorServerError("Error retrieving player clan scores from db", err)
+	}
+
+	c.JSON(http.StatusOK, gin.H{"scores": scores})
+	return nil
+}