implement safe deletion

controllers/controlGroups.go

@@ -105,7 +105,7 @@ func DeleteGroupHandler(c *gin.Context) {
 	//remove leading/trailing spaces in groupname
 	g.GroupName = html.EscapeString(strings.TrimSpace(g.GroupName))
 
-	// Confirm user account exists
+	// Confirm group exists
 	testGroup, _ := models.GroupGetByName(g.GroupName)
 	log.Printf("DeleteGroupHandler confirming group '%s' exists\n", g.GroupName)
 	if (models.Group{} == testGroup) {

controllers/controlSafes.go

@@ -67,7 +67,7 @@ func AddSafeHandler(c *gin.Context) {
 
 	s := models.Safe{SafeId: input.SafeId, SafeName: input.SafeName}
 
-	//remove leading/trailing spaces in groupname
+	//remove leading/trailing spaces in safe name
 	s.SafeName = html.EscapeString(strings.TrimSpace(s.SafeName))
 
 	// Check if safe already exists
@@ -94,3 +94,44 @@ func AddSafeHandler(c *gin.Context) {
 
 	c.JSON(http.StatusOK, gin.H{"message": "safe creation success"})
 }
+
+func DeleteSafeHandler(c *gin.Context) {
+	var input SafeInput
+
+	if err := c.ShouldBindJSON(&input); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+
+	// Input validation
+	if input.SafeId == 0 && len(input.SafeName) == 0 {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "no safe name or id specified"})
+		return
+	}
+
+	s := models.Safe{SafeId: input.SafeId, SafeName: input.SafeName}
+
+	//remove leading/trailing spaces in safe name
+	s.SafeName = html.EscapeString(strings.TrimSpace(s.SafeName))
+
+	// Confirm safe exists
+	testSafe, _ := models.SafeGetByName(s.SafeName)
+	log.Printf("DeleteSafeHandler confirming group '%s' exists\n", s.SafeName)
+	if (models.Safe{} == testSafe) {
+		errString := fmt.Sprintf("attempt to delete non-existing safe '%s'", s.SafeName)
+		log.Printf("DeleteSafeHandler %s\n", errString)
+		c.JSON(http.StatusBadRequest, gin.H{"error": errString})
+		return
+	} else {
+		err := s.SafeDelete()
+
+		if err != nil {
+			errString := fmt.Sprintf("error deleting safe : '%s'", err)
+			log.Printf("DeleteSafeHandler %s\n", errString)
+			c.JSON(http.StatusBadRequest, gin.H{"error": errString})
+			return
+		}
+
+		c.JSON(http.StatusOK, gin.H{"message": "safe deletion success"})
+	}
+}

models/group.go

@@ -99,7 +99,7 @@ func (g *Group) GroupDelete() error {
 
 	// Delete the group
 	log.Printf("GroupDelete confirmed group exists, continuing with deletion of group '%s'\n", g.GroupName)
-	result, err := db.NamedExec((`DELETE FROM group WHERE GroupId = :GroupId`), g)
+	result, err := db.NamedExec((`DELETE FROM groups WHERE GroupId = :GroupId`), g)
 
 	if err != nil {
 		log.Printf("GroupDelete error executing sql delete : '%s'\n", err)

models/safe.go

@@ -112,3 +112,35 @@ func (s *Safe) SafeAdd() (*Safe, error) {
 
 	return s, nil
 }
+
+// SafeDelete removes a safe definition from the database
+func (s *Safe) SafeDelete() error {
+	var err error
+
+	// Validate group exists
+	safe, err := SafeGetByName(s.SafeName)
+	if err != nil && err.Error() == "safe not found" {
+		log.Printf("SafeDelete unable to validate safe exists : '%s'\n", err)
+		return err
+	}
+
+	// Make sure we have a safe ID
+	if s.SafeId == 0 {
+		s.SafeId = safe.SafeId
+	}
+
+	// Delete the safe
+	log.Printf("SafeDelete confirmed safe exists, continuing with deletion of safe '%s'\n", s.SafeName)
+	result, err := db.NamedExec((`DELETE FROM safes WHERE SafeId = :SafeId`), s)
+
+	if err != nil {
+		log.Printf("SafeDelete error executing sql delete : '%s'\n", err)
+		return err
+	} else {
+		affected, _ := result.RowsAffected()
+		id, _ := result.LastInsertId()
+		log.Printf("SafeDelete returned result id '%d' affecting %d row(s).\n", id, affected)
+	}
+
+	return nil
+}