From 4e63e748886ad5559bd02f65043c18d1668edc19 Mon Sep 17 00:00:00 2001
From: Abhishek Shroff <shroff@kudosoft.net>
Date: Wed, 7 Aug 2024 16:56:14 +0530
Subject: [PATCH] Remove app admin command

---
 .../internal/command/appcmd/admincmd/admin.go | 19 -------------------
 server/internal/command/appcmd/appcmd.go      |  4 ++--
 .../command/appcmd/{admincmd => }/storage.go  |  2 +-
 .../command/appcmd/{admincmd => }/user.go     |  2 +-
 server/internal/command/command.go            |  6 ++++--
 5 files changed, 8 insertions(+), 25 deletions(-)
 delete mode 100644 server/internal/command/appcmd/admincmd/admin.go
 rename server/internal/command/appcmd/{admincmd => }/storage.go (98%)
 rename server/internal/command/appcmd/{admincmd => }/user.go (99%)

diff --git a/server/internal/command/appcmd/admincmd/admin.go b/server/internal/command/appcmd/admincmd/admin.go
deleted file mode 100644
index 0cfeeddc..00000000
--- a/server/internal/command/appcmd/admincmd/admin.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package admincmd
-
-import (
-	"github.com/shroff/phylum/server/internal/storage"
-	"github.com/spf13/cobra"
-)
-
-func SetupCommand(cs storage.Storage) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "admin",
-		Short: "Server Administration",
-	}
-	cmd.AddCommand([]*cobra.Command{
-		setupStorageCommand(cs),
-		setupUserCommand(),
-	}...)
-
-	return cmd
-}
diff --git a/server/internal/command/appcmd/appcmd.go b/server/internal/command/appcmd/appcmd.go
index 719a6c5b..49e41bc6 100644
--- a/server/internal/command/appcmd/appcmd.go
+++ b/server/internal/command/appcmd/appcmd.go
@@ -2,7 +2,6 @@ package appcmd
 
 import (
 	"github.com/shroff/phylum/server/internal/app"
-	"github.com/shroff/phylum/server/internal/command/appcmd/admincmd"
 	"github.com/shroff/phylum/server/internal/db"
 	"github.com/shroff/phylum/server/internal/storage"
 	"github.com/sirupsen/logrus"
@@ -42,9 +41,10 @@ func SetupCommand(db **db.DbHandler, debug bool) *cobra.Command {
 	viper.BindPFlag("content_dir", flags.Lookup("content-dir"))
 
 	cmd.AddCommand([]*cobra.Command{
-		admincmd.SetupCommand(cs),
 		setupServeCommand(),
+		setupUserCommand(),
 		setupResourceCommand(),
+		setupStorageCommand(cs),
 	}...)
 
 	return cmd
diff --git a/server/internal/command/appcmd/admincmd/storage.go b/server/internal/command/appcmd/storage.go
similarity index 98%
rename from server/internal/command/appcmd/admincmd/storage.go
rename to server/internal/command/appcmd/storage.go
index b8d3724c..7946a881 100644
--- a/server/internal/command/appcmd/admincmd/storage.go
+++ b/server/internal/command/appcmd/storage.go
@@ -1,4 +1,4 @@
-package admincmd
+package appcmd
 
 import (
 	"bufio"
diff --git a/server/internal/command/appcmd/admincmd/user.go b/server/internal/command/appcmd/user.go
similarity index 99%
rename from server/internal/command/appcmd/admincmd/user.go
rename to server/internal/command/appcmd/user.go
index c668b653..168061b4 100644
--- a/server/internal/command/appcmd/admincmd/user.go
+++ b/server/internal/command/appcmd/user.go
@@ -1,4 +1,4 @@
-package admincmd
+package appcmd
 
 import (
 	"context"
diff --git a/server/internal/command/command.go b/server/internal/command/command.go
index 3b635c4e..c53805e6 100644
--- a/server/internal/command/command.go
+++ b/server/internal/command/command.go
@@ -52,8 +52,10 @@ func SetupCommand() {
 	}
 
 	defer func() {
-		logrus.Info("Shutting Down App")
-		database.Close()
+		if database != nil {
+			logrus.Info("Shutting Down App")
+			database.Close()
+		}
 	}()
 
 	rootCmd.AddCommand([]*cobra.Command{