refactor/handlers

src/handlers/docs/handleAllDocs.go

@@ -10,6 +10,7 @@ import (
 
 func HandleAllDocs(c *gin.Context) {
 	var entries []models.Doc
+
 	database.DB.Find(&entries, &models.Doc{})
 
 	c.JSON(http.StatusOK, entries)

src/handlers/docs/handleDocDelete.go

@@ -1,9 +1,7 @@
 package handlers
 
 import (
-	"fmt"
 	"net/http"
-	"os"
 
 	"github.com/gin-gonic/gin"
 	"github.com/kevinanielsen/go-fast-cdn/src/database"
@@ -18,19 +16,24 @@ func HandleDocDelete(c *gin.Context) {
 		})
 		return
 	}
+
 	deletedFileName, success := database.DeleteDoc(fileName)
-	filePath := fmt.Sprintf("%v/uploads/docs/%v", util.ExPath, deletedFileName)
-	err := os.Remove(filePath)
-	if success && err == nil {
-		c.JSON(http.StatusOK, gin.H{
-			"message":  "Document deleted successfuly",
-			"fileName": deletedFileName,
-		})
-	} else {
-		fmt.Println(success)
-		fmt.Println(err)
+	if !success {
 		c.JSON(http.StatusNotFound, gin.H{
 			"error": "Document not found",
 		})
+		return
+	}
+
+	err := util.DeleteFile(deletedFileName, "docs")
+	if err != nil {
+		c.JSON(http.StatusNotFound, gin.H{
+			"error": "Failed to delete document",
+		})
 	}
+
+	c.JSON(http.StatusOK, gin.H{
+		"message":  "Document deleted successfuly",
+		"fileName": deletedFileName,
+	})
 }

src/handlers/docs/handleDocsRename.go

@@ -2,29 +2,30 @@ package handlers
 
 import (
 	"net/http"
-	"os"
-	"path/filepath"
 
 	"github.com/gin-gonic/gin"
 	"github.com/kevinanielsen/go-fast-cdn/src/database"
 	"github.com/kevinanielsen/go-fast-cdn/src/util"
+	"github.com/kevinanielsen/go-fast-cdn/src/validations"
 )
 
 func HandleDocsRename(c *gin.Context) {
 	oldName := c.PostForm("filename")
 	newName := c.PostForm("newname")
 
-	if oldName == "" || newName == "" {
-		c.String(http.StatusBadRequest, "Invalid request")
+	err := validations.ValidateRenameInput(oldName, newName)
+	if err != nil {
+		c.String(http.StatusBadRequest, err.Error())
 		return
 	}
 
-	prefix := filepath.Join(util.ExPath, "uploads", "docs")
+	filteredNewName, err := util.FilterFilename(newName)
+	if err != nil {
+		c.String(http.StatusBadRequest, err.Error())
+		return
+	}
 
-	err := os.Rename(
-		filepath.Join(prefix, oldName),
-		filepath.Join(prefix, newName),
-	)
+	err = util.RenameFile(oldName, filteredNewName, "docs")
 	if err != nil {
 		c.String(http.StatusInternalServerError, "Failed to rename file: %s", err.Error())
 		return

src/handlers/image/handleAllImages.go

@@ -10,6 +10,7 @@ import (
 
 func HandleAllImages(c *gin.Context) {
 	var entries []models.Image
+
 	database.DB.Find(&entries, &models.Image{})
 
 	c.JSON(http.StatusOK, entries)

src/handlers/image/handleImageDelete.go

@@ -1,9 +1,7 @@
 package handlers
 
 import (
-	"fmt"
 	"net/http"
-	"os"
 
 	"github.com/gin-gonic/gin"
 	"github.com/kevinanielsen/go-fast-cdn/src/database"
@@ -18,17 +16,25 @@ func HandleImageDelete(c *gin.Context) {
 		})
 		return
 	}
+
 	deletedFileName, success := database.DeleteImage(fileName)
-	filePath := fmt.Sprintf("%v/uploads/images/%v", util.ExPath, deletedFileName)
-	err := os.Remove(filePath)
-	if success && err == nil {
-		c.JSON(http.StatusOK, gin.H{
-			"message":  "Image deleted successfully",
-			"fileName": deletedFileName,
-		})
-	} else {
+	if !success {
 		c.JSON(http.StatusNotFound, gin.H{
 			"error": "Image not found",
 		})
+		return
+	}
+
+	err := util.DeleteFile(deletedFileName, "images")
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{
+			"error": "Failed to delete image",
+		})
+		return
 	}
+
+	c.JSON(http.StatusOK, gin.H{
+		"message":  "Image deleted successfully",
+		"fileName": deletedFileName,
+	})
 }

src/handlers/image/handleImageRename.go

@@ -2,20 +2,20 @@ package handlers
 
 import (
 	"net/http"
-	"os"
-	"path/filepath"
 
 	"github.com/gin-gonic/gin"
 	"github.com/kevinanielsen/go-fast-cdn/src/database"
 	"github.com/kevinanielsen/go-fast-cdn/src/util"
+	"github.com/kevinanielsen/go-fast-cdn/src/validations"
 )
 
 func HandleImageRename(c *gin.Context) {
 	oldName := c.PostForm("filename")
 	newName := c.PostForm("newname")
 
-	if oldName == "" || newName == "" {
-		c.String(http.StatusBadRequest, "Invalid request")
+	err := validations.ValidateRenameInput(oldName, newName)
+	if err != nil {
+		c.String(http.StatusBadRequest, err.Error())
 		return
 	}
 
@@ -25,12 +25,7 @@ func HandleImageRename(c *gin.Context) {
 		return
 	}
 
-	prefix := filepath.Join(util.ExPath, "uploads", "images")
-
-	err = os.Rename(
-		filepath.Join(prefix, oldName),
-		filepath.Join(prefix, filteredNewName),
-	)
+	err = util.RenameFile(oldName, filteredNewName, "images")
 	if err != nil {
 		c.String(http.StatusInternalServerError, "Failed to rename file: %s", err.Error())
 		return

src/handlers/image/handleImageUpload.go

@@ -11,9 +11,9 @@ import (
 )
 
 func HandleImageUpload(c *gin.Context) {
-	fileHeader, err := c.FormFile("image")
 	newName := c.PostForm("filename")
 
+	fileHeader, err := c.FormFile("image")
 	if err != nil {
 		c.String(http.StatusBadRequest, "Failed to read file: %s", err.Error())
 		return

src/util/deleteFile.go

@@ -0,0 +1,17 @@
+package util
+
+import (
+	"fmt"
+	"os"
+)
+
+func DeleteFile(deletedFileName string, fileType string) error {
+	filePath := fmt.Sprintf("%v/uploads/%v/%v", ExPath, fileType, deletedFileName)
+
+	err := os.Remove(filePath)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

src/util/renameFile.go

@@ -0,0 +1,20 @@
+package util
+
+import (
+	"os"
+	"path/filepath"
+)
+
+func RenameFile(oldName, newName, fileType string) error {
+	prefix := filepath.Join(ExPath, "uploads", fileType)
+
+	err := os.Rename(
+		filepath.Join(prefix, oldName),
+		filepath.Join(prefix, newName),
+	)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

src/validations/validations.go

@@ -0,0 +1,15 @@
+package validations
+
+import "errors"
+
+func ValidateRenameInput(oldName, newName string) error {
+	if oldName == "" || newName == "" {
+		return errors.New("'oldName' and 'newName' are required")
+	}
+
+	if oldName == newName {
+		return errors.New("New name must be different from the old name")
+	}
+
+	return nil
+}