From 53ef3ee1f0eaa3b782fba60ec32d9a0b2d9aac3e Mon Sep 17 00:00:00 2001 From: Samuel Tariku Date: Wed, 25 Jun 2025 14:24:40 +0300 Subject: [PATCH] fix: minor issues --- internal/domain/league.go | 2 +- internal/services/odds/service.go | 2 +- internal/web_server/handlers/prematch.go | 19 ++++++++------- internal/web_server/handlers/user.go | 30 +++++++++++------------- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/internal/domain/league.go b/internal/domain/league.go index ffaceb4..c4a2d12 100644 --- a/internal/domain/league.go +++ b/internal/domain/league.go @@ -29,7 +29,6 @@ type LeagueFilter struct { Offset ValidInt64 } - // These leagues are automatically featured when the league is created var FeaturedLeagues = []int64{ // Football @@ -46,6 +45,7 @@ var FeaturedLeagues = []int64{ 10050346, //UEFA Super Cup 10081269, //CONCACAF Champions Cup 10070189, //CONCACAF Gold Cup + 10076185, //UEFA Regions Cup 10067913, //Europe - World Cup Qualifying 10040162, //Asia - World Cup Qualifying diff --git a/internal/services/odds/service.go b/internal/services/odds/service.go index b3010d0..cdfda1e 100644 --- a/internal/services/odds/service.go +++ b/internal/services/odds/service.go @@ -1,4 +1,4 @@ -package odds + package odds import ( "context" diff --git a/internal/web_server/handlers/prematch.go b/internal/web_server/handlers/prematch.go index 314bf0f..fbdf594 100644 --- a/internal/web_server/handlers/prematch.go +++ b/internal/web_server/handlers/prematch.go @@ -177,9 +177,11 @@ type TopLeaguesRes struct { } type TopLeague struct { - LeagueID int64 `json:"league_id"` - LeagueName string `json:"league_name"` - Events []domain.UpcomingEvent `json:"events"` + LeagueID int64 `json:"league_id"` + LeagueName string `json:"league_name"` + LeagueCC string `json:"league_cc"` + LeagueSportID int32 `json:"league_sport_id"` + Events []domain.UpcomingEvent `json:"events"` // Total int64 `json:"total"` } @@ -188,7 +190,7 @@ type TopLeague struct { // @Tags prematch // @Accept json // @Produce json -// @Success 200 {array} domain.UpcomingEvent +// @Success 200 {array} TopLeague // @Failure 500 {object} response.APIResponse // @Router /top-leagues [get] func (h *Handler) GetTopLeagues(c *fiber.Ctx) error { @@ -213,11 +215,12 @@ func (h *Handler) GetTopLeagues(c *fiber.Ctx) error { fmt.Printf("Error while fetching events for top league %v \n", league.ID) h.logger.Error("Error while fetching events for top league", "League ID", league.ID) } - topLeague = append(topLeague, TopLeague{ - LeagueID: league.ID, - LeagueName: league.Name, - Events: events, + LeagueID: league.ID, + LeagueName: league.Name, + LeagueCC: league.CountryCode, + LeagueSportID: league.SportID, + Events: events, }) } diff --git a/internal/web_server/handlers/user.go b/internal/web_server/handlers/user.go index aa72107..243ac76 100644 --- a/internal/web_server/handlers/user.go +++ b/internal/web_server/handlers/user.go @@ -59,9 +59,8 @@ func (h *Handler) CheckPhoneEmailExist(c *fiber.Ctx) error { } type RegisterCodeReq struct { - Email string `json:"email" example:"john.doe@example.com"` - PhoneNumber string `json:"phone_number" example:"1234567890"` - Provider domain.OtpProvider `json:"provider" validate:"required" example:"twilio"` + Email string `json:"email" example:"john.doe@example.com"` + PhoneNumber string `json:"phone_number" example:"1234567890"` } // SendRegisterCode godoc @@ -99,7 +98,7 @@ func (h *Handler) SendRegisterCode(c *fiber.Ctx) error { return fiber.NewError(fiber.StatusBadRequest, "Email or PhoneNumber must be provided") } - if err := h.userSvc.SendRegisterCode(c.Context(), medium, sentTo, req.Provider); err != nil { + if err := h.userSvc.SendRegisterCode(c.Context(), medium, sentTo, "twilio"); err != nil { h.logger.Error("Failed to send register code", "error", err) return fiber.NewError(fiber.StatusInternalServerError, "Failed to send register code") } @@ -108,14 +107,13 @@ func (h *Handler) SendRegisterCode(c *fiber.Ctx) error { } type RegisterUserReq struct { - FirstName string `json:"first_name" example:"John"` - LastName string `json:"last_name" example:"Doe"` - Email string `json:"email" example:"john.doe@example.com"` - PhoneNumber string `json:"phone_number" example:"1234567890"` - Password string `json:"password" example:"password123"` - Otp string `json:"otp" example:"123456"` - ReferalCode string `json:"referal_code" example:"ABC123"` - Provider domain.OtpProvider `json:"provider" validate:"required" example:"twilio"` + FirstName string `json:"first_name" example:"John"` + LastName string `json:"last_name" example:"Doe"` + Email string `json:"email" example:"john.doe@example.com"` + PhoneNumber string `json:"phone_number" example:"1234567890"` + Password string `json:"password" example:"password123"` + Otp string `json:"otp" example:"123456"` + ReferalCode string `json:"referal_code" example:"ABC123"` } // RegisterUser godoc @@ -206,9 +204,9 @@ func (h *Handler) RegisterUser(c *fiber.Ctx) error { } type ResetCodeReq struct { - Email string `json:"email" example:"john.doe@example.com"` - PhoneNumber string `json:"phone_number" validate:"required_without=Email" example:"1234567890"` - Provider domain.OtpProvider `json:"provider" validate:"required" example:"twilio"` + Email string `json:"email" example:"john.doe@example.com"` + PhoneNumber string `json:"phone_number" validate:"required_without=Email" example:"1234567890"` + // Provider domain.OtpProvider `json:"provider" validate:"required" example:"twilio"` } // SendResetCode godoc @@ -246,7 +244,7 @@ func (h *Handler) SendResetCode(c *fiber.Ctx) error { return fiber.NewError(fiber.StatusBadRequest, "Email or PhoneNumber must be provided") } - if err := h.userSvc.SendResetCode(c.Context(), medium, sentTo, req.Provider); err != nil { + if err := h.userSvc.SendResetCode(c.Context(), medium, sentTo, "twilio"); err != nil { h.logger.Error("Failed to send reset code", "error", err) fmt.Println(err) return fiber.NewError(fiber.StatusInternalServerError, "Failed to send reset code")