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

Merge branch 'main' into stats

Browse Source
This commit is contained in:
Samuel Tariku 2025-10-18 13:42:57 +03:00
commit 5af3c5d978
1 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
internal/services/bet/service.go
View File

@ -35,7 +35,7 @@ var (
ErrGenerateRandomOutcome = errors.New("failed to generate any random outcome for events") ErrGenerateRandomOutcome = errors.New("failed to generate any random outcome for events")
ErrOutcomesNotCompleted = errors.New("some bet outcomes are still pending") ErrOutcomesNotCompleted = errors.New("some bet outcomes are still pending")
ErrEventHasBeenRemoved = errors.New("event has been removed") ErrEventHasBeenRemoved = errors.New("event has been removed")
ErrEventHasBeenDisabled = errors.New("event has been disabled") ErrEventHasBeenDisabled = errors.New("event has been disabled")
ErrEventHasNotEnded = errors.New("event has not ended yet") ErrEventHasNotEnded = errors.New("event has not ended yet")
ErrOddHasBeenDisabled = errors.New("odd has been disabled") ErrOddHasBeenDisabled = errors.New("odd has been disabled")
@ -129,7 +129,7 @@ func (s *Service) GenerateBetOutcome(ctx context.Context, eventID int64, marketI
) )
return domain.CreateBetOutcome{}, ErrEventHasBeenDisabled return domain.CreateBetOutcome{}, ErrEventHasBeenDisabled
} }
currentTime := time.Now() currentTime := time.Now()
if event.StartTime.Before(currentTime) { if event.StartTime.Before(currentTime) {
s.mongoLogger.Error("event has already started", s.mongoLogger.Error("event has already started",
@ -555,34 +555,50 @@ func (s *Service) DeductBetFromBranchWallet(ctx context.Context, amount float32,
return ErrCompanyDeductedPercentInvalid return ErrCompanyDeductedPercentInvalid
} }
// This is the amount that we take from a company/tenant when they
// create a bet. I.e. if its 5% (0.05), then thats the percentage we take every
deductedAmount := amount * company.DeductedPercentage
if deductedAmount == 0 {
s.mongoLogger.Fatal("Amount",
zap.Int64("wallet_id", walletID),
zap.Float32("amount", deductedAmount),
zap.Error(err),
)
return err
}
_, err = s.walletSvc.DeductFromWallet(ctx, _, err = s.walletSvc.DeductFromWallet(ctx,
walletID, domain.ToCurrency(deductedAmount), domain.ValidInt64{ walletID, domain.ToCurrency(amount), domain.ValidInt64{
Value: userID, Value: userID,
Valid: true, Valid: true,
}, domain.TRANSFER_DIRECT, }, domain.TRANSFER_DIRECT,
fmt.Sprintf("Deducted %v amount from wallet by system while placing bet", deductedAmount)) fmt.Sprintf("Deducted %v amount from wallet by system while placing bet", amount))
if err != nil { if err != nil {
s.mongoLogger.Error("failed to deduct from wallet", s.mongoLogger.Error("failed to deduct from wallet",
zap.Int64("wallet_id", walletID), zap.Int64("wallet_id", walletID),
zap.Float32("amount", deductedAmount), zap.Float32("amount", amount),
zap.Error(err), zap.Error(err),
) )
return err return err
} }
// This is the amount that we take from a company/tenant when they
// create a bet. I.e. if its 5% (0.05), then thats the percentage we take every
// deductedAmount := amount * company.DeductedPercentage
// if deductedAmount == 0 {
// s.mongoLogger.Fatal("Amount",
// zap.Int64("wallet_id", walletID),
// zap.Float32("amount", deductedAmount),
// zap.Error(err),
// )
// return err
// }
// _, err = s.walletSvc.DeductFromWallet(ctx,
// walletID, domain.ToCurrency(deductedAmount), domain.ValidInt64{
// Value: userID,
// Valid: true,
// }, domain.TRANSFER_DIRECT,
// fmt.Sprintf("Deducted %v amount from wallet by system while placing bet", deductedAmount))
// if err != nil {
// s.mongoLogger.Error("failed to deduct from wallet",
// zap.Int64("wallet_id", walletID),
// zap.Float32("amount", deductedAmount),
// zap.Error(err),
// )
// return err
// }
return nil return nil
} }