event.Run fix loop

rarimo · Aug 8, 2024 · 2f4b866 · 2f4b866
1 parent 5ec8bc7
commit 2f4b866
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/internal/cli/main.go b/internal/cli/main.go
@@ -32,7 +32,7 @@ func Run(args []string) bool {
 
 		event    = app.Command("event", "claim event command")
 		eventCmd = event.Command("create-early-test", "claim event command")
-		data     = eventCmd.Arg("before", "data after ...").Required().Int()
+		date     = eventCmd.Arg("before", "date after ...").Required().Int()
 	)
 
 	cmd, err := app.Parse(args[1:])
@@ -53,7 +53,7 @@ func Run(args []string) bool {
 	case migrateDownCmd.FullCommand():
 		err = MigrateDown(cfg)
 	case eventCmd.FullCommand():
-		eventStart(cfg, *data)
+		eventStart(cfg, *date)
 	default:
 		log.Errorf("unknown command %s", cmd)
 		return false

diff --git a/internal/data/evtypes/main.go b/internal/data/evtypes/main.go
@@ -1,6 +1,8 @@
 package evtypes
 
 import (
+	"fmt"
+
 	"github.com/rarimo/geo-points-svc/internal/data"
 	"github.com/rarimo/geo-points-svc/internal/data/evtypes/models"
 )
@@ -91,6 +93,8 @@ func (t *Types) Push(types ...models.EventType) {
 
 func (t *Types) ensureInitialized() {
 	if t.m == nil || t.list == nil || !t.dbSynced {
+		txt := fmt.Sprintf("t.m - %+v, t.lisy - %+v, t.dbSynced %+v", t.m, t.list, t.dbSynced)
+		fmt.Println(txt)
 		panic("event types are not correctly initialized")
 	}
 }
diff --git a/internal/service/event/main.go b/internal/service/event/main.go
@@ -22,6 +22,7 @@ func Run(cfg config.Config, date int) error {
 	referralsQ := pg.NewReferrals(db)
 
 	evType := evTypes.Get(models.TypeEarlyTest, evtypes.FilterInactive)
+	log.Infof("point")
 	if evType == nil {
 		log.Infof("Event type %s is inactive", models.TypeEarlyTest)
 		return nil
@@ -45,6 +46,7 @@ func Run(cfg config.Config, date int) error {
 	}
 
 	filteredEvents, err := eventsQ.
+		FilterByType(models.TypeEarlyTest).
 		FilterByStatus(data.EventFulfilled).
 		FilterByNullifier(nullifiers...).
 		Select()
@@ -60,7 +62,7 @@ func Run(cfg config.Config, date int) error {
 	}
 
 	for _, balance := range balances {
-		err = eventsQ.Transaction(func() error {
+		err = eventsQ.New().Transaction(func() error {
 			if _, exists := eventsMap[balance.Nullifier]; exists {
 				return nil
 			}
@@ -82,7 +84,7 @@ func Run(cfg config.Config, date int) error {
 
 			_, err = eventsQ.FilterByNullifier(balance.Nullifier).Update(data.EventClaimed, nil, &evType.Reward)
 			if err != nil {
-				return fmt.Errorf("failedt to update %s events for user=%s: %w", models.TypeEarlyTest, balance.Nullifier, err)
+				return fmt.Errorf("failed to update %s events for user=%s: %w", models.TypeEarlyTest, balance.Nullifier, err)
 			}
 
 			totalPoints += evType.Reward