Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: validating if file already or image exists #123

Merged
merged 6 commits into from
Feb 2, 2024
Merged

refactor: validating if file already or image exists #123

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0479069
refactor: decoupling responsibility from the creation function
Caixetadev Jan 31, 2024
ab43dfa
feat: add validation if file exists
Caixetadev Jan 31, 2024
af26938
feat: add validate if image exists
Caixetadev Jan 31, 2024
6a13a41
fix: vulnerabilities
Caixetadev Jan 31, 2024
af22ce9
reafactor: add error
Caixetadev Jan 31, 2024
aa20f8a
refactor: add if and using variable that returns from the database
Caixetadev Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions src/database/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,18 @@ import (
"github.com/kevinanielsen/go-fast-cdn/src/models"
)

func AddDoc(fileName string, fileHashBuffer []byte) (string, bool) {
var doc models.Doc
doc.FileName = fileName
doc.Checksum = fileHashBuffer
func GetDocByCheckSum(checksum []byte) models.Doc {
var entries models.Doc

var entries []models.Doc
DB.Where("checksum = ?", checksum).First(&entries)

DB.First(&entries, "checksum = $1", string(fileHashBuffer))
if len(entries) == 0 {
DB.Create(&doc)
return fileName, false
} else {
return entries[0].FileName, true
}
return entries
}

func AddDoc(doc models.Doc) string {
DB.Create(&doc)

return doc.FileName
}

func DeleteDoc(fileName string) (string, bool) {
Expand Down
23 changes: 12 additions & 11 deletions src/database/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,21 @@ import (
"github.com/kevinanielsen/go-fast-cdn/src/models"
)

func AddImage(fileName string, fileHashBuffer []byte) (string, bool) {
var image models.Image
image.FileName = fileName
image.Checksum = fileHashBuffer
func GetImageByCheckSum(checksum []byte) models.Image {
var entries models.Image

var entries []models.Image
DB.Where("checksum = ?", checksum).First(&entries)

DB.First(&entries, "checksum = $1", string(fileHashBuffer))
if len(entries) == 0 {
DB.Create(&image)
return fileName, false
} else {
return entries[0].FileName, true
return entries
}

func AddImage(image models.Image) (string, error) {
result := DB.Create(&image)
if result.Error != nil {
return "", result.Error
}

return image.FileName, nil
}

func DeleteImage(fileName string) (string, bool) {
Expand Down
24 changes: 17 additions & 7 deletions src/handlers/docs/handleDocUpload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

"github.com/gin-gonic/gin"
"github.com/kevinanielsen/go-fast-cdn/src/database"
"github.com/kevinanielsen/go-fast-cdn/src/models"
"github.com/kevinanielsen/go-fast-cdn/src/util"
)

Expand Down Expand Up @@ -65,14 +66,23 @@
return
}

savedFileName, alreadyExists := database.AddDoc(filename, fileHashBuffer[:])
doc := models.Doc{
FileName: filename,
Checksum: fileHashBuffer[:],
}

docInDatabase := database.GetDocByCheckSum(fileHashBuffer[:])
if len(docInDatabase.Checksum) > 0 {
c.JSON(http.StatusConflict, "File already exists")
return
}

if !alreadyExists {
err = c.SaveUploadedFile(fileHeader, util.ExPath+"/uploads/docs/"+filteredFilename)
if err != nil {
c.String(http.StatusInternalServerError, "Failed to save file: %s", err.Error())
return
}
savedFileName := database.AddDoc(doc)

err = c.SaveUploadedFile(fileHeader, util.ExPath+"/uploads/docs/"+filteredFilename)
if err != nil {
c.String(http.StatusInternalServerError, "Failed to save file: %s", err.Error())
return
}

body := gin.H{
Expand Down
29 changes: 22 additions & 7 deletions src/handlers/image/handleImageUpload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

"github.com/gin-gonic/gin"
"github.com/kevinanielsen/go-fast-cdn/src/database"
"github.com/kevinanielsen/go-fast-cdn/src/models"
"github.com/kevinanielsen/go-fast-cdn/src/util"
)

Expand Down Expand Up @@ -67,13 +68,27 @@
return
}

savedFilename, alreadyExists := database.AddImage(filename, fileHashBuffer[:])
if !alreadyExists {
err = c.SaveUploadedFile(fileHeader, util.ExPath+"/uploads/images/"+filteredFilename)
if err != nil {
c.String(http.StatusInternalServerError, "Failed to save file: %s", err.Error())
return
}
image := models.Image{
FileName: filename,
Checksum: fileHashBuffer[:],
}

imageInDatabase := database.GetImageByCheckSum(fileHashBuffer[:])
if len(imageInDatabase.Checksum) > 0 {
c.JSON(http.StatusConflict, "File already exists")
return
}

savedFilename, err := database.AddImage(image)
if err != nil {
c.JSON(http.StatusInternalServerError, err.Error())
return
}

err = c.SaveUploadedFile(fileHeader, util.ExPath+"/uploads/images/"+filteredFilename)
if err != nil {
c.String(http.StatusInternalServerError, "Failed to save file: %s", err.Error())
return
}

body := gin.H{
Expand Down
Loading