fix race condition on 43 msg creation/closure. Speed up game object insert to db (from 10-12s to 1-2s)

Makefile

@@ -1,7 +1,7 @@
 -include .env
 
 api/run:
-	go run ./cmd/api -foundry_pass=${FOUNDRY_PASS} -foundry_host=${FOUNDRY_HOST} -port=${LISTEN_PORT} -env=development -log_level=${LOG_LEVEL} -db-dsn=${DB_DSN}
+	go run ./cmd/api -foundry_pass=${FOUNDRY_PASS} -foundry_host=${FOUNDRY_HOST} -port=${LISTEN_PORT} -env=development -log_level=${LOG_LEVEL} -db-dsn=${DB_DSN} -foundry-worlds=${FOUNDRY_WORLDS} -world-user=${WORLD_USER} -world-pass=${WORLD_PASS}
 
 db/migration/new:
 	@echo 'Creating migration files for ${name}...'

cmd/api/handlers.go

@@ -1,37 +1,22 @@
 package main
 
 import (
-	"encoding/json"
+	"fmt"
 	"net/http"
-	"time"
 
-	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 )
 
 func (app *application) ShowText(w http.ResponseWriter, r *http.Request) {
-	data, err := app.foundryApp.Test()
+	dbConn := app.foundryApp.Transport.DB
+
+	world, err := db.GetWorld(dbConn, "kingmaker")
 	if err != nil {
-		app.slogger.Error("", "error", err)
+		w.Write([]byte("Got error"))
-		w.Write([]byte(err.Error()))
 		return
 	}
 
-	var dbGame db.Game
+	fmt.Fprintf(w, "Got world with name %s, core_version - %s, next_session - %v", world.ID, world.CoreVersion, world.NextSession)
-
-	start := time.Now()
-	data.ToDB(&dbGame)
-	elapsed := time.Since(start)
-
-	app.slogger.Info("Game data successfully parsed", "elapsedtime", elapsed)
-
-	byteData, err := json.Marshal(data)
-	if err != nil {
-		app.slogger.Error("", "error", err)
-		w.Write([]byte(err.Error()))
-		return
-	}
-
-	w.Write(byteData)
 }
 
 func (app *application) WhenNextSession(w http.ResponseWriter, r *http.Request) {

cmd/api/healthcheck.go

@@ -13,7 +13,6 @@ func (app *application) healthcheckHandler(w http.ResponseWriter, r *http.Reques
 			"status":       app.foundryApp.Status,
 			"is_available": app.foundryApp.IsAvailable,
 		},
-		"config": app.foundryApp.GetHTTP(),
 	}
 	err := app.writeJSON(w, http.StatusOK, env, nil)
 	if err != nil {

cmd/api/main.go

@@ -12,6 +12,7 @@ import (
 	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry"
 	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/requests"
 	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/transport"
+	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/types"
 
 	"github.com/jmoiron/sqlx"
 	_ "github.com/mattn/go-sqlite3"
@@ -73,7 +74,7 @@ func openDB(cfg config) (*sqlx.DB, error) {
 }
 
 // TODO: change default values
-func (app *application) parseFlags() *requests.FoundryHttpRequest {
+func (app *application) parseFlags() *transport.FoundryTransportData {
 	flag.StringVar(&app.cfg.port, "port", ":9090", "Service port")
 	flag.StringVar(&app.cfg.env, "env", "development", "Enivornment (development|staging|production)")
 
@@ -85,15 +86,29 @@ func (app *application) parseFlags() *requests.FoundryHttpRequest {
 	var mode string
 	flag.StringVar(&mode, "service_mode", "api", "Type of service mode(api|discord|tg)")
 
-	foundryHttpData := requests.FoundryHttpRequest{SessionID: nil}
+	var foundryTransportData transport.FoundryTransportData
-	flag.StringVar(&foundryHttpData.Host, "foundry_host", "127.0.0.1", "Address to connect to Foundry")
+	foundryTransportData.HttpConfig = &requests.FoundryHttpRequest{SessionID: nil}
-	flag.StringVar(&foundryHttpData.Password, "foundry_pass", "", "Password to connect to Foundry")
+	flag.StringVar(&foundryTransportData.HttpConfig.Host, "foundry_host", "127.0.0.1", "Address to connect to Foundry")
+	flag.StringVar(&foundryTransportData.HttpConfig.Password, "foundry_pass", "", "Password to connect to Foundry")
 
 	var logLevelStr string
 	flag.StringVar(&logLevelStr, "log_level", "info", "Password to connect to Foundry(debug|info|warn|error)")
 
+	var worlds string
+	flag.StringVar(&worlds, "foundry-worlds", "", "Worlds that initialize in db on startup (format: \"test\", \"test1,test2,test3\", \"test1,test2,test3\")")
+	var users string
+	flag.StringVar(&users, "world-user", "", "Usernames to authenticate the world (format: \"test\", \"test1,test2,test3\", \"testForAll\")")
+	var passwords string
+	flag.StringVar(&passwords, "world-pass", "", "Passwords to authenticate the world (format: \"test\", \"test1,test2,test3\", \"testForAll\")")
 	flag.Parse()
 
+	worldsData, err := types.CreateWorldDataSlice(worlds, users, passwords)
+	if err != nil {
+		app.slogger.Warn("Got err on parsing authentication world data", "err", err)
+		return nil
+	}
+	foundryTransportData.Worlds = worldsData
+
 	app.cfg.mode = service_mode(mode)
 
 	logLevel, ok := StringToLogLevel[logLevelStr]
@@ -105,20 +120,25 @@ func (app *application) parseFlags() *requests.FoundryHttpRequest {
 	if !ok {
 		app.slogger.Warn("Wrong log level. Started with log_level=info", "received", logLevelStr)
 	}
-	return &foundryHttpData
+	foundryTransportData.Logger = app.slogger
+	return &foundryTransportData
 }
 
 // TODO: Handle DB connection error
 func main() {
 	app := application{foundryApp: &foundry.FoundryApi{}}
 
-	foundryHttpData := app.parseFlags()
+	foundryTransportData := app.parseFlags()
+	if foundryTransportData == nil {
+		return
+	}
+
 	jar, err := cookiejar.New(nil)
 	if err != nil {
 		app.slogger.Error("Error", "text", err.Error())
 		return
 	}
-	foundryHttpData.Jar = jar
+	foundryTransportData.HttpConfig.Jar = jar
 
 	app.slogger.Info("", "dsn", app.cfg.db.dsn)
 
@@ -129,8 +149,15 @@ func main() {
 	}
 	defer db.Close()
 	app.slogger.Info("Database connection pool established")
+	foundryTransportData.DbConn = db
+
+	app.foundryApp.SetTransport(transport.NewFoundryTransport(foundryTransportData))
+	err = app.foundryApp.PrepareDB()
+	if err != nil {
+		app.slogger.Error("Error on preparing database", "err", err)
+		return
+	}
 
-	app.foundryApp.SetTransport(transport.NewFoundryTransport(db, app.slogger, foundryHttpData))
 	go app.foundryApp.StartListenFoundry()
 
 	app.serve()

db/migrations/000001_create_setup.down.sql

@@ -1,3 +1,5 @@
+DROP TRIGGER IF EXISTS tr_delete_package_warnings_to_data_package_warnings_data;
+DROP TRIGGER IF EXISTS tr_delete_pack_to_index_index;
 DROP TABLE IF EXISTS folder;
 DROP TABLE IF EXISTS pack;
 DROP TABLE IF EXISTS language;
@@ -7,6 +9,10 @@ DROP TABLE IF EXISTS author;
 DROP TABLE IF EXISTS es_modules;
 DROP TABLE IF EXISTS scripts;
 DROP TABLE IF EXISTS tags;
+DROP TABLE IF EXISTS relationships_systems;
+DROP TABLE IF EXISTS relationships_requires;
+DROP TABLE IF EXISTS relationships_recommends;
+DROP TABLE IF EXISTS relationships_conflicts;
 DROP TABLE IF EXISTS relationships;
 DROP TABLE IF EXISTS compatibility;
 DROP TABLE IF EXISTS world;
@@ -14,12 +20,14 @@ DROP TABLE IF EXISTS grid;
 DROP TABLE IF EXISTS system;
 DROP TABLE IF EXISTS package_warnings_data_error;
 DROP TABLE IF EXISTS package_warnings_data_warning;
+DROP TABLE IF EXISTS package_warnings_to_data;
 DROP TABLE IF EXISTS package_warnings_data;
 DROP TABLE IF EXISTS package_warnings;
 DROP TABLE IF EXISTS news;
 DROP TABLE IF EXISTS folder_packs;
 DROP TABLE IF EXISTS folder;
 DROP TABLE IF EXISTS pack_folder;
+DROP TABLE IF EXISTS pack_to_index;
 DROP TABLE IF EXISTS index_;
 DROP TABLE IF EXISTS ownership;
 DROP TABLE IF EXISTS relationships_data;

db/migrations/000001_create_setup.up.sql

@@ -171,9 +171,9 @@ CREATE TABLE IF NOT EXISTS relationships (
 );
 
 CREATE TABLE IF NOT EXISTS relationships_systems (
-    id TEXT PRIMARY KEY,
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
 
-    relationships_type VARCHAR(32) NOT NULL,
+    key_ TEXT NOT NULL,
     type TEXT NOT NULL,
     manifest TEXT NOT NULL,
 
@@ -182,9 +182,9 @@ CREATE TABLE IF NOT EXISTS relationships_systems (
 );
 
 CREATE TABLE IF NOT EXISTS relationships_requires (
-    id TEXT PRIMARY KEY,
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
 
-    relationships_type VARCHAR(32) NOT NULL,
+    key_ INTEGER NOT NULL,
     type TEXT NOT NULL,
     manifest TEXT NOT NULL,
 
@@ -193,9 +193,9 @@ CREATE TABLE IF NOT EXISTS relationships_requires (
 );
 
 CREATE TABLE IF NOT EXISTS relationships_recommends (
-    id TEXT PRIMARY KEY,
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
 
-    relationships_type VARCHAR(32) NOT NULL,
+    key_ INTEGER NOT NULL,
     type TEXT NOT NULL,
     manifest TEXT NOT NULL,
 
@@ -204,9 +204,9 @@ CREATE TABLE IF NOT EXISTS relationships_recommends (
 );
 
 CREATE TABLE IF NOT EXISTS relationships_conflicts (
-    id TEXT PRIMARY KEY,
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
 
-    relationships_type VARCHAR(32) NOT NULL,
+    key_ INTEGER NOT NULL,
     type TEXT NOT NULL,
     manifest TEXT NOT NULL,
 
@@ -222,17 +222,14 @@ CREATE TABLE IF NOT EXISTS compatibility (
     maximum VARCHAR(64) NOT NULL,
 
     module_id TEXT UNIQUE,
-    FOREIGN KEY (module_id) REFERENCES module(id) ON DELETE CASCADE,
+    FOREIGN KEY (module_id) REFERENCES module(id) ON DELETE CASCADE
-    relationships_systems_id TEXT UNIQUE,
-    FOREIGN KEY (relationships_systems_id) REFERENCES relationships_systems(id) ON DELETE CASCADE
-    relationships_requires_id TEXT UNIQUE,
-    FOREIGN KEY (relationships_requires_id) REFERENCES relationships_requires(id) ON DELETE CASCADE
-    relationships_recommends_id TEXT UNIQUE,
-    FOREIGN KEY (relationships_recommends_id) REFERENCES relationships_recommends(id) ON DELETE CASCADE
-    relationships_conflicts_id TEXT UNIQUE,
-    FOREIGN KEY (relationships_conflicts_id) REFERENCES relationships_conflicts(id) ON DELETE CASCADE
 );
 
+ALTER TABLE compatibility ADD COLUMN relationships_systems_id TEXT REFERENCES relationships_systems(id) ON DELETE CASCADE;
+ALTER TABLE compatibility ADD COLUMN relationships_requires_id TEXT REFERENCES relationships_requires(id) ON DELETE CASCADE;
+ALTER TABLE compatibility ADD COLUMN relationships_recommends_id TEXT REFERENCES relationships_recommends(id) ON DELETE CASCADE;
+ALTER TABLE compatibility ADD COLUMN relationships_conflicts_id TEXT REFERENCES relationships_conflicts(id) ON DELETE CASCADE;
+
 CREATE TABLE IF NOT EXISTS scripts (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
 
@@ -326,7 +323,7 @@ CREATE TABLE IF NOT EXISTS ownership (
     trusted VARCHAR(128) NOT NULL,
     assistant VARCHAR(128) NOT NULL,
 
-    pack_id TEXT UNIQUE,
+    pack_id TEXT,
     FOREIGN KEY (pack_id) REFERENCES pack(id) ON DELETE CASCADE
 );
 
@@ -336,12 +333,29 @@ CREATE TABLE IF NOT EXISTS index_ (
     folder VARCHAR(128) NOT NULL,
     img VARCHAR(128) NOT NULL,
     name VARCHAR(128) NOT NULL,
-    type VARCHAR(128) NOT NULL,
+    type VARCHAR(128) NOT NULL
+);
 
+CREATE TABLE IF NOT EXISTS pack_to_index (
     pack_id TEXT,
+    index_id TEXT,
+    
+    PRIMARY KEY (pack_id, index_id),
+    FOREIGN KEY (index_id) REFERENCES index_(id) ON DELETE CASCADE,
     FOREIGN KEY (pack_id) REFERENCES pack(id) ON DELETE CASCADE
 );
 
+CREATE INDEX idx_pack_to_index_index_id ON pack_to_index(index_id);
+
+CREATE TRIGGER tr_delete_pack_to_index_index
+AFTER DELETE ON pack_to_index
+FOR EACH ROW
+BEGIN
+    DELETE FROM index_ 
+    WHERE id = OLD.index_id 
+    AND NOT EXISTS (SELECT 1 FROM pack_to_index WHERE index_id = OLD.index_id);
+END;
+
 CREATE TABLE IF NOT EXISTS pack_folder (
     id TEXT PRIMARY KEY,
 
@@ -363,15 +377,16 @@ CREATE TABLE IF NOT EXISTS folder (
     color VARCHAR(128) NOT NULL,
 
     folder_id INTEGER,
-    FOREIGN KEY (folder_id) REFERENCES folder(id) ON DELETE CASCADE,
+    FOREIGN KEY (folder_id) REFERENCES folder(id) ON DELETE CASCADE
-    module_id TEXT,
-    FOREIGN KEY (module_id) REFERENCES module(id) ON DELETE CASCADE
 );
 
+ALTER TABLE folder ADD COLUMN module_id TEXT REFERENCES module(id) ON DELETE CASCADE;
+CREATE UNIQUE INDEX idx_folder_module_id ON folder(module_id);
+
 CREATE TABLE IF NOT EXISTS folder_packs (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
 
-    packs VARCHAR(128) NOT NULL,
+    value VARCHAR(128) NOT NULL,
 
     folder_id INTEGER,
     FOREIGN KEY (folder_id) REFERENCES folder(id) ON DELETE CASCADE
@@ -390,25 +405,42 @@ CREATE TABLE IF NOT EXISTS news (
 );
 
 CREATE TABLE IF NOT EXISTS package_warnings (
-    id TEXT PRIMARY KEY,
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
 
-    key_ VARCHAR(128) NOT NULL,
+    key_ TEXT NOT NULL,
 
     setup_id INTEGER,
     FOREIGN KEY (setup_id) REFERENCES setup(id) ON DELETE CASCADE
 );
 
+CREATE TABLE IF NOT EXISTS package_warnings_to_data (
+    package_warnings_id INTEGER,
+    package_warnings_data_id TEXT,
+    
+    PRIMARY KEY (package_warnings_id, package_warnings_data_id),
+    FOREIGN KEY (package_warnings_id) REFERENCES package_warnings(id) ON DELETE CASCADE,
+    FOREIGN KEY (package_warnings_data_id) REFERENCES package_warnings_data(id) ON DELETE CASCADE
+);
+
 CREATE TABLE IF NOT EXISTS package_warnings_data (
     id TEXT PRIMARY KEY,
 
     type VARCHAR(128) NOT NULL,
     manifest VARCHAR(128) NOT NULL,
-    reinstallable BOOLEAN NOT NULL,
+    reinstallable BOOLEAN NOT NULL
-
-    package_warnings_id TEXT,
-    FOREIGN KEY (package_warnings_id) REFERENCES package_warnings(id) ON DELETE CASCADE
 );
 
+CREATE INDEX idx_package_warnings_to_data_package_warnings_data_id ON package_warnings_to_data(package_warnings_data_id);
+
+CREATE TRIGGER tr_delete_package_warnings_to_data_package_warnings_data
+AFTER DELETE ON package_warnings_to_data
+FOR EACH ROW
+BEGIN
+    DELETE FROM package_warnings_data 
+    WHERE id = OLD.package_warnings_data_id 
+    AND NOT EXISTS (SELECT 1 FROM package_warnings_to_data WHERE package_warnings_data_id = OLD.package_warnings_data_id);
+END;
+
 CREATE TABLE IF NOT EXISTS package_warnings_data_warning (
     id INTEGER PRIMARY KEY,
 
@@ -454,9 +486,12 @@ CREATE TABLE IF NOT EXISTS system (
     FOREIGN KEY (setup_id) REFERENCES setup(id) ON DELETE CASCADE
 );
 
-ALTER TABLE compatibility ADD COLUMN system_id TEXT UNIQUE REFERENCES system(id);
+ALTER TABLE compatibility ADD COLUMN system_id TEXT REFERENCES system(id) ON DELETE CASCADE;
-ALTER TABLE relationships ADD COLUMN system_id TEXT UNIQUE REFERENCES system(id); 
+CREATE UNIQUE INDEX idx_compatibility_system_id ON compatibility(system_id);
-ALTER TABLE document_types ADD COLUMN system_id TEXT UNIQUE REFERENCES system(id);
+ALTER TABLE relationships ADD COLUMN system_id TEXT REFERENCES system(id) ON DELETE CASCADE; 
+CREATE UNIQUE INDEX idx_relationships_system_id ON relationships(system_id);
+ALTER TABLE document_types ADD COLUMN system_id TEXT REFERENCES system(id) ON DELETE CASCADE;
+CREATE UNIQUE INDEX idx_document_types_system_id ON document_types(system_id);
 
 CREATE TABLE IF NOT EXISTS grid (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -475,15 +510,15 @@ CREATE TABLE IF NOT EXISTS grid (
     FOREIGN KEY (system_id) REFERENCES system(id) ON DELETE CASCADE
 );
 
-ALTER TABLE es_modules ADD COLUMN system_id TEXT REFERENCES system(id);
+ALTER TABLE es_modules ADD COLUMN system_id TEXT REFERENCES system(id) ON DELETE CASCADE;
-ALTER TABLE scripts ADD COLUMN system_id TEXT REFERENCES system(id); 
+ALTER TABLE scripts ADD COLUMN system_id TEXT REFERENCES system(id) ON DELETE CASCADE; 
-ALTER TABLE tags ADD COLUMN system_id TEXT REFERENCES system(id);
+ALTER TABLE tags ADD COLUMN system_id TEXT REFERENCES system(id) ON DELETE CASCADE;
-ALTER TABLE author ADD COLUMN system_id TEXT REFERENCES system(id);
+ALTER TABLE author ADD COLUMN system_id TEXT REFERENCES system(id) ON DELETE CASCADE;
-ALTER TABLE media ADD COLUMN system_id TEXT REFERENCES system(id);
+ALTER TABLE media ADD COLUMN system_id TEXT REFERENCES system(id) ON DELETE CASCADE;
-ALTER TABLE pack ADD COLUMN system_id TEXT REFERENCES system(id);
+ALTER TABLE pack ADD COLUMN system_id TEXT REFERENCES system(id) ON DELETE CASCADE;
-ALTER TABLE style ADD COLUMN system_id TEXT REFERENCES system(id);
+ALTER TABLE style ADD COLUMN system_id TEXT REFERENCES system(id) ON DELETE CASCADE;
-ALTER TABLE language ADD COLUMN system_id TEXT REFERENCES system(id);
+ALTER TABLE language ADD COLUMN system_id TEXT REFERENCES system(id) ON DELETE CASCADE;
-ALTER TABLE folder ADD COLUMN system_id TEXT REFERENCES system(id);
+ALTER TABLE folder ADD COLUMN system_id TEXT REFERENCES system(id) ON DELETE CASCADE;
 
 CREATE TABLE IF NOT EXISTS world (
     id TEXT PRIMARY KEY,
@@ -508,19 +543,24 @@ CREATE TABLE IF NOT EXISTS world (
     owned BOOLEAN NOT NULL DEFAULT FALSE,
     has_storage BOOLEAN NOT NULL DEFAULT FALSE,
 
+    created_at TEXT DEFAULT (datetime('now')),
+    updated_at TEXT DEFAULT (datetime('now')),
+
     setup_id INTEGER,
     FOREIGN KEY (setup_id) REFERENCES setup(id) ON DELETE CASCADE
 );
 
-ALTER TABLE compatibility ADD COLUMN world_id TEXT UNIQUE REFERENCES world(id);
+ALTER TABLE compatibility ADD COLUMN world_id TEXT REFERENCES world(id) ON DELETE CASCADE;
-ALTER TABLE relationships ADD COLUMN world_id TEXT UNIQUE REFERENCES world(id);
+CREATE UNIQUE INDEX idx_compatibility_world_id ON compatibility(world_id);
+ALTER TABLE relationships ADD COLUMN world_id TEXT REFERENCES world(id) ON DELETE CASCADE;
+CREATE UNIQUE INDEX idx_relationships_world_id ON relationships(world_id);
 
-ALTER TABLE tags ADD COLUMN world_id TEXT REFERENCES world(id);
+ALTER TABLE tags ADD COLUMN world_id TEXT REFERENCES world(id) ON DELETE CASCADE;
-ALTER TABLE scripts ADD COLUMN world_id TEXT REFERENCES world(id);
+ALTER TABLE scripts ADD COLUMN world_id TEXT REFERENCES world(id) ON DELETE CASCADE;
-ALTER TABLE es_modules ADD COLUMN world_id TEXT REFERENCES world(id);
+ALTER TABLE es_modules ADD COLUMN world_id TEXT REFERENCES world(id) ON DELETE CASCADE;
-ALTER TABLE author ADD COLUMN world_id TEXT REFERENCES world(id);
+ALTER TABLE author ADD COLUMN world_id TEXT REFERENCES world(id) ON DELETE CASCADE;
-ALTER TABLE media ADD COLUMN world_id TEXT REFERENCES world(id);
+ALTER TABLE media ADD COLUMN world_id TEXT REFERENCES world(id) ON DELETE CASCADE;
-ALTER TABLE style ADD COLUMN world_id TEXT REFERENCES world(id);
+ALTER TABLE style ADD COLUMN world_id TEXT REFERENCES world(id) ON DELETE CASCADE;
-ALTER TABLE language ADD COLUMN world_id TEXT REFERENCES world(id);
+ALTER TABLE language ADD COLUMN world_id TEXT REFERENCES world(id) ON DELETE CASCADE;
-ALTER TABLE pack ADD COLUMN world_id TEXT REFERENCES world(id);
+ALTER TABLE pack ADD COLUMN world_id TEXT REFERENCES world(id) ON DELETE CASCADE;
-ALTER TABLE folder ADD COLUMN world_id TEXT REFERENCES world(id);
+ALTER TABLE folder ADD COLUMN world_id TEXT REFERENCES world(id) ON DELETE CASCADE;

db/migrations/000002_create_game.down.sql

@@ -1,3 +1,203 @@
-DROP TABLE IF EXISTS modules_languages;
+DROP TRIGGER IF EXISTS tr_delete_package_warnings_to_data_package_warnings_data;
-DROP TABLE IF EXISTS modules_compatibility;
+DROP TRIGGER IF EXISTS tr_delete_game_to_systems_system;
-DROP TABLE IF EXISTS modules;
+DROP TRIGGER IF EXISTS tr_delete_game_to_pack_pack; 
+DROP TRIGGER IF EXISTS tr_delete_game_to_module_module; 
+DROP TRIGGER IF EXISTS tr_delete_pack_to_index_index;
+DROP TABLE IF EXISTS token_turn_maker;
+DROP TABLE IF EXISTS token_occludable;
+DROP TABLE IF EXISTS token_light_darkness;
+DROP TABLE IF EXISTS token_light_animation;
+DROP TABLE IF EXISTS token_light;
+DROP TABLE IF EXISTS token_bar_2;
+DROP TABLE IF EXISTS token_bar_1;
+DROP TABLE IF EXISTS token_texture;
+DROP TABLE IF EXISTS token_sight;
+DROP TABLE IF EXISTS ring_subject;
+DROP TABLE IF EXISTS ring_colors;
+DROP TABLE IF EXISTS ring;
+DROP TABLE IF EXISTS token;
+DROP TABLE IF EXISTS actor;
+DROP TABLE IF EXISTS sound;
+DROP TABLE IF EXISTS playlist;
+DROP TABLE IF EXISTS table_result_range;
+DROP TABLE IF EXISTS table_result;
+DROP TABLE IF EXISTS table_;
+DROP TABLE IF EXISTS journal_page_video;
+DROP TABLE IF EXISTS journal_page_title;
+DROP TABLE IF EXISTS journal_page_text;
+DROP TABLE IF EXISTS journal_page;
+DROP TABLE IF EXISTS journal;
+DROP TABLE IF EXISTS setting;
+DROP TABLE IF EXISTS item;
+DROP TABLE IF EXISTS world_folder;
+DROP TABLE IF EXISTS macro;
+DROP TABLE IF EXISTS hotbar;
+DROP TABLE IF EXISTS user;
+DROP TABLE IF EXISTS face;
+DROP TABLE IF EXISTS back;
+DROP TABLE IF EXISTS card;
+DROP TABLE IF EXISTS ownership_string;
+DROP TABLE IF EXISTS card_deck;
+DROP TABLE IF EXISTS combatant;
+DROP TABLE IF EXISTS combat_groups;
+DROP TABLE IF EXISTS combat;
+DROP TABLE IF EXISTS message_rolls;
+DROP TABLE IF EXISTS message_whisper;
+DROP TABLE IF EXISTS speaker;
+DROP TABLE IF EXISTS stats;
+DROP TABLE IF EXISTS message;
+
+CREATE TABLE IF NOT EXISTS pack_new (
+    id VARCHAR(128) PRIMARY KEY,
+
+    name VARCHAR(128) NOT NULL,
+    label VARCHAR(128) NOT NULL,
+    banner VARCHAR(128) NOT NULL,
+    path VARCHAR(128) NOT NULL,
+    type VARCHAR(128) NOT NULL,
+    system VARCHAR(128) NOT NULL,
+    package_type VARCHAR(128) NOT NULL,
+    package_name VARCHAR(128) NOT NULL,
+
+    module_id TEXT,
+    FOREIGN KEY (module_id) REFERENCES module(id) ON DELETE CASCADE
+);
+ALTER TABLE pack_new ADD COLUMN system_id TEXT REFERENCES system(id) ON DELETE CASCADE;
+ALTER TABLE pack_new ADD COLUMN world_id TEXT REFERENCES world(id) ON DELETE CASCADE;
+INSERT INTO pack_new (id, name, label, banner, path, type, system, package_type, package_name, module_id, system_id, world_id)
+SELECT id, name, label, banner, path, type, system, package_type, package_name, module_id, system_id, world_id FROM pack;
+DROP TABLE IF EXISTS pack;
+ALTER TABLE pack_new RENAME TO pack;
+
+CREATE TABLE IF NOT EXISTS package_warnings_new (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+
+    key_ TEXT NOT NULL,
+
+    setup_id INTEGER,
+    FOREIGN KEY (setup_id) REFERENCES setup(id) ON DELETE CASCADE
+);
+INSERT INTO package_warnings_new (id, key_, setup_id)
+SELECT id, key_, setup_id FROM package_warnings;
+DROP TABLE IF EXISTS package_warnings;
+ALTER TABLE package_warnings_new RENAME TO package_warnings;
+
+DROP TABLE IF EXISTS game_to_pack;
+DROP TABLE IF EXISTS game_to_module;
+DROP TABLE IF EXISTS active_users;
+DROP TABLE IF EXISTS system_update;
+DROP INDEX IF EXISTS idx_core_update_game_id;
+
+CREATE TABLE IF NOT EXISTS core_update_new (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+
+    has_update BOOLEAN NOT NULL DEFAULT FALSE,
+    can_update BOOLEAN NOT NULL DEFAULT FALSE,
+    could_reach_website BOOLEAN NOT NULL DEFAULT FALSE,
+    slow_response BOOLEAN NOT NULL DEFAULT FALSE,
+    will_disable_modules BOOLEAN NOT NULL DEFAULT FALSE,
+    version VARCHAR(64) NOT NULL,
+    channel VARCHAR(64) NOT NULL,
+
+    setup_id INTEGER UNIQUE,
+    FOREIGN KEY (setup_id) REFERENCES setup(id) ON DELETE CASCADE
+);
+INSERT INTO core_update_new (id, has_update, can_update, could_reach_website, slow_response, will_disable_modules, version, channel, setup_id)
+SELECT id, has_update, can_update, could_reach_website, slow_response, will_disable_modules, version, channel, setup_id FROM core_update;
+DROP TABLE IF EXISTS core_update;
+ALTER TABLE core_update_new RENAME TO core_update;
+
+DROP TABLE IF EXISTS game_to_systems;
+DROP INDEX IF EXISTS idx_world_game_id;
+
+CREATE TABLE IF NOT EXISTS world_new (
+    id TEXT PRIMARY KEY,
+    
+    title VARCHAR(128) NOT NULL,
+    description VARCHAR(128) NOT NULL,
+    version VARCHAR(128) NOT NULL,
+    system VARCHAR(128) NOT NULL,
+    background VARCHAR(128) NOT NULL,
+    join_theme VARCHAR(128) NOT NULL,
+    core_version VARCHAR(128) NOT NULL,
+    system_version VARCHAR(128) NOT NULL,
+    last_played VARCHAR(128) NOT NULL,
+    playtime INTEGER NOT NULL,
+    availability INTEGER NOT NULL,
+    next_session DATETIME NOT NULL,
+    socket BOOLEAN NOT NULL DEFAULT FALSE,
+    protected BOOLEAN NOT NULL DEFAULT FALSE,
+    exclusive_ BOOLEAN NOT NULL DEFAULT FALSE,
+    persistent_storage BOOLEAN NOT NULL DEFAULT FALSE,
+    locked BOOLEAN NOT NULL DEFAULT FALSE,
+    owned BOOLEAN NOT NULL DEFAULT FALSE,
+    has_storage BOOLEAN NOT NULL DEFAULT FALSE,
+
+    created_at TEXT DEFAULT (datetime('now')),
+    updated_at TEXT DEFAULT (datetime('now')),
+
+    setup_id INTEGER,
+    FOREIGN KEY (setup_id) REFERENCES setup(id) ON DELETE CASCADE
+);
+INSERT INTO world_new (id, title, description, version, system, background, join_theme, core_version, system_version, last_played, playtime, availability, next_session, socket, protected, exclusive_, persistent_storage, locked, owned, has_storage, created_at, updated_at, setup_id)
+SELECT id, title, description, version, system, background, join_theme, core_version, system_version, last_played, playtime, availability, next_session, socket, protected, exclusive_, persistent_storage, locked, owned, has_storage, created_at, updated_at, setup_id FROM world;
+DROP TABLE IF EXISTS world;
+ALTER TABLE world_new RENAME TO world;
+
+DROP INDEX IF EXISTS idx_release_game_id;
+
+CREATE TABLE IF NOT EXISTS release_new (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+
+    generation INTEGER NOT NULL,
+    build INTEGER NOT NULL,
+    node_version INTEGER NOT NULL,
+    max_generation INTEGER NOT NULL,
+    max_stable_generation INTEGER NOT NULL,
+    time DATETIME NOT NULL,
+    channel VARCHAR(128) NOT NULL,
+    suffix VARCHAR(128) NOT NULL,
+
+    setup_id INTEGER UNIQUE,
+    FOREIGN KEY (setup_id) REFERENCES setup(id) ON DELETE CASCADE
+);
+INSERT INTO release_new (id, generation, build, node_version, max_generation, max_stable_generation, time, channel, suffix, setup_id)
+SELECT id, generation, build, node_version, max_generation, max_stable_generation, time, channel, suffix, setup_id FROM release_;
+DROP TABLE IF EXISTS release_;
+ALTER TABLE release_new RENAME TO release_;
+
+DROP TABLE IF EXISTS game_options;
+DROP INDEX IF EXISTS idx_files_game_id;
+
+DROP TABLE IF EXISTS files_new;
+CREATE TABLE IF NOT EXISTS files_new (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+
+    setup_id INTEGER UNIQUE,
+    FOREIGN KEY (setup_id) REFERENCES setup(id) ON DELETE CASCADE
+);
+INSERT INTO files_new (id, setup_id)
+SELECT id, setup_id FROM files;
+DROP TABLE IF EXISTS files;
+ALTER TABLE files_new RENAME TO files;
+
+DROP TABLE IF EXISTS addresses;
+DROP TABLE IF EXISTS game;
+
+CREATE TRIGGER tr_delete_package_warnings_to_data_package_warnings_data
+AFTER DELETE ON package_warnings_to_data
+FOR EACH ROW
+BEGIN
+    DELETE FROM package_warnings_data 
+    WHERE id = OLD.package_warnings_data_id 
+    AND NOT EXISTS (SELECT 1 FROM package_warnings_to_data WHERE package_warnings_data_id = OLD.package_warnings_data_id);
+END;
+
+CREATE TRIGGER tr_delete_pack_to_index_index
+AFTER DELETE ON pack_to_index
+FOR EACH ROW
+BEGIN
+    DELETE FROM index_ 
+    WHERE id = OLD.index_id 
+    AND NOT EXISTS (SELECT 1 FROM pack_to_index WHERE index_id = OLD.index_id);
+END;

internal/foundry/actions/errors.go

@@ -3,7 +3,8 @@ package actions
 import "errors"
 
 var (
-	ErrActionNotFound  = errors.New("Action doesn't found")
+	ErrActionNotFound      = errors.New("Action doesn't found")
-	ErrObjTypeNotMatch = errors.New("Provided value type didn't match obj field type")
+	ErrObjTypeNotMatch     = errors.New("Provided value type didn't match obj field type")
-	ErrObjNotPointer   = errors.New("Passed obj is not pointer")
+	ErrObjNotPointer       = errors.New("Passed obj is not pointer")
+	ErrUserChannelIsClosed = errors.New("User channel is closed")
 )

internal/foundry/actions/session.go

@@ -1,6 +1,8 @@
 package actions
 
 import (
+	"time"
+
 	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/transport"
 	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/types"
 )
@@ -12,19 +14,7 @@ type WsSessionMsg struct {
 
 func (msg WsSessionMsg) Action(tr *transport.FoundryTransport, status *types.FoundryStatus) error {
 	if status.IsActive {
-		tr.Logger.Info("Session msg", "userid", msg.UserId)
+		return msg.OnActiveWorld(tr)
-		if msg.UserId == "" {
-			err := tr.LogInToWorld()
-			if err != nil {
-				return err
-			}
-			tr.Logger.Info("World is started. Succesfully logged into world")
-			close(tr.ReadChan.Reconnect())
-			return nil
-		}
-		// tr.Logger.Warn("World is started. Please, return to setup page to fully initialize database")
-		// go msg.OnActiveWorld(tr)
-		return nil
 	}
 
 	if tr.IsDbInit {
@@ -32,18 +22,44 @@ func (msg WsSessionMsg) Action(tr *transport.FoundryTransport, status *types.Fou
 	}
 	tr.IsDbInit = true
 
-	go tr.FillDBWithFoundryData()
+	return tr.FillDBWithFoundryData()
-	return nil
 }
 
 func (msg WsSessionMsg) OnActiveWorld(tr *transport.FoundryTransport) error {
-	wsMsg := types.NewWsMessage("world", tr.CurrWsId)
+	tr.Logger.Info("Session msg", "userid", msg.UserId)
-	tr.CurrWsId++
+	if msg.UserId != "" {
+		return msg.HandleLoggedInUser(tr)
+	}
 
-	answer, err := tr.HandleWebsocketRequest(wsMsg)
+	userId, userPass, err := tr.GetUserIdAndPass()
 	if err != nil {
 		return err
 	}
-	tr.Logger.Info("World data", "answer", string(answer))
+
+	err = tr.LogInToWorld(userId, userPass)
+	if err != nil {
+		return err
+	}
+
+	tr.Logger.Info("World is started. Succesfully logged into world")
+	close(tr.ReadChan.Reconnect())
+	return nil
+}
+
+func (msg WsSessionMsg) HandleLoggedInUser(tr *transport.FoundryTransport) error {
+	if tr.LoggedInChan == nil {
+		tr.Logger.Info("World had been started before application was started. Run insertion of world data")
+		return tr.InsertGameToDB()
+	}
+
+	select {
+	case <-tr.LoggedInChan:
+		return ErrUserChannelIsClosed
+	default:
+		tr.LoggedInChan <- true
+	}
+
+	time.Sleep(3 * time.Second)
+	types.CloseChannel(tr.LoggedInChan)
 	return nil
 }

internal/foundry/actions/shutdown.go

@@ -25,6 +25,5 @@ func (msg WsShutdownMsg) Action(tr *transport.FoundryTransport, status *types.Fo
 	}
 	tr.IsDbInit = true
 
-	go tr.FillDBWithFoundryData()
+	return tr.FillDBWithFoundryData()
-	return nil
 }

internal/foundry/foundry.go

@@ -8,10 +8,11 @@ import (
 	"time"
 
 	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/actions"
-	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/requests"
+	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
-	json_models "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/json"
+	json_models "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/json"
 	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/transport"
 	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/types"
+	"golang.org/x/sync/errgroup"
 )
 
 var (
@@ -24,7 +25,7 @@ var (
 
 type FoundryApi struct {
 	//TODO: make check of admin's authentication
-	transport   *transport.FoundryTransport
+	Transport   *transport.FoundryTransport
 	IsAvailable bool
 
 	// Logger *slog.Logger
@@ -37,16 +38,16 @@ func NewFoundry() *FoundryApi {
 }
 
 func (foundry *FoundryApi) SetTransport(tr *transport.FoundryTransport) {
-	foundry.transport = tr
+	foundry.Transport = tr
 }
 
 func (foundry *FoundryApi) ListenAndServeWS() error {
 	var err error
 
-	foundry.transport.ReadChan = *types.InitWsChannels()
+	foundry.Transport.ReadChan = *types.InitWsChannels()
-	defer foundry.transport.ReadChan.Close()
+	defer foundry.Transport.ReadChan.Close()
 
-	foundry.background(foundry.transport.ListenWebSocket)
+	foundry.background(foundry.Transport.ListenWebSocket)
 
 	err = foundry.ServeWebSocket()
 	if err != nil {
@@ -57,21 +58,21 @@ func (foundry *FoundryApi) ListenAndServeWS() error {
 
 func (foundry *FoundryApi) ServeWebSocket() error {
 	var err error
-	wsChannels := &foundry.transport.ReadChan
+	wsChannels := &foundry.Transport.ReadChan
 
 	for {
 		select {
 		case message, ok := <-wsChannels.Msg():
 			if !ok {
-				foundry.transport.Logger.Debug("Read channel is closed", "type", types.WebSocketCode)
+				foundry.Transport.Logger.Debug("Read channel is closed", "type", types.WebSocketCode)
-				foundry.transport.Http.SessionID = nil
+				foundry.Transport.Http.SessionID = nil
 				return ChannelIsClosed
 			}
-			foundry.transport.Logger.Debug("Data has been received\n", "msg", message.Code, "type", types.WebSocketCode) //, "msg", message.MsgJson)
+			foundry.Transport.Logger.Debug("Data has been received\n", "msg", message.Code, "type", types.WebSocketCode) //, "msg", message.MsgJson)
 
 			switch message.Code {
 			case types.RespPingCode, types.RespSessionDataCode:
-				err := foundry.transport.SendOnlyCodeRequest(message.Code)
+				err := foundry.Transport.SendOnlyCodeRequest(message.Code)
 				if err != nil {
 					wsChannels.Err() <- &types.FoundryError{Direction: types.WriterCode, Err: err, Type: types.WebSocketCode}
 					continue
@@ -84,69 +85,78 @@ func (foundry *FoundryApi) ServeWebSocket() error {
 					continue
 				}
 
-				foundry.transport.Logger.Debug("RespServerChangeCode", "data", data)
+				foundry.Transport.Logger.Debug("RespServerChangeCode", "data", data)
 				if data == nil {
 					continue
 				}
 
-				err = data.Action(foundry.transport, &foundry.Status)
+				go func() {
-				if err != nil {
+					errAction := data.Action(foundry.Transport, &foundry.Status)
-					wsChannels.Err() <- &types.FoundryError{Direction: types.ReaderCode, Err: err, Type: types.WebSocketCode}
+
-					continue
+					if errAction != nil {
-				}
+						wsChannels.Err() <- &types.FoundryError{Direction: types.ReaderCode, Err: errAction, Type: types.WebSocketCode}
+					}
+				}()
 			case types.RespDataCode:
-				foundry.transport.ExchangeChan.Msgs[message.Id] = make(chan []byte, 1)
+				tr := foundry.Transport
-				foundry.transport.ExchangeChan.Msgs[message.Id] <- []byte(message.MsgJson)
+				func() {
-				go foundry.transport.CloseMsgChannel(message.Id, 5*time.Second)
+					tr.ChanMutex.Lock()
+					defer tr.ChanMutex.Unlock()
+
+					tr.ExchangeChan.Msgs[message.Id] = make(chan []byte, 1)
+					tr.ExchangeChan.Msgs[message.Id] <- []byte(message.MsgJson)
+					go tr.CloseMsgChannel(tr.ExchangeChan.Msgs[message.Id], message.Id, 5*time.Second)
+
+				}()
 			default:
 			}
 		case err = <-wsChannels.Err():
 			var foundryErr *types.FoundryError
 			if errors.As(err, &foundryErr) {
 				if foundryErr.IsFatal {
-					foundry.transport.CloseWebSocketConn()
+					foundry.Transport.CloseWebSocketConn()
-					foundry.transport.Http.SessionID = nil
+					foundry.Transport.Http.SessionID = nil
 					return foundryErr
 				}
-				foundry.transport.Logger.Warn("Got error when listening or served", "err", err.Error(), "type", foundryErr.Type, "direction", foundryErr.Direction)
+				foundry.Transport.Logger.Warn("Got error when listening or served", "err", err.Error(), "type", foundryErr.Type, "direction", foundryErr.Direction)
 			}
 		case <-wsChannels.Done():
-			foundry.transport.CloseWebSocketConn()
+			foundry.Transport.CloseWebSocketConn()
-			foundry.transport.Http.SessionID = nil
+			foundry.Transport.Http.SessionID = nil
 			return ListenIsDone
 		case <-wsChannels.Reconnect():
-			foundry.transport.CloseWebSocketConn()
+			foundry.Transport.CloseWebSocketConn()
 			return ReconnectToWebSocket
 		}
 	}
 }
 
 func (foundry *FoundryApi) HandleWSRequest(msgType string) ([]byte, error) {
-	msg := types.NewWsMessageByPage(msgType, foundry.transport.CurrWsId)
+	msg := types.NewWsMessageByPage(msgType, foundry.Transport.CurrWsId)
 
-	return foundry.transport.HandleWebsocketRequest(msg)
+	return foundry.Transport.HandleWebsocketRequest(msg)
 }
 
 func (foundry *FoundryApi) Shutdown() error {
 	ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
 	defer cancel()
 
-	foundry.transport.Logger.Info("Completing foundry background tasks")
+	foundry.Transport.Logger.Info("Completing foundry background tasks")
 
 	foundryClosed := make(chan struct{})
 	go func() {
-		types.CloseChannel(foundry.transport.ReadChan.Done())
+		types.CloseChannel(foundry.Transport.ReadChan.Done())
 
 		foundry.wg.Wait()
-		foundry.transport.ExchangeChan.Close()
+		foundry.Transport.ExchangeChan.Close()
-		foundry.transport.ReadChan.Close()
+		foundry.Transport.ReadChan.Close()
 
 		types.CloseChannel(foundryClosed)
 	}()
 
 	select {
 	case <-foundryClosed:
-		foundry.transport.Logger.Info("Stopped foundry server")
+		foundry.Transport.Logger.Info("Stopped foundry server")
 	case <-ctx.Done():
 		return CloseTimeoutExceed
 	}
@@ -156,24 +166,24 @@ func (foundry *FoundryApi) Shutdown() error {
 
 func (foundry *FoundryApi) ConnectToWebSocket() (bool, error) {
 	var err error
-	if !foundry.transport.HasSessionId() {
+	if !foundry.Transport.HasSessionId() {
-		err = foundry.transport.InitSessionId()
+		err = foundry.Transport.InitSessionId()
 		if err != nil {
 			return false, err
 		}
 
-		err = foundry.transport.ConnectToFoundry()
+		err = foundry.Transport.ConnectToFoundry()
 		if err != nil {
 			return false, err
 		}
 	}
 
-	err = foundry.transport.InitWebSocketConnection()
+	err = foundry.Transport.InitWebSocketConnection()
 	if err != nil {
 		return false, err
 	}
 
-	status, err := foundry.transport.Http.GetStatus()
+	status, err := foundry.Transport.Http.GetStatus()
 	if err != nil {
 		return false, err
 	}
@@ -195,21 +205,21 @@ func (foundry *FoundryApi) StartListenFoundry() {
 			ok, err := foundry.ConnectToWebSocket()
 			if err != nil {
 				if errors.Is(err, ReconnectToWebSocket) {
-					if foundry.transport.ReconnectNum >= foundry.transport.ReconnectNumMax {
+					if foundry.Transport.ReconnectNum >= foundry.Transport.ReconnectNumMax {
 						return
 					}
-					time.Sleep(foundry.transport.ReconnectTimeout)
+					time.Sleep(foundry.Transport.ReconnectTimeout)
-					foundry.transport.ReconnectNum++
+					foundry.Transport.ReconnectNum++
-					foundry.transport.Logger.Info("Reconnecting to WebSocket", "times", foundry.transport.ReconnectNum)
+					foundry.Transport.Logger.Info("Reconnecting to WebSocket", "times", foundry.Transport.ReconnectNum)
 					continue
 				}
 
-				foundry.transport.Logger.Error("Error raised", "err", err.Error())
+				foundry.Transport.Logger.Error("Error raised", "err", err.Error())
 
 				if ok {
 					timeInterval = 1 * time.Second
 				}
-				foundry.transport.Logger.Info("Trying to reconnect", "timer", timeInterval.String())
+				foundry.Transport.Logger.Info("Trying to reconnect", "timer", timeInterval.String())
 
 				time.Sleep(timeInterval)
 				timeInterval = min(timeInterval*2, 15*time.Second)
@@ -220,11 +230,28 @@ func (foundry *FoundryApi) StartListenFoundry() {
 	})
 }
 
-func (foundry *FoundryApi) Test() (*json_models.Game, error) {
+func (foundry *FoundryApi) PrepareDB() error {
-	wsMsg := types.NewWsMessage("world", foundry.transport.CurrWsId)
+	dbConn := foundry.Transport.DB
-	foundry.transport.CurrWsId++
 
-	answer, err := foundry.transport.HandleWebsocketRequest(wsMsg)
+	group, _ := errgroup.WithContext(context.Background())
+
+	group.Go(func() error { return db.DeleteSetupAll(dbConn) })
+	group.Go(func() error { return db.DeleteGameAll(dbConn) })
+	group.Go(func() error { return db.DeleteSeqAll(dbConn) })
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, db.ErrorRecordNotFound) {
+		return err
+	}
+
+	return nil
+}
+
+func (foundry *FoundryApi) Test() (*json_models.Game, error) {
+	wsMsg := types.NewWsMessage("world", foundry.Transport.CurrWsId)
+	foundry.Transport.CurrWsId++
+
+	answer, err := foundry.Transport.HandleWebsocketRequest(wsMsg)
 	if err != nil {
 		return nil, err
 	}
@@ -238,11 +265,6 @@ func (foundry *FoundryApi) Test() (*json_models.Game, error) {
 	}
 	elapsed := time.Since(start)
 
-	foundry.transport.Logger.Info("World data successfully received and parsed", "parseTime", elapsed)
+	foundry.Transport.Logger.Info("World data successfully received and parsed", "parseTime", elapsed)
 	return &game[0], nil
 }
-
-// TODO: remove
-func (foundry *FoundryApi) GetHTTP() *requests.FoundryHttpRequest {
-	return foundry.transport.Http
-}

internal/foundry/helpers.go

@@ -9,7 +9,7 @@ func (f *FoundryApi) background(fn func()) {
 
 		defer func() {
 			if err := recover(); err != nil {
-				f.transport.Logger.Error(fmt.Sprintf("%s", err))
+				f.Transport.Logger.Error(fmt.Sprintf("%s", err))
 			}
 		}()
 

internal/foundry/models/db/actor.go

@@ -0,0 +1,92 @@
+package db
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
+)
+
+type Actor struct {
+	ID string
+
+	Img            string
+	Name           string
+	Type           string
+	Folder         string
+	Sort           int
+	PrototypeToken *Token
+	Stats          Stats
+	Items          []*Item
+	Ownership      []OwnershipString
+}
+
+func (a *Actor) Query(data *InsertId[uint]) {
+	data.query = `
+		INSERT INTO actor (game_id, id, img, name, type, folder, sort)
+		VALUES ($1, $2, $3, $4, $5, $6, $7)
+		ON CONFLICT(id) DO UPDATE SET
+			game_id = EXCLUDED.game_id,
+			updated_at = datetime('now')
+		RETURNING (created_at == updated_at) AS is_inserted`
+}
+
+func (a *Actor) InsertObjects(tx *sqlx.Tx) error {
+	group, _ := errgroup.WithContext(context.Background())
+
+	relId := InsertId[string]{id: a.ID, fieldName: "actor_id"}
+	InsertWithCtxParallel(group, tx, a.PrototypeToken, relId)
+	InsertWithCtxParallel(group, tx, a.Stats, relId)
+	InsertSliceParallel(group, tx, a.Ownership, relId)
+	InsertSliceParallel(group, tx, a.Items, relId)
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (a *Actor) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, a.ID, a.Img, a.Name, a.Type, a.Folder, a.Sort}
+
+	var isInserted bool
+	err := tx.QueryRowx(data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return a.InsertObjects(tx)
+	}
+	return nil
+}
+
+func (a *Actor) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, a.ID, a.Img, a.Name, a.Type, a.Folder, a.Sort}
+
+	mutex := GetMutex("actor_insert")
+	mutex.Lock()
+	defer mutex.Unlock()
+
+	var isInserted bool
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return a.InsertObjects(tx)
+	}
+	return nil
+}

internal/foundry/models/db/addresses.go

@@ -0,0 +1,52 @@
+package db
+
+import (
+	"context"
+
+	"github.com/jmoiron/sqlx"
+)
+
+type Addresses struct {
+	ID uint
+
+	Local              string
+	Remote             string
+	RemoteIsAccessible bool
+}
+
+func (a *Addresses) Query(data *InsertId[uint]) {
+	data.query = `
+		INSERT INTO addresses (game_id, local, remote, remote_is_accessible)
+		VALUES ($1, $2, $3, $4)
+		RETURNING id`
+}
+
+func (a *Addresses) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, a.Local, a.Remote, a.RemoteIsAccessible}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&a.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (a *Addresses) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, a.Local, a.Remote, a.RemoteIsAccessible}
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&a.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

internal/foundry/models/db/authors.go

@@ -31,7 +31,7 @@ func (a *Author) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
 
 	args := []any{data.id, a.Name, a.URL, a.Email, a.Discord}
 
-	err := tx.QueryRow(data.query, args...).Scan(&a.ID)
+	err := tx.QueryRowx(data.query, args...).Scan(&a.ID)
 	if err != nil {
 		return err
 	}
@@ -46,7 +46,11 @@ func (a *Author) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[stri
 
 	args := []any{data.id, a.Name, a.URL, a.Email, a.Discord}
 
-	err := tx.QueryRowContext(ctx, data.query, args...).Scan(&a.ID)
+	mutex := GetMutex("author_insert")
+	mutex.Lock()
+	defer mutex.Unlock()
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&a.ID)
 	if err != nil {
 		return err
 	}

internal/foundry/models/db/card.go

@@ -0,0 +1,263 @@
+package db
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
+)
+
+type CardDeck struct {
+	ID string
+
+	Name         string
+	Type         string
+	Description  string
+	Img          string
+	Folder       string
+	Width        int
+	Height       int
+	Rotation     int
+	Sort         int
+	DisplayCount bool
+	Stats        Stats
+	Ownership    []OwnershipString
+	Cards        []*Card
+}
+
+func (c *CardDeck) Query(data *InsertId[uint]) {
+	data.query = `
+		INSERT INTO card_deck (game_id, id, name, type, description, img, folder, width, height, rotation, sort, display_count)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
+		ON CONFLICT(id) DO UPDATE SET
+			game_id = EXCLUDED.game_id,
+			updated_at = datetime('now')
+		RETURNING (created_at == updated_at) AS is_inserted`
+}
+
+func (c *CardDeck) InsertObjects(tx *sqlx.Tx) error {
+	group, _ := errgroup.WithContext(context.Background())
+
+	relId := InsertId[string]{id: c.ID, fieldName: "card_deck_id"}
+	InsertWithCtxParallel(group, tx, c.Stats, relId)
+	InsertSliceParallel(group, tx, c.Ownership, relId)
+	InsertSliceParallel(group, tx, c.Cards, relId)
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (c *CardDeck) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, c.ID, c.Name, c.Type, c.Description, c.Img, c.Folder, c.Width, c.Height, c.Rotation, c.Sort, c.DisplayCount}
+
+	var isInserted bool
+	err := tx.QueryRowx(data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return c.InsertObjects(tx)
+	}
+	return nil
+}
+
+func (c *CardDeck) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, c.ID, c.Name, c.Type, c.Description, c.Img, c.Folder, c.Width, c.Height, c.Rotation, c.Sort, c.DisplayCount}
+
+	var isInserted bool
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return c.InsertObjects(tx)
+	}
+	return nil
+}
+
+type Card struct {
+	ID string
+
+	Name        string
+	Type        string
+	Suit        string
+	Description string
+	Origin      string
+	Width       int
+	Height      int
+	Rotation    int
+	Value       int
+	Face        int
+	Sort        int
+	Drawn       bool
+	Back        Back
+	Stats       Stats
+	Faces       []Face
+}
+
+func (c *Card) Query(data *InsertId[string]) {
+	data.query = `
+		INSERT INTO card (card_deck_id, id, name, type, suit, description, origin, width, height, rotation, value, face, sort, drawn)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)
+		ON CONFLICT(id) DO UPDATE SET
+			card_deck_id = EXCLUDED.card_deck_id,
+			updated_at = datetime('now')
+		RETURNING (created_at == updated_at) AS is_inserted`
+}
+
+func (c *Card) InsertObjects(tx *sqlx.Tx) error {
+	group, _ := errgroup.WithContext(context.Background())
+
+	relId := InsertId[string]{id: c.ID, fieldName: "card_id"}
+	InsertWithCtxParallel(group, tx, c.Back, relId)
+	InsertWithCtxParallel(group, tx, c.Stats, relId)
+	InsertSliceParallel(group, tx, c.Faces, relId)
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (c *Card) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, c.ID, c.Name, c.Type, c.Suit, c.Description, c.Origin, c.Width, c.Height, c.Rotation, c.Value, c.Face, c.Sort, c.Drawn}
+
+	var isInserted bool
+	err := tx.QueryRowx(data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return c.InsertObjects(tx)
+	}
+	return nil
+}
+
+func (c *Card) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, c.ID, c.Name, c.Type, c.Suit, c.Description, c.Origin, c.Width, c.Height, c.Rotation, c.Value, c.Face, c.Sort, c.Drawn}
+
+	var isInserted bool
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return c.InsertObjects(tx)
+	}
+	return nil
+}
+
+type Face struct {
+	ID uint
+
+	Name string
+	Img  string
+	Text string
+}
+
+func (f Face) Query(data *InsertId[string]) {
+	data.query = `
+		INSERT INTO face (card_id, name, img, text)
+		VALUES ($1, $2, $3, $4)
+		RETURNING id`
+}
+
+func (f Face) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, f.Name, f.Img, f.Text}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&f.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (f Face) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, f.Name, f.Img, f.Text}
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&f.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+type Back struct {
+	ID uint
+
+	Name string
+	Text string
+}
+
+func (b Back) Query(data *InsertId[string]) {
+	data.query = `
+		INSERT INTO back (card_id, name, text)
+		VALUES ($1, $2, $3)
+		RETURNING id`
+}
+
+func (b Back) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, b.Name, b.Text}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&b.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (b Back) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, b.Name, b.Text}
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&b.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

internal/foundry/models/db/combat.go

@@ -0,0 +1,163 @@
+package db
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
+)
+
+type Combat struct {
+	ID string
+
+	Type       string
+	Scene      string
+	Round      int
+	Turn       int
+	Sort       int
+	Active     bool
+	Stats      Stats
+	Groups     []string
+	Combatants []*Combatant
+}
+
+func (c *Combat) Query(data *InsertId[uint]) {
+	data.query = `
+		INSERT INTO combat (game_id, id, type, scene, round, turn, sort, active)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
+		ON CONFLICT(id) DO UPDATE SET
+			game_id = EXCLUDED.game_id,
+			updated_at = datetime('now')
+		RETURNING (created_at == updated_at) AS is_inserted`
+}
+
+func (c *Combat) InsertObjects(tx *sqlx.Tx) error {
+	group, _ := errgroup.WithContext(context.Background())
+
+	relId := InsertId[string]{id: c.ID, fieldName: "combat_id", tableName: "combat_groups"}
+	InsertWithCtxParallel(group, tx, c.Stats, relId)
+	InsertSimpleSliceParallel(group, tx, c.Groups, &relId)
+	InsertSliceParallel(group, tx, c.Combatants, relId)
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (c *Combat) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, c.ID, c.Type, c.Scene, c.Round, c.Turn, c.Sort, c.Active}
+
+	var isInserted bool
+	err := tx.QueryRowx(data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return c.InsertObjects(tx)
+	}
+	return nil
+}
+
+func (c *Combat) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, c.ID, c.Type, c.Scene, c.Round, c.Turn, c.Sort, c.Active}
+
+	var isInserted bool
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return c.InsertObjects(tx)
+	}
+	return nil
+}
+
+type Combatant struct {
+	ID string
+
+	TokenId    string
+	SceneId    string
+	ActorId    string
+	Type       string
+	Img        string
+	Group      string
+	Initiative int
+	Hidden     bool
+	Defeated   bool
+	Stats      Stats
+}
+
+func (c *Combatant) Query(data *InsertId[string]) {
+	data.query = `
+		INSERT INTO combatant (combat_id, id, token_id, scene_id, actor_id, type, img, group_, initiative, hidden, defeated)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)
+		ON CONFLICT(id) DO UPDATE SET
+			combat_id = EXCLUDED.combat_id,
+			updated_at = datetime('now')
+		RETURNING (created_at == updated_at) AS is_inserted`
+}
+
+func (c *Combatant) InsertObjects(tx *sqlx.Tx) error {
+	relId := InsertId[string]{id: c.ID, fieldName: "combatant_id"}
+	group, _ := errgroup.WithContext(context.Background())
+
+	InsertWithCtxParallel(group, tx, c.Stats, relId)
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (c *Combatant) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, c.ID, c.TokenId, c.SceneId, c.ActorId, c.Type, c.Img, c.Group, c.Initiative, c.Hidden, c.Defeated}
+
+	var isInserted bool
+	err := tx.QueryRowx(data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return c.InsertObjects(tx)
+	}
+	return nil
+}
+
+func (c *Combatant) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, c.ID, c.TokenId, c.SceneId, c.ActorId, c.Type, c.Img, c.Group, c.Initiative, c.Hidden, c.Defeated}
+
+	var isInserted bool
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return c.InsertObjects(tx)
+	}
+	return nil
+}

internal/foundry/models/db/compatibility.go

@@ -29,7 +29,7 @@ func (c Compatibility) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
 
 	args := []any{data.id, c.Minimum, c.Verified, c.Maximum}
 
-	err := tx.QueryRow(data.query, args...).Scan(&c.ID)
+	err := tx.QueryRowx(data.query, args...).Scan(&c.ID)
 	if err != nil {
 		return err
 	}
@@ -44,7 +44,11 @@ func (c Compatibility) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertI
 
 	args := []any{data.id, c.Minimum, c.Verified, c.Maximum}
 
-	err := tx.QueryRowContext(ctx, data.query, args...).Scan(&c.ID)
+	mutex := GetMutex("compatibility_insert")
+	mutex.Lock()
+	defer mutex.Unlock()
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&c.ID)
 	if err != nil {
 		return err
 	}

