Skip to content

fix: using get user from loyalty #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TeoCalvo merged 1 commit into from
Jun 2, 2026
Merged

fix: using get user from loyalty #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions controllers/commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ func (c *CommandsController) GetCommand(message twitch.PrivateMessage) (string,
case "cubos":
return c.perfilService.GetUserCubes(message.User)

case "retro":
return c.perfilService.GetUserRetro(message.User)

case "presente":
return c.pointsService.MgmtPresenca(message.User)
Comment on lines 69 to 73

Expand Down
28 changes: 28 additions & 0 deletions repositories/loyalty.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,34 @@ func (r *LoyaltyRepository) GetCustomerLastTransactionDateByCategory(customerID

}

func (r *LoyaltyRepository) GetCustomerLastTransactionDateByCodProduct(customerID string, codProduct string) (*time.Time, error) {

/// last_transaction_product/:customerID/:codProduct
url := fmt.Sprintf("%s/last_transaction_product/%s/%s", r.URI, customerID, codProduct)

resp, err := r.HttpClient.Get(url)
if err != nil {
return nil, err
}

defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
return nil, fmt.Errorf("erro na requisição. statuscode: %d", resp.StatusCode)
}

bodyReader, err := io.ReadAll(resp.Body)
if err != nil {
return nil, err
}

var payload PayloadLastDate
if err := json.Unmarshal(bodyReader, &payload); err != nil {
return nil, err
}

return payload.LastTransactionDate, nil
}

