fixed cli lints

GenerateNU · Feb 5, 2024 · 3171ff1 · 3171ff1
1 parent 433a0f3
commit 3171ff1
Show file tree

Hide file tree

Showing 10 changed files with 122 additions and 41 deletions.
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -46,6 +46,10 @@ jobs:
   lint:
     name: Lint
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: read
+      checks: write
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4

diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
@@ -46,6 +46,10 @@ jobs:
   lint:
     name: Lint
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: read
+      checks: write
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4

diff --git a/cli/commands/drop.go b/cli/commands/drop.go
@@ -70,8 +70,7 @@ func DropData() error {
 			return fmt.Errorf("error scanning table name: %w", err)
 		}
 
-		deleteStmt := fmt.Sprintf("DELETE FROM \"%s\"", tablename)
-		_, err := db.Exec(deleteStmt)
+		_, err := db.Exec("DELETE FROM $1", tablename)
 		if err != nil {
 			return fmt.Errorf("error deleting rows from table %s: %w", tablename, err)
 		}
@@ -82,7 +81,9 @@ func DropData() error {
 		return fmt.Errorf("error in rows handling: %w", err)
 	}
 
-	Migrate()
+	if Migrate() != nil {
+		return fmt.Errorf("error migrating database: %w", err)
+	}
 
 	fmt.Println("All rows removed successfully.")
 	return nil

diff --git a/cli/commands/format.go b/cli/commands/format.go
@@ -39,7 +39,10 @@ func FormatCommand() *cli.Command {
 			runFrontend := folder != ""
 			runBackend := c.Bool("backend")
 
-			Format(folder, runFrontend, runBackend)
+			err := Format(folder, runFrontend, runBackend)
+			if err != nil {
+				return cli.Exit(err.Error(), 1)
+			}
 
 			return nil
 		},
@@ -56,7 +59,10 @@ func Format(folder string, runFrontend bool, runBackend bool) error {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			BackendFormat()
+			err := BackendFormat()
+			if err != nil {
+				fmt.Println(err)
+			}
 		}()
 	}
 
@@ -65,7 +71,10 @@ func Format(folder string, runFrontend bool, runBackend bool) error {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			FrontendFormat(folder)
+			err := FrontendFormat(folder)
+			if err != nil {
+				fmt.Println(err)
+			}
 		}()
 	}
 

diff --git a/cli/commands/insert.go b/cli/commands/insert.go
@@ -1,15 +1,12 @@
 package commands
 
 import (
-	"bytes"
 	"database/sql"
-	"errors"
 	"fmt"
+	"os"
 	"os/exec"
-	"strconv"
-	"strings"
 
-	_ "github.com/lib/pq"
+	"github.com/lib/pq"
 	"github.com/urfave/cli/v2"
 )
 
@@ -65,18 +62,20 @@ func InsertDB() error {
 		fmt.Println("Database exists with tables.")
 	}
 
-	insertCmd := exec.Command("psql", "-h", CONFIG.Database.Host, "-p", strconv.Itoa(int(CONFIG.Database.Port)), "-U", CONFIG.Database.Username, "-d", CONFIG.Database.DatabaseName, "-a", "-f", MIGRATION_FILE)
-
-	var output bytes.Buffer
-	insertCmd.Stdout = &output
-	insertCmd.Stderr = &output
-
-	if err := insertCmd.Run(); err != nil {
-		return fmt.Errorf("error inserting data: %w", err)
+	migrationSQL, err := os.ReadFile(MIGRATION_FILE)
+	if err != nil {
+		return fmt.Errorf("error reading migration file: %w", err)
 	}
 
-	if strings.Contains(output.String(), "ROLLBACK") {
-		return errors.New("insertion failed, rolling back")
+	_, err = db.Exec(string(migrationSQL))
+	if err != nil {
+		if pqErr, ok := err.(*pq.Error); ok {
+			fmt.Println("PostgreSQL Error:")
+			fmt.Println("Code:", pqErr.Code)
+			fmt.Println("Message:", pqErr.Message)
+		} else {
+			return fmt.Errorf("error executing migration: %w", err)
+		}
 	}
 
 	fmt.Println("Data inserted successfully.")

diff --git a/cli/commands/lint.go b/cli/commands/lint.go
@@ -39,7 +39,10 @@ func LintCommand() *cli.Command {
 			runFrontend := folder != ""
 			runBackend := c.Bool("backend")
 
-			Lint(folder, runFrontend, runBackend)
+			err := Lint(folder, runFrontend, runBackend)
+			if err != nil {
+				return cli.Exit(err.Error(), 1)
+			}
 
 			return nil
 		},
@@ -50,13 +53,17 @@ func LintCommand() *cli.Command {
 
 func Lint(folder string, runFrontend bool, runBackend bool) error {
 	var wg sync.WaitGroup
+	errChan := make(chan error, 1)
 
 	// Start the backend if specified
 	if runBackend {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			BackendLint()
+			err := BackendLint()
+			if err != nil {
+				errChan <- err
+			}
 		}()
 	}
 
@@ -65,19 +72,31 @@ func Lint(folder string, runFrontend bool, runBackend bool) error {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			FrontendLint(folder)
+			err := FrontendLint(folder)
+			if err != nil {
+				errChan <- err
+			}
 		}()
 	}
 
-	wg.Wait()
+	go func() {
+		wg.Wait()
+		close(errChan)
+	}()
+
+	for err := range errChan {
+		if err != nil {
+			return err
+		}
+	}
 
 	return nil
 }
 
 func BackendLint() error {
 	fmt.Println("Linting backend")
 
-	cmd := exec.Command("go", "vet", "./...")
+	cmd := exec.Command("golangci-lint", "run")
 	cmd.Dir = BACKEND_DIR
 
 	err := cmd.Run()

diff --git a/cli/commands/migrate.go b/cli/commands/migrate.go
@@ -17,7 +17,10 @@ func MigrateCommand() *cli.Command {
 				return cli.Exit("Invalid arguments", 1)
 			}
 
-			Migrate()
+			err := Migrate()
+			if err != nil {
+				return cli.Exit(err.Error(), 1)
+			}
 			return nil
 		},
 	}

