src to pkg, impl lobby.Closed

.gitignore

@@ -1,2 +1,3 @@
 **/*.sw*
 /src/state/fsm/template
+/pkg/state/fsm/template

pkg/lib/db/ctx_test.go

@@ -3,7 +3,7 @@ package db_test
 import (
 	"context"
 	"database/sql"
-	"gitea/price-is-wrong/src/lib/db"
+	"gitea/price-is-wrong/pkg/lib/db"
 	"testing"
 )
 

pkg/lib/db/new.go

@@ -0,0 +1,21 @@
+package db
+
+import (
+	"context"
+	"database/sql"
+
+	_ "github.com/glebarez/sqlite"
+)
+
+func New(ctx context.Context, driver, conn string) (*sql.DB, error) {
+	db, err := sql.Open(driver, conn)
+	if err != nil {
+		return nil, err
+	}
+
+	if err := db.PingContext(ctx); err != nil {
+		return nil, err
+	}
+
+	return db, nil
+}

pkg/lib/test.go

@@ -2,11 +2,10 @@ package lib
 
 import (
 	"context"
-	"database/sql"
 	"path"
 	"testing"
 
-	"gitea/price-is-wrong/src/lib/db"
+	"gitea/price-is-wrong/pkg/lib/db"
 
 	_ "github.com/glebarez/sqlite"
 )
@@ -15,7 +14,7 @@ func NewTestCtx(t *testing.T) context.Context {
 	d := t.TempDir()
 	p := path.Join(d, "db.db")
 	t.Logf("test db at %s", p)
-	b, err := sql.Open("sqlite", p)
+	b, err := db.New(context.Background(), "sqlite", p)
 	if err != nil {
 		t.Fatal(err)
 	}

pkg/lib/test_test.go

@@ -2,8 +2,8 @@ package lib_test
 
 import (
 	"context"
-	"gitea/price-is-wrong/src/lib"
+	"gitea/price-is-wrong/pkg/lib"
-	"gitea/price-is-wrong/src/lib/db"
+	"gitea/price-is-wrong/pkg/lib/db"
 	"sync"
 	"testing"
 )

pkg/state/lobby/'

@@ -2,8 +2,8 @@ package lobby
 
 import (
 	"context"
-	"gitea/price-is-wrong/src/lib/db"
+	"gitea/price-is-wrong/pkg/lib/db"
-	lobby "gitea/price-is-wrong/src/state/lobby/internal"
+	lobby "gitea/price-is-wrong/pkg/state/lobby/internal"
 	"slices"
 )
 
@@ -15,6 +15,10 @@ func (l *Lobby) Leave(ctx context.Context, id int) error {
 	return l.upsertEvent(ctx, &lobby.PlayerLeave{ID: id})
 }
 
+func (l *Lobby) Close(ctx context.Context) error {
+	return l.upsertEvent(ctx, &lobby.Close{})
+}
+
 func (l *Lobby) upsertEvent(ctx context.Context, e lobby.Event) error {
 	if err := upsertEvent(ctx, l.id, e); err != nil {
 		return err

pkg/state/lobby/events.go

@@ -0,0 +1,60 @@
+package lobby
+
+import (
+	"context"
+	"gitea/price-is-wrong/pkg/lib/db"
+	lobby "gitea/price-is-wrong/pkg/state/lobby/internal"
+	"slices"
+)
+
+func (l *Lobby) Join(ctx context.Context, id int) error {
+	return l.upsertEvent(ctx, &lobby.PlayerJoin{ID: id})
+}
+
+func (l *Lobby) Leave(ctx context.Context, id int) error {
+	return l.upsertEvent(ctx, &lobby.PlayerLeave{ID: id})
+}
+
+func (l *Lobby) Close(ctx context.Context) error {
+	return l.upsertEvent(ctx, &lobby.Close{})
+}
+
+func (l *Lobby) upsertEvent(ctx context.Context, e lobby.Event) error {
+	if err := upsertEvent(ctx, l.id, e); err != nil {
+		return err
+	}
+
+	l2, err := openID(ctx, l.id)
+	if err != nil {
+		return err
+	}
+
+	*l = *l2
+	return nil
+}
+
+func upsertEvent(ctx context.Context, lobbyID int, e lobby.Event) error {
+	b, err := lobby.MarshalEvent(e)
+	if err != nil {
+		return err
+	}
+
+	_, err = db.From(ctx).ExecContext(ctx, `
+      INSERT INTO lobby_events (lobby_id, payload) VALUES (?, ?)
+   `, lobbyID, b)
+	return err
+}
+
+func (l *Lobby) apply(e lobby.Event) error {
+	switch e := e.(type) {
+	case *lobby.PlayerJoin:
+		if !slices.Contains(l.Players, e.ID) {
+			l.Players = append(l.Players, e.ID)
+		}
+	case *lobby.PlayerLeave:
+		l.Players = slices.DeleteFunc(l.Players, func(id int) bool { return id == e.ID })
+	case *lobby.Close:
+		l.Closed = true
+	}
+	return nil
+}

pkg/state/lobby/internal/event.go

@@ -2,7 +2,7 @@ package lobby
 
 import (
 	"fmt"
-	"gitea/price-is-wrong/src/lib/event"
+	"gitea/price-is-wrong/pkg/lib/event"
 )
 
 type Event interface{}
@@ -15,10 +15,14 @@ type PlayerLeave struct {
 	ID int
 }
 
+type Close struct {
+}
+
 func ParseEvent(b []byte) (Event, error) {
 	typesToPointers := map[string]any{
 		"*lobby.PlayerJoin":  &PlayerJoin{},
 		"*lobby.PlayerLeave": &PlayerLeave{},
+		"*lobby.Close":       &Close{},
 	}
 	t, err := event.Parse(b, typesToPointers)
 	return typesToPointers[t], err

pkg/state/lobby/internal/event_test.go

@@ -2,7 +2,7 @@ package lobby_test
 
 import (
 	"fmt"
-	lobby "gitea/price-is-wrong/src/state/lobby/internal"
+	lobby "gitea/price-is-wrong/pkg/state/lobby/internal"
 	"testing"
 )
 

pkg/state/lobby/lobby_test.go

@@ -1,8 +1,8 @@
 package lobby_test
 
 import (
-	"gitea/price-is-wrong/src/lib"
+	"gitea/price-is-wrong/pkg/lib"
-	"gitea/price-is-wrong/src/state/lobby"
+	"gitea/price-is-wrong/pkg/state/lobby"
 	"testing"
 )
 
@@ -44,4 +44,10 @@ func TestOpen(t *testing.T) {
 	} else if len(l.Players) != 2 {
 		t.Errorf("second join yielded wrong players: %+v", l.Players)
 	}
+
+	if err := l.Close(ctx); err != nil {
+		t.Fatal(err)
+	} else if !l.Closed {
+		t.Error(l.Closed)
+	}
 }

pkg/state/lobby/open.go

@@ -4,13 +4,14 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"gitea/price-is-wrong/src/lib/db"
+	"gitea/price-is-wrong/pkg/lib/db"
-	lobby "gitea/price-is-wrong/src/state/lobby/internal"
+	lobby "gitea/price-is-wrong/pkg/state/lobby/internal"
 )
 
 type Lobby struct {
 	id      int
 	Players []int
+	Closed  bool
 }
 
 func Open(ctx context.Context, name string) (*Lobby, error) {

pkg/state/priceiswrong/events.go

@@ -2,8 +2,8 @@ package priceiswrong
 
 import (
 	"context"
-	"gitea/price-is-wrong/src/lib/db"
+	"gitea/price-is-wrong/pkg/lib/db"
-	priceiswrong "gitea/price-is-wrong/src/state/priceiswrong/internal"
+	priceiswrong "gitea/price-is-wrong/pkg/state/priceiswrong/internal"
 	"html"
 	"math/rand"
 )

pkg/state/priceiswrong/internal/event.go

@@ -2,7 +2,7 @@ package priceiswrong
 
 import (
 	"fmt"
-	"gitea/price-is-wrong/src/lib/event"
+	"gitea/price-is-wrong/pkg/lib/event"
 )
 
 type Event interface{}

pkg/state/priceiswrong/open.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"gitea/price-is-wrong/src/lib/db"
+	"gitea/price-is-wrong/pkg/lib/db"
-	priceiswrong "gitea/price-is-wrong/src/state/priceiswrong/internal"
+	priceiswrong "gitea/price-is-wrong/pkg/state/priceiswrong/internal"
 )
 
 type PriceIsWrong struct {

pkg/state/priceiswrong/priceiswrong_test.go

@@ -1,8 +1,8 @@
 package priceiswrong_test
 
 import (
-	"gitea/price-is-wrong/src/lib"
+	"gitea/price-is-wrong/pkg/lib"
-	"gitea/price-is-wrong/src/state/priceiswrong"
+	"gitea/price-is-wrong/pkg/state/priceiswrong"
 	"testing"
 )