internal/foundry/models/db/document_types.go

@@ -2,8 +2,12 @@ package db
 
 import (
 	"context"
+	"database/sql"
+	"errors"
+	"fmt"
 
 	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
 )
 
 type DocumentTypes struct {
@@ -13,10 +17,10 @@ type DocumentTypes struct {
 }
 
 func (d DocumentTypes) Query(data *InsertId[string]) {
-	data.query = `
+	data.query = fmt.Sprintf(`
-		INSERT INTO document_types (module_id)
+		INSERT INTO document_types (%s)
 		VALUES ($1)
-		RETURNING id`
+		RETURNING id`, data.fieldName)
 }
 
 func (d DocumentTypes) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
@@ -26,16 +30,19 @@ func (d DocumentTypes) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
 
 	args := []any{data.id}
 
-	err := tx.QueryRow(data.query, args...).Scan(&d.ID)
+	err := tx.QueryRowx(data.query, args...).Scan(&d.ID)
 	if err != nil {
 		return err
 	}
 
-	syncDB := NewSyncDB()
+	group, _ := errgroup.WithContext(context.Background())
-	defer close(syncDB.errChan)
+	InsertSliceParallel(group, tx, d.Data, InsertId[uint]{id: d.ID})
-	InsertSliceParallel(syncDB, tx, d.Data, &InsertId[uint]{id: d.ID})
 
