better

cmd/cart/main.go

@@ -39,34 +39,12 @@ var (
 	})
 )
 
-func spawn(id uint64) (actor.Grain[CartGrain], error) {
-	grainSpawns.Inc()
-	ret := &CartGrain{
-		lastItemId:     0,
-		lastDeliveryId: 0,
-		Deliveries:     []*CartDelivery{},
-		Id:             CartId(id),
-		Items:          []*CartItem{},
-		TotalPrice:     0,
-	}
-	// Set baseline lastChange at spawn; replay may update it to last event timestamp.
-	ret.lastChange = time.Now()
-	ret.lastAccess = time.Now()
-
-	// Legacy loadMessages (no-op) retained; then replay append-only event log
-	//_ = loadMessages(ret, id)
-	err := ReplayCartEvents(ret, CartId(id))
-
-	return ret, err
-}
-
 func init() {
 	os.Mkdir("data", 0755)
 }
 
 type App struct {
-	pool    *actor.SimpleGrainPool[CartGrain]
-	storage *DiskStorage
+	pool *actor.SimpleGrainPool[CartGrain]
 }
 
 var podIp = os.Getenv("POD_IP")
@@ -91,7 +69,10 @@ func getCountryFromHost(host string) string {
 	if strings.Contains(strings.ToLower(host), "-no") {
 		return "no"
 	}
-	return "se"
+	if strings.Contains(strings.ToLower(host), "-se") {
+		return "se"
+	}
+	return ""
 }
 
 func GetDiscovery() discovery.Discovery {
@@ -112,21 +93,71 @@ func GetDiscovery() discovery.Discovery {
 }
 
 func main() {
+
 	controlPlaneConfig := actor.DefaultServerConfig()
-	storage, err := NewDiskStorage(fmt.Sprintf("data/s_%s.gob", name))
-	if err != nil {
-		log.Printf("Error loading state: %v\n", err)
+
+	reg := actor.NewMutationRegistry()
+	reg.RegisterMutations(
+		actor.NewMutation(AddItem, func() *messages.AddItem {
+			return &messages.AddItem{}
+		}),
+		actor.NewMutation(ChangeQuantity, func() *messages.ChangeQuantity {
+			return &messages.ChangeQuantity{}
+		}),
+		actor.NewMutation(RemoveItem, func() *messages.RemoveItem {
+			return &messages.RemoveItem{}
+		}),
+		actor.NewMutation(InitializeCheckout, func() *messages.InitializeCheckout {
+			return &messages.InitializeCheckout{}
+		}),
+		actor.NewMutation(RemoveDelivery, func() *messages.RemoveDelivery {
+			return &messages.RemoveDelivery{}
+		}),
+		actor.NewMutation(SetDelivery, func() *messages.SetDelivery {
+			return &messages.SetDelivery{}
+		}),
+		actor.NewMutation(SetPickupPoint, func() *messages.SetPickupPoint {
+			return &messages.SetPickupPoint{}
+		}),
+	)
+	diskStorage := actor.NewDiskStorage[CartGrain]("data", reg)
+	poolConfig := actor.GrainPoolConfig[CartGrain]{
+		MutationRegistry: reg,
+		Storage:          diskStorage,
+		Spawn: func(id uint64) (actor.Grain[CartGrain], error) {
+			grainSpawns.Inc()
+			ret := &CartGrain{
+				lastItemId:     0,
+				lastDeliveryId: 0,
+				Deliveries:     []*CartDelivery{},
+				Id:             CartId(id),
+				Items:          []*CartItem{},
+				TotalPrice:     0,
+			}
+			// Set baseline lastChange at spawn; replay may update it to last event timestamp.
+			ret.lastChange = time.Now()
+			ret.lastAccess = time.Now()
+
+			// Legacy loadMessages (no-op) retained; then replay append-only event log
+			//_ = loadMessages(ret, id)
+			err := diskStorage.LoadEvents(id, ret)
+
+			return ret, err
+		},
+		SpawnHost: func(host string) (actor.Host, error) {
+			return proxy.NewRemoteHost(host)
+		},
+		TTL:      15 * time.Minute,
+		PoolSize: 2 * 65535,
+		Hostname: podIp,
 	}
 
-	pool, err := actor.NewSimpleGrainPool(2*65535, 15*time.Minute, podIp, spawn, func(host string) (actor.Host, error) {
-		return proxy.NewRemoteHost(host)
-	})
+	pool, err := actor.NewSimpleGrainPool(poolConfig)
 	if err != nil {
 		log.Fatalf("Error creating cart pool: %v\n", err)
 	}
 	app := &App{
-		pool:    pool,
-		storage: storage,
+		pool: pool,
 	}
 
 	grpcSrv, err := actor.NewControlServer[*CartGrain](controlPlaneConfig, pool)