upgraded cli

cli/commands/backend.go

@@ -0,0 +1,59 @@
+package commands
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+
+	_ "github.com/lib/pq"
+	"github.com/urfave/cli/v2"
+)
+
+var backendCmd = &cli.Command{
+    Name:  "backend",
+    Usage: "Starts the backend server in development mode",
+    Action: func(c *cli.Context) error {
+        cmd := exec.Command("go", "run", "backend/main.go", "--use-dev-dot-env")
+        cmd.Stdout = os.Stdout
+        cmd.Stderr = os.Stderr
+        err := cmd.Run()
+        if err != nil {
+            return fmt.Errorf("error starting backend: %w", err)
+        }
+        return nil
+    },
+}
+
+func BackendCommand() *cli.Command {
+	command := &cli.Command{
+		Name:  "backend",
+		Usage: "Starts the backend server",
+		Aliases: []string{"be"},
+		Flags: []cli.Flag{
+			&cli.BoolFlag{
+				Name:  "use-dev-dot-env",
+				Usage: "Use the .env file in the backend directory",
+				Aliases: []string{"d"},
+			},
+		},
+		Action: func(c *cli.Context) error {
+			RunBackend()
+
+			return nil
+		},
+	}
+
+	return command
+}
+
+func RunBackend() error {
+	cmd := exec.Command("go", "run", "main.go")
+	cmd.Dir = BACKEND_DIR
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	err := cmd.Run()
+	if err != nil {
+		return fmt.Errorf("error starting backend: %w", err)
+	}
+	return nil
+}

cli/commands/clean_tests.go

@@ -34,54 +34,62 @@ func ClearDBCommand() *cli.Command {
 }
 
 func CleanTestDBs() error {
-	fmt.Println("Cleaning test databases")
+    fmt.Println("Cleaning test databases")
 
-	db, err := sql.Open("postgres", CONFIG.Database.WithDb())
-	if err != nil {
-		return err
-	}
+    db, err := sql.Open("postgres", CONFIG.Database.WithDb())
+    if err != nil {
+        return err
+    }
 
-	defer db.Close()
+    defer db.Close()
 
-	currentUser, err := user.Current()
-	if err != nil {
-		return fmt.Errorf("failed to get current user: %w", err)
-	}
+    currentUser, err := user.Current()
+    if err != nil {
+        return fmt.Errorf("failed to get current user: %w", err)
+    }
 
-	rows, err := db.Query("SELECT datname FROM pg_database WHERE datistemplate = false AND datname != 'postgres' AND datname != $1 AND datname != $2 AND datname LIKE 'sac_test_%';", currentUser.Username, CONFIG.Database.DatabaseName)
-	if err != nil {
-		return err
-	}
+    query := "SELECT datname FROM pg_database WHERE datistemplate = false AND datname != 'postgres' AND datname != $1 AND datname != $2 AND datname LIKE 'sac_test_%';"
+    rows, err := db.Query(query, currentUser.Username, CONFIG.Database.DatabaseName)
+    if err != nil {
+        return err
+    }
 
-	defer rows.Close()
+    defer rows.Close()
 
-	var wg sync.WaitGroup
+    var wg sync.WaitGroup
+    var dropped, failed int
 
-	for rows.Next() {
-		var dbName string
+    for rows.Next() {
+        var dbName string
 
-		if err := rows.Scan(&dbName); err != nil {
-			return err
-		}
+        if err := rows.Scan(&dbName); err != nil {
+            return err
+        }
 
-		wg.Add(1)
+        wg.Add(1)
 
-		go func(dbName string) {
-			defer wg.Done()
+        go func(dbName string) {
+            defer wg.Done()
 
-			fmt.Printf("Dropping database %s\n", dbName)
+            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)
-	}
+            _, err := db.Exec(fmt.Sprintf("DROP DATABASE %s", dbName))
+            if err != nil {
+                fmt.Printf("Failed to drop database %s: %v\n", dbName, err)
+                failed++
+            } else {
+                dropped++
+            }
+        }(dbName)
+    }
 
-	if err := rows.Err(); err != nil {
-		return err
-	}
+    wg.Wait()
+
+    fmt.Printf("\nSummary:\n  - Databases dropped: %d\n  - Databases failed to drop: %d\n", dropped, failed)
 
-	wg.Wait()
+    if failed > 0 {
+        return fmt.Errorf("failed to drop %d database(s)", failed)
+    }
 
-	return nil
+    return nil
 }

cli/commands/fe.go → cli/commands/frontend.go

@@ -8,7 +8,7 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
-func RunFrontendCommand() *cli.Command {
+func FrontendCommand() *cli.Command {
 	command := cli.Command{
 		Name:     "fe",
 		Usage:    "Run the frontend",

cli/commands/swagger.go

@@ -2,6 +2,7 @@ package commands
 
 import (
 	"fmt"
+	"os"
 	"os/exec"
 
 	"github.com/urfave/cli/v2"
@@ -11,15 +12,15 @@ func SwaggerCommand() *cli.Command {
 	command := cli.Command{
 		Name:    "swagger",
 		Aliases: []string{"swag"},
-		Usage:   "Updates the swagger documentation",
+		Usage:   "Runs `swag init` to update Swagger documentation for the backend API",
 		Action: func(c *cli.Context) error {
-			if c.Args().Len() > 0 {
-				return cli.Exit("Invalid arguments", 1)
-			}
-
-			err := Swagger()
+			cmd := exec.Command("swag", "init")
+			cmd.Dir = BACKEND_DIR
+			cmd.Stdout = os.Stdout
+			cmd.Stderr = os.Stderr
+			err := cmd.Run()
 			if err != nil {
-				return cli.Exit(err.Error(), 1)
+				return fmt.Errorf("error running swag init: %w", err)
 			}
 			return nil
 		},

cli/commands/test.go

@@ -95,7 +95,7 @@ func Test(folder string, runFrontend bool, runBackend bool) error {
 
 func BackendTest() error {
 	cmd := exec.Command("go", "test", "./...")
-	cmd.Dir = fmt.Sprintf("%s/..", BACKEND_DIR)
+	cmd.Dir = BACKEND_DIR
 
 	out, err := cmd.CombinedOutput()
 	if err != nil {

cli/main.go

@@ -11,16 +11,16 @@ import (
 func main() {
 	app := &cli.App{
 		Name:  "sac-cli",
-		Usage: "CLI for SAC",
+		Usage: "CLI for the GenerateNU SAC",
 		Commands: []*cli.Command{
 			commands.SwaggerCommand(),
 			commands.ClearDBCommand(),
 			commands.MigrateCommand(),
 			commands.ResetCommand(),
 			commands.InsertCommand(),
 			commands.DropCommand(),
-			commands.RunBackendCommand(),
-			commands.RunFrontendCommand(),
+			commands.BackendCommand(),
+			commands.FrontendCommand(),
 			commands.TestCommand(), // TODO: frontend tests
 			commands.FormatCommand(),
 			commands.LintCommand(),