func NewLoyaltyRepository(settings *config.Config) *LoyaltyRepository {
return &LoyaltyRepository{
URI: settings.LoyaltyServiceURI,
Expand Down
34 changes: 6 additions & 28 deletions repositories/presenca.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@ type PresentUser struct {
CreatedAt time.Time `json:"created_at" gorm:"autoCreateTime"`
}

func NewPresentUser(twitchUser *TwitchUser) *PresentUser {
return &PresentUser{
UUID: uuid.New().String(),
UserID: twitchUser.UUID,
}
}

type StreakPresentUser struct {
UUID string `json:"uuid" gorm:"primaryKey"`
UserID string `json:"user_id"`
Expand All @@ -28,10 +21,10 @@ type StreakPresentUser struct {
UpdatedAt time.Time `json:"updated_at" gorm:"autoUpdateTime:true"`
}

func NewStreakPresentUser(twitchUser *TwitchUser) *StreakPresentUser {
func NewStreakPresentUser(twitch_id string) *StreakPresentUser {
return &StreakPresentUser{
UUID: uuid.New().String(),
UserID: twitchUser.UUID,
UserID: twitch_id,
Qtd: 1,
}
}
Expand All @@ -46,32 +39,17 @@ func NewPresencaRepository(db *gorm.DB) *PresencaRepository {
}
}

func (r *PresencaRepository) CreatePresenca(twitchUser *TwitchUser) (*PresentUser, error) {
present := NewPresentUser(twitchUser)
return present, r.db.Create(&present).Error
}

func (r *PresencaRepository) DeletePresenca(present *PresentUser) error {
return r.db.Delete(&present).Error
}

func (r *PresencaRepository) LoadLastPresent(twitchUser *TwitchUser) (*PresentUser, error) {
present := &PresentUser{}
res := r.db.Where("user_id = ?", twitchUser.UUID).Order("created_at DESC").First(&present)
return present, res.Error
}

func (r *PresencaRepository) CreateStreak(twitchUser *TwitchUser) error {
streak := NewStreakPresentUser(twitchUser)
func (r *PresencaRepository) CreateStreak(twitch_id string) error {
streak := NewStreakPresentUser(twitch_id)
return r.db.Create(&streak).Error
}

func (r *PresencaRepository) UpdateStreak(streak *StreakPresentUser) error {
return r.db.Save(&streak).Error
}

func (r *PresencaRepository) LoadLastUpdatedStreak(twitchUser *TwitchUser) (*StreakPresentUser, error) {
func (r *PresencaRepository) LoadLastUpdatedStreak(twitch_id string) (*StreakPresentUser, error) {
streak := &StreakPresentUser{}
res := r.db.Where("user_id = ?", twitchUser.UUID).Order("updated_at DESC").First(&streak)
res := r.db.Where("user_id = ?", twitch_id).Order("updated_at DESC").First(&streak)
Comment on lines 24 to +53
return streak, res.Error
}
57 changes: 0 additions & 57 deletions repositories/retro.go
View file
Open in desktop

This file was deleted.

43 changes: 5 additions & 38 deletions services/perfil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@ import (
type PerfilService struct {
loyaltyRepository *repositories.LoyaltyRepository
userRepository *repositories.UserRepository
retroRepository *repositories.RetroRepository
palantirRepository *repositories.PalantirRepository
}

func (s *PerfilService) CreateNewUser(twitchUser twitch.User) (string, error) {
_, err := s.userRepository.GetUserByField("twitch_id", twitchUser.ID)
_, err := s.loyaltyRepository.GetCustomerByTwitch(twitchUser.ID)
if err != nil {
if err == gorm.ErrRecordNotFound {

Comment on lines +24 to 27
Expand Down Expand Up @@ -70,15 +69,7 @@ func (s *PerfilService) CreateNewUser(twitchUser twitch.User) (string, error) {

func (s *PerfilService) GetUserCubes(twitchUser twitch.User) (string, error) {

user, err := s.userRepository.GetUserByField("twitch_id", twitchUser.ID)
if err != nil {
if err == gorm.ErrRecordNotFound {
msg := fmt.Sprintf("%s usuário não encontrado. Dê !join", twitchUser.DisplayName)
return msg, err
}
}

customer, err := s.loyaltyRepository.GetCustomer(user.UUID)
customer, err := s.loyaltyRepository.GetCustomerByTwitch(twitchUser.ID)
if err != nil {
log.Println(err)
msg := fmt.Sprintf("%s não foi possível recuperar seus cubos", twitchUser.DisplayName)
Expand All @@ -97,31 +88,9 @@ func (s *PerfilService) GetUserCubes(twitchUser twitch.User) (string, error) {

}

func (s *PerfilService) GetUserRetro(twitchUser twitch.User) (string, error) {

user, err := s.userRepository.GetUserByField("twitch_id", twitchUser.ID)
if err != nil {
if err == gorm.ErrRecordNotFound {
msg := fmt.Sprintf("%s usuário não encontrado. Dê !join", twitchUser.DisplayName)
return msg, err
}
msg := fmt.Sprintf("%s não foi possível obter sua retro", twitchUser.DisplayName)
return msg, err
}

retro, err := s.retroRepository.GetUserRetro(user.UUID, user.TwitchNick)
if retro == nil {
msg := fmt.Sprintf("%s não foi possível obter sua retro", twitchUser.DisplayName)
return msg, err
}

return *retro, err

}

func (s *PerfilService) GetFielScore(twitchUser twitch.User) (string, error) {

user, err := s.userRepository.GetUserByField("twitch_id", twitchUser.ID)
user, err := s.loyaltyRepository.GetCustomerByTwitch(twitchUser.ID)
if err != nil {
if err == gorm.ErrRecordNotFound {
msg := fmt.Sprintf("%s usuário não encontrado. Dê !join", twitchUser.DisplayName)
Expand Down Expand Up @@ -184,7 +153,7 @@ func (s *PerfilService) GetFielScore(twitchUser twitch.User) (string, error) {

msg += msgPontos

customer, err := s.loyaltyRepository.GetCustomer(user.UUID)
customer, err := s.loyaltyRepository.GetCustomerByTwitch(twitchUser.ID)
if err != nil {
log.Println(err)
}
Expand All @@ -201,7 +170,7 @@ func (s *PerfilService) GetFielScore(twitchUser twitch.User) (string, error) {

func (s *PerfilService) CheckFielToday(twitchUser twitch.User) (bool, error) {

user, err := s.userRepository.GetUserByField("twitch_id", twitchUser.ID)
user, err := s.loyaltyRepository.GetCustomerByTwitch(twitchUser.ID)
if err != nil {
if err == gorm.ErrRecordNotFound {
return false, err
Expand All @@ -227,14 +196,12 @@ func (s *PerfilService) CheckFielToday(twitchUser twitch.User) (bool, error) {
func NewPerfilService(settings *config.Config, db *gorm.DB) *PerfilService {

loyaltyRepository := repositories.NewLoyaltyRepository(settings)
retroRepository := repositories.NewRetroRepository(settings)
palantirRepository := repositories.NewPalantirRepository(settings, &http.Client{})
userRepository := repositories.NewUserRepository(db)

return &PerfilService{
loyaltyRepository: loyaltyRepository,
userRepository: userRepository,
retroRepository: retroRepository,
palantirRepository: palantirRepository,
}

Expand Down
Loading