github-starred/vikunja
2
0
Fork 0
mirror of https://github.com/go-vikunja/vikunja.git synced 2026-03-09 07:13:35 -05:00
Code Issues 219 Packages Projects Releases 2 Wiki Activity

fix(migration): use echo/v5 and fix handler patterns in CSV handler

Browse Source 
The CSV handler imported echo/v4 instead of echo/v5 (which the project
uses), used value receiver echo.Context instead of pointer
*echo.Context, and called a non-existent handler.HandleHTTPError
function. Update to match existing handler patterns.
This commit is contained in:
kolaente
2026-03-05 11:49:48 +01:00
parent b4513384ff
commit 73c9d63ff3
1 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pkg/modules/migration/csv/handler.go
View File

@@ -23,8 +23,7 @@ import (
"code.vikunja.io/api/pkg/models" "code.vikunja.io/api/pkg/models"
"code.vikunja.io/api/pkg/modules/migration" "code.vikunja.io/api/pkg/modules/migration"
user2 "code.vikunja.io/api/pkg/user" user2 "code.vikunja.io/api/pkg/user"
"code.vikunja.io/api/pkg/web/handler" "github.com/labstack/echo/v5"
"github.com/labstack/echo/v4"
) )
// MigratorWeb handles CSV migration HTTP routes // MigratorWeb handles CSV migration HTTP routes
@@ -47,16 +46,16 @@ func (c *MigratorWeb) RegisterRoutes(g *echo.Group) {
// @Success 200 {object} migration.Status "The migration status" // @Success 200 {object} migration.Status "The migration status"
// @Failure 500 {object} models.Message "Internal server error" // @Failure 500 {object} models.Message "Internal server error"
// @Router /migration/csv/status [get] // @Router /migration/csv/status [get]
func (c *MigratorWeb) Status(ctx echo.Context) error { func (c *MigratorWeb) Status(ctx *echo.Context) error {
u, err := user2.GetCurrentUser(ctx) u, err := user2.GetCurrentUser(ctx)
if err != nil { if err != nil {
return handler.HandleHTTPError(err) return err
} }
m := &Migrator{} m := &Migrator{}
s, err := migration.GetMigrationStatus(m, u) s, err := migration.GetMigrationStatus(m, u)
if err != nil { if err != nil {
return handler.HandleHTTPError(err) return err
} }
return ctx.JSON(http.StatusOK, s) return ctx.JSON(http.StatusOK, s)
@@ -74,10 +73,10 @@ func (c *MigratorWeb) Status(ctx echo.Context) error {
// @Failure 400 {object} models.Message "Invalid CSV file" // @Failure 400 {object} models.Message "Invalid CSV file"
// @Failure 500 {object} models.Message "Internal server error" // @Failure 500 {object} models.Message "Internal server error"
// @Router /migration/csv/detect [put] // @Router /migration/csv/detect [put]
func (c *MigratorWeb) Detect(ctx echo.Context) error { func (c *MigratorWeb) Detect(ctx *echo.Context) error {
_, err := user2.GetCurrentUser(ctx) _, err := user2.GetCurrentUser(ctx)
if err != nil { if err != nil {
return handler.HandleHTTPError(err) return err
} }
file, err := ctx.FormFile("import") file, err := ctx.FormFile("import")
@@ -87,13 +86,13 @@ func (c *MigratorWeb) Detect(ctx echo.Context) error {
src, err := file.Open() src, err := file.Open()
if err != nil { if err != nil {
return handler.HandleHTTPError(err) return err
} }
defer src.Close() defer src.Close()
result, err := DetectCSVStructure(src, file.Size) result, err := DetectCSVStructure(src, file.Size)
if err != nil { if err != nil {
return handler.HandleHTTPError(err) return err
} }
return ctx.JSON(http.StatusOK, result) return ctx.JSON(http.StatusOK, result)
@@ -112,10 +111,10 @@ func (c *MigratorWeb) Detect(ctx echo.Context) error {
// @Failure 400 {object} models.Message "Invalid CSV file or configuration" // @Failure 400 {object} models.Message "Invalid CSV file or configuration"
// @Failure 500 {object} models.Message "Internal server error" // @Failure 500 {object} models.Message "Internal server error"
// @Router /migration/csv/preview [put] // @Router /migration/csv/preview [put]
func (c *MigratorWeb) Preview(ctx echo.Context) error { func (c *MigratorWeb) Preview(ctx *echo.Context) error {
_, err := user2.GetCurrentUser(ctx) _, err := user2.GetCurrentUser(ctx)
if err != nil { if err != nil {
return handler.HandleHTTPError(err) return err
} }
file, err := ctx.FormFile("import") file, err := ctx.FormFile("import")
@@ -135,13 +134,13 @@ func (c *MigratorWeb) Preview(ctx echo.Context) error {
src, err := file.Open() src, err := file.Open()
if err != nil { if err != nil {
return handler.HandleHTTPError(err) return err
} }
defer src.Close() defer src.Close()
result, err := PreviewImport(src, file.Size, config) result, err := PreviewImport(src, file.Size, config)
if err != nil { if err != nil {
return handler.HandleHTTPError(err) return err
} }
return ctx.JSON(http.StatusOK, result) return ctx.JSON(http.StatusOK, result)
@@ -160,10 +159,10 @@ func (c *MigratorWeb) Preview(ctx echo.Context) error {
// @Failure 400 {object} models.Message "Invalid CSV file or configuration" // @Failure 400 {object} models.Message "Invalid CSV file or configuration"
// @Failure 500 {object} models.Message "Internal server error" // @Failure 500 {object} models.Message "Internal server error"
// @Router /migration/csv/migrate [put] // @Router /migration/csv/migrate [put]
func (c *MigratorWeb) Migrate(ctx echo.Context) error { func (c *MigratorWeb) Migrate(ctx *echo.Context) error {
u, err := user2.GetCurrentUser(ctx) u, err := user2.GetCurrentUser(ctx)
if err != nil { if err != nil {
return handler.HandleHTTPError(err) return err
} }
file, err := ctx.FormFile("import") file, err := ctx.FormFile("import")
@@ -183,24 +182,24 @@ func (c *MigratorWeb) Migrate(ctx echo.Context) error {
src, err := file.Open() src, err := file.Open()
if err != nil { if err != nil {
return handler.HandleHTTPError(err) return err
} }
defer src.Close() defer src.Close()
m := &Migrator{} m := &Migrator{}
status, err := migration.StartMigration(m, u) status, err := migration.StartMigration(m, u)
if err != nil { if err != nil {
return handler.HandleHTTPError(err) return err
} }
err = MigrateWithConfig(u, src, file.Size, config) err = MigrateWithConfig(u, src, file.Size, config)
if err != nil { if err != nil {
return handler.HandleHTTPError(err) return err
} }
err = migration.FinishMigration(status) err = migration.FinishMigration(status)
if err != nil { if err != nil {
return handler.HandleHTTPError(err) return err
} }
return ctx.JSON(http.StatusOK, models.Message{Message: "Everything was migrated successfully."}) return ctx.JSON(http.StatusOK, models.Message{Message: "Everything was migrated successfully."})