more stuff

cart-grain.go

@@ -3,10 +3,11 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	"slices"
 	"sync"
 	"time"
 
-	messages "git.tornberg.me/go-cart-actor/proto"
+	messages "git.tornberg.me/go-cart-actor/pkg/messages"
 )
 
 // Legacy padded [16]byte CartId and its helper methods removed.
@@ -61,7 +62,8 @@ type CartGrain struct {
 	mu                sync.RWMutex
 	lastItemId        int
 	lastDeliveryId    int
-	lastChange        int64           // unix seconds of last successful mutation (replay sets from event ts)
+	lastAccess        time.Time
+	lastChange        time.Time       // unix seconds of last successful mutation (replay sets from event ts)
 	Id                CartId          `json:"id"`
 	Items             []*CartItem     `json:"items"`
 	TotalPrice        int64           `json:"totalPrice"`
@@ -74,21 +76,20 @@ type CartGrain struct {
 	PaymentStatus     string          `json:"paymentStatus,omitempty"`
 }
 
-type Grain interface {
-	GetId() CartId
-	Apply(content interface{}, isReplay bool) (*CartGrain, error)
-	GetCurrentState() (*CartGrain, error)
-}
-
 func (c *CartGrain) GetId() CartId {
 	return c.Id
 }
 
-func (c *CartGrain) GetLastChange() int64 {
+func (c *CartGrain) GetLastChange() time.Time {
 	return c.lastChange
 }
 
+func (c *CartGrain) GetLastAccess() time.Time {
+	return c.lastAccess
+}
+
 func (c *CartGrain) GetCurrentState() (*CartGrain, error) {
+	c.lastAccess = time.Now()
 	return c, nil
 }
 
@@ -195,13 +196,7 @@ func (c *CartGrain) ItemsWithoutDelivery() []int {
 	ret := make([]int, 0, len(c.Items))
 	hasDelivery := c.ItemsWithDelivery()
 	for _, item := range c.Items {
-		found := false
-		for _, id := range hasDelivery {
-			if item.Id == id {
-				found = true
-				break
-			}
-		}
+		found := slices.Contains(hasDelivery, item.Id)
 
 		if !found {
 			ret = append(ret, item.Id)
@@ -239,7 +234,8 @@ func (c *CartGrain) Apply(content interface{}, isReplay bool) (*CartGrain, error
 
 	// Sliding TTL: update lastChange only for non-replay successful mutations.
 	if updated != nil && !isReplay {
-		c.lastChange = time.Now().Unix()
+		c.lastChange = time.Now()
+		c.lastAccess = time.Now()
 		_ = AppendCartEvent(c.Id, content)
 	}