Feat/fixes

cmd/api/main.go

@@ -18,9 +18,10 @@ func main() {
 
 	e.GET("/demo/style.css", handler.Stylesheet)
 
-	e.GET("/v/:ulid", handler.Configuration)
+	e.GET("/v/:ulid", handler.GetConfiguration)
+	e.GET("/v/new", handler.GetConfiguration)
+
 	e.POST("/v/:ulid", handler.UpdateConfig)
-	e.GET("/v/new", handler.Configuration)
 	e.POST("/v/new", handler.IntroVideoCode)
 	e.POST("/v/config", handler.CreateConfig)
 
@@ -36,4 +37,3 @@ func main() {
 
 	e.Logger.Fatal(e.Start(":" + port))
 }
-

db/migrations/1715450000_configuration.up.sql → db/migrations/1725105528_configuration.up.sql

@@ -1,9 +1,9 @@
 CREATE TABLE `configurations` (
-	`id` INTEGER PRIMARY KEY NOT NULL,
+	`id` BLOB UNIQUE NOT NULL,
   `theme` TEXT DEFAULT 'default',
   `bubble_enabled` BOOLEAN DEFAULT false,
   `bubble_text_content` TEXT,
   `cta_enabled` BOOLEAN DEFAULT false,
-  `cta_text_content` TEXT
+  `cta_text_content` TEXT,
+  `video_url` TEXT
 );
-

db/migrations/schema.sql

@@ -1,22 +1,15 @@
-CREATE TABLE schema_migrations (id VARCHAR(255) NOT NULL PRIMARY KEY);
+
+--
+-- LibSQL SQL Schema dump automatic generated by geni
+--
+
+CREATE TABLE schema_migrations (id VARCHAR(255) NOT NULL PRIMARY KEY)
 CREATE TABLE `configurations` (
-\t`id` integer PRIMARY KEY NOT NULL,
-  `bubble_enabled` boolean DEFAULT false,
-  `bubble_text_content` text,
-  `bubble_type` text DEFAULT 'default',
-  `cta_enabled` boolean DEFAULT false,
-  `cta_text_content` text,
-  `cta_type` text DEFAULT 'default'
-);
-CREATE TABLE `videos` (
-\t`id` integer PRIMARY KEY NOT NULL,
-  `url` text NOT NULL,
-  `weight` integer DEFAULT 1,
-  `configuration_id` integer NOT NULL,
-  `instance_id` integer NOT NULL,
-  FOREIGN KEY(`configuration_id`) REFERENCES `configurations`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION,
-  FOREIGN KEY(`instance_id`) REFERENCES `instances`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION
-);
-CREATE TABLE `instances` (
-\t`id` integer PRIMARY KEY NOT NULL
-);
+	`id` BLOB UNIQUE NOT NULL,
+  `theme` TEXT DEFAULT 'default',
+  `bubble_enabled` BOOLEAN DEFAULT false,
+  `bubble_text_content` TEXT,
+  `cta_enabled` BOOLEAN DEFAULT false,
+  `cta_text_content` TEXT,
+  `video_url` TEXT
+)

internal/data/instance.go → internal/data/configuration.go

@@ -2,46 +2,20 @@ package data
 
 import (
 	"database/sql"
-	"os"
 	"fmt"
+	"os"
 
 	"github.com/crocoder-dev/intro-video/internal/config"
 	"github.com/joho/godotenv"
 	"github.com/oklog/ulid/v2"
 	_ "github.com/tursodatabase/libsql-client-go/libsql"
 )
 
-type Instance struct {
-	Id             int32
-	ExternalId     []byte
-	Videos         map[int32]Video
-	Configurations map[int32]Configuration
-}
-
-type NewVideo struct {
-	Weight int32
-	URL    string
-}
-
-type Video struct {
-	Id              int32
-	Weight          int32
-	ConfigurationId int32
-	URL             string
-}
-
-type NewConfiguration struct {
-	VideoUrl string
-	Theme  config.Theme
-	Bubble config.Bubble
-	Cta    config.Cta
-}
-
 type Configuration struct {
-	Id     []byte
-	Theme  config.Theme
-	Bubble config.Bubble
-	Cta    config.Cta
+	Id       []byte
+	Theme    config.Theme
+	Bubble   config.Bubble
+	Cta      config.Cta
 	VideoUrl string
 }
 
@@ -61,7 +35,7 @@ func NewStore() (Store, error) {
 
 }
 
