fix

cli/commands/clean_tests.go

@@ -1,9 +1,13 @@
 package commands
 
 import (
+	"database/sql"
+	"os/user"
+
 	"fmt"
-	"os/exec"
+	"sync"
 
+	_ "github.com/lib/pq"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,28 +20,70 @@ func ClearDBCommand() *cli.Command {
 				return cli.Exit("Invalid arguments", 1)
 			}
 
-			ClearDB()
+			err := CleanTestDBs()
+
+			if err != nil {
+				return cli.Exit(err.Error(), 1)
+			}
 			return nil
 		},
 	}
 
 	return &command
 }
 
-func ClearDB() error { 
+func CleanTestDBs() error {
+	db, err := sql.Open("postgres", CONFIG.Database.WithDb())
 
-	fmt.Println("Clearing databases")
+	if err != nil {
+		return err
+	}
+
+	defer db.Close()
 
-	cmd := exec.Command("./scripts/clean_old_test_dbs.sh")
-	cmd.Dir = ROOT_DIR
+	currentUser, err := user.Current()
 
-	out, err := cmd.CombinedOutput()
 	if err != nil {
-		fmt.Println(string(out))
-		return cli.Exit("Failed to clean old test databases", 1)
+		return fmt.Errorf("failed to get current user: %w", err)
 	}
 
-	fmt.Println("Databases cleared")
-
+	rows, err := db.Query("SELECT datname FROM pg_database WHERE datistemplate = false AND datname != 'postgres' AND datname != $1 AND datname != $2", currentUser.Username, CONFIG.Database.DatabaseName)
+
+	if err != nil {
+		return err
+	}
+
+	defer rows.Close()
+
+	var wg sync.WaitGroup
+
+	for rows.Next() {
+		var dbName string
+
+		if err := rows.Scan(&dbName); err != nil {
+			return err
+		}
+
+		wg.Add(1)
+
+		go func(dbName string) {
+
+			defer wg.Done()
+
+			fmt.Printf("Dropping database %s\n", dbName)
+
+			if _, err := db.Exec(fmt.Sprintf("DROP DATABASE %s", dbName)); err != nil {
+				fmt.Printf("Failed to drop database %s: %v\n", dbName, err)
+			}
+
+		}(dbName)
+	}
+
+	if err := rows.Err(); err != nil {
+		return err
+	}
+
+	wg.Wait()
+
 	return nil
 }

cli/commands/config.go

@@ -3,9 +3,11 @@ package commands
 import (
 	"path/filepath"
 
+	"github.com/GenerateNU/sac/backend/src/config"
 	"github.com/GenerateNU/sac/cli/utils"
 )
 
 var ROOT_DIR, _ = utils.GetRootDir()
 var FRONTEND_DIR = filepath.Join(ROOT_DIR, "/frontend")
 var BACKEND_DIR = filepath.Join(ROOT_DIR, "/backend/src")
+var CONFIG, _ = config.GetConfiguration(filepath.Join(ROOT_DIR, "/config"))

cli/commands/test.go

@@ -74,30 +74,20 @@ func Test(folder string, runFrontend bool, runBackend bool) error {
 }
 
 func BackendTest() error {
-	// rootDir, err := utils.GetRootDir()
-	// if err != nil {
-	// 	return cli.Exit("Couldn't find the project root", 1)
-	// }
-
 	cmd := exec.Command("go", "test", "./...")
-	cmd.Dir = BACKEND_DIR + "/.."
+	cmd.Dir = fmt.Sprintf("%s/..", BACKEND_DIR)
+
+	defer CleanTestDBs()
 
 	out, err := cmd.CombinedOutput()
+
 	if err != nil {
 		fmt.Println(string(out))
 		return cli.Exit("Failed to run backend tests", 1)
 	}
 
 	fmt.Println(string(out))
 
-	cmd = exec.Command("./scripts/clean_old_test_dbs.sh")
-	cmd.Dir = ROOT_DIR
-
-	err = cmd.Run()
-	if err != nil {
-		return cli.Exit("Failed to clean old test databases", 1)
-	}
-
 	return nil
 }
 

cli/go.mod

@@ -6,6 +6,7 @@ require github.com/urfave/cli/v2 v2.27.1
 
 require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+	github.com/lib/pq v1.10.9
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
 )

cli/go.sum

@@ -1,5 +1,7 @@
 github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho=

install.sh

@@ -5,8 +5,6 @@ set -o pipefail
 # Get the absolute path to the current script
 SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-# /Users/davidoduneye/northeastern/org-generate/sac
-
 # Build the Go CLI tool
 go build -o "sac-cli" "cli/main.go"