-	return syncDB.Wait()
+	err = group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
 }
 
 func (d DocumentTypes) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
@@ -45,16 +52,23 @@ func (d DocumentTypes) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertI
 
 	args := []any{data.id}
 
-	err := tx.QueryRowContext(ctx, data.query, args...).Scan(&d.ID)
+	mutex := GetMutex("document_types_insert")
+	mutex.Lock()
+	defer mutex.Unlock()
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&d.ID)
 	if err != nil {
 		return err
 	}
 
-	syncDB := NewSyncDB()
+	group, _ := errgroup.WithContext(context.Background())
-	defer close(syncDB.errChan)
+	InsertSliceParallel(group, tx, d.Data, InsertId[uint]{id: d.ID})
-	InsertSliceParallel(syncDB, tx, d.Data, &InsertId[uint]{id: d.ID})
 
-	return syncDB.Wait()
+	err = group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
 }
 
 type DocumentTypeData struct {
@@ -78,17 +92,16 @@ func (d *DocumentTypeData) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
 
 	args := []any{data.id, d.Type}
 
-	err := tx.QueryRow(data.query, args...).Scan(&d.ID)
+	err := tx.QueryRowx(data.query, args...).Scan(&d.ID)
 	if err != nil {
 		return err
 	}
 
-	syncDB := NewSyncDB()
+	group, _ := errgroup.WithContext(context.Background())
-	defer close(syncDB.errChan)
 	relData := &InsertId[uint]{id: d.ID, fieldName: "document_types_data_id", tableName: "document_types_data_html"}
-	InsertSimpleSliceParallel(syncDB, tx, d.HtmlFields, relData)
+	InsertSimpleSliceParallel(group, tx, d.HtmlFields, relData)
 
-	return syncDB.Wait()
+	return group.Wait()
 }
 
 func (d *DocumentTypeData) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
@@ -98,15 +111,14 @@ func (d *DocumentTypeData) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *Ins
 
 	args := []any{data.id, d.Type}
 
-	err := tx.QueryRowContext(ctx, data.query, args...).Scan(&d.ID)
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&d.ID)
 	if err != nil {
 		return err
 	}
 
-	syncDB := NewSyncDB()
+	group, _ := errgroup.WithContext(context.Background())
-	defer close(syncDB.errChan)
 	relData := &InsertId[uint]{id: d.ID, fieldName: "document_types_data_id", tableName: "document_types_data_html"}
-	InsertSimpleSliceParallel(syncDB, tx, d.HtmlFields, relData)
+	InsertSimpleSliceParallel(group, tx, d.HtmlFields, relData)
 
-	return syncDB.Wait()
+	return group.Wait()
 }

internal/foundry/models/db/errors.go

@@ -1,9 +0,0 @@
-package db
-
-import "errors"
-
-var (
-	ErrorSetupMoreThanOne = errors.New("Passed more than one setupData")
-	ErrorSetupNotFound    = errors.New("Not found setup data from your request")
-	ErrorRecordNotFound   = errors.New("Record not found")
-)

internal/foundry/models/db/files.go

@@ -2,9 +2,12 @@ package db
 
 import (
 	"context"
+	"database/sql"
+	"errors"
 	"fmt"
 
 	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
 )
 
 type Files struct {
@@ -32,12 +35,15 @@ func (f *Files) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
 		return err
 	}
 
-	syncDB := NewSyncDB()
+	group, _ := errgroup.WithContext(context.Background())
-	defer close(syncDB.errChan)
 
-	InsertSliceParallel(syncDB, tx, f.Storages, &InsertId[uint]{id: f.ID})
+	InsertSliceParallel(group, tx, f.Storages, InsertId[uint]{id: f.ID})
 
-	return syncDB.Wait()
+	err = group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
 }
 
 func (f *Files) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
@@ -52,12 +58,15 @@ func (f *Files) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]
 		return err
 	}
 
-	syncDB := NewSyncDB()
+	group, _ := errgroup.WithContext(context.Background())
-	defer close(syncDB.errChan)
 
-	InsertSliceParallel(syncDB, tx, f.Storages, &InsertId[uint]{id: f.ID})
+	InsertSliceParallel(group, tx, f.Storages, InsertId[uint]{id: f.ID})
 
-	return syncDB.Wait()
+	err = group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
 }
 
 type FilesStorage struct {

internal/foundry/models/db/folder.go

@@ -0,0 +1,151 @@
+package db
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+	"fmt"
+	"strconv"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
+)
+
+type Folder struct {
+	ID uint
+
+	Name    string
+	Sorting string
+	Color   string
+	Packs   []string
+	Folders []*Folder
+}
+
+func (f *Folder) Query(data *InsertId[string]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO folder (%s, name, sorting, color)
+		VALUES ($1, $2, $3, $4)
+		RETURNING id`, data.fieldName)
+}
+
+func (f *Folder) InsertObjects(tx *sqlx.Tx) error {
+	relId := InsertId[string]{
+		id:        strconv.FormatUint(uint64(f.ID), 10),
+		fieldName: "folder_id",
+		tableName: "folder_packs",
+	}
+	group, _ := errgroup.WithContext(context.Background())
+
+	InsertSimpleSliceParallel(group, tx, f.Packs, &relId)
+	InsertSliceParallel(group, tx, f.Folders, relId)
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (f *Folder) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, f.Name, f.Sorting, f.Color}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&f.ID)
+	if err != nil {
+		return err
+	}
+
+	return f.InsertObjects(tx)
+}
+
+func (f *Folder) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, f.Name, f.Sorting, f.Color}
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&f.ID)
+	if err != nil {
+		return err
+	}
+
+	return f.InsertObjects(tx)
+}
+
+type WorldFolder struct {
+	ID string
+
+	Name        string
+	Type        string
+	Folder      string
+	Sorting     string
+	Description string
+	Color       string
+	Sort        int
+	Stats       Stats
+}
+
+func (w *WorldFolder) Query(data *InsertId[uint]) {
+	data.query = `
+		INSERT INTO world_folder (game_id, id, name, type, folder, sorting, description, color, sort)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
+		ON CONFLICT(id) DO UPDATE SET
+			game_id = EXCLUDED.game_id,
+			updated_at = datetime('now')
+		RETURNING (created_at == updated_at) AS is_inserted`
+}
+
+func (w *WorldFolder) InsertObjects(tx *sqlx.Tx) error {
+	group, _ := errgroup.WithContext(context.Background())
+
+	relId := InsertId[string]{id: w.ID, fieldName: "world_folder_id"}
+	InsertWithCtxParallel(group, tx, w.Stats, relId)
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (w *WorldFolder) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, w.ID, w.Name, w.Type, w.Folder, w.Sorting, w.Description, w.Color, w.Sort}
+
+	var isInserted bool
+	err := tx.QueryRowx(data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return w.InsertObjects(tx)
+	}
+	return nil
+}
+
+func (w *WorldFolder) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, w.ID, w.Name, w.Type, w.Folder, w.Sorting, w.Description, w.Color, w.Sort}
+
+	var isInserted bool
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return w.InsertObjects(tx)
+	}
+	return nil
+}

internal/foundry/models/db/foundry_state.go

@@ -1,308 +0,0 @@
-package db
-
-import (
-	"context"
-	"database/sql"
-	"errors"
-	"time"
-
-	"github.com/jmoiron/sqlx"
-)
-
-type StateType int
-
-const (
-	AuthState    = StateType(0)
-	SetupState   = StateType(1)
-	JoinState    = StateType(2)
-	PlayersState = StateType(3)
-	UpdateState  = StateType(4)
-	LicenseState = StateType(5)
-)
-
-type FoundryState struct {
-	Id        int64
-	IsAdmin   bool
-	IsSetup   bool
-	Type      StateType
-	CreatedAt time.Time
-	Options   Options
-	Modules   Modules
-	Systems   Systems
-	Worlds    Worlds
-	Users     Users
-}
-
-type Compatibility struct {
-	Id       int64
-	Minimum  string
-	Verified string
-	Maximum  string
-}
-
-type Options struct {
-	Id       int64
-	Language string
-}
-
-type FoundryStateModel struct {
-	DB *sqlx.DB
-}
-
-func (m FoundryStateModel) Insert(state *FoundryState) error {
-	query := `
-		INSERT INTO foundry_state (is_admin, is_setup, state_type)
-		VALUES ($1, $2, $3)
-		RETURNING id, created_at`
-
-	args := []any{state.IsAdmin, state.IsSetup, state.Type}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	err := m.DB.QueryRowContext(ctx, query, args...).Scan(&state.Id, &state.CreatedAt)
-	if err != nil {
-		return err
-	}
-
-	err = m.InsertOptions(&state.Options, state.Id)
-	if err != nil && err != sql.ErrNoRows {
-		return err
-	}
-
-	for i := range state.Modules {
-		err = m.InsertModule(&state.Modules[i], state.Id)
-		if err != nil && err != sql.ErrNoRows {
-			return err
-		}
-	}
-
-	for i := range state.Systems {
-		err = m.InsertSystem(&state.Systems[i], state.Id)
-		if err != nil && err != sql.ErrNoRows {
-			return err
-		}
-	}
-
-	for i := range state.Worlds {
-		err = m.InsertWorld(&state.Worlds[i], state.Id)
-		if err != nil && err != sql.ErrNoRows {
-			return err
-		}
-	}
-
-	for i := range state.Users {
-		err = m.InsertUser(&state.Users[i], state.Id)
-		if err != nil && err != sql.ErrNoRows {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m FoundryStateModel) InsertOptions(options *Options, stateId int64) error {
-	query := `
-		INSERT INTO options (state_id, lang)
-		VALUES ($1, $2)
-		RETURNING id`
-
-	args := []any{stateId, options.Language}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	return m.DB.QueryRowContext(ctx, query, args...).Scan(&options.Id)
-}
-
-func (m FoundryStateModel) Get(id int64) (*FoundryState, error) {
-	if id < 1 {
-		return nil, ErrorRecordNotFound
-	}
-
-	query := `
-		SELECT id, created_at, is_admin, is_setup, state_type
-		FROM foundry_state
-		WHERE id = $1`
-
-	var state FoundryState
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	err := m.DB.QueryRowContext(ctx, query, id).Scan(
-		&state.Id,
-		&state.CreatedAt,
-		&state.IsAdmin,
-		&state.IsSetup,
-		&state.Type,
-	)
-
-	if err != nil {
-		switch {
-		case errors.Is(err, sql.ErrNoRows):
-			return nil, ErrorRecordNotFound
-		default:
-			return nil, err
-		}
-	}
-	state.Modules, err = m.GetModules(state.Id)
-	if err != nil {
-		return nil, err
-	}
-	state.Systems, err = m.GetSystems(state.Id)
-	if err != nil {
-		return nil, err
-	}
-	state.Worlds, err = m.GetWorlds(state.Id)
-	if err != nil {
-		return nil, err
-	}
-	state.Users, err = m.GetUsers(state.Id)
-	if err != nil {
-		return nil, err
-	}
-
-	options, err := m.GetOptions(state.Id)
-	if err != nil {
-		return nil, err
-	}
-	state.Options = *options
-
-	return &state, nil
-}
-
-func (m FoundryStateModel) GetOptions(idState int64) (*Options, error) {
-	if idState < 1 {
-		return nil, ErrorRecordNotFound
-	}
-
-	query := `
-		SELECT id, lang
-		FROM options
-		WHERE state_id = $1`
-
-	var options Options
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	err := m.DB.QueryRowContext(ctx, query, idState).Scan(
-		&options.Id,
-		&options.Language,
-	)
-
-	if err != nil {
-		switch {
-		case errors.Is(err, sql.ErrNoRows):
-			return nil, ErrorRecordNotFound
-		default:
-			return nil, err
-		}
-	}
-
-	return &options, nil
-}
-
-func (m FoundryStateModel) GetIdByType(stateType StateType) (int64, error) {
-	if stateType < 0 {
-		return -1, ErrorRecordNotFound
-	}
-
-	query := `
-		SELECT id
-		FROM foundry_state
-		WHERE state_type = $1`
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	var id int64
-
-	err := m.DB.QueryRowContext(ctx, query, stateType).Scan(&id)
-
-	if err != nil {
-		switch {
-		case errors.Is(err, sql.ErrNoRows):
-			return -1, ErrorRecordNotFound
-		default:
-			return -1, err
-		}
-	}
-
-	return id, nil
-}
-
-func (m FoundryStateModel) Delete(id int64) error {
-	if id < 1 {
-		return ErrorRecordNotFound
-	}
-
-	query := `
-		DELETE FROM foundry_state
-		WHERE id = $1`
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	result, err := m.DB.ExecContext(ctx, query, id)
-	if err != nil {
-		return err
-	}
-
-	rowsAffected, err := result.RowsAffected()
-	if err != nil {
-		return err
-	}
-	if rowsAffected == 0 {
-		return ErrorRecordNotFound
-	}
-
-	return nil
-}
-
-func (m FoundryStateModel) DeleteAll() error {
-	query := `
-		DELETE FROM foundry_state`
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	result, err := m.DB.ExecContext(ctx, query)
-	if err != nil {
-		return err
-	}
-
-	rowsAffected, err := result.RowsAffected()
-	if err != nil {
-		return err
-	}
-	if rowsAffected == 0 {
-		return ErrorRecordNotFound
-	}
-
-	return nil
-}
-
-func (m FoundryStateModel) DeleteAllSeq() error {
-	query := `
-		DELETE FROM sqlite_sequence`
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	result, err := m.DB.ExecContext(ctx, query)
-	if err != nil {
-		return err
-	}
-
-	rowsAffected, err := result.RowsAffected()
-	if err != nil {
-		return err
-	}
-	if rowsAffected == 0 {
-		return ErrorRecordNotFound
-	}
-
-	return nil
-}

internal/foundry/models/db/game.go

@@ -0,0 +1,157 @@
+package db
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+	"fmt"
+	"strconv"
+	"time"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
+)
+
+type Game struct {
+	ID        uint
+	CreatedAt time.Time
+
+	DemoMode   bool
+	IdleLogout bool
+	Paused     bool
+	UserID     string
+
+	Addresses       Addresses
+	Files           Files
+	Options         GameOptions
+	Release         Release
+	World           *World
+	System          *System
+	CoreUpdate      CoreUpdate
+	SystemUpdate    SystemUpdate
+	ActiveUsers     []string
+	Modules         []*Module
+	PackageWarnings []*PackageWarning
+	Packs           []*Pack
+	Messages        []*Message
+	Combats         []*Combat
+	CardDeck        []*CardDeck
+	Users           []*User
+	Macros          []*Macro
+	Folders         []*WorldFolder
+	Items           []*Item
+	Settings        []*Setting
+	Journals        []*Journal
+	Tables          []*Table
+	Playlists       []*Playlist
+	Actors          []*Actor
+	// Scenes          []Scene
+}
+
+func (g *Game) InsertObjects(db *sqlx.DB) error {
+	relData := InsertId[uint]{id: g.ID, fieldName: "game_id"}
+
+	err := func() error {
+		tx := db.MustBegin()
+		defer tx.Rollback()
+
+		groupFunc, _ := errgroup.WithContext(context.Background())
+
+		InsertWithCtxParallel(groupFunc, tx, &g.Addresses, relData)
+		InsertWithCtxParallel(groupFunc, tx, &g.Files, relData)
+		InsertWithCtxParallel(groupFunc, tx, &g.Options, relData)
+		InsertWithCtxParallel(groupFunc, tx, &g.Release, relData)
+		InsertWithCtxParallel(groupFunc, tx, &g.CoreUpdate, relData)
+		InsertWithCtxParallel(groupFunc, tx, &g.SystemUpdate, relData)
+
+		relDataString := InsertId[string]{id: strconv.FormatUint(uint64(g.ID), 10), fieldName: "game_id"}
+		InsertWithCtxParallel(groupFunc, tx, g.World, relDataString)
+		InsertWithCtxParallel(groupFunc, tx, g.System, relDataString)
+
+		InsertSimpleSliceParallel(groupFunc, tx, g.ActiveUsers,
+			&InsertId[uint]{id: g.ID, fieldName: "game_id", tableName: "active_users"})
+
+		InsertSliceParallel(groupFunc, tx, g.Modules, relData)
+		InsertSliceParallel(groupFunc, tx, g.PackageWarnings, relData)
+		InsertSliceParallel(groupFunc, tx, g.Packs, relDataString)
+		InsertSliceParallel(groupFunc, tx, g.Messages, relData)
+		InsertSliceParallel(groupFunc, tx, g.Combats, relData)
+		InsertSliceParallel(groupFunc, tx, g.CardDeck, relData)
+		InsertSliceParallel(groupFunc, tx, g.Users, relData)
+		InsertSliceParallel(groupFunc, tx, g.Macros, relData)
+		InsertSliceParallel(groupFunc, tx, g.Folders, relData)
+
+		errFunc := groupFunc.Wait()
+		if errFunc != nil && !errors.Is(errFunc, sql.ErrNoRows) {
+			return errFunc
+		}
+		return tx.Commit()
+	}()
+
+	err = func() error {
+		tx := db.MustBegin()
+		defer tx.Rollback()
+		groupFunc, _ := errgroup.WithContext(context.Background())
+
+		InsertSliceParallel(groupFunc, tx, g.Settings, relData)
+		InsertSliceParallel(groupFunc, tx, g.Journals, relData)
+		InsertSliceParallel(groupFunc, tx, g.Tables, relData)
+		InsertSliceParallel(groupFunc, tx, g.Playlists, relData)
+
+		errFunc := groupFunc.Wait()
+		if errFunc != nil && !errors.Is(errFunc, sql.ErrNoRows) {
+			return errFunc
+		}
+		return tx.Commit()
+	}()
+
+	err = func() error {
+		tx := db.MustBegin()
+		defer tx.Rollback()
+		groupFunc, _ := errgroup.WithContext(context.Background())
+
+		InsertSliceParallelTimeout(groupFunc, tx, g.Items,
+			InsertId[string]{id: strconv.FormatUint(uint64(g.ID), 10), fieldName: "game_id"},
+			15*time.Second)
+		InsertSliceParallelTimeout(groupFunc, tx, g.Actors, relData, 15*time.Second)
+
+		errFunc := groupFunc.Wait()
+		if errFunc != nil && !errors.Is(errFunc, sql.ErrNoRows) {
+			return errFunc
+		}
+		return tx.Commit()
+	}()
+
+	return err
+}
+
+func (g *Game) Insert(db *sqlx.DB) error {
+	tx := db.MustBegin()
+	defer tx.Rollback()
+
+	const query = `
+		INSERT INTO game (demo_mode, idle_logout, paused, user_id)
+		VALUES ($1, $2, $3, $4)
+		RETURNING id, created_at`
+
+	args := []any{g.DemoMode, g.IdleLogout, g.Paused, g.UserID}
+
+	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+	defer cancel()
+
+	err := tx.QueryRowxContext(ctx, query, args...).Scan(&g.ID, &g.CreatedAt)
+	if err != nil {
+		return err
+	}
+	err = tx.Commit()
+	if err != nil {
+		return err
+	}
+
+	err = g.InsertObjects(db)
+	if err != nil {
+		fmt.Printf("%v\n", err)
+	}
+
+	return err
+}

internal/foundry/models/db/grid.go

@@ -22,7 +22,7 @@ type Grid struct {
 
 func (g *Grid) Query(data *InsertId[string]) {
 	data.query = `
-		INSERT INTO grid (system_id, type, size, distance, diagonals, thickness
+		INSERT INTO grid (system_id, type, size, distance, diagonals, thickness,
 							alpha, color, units, style)
 		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
 		RETURNING id`

internal/foundry/models/db/index.go

@@ -0,0 +1,92 @@
+package db
+
+import (
+	"context"
+
+	"github.com/jmoiron/sqlx"
+)
+
+type Index struct {
+	ID string
+
+	Folder string
+	Img    string
+	Name   string
+	Type   string
+}
+
+func (i *Index) Query(data *InsertId[string]) {
+	data.query = `
+		INSERT INTO index_ (id, folder, img, name, type)
+		VALUES ($1, $2, $3, $4, $5)
+		ON CONFLICT(id) DO NOTHING`
+}
+
+func (i *Index) ConnectGameQuery(data *InsertId[string]) {
+	data.query = `
+		INSERT INTO pack_to_index (pack_id, index_id)
+		VALUES ($1, $2)
+		ON CONFLICT(pack_id, index_id) DO NOTHING`
+}
+
+func (i *Index) ConnectGame(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, i.ID}
+
+	_, err := tx.Exec(data.query, args...)
+	return err
+}
+
+func (i *Index) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{i.ID, i.Folder, i.Img, i.Name, i.Type}
+
+	_, err := tx.Exec(data.query, args...)
+	if err != nil {
+		return err
+	}
+
+	dataCopy := *data
+	i.ConnectGameQuery(&dataCopy)
+
+	return i.ConnectGame(tx, &dataCopy)
+}
+
+func (i *Index) ConnectGameCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, i.ID}
+
+	_, err := tx.ExecContext(ctx, data.query, args...)
+	return err
+}
+
+func (i *Index) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{i.ID, i.Folder, i.Img, i.Name, i.Type}
+
+	mutex := GetMutex("index_insert")
+	mutex.Lock()
+	defer mutex.Unlock()
+
+	_, err := tx.ExecContext(ctx, data.query, args...)
+	if err != nil {
+		return err
+	}
+
+	dataCopy := *data
+	i.ConnectGameQuery(&dataCopy)
+
+	return i.ConnectGameCtx(ctx, tx, &dataCopy)
+}

internal/foundry/models/db/item.go

@@ -0,0 +1,89 @@
+package db
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+	"fmt"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
+)
+
+type Item struct {
+	ID string
+
+	Img       string
+	Name      string
+	Type      string
+	Folder    string
+	Sort      int
+	Stats     Stats
+	Ownership []OwnershipString
+}
+
+func (i *Item) Query(data *InsertId[string]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO item (%[1]s, id, img, name, type, folder, sort)
+		VALUES ($1, $2, $3, $4, $5, $6, $7)
+		ON CONFLICT(id) DO UPDATE SET
+			%[1]s = EXCLUDED.%[1]s,
+			updated_at = datetime('now')
+		RETURNING (created_at == updated_at) AS is_inserted`, data.fieldName)
+}
+
+func (i *Item) InsertObjects(tx *sqlx.Tx) error {
+	group, _ := errgroup.WithContext(context.Background())
+
+	relId := InsertId[string]{id: i.ID, fieldName: "item_id"}
+	InsertWithCtxParallel(group, tx, i.Stats, relId)
+	InsertSliceParallel(group, tx, i.Ownership, relId)
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (i *Item) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, i.ID, i.Img, i.Name, i.Type, i.Folder, i.Sort}
+
+	var isInserted bool
+	err := tx.QueryRowx(data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return i.InsertObjects(tx)
+	}
+	return nil
+}
+
+func (i *Item) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, i.ID, i.Img, i.Name, i.Type, i.Folder, i.Sort}
+
+	mutex := GetMutex("item_insert")
+	mutex.Lock()
+	defer mutex.Unlock()
+
+	var isInserted bool
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return i.InsertObjects(tx)
+	}
+	return nil
+}

internal/foundry/models/db/journal.go

@@ -0,0 +1,81 @@
+package db
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
+)
+
+type Journal struct {
+	ID string
+
+	Name      string
+	Sort      int
+	Pages     []*JournalPage
+	Ownership []OwnershipString
+}
+
+func (j *Journal) Query(data *InsertId[uint]) {
+	data.query = `
+		INSERT INTO journal (game_id, id, name, sort)
+		VALUES ($1, $2, $3, $4)
+		ON CONFLICT(id) DO UPDATE SET
+			game_id = EXCLUDED.game_id,
+			updated_at = datetime('now')
+		RETURNING (created_at == updated_at) AS is_inserted`
+}
+
+func (j *Journal) InsertObjects(tx *sqlx.Tx) error {
+	group, _ := errgroup.WithContext(context.Background())
+
+	relId := InsertId[string]{id: j.ID, fieldName: "journal_id"}
+	InsertSliceParallel(group, tx, j.Pages, relId)
+	InsertSliceParallel(group, tx, j.Ownership, relId)
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (j *Journal) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, j.ID, j.Name, j.Sort}
+
+	var isInserted bool
+	err := tx.QueryRowx(data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return j.InsertObjects(tx)
+	}
+	return nil
+}
+
+func (j *Journal) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, j.ID, j.Name, j.Sort}
+
+	var isInserted bool
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return j.InsertObjects(tx)
+	}
+	return nil
+}

