daanselen/orbits
SHA256
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat: refac and add key deletion route

Browse Source
This commit is contained in:
Daan Selen
2026-04-29 14:46:24 +02:00
parent 8f6b1efea0
commit 6669fda371
11 changed files with 177 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/server/api/routes/api.go
-16
View File
@@ -1,16 +0,0 @@
package routes
import (
"github.com/gin-gonic/gin"
"gorm.io/gorm"
)
func RegisterApiRoutes(api *gin.RouterGroup, db *gorm.DB) {
api.GET("/version", func(c *gin.Context) {
})
api.GET("/codename", func(c *gin.Context) {
})
}
internal/server/api/routes/apiroute.go
+21
View File
@@ -0,0 +1,21 @@
package routes
import (
"log/slog"
"orbits-server/internal/server/api/assets"
"orbits-server/internal/server/bootstrap"
"github.com/gin-gonic/gin"
)
func RegisterApiRoutes(api *gin.RouterGroup, env bootstrap.Environment) {
api.GET("/version", func(c *gin.Context) {
slog.Debug("received request for the version endpoint")
assets.BasicResponse(c, env.Version)
})
api.GET("/codename", func(c *gin.Context) {
slog.Debug("received request for the codename endpoint")
assets.BasicResponse(c, env.Codename)
})
}
internal/server/api/routes/ctrl.go → internal/server/api/routes/ctrlroute.go
+1 -5
View File
@@ -2,7 +2,6 @@ package routes
import (
"log/slog"
"net/http"
"orbits-server/internal/server/api/assets"
"orbits-server/internal/server/service"
@@ -24,10 +23,7 @@ func RegisterCtrlRoutes(api *gin.RouterGroup, db *gorm.DB) {
return
}
c.JSON(http.StatusOK, assets.BasicResponse{
Msg: assets.OkMes,
Data: command,
})
assets.BasicResponse(c, command)
})
ctrl.PATCH("/command", func(c *gin.Context) {
internal/server/api/routes/file.go → internal/server/api/routes/fileroute.go
+25 -31
View File
@@ -1,8 +1,8 @@
package routes
import (
"errors"
"log/slog"
"net/http"
"orbits-server/internal/server/api/assets"
"orbits-server/internal/server/bootstrap"
"orbits-server/internal/server/service"
@@ -18,25 +18,23 @@ func RegisterFileRoutes(file *gin.RouterGroup, env bootstrap.Environment, db *go
// for example: /file/<file-name>
// file download route / display contents
file.GET("/:filename", func(c *gin.Context) {
fileParam := c.Param("filename")
p := filepath.Join(env.ContentDirectory, fileParam)
file.GET("/:fileName", func(c *gin.Context) {
fileParam := c.Param("fileName")
fp := filepath.Join(env.ContentDirectory, fileParam)
c.File(p)
assets.FileDownloadResponse(c, fp)
})
// upload route
file.POST("/upload", func(c *gin.Context) {
fh, err := c.FormFile("file")
fileHeader, err := c.FormFile("file")
if err != nil {
slog.Debug("no file or file headers provided on the request", "error", err)
c.JSON(http.StatusBadRequest, assets.BasicResponse{
Msg: "a file is required",
})
assets.BadRequestResponse(c)
return
}
stream, err := fh.Open()
stream, err := fileHeader.Open()
if err != nil {
slog.Error("failed to a reader stream")
assets.InternalErrorResponse(c)
@@ -44,19 +42,25 @@ func RegisterFileRoutes(file *gin.RouterGroup, env bootstrap.Environment, db *go
}
defer stream.Close()
fileRecord, err := fileService.Create(stream, fh.Filename)
fileResponse, err := fileService.Create(stream, fileHeader.Filename)
if err != nil {
slog.Error("failed to enroll file to the database", "error", err)
if errors.Is(err, gorm.ErrDuplicatedKey) {
assets.DuplicateResponse(c)
return
}
assets.InternalErrorResponse(c)
return
}
// save to filesystem after everything has given a green light
if err := c.SaveUploadedFile(fh, fileRecord.FilePath); err != nil {
if err := c.SaveUploadedFile(fileHeader, fileResponse.FilePath); err != nil {
slog.Error("failed to save to disk, rolling back database", "error", err)
// rollback db if the write has failed
fileService.DeleteByID(fileRecord.ID)
fileService.DeleteRecordByID(fileResponse.ID)
// give the response to the client
assets.InternalErrorResponse(c)
@@ -64,32 +68,25 @@ func RegisterFileRoutes(file *gin.RouterGroup, env bootstrap.Environment, db *go
}
slog.Info("saved file to local filesystem and database")
c.JSON(http.StatusCreated, assets.BasicResponse{
Msg: "file has succesfully been uploaded",
Data: fileRecord,
})
assets.CreationResponse(c, fileResponse)
})
// delete route
file.DELETE("/:filename", func(c *gin.Context) {
fileParam := c.Param("filename")
fileRecord, err := fileService.DeleteByName(fileParam)
if err != nil {
if err := fileService.DeleteByName(fileParam); err != nil {
slog.Error("file not found", "error", err)
c.JSON(http.StatusNotFound, assets.BasicResponse{
Msg: "file was not found",
})
assets.NotFoundResponse(c)
return
}
slog.Info("received a delete request for a file", "file", fileRecord, "filename", fileParam)
c.JSON(http.StatusOK, assets.BasicResponse{
Msg: "file deleted succesfully",
})
slog.Info("received a delete request for a file", "fileName", fileParam)
assets.DeletionResponse(c)
})
// define a route to check what is registered
file.GET("/available", func(c *gin.Context) {
file.GET("/list", func(c *gin.Context) {
files, err := fileService.ListFiles()
if err != nil {
slog.Error("failed to retrieve available files", "error", err)
@@ -97,9 +94,6 @@ func RegisterFileRoutes(file *gin.RouterGroup, env bootstrap.Environment, db *go
return
}
c.JSON(http.StatusOK, assets.BasicResponse{
Msg: assets.OkMes,
Data: files,
})
assets.BasicResponse(c, files)
})
}
internal/server/api/routes/key.go → internal/server/api/routes/keyroute.go
+10 -6
View File
@@ -2,7 +2,6 @@ package routes
import (
"log/slog"
"net/http"
"orbits-server/internal/server/api/assets"
"orbits-server/internal/server/service"
@@ -36,13 +35,18 @@ func RegisterKeyRoutes(api *gin.RouterGroup, db *gorm.DB) {
slog.Info("saved key to database")
c.JSON(http.StatusCreated, assets.BasicResponse{
Msg: "key has succesfully been created and saved",
Data: keyResponse,
})
assets.CreationResponse(c, keyResponse)
})
key.DELETE("/:key", func(c *gin.Context) {
key.DELETE("/:keyName", func(c *gin.Context) {
keyParam := c.Param("keyName")
if err := keyService.DeleteByName(keyParam); err != nil {
slog.Error("key not found", "error", err)
assets.NotFoundResponse(c)
}
slog.Info("received a delete request for a key", "keyName", keyParam)
assets.DeletionResponse(c)
})
}