-func (s *Store) LoadConfig(id []byte) (Configuration, error) {
+func (s *Store) LoadConfiguration(id []byte) (Configuration, error) {
 	db, err := sql.Open(s.DriverName, s.DatabaseUrl)
 	if err != nil {
 		return Configuration{}, err
@@ -113,7 +87,7 @@ func (s *Store) LoadConfig(id []byte) (Configuration, error) {
 	}
 
 	return Configuration{
-		Id: configId,
+		Id:    configId,
 		Theme: config.Theme(theme),
 		Bubble: config.Bubble{
 			Enabled:     bubbleEnabled,
@@ -127,7 +101,7 @@ func (s *Store) LoadConfig(id []byte) (Configuration, error) {
 	}, nil
 }
 
-func (s *Store) CreateConfiguration(configuration NewConfiguration) (Configuration, error) {
+func (s *Store) CreateConfiguration(configuration Configuration) (Configuration, error) {
 	db, err := sql.Open(s.DriverName, s.DatabaseUrl)
 	if err != nil {
 		return Configuration{}, err
@@ -179,17 +153,17 @@ func (s *Store) CreateConfiguration(configuration NewConfiguration) (Configurati
 	}
 
 	newConfiguration := Configuration{
-		Id:     configurationId,
-		Theme:  configuration.Theme,
-		Bubble:	config.Bubble{Enabled: configuration.Bubble.Enabled, TextContent: configuration.Bubble.TextContent},
-		Cta:	config.Cta{Enabled: configuration.Cta.Enabled, TextContent: configuration.Cta.TextContent},
+		Id:       configurationId,
+		Theme:    configuration.Theme,
+		Bubble:   config.Bubble{Enabled: configuration.Bubble.Enabled, TextContent: configuration.Bubble.TextContent},
+		Cta:      config.Cta{Enabled: configuration.Cta.Enabled, TextContent: configuration.Cta.TextContent},
 		VideoUrl: configuration.VideoUrl,
 	}
 
 	return newConfiguration, nil
 }
 
-func (s *Store) UpdateConfiguration(id []byte, configuration NewConfiguration) (Configuration, error) {
+func (s *Store) UpdateConfiguration(id []byte, configuration Configuration) (Configuration, error) {
 	db, err := sql.Open(s.DriverName, s.DatabaseUrl)
 	if err != nil {
 		return Configuration{}, err
@@ -232,13 +206,12 @@ func (s *Store) UpdateConfiguration(id []byte, configuration NewConfiguration) (
 	}
 
 	updatedConfiguration := Configuration{
-		Id:     id,
-		Theme:  configuration.Theme,
-		Bubble:	config.Bubble{Enabled: configuration.Bubble.Enabled, TextContent: configuration.Bubble.TextContent},
-		Cta:	config.Cta{Enabled: configuration.Cta.Enabled, TextContent: configuration.Cta.TextContent},
+		Id:       id,
+		Theme:    configuration.Theme,
+		Bubble:   config.Bubble{Enabled: configuration.Bubble.Enabled, TextContent: configuration.Bubble.TextContent},
+		Cta:      config.Cta{Enabled: configuration.Cta.Enabled, TextContent: configuration.Cta.TextContent},
 		VideoUrl: configuration.VideoUrl,
 	}
 
 	return updatedConfiguration, nil
 }
-

internal/data/instance_test.go → internal/data/configuration_test.go

@@ -108,7 +108,7 @@ func TestCreateConfiguration(t *testing.T) {
 
 	store := data.Store{DatabaseUrl: dbName, DriverName: "sqlite3"}
 
-	newConfiguration := data.NewConfiguration{
+	newConfiguration := data.Configuration{
 		Theme: config.DefaultTheme,
 		Bubble: config.Bubble{
 			Enabled:     true,
@@ -153,7 +153,7 @@ func TestLoadConfiguration(t *testing.T) {
 
 	store := data.Store{DatabaseUrl: dbName, DriverName: "sqlite3"}
 
-	configuration, err := store.LoadConfig(binUlid)
+	configuration, err := store.LoadConfiguration(binUlid)
 	if err != nil {
 		t.Fatalf("failed to load instance: %v", err)
 	}
@@ -196,7 +196,7 @@ func TestUpdateConfiguration(t *testing.T) {
 
 	store := data.Store{DatabaseUrl: dbName, DriverName: "sqlite3"}
 
-	newConfiguration := data.NewConfiguration{
+	newConfiguration := data.Configuration{
 		Theme: config.DefaultTheme,
 		Bubble: config.Bubble{
 			Enabled:     true,
@@ -214,7 +214,7 @@ func TestUpdateConfiguration(t *testing.T) {
 		t.Fatalf("failed to create instance: %v", err)
 	}
 
-	updatedConfiguration := data.NewConfiguration{
+	updatedConfiguration := data.Configuration{
 		Theme: config.ShadcnThemeDark,
 		Bubble: config.Bubble{
 			Enabled:     false,
@@ -224,7 +224,7 @@ func TestUpdateConfiguration(t *testing.T) {
 			Enabled:     false,
 			TextContent: "updated cta text",
 		},
-		VideoUrl:  "updated url",
+		VideoUrl: "updated url",
 	}
 
 	expected := data.Configuration{
@@ -241,7 +241,6 @@ func TestUpdateConfiguration(t *testing.T) {
 		VideoUrl: "updated url",
 	}
 
-
 	newConfig, err := store.UpdateConfiguration(configuration.Id, updatedConfiguration)
 	if err != nil {
 		t.Fatalf("failed to update instance: %v", err)
@@ -250,4 +249,3 @@ func TestUpdateConfiguration(t *testing.T) {
 		t.Fatalf("Expected updated configuration %+v, got %+v", newConfig, expected)
 	}
 }
-