fix errors on insertion to game, fix db creation of game

2026-04-23 19:03:56 +03:00
parent f46ff8333e
commit 07025afefc
36 changed files with 1820 additions and 693 deletions
--- a/internal/foundry/temp_models/db/token.go
+++ b/internal/foundry/temp_models/db/token.go
@@ -1,5 +1,15 @@
 package db

+import (
+	"context"
+	"database/sql"
+	"errors"
+	"fmt"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
+)
+
 type Token struct {
 	ID uint

@@ -16,16 +26,76 @@ type Token struct {
 	Alpha            int
 	Width            float64
 	Height           float64
-	Ring             Ring
-	Sight            TokenSight
-	Texture          TokenTexture
+	Ring             *Ring
+	Sight            *TokenSight
+	Texture          *TokenTexture
 	Bar1             TokenBar
 	Bar2             TokenBar
-	Light            Light
+	Light            *Light
 	Occludable       TokenOccludable
 	TurnMarker       TokenTurnMarker
 }

+func (t *Token) Query(data *InsertId[string]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO token (%s, name, actor_link_ append_number, prepend_adjective, lock_rotation, random_img, display_name,
+			display_bars, disposition, rotation, alpha, width, height)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)
+		RETURNING id`, data.fieldName)
+}
+
+func (t *Token) InsertObjects(tx *sqlx.Tx) error {
+	group, ctx := errgroup.WithContext(context.Background())
+
+	relId := InsertId[uint]{id: t.ID, fieldName: "token_id"}
+	InsertWithCtxParallel(group, ctx, tx, t.Ring, relId)
+	InsertWithCtxParallel(group, ctx, tx, t.Sight, relId)
+	InsertWithCtxParallel(group, ctx, tx, t.Texture, relId)
+	InsertWithCtxParallel(group, ctx, tx, t.Bar1, InsertId[uint]{id: t.ID, fieldName: "token_id", tableName: "token_bar_1"})
+	InsertWithCtxParallel(group, ctx, tx, t.Bar1, InsertId[uint]{id: t.ID, fieldName: "token_id", tableName: "token_bar_2"})
+	InsertWithCtxParallel(group, ctx, tx, t.Light, relId)
+	InsertWithCtxParallel(group, ctx, tx, t.Occludable, relId)
+	InsertWithCtxParallel(group, ctx, tx, t.TurnMarker, relId)
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (t *Token) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, t.Name, t.ActorLink, t.AppendNumber, t.PrependAdjective, t.LockRotation, t.RandomImg,
+		t.DisplayName, t.DisplayBars, t.Disposition, t.Rotation, t.Alpha, t.Width, t.Height}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&t.ID)
+	if err != nil {
+		return err
+	}
+
+	return t.InsertObjects(tx)
+}
+
+func (t *Token) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, t.Name, t.ActorLink, t.AppendNumber, t.PrependAdjective, t.LockRotation, t.RandomImg,
+		t.DisplayName, t.DisplayBars, t.Disposition, t.Rotation, t.Alpha, t.Width, t.Height}
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&t.ID)
+	if err != nil {
+		return err
+	}
+
+	return t.InsertObjects(tx)
+}
+
 type TokenTexture struct {
 	ID uint

@@ -42,6 +112,43 @@ type TokenTexture struct {
 	AlphaThreshold float64
 }

+func (t *TokenTexture) Query(data *InsertId[uint]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO token_texture (%s, src, fit, tint, scale_x, scale_y, offset_x, offset_y, rotation, anchor_x, anchor_y, alpha_threshold)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
+		RETURNING id`, data.fieldName)
+}
+
+func (t *TokenTexture) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, t.Src, t.Fit, t.Tint, t.ScaleX, t.ScaleY, t.OffsetX, t.OffsetY, t.Rotation, t.AnchorX, t.AnchorY, t.AlphaThreshold}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&t.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (t *TokenTexture) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, t.Src, t.Fit, t.Tint, t.ScaleX, t.ScaleY, t.OffsetX, t.OffsetY, t.Rotation, t.AnchorX, t.AnchorY, t.AlphaThreshold}
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&t.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 type TokenSight struct {
 	ID uint

@@ -54,18 +161,129 @@ type TokenSight struct {
 	Enabled     bool
 }

+func (t *TokenSight) Query(data *InsertId[uint]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO token_sight (%s, color, vision_mode, range_, angle, attenuation, brightness, enabled)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
+		RETURNING id`, data.fieldName)
+}
+
+func (t *TokenSight) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, t.Color, t.VisionMode, t.Range, t.Angle, t.Attenuation, t.Brightness, t.Enabled}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&t.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (t *TokenSight) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, t.Color, t.VisionMode, t.Range, t.Angle, t.Attenuation, t.Brightness, t.Enabled}
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&t.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 type TokenBar struct {
 	ID uint

 	Attribute string
 }

+func (t TokenBar) Query(data *InsertId[uint]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO %s (%s, attribute)
+		VALUES ($1, $2)
+		RETURNING id`, data.tableName, data.fieldName)
+}
+
+func (t TokenBar) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, t.Attribute}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&t.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (t TokenBar) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, t.Attribute}
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&t.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 type TokenOccludable struct {
 	ID uint

 	Radius int
 }

+func (t TokenOccludable) Query(data *InsertId[uint]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO token_occludable (%s, radius)
+		VALUES ($1, $2)
+		RETURNING id`, data.fieldName)
+}
+
+func (t TokenOccludable) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, t.Radius}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&t.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (t TokenOccludable) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, t.Radius}
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&t.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 type TokenTurnMarker struct {
 	ID uint

@@ -74,3 +292,40 @@ type TokenTurnMarker struct {
 	Src         string
 	Disposition bool
 }
+
+func (t TokenTurnMarker) Query(data *InsertId[uint]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO token_turn_maker (%s, mode, animation, src, disposition)
+		VALUES ($1, $2, $3, $4, $5)
+		RETURNING id`, data.fieldName)
+}
+
+func (t TokenTurnMarker) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, t.Mode, t.Animation, t.Src, t.Disposition}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&t.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (t TokenTurnMarker) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, t.Mode, t.Animation, t.Src, t.Disposition}
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&t.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}