Fix Directory Error

GenerateNU · Mar 6, 2024 · 21ed818 · 21ed818
1 parent c03963d
commit 21ed818
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 114 deletions.
diff --git a/cli/commands/backend.go b/cli/commands/backend.go
@@ -36,7 +36,7 @@ func BackendCommand() *cli.Command {
 
 func RunBackend() error {
 	cmd := exec.Command("go", "run", "main.go")
-	cmd.Dir = BACKEND_DIR
+	cmd.Dir = BACKEND_SRC_DIR
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	err := cmd.Run()

diff --git a/cli/commands/config.go b/cli/commands/config.go
@@ -10,7 +10,8 @@ import (
 var (
 	ROOT_DIR, _    = utils.GetRootDir()
 	FRONTEND_DIR   = filepath.Join(ROOT_DIR, "/frontend")
-	BACKEND_DIR    = filepath.Join(ROOT_DIR, "/backend/")
+	BACKEND_DIR	= filepath.Join(ROOT_DIR, "/backend/")
+	BACKEND_SRC_DIR    = filepath.Join(ROOT_DIR, "/backend/src")
 	CONFIG, _      = config.GetConfiguration(filepath.Join(ROOT_DIR, "/config"), false)
-	MIGRATION_FILE = filepath.Join(BACKEND_DIR, "/migrations/data.sql")
+	MIGRATION_FILE = filepath.Join(BACKEND_SRC_DIR, "/migrations/data.sql")
 )
diff --git a/cli/commands/insert.go b/cli/commands/insert.go
@@ -53,7 +53,7 @@ func InsertDB() error {
 
 		migrateCmd := exec.Command("go", "run", "main.go", "--only-migrate")
 
-		migrateCmd.Dir = BACKEND_DIR
+		migrateCmd.Dir = BACKEND_SRC_DIR
 
 		if err := migrateCmd.Run(); err != nil {
 			return fmt.Errorf("error running migration: %w", err)

diff --git a/cli/commands/migrate.go b/cli/commands/migrate.go
@@ -33,7 +33,7 @@ func Migrate() error {
 	fmt.Println("Migrating database")
 
 	goCmd := exec.Command("go", "run", "main.go", "--only-migrate")
-	goCmd.Dir = BACKEND_DIR
+	goCmd.Dir = BACKEND_SRC_DIR
 
 	output, err := goCmd.CombinedOutput()
 	if err != nil {

diff --git a/cli/commands/reset.go b/cli/commands/reset.go
@@ -52,7 +52,7 @@ func ResetData() error {
 	}
 
 	cmd := exec.Command("sleep", "1")
-	cmd.Dir = BACKEND_DIR
+	cmd.Dir = BACKEND_SRC_DIR
 
 	err = cmd.Run()
 	if err != nil {
@@ -65,7 +65,7 @@ func ResetData() error {
 	}
 
 	cmd = exec.Command("sleep", "1")
-	cmd.Dir = BACKEND_DIR
+	cmd.Dir = BACKEND_SRC_DIR
 
 	err = cmd.Run()
 	if err != nil {
@@ -91,7 +91,7 @@ func ResetMigration() error {
 	}
 
 	cmd := exec.Command("sleep", "1")
-	cmd.Dir = BACKEND_DIR
+	cmd.Dir = BACKEND_SRC_DIR
 
 	err = cmd.Run()
 	if err != nil {

diff --git a/cli/commands/swagger.go b/cli/commands/swagger.go
@@ -15,7 +15,7 @@ func SwaggerCommand() *cli.Command {
 		Usage:   "Runs `swag init` to update Swagger documentation for the backend API",
 		Action: func(c *cli.Context) error {
 			cmd := exec.Command("swag", "init")
-			cmd.Dir = BACKEND_DIR
+			cmd.Dir = BACKEND_SRC_DIR
 			cmd.Stdout = os.Stdout
 			cmd.Stderr = os.Stderr
 			err := cmd.Run()
@@ -31,7 +31,7 @@ func SwaggerCommand() *cli.Command {
 
 func Swagger() error {
 	cmd := exec.Command("swag", "init")
-	cmd.Dir = BACKEND_DIR
+	cmd.Dir = BACKEND_SRC_DIR
 
 	out, err := cmd.CombinedOutput()
 	if err != nil {

diff --git a/cli/commands/test.go b/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 = BACKEND_DIR
+	cmd.Dir = BACKEND_SRC_DIR
 
 	out, err := cmd.CombinedOutput()
 	if err != nil {

diff --git a/go.work.sum b/go.work.sum