fix: replaced vid with file for abstraction of image and audio

ZeStream · Nov 4, 2023 · 7c808e7 · 7c808e7
1 parent a680fcd
commit 7c808e7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/controllers/upload.go b/controllers/upload.go
@@ -10,22 +10,21 @@ import (
 
 func GetPresignedURL(c *gin.Context) {
 	fileName := c.Query("fileName")
-	fileType := c.Query("fileType")
 	basePath := c.Query("basePath")
 	extension := filepath.Ext(fileName)
 
-	if fileName == "" || extension == "" || fileType == "" {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "Missing required query parameter 'fileName' or 'fileType'"})
+	if fileName == "" || extension == "" {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "Missing required query parameter 'fileName' or 'fileName' without extension"})
 		return
 	}
 
-	videoID := utils.VideoIDGen(extension)
+	fileID := utils.FileIDGen(extension)
 
-	url := utils.GetSignedURL(videoID, fileType, basePath)
+	url := utils.GetSignedURL(fileID, basePath)
 	if url == "" {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "Error generating presigned URL", "details": ""})
 		return
 	}
 
-	c.JSON(http.StatusOK, gin.H{"preSignedURL": url, "videoID": videoID})
+	c.JSON(http.StatusOK, gin.H{"preSignedURL": url, "fileID": fileID})
 }
diff --git a/utils/helper.go b/utils/helper.go
@@ -13,7 +13,7 @@ import (
 VideoIDGen returns an unique videoID and appends the fileExtension to it,
 it takes the fileExtensionas parameter
 */
-func VideoIDGen(fileExtension string) string {
+func FileIDGen(fileExtension string) string {
 	var b [8]byte
 	if _, err := rand.Read(b[:]); err != nil {
 		return err.Error()

diff --git a/utils/helper_test.go b/utils/helper_test.go
@@ -7,10 +7,10 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestVideoIDGen(t *testing.T) {
+func TestFileIDGen(t *testing.T) {
 
 	// Call the Video ID Gen function
-	videoIDExt := VideoIDGen(".mp4")
+	videoIDExt := FileIDGen(".mp4")
 
 	//Split the string into digits and ext
 	videoID := strings.Split(videoIDExt, ".")

diff --git a/utils/upload.go b/utils/upload.go
@@ -245,10 +245,10 @@ func GetWhichCloudIsEnabled() (bool, bool, bool) {
 	return false, false, false
 }
 
-func GetSignedURL(videoId string, fileType string, basePath string) string {
+func GetSignedURL(fileID string, basePath string) string {
 	isAWS, isGCP, isAzure := GetWhichCloudIsEnabled()
 
-	filePath, err := GetCloudStoragePath(basePath, videoId, fileType)
+	filePath, err := GetCloudStoragePath(basePath, fileID)
 	LogErr(err)
 
 	if isAWS {
@@ -352,7 +352,7 @@ func generateAzureSignedURL(filePath string) string {
 	return sasURL
 }
 
-func GetCloudStoragePath(basePath, fileName string, _ string) (string, error) {
+func GetCloudStoragePath(basePath, fileName string) (string, error) {
 	url, err := url.JoinPath(basePath, fileName)
 	LogErr(err)