internal/foundry/models/db/journal_page.go

@@ -0,0 +1,221 @@
+package db
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+	"fmt"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
+)
+
+type JournalPage struct {
+	ID string
+
+	Name      string
+	Type      string
+	Src       string
+	Sort      int
+	Text      PageText
+	Title     PageTitle
+	Video     PageVideo
+	Stats     Stats
+	Ownership []OwnershipString
+}
+
+func (j *JournalPage) Query(data *InsertId[string]) {
+	data.query = `
+		INSERT INTO journal_page (journal_id, id, name, type, src, sort)
+		VALUES ($1, $2, $3, $4, $5, $6)
+		ON CONFLICT(id) DO UPDATE SET
+			journal_id = EXCLUDED.journal_id,
+			updated_at = datetime('now')
+		RETURNING (created_at == updated_at) AS is_inserted`
+}
+
+func (j *JournalPage) InsertObjects(tx *sqlx.Tx) error {
+	group, _ := errgroup.WithContext(context.Background())
+
+	relId := InsertId[string]{id: j.ID, fieldName: "journal_page_id"}
+	InsertWithCtxParallel(group, tx, j.Text, relId)
+	InsertWithCtxParallel(group, tx, j.Title, relId)
+	InsertWithCtxParallel(group, tx, j.Video, relId)
+	InsertWithCtxParallel(group, tx, j.Stats, relId)
+
+	InsertSliceParallel(group, tx, j.Ownership, relId)
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (j *JournalPage) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, j.ID, j.Name, j.Type, j.Src, j.Sort}
+
+	var isInserted bool
+	err := tx.QueryRowx(data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return j.InsertObjects(tx)
+	}
+	return nil
+}
+
+func (j *JournalPage) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, j.ID, j.Name, j.Type, j.Src, j.Sort}
+
+	var isInserted bool
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return j.InsertObjects(tx)
+	}
+	return nil
+}
+
+type PageText struct {
+	ID uint
+
+	Content  string
+	Markdown string
+	Format   int
+}
+
+func (p PageText) Query(data *InsertId[string]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO journal_page_text (%s, content, markdown, format)
+		VALUES ($1, $2, $3, $4)`, data.fieldName)
+}
+
+func (p PageText) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, p.Content, p.Markdown, p.Format}
+
+	_, err := tx.Exec(data.query, args...)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (p PageText) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, p.Content, p.Markdown, p.Format}
+
+	_, err := tx.ExecContext(ctx, data.query, args...)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+type PageTitle struct {
+	ID uint
+
+	Show  bool
+	Level int
+}
+
+func (p PageTitle) Query(data *InsertId[string]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO journal_page_title (%s, show, level)
+		VALUES ($1, $2, $3)`, data.fieldName)
+}
+
+func (p PageTitle) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, p.Show, p.Level}
+
+	_, err := tx.Exec(data.query, args...)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (p PageTitle) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, p.Show, p.Level}
+
+	_, err := tx.ExecContext(ctx, data.query, args...)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+type PageVideo struct {
+	ID uint
+
+	Controls bool
+	Volume   float64
+}
+
+func (p PageVideo) Query(data *InsertId[string]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO journal_page_video (%s, controls, volume)
+		VALUES ($1, $2, $3)`, data.fieldName)
+}
+
+func (p PageVideo) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, p.Controls, p.Volume}
+
+	_, err := tx.Exec(data.query, args...)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (p PageVideo) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, p.Controls, p.Volume}
+
+	_, err := tx.ExecContext(ctx, data.query, args...)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

internal/foundry/models/db/language.go

@@ -2,9 +2,12 @@ package db
 
 import (
 	"context"
+	"database/sql"
+	"errors"
 	"fmt"
 
 	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
 )
 
 type SetupLanguage struct {
@@ -33,11 +36,10 @@ func (l *SetupLanguage) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
 		return err
 	}
 
-	syncDB := NewSyncDB()
+	group, _ := errgroup.WithContext(context.Background())
-	defer close(syncDB.errChan)
+	InsertSliceParallel(group, tx, l.Modules, InsertId[string]{id: l.ID})
-	InsertSliceParallel(syncDB, tx, l.Modules, &InsertId[string]{id: l.ID})
 
-	return nil
+	return group.Wait()
 }
 
 func (l *SetupLanguage) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
@@ -52,10 +54,13 @@ func (l *SetupLanguage) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *Insert
 		return err
 	}
 
-	syncDB := NewSyncDB()
+	group, _ := errgroup.WithContext(context.Background())
-	defer close(syncDB.errChan)
+	InsertSliceParallel(group, tx, l.Modules, InsertId[string]{id: l.ID})
-	InsertSliceParallel(syncDB, tx, l.Modules, &InsertId[string]{id: l.ID})
 
+	err = group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
 	return nil
 }
 
@@ -125,7 +130,7 @@ func (l *Language) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
 
 	args := []any{data.id, l.Lang, l.Name, l.Path}
 
-	err := tx.QueryRow(data.query, args...).Scan(&l.ID)
+	err := tx.QueryRowx(data.query, args...).Scan(&l.ID)
 	if err != nil {
 		return err
 	}
@@ -140,7 +145,11 @@ func (l *Language) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[st
 
 	args := []any{data.id, l.Lang, l.Name, l.Path}
 
-	err := tx.QueryRowContext(ctx, data.query, args...).Scan(&l.ID)
+	mutex := GetMutex("language_insert")
+	mutex.Lock()
+	defer mutex.Unlock()
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&l.ID)
 	if err != nil {
 		return err
 	}

internal/foundry/models/db/light.go

@@ -0,0 +1,174 @@
+package db
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+	"fmt"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
+)
+
+type Light struct {
+	ID uint
+
+	Color          string
+	Priority       int
+	Angle          int
+	Negative       bool
+	Alpha          float64
+	Bright         float64
+	Coloration     float64
+	Dim            float64
+	Attenuation    float64
+	Luminosity     float64
+	Saturation     float64
+	Contrast       float64
+	Shadows        float64
+	LightAnimation LightAnimation
+	LightDarkness  LightDarkness
+}
+
+func (l *Light) Query(data *InsertId[uint]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO token_light (%s, color, priority, angle, negative, alpha, bright, coloration, dim, 
+			attenuation, luminosity, saturation, contrast, shadows)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)
+		RETURNING id`, data.fieldName)
+}
+
+func (l *Light) InsertObjects(tx *sqlx.Tx) error {
+	group, _ := errgroup.WithContext(context.Background())
+
+	relId := InsertId[uint]{id: l.ID, fieldName: "token_light_id"}
+	InsertWithCtxParallel(group, tx, l.LightAnimation, relId)
+	InsertWithCtxParallel(group, tx, l.LightDarkness, relId)
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (l *Light) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, l.Color, l.Priority, l.Angle, l.Negative, l.Alpha, l.Bright, l.Coloration, l.Dim,
+		l.Attenuation, l.Luminosity, l.Saturation, l.Contrast, l.Shadows}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&l.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (l *Light) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, l.Color, l.Priority, l.Angle, l.Negative, l.Alpha, l.Bright, l.Coloration, l.Dim,
+		l.Attenuation, l.Luminosity, l.Saturation, l.Contrast, l.Shadows}
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&l.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+type LightAnimation struct {
+	ID uint
+
+	Speed     int
+	Intensity int
+	Reverse   bool
+}
+
+func (l LightAnimation) Query(data *InsertId[uint]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO token_light_animation (%s, speed, intensity, reverse)
+		VALUES ($1, $2, $3, $4)
+		RETURNING id`, data.fieldName)
+}
+
+func (l LightAnimation) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, l.Speed, l.Intensity, l.Reverse}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&l.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (l LightAnimation) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, l.Speed, l.Intensity, l.Reverse}
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&l.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+type LightDarkness struct {
+	ID uint
+
+	Min float64
+	Max float64
+}
+
+func (l LightDarkness) Query(data *InsertId[uint]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO token_light_darkness (%s, min, max)
+		VALUES ($1, $2, $3, $4)
+		RETURNING id`, data.fieldName)
+}
+
+func (l LightDarkness) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, l.Min, l.Max}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&l.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (l LightDarkness) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, l.Min, l.Max}
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&l.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

internal/foundry/models/db/macro.go

@@ -0,0 +1,87 @@
+package db
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
+)
+
+type Macro struct {
+	ID string
+
+	Command   string
+	Name      string
+	Type      string
+	Img       string
+	Author    string
+	Scope     string
+	Folder    string
+	Sort      int
+	Stats     Stats
+	Ownership []OwnershipString
+}
+
+func (m *Macro) Query(data *InsertId[uint]) {
+	data.query = `
+		INSERT INTO macro (game_id, id, command, name, type, img, author, scope, folder, sort)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
+		ON CONFLICT(id) DO UPDATE SET
+			game_id = EXCLUDED.game_id,
+			updated_at = datetime('now')
+		RETURNING (created_at == updated_at) AS is_inserted`
+}
+
+func (m *Macro) InsertObjects(tx *sqlx.Tx) error {
+	group, _ := errgroup.WithContext(context.Background())
+
+	relId := InsertId[string]{id: m.ID, fieldName: "macro_id"}
+	InsertWithCtxParallel(group, tx, m.Stats, relId)
+	InsertSliceParallel(group, tx, m.Ownership, relId)
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (m *Macro) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, m.ID, m.Command, m.Name, m.Type, m.Img, m.Author, m.Scope, m.Folder, m.Sort}
+
+	var isInserted bool
+	err := tx.QueryRowx(data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return m.InsertObjects(tx)
+	}
+	return nil
+}
+
+func (m *Macro) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, m.ID, m.Command, m.Name, m.Type, m.Img, m.Author, m.Scope, m.Folder, m.Sort}
+
+	var isInserted bool
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return m.InsertObjects(tx)
+	}
+	return nil
+}

internal/foundry/models/db/media.go

@@ -29,7 +29,7 @@ func (m *Media) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
 
 	args := []any{data.id, m.Type, m.URL, m.Caption}
 
-	err := tx.QueryRow(data.query, args...).Scan(&m.ID)
+	err := tx.QueryRowx(data.query, args...).Scan(&m.ID)
 	if err != nil {
 		return err
 	}
@@ -44,7 +44,11 @@ func (m *Media) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[strin
 
 	args := []any{data.id, m.Type, m.URL, m.Caption}
 
-	err := tx.QueryRowContext(ctx, data.query, args...).Scan(&m.ID)
+	mutex := GetMutex("media_insert")
+	mutex.Lock()
+	defer mutex.Unlock()
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&m.ID)
 	if err != nil {
 		return err
 	}

internal/foundry/models/db/message.go

@@ -0,0 +1,139 @@
+package db
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+	"fmt"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
+)
+
+type Message struct {
+	ID string
+
+	Blind     bool
+	Emote     bool
+	Style     int
+	Timestamp int64
+	Content   string
+	Author    string
+	Type      string
+	Flavor    string
+	Sound     string
+	Stats     Stats
+	Speaker   Speaker
+	Whisper   []string
+	Rolls     []string
+}
+
+func (m *Message) Query(data *InsertId[uint]) {
+	data.query = `
+		INSERT INTO message (game_id, id, blind, emote, style, timestamp, content, author, type, flavor, sound)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)
+		ON CONFLICT(id) DO UPDATE SET
+			game_id = EXCLUDED.game_id,
+			updated_at = datetime('now')
+		RETURNING (created_at == updated_at) AS is_inserted`
+}
+
+func (m *Message) InsertObjects(tx *sqlx.Tx) error {
+	relId := InsertId[string]{id: m.ID, fieldName: "message_id"}
+	group, _ := errgroup.WithContext(context.Background())
+
+	InsertWithCtxParallel(group, tx, m.Stats, relId)
+	InsertWithCtxParallel(group, tx, m.Speaker, relId)
+
+	InsertSimpleSliceParallel(group, tx, m.Whisper, &InsertId[string]{id: m.ID, fieldName: "message_id", tableName: "message_whisper"})
+	InsertSimpleSliceParallel(group, tx, m.Rolls, &InsertId[string]{id: m.ID, fieldName: "message_id", tableName: "message_rolls"})
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (m *Message) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, m.ID, m.Blind, m.Emote, m.Style, m.Timestamp, m.Content, m.Author, m.Type, m.Flavor, m.Sound}
+
+	var isInserted bool
+	err := tx.QueryRowx(data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return m.InsertObjects(tx)
+	}
+	return nil
+}
+
+func (m *Message) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, m.ID, m.Blind, m.Emote, m.Style, m.Timestamp, m.Content, m.Author, m.Type, m.Flavor, m.Sound}
+
+	var isInserted bool
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return m.InsertObjects(tx)
+	}
+	return nil
+}
+
+type Speaker struct {
+	ID uint
+
+	Scene string
+	Actor string
+	Token string
+	Alias string
+}
+
+func (s Speaker) Query(data *InsertId[string]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO speaker (%s, scene, actor, token, alias)
+		VALUES ($1, $2, $3, $4, $5)`, data.fieldName)
+}
+
+func (s Speaker) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, s.Scene, s.Actor, s.Token, s.Alias}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&s.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (s Speaker) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, s.Scene, s.Actor, s.Token, s.Alias}
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&s.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

internal/foundry/models/db/models.go

@@ -1,35 +0,0 @@
-package db
-
-import "github.com/jmoiron/sqlx"
-
-// var (
-// 	ErrRecordNotFound = errors.New("record not found")
-// 	ErrEditConflict   = errors.New("edit conflict")
-// )
-
-type Models struct {
-	FoundryState FoundryStateModel
-}
-
-// type Models struct {
-// 	Movies interface {
-// 		Insert(movie *Movie) error
-// 		Get(id int64) (*Movie, error)
-// 		Update(movie *Movie) error
-// 		Delete(id int64) error
-// 		GetAll(title string, genres []string, filter Filters) ([]*Movie, Metadata, error)
-// 	}
-// }
-
-func NewModels(db *sqlx.DB) *Models {
-	return &Models{
-		FoundryState: FoundryStateModel{DB: db},
-	}
-}
-
-// func NewMockModels() Models {
-// 	return Models{
-// 		Movies: MockMovieModel{},
-// 		Users:  MockMovieModel{},
-// 	}
-// }

internal/foundry/models/db/module.go

@@ -4,287 +4,185 @@ import (
 	"context"
 	"database/sql"
 	"errors"
-	"time"
+	"strings"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
 )
 
 type Module struct {
-	Id            int64
+	ID string
-	TextId        string
+
-	Title         string
+	Title             string
-	Description   string
+	Description       string
-	Url           string
+	URL               string
-	Version       string
+	License           string
-	Availability  int
+	Readme            string
-	CreatedAt     time.Time
+	Bugs              string
-	Languages     []Language
+	Changelog         string
-	Compatibility Compatibility
+	Version           string
+	Download          string
+	Manifest          string
+	Socket            bool
+	Protected         bool
+	Exclusive         bool
+	PersistentStorage bool
+	CoreTranslation   bool
+	Library           bool
+	Locked            bool
+	Owned             bool
+	HasStorage        bool
+	Active            bool
+	Availability      int
+	DocumentTypes     DocumentTypes
+	Relationships     Relationships
+	Compatibility     Compatibility
+	Scripts           []string
+	Esmodules         []string
+	Tags              []string
+	Authors           []*Author
+	Media             []*Media
+	Styles            []*Style
+	Languages         []*Language
+	Packs             []*Pack
+	PackFolders       []*Folder
 }
 
-type Language struct {
+func (m *Module) Query(data *InsertId[uint]) {
-	Id   int64
+	data.query = `
-	Lang string
+		INSERT INTO module (setup_id, id, title, description, url, license, readme, bugs,
-	Name string
+			changelog, version, manifest, download, socket, protected, exclusive_, persistent_storage,
-	Path string
+			core_translation, library, locked, owned, has_storage, active, availability)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17,
+			$18, $19, $20, $21, $22, $23)
+		ON CONFLICT(id) DO NOTHING`
 }
 
-type Modules []Module
+func (m *Module) ConnectGameQuery(data *InsertId[uint]) {
-
+	data.query = `
-func (modules Modules) GetById(id int) *Module {
+		INSERT INTO game_to_module (game_id, module_id)
-	return &modules[id]
+		VALUES ($1, $2)`
 }
 
-func (m FoundryStateModel) InsertModule(module *Module, stateId int64) error {
+func (m *Module) InsertObjects(tx *sqlx.Tx) error {
-	query := `
+	relId := InsertId[string]{id: m.ID, fieldName: "module_id"}
-		INSERT INTO modules (state_id, text_id, title, description, url, version, availability)
+	group, _ := errgroup.WithContext(context.Background())
-		VALUES ($1, $2, $3, $4, $5, $6, $7)
-		RETURNING id, created_at`
 
-	args := []any{stateId, module.TextId, module.Title, module.Description, module.Url, module.Version, module.Availability}
+	InsertWithCtxParallel(group, tx, m.DocumentTypes, relId)
+	InsertWithCtxParallel(group, tx, m.Relationships, relId)
+	InsertWithCtxParallel(group, tx, m.Compatibility, relId)
 
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+	scriptRelId := &InsertId[string]{id: m.ID, fieldName: "module_id", tableName: "scripts"}
-	defer cancel()
+	InsertSimpleSliceParallel(group, tx, m.Scripts, scriptRelId)
+	esModulesRelId := &InsertId[string]{id: m.ID, fieldName: "module_id", tableName: "es_modules"}
+	InsertSimpleSliceParallel(group, tx, m.Esmodules, esModulesRelId)
+	tagsRelId := &InsertId[string]{id: m.ID, fieldName: "module_id", tableName: "tags"}
+	InsertSimpleSliceParallel(group, tx, m.Tags, tagsRelId)
 
-	err := m.DB.QueryRowContext(ctx, query, args...).Scan(&module.Id, &module.CreatedAt)
+	InsertSliceParallel(group, tx, m.Authors, relId)
+	InsertSliceParallel(group, tx, m.Media, relId)
+	InsertSliceParallel(group, tx, m.Styles, relId)
+	InsertSliceParallel(group, tx, m.Languages, relId)
+	InsertSliceParallel(group, tx, m.Packs, relId)
+	InsertSliceParallel(group, tx, m.PackFolders, relId)
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (m *Module) ConnectGame(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, m.ID}
+
+	_, err := tx.Exec(data.query, args...)
+	return err
+}
+
+func (m *Module) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	var dataId *uint
+	if strings.EqualFold(data.fieldName, "setup_id") {
+		dataId = &data.id
+	}
+
+	args := []any{dataId, m.ID, m.Title, m.Description, m.URL, m.License, m.Readme, m.Bugs,
+		m.Changelog, m.Version, m.Manifest, m.Download, m.Socket, m.Protected, m.Exclusive, m.PersistentStorage,
+		m.CoreTranslation, m.Library, m.Locked, m.Owned, m.HasStorage, m.Active, m.Availability}
+
+	res, err := tx.Exec(data.query, args...)
 	if err != nil {
 		return err
 	}
-	for i := range module.Languages {
+
-		err = m.InsertModuleLanguages(&module.Languages[i], module.Id)
+	rowsAffected, err := res.RowsAffected()
-		if err != nil && err != sql.ErrNoRows {
+	if rowsAffected != 0 {
+		err = m.InsertObjects(tx)
+		if err != nil {
 			return err
 		}
 	}
-	return m.InsertModuleCompatibility(&module.Compatibility, module.Id)
-}
 
-func (m FoundryStateModel) InsertModuleCompatibility(compatibility *Compatibility, moduleId int64) error {
+	if dataId == nil {
-	query := `
+		dataCopy := *data
-		INSERT INTO modules_compatibility (module_id, minimum, verified, maximum)
+		m.ConnectGameQuery(&dataCopy)
-		VALUES ($1, $2, $3, $4)
+		err = m.ConnectGame(tx, &dataCopy)
-		RETURNING id`
-
-	args := []any{moduleId, compatibility.Minimum, compatibility.Verified, compatibility.Maximum}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	err := m.DB.QueryRowContext(ctx, query, args...).Scan(&compatibility.Id)
-	if err != nil && err != sql.ErrNoRows {
-		return err
-	}
-	return nil
-}
-
-func (m FoundryStateModel) InsertModuleLanguages(lang *Language, moduleId int64) error {
-	query := `
-		INSERT INTO modules_languages (module_id, language, name, path)
-		VALUES ($1, $2, $3, $4)
-		RETURNING id`
-
-	args := []any{moduleId, lang.Lang, lang.Name, lang.Path}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	err := m.DB.QueryRowContext(ctx, query, args...).Scan(&lang.Id)
-	if err != nil && err != sql.ErrNoRows {
-		return err
-	}
-	return nil
-}
-
-func (m FoundryStateModel) GetModules(idState int64) (Modules, error) {
-	if idState < 1 {
-		return nil, ErrorRecordNotFound
 	}
 
-	query := `
+	return err
-		SELECT id, created_at, text_id, title, description, url, version, availability
+}
-		FROM modules
-		WHERE state_id = $1`
 
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+func (m *Module) ConnectGameCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
-	defer cancel()
+	if data.query == "" {
+		return ErrNoQuery
+	}
 
-	rows, err := m.DB.QueryContext(ctx, query, idState)
+	args := []any{data.id, m.ID}
+
+	_, err := tx.ExecContext(ctx, data.query, args...)
+	return err
+}
+
+func (m *Module) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	var dataId *uint
+	if strings.EqualFold(data.fieldName, "setup_id") {
+		dataId = &data.id
+	}
+
+	args := []any{dataId, m.ID, m.Title, m.Description, m.URL, m.License, m.Readme, m.Bugs,
+		m.Changelog, m.Version, m.Manifest, m.Download, m.Socket, m.Protected, m.Exclusive, m.PersistentStorage,
+		m.CoreTranslation, m.Library, m.Locked, m.Owned, m.HasStorage, m.Active, m.Availability}
+
+	res, err := tx.ExecContext(ctx, data.query, args...)
 	if err != nil {
-		switch {
+		return err
-		case errors.Is(err, sql.ErrNoRows):
-			return nil, ErrorRecordNotFound
-		default:
-			return nil, err
-		}
 	}
 
-	modules := make(Modules, 0, 1)
+	rowsAffected, err := res.RowsAffected()
-
+	if rowsAffected != 0 {
-	for rows.Next() {
+		err = m.InsertObjects(tx)
-		var module Module
-		err := rows.Scan(
-			&module.Id,
-			&module.CreatedAt,
-			&module.TextId,
-			&module.Title,
-			&module.Description,
-			&module.Url,
-			&module.Version,
-			&module.Availability,
-		)
 		if err != nil {
-			return nil, err
+			return err
 		}
-		module.Languages, err = m.GetModuleLanguages(module.Id)
-		if err != nil {
-			return nil, err
-		}
-
-		compatibility, err := m.GetModuleCompatibility(module.Id)
-		if err != nil {
-			return nil, err
-		}
-		module.Compatibility = *compatibility
-		modules = append(modules, module)
 	}
 
-	if err := rows.Err(); err != nil {
+	if dataId == nil {
-		return nil, err
+		dataCopy := *data
+		m.ConnectGameQuery(&dataCopy)
+		err = m.ConnectGameCtx(ctx, tx, &dataCopy)
 	}
 
-	return modules, nil
+	return err
-}
-
-func (m FoundryStateModel) GetModuleCompatibility(idModule int64) (*Compatibility, error) {
-	if idModule < 1 {
-		return nil, ErrorRecordNotFound
-	}
-
-	query := `
-		SELECT id, minimum, verified, maximum
-		FROM modules_compatibility
-		WHERE module_id = $1`
-
-	var compatibility Compatibility
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	err := m.DB.QueryRowContext(ctx, query, idModule).Scan(
-		&compatibility.Id,
-		&compatibility.Minimum,
-		&compatibility.Verified,
-		&compatibility.Maximum,
-	)
-
-	if err != nil {
-		switch {
-		case errors.Is(err, sql.ErrNoRows):
-			return nil, ErrorRecordNotFound
-		default:
-			return nil, err
-		}
-	}
-
-	return &compatibility, nil
-}
-
-func (m FoundryStateModel) GetModuleLanguages(idModule int64) ([]Language, error) {
-	if idModule < 1 {
-		return nil, ErrorRecordNotFound
-	}
-
-	query := `
-		SELECT id, language, name, path
-		FROM modules_languages
-		WHERE module_id = $1`
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	rows, err := m.DB.QueryContext(ctx, query, idModule)
-	if err != nil {
-		switch {
-		case errors.Is(err, sql.ErrNoRows):
-			return nil, ErrorRecordNotFound
-		default:
-			return nil, err
-		}
-	}
-
-	languages := make([]Language, 0, 1)
-
-	for rows.Next() {
-		var lang Language
-		err := rows.Scan(
-			&lang.Id,
-			&lang.Lang,
-			&lang.Name,
-			&lang.Path,
-		)
-		if err != nil {
-			return nil, err
-		}
-		languages = append(languages, lang)
-	}
-
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-
-	return languages, nil
-}
-
-func (m FoundryStateModel) DeleteModules(idState int64) error {
-	if idState < 1 {
-		return ErrorRecordNotFound
-	}
-
-	query := `
-		DELETE FROM modules
-		WHERE state_id = $1`
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	result, err := m.DB.ExecContext(ctx, query, idState)
-	if err != nil {
-		return err
-	}
-
-	rowsAffected, err := result.RowsAffected()
-	if err != nil {
-		return err
-	}
-	if rowsAffected == 0 {
-		return ErrorRecordNotFound
-	}
-
-	return nil
-}
-
-func (m FoundryStateModel) DeleteModule(idModule int64) error {
-	if idModule < 1 {
-		return ErrorRecordNotFound
-	}
-
-	query := `
-		DELETE FROM modules
-		WHERE id = $1`
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	result, err := m.DB.ExecContext(ctx, query, idModule)
-	if err != nil {
-		return err
-	}
-
-	rowsAffected, err := result.RowsAffected()
-	if err != nil {
-		return err
-	}
-	if rowsAffected == 0 {
-		return ErrorRecordNotFound
-	}
-
-	return nil
 }

internal/foundry/models/db/options.go

@@ -14,15 +14,21 @@ type GameOptions struct {
 	Port          int
 }
 
-func (g *GameOptions) Insert(tx *sqlx.Tx, gameId *InsertId[uint]) error {
+func (g *GameOptions) Query(data *InsertId[uint]) {
-	query := `
+	data.query = `
-		INSERT INTO featured_content (game_id, language, update_channel, port)
+		INSERT INTO game_options (game_id, language, update_channel, port)
 		VALUES ($1, $2, $3, $4)
 		RETURNING id`
+}
 
-	args := []any{gameId.id, g.Language, g.UpdateChannel, g.Port}
+func (g *GameOptions) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
 
-	err := tx.QueryRowx(query, args...).Scan(&g.ID)
+	args := []any{data.id, g.Language, g.UpdateChannel, g.Port}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&g.ID)
 	if err != nil {
 		return err
 	}
@@ -30,15 +36,14 @@ func (g *GameOptions) Insert(tx *sqlx.Tx, gameId *InsertId[uint]) error {
 	return nil
 }
 
-func (g *GameOptions) InsertCtx(ctx context.Context, tx *sqlx.Tx, gameId *InsertId[uint]) error {
+func (g *GameOptions) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
-	query := `
+	if data.query == "" {
-		INSERT INTO featured_content (game_id, language, update_channel, port)
+		return ErrNoQuery
-		VALUES ($1, $2, $3, $4)
+	}
-		RETURNING id`
 
-	args := []any{gameId.id, g.Language, g.UpdateChannel, g.Port}
+	args := []any{data.id, g.Language, g.UpdateChannel, g.Port}
 
-	err := tx.QueryRowxContext(ctx, query, args...).Scan(&g.ID)
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&g.ID)
 	if err != nil {
 		return err
 	}
@@ -71,7 +76,7 @@ func (s *SetupOptions) Query(data *InsertId[uint]) {
 	data.query = `
 		INSERT INTO setup_options (setup_id, css_theme, data_path, hostname, language, local_hostname, 
 			update_channel, port, compress_socket, compress_static, fullscreen, hot_reload, proxy_ssl,
-			telemetry, upnp, delete_nedb, no_backups,)
+			telemetry, upnp, delete_nedb, no_backups)
 		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17)
 		RETURNING id`
 }

internal/foundry/models/db/ownership.go

