Simplify worker

rarimo · Jul 29, 2024 · 1893df1 · 1893df1
1 parent 2a8a52b
commit 1893df1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/internal/service/handlers/claim_event.go b/internal/service/handlers/claim_event.go
@@ -104,7 +104,7 @@ func claimEvent(r *http.Request, event *data.Event, balance *data.Balance) (*dat
 		return nil, fmt.Errorf("event wasn't updated")
 	}
 
-	level, err := doLevelRefUpgrade(Levels(r), ReferralsQ(r), balance, evType.Reward)
+	level, err := DoLevelRefUpgrade(Levels(r), ReferralsQ(r), balance, evType.Reward)
 	if err != nil {
 		return nil, fmt.Errorf("failed to do lvlup and referrals updates: %w", err)
 	}
@@ -133,7 +133,7 @@ func DoClaimEventUpdates(
 	balance *data.Balance,
 	reward int64) (err error) {
 
-	level, err := doLevelRefUpgrade(levels, referralsQ, balance, reward)
+	level, err := DoLevelRefUpgrade(levels, referralsQ, balance, reward)
 	if err != nil {
 		return fmt.Errorf("failed to do lvlup and referrals updates: %w", err)
 	}
@@ -149,9 +149,9 @@ func DoClaimEventUpdates(
 	return nil
 }
 
-// doLevelRefUpgrade calculates new level by provided reward: if level is up,
+// DoLevelRefUpgrade calculates new level by provided reward: if level is up,
 // referrals are added
-func doLevelRefUpgrade(levels *config.Levels, refQ data.ReferralsQ, balance *data.Balance, reward int64) (level int, err error) {
+func DoLevelRefUpgrade(levels *config.Levels, refQ data.ReferralsQ, balance *data.Balance, reward int64) (level int, err error) {
 	refsCount, level := levels.LvlChange(balance.Level, reward+balance.Amount)
 	referrals := []data.Referral{}
 	// count used to calculate ref code

diff --git a/internal/service/handlers/create_balance.go b/internal/service/handlers/create_balance.go
@@ -160,7 +160,7 @@ func createBalanceWithEventsAndReferrals(nullifier, refBy string, events []data.
 		}
 		balance.ReferredBy = &refBy
 
-		level, err := doLevelRefUpgrade(Levels(r), ReferralsQ(r), balance, 0)
+		level, err := DoLevelRefUpgrade(Levels(r), ReferralsQ(r), balance, 0)
 		if err != nil {
 			return fmt.Errorf("failed to do lvlup and referrals update: %w", err)
 		}

diff --git a/internal/service/handlers/verify_external_passport.go b/internal/service/handlers/verify_external_passport.go
@@ -196,7 +196,7 @@ func autoClaimEventsForBalance(r *http.Request, balance *data.Balance) error {
 		totalPoints += evType.Reward * int64(len(evIDs))
 	}
 
-	level, err := doLevelRefUpgrade(Levels(r), ReferralsQ(r), balance, totalPoints)
+	level, err := DoLevelRefUpgrade(Levels(r), ReferralsQ(r), balance, totalPoints)
 	if err != nil {
 		return fmt.Errorf("failed to do lvlup and referrals updates: %w", err)
 	}

diff --git a/internal/service/workers/leveljustice/main.go b/internal/service/workers/leveljustice/main.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/rarimo/geo-points-svc/internal/config"
+	"github.com/rarimo/geo-points-svc/internal/data"
 	"github.com/rarimo/geo-points-svc/internal/data/pg"
 	"github.com/rarimo/geo-points-svc/internal/service/handlers"
 )
@@ -17,9 +18,16 @@ func Run(cfg config.Config, sig chan struct{}) {
 
 	err = pg.NewEvents(db).Transaction(func() error {
 		for _, balance := range balances {
-			err = handlers.DoClaimEventUpdates(cfg.Levels(), pg.NewReferrals(db), pg.NewBalances(db), &balance, 0)
+			level, err := handlers.DoLevelRefUpgrade(cfg.Levels(), pg.NewReferrals(db), &balance, 0)
 			if err != nil {
-				return fmt.Errorf("failed to update balance level: %w", err)
+				return fmt.Errorf("failed to do lvlup and referrals updates: %w", err)
+			}
+
+			err = pg.NewBalances(db).FilterByNullifier(balance.Nullifier).Update(map[string]any{
+				data.ColLevel: level,
+			})
+			if err != nil {
+				return fmt.Errorf("update balance amount and level: %w", err)
 			}
 		}
 		return nil