Maintain date type for snapshot

pkg/rewards/operatorAvsRegistrationSnaphots.go

@@ -95,7 +95,7 @@ cleaned_records AS (
 SELECT
 	operator,
 	avs,
-	to_char(d, 'YYYY-MM-DD') AS snapshot
+	d AS snapshot
 FROM cleaned_records
 CROSS JOIN generate_series(DATE(start_time), DATE(end_time) - interval '1' day, interval '1' day) AS d
 `

pkg/rewards/operatorAvsRegistrationSnaphots_test.go

@@ -11,6 +11,7 @@ import (
 	"gorm.io/gorm"
 	"slices"
 	"testing"
+	"time"
 )
 
 func setupOperatorAvsRegistrationSnapshot() (
@@ -163,7 +164,7 @@ func Test_OperatorAvsRegistrationSnapshots(t *testing.T) {
 					t.Logf("Operator/AVS not found in results: %+v\n", window)
 					lacksExpectedResult = append(lacksExpectedResult, window)
 				} else {
-					if !slices.Contains(found, window.Snapshot) {
+					if !slices.Contains(found, window.Snapshot.Format(time.DateOnly)) {
 						t.Logf("Found operator/AVS, but no snapshot: %+v - %+v\n", window, found)
 						lacksExpectedResult = append(lacksExpectedResult, window)
 					}

pkg/rewards/operatorAvsStrategySnapshots.go

@@ -131,7 +131,7 @@ final_results as (
 		operator,
 		avs,
 		strategy,
-		to_char(d, 'YYYY-MM-DD') AS snapshot
+		d AS snapshot
 	FROM cleaned_records
 		CROSS JOIN generate_series(DATE(start_time), DATE(end_time) - interval '1' day, interval '1' day) AS d
 )

pkg/rewards/operatorAvsStrategySnapshots_test.go

@@ -12,6 +12,7 @@ import (
 	"slices"
 	"strings"
 	"testing"
+	"time"
 )
 
 func setupOperatorAvsStrategyWindows() (
@@ -158,7 +159,7 @@ func Test_OperatorAvsStrategySnapshots(t *testing.T) {
 				t.Logf("Could not find expected result for %+v", window)
 				continue
 			}
-			if !slices.Contains(found, window.Snapshot) {
+			if !slices.Contains(found, window.Snapshot.Format(time.DateOnly)) {
 				t.Logf("Found result, but snapshot doesnt match: %+v - %v", window, found)
 				lacksExpectedResult = append(lacksExpectedResult, window)
 			}

pkg/rewards/operatorShareSnapshots.go

@@ -50,11 +50,11 @@ final_results as (
 		operator,
 		strategy,
 		shares,
-		cast(day AS DATE) AS snapshot
+		d AS snapshot
 	FROM
 		cleaned_records
 			CROSS JOIN
-		generate_series(DATE(start_time), DATE(end_time) - interval '1' day, interval '1' day) AS day
+		generate_series(DATE(start_time), DATE(end_time) - interval '1' day, interval '1' day) AS d
 )
 select * from final_results
 `

pkg/rewards/operatorShareSnapshots_test.go

@@ -10,6 +10,7 @@ import (
 	"go.uber.org/zap"
 	"gorm.io/gorm"
 	"testing"
+	"time"
 )
 
 func setupOperatorShareSnapshot() (
@@ -129,7 +130,7 @@ func Test_OperatorShareSnapshots(t *testing.T) {
 			// Go line-by-line in the snapshot results and find the corresponding line in the expected results.
 			// If one doesnt exist, add it to the missing list.
 			for _, snapshot := range snapshots {
-				snapshotStr := snapshot.Snapshot
+				snapshotStr := snapshot.Snapshot.Format(time.DateOnly)
 
 				slotId := fmt.Sprintf("%s_%s_%s", snapshot.Operator, snapshot.Strategy, snapshotStr)
 

pkg/rewards/stakerDelegationSnapshots.go

@@ -48,11 +48,11 @@ final_results as (
 	SELECT
 		staker,
 		operator,
-		cast(day AS DATE) AS snapshot
+		d AS snapshot
 	FROM
 		cleaned_records
 			CROSS JOIN
-		generate_series(DATE(start_time), DATE(end_time) - interval '1' day, interval '1' day) AS day
+		generate_series(DATE(start_time), DATE(end_time) - interval '1' day, interval '1' day) AS d
 )
 select * from final_results
 `

pkg/rewards/stakerDelegationSnapshots_test.go

@@ -11,6 +11,7 @@ import (
 	"gorm.io/gorm"
 	"slices"
 	"testing"
+	"time"
 )
 
 func setupStakerDelegationSnapshot() (
@@ -138,7 +139,7 @@ func Test_StakerDelegationSnapshots(t *testing.T) {
 					t.Logf("Staker/operator not found in results: %+v\n", snapshot)
 					lacksExpectedResult = append(lacksExpectedResult, snapshot)
 				} else {
-					if !slices.Contains(found, snapshot.Snapshot) {
+					if !slices.Contains(found, snapshot.Snapshot.Format(time.DateOnly)) {
 						t.Logf("Found staker operator, but no snapshot: %+v - %+v\n", snapshot, found)
 						lacksExpectedResult = append(lacksExpectedResult, snapshot)
 					}

pkg/rewards/stakerShareSnapshots.go

@@ -50,11 +50,11 @@ final_results as (
 		staker,
 		strategy,
 		shares,
-		cast(day AS DATE) AS snapshot
+		d AS snapshot
 	FROM
 		cleaned_records
 	CROSS JOIN
-		generate_series(DATE(start_time), DATE(end_time) - interval '1' day, interval '1' day) AS day
+		generate_series(DATE(start_time), DATE(end_time) - interval '1' day, interval '1' day) AS d
 )
 select * from final_results
 `

pkg/rewards/stakerShareSnapshots_test.go

@@ -10,6 +10,7 @@ import (
 	"go.uber.org/zap"
 	"gorm.io/gorm"
 	"testing"
+	"time"
 )
 
 func setupStakerShareSnapshot() (
@@ -126,7 +127,7 @@ func Test_StakerShareSnapshots(t *testing.T) {
 			// Go line-by-line in the snapshot results and find the corresponding line in the expected results.
 			// If one doesnt exist, add it to the missing list.
 			for _, snapshot := range snapshots {
-				slotId := fmt.Sprintf("%s_%s_%s", snapshot.Staker, snapshot.Strategy, snapshot.Snapshot)
+				slotId := fmt.Sprintf("%s_%s_%s", snapshot.Staker, snapshot.Strategy, snapshot.Snapshot.Format(time.DateOnly))
 
 				found, ok := mappedExpectedResults[slotId]
 				if !ok {

pkg/rewards/tables.go

@@ -22,32 +22,32 @@ type CombinedRewards struct {
 type OperatorAvsRegistrationSnapshots struct {
 	Avs      string
 	Operator string
-	Snapshot string
+	Snapshot time.Time
 }
 
 type OperatorAvsStrategySnapshot struct {
 	Operator string
 	Avs      string
 	Strategy string
-	Snapshot string
+	Snapshot time.Time
 }
 
 type OperatorShareSnapshots struct {
 	Operator string
 	Strategy string
 	Shares   string
-	Snapshot string
+	Snapshot time.Time
 }
 
 type StakerDelegationSnapshot struct {
 	Staker   string
 	Operator string
-	Snapshot string
+	Snapshot time.Time
 }
 
 type StakerShareSnapshot struct {
 	Staker   string
 	Strategy string
-	Snapshot string
+	Snapshot time.Time
 	Shares   string
 }