@@ -0,0 +1,101 @@
+package db
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/jmoiron/sqlx"
+)
+
+type Ownership struct {
+	ID uint
+
+	Player    string
+	Trusted   string
+	Assistant string
+}
+
+func (o Ownership) Query(data *InsertId[string]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO ownership (%s, player, trusted, assistant)
+		VALUES ($1, $2, $3, $4)
+		RETURNING id`, data.fieldName)
+}
+
+func (o Ownership) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, o.Player, o.Trusted, o.Assistant}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&o.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (o Ownership) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, o.Player, o.Trusted, o.Assistant}
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&o.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+type OwnershipString struct {
+	ID uint
+
+	Key   string
+	Value int
+}
+
+func (o OwnershipString) Query(data *InsertId[string]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO ownership_string (%s, key_, value)
+		VALUES ($1, $2, $3)
+		RETURNING id`, data.fieldName)
+}
+
+func (o OwnershipString) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, o.Key, o.Value}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&o.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (o OwnershipString) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, o.Key, o.Value}
+
+	mutex := GetMutex("ownership_string_insert")
+	mutex.Lock()
+	defer mutex.Unlock()
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&o.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

internal/foundry/models/db/pack.go

@@ -0,0 +1,211 @@
+package db
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+	"fmt"
+	"strings"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
+)
+
+type Pack struct {
+	ID string
+
+	Name        string
+	Label       string
+	Banner      string
+	Path        string
+	Type        string
+	System      string
+	PackageType string
+	PackageName string
+	Ownership   Ownership
+	Index       []*Index
+	Folders     []*PackFolder
+}
+
+func (p *Pack) Query(data *InsertId[string]) {
+	if !strings.EqualFold(data.fieldName, "game_id") {
+		data.query = fmt.Sprintf(`
+			INSERT INTO pack (%s, id, name, label, banner, path, type, system, package_type, package_name)
+			VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
+			ON CONFLICT(id) DO NOTHING`, data.fieldName)
+	} else {
+		data.query = `
+			INSERT INTO pack (module_id, id, name, label, banner, path, type, system, package_type, package_name)
+			VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
+			ON CONFLICT(id) DO NOTHING`
+	}
+}
+
+func (p *Pack) ConnectGameQuery(data *InsertId[string]) {
+	data.query = `
+		INSERT INTO game_to_pack (game_id, pack_id)
+		VALUES ($1, $2)`
+}
+
+func (p *Pack) InsertObjects(tx *sqlx.Tx) error {
+	group, _ := errgroup.WithContext(context.Background())
+
+	InsertWithCtxParallel(group, tx, p.Ownership,
+		InsertId[string]{id: p.ID, fieldName: "pack_id"})
+
+	relId := InsertId[string]{id: p.ID, fieldName: "pack_id"}
+	InsertSliceParallel(group, tx, p.Index, relId)
+	InsertSliceParallel(group, tx, p.Folders, relId)
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (p *Pack) ConnectGame(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, p.ID}
+
+	_, err := tx.Exec(data.query, args...)
+	return err
+}
+
+func (p *Pack) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	var dataId *string
+	if !strings.EqualFold(data.fieldName, "game_id") {
+		dataId = &data.id
+	}
+
+	args := []any{dataId, p.ID, p.Name, p.Label, p.Banner, p.Path, p.Type,
+		p.System, p.PackageType, p.PackageName}
+
+	mutex := GetMutex("pack_insert")
+	mutex.Lock()
+	defer mutex.Unlock()
+
+	res, err := tx.Exec(data.query, args...)
+	if err != nil {
+		return err
+	}
+
+	rowsAffected, err := res.RowsAffected()
+	if rowsAffected != 0 {
+		err = p.InsertObjects(tx)
+		if err != nil {
+			return err
+		}
+	}
+
+	if dataId == nil {
+		dataCopy := *data
+		p.ConnectGameQuery(&dataCopy)
+		err = p.ConnectGame(tx, &dataCopy)
+	}
+
+	return err
+}
+
+func (p *Pack) ConnectGameCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, p.ID}
+
+	_, err := tx.ExecContext(ctx, data.query, args...)
+	return err
+}
+
+func (p *Pack) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	var dataId *string
+	if !strings.EqualFold(data.fieldName, "game_id") {
+		dataId = &data.id
+	}
+
+	args := []any{dataId, p.ID, p.Name, p.Label, p.Banner, p.Path, p.Type,
+		p.System, p.PackageType, p.PackageName}
+
+	mutex := GetMutex("pack_insert")
+	mutex.Lock()
+	defer mutex.Unlock()
+
+	res, err := tx.ExecContext(ctx, data.query, args...)
+	if err != nil {
+		return err
+	}
+
+	rowsAffected, err := res.RowsAffected()
+	if rowsAffected != 0 {
+		err = p.InsertObjects(tx)
+		if err != nil {
+			return err
+		}
+	}
+
+	if dataId == nil {
+		dataCopy := *data
+		p.ConnectGameQuery(&dataCopy)
+		err = p.ConnectGameCtx(ctx, tx, &dataCopy)
+	}
+
+	return err
+}
+
+type PackFolder struct {
+	ID string
+
+	Description string
+	Name        string
+	Sorting     string
+	Type        string
+	Sort        int
+}
+
+func (p *PackFolder) Query(data *InsertId[string]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO pack_folder (%s, id, description, name, sorting, type, sort)
+		VALUES ($1, $2, $3, $4, $5, $6, $7)`, data.fieldName)
+}
+
+func (p *PackFolder) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, p.ID, p.Description, p.Name, p.Sorting, p.Type, p.Sort}
+
+	_, err := tx.Exec(data.query, args...)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (p *PackFolder) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, p.ID, p.Description, p.Name, p.Sorting, p.Type, p.Sort}
+
+	_, err := tx.ExecContext(ctx, data.query, args...)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

internal/foundry/models/db/package_warnings.go

@@ -0,0 +1,173 @@
+package db
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+	"fmt"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
+)
+
+type PackageWarning struct {
+	ID uint
+
+	Key   string
+	Value *PackageWarningsData
+}
+
+func (p *PackageWarning) Query(data *InsertId[uint]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO package_warnings (%s, key_)
+		VALUES ($1, $2)
+		RETURNING id`, data.fieldName)
+}
+
+func (p *PackageWarning) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, p.Key}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&p.ID)
+	if err != nil {
+		return err
+	}
+
+	InsertWithCtx(tx, p.Value, InsertId[uint]{id: p.ID})
+
+	return nil
+}
+
+func (p *PackageWarning) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, p.Key}
+
+	mutex := GetMutex("package_warning_insert")
+	mutex.Lock()
+	defer mutex.Unlock()
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&p.ID)
+	if err != nil {
+		return err
+	}
+
+	return InsertWithCtx(tx, p.Value, InsertId[uint]{id: p.ID})
+}
+
+type PackageWarningsData struct {
+	ID string
+
+	Type          string
+	Manifest      string
+	Reinstallable bool
+	Warning       []string
+	Error         []string
+}
+
+func (p *PackageWarningsData) InsertObjects(tx *sqlx.Tx) error {
+	group, _ := errgroup.WithContext(context.Background())
+
+	warningData := &InsertId[string]{id: p.ID, fieldName: "package_warnings_data_id", tableName: "package_warnings_data_warning"}
+	InsertSimpleSliceParallel(group, tx, p.Warning, warningData)
+	errorData := &InsertId[string]{id: p.ID, fieldName: "package_warnings_data_id", tableName: "package_warnings_data_error"}
+	InsertSimpleSliceParallel(group, tx, p.Warning, errorData)
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (p *PackageWarningsData) Query(data *InsertId[uint]) {
+	data.query = `
+		INSERT INTO package_warnings_data (id, type, reinstallable, manifest)
+		VALUES ($1, $2, $3, $4)
+		ON CONFLICT(id) DO NOTHING`
+}
+
+func (p *PackageWarningsData) ConnectGameQuery(data *InsertId[uint]) {
+	data.query = `
+		INSERT INTO package_warnings_to_data (package_warnings_id, package_warnings_data_id)
+		VALUES ($1, $2)`
+}
+
+func (p *PackageWarningsData) ConnectGame(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, p.ID}
+
+	_, err := tx.Exec(data.query, args...)
+	return err
+}
+
+func (p *PackageWarningsData) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{p.ID, p.Type, p.Reinstallable, p.Manifest}
+
+	res, err := tx.Exec(data.query, args...)
+	if err != nil {
+		return err
+	}
+
+	rowsAffected, err := res.RowsAffected()
+	if rowsAffected != 0 {
+		err = p.InsertObjects(tx)
+	}
+	if err != nil {
+		return err
+	}
+
+	dataCopy := *data
+	p.ConnectGameQuery(&dataCopy)
+
+	return p.ConnectGame(tx, &dataCopy)
+}
+
+func (p *PackageWarningsData) ConnectGameCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, p.ID}
+
+	_, err := tx.ExecContext(ctx, data.query, args...)
+	return err
+}
+
+func (p *PackageWarningsData) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{p.ID, p.Type, p.Reinstallable, p.Manifest}
+
+	res, err := tx.ExecContext(ctx, data.query, args...)
+	if err != nil {
+		return err
+	}
+
+	rowsAffected, err := res.RowsAffected()
+	if rowsAffected != 0 {
+		err = p.InsertObjects(tx)
+	}
+	if err != nil {
+		return err
+	}
+
+	dataCopy := *data
+	p.ConnectGameQuery(&dataCopy)
+
+	return p.ConnectGameCtx(ctx, tx, &dataCopy)
+}

internal/foundry/models/db/playlist.go

@@ -0,0 +1,145 @@
+package db
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
+)
+
+type Playlist struct {
+	ID string
+
+	Name        string
+	Folder      string
+	Sorting     string
+	Description string
+	Channel     string
+	Mode        int
+	Fade        int
+	Seed        int
+	Sort        int
+	Playing     bool
+	Stats       Stats
+	Ownership   []OwnershipString
+	Sounds      []*Sound
+}
+
+func (p *Playlist) Query(data *InsertId[uint]) {
+	data.query = `
+		INSERT INTO playlist (game_id, id, name, folder, sorting, description, channel, mode, fade, seed, sort, playing)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
+		ON CONFLICT(id) DO UPDATE SET
+			game_id = EXCLUDED.game_id,
+			updated_at = datetime('now')
+		RETURNING (created_at == updated_at) AS is_inserted`
+}
+
+func (p *Playlist) InsertObjects(tx *sqlx.Tx) error {
+	group, _ := errgroup.WithContext(context.Background())
+
+	relId := InsertId[string]{id: p.ID, fieldName: "playlist_id"}
+	InsertWithCtxParallel(group, tx, p.Stats, relId)
+	InsertSliceParallel(group, tx, p.Ownership, relId)
+	InsertSliceParallel(group, tx, p.Sounds, relId)
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (p *Playlist) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, p.ID, p.Name, p.Folder, p.Sorting, p.Description, p.Channel, p.Mode, p.Fade, p.Seed, p.Sort, p.Playing}
+
+	var isInserted bool
+	err := tx.QueryRowx(data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return p.InsertObjects(tx)
+	}
+	return nil
+}
+
+func (p *Playlist) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, p.ID, p.Name, p.Folder, p.Sorting, p.Description, p.Channel, p.Mode, p.Fade, p.Seed, p.Sort, p.Playing}
+
+	var isInserted bool
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return p.InsertObjects(tx)
+	}
+	return nil
+}
+
+type Sound struct {
+	ID string
+
+	Name        string
+	Path        string
+	Channel     string
+	Description string
+	Fade        int
+	Sort        int
+	Repeat      bool
+	Playing     bool
+	Volume      float64
+	PausedTime  float64
+}
+
+func (s *Sound) Query(data *InsertId[string]) {
+	data.query = `
+		INSERT INTO sound (playlist_id, id, name, path, channel, description, fade, sort, repeat, playing, volume, paused_time)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
+		ON CONFLICT(id) DO UPDATE SET
+			playlist_id = EXCLUDED.playlist_id,
+			updated_at = datetime('now')`
+}
+
+func (s *Sound) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, s.ID, s.Name, s.Path, s.Channel, s.Description, s.Fade, s.Sort, s.Repeat, s.Playing, s.Volume, s.PausedTime}
+
+	_, err := tx.Exec(data.query, args...)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (s *Sound) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, s.ID, s.Name, s.Path, s.Channel, s.Description, s.Fade, s.Sort, s.Repeat, s.Playing, s.Volume, s.PausedTime}
+
+	_, err := tx.ExecContext(ctx, data.query, args...)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

internal/foundry/models/db/relationships.go

@@ -0,0 +1,135 @@
+package db
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+	"fmt"
+	"strconv"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
+)
+
+type Relationships struct {
+	ID uint
+
+	Systems    []RelationshipsData
+	Requires   []RelationshipsData
+	Recommends []RelationshipsData
+	Conflicts  []RelationshipsData
+}
+
+func (r Relationships) Query(data *InsertId[string]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO relationships (%s)
+		VALUES ($1)
+		RETURNING id`, data.fieldName)
+}
+
+func (r Relationships) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&r.ID)
+	if err != nil {
+		return err
+	}
+
+	group, _ := errgroup.WithContext(context.Background())
+
+	InsertSliceParallel(group, tx, r.Systems, InsertId[uint]{id: r.ID, tableName: "relationships_systems"})
+	InsertSliceParallel(group, tx, r.Requires, InsertId[uint]{id: r.ID, tableName: "relationships_requires"})
+	InsertSliceParallel(group, tx, r.Recommends, InsertId[uint]{id: r.ID, tableName: "relationships_recommends"})
+	InsertSliceParallel(group, tx, r.Conflicts, InsertId[uint]{id: r.ID, tableName: "relationships_conflicts"})
+
+	err = group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (r Relationships) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id}
+
+	mutex := GetMutex("relationships_insert")
+	mutex.Lock()
+	defer mutex.Unlock()
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&r.ID)
+	if err != nil {
+		return err
+	}
+
+	group, _ := errgroup.WithContext(context.Background())
+
+	InsertSliceParallel(group, tx, r.Systems, InsertId[uint]{id: r.ID, tableName: "relationships_systems"})
+	InsertSliceParallel(group, tx, r.Requires, InsertId[uint]{id: r.ID, tableName: "relationships_requires"})
+	InsertSliceParallel(group, tx, r.Recommends, InsertId[uint]{id: r.ID, tableName: "relationships_recommends"})
+	InsertSliceParallel(group, tx, r.Conflicts, InsertId[uint]{id: r.ID, tableName: "relationships_conflicts"})
+
+	err = group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+type RelationshipsData struct {
+	ID uint
+
+	Key           string
+	Type          string
+	Manifest      string
+	Compatibility Compatibility
+}
+
+func (r RelationshipsData) Query(data *InsertId[uint]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO %s (relationships_id, key_, type, manifest)
+		VALUES ($1, $2, $3, $4)`, data.tableName)
+}
+
+func (r RelationshipsData) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, r.Key, r.Type, r.Manifest}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&r.ID)
+	if err != nil {
+		return err
+	}
+
+	group, _ := errgroup.WithContext(context.Background())
+	InsertWithCtxParallel(group, tx, r.Compatibility, InsertId[string]{id: strconv.FormatUint(uint64(r.ID), 10), fieldName: fmt.Sprintf("%s_id", data.tableName)})
+
+	return group.Wait()
+}
+
+func (r RelationshipsData) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, r.Key, r.Type, r.Manifest}
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&r.ID)
+	if err != nil {
+		return err
+	}
+
+	group, _ := errgroup.WithContext(context.Background())
+	InsertWithCtxParallel(group, tx, r.Compatibility, InsertId[string]{id: strconv.FormatUint(uint64(r.ID), 10), fieldName: fmt.Sprintf("%s_id", data.tableName)})
+
+	return group.Wait()
+}

internal/foundry/models/db/release.go

@@ -22,7 +22,7 @@ type Release struct {
 
 func (r *Release) Query(data *InsertId[uint]) {
 	data.query = fmt.Sprintf(`
-		INSERT INTO release_ (%s, generaion, build, node_version, max_generation, max_stable_generation,
+		INSERT INTO release_ (%s, generation, build, node_version, max_generation, max_stable_generation,
 			time, channel, suffix)
 		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
 		RETURNING id`, data.fieldName)

internal/foundry/models/db/ring.go

@@ -0,0 +1,159 @@
+package db
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+	"fmt"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
+)
+
+type Ring struct {
+	ID uint
+
+	Enabled    bool
+	Effects    int
+	RingColors RingColors
+	Subject    Subject
+}
+
+func (r *Ring) Query(data *InsertId[uint]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO ring (%s, enabled, effects)
+		VALUES ($1, $2, $3)
+		RETURNING id`, data.fieldName)
+}
+
+func (r *Ring) InsertObjects(tx *sqlx.Tx) error {
+	group, _ := errgroup.WithContext(context.Background())
+
+	relId := InsertId[uint]{id: r.ID, fieldName: "ring_id"}
+	InsertWithCtxParallel(group, tx, r.RingColors, relId)
+	InsertWithCtxParallel(group, tx, r.Subject, relId)
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (r *Ring) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, r.Enabled, r.Effects}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&r.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (r *Ring) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, r.Enabled, r.Effects}
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&r.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+type RingColors struct {
+	ID uint
+
+	Ring       string
+	Background string
+}
+
+func (r RingColors) Query(data *InsertId[uint]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO ring_colors (%s, ring, background)
+		VALUES ($1, $2, $3)
+		RETURNING id`, data.fieldName)
+}
+
+func (r RingColors) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, r.Ring, r.Background}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&r.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (r RingColors) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, r.Ring, r.Background}
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&r.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+type Subject struct {
+	ID uint
+
+	Scale   int
+	Texture string
+}
+
+func (s Subject) Query(data *InsertId[uint]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO ring_colors (%s, scale, texture)
+		VALUES ($1, $2, $3)
+		RETURNING id`, data.fieldName)
+}
+
+func (s Subject) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, s.Scale, s.Texture}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&s.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (s Subject) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, s.Scale, s.Texture}
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&s.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

internal/foundry/models/db/scene.go

@@ -21,7 +21,7 @@ type Scene struct {
 	Grid                SceneGrid
 	TokenVision         bool
 	Drawings            []SceneDrawing
-	Tokens              []Token
+	Tokens              []*Token
 	Lights              []SceneLight
 	Notes               []Note
 	Sounds              []ScenesSound
@@ -119,7 +119,7 @@ type SceneLight struct {
 	Rotation  int
 	Walls     bool
 	Vision    bool
-	Config    Light
+	Config    *Light
 	Hidden    bool
 	Elevation int
 }

internal/foundry/models/db/settings.go

@@ -0,0 +1,79 @@
+package db
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
+)
+
+type Setting struct {
+	ID string
+
+	Key   string
+	Value string
+	Stats Stats
+}
+
+func (s *Setting) Query(data *InsertId[uint]) {
+	data.query = `
+		INSERT INTO setting (game_id, id, key_, value)
+		VALUES ($1, $2, $3, $4)
+		ON CONFLICT(id) DO UPDATE SET
+			game_id = EXCLUDED.game_id,
+			updated_at = datetime('now')
+		RETURNING (created_at == updated_at) AS is_inserted`
+}
+
+func (s *Setting) InsertObjects(tx *sqlx.Tx) error {
+	group, _ := errgroup.WithContext(context.Background())
+
+	relId := InsertId[string]{id: s.ID, fieldName: "setting_id"}
+	InsertWithCtxParallel(group, tx, s.Stats, relId)
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (s *Setting) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, s.ID, s.Key, s.Value}
+
+	var isInserted bool
+	err := tx.QueryRowx(data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return s.InsertObjects(tx)
+	}
+	return nil
+}
+
+func (s *Setting) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, s.ID, s.Key, s.Value}
+
+	var isInserted bool
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return s.InsertObjects(tx)
+	}
+	return nil
+}

internal/foundry/models/db/setup.go

@@ -2,10 +2,13 @@ package db
 
 import (
 	"context"
+	"database/sql"
+	"errors"
 	"strconv"
 	"time"
 
 	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
 )
 
 type Setup struct {
@@ -28,29 +31,32 @@ type Setup struct {
 }
 
 func (s *Setup) InsertObjects(tx *sqlx.Tx) error {
-	relData := &InsertId[uint]{id: s.ID, fieldName: "setup_id"}
+	relData := InsertId[uint]{id: s.ID, fieldName: "setup_id"}
-	syncDB := NewSyncDB()
+	group, _ := errgroup.WithContext(context.Background())
-	defer close(syncDB.errChan)
 
-	InsertWithCtxParallel(syncDB, tx, &s.CoreUpdate, relData)
+	InsertWithCtxParallel(group, tx, &s.CoreUpdate, relData)
-	InsertWithCtxParallel(syncDB, tx, &s.FeaturedContent, relData)
+	InsertWithCtxParallel(group, tx, &s.FeaturedContent, relData)
-	InsertWithCtxParallel(syncDB, tx, &s.Files, relData)
+	InsertWithCtxParallel(group, tx, &s.Files, relData)
-	InsertWithCtxParallel(syncDB, tx, s.Options, relData)
+	InsertWithCtxParallel(group, tx, s.Options, relData)
-	InsertWithCtxParallel(syncDB, tx, &s.Release, relData)
+	InsertWithCtxParallel(group, tx, &s.Release, relData)
 
-	InsertSliceParallel(syncDB, tx, s.Languages, relData)
+	InsertSliceParallel(group, tx, s.Languages, relData)
-	InsertSliceParallel(syncDB, tx, s.Modules, relData)
+	InsertSliceParallel(group, tx, s.Modules, relData)
-	InsertSliceParallel(syncDB, tx, s.News, relData)
+	InsertSliceParallel(group, tx, s.News, relData)
-	InsertSliceParallel(syncDB, tx, s.PackageWarnings, relData)
+	InsertSliceParallel(group, tx, s.PackageWarnings, relData)
 
-	relDataString := &InsertId[string]{
+	relDataString := InsertId[string]{
 		id:        strconv.FormatUint(uint64(s.ID), 10),
 		fieldName: "setup_id",
 	}
-	InsertSliceParallel(syncDB, tx, s.Systems, relDataString)
+	InsertSliceParallel(group, tx, s.Systems, relDataString)
-	InsertSliceParallel(syncDB, tx, s.Worlds, relDataString)
+	InsertSliceParallel(group, tx, s.Worlds, relDataString)
 
-	return syncDB.Wait()
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
 }
 
 func (s *Setup) Insert(db *sqlx.DB) error {
@@ -67,7 +73,7 @@ func (s *Setup) Insert(db *sqlx.DB) error {
 	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
 	defer cancel()
 
-	err := tx.QueryRowContext(ctx, query, args...).Scan(&s.ID, &s.CreatedAt)
+	err := tx.QueryRowxContext(ctx, query, args...).Scan(&s.ID, &s.CreatedAt)
 	if err != nil {
 		return err
 	}
@@ -149,7 +155,7 @@ func (n *News) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
 
 	args := []any{data.id, n.Title, n.Caption, n.URL, n.Image}
 
-	err := tx.QueryRow(data.query, args...).Scan(&n.ID)
+	err := tx.QueryRowx(data.query, args...).Scan(&n.ID)
 	if err != nil {
 		return err
 	}
@@ -164,10 +170,25 @@ func (n *News) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint])
 
 	args := []any{data.id, n.Title, n.Caption, n.URL, n.Image}
 
-	err := tx.QueryRowContext(ctx, data.query, args...).Scan(&n.ID)
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&n.ID)
 	if err != nil {
 		return err
 	}
 
 	return nil
 }
+
+func HasSetup(db *sqlx.DB) (bool, error) {
+	const query = `
+		SELECT EXISTS(SELECT 1 FROM setup)`
+
+	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+	defer cancel()
+
+	var exists bool
+	err := db.GetContext(ctx, &exists, query)
+	if err != nil {
+		return false, err
+	}
+	return exists, nil
+}

internal/foundry/models/db/stats.go

@@ -0,0 +1,58 @@
+package db
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/jmoiron/sqlx"
+)
+
+type Stats struct {
+	ID uint
+
+	CoreVersion    string
+	SystemID       string
+	SystemVersion  string
+	LastModifiedBy string
+	ModifiedTime   int64
+}
+
+func (s Stats) Query(data *InsertId[string]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO stats (%s, core_version, system_id, system_version, last_modified_by, modified_time)
+		VALUES ($1, $2, $3, $4, $5, $6)`, data.fieldName)
+}
+
+func (s Stats) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, s.CoreVersion, s.SystemID, s.SystemVersion, s.LastModifiedBy, s.ModifiedTime}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&s.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (s Stats) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, s.CoreVersion, s.SystemID, s.SystemVersion, s.LastModifiedBy, s.ModifiedTime}
+
+	mutex := GetMutex("stats_insert")
+	mutex.Lock()
+	defer mutex.Unlock()
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&s.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

internal/foundry/models/db/style.go

@@ -27,7 +27,7 @@ func (s *Style) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
 
 	args := []any{data.id, s.Src}
 
-	err := tx.QueryRow(data.query, args...).Scan(&s.ID)
+	err := tx.QueryRowx(data.query, args...).Scan(&s.ID)
 	if err != nil {
 		return err
 	}
@@ -42,7 +42,11 @@ func (s *Style) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[strin
 
 	args := []any{data.id, s.Src}
 
-	err := tx.QueryRowContext(ctx, data.query, args...).Scan(&s.ID)
+	mutex := GetMutex("style_insert")
+	mutex.Lock()
+	defer mutex.Unlock()
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&s.ID)
 	if err != nil {
 		return err
 	}

internal/foundry/models/db/system.go

@@ -4,201 +4,186 @@ import (
 	"context"
 	"database/sql"
 	"errors"
-	"time"
+	"strings"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
 )
 
 type System struct {
-	Id            int64
+	ID string
-	TextId        string
+
-	Title         string
+	Title                 string
-	Description   string
+	Description           string
-	Url           string
+	URL                   string
-	Download      string
+	License               string
-	CreatedAt     time.Time
+	Bugs                  string
-	Compatibility Compatibility
+	Changelog             string
+	Version               string
+	Manifest              string
+	Download              string
+	Background            string
+	PrimaryTokenAttribute string
+	Availability          int
+	Socket                bool
+	Protected             bool
+	Exclusive             bool
+	PersistentStorage     bool
+	Locked                bool
+	Owned                 bool
+	HasStorage            bool
+	Compatibility         Compatibility
+	Relationships         Relationships
+	DocumentTypes         DocumentTypes
+	Grid                  *Grid
+	Esmodules             []string
+	Scripts               []string
+	Tags                  []string
+	Authors               []*Author
+	Media                 []*Media
+	Packs                 []*Pack
+	Styles                []*Style
+	Languages             []*Language
+	PackFolders           []*Folder
 }
 
-type Systems []System
+func (s *System) Query(data *InsertId[string]) {
-
+	data.query = `
-func (systems Systems) GetById(id int) *System {
+		INSERT INTO system (setup_id, id, title, description, url, license, bugs, changelog, version, manifest, 
-	return &systems[id]
+			download, background, primary_token_attribute, availability, socket, protected, exclusive_,
+			persistent_storage, locked, owned, has_storage)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21)
+		ON CONFLICT(id) DO NOTHING`
 }
 
