From d087492c31178ea54d420b6bfb637109dd8e3f9d Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@thecoads.com>
Date: Thu, 11 Jan 2024 18:02:25 +1100
Subject: [PATCH] re-arrange checks

---
 controllers/controlGroups.go | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/controllers/controlGroups.go b/controllers/controlGroups.go
index 7c23fee..c777794 100644
--- a/controllers/controlGroups.go
+++ b/controllers/controlGroups.go
@@ -59,19 +59,6 @@ func AddGroupHandler(c *gin.Context) {
 	//remove leading/trailing spaces in groupname
 	g.GroupName = html.EscapeString(strings.TrimSpace(g.GroupName))
 
-	// Check if group already exists
-	testGroup, _ := models.GroupGetByName(g.GroupName)
-	log.Printf("AddGroupHandler checking if group '%s' already exists\n", g.GroupName)
-
-	if (models.Group{} == testGroup) {
-		log.Printf("AddGroupHandler confirmed no existing group name\n")
-	} else {
-		errorString := fmt.Sprintf("attempt to register conflicting groupname '%s'", g.GroupName)
-		log.Printf("AddGroupHandler error : '%s'\n", errorString)
-		c.JSON(http.StatusBadRequest, gin.H{"error": errorString})
-		return
-	}
-
 	// Check if there is already an LDAP group with the same Dn
 	if g.LdapGroup {
 		// TODO check for existing LDAP group
@@ -87,6 +74,19 @@ func AddGroupHandler(c *gin.Context) {
 		}
 	}
 
+	// Check if group already exists with same name
+	testGroup, _ := models.GroupGetByName(g.GroupName)
+	log.Printf("AddGroupHandler checking if group '%s' already exists\n", g.GroupName)
+
+	if (models.Group{} == testGroup) {
+		log.Printf("AddGroupHandler confirmed no existing group name\n")
+	} else {
+		errorString := fmt.Sprintf("attempt to register conflicting groupname '%s'", g.GroupName)
+		log.Printf("AddGroupHandler error : '%s'\n", errorString)
+		c.JSON(http.StatusBadRequest, gin.H{"error": errorString})
+		return
+	}
+
 	// Verification checks passed, return group
 	group, err := g.GroupAdd()