diff --git a/cli/commands/reset.go b/cli/commands/reset.go
@@ -46,17 +46,23 @@ func ResetCommand() *cli.Command {
 func ResetData() error {
 	fmt.Println("Clearing database")
 
-	DropData()
+	err := DropData()
+	if err != nil {
+		return cli.Exit(err.Error(), 1)
+	}
 
 	cmd := exec.Command("sleep", "1")
 	cmd.Dir = BACKEND_DIR
 
-	err := cmd.Run()
+	err = cmd.Run()
 	if err != nil {
 		return cli.Exit("Error running sleep", 1)
 	}
 
-	Migrate()
+	err = Migrate()
+	if err != nil {
+		return cli.Exit(err.Error(), 1)
+	}
 
 	cmd = exec.Command("sleep", "1")
 	cmd.Dir = BACKEND_DIR
@@ -66,7 +72,10 @@ func ResetData() error {
 		return cli.Exit("Error running sleep", 1)
 	}
 
-	InsertDB()
+	err = InsertDB()
+	if err != nil {
+		return cli.Exit(err.Error(), 1)
+	}
 
 	fmt.Println("Data reset successfully")
 
@@ -76,17 +85,23 @@ func ResetData() error {
 func ResetMigration() error {
 	fmt.Println("Resetting migration")
 
-	DropDB()
+	err := DropDB()
+	if err != nil {
+		return cli.Exit(err.Error(), 1)
+	}
 
 	cmd := exec.Command("sleep", "1")
 	cmd.Dir = BACKEND_DIR
 
-	err := cmd.Run()
+	err = cmd.Run()
 	if err != nil {
 		return cli.Exit("Error running sleep", 1)
 	}
 
-	Migrate()
+	err = Migrate()
+	if err != nil {
+		return cli.Exit(err.Error(), 1)
+	}
 
 	fmt.Println("Migration reset successfully")
 

diff --git a/cli/commands/swagger.go b/cli/commands/swagger.go
@@ -17,7 +17,10 @@ func SwaggerCommand() *cli.Command {
 				return cli.Exit("Invalid arguments", 1)
 			}
 
-			Swagger()
+			err := Swagger()
+			if err != nil {
+				return cli.Exit(err.Error(), 1)
+			}
 			return nil
 		},
 	}

diff --git a/cli/commands/test.go b/cli/commands/test.go
@@ -38,7 +38,10 @@ func TestCommand() *cli.Command {
 			folder := c.String("frontend")
 			runFrontend := folder != ""
 			runBackend := c.Bool("backend")
-			Test(folder, runFrontend, runBackend)
+			err := Test(folder, runFrontend, runBackend)
+			if err != nil {
+				return cli.Exit(err.Error(), 1)
+			}
 			return nil
 		},
 	}
@@ -47,13 +50,17 @@ func TestCommand() *cli.Command {
 
 func Test(folder string, runFrontend bool, runBackend bool) error {
 	var wg sync.WaitGroup
+	errChan := make(chan error, 1)
 
 	// Start the backend if specified
 	if runBackend {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			BackendTest()
+			err := BackendTest()
+			if err != nil {
+				errChan <- err
+			}
 		}()
 	}
 
@@ -62,27 +69,44 @@ func Test(folder string, runFrontend bool, runBackend bool) error {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			FrontendTest(folder)
+			err := FrontendTest(folder)
+			if err != nil {
+				errChan <- err
+			}
 		}()
 	}
 
-	wg.Wait()
+	go func() {
+		wg.Wait()
+		close(errChan)
+	}()
+
+	for err := range errChan {
+		if err != nil {
+			return err
+		}
+	}
+
 	return nil
 }
 
 func BackendTest() error {
 	cmd := exec.Command("go", "test", "./...")
 	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))
+
+	err = CleanTestDBs()
+	if err != nil {
+		return cli.Exit(err.Error(), 1)
+	}
+
 	return nil
 }