-func (m FoundryStateModel) InsertSystem(system *System, stateId int64) error {
+func (s *System) ConnectGameQuery(data *InsertId[string]) {
-	query := `
+	data.query = `
-		INSERT INTO systems (state_id, text_id, title, description, url, download)
+		INSERT INTO game_to_systems (game_id, system_id)
-		VALUES ($1, $2, $3, $4, $5, $6)
+		VALUES ($1, $2)`
-		RETURNING id, created_at`
-
-	args := []any{stateId, system.TextId, system.Title, system.Description, system.Url, system.Download}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	err := m.DB.QueryRowContext(ctx, query, args...).Scan(&system.Id, &system.CreatedAt)
-	if err != nil && err != sql.ErrNoRows {
-		return err
-	}
-	return m.InsertSystemCompatibility(&system.Compatibility, system.Id)
 }
 
-func (m FoundryStateModel) InsertSystemCompatibility(compatibility *Compatibility, systemId int64) error {
+func (s *System) InsertObjects(tx *sqlx.Tx) error {
-	query := `
+	relId := InsertId[string]{id: s.ID, fieldName: "system_id"}
-		INSERT INTO systems_compatibility (system_id, minimum, verified, maximum)
+	group, _ := errgroup.WithContext(context.Background())
-		VALUES ($1, $2, $3, $4)`
 
-	args := []any{systemId, compatibility.Minimum, compatibility.Verified, compatibility.Maximum}
+	InsertWithCtxParallel(group, tx, s.Compatibility, relId)
+	InsertWithCtxParallel(group, tx, s.Relationships, relId)
+	InsertWithCtxParallel(group, tx, s.DocumentTypes, relId)
+	InsertWithCtxParallel(group, tx, s.Grid, relId)
 
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+	esModulesRelId := &InsertId[string]{id: s.ID, fieldName: "system_id", tableName: "es_modules"}
-	defer cancel()
+	InsertSimpleSliceParallel(group, tx, s.Esmodules, esModulesRelId)
+	scriptRelId := &InsertId[string]{id: s.ID, fieldName: "system_id", tableName: "scripts"}
+	InsertSimpleSliceParallel(group, tx, s.Scripts, scriptRelId)
+	tagsRelId := &InsertId[string]{id: s.ID, fieldName: "system_id", tableName: "tags"}
+	InsertSimpleSliceParallel(group, tx, s.Tags, tagsRelId)
 
-	err := m.DB.QueryRowContext(ctx, query, args...).Scan(&compatibility.Id)
+	InsertSliceParallel(group, tx, s.Authors, relId)
-	if err != nil && err != sql.ErrNoRows {
+	InsertSliceParallel(group, tx, s.Media, relId)
+	InsertSliceParallel(group, tx, s.Styles, relId)
+	InsertSliceParallel(group, tx, s.Languages, relId)
+	InsertSliceParallel(group, tx, s.Packs, relId)
+	InsertSliceParallel(group, tx, s.PackFolders, relId)
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
 		return err
 	}
 	return nil
 }
 
-func (m FoundryStateModel) GetSystems(idState int64) (Systems, error) {
+func (s *System) ConnectGame(tx *sqlx.Tx, data *InsertId[string]) error {
-	if idState < 1 {
+	if data.query == "" {
-		return nil, ErrorRecordNotFound
+		return ErrNoQuery
 	}
 
-	query := `
+	args := []any{data.id, s.ID}
-		SELECT id, created_at, text_id, title, description, url, download
-		FROM systems
-		WHERE state_id = $1`
 
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+	_, err := tx.Exec(data.query, args...)
-	defer cancel()
+	return err
+}
 
-	rows, err := m.DB.QueryContext(ctx, query, idState)
+func (s *System) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	var dataId *string
+	if strings.EqualFold(data.fieldName, "setup_id") {
+		dataId = &data.id
+	}
+
+	args := []any{dataId, s.ID, s.Title, s.Description, s.URL, s.License, s.Bugs,
+		s.Changelog, s.Version, s.Manifest, s.Download, s.Background,
+		s.PrimaryTokenAttribute, s.Availability, s.Socket, s.Protected, s.Exclusive,
+		s.PersistentStorage, s.Locked, s.Owned, s.HasStorage}
+
+	res, err := tx.Exec(data.query, args...)
 	if err != nil {
-		switch {
+		return err
-		case errors.Is(err, sql.ErrNoRows):
-			return nil, ErrorRecordNotFound
-		default:
-			return nil, err
-		}
 	}
 
-	systems := make(Systems, 0, 1)
+	rowsAffected, err := res.RowsAffected()
-
+	if rowsAffected != 0 {
-	for rows.Next() {
+		err = s.InsertObjects(tx)
-		var system System
-		err := rows.Scan(
-			&system.Id,
-			&system.CreatedAt,
-			&system.TextId,
-			&system.Title,
-			&system.Description,
-			&system.Url,
-			&system.Download,
-		)
 		if err != nil {
-			return nil, err
+			return err
 		}
-		compatibility, err := m.GetModuleCompatibility(system.Id)
+	}
+
+	if dataId == nil {
+		dataCopy := *data
+		s.ConnectGameQuery(&dataCopy)
+		err = s.ConnectGame(tx, &dataCopy)
+	}
+
+	return err
+}
+
+func (s *System) ConnectGameCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, s.ID}
+
+	_, err := tx.ExecContext(ctx, data.query, args...)
+	return err
+}
+
+func (s *System) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	var dataId *string
+	if strings.EqualFold(data.fieldName, "setup_id") {
+		dataId = &data.id
+	}
+
+	args := []any{dataId, s.ID, s.Title, s.Description, s.URL, s.License, s.Bugs,
+		s.Changelog, s.Version, s.Manifest, s.Download, s.Background,
+		s.PrimaryTokenAttribute, s.Availability, s.Socket, s.Protected, s.Exclusive,
+		s.PersistentStorage, s.Locked, s.Owned, s.HasStorage}
+
+	res, err := tx.ExecContext(ctx, data.query, args...)
+	if err != nil {
+		return err
+	}
+
+	rowsAffected, err := res.RowsAffected()
+	if rowsAffected != 0 {
+		err = s.InsertObjects(tx)
 		if err != nil {
-			return nil, err
+			return err
-		}
-		system.Compatibility = *compatibility
-		systems = append(systems, system)
-	}
-
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-
-	return systems, nil
-}
-
-func (m FoundryStateModel) GetSystemCompatibility(idSystem int64) (*Compatibility, error) {
-	if idSystem < 1 {
-		return nil, ErrorRecordNotFound
-	}
-
-	query := `
-		SELECT id, minimum, verified, maximum
-		FROM systems_compatibility
-		WHERE system_id = $1`
-
-	var compatibility Compatibility
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	err := m.DB.QueryRowContext(ctx, query, idSystem).Scan(
-		&compatibility.Id,
-		&compatibility.Minimum,
-		&compatibility.Verified,
-		&compatibility.Maximum,
-	)
-
-	if err != nil {
-		switch {
-		case errors.Is(err, sql.ErrNoRows):
-			return nil, ErrorRecordNotFound
-		default:
-			return nil, err
 		}
 	}
 
-	return &compatibility, nil
+	if dataId == nil {
-}
+		dataCopy := *data
-
+		s.ConnectGameQuery(&dataCopy)
-func (m FoundryStateModel) DeleteSystems(idState int64) error {
+		err = s.ConnectGameCtx(ctx, tx, &dataCopy)
-	if idState < 1 {
+	}
-		return ErrorRecordNotFound
+
-	}
+	return err
-
-	query := `
-		DELETE FROM systems
-		WHERE state_id = $1`
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	result, err := m.DB.ExecContext(ctx, query, idState)
-	if err != nil {
-		return err
-	}
-
-	rowsAffected, err := result.RowsAffected()
-	if err != nil {
-		return err
-	}
-	if rowsAffected == 0 {
-		return ErrorRecordNotFound
-	}
-
-	return nil
-}
-
-func (m FoundryStateModel) DeleteSystem(idSystem int64) error {
-	if idSystem < 1 {
-		return ErrorRecordNotFound
-	}
-
-	query := `
-		DELETE FROM systems
-		WHERE id = $1`
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	result, err := m.DB.ExecContext(ctx, query, idSystem)
-	if err != nil {
-		return err
-	}
-
-	rowsAffected, err := result.RowsAffected()
-	if err != nil {
-		return err
-	}
-	if rowsAffected == 0 {
-		return ErrorRecordNotFound
-	}
-
-	return nil
 }

internal/foundry/models/db/table.go

@@ -0,0 +1,163 @@
+package db
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
+)
+
+type Table struct {
+	ID string
+
+	Name        string
+	Description string
+	Formula     string
+	Img         string
+	Folder      string
+	Sort        int
+	Replacement bool
+	DisplayRoll bool
+	Stats       Stats
+	Ownership   []OwnershipString
+	Results     []*TableResult
+}
+
+func (t *Table) Query(data *InsertId[uint]) {
+	data.query = `
+		INSERT INTO table_ (game_id, id, name, description, formula, img, folder, sort, replacement, display_roll)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
+		ON CONFLICT(id) DO UPDATE SET
+			game_id = EXCLUDED.game_id,
+			updated_at = datetime('now')
+		RETURNING (created_at == updated_at) AS is_inserted`
+}
+
+func (t *Table) InsertObjects(tx *sqlx.Tx) error {
+	group, _ := errgroup.WithContext(context.Background())
+
+	relId := InsertId[string]{id: t.ID, fieldName: "table_id"}
+	InsertWithCtxParallel(group, tx, t.Stats, relId)
+	InsertSliceParallel(group, tx, t.Ownership, relId)
+	InsertSliceParallel(group, tx, t.Results, relId)
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (t *Table) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, t.ID, t.Name, t.Description, t.Formula, t.Img, t.Folder, t.Sort, t.Replacement, t.DisplayRoll}
+
+	var isInserted bool
+	err := tx.QueryRowx(data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return t.InsertObjects(tx)
+	}
+	return nil
+}
+
+func (t *Table) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, t.ID, t.Name, t.Description, t.Formula, t.Img, t.Folder, t.Sort, t.Replacement, t.DisplayRoll}
+
+	var isInserted bool
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return t.InsertObjects(tx)
+	}
+	return nil
+}
+
+type TableResult struct {
+	ID string
+
+	Type        string
+	Img         string
+	Description string
+	Name        string
+	Weight      int
+	Drawn       bool
+	Stats       Stats
+	Range       []int
+}
+
+func (t *TableResult) Query(data *InsertId[string]) {
+	data.query = `
+		INSERT INTO table_result (table_id, id, type, img, description, name, weight, drawn)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
+		ON CONFLICT(id) DO UPDATE SET
+			table_id = EXCLUDED.table_id,
+			updated_at = datetime('now')
+		RETURNING (created_at == updated_at) AS is_inserted`
+}
+
+func (t *TableResult) InsertObjects(tx *sqlx.Tx) error {
+	group, _ := errgroup.WithContext(context.Background())
+
+	InsertWithCtxParallel(group, tx, t.Stats, InsertId[string]{id: t.ID, fieldName: "table_result_id"})
+	InsertSimpleSlice(tx, t.Range, &InsertId[string]{id: t.ID, fieldName: "table_result_id", tableName: "table_result_range"})
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
+}
+
+func (t *TableResult) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, t.ID, t.Type, t.Img, t.Description, t.Name, t.Weight, t.Drawn}
+
+	var isInserted bool
+	err := tx.QueryRowx(data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return t.InsertObjects(tx)
+	}
+	return nil
+}
+
+func (t *TableResult) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, t.ID, t.Type, t.Img, t.Description, t.Name, t.Weight, t.Drawn}
+
+	var isInserted bool
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return t.InsertObjects(tx)
+	}
+	return nil
+}

internal/foundry/models/db/token.go

@@ -0,0 +1,335 @@
+package db
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+	"fmt"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
+)
+
+type Token struct {
+	ID uint
+
+	Name             string
+	ActorLink        bool
+	AppendNumber     bool
+	PrependAdjective bool
+	LockRotation     bool
+	RandomImg        bool
+	DisplayName      int
+	DisplayBars      int
+	Disposition      int
+	Rotation         int
+	Alpha            int
+	Width            float64
+	Height           float64
+	Ring             *Ring
+	Sight            *TokenSight
+	Texture          *TokenTexture
+	Bar1             TokenBar
+	Bar2             TokenBar
+	Light            *Light
+	Occludable       TokenOccludable
+	TurnMarker       TokenTurnMarker
+}
+
+func (t *Token) Query(data *InsertId[string]) {
+	data.query = `
+		INSERT INTO token (actor_id, 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`
+}
+
+func (t *Token) InsertObjects(tx *sqlx.Tx) error {
+	group, _ := errgroup.WithContext(context.Background())
+
+	relId := InsertId[uint]{id: t.ID, fieldName: "token_id"}
+	InsertWithCtxParallel(group, tx, t.Ring, relId)
+	InsertWithCtxParallel(group, tx, t.Sight, relId)
+	InsertWithCtxParallel(group, tx, t.Texture, relId)
+	InsertWithCtxParallel(group, tx, t.Bar1, InsertId[uint]{id: t.ID, fieldName: "token_id", tableName: "token_bar_1"})
+	InsertWithCtxParallel(group, tx, t.Bar1, InsertId[uint]{id: t.ID, fieldName: "token_id", tableName: "token_bar_2"})
+	InsertWithCtxParallel(group, tx, t.Light, relId)
+	InsertWithCtxParallel(group, tx, t.Occludable, relId)
+	InsertWithCtxParallel(group, 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}
+
+	mutex := GetMutex("token_insert")
+	mutex.Lock()
+	defer mutex.Unlock()
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&t.ID)
+	if err != nil {
+		return err
+	}
+
+	return t.InsertObjects(tx)
+}
+
+type TokenTexture struct {
+	ID uint
+
+	Src            string
+	Fit            string
+	Tint           string
+	ScaleX         float64
+	ScaleY         float64
+	OffsetX        float64
+	OffsetY        float64
+	Rotation       float64
+	AnchorX        float64
+	AnchorY        float64
+	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
+
+	Color       string
+	VisionMode  string
+	Range       int
+	Angle       int
+	Attenuation float64
+	Brightness  float64
+	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
+
+	Mode        int
+	Animation   string
+	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
+}

internal/foundry/models/db/update.go

@@ -62,3 +62,40 @@ type SystemUpdate struct {
 	HasUpdate bool
 	Version   string
 }
+
+func (s *SystemUpdate) Query(data *InsertId[uint]) {
+	data.query = fmt.Sprintf(`
+		INSERT INTO system_update (%s, has_update, version)
+		VALUES ($1, $2, $3)
+		RETURNING id`, data.fieldName)
+}
+
+func (s *SystemUpdate) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, s.HasUpdate, s.Version}
+
+	err := tx.QueryRowx(data.query, args...).Scan(&s.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (s *SystemUpdate) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, s.HasUpdate, s.Version}
+
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&s.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

internal/foundry/models/db/user.go

@@ -4,293 +4,125 @@ import (
 	"context"
 	"database/sql"
 	"errors"
-	"time"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
 )
 
 type User struct {
-	Id        int64
+	ID string
+
 	Name      string
-	Role      int
+	Avatar    string
 	Character string
 	Color     string
 	Pronouns  string
-	CreatedAt time.Time
+	Role      int
-	Hotbar    map[string]string
+	Stats     Stats
-	Stats     UserStats
+	Hotbar    []UserHotbar
 }
 
