Adding initial code for adding a new poll on the backend

server/db/db.go

@@ -2,30 +2,53 @@ package db
 
 import (
 	"database/sql"
-	"os"
+
+	"go-sjles-pta-vote/server/config"
 
 	_ "github.com/glebarez/go-sqlite"
 )
 
+var build_db_query string = `
+CREATE TABLE IF NOT EXISTS polls (
+    id INTEGER PRIMARY KEY,
+    question TEXT NOT NULL,
+    member_yes_votes UNSIGNED INT NOT NULL DEFAULT 0,
+    member_no_votes UNSIGNED INT NOT NULL DEFAULT 0,
+    non_member_yes_votes UNSIGNED INT NOT NULL DEFAULT 0,
+    non_member_no_votes UNSIGNED INT NOT NULL DEFAULT 0,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    expires_at DATETIME
+);
+
+CREATE TABLE IF NOT EXISTS voters (
+    poll_id UNSIGNED INT NOT NULL,
+    voter_email TEXT NOT NULL,
+    FOREIGN KEY (poll_id) REFERENCES polls(id),
+    PRIMARY KEY (poll_id, voter_email)
+);
+
+CREATE TABLE IF NOT EXISTS members (
+    email TEXT NOT NULL,
+    member_name TEXT,
+    PRIMARY KEY (email)
+);
+`
+
 var db *sql.DB
 
-func Connect(db_path string) error {
-	var err error
-	db, err = sql.Open("sqlite", db_path)
+func Connect() (*sql.DB, error) {
+	db_config := config.GetConfig()
+
+	db, err := sql.Open("sqlite", db_config.DBPath)
 
 	if err != nil {
-		return err
+		return nil, err
 	}
 
-	sql_create, err := os.ReadFile("./db_format.sql")
+	_, err = db.Exec(build_db_query)
 	
-	if err != nil {
-		return err
-	}
-
-	_, err = db.Exec(string(sql_create))
-	
-	return err
+	return db, err
 }
 
 func Close() {

server/db/db_format.sql

@@ -1,24 +0,0 @@
-CREATE TABLE IF NOT EXISTS polls (
-    id INTEGER PRIMARY KEY,
-    question TEXT NOT NULL,
-    member_yes_votes UNSIGNED INT NOT NULL,
-    member_no_votes UNSIGNED INT NOT NULL,
-    non_member_yes_votes UNSIGNED INT NOT NULL,
-    non_member_no_votes UNSIGNED INT NOT NULL,
-    created_at DATETIME,
-    updated_at DATETIME,
-    expires_at DATETIME
-);
-
-CREATE TABLE IF NOT EXISTS voters (
-    poll_id UNSIGNED INT NOT NULL,
-    voter_email TEXT NOT NULL,
-    FOREIGN KEY (poll_id) REFERENCES polls(id),
-    PRIMARY KEY (poll_id, voter_email)
-);
-
-CREATE TABLE IF NOT EXISTS members (
-    email TEXT NOT NULL,
-    member_name TEXT,
-    PRIMARY KEY (email)
-);

server/db/db_test.go

@@ -3,21 +3,26 @@ package db
 import (
 	"os"
 	"testing"
+
+	"go-sjles-pta-vote/server/config"
 )
 
 func TestConnect(t *testing.T) {
 	tmp_db, err := os.CreateTemp("", "vote_test.*.db")
-	tmp_db_name := tmp_db.Name()
-	tmp_db.Close()
-
-	defer os.Remove(tmp_db_name)
-
 	if err != nil {
-		t.Errorf(`Failed to create temporary db: %v`, err)
+		t.Errorf(`Failed to create temporary db file: %v`, err)
 	}
 
-	if err := Connect(tmp_db_name); err != nil {
-		t.Errorf(`Failed to create the database at %s: %v`, tmp_db_name, err)
+	init_conf := &config.Config{
+		DBPath: string(tmp_db.Name()),
+	}
+	config.SetConfig(init_conf)
+
+	defer os.Remove(tmp_db.Name())
+	tmp_db.Close()
+
+	if _, err := Connect(); err != nil {
+		t.Errorf(`Failed to create the database: %v`, err)
 	}
 
 	defer Close()