Yimaru/Yimaru-BackEnd
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: minor issues

Browse Source
This commit is contained in:
Samuel Tariku 2025-06-25 14:24:40 +03:00
parent 448d8c73c1
commit 53ef3ee1f0
4 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/domain/league.go
View File

@ -29,7 +29,6 @@ type LeagueFilter struct {
Offset ValidInt64 Offset ValidInt64
} }
// These leagues are automatically featured when the league is created // These leagues are automatically featured when the league is created
var FeaturedLeagues = []int64{ var FeaturedLeagues = []int64{
// Football // Football
@ -46,6 +45,7 @@ var FeaturedLeagues = []int64{
10050346, //UEFA Super Cup 10050346, //UEFA Super Cup
10081269, //CONCACAF Champions Cup 10081269, //CONCACAF Champions Cup
10070189, //CONCACAF Gold Cup 10070189, //CONCACAF Gold Cup
10076185, //UEFA Regions Cup
10067913, //Europe - World Cup Qualifying 10067913, //Europe - World Cup Qualifying
10040162, //Asia - World Cup Qualifying 10040162, //Asia - World Cup Qualifying

2
internal/services/odds/service.go
View File

@ -1,4 +1,4 @@
package odds package odds
import ( import (
"context" "context"

19
internal/web_server/handlers/prematch.go
View File

@ -177,9 +177,11 @@ type TopLeaguesRes struct {
} }
type TopLeague struct { type TopLeague struct {
LeagueID int64 `json:"league_id"` LeagueID int64 `json:"league_id"`
LeagueName string `json:"league_name"` LeagueName string `json:"league_name"`
Events []domain.UpcomingEvent `json:"events"` LeagueCC string `json:"league_cc"`
LeagueSportID int32 `json:"league_sport_id"`
Events []domain.UpcomingEvent `json:"events"`
// Total int64 `json:"total"` // Total int64 `json:"total"`
} }
@ -188,7 +190,7 @@ type TopLeague struct {
// @Tags prematch // @Tags prematch
// @Accept json // @Accept json
// @Produce json // @Produce json
// @Success 200 {array} domain.UpcomingEvent // @Success 200 {array} TopLeague
// @Failure 500 {object} response.APIResponse // @Failure 500 {object} response.APIResponse
// @Router /top-leagues [get] // @Router /top-leagues [get]
func (h *Handler) GetTopLeagues(c *fiber.Ctx) error { 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) 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) h.logger.Error("Error while fetching events for top league", "League ID", league.ID)
} }
topLeague = append(topLeague, TopLeague{ topLeague = append(topLeague, TopLeague{
LeagueID: league.ID, LeagueID: league.ID,
LeagueName: league.Name, LeagueName: league.Name,
Events: events, LeagueCC: league.CountryCode,
LeagueSportID: league.SportID,
Events: events,
}) })
} }

30
internal/web_server/handlers/user.go
View File

@ -59,9 +59,8 @@ func (h *Handler) CheckPhoneEmailExist(c *fiber.Ctx) error {
} }
type RegisterCodeReq struct { type RegisterCodeReq struct {
Email string `json:"email" example:"john.doe@example.com"` Email string `json:"email" example:"john.doe@example.com"`
PhoneNumber string `json:"phone_number" example:"1234567890"` PhoneNumber string `json:"phone_number" example:"1234567890"`
Provider domain.OtpProvider `json:"provider" validate:"required" example:"twilio"`
} }
// SendRegisterCode godoc // 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") 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) h.logger.Error("Failed to send register code", "error", err)
return fiber.NewError(fiber.StatusInternalServerError, "Failed to send register code") 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 { type RegisterUserReq struct {
FirstName string `json:"first_name" example:"John"` FirstName string `json:"first_name" example:"John"`
LastName string `json:"last_name" example:"Doe"` LastName string `json:"last_name" example:"Doe"`
Email string `json:"email" example:"john.doe@example.com"` Email string `json:"email" example:"john.doe@example.com"`
PhoneNumber string `json:"phone_number" example:"1234567890"` PhoneNumber string `json:"phone_number" example:"1234567890"`
Password string `json:"password" example:"password123"` Password string `json:"password" example:"password123"`
Otp string `json:"otp" example:"123456"` Otp string `json:"otp" example:"123456"`
ReferalCode string `json:"referal_code" example:"ABC123"` ReferalCode string `json:"referal_code" example:"ABC123"`
Provider domain.OtpProvider `json:"provider" validate:"required" example:"twilio"`
} }
// RegisterUser godoc // RegisterUser godoc
@ -206,9 +204,9 @@ func (h *Handler) RegisterUser(c *fiber.Ctx) error {
} }
type ResetCodeReq struct { type ResetCodeReq struct {
Email string `json:"email" example:"john.doe@example.com"` Email string `json:"email" example:"john.doe@example.com"`
PhoneNumber string `json:"phone_number" validate:"required_without=Email" example:"1234567890"` PhoneNumber string `json:"phone_number" validate:"required_without=Email" example:"1234567890"`
Provider domain.OtpProvider `json:"provider" validate:"required" example:"twilio"` // Provider domain.OtpProvider `json:"provider" validate:"required" example:"twilio"`
} }
// SendResetCode godoc // 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") 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) h.logger.Error("Failed to send reset code", "error", err)
fmt.Println(err) fmt.Println(err)
return fiber.NewError(fiber.StatusInternalServerError, "Failed to send reset code") return fiber.NewError(fiber.StatusInternalServerError, "Failed to send reset code")