-type UserStats struct {
+func (u *User) Query(data *InsertId[uint]) {
-	Id             int64
+	data.query = `
-	CoreVersion    string
+		INSERT INTO user (game_id, id, name, avatar, character, color, pronouns, role)
-	SystemId       string
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
-	SystemVersion  string
+		ON CONFLICT(id) DO UPDATE SET
-	CreatedTime    int64
+			game_id = EXCLUDED.game_id,
-	ModifiedTime   int64
+			updated_at = datetime('now')
-	LastModifiedBy string
+		RETURNING (created_at == updated_at) AS is_inserted`
 }
 
-type Users []User
+func (u *User) InsertObjects(tx *sqlx.Tx) error {
+	group, _ := errgroup.WithContext(context.Background())
 
-func (users Users) GetById(id int) *User {
+	relId := InsertId[string]{id: u.ID, fieldName: "user_id"}
-	return &users[id]
+	InsertWithCtxParallel(group, tx, u.Stats, relId)
+	InsertSliceParallel(group, tx, u.Hotbar, relId)
+
+	err := group.Wait()
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return err
+	}
+	return nil
 }
 
-func (m FoundryStateModel) InsertUser(user *User, stateId int64) error {
+func (u *User) Insert(tx *sqlx.Tx, data *InsertId[uint]) error {
-	query := `
+	if data.query == "" {
-		INSERT INTO users (state_id, name, role, character, color, pronouns)
+		return ErrNoQuery
-		VALUES ($1, $2, $3, $4, $5, $6)
+	}
-		RETURNING id, created_at`
 
-	args := []any{stateId, user.Name, user.Role, user.Character, user.Color, user.Pronouns}
+	args := []any{data.id, u.ID, u.Name, u.Avatar, u.Character, u.Color, u.Pronouns, u.Role}
 
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+	var isInserted bool
-	defer cancel()
+	err := tx.QueryRowx(data.query, args...).Scan(&isInserted)
-
-	err := m.DB.QueryRowContext(ctx, query, args...).Scan(&user.Id, &user.CreatedAt)
 	if err != nil {
 		return err
 	}
 
-	for k, v := range user.Hotbar {
+	if isInserted {
-		err = m.InsertUserHotbar(k, v, user.Id)
+		return u.InsertObjects(tx)
-		if err != nil {
-			return err
-		}
 	}
-
+	return nil
-	return m.InsertUserStats(&user.Stats, user.Id)
 }
 
-func (m FoundryStateModel) InsertUserHotbar(key string, value string, userId int64) error {
+func (u *User) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[uint]) error {
-	query := `
+	if data.query == "" {
-		INSERT INTO users_hotbar (user_id, key, value)
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, u.ID, u.Name, u.Avatar, u.Character, u.Color, u.Pronouns, u.Role}
+
+	var isInserted bool
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return u.InsertObjects(tx)
+	}
+	return nil
+}
+
+type UserHotbar struct {
+	ID uint
+
+	Key   int
+	Value string
+}
+
+func (u UserHotbar) Query(data *InsertId[string]) {
+	data.query = `
+		INSERT INTO hotbar (user_id, key_, value)
 		VALUES ($1, $2, $3)`
-
-	args := []any{userId, key, value}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	_, err := m.DB.ExecContext(ctx, query, args...)
-	if err != nil && err != sql.ErrNoRows {
-		return err
-	}
-	return nil
 }
 
-func (m FoundryStateModel) InsertUserStats(stats *UserStats, userId int64) error {
+func (u UserHotbar) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
-	query := `
+	if data.query == "" {
-		INSERT INTO users_stats (user_id, core_version, system_id, system_version, created_time, modified_time, last_modified_by)
+		return ErrNoQuery
-		VALUES ($1, $2, $3, $4, $5, $6, $7)
-		RETURNING id`
-
-	args := []any{userId, stats.CoreVersion, stats.SystemId, stats.SystemVersion, stats.CreatedTime, stats.ModifiedTime, stats.LastModifiedBy}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	return m.DB.QueryRowContext(ctx, query, args...).Scan(&stats.Id)
-}
-
-func (m FoundryStateModel) GetUsers(idState int64) (Users, error) {
-	if idState < 1 {
-		return nil, ErrorRecordNotFound
 	}
 
-	query := `
+	args := []any{data.id, u.Key, u.Value}
-		SELECT id, created_at, name, role, character, color, pronouns
-		FROM users
-		WHERE state_id = $1`
 
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+	err := tx.QueryRowx(data.query, args...).Scan(&u.ID)
-	defer cancel()
-
-	rows, err := m.DB.QueryContext(ctx, query, idState)
-	if err != nil {
-		switch {
-		case errors.Is(err, sql.ErrNoRows):
-			return nil, ErrorRecordNotFound
-		default:
-			return nil, err
-		}
-	}
-
-	users := make(Users, 0, 1)
-
-	for rows.Next() {
-		var user User
-		err := rows.Scan(
-			&user.Id,
-			&user.CreatedAt,
-			&user.Name,
-			&user.Role,
-			&user.Character,
-			&user.Color,
-			&user.Pronouns,
-		)
-		if err != nil {
-			return nil, err
-		}
-		user.Hotbar, err = m.GetUserHotbar(user.Id)
-		if err != nil {
-			return nil, err
-		}
-		userState, err := m.GetUserStats(user.Id)
-		if err != nil {
-			return nil, err
-		}
-
-		user.Stats = *userState
-		users = append(users, user)
-	}
-
-	if err := rows.Err(); err != nil {
-		return nil, err
-	}
-
-	return users, nil
-}
-
-func (m FoundryStateModel) GetUserHotbar(idUser int64) (map[string]string, error) {
-	if idUser < 1 {
-		return nil, ErrorRecordNotFound
-	}
-
-	query := `
-		SELECT key, value
-		FROM users_hotbar
-		WHERE user_id = $1`
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	rows, err := m.DB.QueryContext(ctx, query, idUser)
-	if err != nil {
-		switch {
-		case errors.Is(err, sql.ErrNoRows):
-			return nil, ErrorRecordNotFound
-		default:
-			return nil, err
-		}
-	}
-
-	hotbar := make(map[string]string)
-	for rows.Next() {
-		var key string
-		var val string
-
-		err := rows.Scan(
-			&key,
-			&val,
-		)
-		if err != nil {
-			return nil, err
-		}
-
-		hotbar[key] = val
-	}
-
-	if err != nil {
-		switch {
-		case errors.Is(err, sql.ErrNoRows):
-			return nil, ErrorRecordNotFound
-		default:
-			return nil, err
-		}
-	}
-
-	return hotbar, nil
-}
-
-func (m FoundryStateModel) GetUserStats(idSystem int64) (*UserStats, error) {
-	if idSystem < 1 {
-		return nil, ErrorRecordNotFound
-	}
-
-	query := `
-		SELECT id, core_version, system_id, system_version, created_time, modified_time, last_modified_by
-		FROM users_stats
-		WHERE user_id = $1`
-
-	var userStats UserStats
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	err := m.DB.QueryRowContext(ctx, query, idSystem).Scan(
-		&userStats.Id,
-		&userStats.CoreVersion,
-		&userStats.SystemId,
-		&userStats.SystemVersion,
-		&userStats.CreatedTime,
-		&userStats.ModifiedTime,
-		&userStats.LastModifiedBy,
-	)
-
-	if err != nil {
-		switch {
-		case errors.Is(err, sql.ErrNoRows):
-			return nil, ErrorRecordNotFound
-		default:
-			return nil, err
-		}
-	}
-
-	return &userStats, nil
-}
-
-func (m FoundryStateModel) DeleteUsers(idState int64) error {
-	if idState < 1 {
-		return ErrorRecordNotFound
-	}
-
-	query := `
-		DELETE FROM users
-		WHERE state_id = $1`
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	result, err := m.DB.ExecContext(ctx, query, idState)
 	if err != nil {
 		return err
 	}
 
-	rowsAffected, err := result.RowsAffected()
-	if err != nil {
-		return err
-	}
-	if rowsAffected == 0 {
-		return ErrorRecordNotFound
-	}
-
 	return nil
 }
 
-func (m FoundryStateModel) DeleteUser(idUser int64) error {
+func (u UserHotbar) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
-	if idUser < 1 {
+	if data.query == "" {
-		return ErrorRecordNotFound
+		return ErrNoQuery
 	}
 
-	query := `
+	args := []any{data.id, u.Key, u.Value}
-		DELETE FROM users
-		WHERE id = $1`
 
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&u.ID)
-	defer cancel()
-
-	result, err := m.DB.ExecContext(ctx, query, idUser)
 	if err != nil {
 		return err
 	}
 
-	rowsAffected, err := result.RowsAffected()
-	if err != nil {
-		return err
-	}
-	if rowsAffected == 0 {
-		return ErrorRecordNotFound
-	}
-
 	return nil
 }

internal/foundry/models/db/utils.go

@@ -0,0 +1,248 @@
+package db
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"sync"
+	"time"
+
+	"github.com/jmoiron/sqlx"
+	"github.com/mattn/go-sqlite3"
+	"golang.org/x/sync/errgroup"
+)
+
+var (
+	ErrNoQuery          = errors.New("Query has not been set")
+	ErrorRecordNotFound = errors.New("Record not found")
+)
+
+type AllowedIds interface {
+	~uint | ~string
+}
+
+type InsertId[T AllowedIds] struct {
+	id        T
+	fieldName string
+	tableName string
+	query     string
+}
+
+type Insertable[T AllowedIds] interface {
+	Query(data *InsertId[T])
+	Insert(tx *sqlx.Tx, relId *InsertId[T]) error
+	InsertCtx(ctx context.Context, tx *sqlx.Tx, relId *InsertId[T]) error
+}
+
+func InsertWithCtx[T AllowedIds, I Insertable[T]](tx *sqlx.Tx, data I, relId InsertId[T]) error {
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+
+	data.Query(&relId)
+	return data.InsertCtx(ctx, tx, &relId)
+}
+
+func InsertWithCtxParallel[T AllowedIds, I Insertable[T]](g *errgroup.Group, tx *sqlx.Tx, data I, relId InsertId[T]) {
+	g.Go(func() error {
+		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+		defer cancel()
+
+		data.Query(&relId)
+		err := data.InsertCtx(ctx, tx, &relId)
+		return err
+	})
+}
+
+func InsertSlice[T AllowedIds, I Insertable[T]](tx *sqlx.Tx, data []I, relId InsertId[T]) error {
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+
+	if len(data) > 0 {
+		data[0].Query(&relId)
+	}
+	for i := range data {
+		err := data[i].InsertCtx(ctx, tx, &relId)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func InsertSliceParallelTimeout[T AllowedIds, I Insertable[T]](g *errgroup.Group, tx *sqlx.Tx, data []I, relId InsertId[T], timeout time.Duration) {
+	g.Go(func() error {
+		wg, _ := errgroup.WithContext(context.Background())
+
+		var err error
+		if len(data) > 0 {
+			data[0].Query(&relId)
+		}
+		for i := range data {
+			wg.Go(func() error {
+				ctx, cancel := context.WithTimeout(context.Background(), timeout)
+				defer cancel()
+
+				err = data[i].InsertCtx(ctx, tx, &relId)
+				return err
+			})
+		}
+
+		return wg.Wait()
+	})
+}
+
+func InsertSliceParallel[T AllowedIds, I Insertable[T]](g *errgroup.Group, tx *sqlx.Tx, data []I, relId InsertId[T]) {
+	g.Go(func() error {
+		wg, _ := errgroup.WithContext(context.Background())
+
+		var err error
+		if len(data) > 0 {
+			data[0].Query(&relId)
+		}
+		for i := range data {
+			wg.Go(func() error {
+				ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+				defer cancel()
+
+				err = data[i].InsertCtx(ctx, tx, &relId)
+				return err
+			})
+		}
+
+		return wg.Wait()
+	})
+}
+
+func InsertSimpleSlice[T AllowedIds, I any](tx *sqlx.Tx, data []I, relId *InsertId[T]) error {
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+
+	query := fmt.Sprintf(`
+		INSERT INTO %s (%s, value)
+		VALUES ($1, $2)`, relId.tableName, relId.fieldName)
+	for i := range data {
+		_, err := tx.ExecContext(ctx, query, relId.id, data[i])
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func InsertSimpleSliceParallel[T AllowedIds, I any](g *errgroup.Group, tx *sqlx.Tx, data []I, relId *InsertId[T]) {
+	g.Go(func() error {
+		wg, _ := errgroup.WithContext(context.Background())
+
+		query := fmt.Sprintf(`
+			INSERT INTO %s (%s, value)
+			VALUES ($1, $2)`, relId.tableName, relId.fieldName)
+		for i := range data {
+			wg.Go(func() error {
+				ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+				defer cancel()
+
+				_, err := tx.ExecContext(ctx, query, relId.id, data[i])
+				return err
+			})
+		}
+
+		return wg.Wait()
+	})
+}
+
+func DeleteSetupAll(db *sqlx.DB) error {
+	const query = `DELETE FROM setup`
+
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+
+	tx := db.MustBegin()
+	defer tx.Rollback()
+
+	result, err := tx.ExecContext(ctx, query)
+	if err != nil {
+		return err
+	}
+	tx.Commit()
+
+	rowsAffected, err := result.RowsAffected()
+	if err != nil {
+		return err
+	}
+	if rowsAffected == 0 {
+		return ErrorRecordNotFound
+	}
+
+	return nil
+}
+
+func DeleteGameAll(db *sqlx.DB) error {
+	const query = `DELETE FROM game`
+
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+
+	tx := db.MustBegin()
+	defer tx.Rollback()
+
+	result, err := tx.ExecContext(ctx, query)
+	if err != nil {
+		return err
+	}
+	tx.Commit()
+
+	rowsAffected, err := result.RowsAffected()
+	if err != nil {
+		return err
+	}
+	if rowsAffected == 0 {
+		return ErrorRecordNotFound
+	}
+
+	return nil
+}
+
+func DeleteSeqAll(db *sqlx.DB) error {
+	const query = `DELETE FROM sqlite_sequence`
+
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+
+	tx := db.MustBegin()
+	defer tx.Rollback()
+
+	result, err := tx.ExecContext(ctx, query)
+	if err != nil {
+		return err
+	}
+	tx.Commit()
+
+	rowsAffected, err := result.RowsAffected()
+	if err != nil {
+		return err
+	}
+	if rowsAffected == 0 {
+		return ErrorRecordNotFound
+	}
+
+	return nil
+}
+
+func IsErrUniqueConstraint(err error) {
+	if sqliteErr, ok := err.(sqlite3.Error); ok {
+		// SQLITE_CONSTRAINT_UNIQUE (extended code 2067)
+		// or SQLITE_CONSTRAINT (basic code 19)
+		if sqliteErr.ExtendedCode == sqlite3.ErrConstraintUnique ||
+			sqliteErr.Code == sqlite3.ErrConstraint {
+		}
+	}
+}
+
+var modelInsertLock sync.Map
+
+func GetMutex(id string) *sync.Mutex {
+	val, _ := modelInsertLock.LoadOrStore(id, &sync.Mutex{})
+
+	return val.(*sync.Mutex)
+}

internal/foundry/models/db/world.go

@@ -4,231 +4,179 @@ import (
 	"context"
 	"database/sql"
 	"errors"
+	"fmt"
 	"time"
+
+	"github.com/jmoiron/sqlx"
+	"golang.org/x/sync/errgroup"
 )
 
 type World struct {
-	Id            int64
+	ID string
-	TextId        string
+
-	Title         string
+	Title             string
-	Description   string
+	Description       string
-	System        string
+	Version           string
-	CoreVersion   string
+	System            string
-	SystemVersion string
+	Background        string
-	LastPlayed    string
+	JoinTheme         string
-	PlayTime      int64
+	CoreVersion       string
-	NextSession   time.Time
+	SystemVersion     string
-	CreatedAt     time.Time
+	LastPlayed        string
-	Compatibility Compatibility
+	Playtime          int
+	Availability      int
+	NextSession       time.Time
+	Socket            bool
+	Protected         bool
+	Exclusive         bool
+	PersistentStorage bool
+	Locked            bool
+	Owned             bool
+	HasStorage        bool
+	Compatibility     Compatibility
+	Relationships     Relationships
+	Tags              []string
+	Scripts           []string
+	Esmodules         []string
+	Authors           []*Author
+	Media             []*Media
+	Styles            []*Style
+	Languages         []*Language
+	Packs             []*Pack
+	PackFolders       []*Folder
 }
 
-type Worlds []World
+func (w *World) Query(data *InsertId[string]) {
-
+	data.query = fmt.Sprintf(`
-func (worlds Worlds) GetById(id int) *World {
+		INSERT INTO world (%[1]s, id, title, description, version, system, background, join_theme,
-	return &worlds[id]
+			core_version, system_version, last_played, playtime, availability, next_session, socket,
+			protected, exclusive_, persistent_storage, locked, owned, has_storage)
+		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21)
+		ON CONFLICT(id) DO UPDATE SET
+			%[1]s = EXCLUDED.%[1]s,
+			updated_at = datetime('now')
+		RETURNING (created_at == updated_at) AS is_inserted`,
+		data.fieldName)
 }
 
-func (m FoundryStateModel) InsertWorld(world *World, stateId int64) error {
+func (w *World) InsertObjects(tx *sqlx.Tx) error {
-	query := `
+	relId := InsertId[string]{id: w.ID, fieldName: "world_id"}
-		INSERT INTO worlds (state_id, text_id, title, description, system, core_version, system_version, playtime, next_session)
+	group, _ := errgroup.WithContext(context.Background())
-		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
-		RETURNING id, created_at`
 
-	args := []any{stateId, world.TextId, world.Title, world.Description, world.System, world.CoreVersion, world.SystemVersion, world.PlayTime, world.NextSession}
+	InsertWithCtxParallel(group, tx, w.Compatibility, relId)
+	InsertWithCtxParallel(group, tx, w.Relationships, relId)
 
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+	esModulesRelId := &InsertId[string]{id: w.ID, fieldName: "world_id", tableName: "es_modules"}
-	defer cancel()
+	InsertSimpleSliceParallel(group, tx, w.Esmodules, esModulesRelId)
+	scriptRelId := &InsertId[string]{id: w.ID, fieldName: "world_id", tableName: "scripts"}
+	InsertSimpleSliceParallel(group, tx, w.Scripts, scriptRelId)
+	tagsRelId := &InsertId[string]{id: w.ID, fieldName: "world_id", tableName: "tags"}
+	InsertSimpleSliceParallel(group, tx, w.Tags, tagsRelId)
 
-	err := m.DB.QueryRowContext(ctx, query, args...).Scan(&world.Id, &world.CreatedAt)
+	InsertSliceParallel(group, tx, w.Authors, relId)
-	if err != nil && err != sql.ErrNoRows {
+	InsertSliceParallel(group, tx, w.Media, relId)
-		return err
+	InsertSliceParallel(group, tx, w.Styles, relId)
-	}
+	InsertSliceParallel(group, tx, w.Languages, relId)
-	return m.InsertWorldCompatibility(&world.Compatibility, world.Id)
+	InsertSliceParallel(group, tx, w.Packs, relId)
-}
+	InsertSliceParallel(group, tx, w.PackFolders, relId)
 
-func (m FoundryStateModel) InsertWorldCompatibility(compatibility *Compatibility, worldId int64) error {
+	err := group.Wait()
-	query := `
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
-		INSERT INTO worlds_compatibility (world_id, minimum, verified, maximum)
-		VALUES ($1, $2, $3, $4)
-		RETURNING id`
-
-	args := []any{worldId, compatibility.Minimum, compatibility.Verified, compatibility.Maximum}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	err := m.DB.QueryRowContext(ctx, query, args...).Scan(&compatibility.Id)
-	if err != nil && err != sql.ErrNoRows {
 		return err
 	}
 	return nil
 }
 
-func (m FoundryStateModel) GetWorlds(idState int64) (Worlds, error) {
+func (w *World) Insert(tx *sqlx.Tx, data *InsertId[string]) error {
-	if idState < 1 {
+	if data.query == "" {
-		return nil, ErrorRecordNotFound
+		return ErrNoQuery
 	}
 
-	query := `
+	args := []any{data.id, w.ID, w.Title, w.Description, w.Version, w.System, w.Background, w.JoinTheme,
-		SELECT id, created_at, text_id, title, description, system, core_version, system_version, playtime, next_session
+		w.CoreVersion, w.SystemVersion, w.LastPlayed, w.Playtime, w.Availability, w.NextSession, w.Socket,
-		FROM worlds
+		w.Protected, w.Exclusive, w.PersistentStorage, w.Locked, w.Owned, w.HasStorage}
-		WHERE state_id = $1`
+
+	var isInserted bool
+	err := tx.QueryRowx(data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return w.InsertObjects(tx)
+	}
+	return nil
+}
+
+func (w *World) InsertCtx(ctx context.Context, tx *sqlx.Tx, data *InsertId[string]) error {
+	if data.query == "" {
+		return ErrNoQuery
+	}
+
+	args := []any{data.id, w.ID, w.Title, w.Description, w.Version, w.System, w.Background, w.JoinTheme,
+		w.CoreVersion, w.SystemVersion, w.LastPlayed, w.Playtime, w.Availability, w.NextSession, w.Socket,
+		w.Protected, w.Exclusive, w.PersistentStorage, w.Locked, w.Owned, w.HasStorage}
+
+	var isInserted bool
+	err := tx.QueryRowxContext(ctx, data.query, args...).Scan(&isInserted)
+	if err != nil {
+		return err
+	}
+
+	if isInserted {
+		return w.InsertObjects(tx)
+	}
+	return nil
+}
+
+func GetNotStartedWorlds(db *sqlx.DB) ([]string, error) {
+	const query = `
+		SELECT id FROM world WHERE game_id IS NULL`
 
 	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
 	defer cancel()
 
-	rows, err := m.DB.QueryContext(ctx, query, idState)
+	var worldNames []string
+	err := db.SelectContext(ctx, &worldNames, query)
 	if err != nil {
-		switch {
-		case errors.Is(err, sql.ErrNoRows):
-			return nil, ErrorRecordNotFound
-		default:
-			return nil, err
-		}
-	}
-
-	worlds := make(Worlds, 0, 1)
-
-	for rows.Next() {
-		var world World
-		err := rows.Scan(
-			&world.Id,
-			&world.CreatedAt,
-			&world.TextId,
-			&world.Title,
-			&world.Description,
-			&world.System,
-			&world.CoreVersion,
-			&world.SystemVersion,
-			&world.PlayTime,
-			&world.NextSession,
-		)
-		if err != nil {
-			return nil, err
-		}
-		compatibility, err := m.GetWorldsCompatibility(world.Id)
-		if err != nil {
-			return nil, err
-		}
-		world.Compatibility = *compatibility
-		worlds = append(worlds, world)
-	}
-
-	if err := rows.Err(); err != nil {
 		return nil, err
 	}
-
+	return worldNames, nil
-	return worlds, nil
 }
 
-func (m FoundryStateModel) GetWorldsCompatibility(idWorld int64) (*Compatibility, error) {
+func IsWorldInserted(db *sqlx.DB, worldName string) (bool, error) {
-	if idWorld < 1 {
+	const query = `
-		return nil, ErrorRecordNotFound
+		SELECT EXISTS(SELECT 1 FROM world WHERE id = $1 AND game_id IS NOT NULL)`
-	}
-
-	query := `
-		SELECT id, minimum, verified, maximum
-		FROM worlds_compatibility
-		WHERE world_id = $1`
-
-	var compatibility Compatibility
 
 	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
 	defer cancel()
 
-	err := m.DB.QueryRowContext(ctx, query, idWorld).Scan(
+	var exist bool
-		&compatibility.Id,
+	err := db.GetContext(ctx, &exist, query, worldName)
-		&compatibility.Minimum,
+	if err != nil {
-		&compatibility.Verified,
+		return false, err
-		&compatibility.Maximum,
+	}
+	return exist, nil
+}
+
+func GetWorld(db *sqlx.DB, worldName string) (*World, error) {
+	const query = `
+		SELECT id, title, description, version, system, background, join_theme, core_version, system_version,
+			last_played, playtime, availability, next_session, socket, protected, exclusive_, persistent_storage,
+			locked, owned, has_storage
+		FROM world WHERE id = $1`
+
+	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
+	defer cancel()
+
+	var world World
+	err := db.QueryRowxContext(ctx, query, worldName).Scan(
+		&world.ID, &world.Title, &world.Description, &world.Version, &world.System, &world.Background, &world.JoinTheme,
+		&world.CoreVersion, &world.SystemVersion, &world.LastPlayed, &world.Playtime, &world.Availability, &world.NextSession,
+		&world.Socket, &world.Protected, &world.Exclusive, &world.PersistentStorage, &world.Locked, &world.Owned, &world.HasStorage,
 	)
-
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
-	if err != nil {
+		return nil, err
-		switch {
-		case errors.Is(err, sql.ErrNoRows):
-			return nil, ErrorRecordNotFound
-		default:
-			return nil, err
-		}
 	}
-
+	return &world, nil
-	return &compatibility, nil
 }
-
-func (m FoundryStateModel) DeleteWorlds(idState int64) error {
-	if idState < 1 {
-		return ErrorRecordNotFound
-	}
-
-	query := `
-		DELETE FROM worlds
-		WHERE state_id = $1`
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	result, err := m.DB.ExecContext(ctx, query, idState)
-	if err != nil {
-		return err
-	}
-
-	rowsAffected, err := result.RowsAffected()
-	if err != nil {
-		return err
-	}
-	if rowsAffected == 0 {
-		return ErrorRecordNotFound
-	}
-
-	return nil
-}
-
-func (m FoundryStateModel) DeleteWorld(idWorld int64) error {
-	if idWorld < 1 {
-		return ErrorRecordNotFound
-	}
-
-	query := `
-		DELETE FROM worlds
-		WHERE id = $1`
-
-	ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
-	defer cancel()
-
-	result, err := m.DB.ExecContext(ctx, query, idWorld)
-	if err != nil {
-		return err
-	}
-
-	rowsAffected, err := result.RowsAffected()
-	if err != nil {
-		return err
-	}
-	if rowsAffected == 0 {
-		return ErrorRecordNotFound
-	}
-
-	return nil
-}
-
-// func (worlds Worlds) GetSessionTime(worldName string) (*time.Time, error) {
-// 	if worldName == "" && len(worlds) != 1 {
-// 		return nil, ErrorSetupNotFound
-// 	}
-
-// 	if worldName == "" {
-// 		return &worlds.GetById(0).NextSession, nil
-// 	} else {
-// 		for i := range worlds {
-// 			if worlds[i].Id == worldName {
-// 				return &worlds.GetById(0).NextSession, nil
-// 			}
-// 		}
-// 	}
-
-// 	return nil, ErrorSetupNotFound
-// }
-
-// func (world World) GetSessionTime() *time.Time {
-// 	return &world.NextSession
-// }

internal/foundry/models/json/actor.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type Actor struct {
 	PrototypeToken Token          `json:"prototypeToken"`
@@ -18,24 +18,28 @@ type Actor struct {
 	// ActorsEffects   []any          `json:"effects"`
 }
 
-func (a *Actor) ToDB(dest *db.Actor) bool {
+func (a *Actor) ToDB(dest **db.Actor) bool {
 	if dest == nil {
 		return false
 	}
 
-	dest.Img = a.Img
+	actor := &db.Actor{
-	dest.Name = a.Name
+		Img:    a.Img,
-	dest.Type = a.Type
+		Name:   a.Name,
-	dest.Folder = a.Folder
+		Type:   a.Type,
-	dest.Sort = a.Sort
+		Folder: a.Folder,
-	dest.ID = a.ID
+		Sort:   a.Sort,
+		ID:     a.ID,
+	}
 
-	a.PrototypeToken.ToDB(&dest.PrototypeToken)
+	a.PrototypeToken.ToDB(&actor.PrototypeToken)
-	a.Stats.ToDB(&dest.Stats)
+	a.Stats.ToDB(&actor.Stats)
 
-	OwnershipToDB(&dest.Ownership, a.Ownership)
+	OwnershipToDB(&actor.Ownership, a.Ownership)
 
-	CopySliceToDB(&dest.Items, a.Items)
+	CopySliceToDB(&actor.Items, a.Items)
+
+	*dest = actor
 
 	return true
 }

internal/foundry/models/json/addresses.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type Addresses struct {
 	Local              string `json:"local"`

internal/foundry/models/json/authors.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type Author struct {
 	Name    string `json:"name"`

internal/foundry/models/json/card.go

@@ -0,0 +1,138 @@
+package json
+
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
+
+type CardDeck struct {
+	Name         string         `json:"name"`
+	Type         string         `json:"type"`
+	Description  string         `json:"description"`
+	Img          string         `json:"img"`
+	Cards        []*Card        `json:"cards"`
+	Width        int            `json:"width"`
+	Height       int            `json:"height"`
+	Rotation     int            `json:"rotation"`
+	DisplayCount bool           `json:"displayCount"`
+	Stats        Stats          `json:"_stats"`
+	Ownership    map[string]int `json:"ownership,omitempty"`
+	Folder       string         `json:"folder"`
+	Sort         int            `json:"sort"`
+	ID           string         `json:"_id"`
+	// Flags           any             `json:"flags"`
+	// Cards0System    any             `json:"system"`
+}
+
+func (c *CardDeck) ToDB(dest **db.CardDeck) bool {
+	if dest == nil {
+		return false
+	}
+
+	cardDeck := &db.CardDeck{
+		Name:         c.Name,
+		Type:         c.Type,
+		Description:  c.Description,
+		Img:          c.Img,
+		Width:        c.Width,
+		Height:       c.Height,
+		Rotation:     c.Rotation,
+		DisplayCount: c.DisplayCount,
+		Folder:       c.Folder,
+		Sort:         c.Sort,
+		ID:           c.ID,
+	}
+
+	c.Stats.ToDB(&cardDeck.Stats)
+
+	OwnershipToDB(&cardDeck.Ownership, c.Ownership)
+	CopySliceToDB(&cardDeck.Cards, c.Cards)
+
+	*dest = cardDeck
+
+	return true
+}
+
+type Card struct {
+	Name        string  `json:"name"`
+	Faces       []*Face `json:"faces"`
+	Width       int     `json:"width"`
+	Height      int     `json:"height"`
+	Rotation    int     `json:"rotation"`
+	Type        string  `json:"type"`
+	Value       int     `json:"value"`
+	Suit        string  `json:"suit"`
+	Description string  `json:"description"`
+	Face        int     `json:"face"`
+	Drawn       bool    `json:"drawn"`
+	Sort        int     `json:"sort"`
+	Back        Back    `json:"back"`
+	Origin      string  `json:"origin"`
+	ID          string  `json:"_id"`
+	Stats       Stats   `json:"_stats"`
+	// Flags       any    `json:"flags"`
+	// System      any    `json:"system"`
+}
+
+func (c *Card) ToDB(dest **db.Card) bool {
+	if dest == nil {
+		return false
+	}
+
+	card := &db.Card{
+		Name:        c.Name,
+		Width:       c.Width,
+		Height:      c.Height,
+		Rotation:    c.Rotation,
+		Type:        c.Type,
+		Value:       c.Value,
+		Suit:        c.Suit,
+		Description: c.Description,
+		Face:        c.Face,
+		Drawn:       c.Drawn,
+		Origin:      c.Origin,
+		ID:          c.ID,
+		Sort:        c.Sort,
+	}
+
+	c.Back.ToDB(&card.Back)
+	c.Stats.ToDB(&card.Stats)
+
+	CopySliceToDB(&card.Faces, c.Faces)
+
+	*dest = card
+
+	return true
+}
+
+type Face struct {
+	Name string `json:"name"`
+	Img  string `json:"img"`
+	Text string `json:"text"`
+}
+
+func (f *Face) ToDB(dest *db.Face) bool {
+	if dest == nil {
+		return false
+	}
+
+	dest.Name = f.Name
+	dest.Img = f.Img
+	dest.Text = f.Text
+
+	return true
+}
+
+type Back struct {
+	Img  any    `json:"img"`
+	Name string `json:"name"`
+	Text string `json:"text"`
+}
+
+func (b *Back) ToDB(dest *db.Back) bool {
+	if dest == nil {
+		return false
+	}
+
+	dest.Name = b.Name
+	dest.Text = b.Text
+
+	return true
+}

internal/foundry/models/json/combat.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type Combat struct {
 	Id         string       `json:"_id"`
@@ -17,23 +17,28 @@ type Combat struct {
 	// Flags      any		`json:"flags"`
 }
 
-func (c *Combat) ToDB(dest *db.Combat) bool {
+func (c *Combat) ToDB(dest **db.Combat) bool {
 	if dest == nil {
 		return false
 	}
 
-	dest.ID = c.Id
+	combat := &db.Combat{
-	dest.Type = c.Type
+		ID:     c.Id,
-	dest.Scene = c.Scene
+		Type:   c.Type,
-	dest.Active = c.Active
+		Scene:  c.Scene,
-	dest.Round = c.Round
+		Active: c.Active,
-	dest.Turn = c.Turn
+		Round:  c.Round,
-	dest.Sort = c.Sort
+		Turn:   c.Turn,
+		Sort:   c.Sort,
+	}
 
-	c.Stats.ToDB(&dest.Stats)
+	c.Stats.ToDB(&combat.Stats)
 
-	copy(dest.Groups, c.Groups)
+	combat.Groups = make([]string, len(c.Groups))
-	CopySliceToDB(&dest.Combatants, c.Combatants)
+	copy(combat.Groups, c.Groups)
+	CopySliceToDB(&combat.Combatants, c.Combatants)
+
+	*dest = combat
 
 	return true
 }
@@ -54,22 +59,27 @@ type Combatant struct {
 	// Flags      any		`json:"flags"`
 }
 
-func (c *Combatant) ToDB(dest *db.Combatant) bool {
+func (c *Combatant) ToDB(dest **db.Combatant) bool {
 	if dest == nil {
 		return false
 	}
 
-	dest.TokenId = c.TokenId
+	combatant := &db.Combatant{
-	dest.SceneId = c.SceneId
+		TokenId:    c.TokenId,
-	dest.ActorId = c.ActorId
+		SceneId:    c.SceneId,
-	dest.Hidden = c.Hidden
+		ActorId:    c.ActorId,
-	dest.ID = c.Id
+		Hidden:     c.Hidden,
-	dest.Type = c.Type
+		ID:         c.Id,
-	dest.Img = c.Img
+		Type:       c.Type,
-	dest.Initiative = c.Initiative
+		Img:        c.Img,
-	dest.Defeated = c.Defeated
+		Initiative: c.Initiative,
-	dest.Group = c.Group
+		Defeated:   c.Defeated,
-	c.Stats.ToDB(&dest.Stats)
+		Group:      c.Group,
+	}
+
+	c.Stats.ToDB(&combatant.Stats)
+
+	*dest = combatant
 
 	return true
 }

internal/foundry/models/json/compatibility.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type Compatibility struct {
 	Minimum  string `json:"minimum,omitempty"`

internal/foundry/models/json/data.go

@@ -1,185 +0,0 @@
-package json
-
-import (
-	"encoding/json"
-
-	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
-)
-
-type FoundryState struct {
-	IsAdmin   bool           `json:"isAdmin,omitempty"`
-	IsSetup   bool           `json:"isSetup,omitempty"`
-	Languages []Language     `json:"languages,omitempty"`
-	Modules   []DataTemplate `json:"modules"`
-	Release   Release        `json:"release"`
-	Systems   []DataTemplate `json:"systems,omitempty"`
-	Worlds    []DataTemplate `json:"worlds,omitempty"`
-	World     *DataTemplate  `json:"world,omitempty"`
-	Users     Users          `json:"users,omitempty"`
-	Options   Options        `json:"options,omitempty"`
-
-	//coreUpdate struct{}
-	//featuredContent struct{}
-	//files struct{}
-	//news            struct{}
-
-	//packageWarnings struct{} think about it
-}
-
-type Options struct {
-	Language string `json:"language,omitempty"`
-}
-
-func (state FoundryState) GetRelease() Release {
-	return state.Release
-}
-
-func (state FoundryState) GetFoundryStateDB(stateType db.StateType) *db.FoundryState {
-	dbFoundryState := db.FoundryState{
-		IsAdmin: state.IsAdmin,
-		IsSetup: state.IsSetup,
-		Type:    stateType,
-		Options: db.Options{Language: state.Options.Language},
-	}
-
-	dbFoundryState.Modules = state.GetModules()
-	dbFoundryState.Systems = state.GetSystems()
-	dbFoundryState.Worlds = state.GetWorlds()
-	dbFoundryState.Users = state.GetUsers()
-
-	return &dbFoundryState
-}
-
-func (state *FoundryState) GetModules() db.Modules {
-	modulesCopy := make([]db.Module, 0, 8)
-	for i := range state.Modules {
-		module := &(state.Modules[i])
-		moduleCopy := db.Module{
-			TextId:      module.Id,
-			Title:       module.Title,
-			Description: module.Description,
-			Compatibility: db.Compatibility{
-				Minimum: module.Compatibility.Minimum,
-				Maximum: module.Compatibility.Maximum,
-			},
-			Url:     module.Url,
-			Version: module.CoreVersion,
-
-			Availability: module.Availability,
-		}
-		for j := range module.Languages {
-			lang := db.Language{
-				Lang: module.Languages[j].Lang,
-				Name: module.Languages[j].Name,
-				Path: module.Languages[j].Path,
-			}
-			moduleCopy.Languages = append(moduleCopy.Languages, lang)
-		}
-		modulesCopy = append(modulesCopy, moduleCopy)
-	}
-	return modulesCopy
-}
-
-func (state *FoundryState) GetSystems() db.Systems {
-	systemsCopy := make([]db.System, 0, 8)
-	for i := range state.Systems {
-		system := &(state.Systems[i])
-		systemCopy := db.System{
-			TextId:      system.Id,
-			Title:       system.Title,
-			Description: system.Description,
-			Url:         system.Url,
-			Compatibility: db.Compatibility{
-				Minimum: system.Compatibility.Minimum,
-				Maximum: system.Compatibility.Maximum,
-			},
-			Download: system.Download,
-		}
-		systemsCopy = append(systemsCopy, systemCopy)
-	}
-	return systemsCopy
-}
-
-func (state *FoundryState) GetWorld() *db.World {
-	return &db.World{
-		TextId:      state.World.Id,
-		Title:       state.World.Title,
-		Description: state.World.Description,
-		Compatibility: db.Compatibility{
-			Minimum: state.World.Compatibility.Minimum,
-			Maximum: state.World.Compatibility.Maximum,
-		},
-		System:        state.World.System,
-		CoreVersion:   state.World.CoreVersion,
-		SystemVersion: state.World.SystemVersion,
-		LastPlayed:    state.World.LastPlayed,
-		PlayTime:      state.World.PlayTime,
-		NextSession:   state.World.NextSession,
-	}
-}
-
-func (state *FoundryState) GetWorlds() db.Worlds {
-	worldsCopy := make([]db.World, 0, 8)
-	for i := range state.Worlds {
-		world := &(state.Worlds[i])
-		worldCopy := db.World{
-			TextId:      world.Id,
-			Title:       world.Title,
-			Description: world.Description,
-			Compatibility: db.Compatibility{
-				Minimum: world.Compatibility.Minimum,
-				Maximum: world.Compatibility.Maximum,
-			},
-			System:        world.System,
-			CoreVersion:   world.CoreVersion,
-			SystemVersion: world.SystemVersion,
-			LastPlayed:    world.LastPlayed,
-			PlayTime:      world.PlayTime,
-			NextSession:   world.NextSession,
-		}
-		worldsCopy = append(worldsCopy, worldCopy)
-	}
-
-	if state.World != nil {
-		worldsCopy = append(worldsCopy, *state.GetWorld())
-	}
-	return worldsCopy
-}
-
-func (state *FoundryState) GetUsers() db.Users {
-	usersCopy := make(db.Users, 0, 8)
-	for i := range state.Users {
-		user := &(state.Users[i])
-		userCopy := db.User{
-			Name:      user.Name,
-			Role:      user.Role,
-			Character: user.Character,
-			Color:     user.Color,
-			Pronouns:  user.Pronouns,
-			Hotbar:    user.Hotbar,
-			Stats: db.UserStats{
-				CoreVersion:    user.Stats.CoreVersion,
-				SystemId:       user.Stats.SystemId,
-				SystemVersion:  user.Stats.SystemVersion,
-				CreatedTime:    user.Stats.CreatedTime,
-				ModifiedTime:   user.Stats.ModifiedTime,
-				LastModifiedBy: user.Stats.LastModifiedBy,
-			},
-		}
-		usersCopy = append(usersCopy, userCopy)
-	}
-	return usersCopy
-}
-
-func ParseSetupModel(data []byte) (*FoundryState, error) {
-	var modelSetup []FoundryState
-	err := json.Unmarshal(data, &modelSetup)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(modelSetup) > 1 {
-		return nil, ErrorSetupMoreThanOne
-	}
-	return &modelSetup[0], nil
-}

internal/foundry/models/json/details_language.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type DetailsLanguages struct {
 	Details string `json:"details"`

internal/foundry/models/json/document_types.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type DocumentTypes struct {
 	Actor          DocumentTypeData `json:"Actor"`
@@ -15,11 +15,11 @@ func (d *DocumentTypes) ToDB(dest *db.DocumentTypes) bool {
 
 	dest.Data = make([]*db.DocumentTypeData, 2)
 
+	dest.Data[0] = &db.DocumentTypeData{Type: "Actor"}
 	d.Actor.ToDB(dest.Data[0])
-	dest.Data[0].Type = "Actor"
 
+	dest.Data[1] = &db.DocumentTypeData{Type: "Item"}
 	d.Item.ToDB(dest.Data[1])
-	dest.Data[1].Type = "Item"
 
 	return true
 }

internal/foundry/models/json/environment.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type Environment struct {
 	GlobalLight           EnvironmentGlobalLight `json:"globalLight"`

internal/foundry/models/json/errors.go

@@ -1,8 +0,0 @@
-package json
-
-import "errors"
-
-var (
-	ErrorSetupMoreThanOne = errors.New("Passed more than one setupData")
-	ErrorSetupNotFound    = errors.New("Not found setup data from your request")
-)

internal/foundry/models/json/files.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type Files struct {
 	Storages []string `json:"storages"`

internal/foundry/models/json/folder.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type Folder struct {
 	Name    string    `json:"name"`
@@ -20,6 +20,8 @@ func (f *Folder) ToDB(dest **db.Folder) bool {
 		Sorting: f.Sorting,
 		Color:   f.Color,
 	}
+
+	folder.Packs = make([]string, len(f.Packs))
 	copy(folder.Packs, f.Packs)
 	CopySliceToDB(&folder.Folders, f.Folders)
 
@@ -41,20 +43,25 @@ type WorldFolder struct {
 	// Flags       any    `json:"flags,omitempty"`
 }
 
-func (w *WorldFolder) ToDB(dest *db.WorldFolder) bool {
+func (w *WorldFolder) ToDB(dest **db.WorldFolder) bool {
 	if dest == nil {
 		return false
 	}
 
-	dest.Name = w.Name
+	worldFolder := &db.WorldFolder{
-	dest.Type = w.Type
+		Name:        w.Name,
-	dest.ID = w.ID
+		Type:        w.Type,
-	dest.Folder = w.Folder
+		ID:          w.ID,
-	dest.Sorting = w.Sorting
+		Folder:      w.Folder,
-	dest.Sort = w.Sort
+		Sorting:     w.Sorting,
-	w.Stats.ToDB(&dest.Stats)
+		Sort:        w.Sort,
-	dest.Description = w.Description
+		Description: w.Description,
-	dest.Color = w.Color
+		Color:       w.Color,
+	}
+
+	w.Stats.ToDB(&worldFolder.Stats)
+
+	*dest = worldFolder
 
 	return true
 }

internal/foundry/models/json/game.go

@@ -1,9 +1,10 @@
 package json
 
 import (
+	"encoding/json"
 	"sync"
 
-	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 )
 
 type Game struct {
@@ -40,6 +41,19 @@ type Game struct {
 	// Template        Template                       `json:"template"`
 }
 
+func ParseGame(data []byte) (*Game, error) {
+	var modelGame []Game
+	err := json.Unmarshal(data, &modelGame)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(modelGame) > 1 {
+		return nil, ErrorSetupMoreThanOne
+	}
+	return &modelGame[0], nil
+}
+
 func (g *Game) ToDB(dest *db.Game) bool {
 	dest.UserID = g.UserID
 	dest.DemoMode = g.DemoMode
@@ -55,23 +69,25 @@ func (g *Game) ToDB(dest *db.Game) bool {
 	g.Options.ToDB(&dest.Options)
 	g.CoreUpdate.ToDB(&dest.CoreUpdate)
 	g.SystemUpdate.ToDB(&dest.SystemUpdate)
+
+	dest.ActiveUsers = make([]string, len(g.ActiveUsers))
 	copy(dest.ActiveUsers, g.ActiveUsers)
 
 	wg := sync.WaitGroup{}
-	go CopySliceToDBParallel(&wg, &dest.Modules, g.Modules)
+	CopySliceToDBParallel(&wg, &dest.Modules, g.Modules)
-	go CopySliceToDBParallel(&wg, &dest.Packs, g.Packs)
+	CopySliceToDBParallel(&wg, &dest.Packs, g.Packs)
-	go CopySliceToDBParallel(&wg, &dest.Messages, g.Messages)
+	CopySliceToDBParallel(&wg, &dest.Messages, g.Messages)
-	go CopySliceToDBParallel(&wg, &dest.Combats, g.Combats)
+	CopySliceToDBParallel(&wg, &dest.Combats, g.Combats)
-	go CopySliceToDBParallel(&wg, &dest.CardDeck, g.CardDeck)
+	CopySliceToDBParallel(&wg, &dest.CardDeck, g.CardDeck)
-	go CopySliceToDBParallel(&wg, &dest.Users, g.Users)
+	CopySliceToDBParallel(&wg, &dest.Users, g.Users)
-	go CopySliceToDBParallel(&wg, &dest.Macros, g.Macros)
+	CopySliceToDBParallel(&wg, &dest.Macros, g.Macros)
-	go CopySliceToDBParallel(&wg, &dest.Folders, g.Folders)
+	CopySliceToDBParallel(&wg, &dest.Folders, g.Folders)
-	go CopySliceToDBParallel(&wg, &dest.Items, g.Items)
+	CopySliceToDBParallel(&wg, &dest.Items, g.Items)
-	go CopySliceToDBParallel(&wg, &dest.Settings, g.Settings)
+	CopySliceToDBParallel(&wg, &dest.Settings, g.Settings)
-	go CopySliceToDBParallel(&wg, &dest.Journals, g.Journals)
+	CopySliceToDBParallel(&wg, &dest.Journals, g.Journals)
-	go CopySliceToDBParallel(&wg, &dest.Tables, g.Tables)
+	CopySliceToDBParallel(&wg, &dest.Tables, g.Tables)
-	go CopySliceToDBParallel(&wg, &dest.Playlists, g.Playlists)
+	CopySliceToDBParallel(&wg, &dest.Playlists, g.Playlists)
-	go CopySliceToDBParallel(&wg, &dest.Actors, g.Actors)
+	CopySliceToDBParallel(&wg, &dest.Actors, g.Actors)
 	// go CopySliceToDBParallel(&wg, &dest.Scenes, g.Scenes)
 	wg.Wait()
 

internal/foundry/models/json/grid.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type Grid struct {
 	Type      int     `json:"type"`

internal/foundry/models/json/index.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type Index struct {
 	Id     string `json:"_id"`

internal/foundry/models/json/item.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type Item struct {
 	Img       string         `json:"img"`
@@ -16,19 +16,23 @@ type Item struct {
 	// Effects          []any            `json:"effects"`
 }
 
-func (i *Item) ToDB(dest *db.Item) bool {
+func (i *Item) ToDB(dest **db.Item) bool {
 	if dest == nil {
 		return false
 	}
 
-	dest.Img = i.Img
+	item := &db.Item{
-	dest.Name = i.Name
+		Img:    i.Img,
-	dest.Type = i.Type
+		Name:   i.Name,
-	dest.Folder = i.Folder
+		Type:   i.Type,
-	dest.ID = i.ID
+		Folder: i.Folder,
-	dest.Sort = i.Sort
+		ID:     i.ID,
+		Sort:   i.Sort,
+	}
 
-	i.Stats.ToDB(&dest.Stats)
+	i.Stats.ToDB(&item.Stats)
+
+	*dest = item
 
 	return true
 }

internal/foundry/models/json/journal.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type Journal struct {
 	Folder    any            `json:"folder"`
@@ -14,17 +14,21 @@ type Journal struct {
 	// Categories []any          `json:"categories"`
 }
 
-func (j *Journal) ToDB(dest *db.Journal) bool {
+func (j *Journal) ToDB(dest **db.Journal) bool {
 	if dest == nil {
 		return false
 	}
 
-	dest.Name = j.Name
+	journal := &db.Journal{
-	dest.Sort = j.Sort
+		Name: j.Name,
-	dest.ID = j.ID
+		Sort: j.Sort,
+		ID:   j.ID,
+	}
 
-	OwnershipToDB(&dest.Ownership, j.Ownership)
+	OwnershipToDB(&journal.Ownership, j.Ownership)
-	CopySliceToDB(&dest.Pages, j.Pages)
+	CopySliceToDB(&journal.Pages, j.Pages)
+
+	*dest = journal
 
 	return true
 }

internal/foundry/models/json/journal_page.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type JournalPage struct {
 	Name      string         `json:"name"`
@@ -19,23 +19,27 @@ type JournalPage struct {
 	// Category  any            `json:"category"`
 }
 
-func (j *JournalPage) ToDB(dest *db.JournalPage) bool {
+func (j *JournalPage) ToDB(dest **db.JournalPage) bool {
 	if dest == nil {
 		return false
 	}
 
-	dest.Name = j.Name
+	journalPage := &db.JournalPage{
-	dest.Type = j.Type
+		Name: j.Name,
-	dest.ID = j.ID
+		Type: j.Type,
-	dest.Src = j.Src
+		ID:   j.ID,
-	dest.Sort = j.Sort
+		Src:  j.Src,
+		Sort: j.Sort,
+	}
 
-	j.Text.ToDB(&dest.Text)
+	j.Text.ToDB(&journalPage.Text)
-	j.Title.ToDB(&dest.Title)
+	j.Title.ToDB(&journalPage.Title)
-	j.Video.ToDB(&dest.Video)
+	j.Video.ToDB(&journalPage.Video)
-	j.Stats.ToDB(&dest.Stats)
+	j.Stats.ToDB(&journalPage.Stats)
 
-	OwnershipToDB(&dest.Ownership, j.Ownership)
+	OwnershipToDB(&journalPage.Ownership, j.Ownership)
+
+	*dest = journalPage
 
 	return true
 }

internal/foundry/models/json/language.go

@@ -1,13 +1,67 @@
 package json
 
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
+
 type Language struct {
-	Id      string       `json:"id"`
+	Lang string `json:"lang"`
-	Label   string       `json:"label"`
+	Name string `json:"name"`
-	Modules []LangModule `json:"modules"`
+	Path string `json:"path"`
+	// SystemLanguagesFlags SystemLanguagesFlags `json:"flags"`
 }
 
-type LangModule struct {
+func (l *Language) ToDB(dest **db.Language) bool {
-	Id    string `json:"id"`
+	if dest == nil {
+		return false
+	}
+
+	lang := &db.Language{
+		Lang: l.Lang,
+		Name: l.Name,
+		Path: l.Path,
+	}
+
+	*dest = lang
+
+	return true
+}
+
+type SetupLanguage struct {
+	ID      string                 `json:"id"`
+	Label   string                 `json:"label"`
+	Modules []*SetupLanguageModule `json:"modules"`
+}
+
+func (s *SetupLanguage) ToDB(dest **db.SetupLanguage) bool {
+	if dest == nil {
+		return false
+	}
+
+	lang := &db.SetupLanguage{
+		ID:    s.ID,
+		Label: s.Label,
+	}
+
+	CopySliceToDB(&lang.Modules, s.Modules)
+
+	*dest = lang
+
+	return true
+}
+
+type SetupLanguageModule struct {
+	ID    string `json:"id"`
 	Label string `json:"label"`
 	Path  string `json:"path"`
 }
+
+func (s *SetupLanguageModule) ToDB(dest *db.SetupLanguageModule) bool {
+	if dest == nil {
+		return false
+	}
+
+	dest.ID = s.ID
+	dest.Label = s.Label
+	dest.Path = s.Path
+
+	return true
+}

internal/foundry/models/json/light.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type Light struct {
 	Alpha          float64        `json:"alpha"`
@@ -20,27 +20,31 @@ type Light struct {
 	Color          string         `json:"color"`
 }
 
-func (l *Light) ToDB(dest *db.Light) bool {
+func (l *Light) ToDB(dest **db.Light) bool {
 	if dest == nil {
 		return false
 	}
 
-	dest.Alpha = l.Alpha
+	light := &db.Light{
-	dest.Angle = l.Angle
+		Alpha:       l.Alpha,
-	dest.Bright = l.Bright
+		Angle:       l.Angle,
-	dest.Coloration = l.Coloration
+		Bright:      l.Bright,
-	dest.Dim = l.Dim
+		Coloration:  l.Coloration,
-	dest.Attenuation = l.Attenuation
+		Dim:         l.Dim,
-	dest.Luminosity = l.Luminosity
+		Attenuation: l.Attenuation,
-	dest.Saturation = l.Saturation
+		Luminosity:  l.Luminosity,
-	dest.Contrast = l.Contrast
+		Saturation:  l.Saturation,
-	dest.Shadows = l.Shadows
+		Contrast:    l.Contrast,
-	dest.Negative = l.Negative
+		Shadows:     l.Shadows,
-	dest.Priority = l.Priority
+		Negative:    l.Negative,
-	dest.Color = l.Color
+		Priority:    l.Priority,
+		Color:       l.Color,
+	}
 
-	l.LightAnimation.ToDB(&dest.LightAnimation)
+	l.LightAnimation.ToDB(&light.LightAnimation)
-	l.LightDarkness.ToDB(&dest.LightDarkness)
+	l.LightDarkness.ToDB(&light.LightDarkness)
+
+	*dest = light
 
 	return true
 }

internal/foundry/models/json/macro.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type Macro struct {
 	Command   string         `json:"command"`
@@ -17,24 +17,28 @@ type Macro struct {
 	// Flags any `json:"flags,omitempty"`
 }
 
-func (m *Macro) ToDB(dest *db.Macro) bool {
+func (m *Macro) ToDB(dest **db.Macro) bool {
 	if dest == nil {
 		return false
 	}
 
-	dest.Command = m.Command
+	macro := &db.Macro{
-	dest.Name = m.Name
+		Command: m.Command,
-	dest.Type = m.Type
+		Name:    m.Name,
-	dest.Img = m.Img
+		Type:    m.Type,
-	dest.ID = m.ID
+		Img:     m.Img,
-	dest.Author = m.Author
+		ID:      m.ID,
-	dest.Scope = m.Scope
+		Author:  m.Author,
-	dest.Folder = m.Folder
+		Scope:   m.Scope,
-	dest.Sort = m.Sort
+		Folder:  m.Folder,
+		Sort:    m.Sort,
+	}
 
-	m.Stats.ToDB(&dest.Stats)
+	m.Stats.ToDB(&macro.Stats)
 
-	OwnershipToDB(&dest.Ownership, m.Ownership)
+	OwnershipToDB(&macro.Ownership, m.Ownership)
+
+	*dest = macro
 
 	return true
 }

internal/foundry/models/json/media.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type Media struct {
 	Type    string `json:"type"`

internal/foundry/models/json/message.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type Message struct {
 	Content   string   `json:"content"`
@@ -21,27 +21,33 @@ type Message struct {
 	// Flags     any `json:"flags"`
 }
 
-func (m *Message) ToDB(dest *db.Message) bool {
+func (m *Message) ToDB(dest **db.Message) bool {
 	if dest == nil {
 		return false
 	}
 
-	dest.Content = m.Content
+	message := &db.Message{
-	dest.Style = m.Style
+		Content:   m.Content,
-	dest.Author = m.Author
+		Style:     m.Style,
-	dest.ID = m.Id
+		Author:    m.Author,
-	dest.Type = m.Type
+		ID:        m.Id,
-	dest.Timestamp = m.Timestamp
+		Type:      m.Type,
-	dest.Flavor = m.Flavor
+		Timestamp: m.Timestamp,
-	dest.Blind = m.Blind
+		Flavor:    m.Flavor,
-	dest.Sound = m.Sound
+		Blind:     m.Blind,
-	dest.Emote = m.Emote
+		Sound:     m.Sound,
+		Emote:     m.Emote,
+	}
 
-	m.Speaker.ToDB(&dest.Speaker)
+	m.Speaker.ToDB(&message.Speaker)
-	m.Stats.ToDB(&dest.Stats)
+	m.Stats.ToDB(&message.Stats)
 
-	copy(dest.Whisper, m.Whisper)
+	message.Whisper = make([]string, len(m.Whisper))
-	copy(dest.Rolls, m.Rolls)
+	copy(message.Whisper, m.Whisper)
+	message.Rolls = make([]string, len(m.Rolls))
+	copy(message.Rolls, m.Rolls)
+
+	*dest = message
 
 	return true
 }

internal/foundry/models/json/module.go

@@ -3,7 +3,7 @@ package json
 import (
 	"sync"
 
-	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 )
 
 type Module struct {
@@ -74,8 +74,11 @@ func (m *Module) ToDB(dest **db.Module) bool {
 		Active:            m.Active,
 	}
 
+	module.Scripts = make([]string, len(m.Scripts))
 	copy(module.Scripts, m.Scripts)
+	module.Esmodules = make([]string, len(m.Esmodules))
 	copy(module.Esmodules, m.Esmodules)
+	module.Tags = make([]string, len(m.Tags))
 	copy(module.Tags, m.Tags)
 
 	m.Compatibility.ToDB(&module.Compatibility)
@@ -83,12 +86,12 @@ func (m *Module) ToDB(dest **db.Module) bool {
 	m.DocumentTypes.ToDB(&module.DocumentTypes)
 
 	wg := sync.WaitGroup{}
-	go CopySliceToDBParallel(&wg, &module.Authors, m.Authors)
+	CopySliceToDBParallel(&wg, &module.Authors, m.Authors)
-	go CopySliceToDBParallel(&wg, &module.Media, m.Media)
+	CopySliceToDBParallel(&wg, &module.Media, m.Media)
-	go CopySliceToDBParallel(&wg, &module.Styles, m.Styles)
+	CopySliceToDBParallel(&wg, &module.Styles, m.Styles)
-	go CopySliceToDBParallel(&wg, &module.Languages, m.Languages)
+	CopySliceToDBParallel(&wg, &module.Languages, m.Languages)
-	go CopySliceToDBParallel(&wg, &module.Packs, m.Packs)
+	CopySliceToDBParallel(&wg, &module.Packs, m.Packs)
-	go CopySliceToDBParallel(&wg, &module.PackFolders, m.PackFolders)
+	CopySliceToDBParallel(&wg, &module.PackFolders, m.PackFolders)
 	wg.Wait()
 
 	*dest = module

internal/foundry/models/json/modules/dice-stats.go

@@ -1,59 +0,0 @@
-package modules
-
-type DiceStats struct {
-	PlayerRollData DiceStatsRollData `json:"player_roll_data"`
-}
-
-type DiceStatsRollData struct {
-	PlayerDice     []DicePlayerDice `json:"PLAYER_DICE"`
-	Username       string           `json:"USERNAME"`
-	Userid         string           `json:"USERID"`
-	Gm             bool             `json:"GM"`
-	PlayerRollInfo DiceRollInfo     `json:"PLAYER_ROLL_INFO"`
-}
-
-type DicePlayerDice struct {
-	Type                 string `json:"TYPE"`
-	Max                  int    `json:"MAX"`
-	TotalRolls           int    `json:"TOTAL_ROLLS"`
-	Rolls                []int  `json:"ROLLS"`
-	BlindRolls           []int  `json:"BLIND_ROLLS"`
-	StreakSize           int    `json:"STREAK_SIZE"`
-	StreakInit           int    `json:"STREAK_INIT"`
-	StreakIsBlind        bool   `json:"STREAK_ISBLIND"`
-	LongestStreak        int    `json:"LONGEST_STREAK"`
-	LongestStreakInit    int    `json:"LONGEST_STREAK_INIT"`
-	Mean                 int    `json:"MEAN"`
-	Median               int    `json:"MEDIAN"`
-	Mode                 int    `json:"MODE"`
-	Means                []int  `json:"MEANS"`
-	Medians              []int  `json:"MEDIANS"`
-	Modes                []int  `json:"MODES"`
-	RollCounters         []int  `json:"ROLL_COUNTERS"`
-	AtkRolls             []int  `json:"ATK_ROLLS"`
-	DmgRolls             []int  `json:"DMG_ROLLS"`
-	SavesRolls           []int  `json:"SAVES_ROLLS"`
-	SkillsRolls          []int  `json:"SKILLS_ROLLS"`
-	AbilityRolls         []int  `json:"ABILITY_ROLLS"`
-	UnknownRolls         []int  `json:"UNKNOWN_ROLLS"`
-	PerceptionRolls      []int  `json:"PERCEPTION_ROLLS"`
-	InitiativeRolls      []int  `json:"INITIATIVE_ROLLS"`
-	AtkRollsBlind        []int  `json:"ATK_ROLLS_BLIND"`
-	DmgRollsBlind        []int  `json:"DMG_ROLLS_BLIND"`
-	SavesRollsBlind      []int  `json:"SAVES_ROLLS_BLIND"`
-	SkillsRollsBlind     []int  `json:"SKILLS_ROLLS_BLIND"`
-	AbilityRollsBlind    []int  `json:"ABILITY_ROLLS_BLIND"`
-	UnknownRollsBlind    []int  `json:"UNKNOWN_ROLLS_BLIND"`
-	PerceptionRollsBlind []int  `json:"PERCEPTION_ROLLS_BLIND"`
-	InitiativeRollsBlind []int  `json:"INITIATIVE_ROLLS_BLIND"`
-}
-
-type DiceRollInfo struct {
-	IsRollInfoTracked  bool  `json:"IS_ROLL_INFO_TRACKED"`
-	AtkOutcomeTracker  []int `json:"ATK_OUTCOME_TRACKER"`
-	NumUntargetedAtks  int   `json:"NUM_UNTARGETED_ATKS"`
-	TotalAttacks       int   `json:"TOTAL_ATTACKS"`
-	SaveOutcomeTracker []int `json:"SAVE_OUTCOME_TRACKER"`
-	NumUntargetedSaves int   `json:"NUM_UNTARGETED_SAVES"`
-	TotalSaves         int   `json:"TOTAL_SAVES"`
-}

internal/foundry/models/json/modules/pf2e.go

@@ -1,12 +0,0 @@
-package modules
-
-type Pf2eModule struct {
-	settings Pf2eSettings
-}
-
-type Pf2eSettings struct {
-	showEffectPanel      bool
-	showCheckDialogs     bool
-	showDamageDialogs    bool
-	monochromeDarkvision bool
-}

internal/foundry/models/json/notes.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type Note struct {
 	EntryID    string      `json:"entryId"`

internal/foundry/models/json/options.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type GameOptions struct {
 	Language      string `json:"language"`

internal/foundry/models/json/ownership.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type Ownership struct {
 	Player    string `json:"PLAYER,omitempty"`

internal/foundry/models/json/pack.go

@@ -3,7 +3,7 @@ package json
 import (
 	"sync"
 
-	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 )
 
 type Pack struct {
@@ -42,8 +42,8 @@ func (p *Pack) ToDB(dest **db.Pack) bool {
 	p.Ownership.ToDB(&pack.Ownership)
 
 	wg := sync.WaitGroup{}
-	go CopySliceToDBParallel(&wg, &pack.Index, p.Index)
+	CopySliceToDBParallel(&wg, &pack.Index, p.Index)
-	go CopySliceToDBParallel(&wg, &pack.Folders, p.Folders)
+	CopySliceToDBParallel(&wg, &pack.Folders, p.Folders)
 	wg.Wait()
 
 	*dest = pack

internal/foundry/models/json/package_warnings.go

@@ -0,0 +1,35 @@
+package json
+
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
+
+type PackageWarningsData struct {
+	Id            string   `json:"id"`
+	Type          string   `json:"type"`
+	Warning       []string `json:"warning"`
+	Error         []string `json:"error"`
+	Reinstallable bool     `json:"reinstallable"`
+	Manifest      string   `json:"manifest,omitempty"`
+}
+
+func (p *PackageWarningsData) ToDB(dest **db.PackageWarningsData) bool {
+	if dest == nil {
+		return false
+	}
+
+	packageData := &db.PackageWarningsData{
+		ID:            p.Id,
+		Type:          p.Type,
+		Reinstallable: p.Reinstallable,
+		Manifest:      p.Manifest,
+	}
+
+	packageData.Warning = make([]string, len(p.Warning))
+	copy(packageData.Warning, p.Warning)
+
+	packageData.Error = make([]string, len(p.Error))
+	copy(packageData.Error, p.Error)
+
+	*dest = packageData
+
+	return true
+}

internal/foundry/models/json/playlist.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type Playlist struct {
 	Name        string         `json:"name"`
@@ -20,28 +20,32 @@ type Playlist struct {
 	// Flags                any                  `json:"flags,omitempty"`
 }
 
-func (p *Playlist) ToDB(dest *db.Playlist) bool {
+func (p *Playlist) ToDB(dest **db.Playlist) bool {
 	if dest == nil {
 		return false
 	}
 
-	dest.Name = p.Name
+	playlist := &db.Playlist{
-	dest.ID = p.ID
+		Name:        p.Name,
-	dest.Mode = p.Mode
+		ID:          p.ID,
-	dest.Playing = p.Playing
+		Mode:        p.Mode,
-	dest.Fade = p.Fade
+		Playing:     p.Playing,
-	dest.Folder = p.Folder
+		Fade:        p.Fade,
-	dest.Sorting = p.Sorting
+		Folder:      p.Folder,
-	dest.Seed = p.Seed
+		Sorting:     p.Sorting,
-	dest.Sort = p.Sort
+		Seed:        p.Seed,
-	dest.Description = p.Description
+		Sort:        p.Sort,
-	dest.Channel = p.Channel
+		Description: p.Description,
+		Channel:     p.Channel,
+	}
 
-	p.Stats.ToDB(&dest.Stats)
+	p.Stats.ToDB(&playlist.Stats)
 
-	OwnershipToDB(&dest.Ownership, p.Ownership)
+	OwnershipToDB(&playlist.Ownership, p.Ownership)
 
-	CopySliceToDB(&dest.Sounds, p.Sounds)
+	CopySliceToDB(&playlist.Sounds, p.Sounds)
+
+	*dest = playlist
 
 	return true
 }
@@ -61,22 +65,26 @@ type Sound struct {
 	// Flags any     `json:"flags"`
 }
 
-func (s *Sound) ToDB(dest *db.Sound) bool {
+func (s *Sound) ToDB(dest **db.Sound) bool {
 	if dest == nil {
 		return false
 	}
 
-	dest.Name = s.Name
+	sound := &db.Sound{
-	dest.Path = s.Path
+		Name:        s.Name,
-	dest.ID = s.ID
+		Path:        s.Path,
-	dest.Playing = s.Playing
+		ID:          s.ID,
-	dest.PausedTime = s.PausedTime
+		Playing:     s.Playing,
-	dest.Repeat = s.Repeat
+		PausedTime:  s.PausedTime,
-	dest.Volume = s.Volume
+		Repeat:      s.Repeat,
-	dest.Fade = s.Fade
+		Volume:      s.Volume,
-	dest.Sort = s.Sort
+		Fade:        s.Fade,
-	dest.Channel = s.Channel
+		Sort:        s.Sort,
-	dest.Description = s.Description
+		Channel:     s.Channel,
+		Description: s.Description,
+	}
+
+	*dest = sound
 
 	return true
 }

internal/foundry/models/json/relationships.go

@@ -3,7 +3,7 @@ package json
 import (
 	"sync"
 
-	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 )
 
 type Relationships struct {
@@ -20,10 +20,10 @@ func (r *Relationships) ToDB(dest *db.Relationships) bool {
 	}
 
 	wg := sync.WaitGroup{}
-	go CopySliceToDBParallel(&wg, &dest.Systems, r.Systems)
+	CopySliceToDBParallel(&wg, &dest.Systems, r.Systems)
-	go CopySliceToDBParallel(&wg, &dest.Requires, r.Requires)
+	CopySliceToDBParallel(&wg, &dest.Requires, r.Requires)
-	go CopySliceToDBParallel(&wg, &dest.Recommends, r.Recommends)
+	CopySliceToDBParallel(&wg, &dest.Recommends, r.Recommends)
-	go CopySliceToDBParallel(&wg, &dest.Conflicts, r.Conflicts)
+	CopySliceToDBParallel(&wg, &dest.Conflicts, r.Conflicts)
 	wg.Wait()
 
 	return true
@@ -41,7 +41,7 @@ func (r *RelationshipsData) ToDB(dest *db.RelationshipsData) bool {
 		return false
 	}
 
-	dest.ID = r.Id
+	dest.Key = r.Id
 	dest.Type = r.Type
 	dest.Manifest = r.Manifest
 

internal/foundry/models/json/release.go

@@ -1,11 +1,32 @@
 package json
 
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
+
 type Release struct {
-	Generation   int      `json:"generation"`
+	Generation          int    `json:"generation"`
-	Channel      string   `json:"channel"`
+	Channel             string `json:"channel"`
-	Suffix       string   `json:"suffix"`
+	Suffix              string `json:"suffix"`
-	Build        int      `json:"build"`
+	Build               int    `json:"build"`
-	Node_version int      `json:"node_version"`
+	NodeVersion         int    `json:"node_version"`
-	Time         int64    `json:"time"`
+	MaxGeneration       int    `json:"maxGeneration"`
-	flags        struct{} `json:"-"`
+	MaxStableGeneration int    `json:"maxStableGeneration"`
+	Time                int64  `json:"time"`
+	// Flags               Flags  `json:"flags"`
+}
+
+func (r *Release) ToDB(dest *db.Release) bool {
+	if dest == nil {
+		return false
+	}
+
+	dest.Generation = r.Generation
+	dest.Channel = r.Channel
+	dest.Suffix = r.Suffix
+	dest.Build = r.Build
+	dest.NodeVersion = r.NodeVersion
+	dest.MaxGeneration = r.MaxGeneration
+	dest.MaxStableGeneration = r.MaxStableGeneration
+	dest.Time = r.Time
+
+	return true
 }

internal/foundry/models/json/ring.go

@@ -1,6 +1,6 @@
 package json
 
-import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+import "gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 
 type Ring struct {
 	Enabled    bool       `json:"enabled"`
@@ -9,15 +9,20 @@ type Ring struct {
 	Subject    Subject    `json:"subject"`
 }
 
-func (r *Ring) ToDB(dest *db.Ring) bool {
+func (r *Ring) ToDB(dest **db.Ring) bool {
 	if dest == nil {
 		return false
 	}
 
-	dest.Enabled = r.Enabled
+	ring := &db.Ring{
-	dest.Effects = r.Effects
+		Enabled: r.Enabled,
-	r.RingColors.ToDB(&dest.RingColors)
+		Effects: r.Effects,
-	r.Subject.ToDB(&dest.Subject)
+	}
+
+	r.RingColors.ToDB(&ring.RingColors)
+	r.Subject.ToDB(&ring.Subject)
+
+	*dest = ring
 
 	return true
 }

internal/foundry/models/json/scene.go

@@ -3,7 +3,7 @@ package json
 import (
 	"sync"
 
-	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/temp_models/db"
+	"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models/db"
 )
 
 type Scene struct {
@@ -85,12 +85,12 @@ func (s *Scene) ToDB(dest *db.Scene) bool {
 	OwnershipToDB(&dest.Ownership, s.Ownership)
 
 	wg := sync.WaitGroup{}
-	go CopySliceToDBParallel(&wg, &dest.Drawings, s.Drawings)
+	CopySliceToDBParallel(&wg, &dest.Drawings, s.Drawings)
-	go CopySliceToDBParallel(&wg, &dest.Tokens, s.Tokens)
+	CopySliceToDBParallel(&wg, &dest.Tokens, s.Tokens)
-	go CopySliceToDBParallel(&wg, &dest.Lights, s.Lights)
+	CopySliceToDBParallel(&wg, &dest.Lights, s.Lights)
-	go CopySliceToDBParallel(&wg, &dest.Notes, s.Notes)
+	CopySliceToDBParallel(&wg, &dest.Notes, s.Notes)
-	go CopySliceToDBParallel(&wg, &dest.Sounds, s.Sounds)
+	CopySliceToDBParallel(&wg, &dest.Sounds, s.Sounds)
-	go CopySliceToDBParallel(&wg, &dest.Walls, s.Walls)
+	CopySliceToDBParallel(&wg, &dest.Walls, s.Walls)
 	wg.Wait()
 
 	return true