From dc707f384b2dd5014dc800c4a47c50ba7eeb0090 Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 27 Feb 2026 12:00:39 +0100 Subject: [PATCH] renamed old importer and transfer package to importero and transfero --- backend/api/api_test.go | 2 +- backend/cmd/main.go | 8 ++--- .../charimport_test.go | 2 +- backend/{importer => importero}/exporter.go | 2 +- .../{importer => importero}/exporter_test.go | 2 +- backend/{importer => importero}/handler.go | 2 +- .../importJSON2ImportStruct_test.go | 2 +- .../{importer => importero}/importVTTJson.go | 2 +- backend/{importer => importero}/importer.go | 2 +- .../{importer => importero}/importer_test.go | 2 +- backend/{importer => importero}/model.go | 2 +- backend/{importer => importero}/routes.go | 2 +- .../{importer => importero}/upload_test.go | 2 +- backend/maintenance/handlers.go | 2 +- backend/transfer/routes.go | 24 -------------- backend/{transfer => transfero}/README.md | 0 backend/{transfer => transfero}/database.go | 2 +- .../database_handlers_test.go | 2 +- .../{transfer => transfero}/database_test.go | 2 +- backend/{transfer => transfero}/exporter.go | 2 +- .../{transfer => transfero}/exporter_test.go | 2 +- backend/{transfer => transfero}/handlers.go | 6 +++- .../{transfer => transfero}/handlers_test.go | 2 +- backend/{transfer => transfero}/importer.go | 2 +- .../{transfer => transfero}/importer_test.go | 2 +- backend/transfero/routes.go | 32 +++++++++++++++++++ 26 files changed, 62 insertions(+), 50 deletions(-) rename backend/{importer => importero}/charimport_test.go (99%) rename backend/{importer => importero}/exporter.go (99%) rename backend/{importer => importero}/exporter_test.go (99%) rename backend/{importer => importero}/handler.go (99%) rename backend/{importer => importero}/importJSON2ImportStruct_test.go (99%) rename backend/{importer => importero}/importVTTJson.go (99%) rename backend/{importer => importero}/importer.go (99%) rename backend/{importer => importero}/importer_test.go (99%) rename backend/{importer => importero}/model.go (99%) rename backend/{importer => importero}/routes.go (96%) rename backend/{importer => importero}/upload_test.go (99%) delete mode 100644 backend/transfer/routes.go rename backend/{transfer => transfero}/README.md (100%) rename backend/{transfer => transfero}/database.go (99%) rename backend/{transfer => transfero}/database_handlers_test.go (99%) rename backend/{transfer => transfero}/database_test.go (99%) rename backend/{transfer => transfero}/exporter.go (99%) rename backend/{transfer => transfero}/exporter_test.go (99%) rename backend/{transfer => transfero}/handlers.go (96%) rename backend/{transfer => transfero}/handlers_test.go (99%) rename backend/{transfer => transfero}/importer.go (99%) rename backend/{transfer => transfero}/importer_test.go (99%) create mode 100644 backend/transfero/routes.go diff --git a/backend/api/api_test.go b/backend/api/api_test.go index 0de6843..fd4fe4b 100644 --- a/backend/api/api_test.go +++ b/backend/api/api_test.go @@ -63,7 +63,7 @@ func TestSetupCheck(t *testing.T) { err = models.MigrateStructure() assert.NoError(t, err, "No error expected when migrating gsmaster tables") - //err = importer.MigrateStructure() + //err = importero.MigrateStructure() assert.NoError(t, err, "No error expected when migrating importer tables") } diff --git a/backend/cmd/main.go b/backend/cmd/main.go index 8fd25c6..f5044ad 100644 --- a/backend/cmd/main.go +++ b/backend/cmd/main.go @@ -7,12 +7,12 @@ import ( "bamort/database" "bamort/equipment" "bamort/gsmaster" - "bamort/importer" + "bamort/importero" "bamort/logger" "bamort/maintenance" "bamort/pdfrender" "bamort/router" - "bamort/transfer" + "bamort/transfero" "bamort/user" "github.com/gin-gonic/gin" @@ -90,9 +90,9 @@ func main() { character.RegisterRoutes(protected) equipment.RegisterRoutes(protected) maintenance.RegisterRoutes(protected) - importer.RegisterRoutes(protected) + importero.RegisterRoutes(protected) pdfrender.RegisterRoutes(protected) - transfer.RegisterRoutes(protected) + transfero.RegisterRoutes(protected) appsystem.RegisterRoutes(protected) // Register public routes (no authentication) diff --git a/backend/importer/charimport_test.go b/backend/importero/charimport_test.go similarity index 99% rename from backend/importer/charimport_test.go rename to backend/importero/charimport_test.go index 178cf34..6ca8e76 100644 --- a/backend/importer/charimport_test.go +++ b/backend/importero/charimport_test.go @@ -1,4 +1,4 @@ -package importer +package importero import ( "bamort/database" diff --git a/backend/importer/exporter.go b/backend/importero/exporter.go similarity index 99% rename from backend/importer/exporter.go rename to backend/importero/exporter.go index 2181816..42449c2 100644 --- a/backend/importer/exporter.go +++ b/backend/importero/exporter.go @@ -1,4 +1,4 @@ -package importer +package importero import ( "bamort/models" diff --git a/backend/importer/exporter_test.go b/backend/importero/exporter_test.go similarity index 99% rename from backend/importer/exporter_test.go rename to backend/importero/exporter_test.go index f0abd2f..6c9cd3d 100644 --- a/backend/importer/exporter_test.go +++ b/backend/importero/exporter_test.go @@ -1,4 +1,4 @@ -package importer +package importero import ( "bamort/database" diff --git a/backend/importer/handler.go b/backend/importero/handler.go similarity index 99% rename from backend/importer/handler.go rename to backend/importero/handler.go index 6b6421c..55b2fcb 100644 --- a/backend/importer/handler.go +++ b/backend/importero/handler.go @@ -1,4 +1,4 @@ -package importer +package importero import ( "bamort/database" diff --git a/backend/importer/importJSON2ImportStruct_test.go b/backend/importero/importJSON2ImportStruct_test.go similarity index 99% rename from backend/importer/importJSON2ImportStruct_test.go rename to backend/importero/importJSON2ImportStruct_test.go index 09447b1..94d196f 100644 --- a/backend/importer/importJSON2ImportStruct_test.go +++ b/backend/importero/importJSON2ImportStruct_test.go @@ -1,4 +1,4 @@ -package importer +package importero import ( "bamort/database" diff --git a/backend/importer/importVTTJson.go b/backend/importero/importVTTJson.go similarity index 99% rename from backend/importer/importVTTJson.go rename to backend/importero/importVTTJson.go index c18b08b..eb187a0 100644 --- a/backend/importer/importVTTJson.go +++ b/backend/importero/importVTTJson.go @@ -1,4 +1,4 @@ -package importer +package importero import ( "bamort/models" diff --git a/backend/importer/importer.go b/backend/importero/importer.go similarity index 99% rename from backend/importer/importer.go rename to backend/importero/importer.go index 78c9ff2..9feeb4f 100644 --- a/backend/importer/importer.go +++ b/backend/importero/importer.go @@ -1,4 +1,4 @@ -package importer +package importero import ( "bamort/models" diff --git a/backend/importer/importer_test.go b/backend/importero/importer_test.go similarity index 99% rename from backend/importer/importer_test.go rename to backend/importero/importer_test.go index 55cbe9a..7998e41 100644 --- a/backend/importer/importer_test.go +++ b/backend/importero/importer_test.go @@ -1,4 +1,4 @@ -package importer +package importero import ( "bamort/database" diff --git a/backend/importer/model.go b/backend/importero/model.go similarity index 99% rename from backend/importer/model.go rename to backend/importero/model.go index 0e968bf..aca96cd 100644 --- a/backend/importer/model.go +++ b/backend/importero/model.go @@ -1,4 +1,4 @@ -package importer +package importero import ( "bamort/models" diff --git a/backend/importer/routes.go b/backend/importero/routes.go similarity index 96% rename from backend/importer/routes.go rename to backend/importero/routes.go index e9d95cf..5ba93a7 100644 --- a/backend/importer/routes.go +++ b/backend/importero/routes.go @@ -1,4 +1,4 @@ -package importer +package importero import ( "github.com/gin-gonic/gin" diff --git a/backend/importer/upload_test.go b/backend/importero/upload_test.go similarity index 99% rename from backend/importer/upload_test.go rename to backend/importero/upload_test.go index bdadd64..821590e 100644 --- a/backend/importer/upload_test.go +++ b/backend/importero/upload_test.go @@ -1,4 +1,4 @@ -package importer +package importero import ( "bamort/database" diff --git a/backend/maintenance/handlers.go b/backend/maintenance/handlers.go index b151d38..553e89b 100644 --- a/backend/maintenance/handlers.go +++ b/backend/maintenance/handlers.go @@ -60,7 +60,7 @@ func migrateAllStructures(db *gorm.DB) error { return fmt.Errorf("failed to migrate gsmaster structures: %w", err) } - /*if err := importer.MigrateStructure(db); err != nil { + /*if err := importero.MigrateStructure(db); err != nil { return fmt.Errorf("failed to migrate importer structures: %w", err) }*/ diff --git a/backend/transfer/routes.go b/backend/transfer/routes.go deleted file mode 100644 index febe511..0000000 --- a/backend/transfer/routes.go +++ /dev/null @@ -1,24 +0,0 @@ -package transfer - -import ( - "github.com/gin-gonic/gin" -) - -// RegisterRoutes registers the transfer routes -func RegisterRoutes(r *gin.RouterGroup) { - transfer := r.Group("/transfer") - { - // Export character as JSON (for API consumption) - transfer.GET("/export/:id", ExportCharacterHandler) - - // Download character as JSON file - transfer.GET("/download/:id", DownloadCharacterHandler) - - // Import character from JSON - transfer.POST("/import", ImportCharacterHandler) - - // Full database export/import - transfer.POST("/database/export", ExportDatabaseHandler) - transfer.POST("/database/import", ImportDatabaseHandler) - } -} diff --git a/backend/transfer/README.md b/backend/transfero/README.md similarity index 100% rename from backend/transfer/README.md rename to backend/transfero/README.md diff --git a/backend/transfer/database.go b/backend/transfero/database.go similarity index 99% rename from backend/transfer/database.go rename to backend/transfero/database.go index a806467..fda844f 100644 --- a/backend/transfer/database.go +++ b/backend/transfero/database.go @@ -1,4 +1,4 @@ -package transfer +package transfero import ( "bamort/appsystem" diff --git a/backend/transfer/database_handlers_test.go b/backend/transfero/database_handlers_test.go similarity index 99% rename from backend/transfer/database_handlers_test.go rename to backend/transfero/database_handlers_test.go index 10b7b1a..4989e3e 100644 --- a/backend/transfer/database_handlers_test.go +++ b/backend/transfero/database_handlers_test.go @@ -1,4 +1,4 @@ -package transfer +package transfero import ( "bamort/config" diff --git a/backend/transfer/database_test.go b/backend/transfero/database_test.go similarity index 99% rename from backend/transfer/database_test.go rename to backend/transfero/database_test.go index f3c17b2..9d30609 100644 --- a/backend/transfer/database_test.go +++ b/backend/transfero/database_test.go @@ -1,4 +1,4 @@ -package transfer +package transfero import ( "bamort/config" diff --git a/backend/transfer/exporter.go b/backend/transfero/exporter.go similarity index 99% rename from backend/transfer/exporter.go rename to backend/transfero/exporter.go index f75a68c..23054aa 100644 --- a/backend/transfer/exporter.go +++ b/backend/transfero/exporter.go @@ -1,4 +1,4 @@ -package transfer +package transfero import ( "bamort/database" diff --git a/backend/transfer/exporter_test.go b/backend/transfero/exporter_test.go similarity index 99% rename from backend/transfer/exporter_test.go rename to backend/transfero/exporter_test.go index 59443c7..99015f4 100644 --- a/backend/transfer/exporter_test.go +++ b/backend/transfero/exporter_test.go @@ -1,4 +1,4 @@ -package transfer +package transfero import ( "bamort/database" diff --git a/backend/transfer/handlers.go b/backend/transfero/handlers.go similarity index 96% rename from backend/transfer/handlers.go rename to backend/transfero/handlers.go index 9cdf775..370b7cc 100644 --- a/backend/transfer/handlers.go +++ b/backend/transfero/handlers.go @@ -1,4 +1,4 @@ -package transfer +package transfero import ( "bamort/config" @@ -10,6 +10,10 @@ import ( "github.com/gin-gonic/gin" ) +func dummyproc(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{"message": "This endpoint is a placeholder for future VTT import functionality."}) +} + // ExportCharacterHandler handles character export requests func ExportCharacterHandler(c *gin.Context) { // Get character ID from URL parameter diff --git a/backend/transfer/handlers_test.go b/backend/transfero/handlers_test.go similarity index 99% rename from backend/transfer/handlers_test.go rename to backend/transfero/handlers_test.go index 9b4f3ed..01a212d 100644 --- a/backend/transfer/handlers_test.go +++ b/backend/transfero/handlers_test.go @@ -1,4 +1,4 @@ -package transfer +package transfero import ( "bytes" diff --git a/backend/transfer/importer.go b/backend/transfero/importer.go similarity index 99% rename from backend/transfer/importer.go rename to backend/transfero/importer.go index 2508aff..bac71c9 100644 --- a/backend/transfer/importer.go +++ b/backend/transfero/importer.go @@ -1,4 +1,4 @@ -package transfer +package transfero import ( "bamort/database" diff --git a/backend/transfer/importer_test.go b/backend/transfero/importer_test.go similarity index 99% rename from backend/transfer/importer_test.go rename to backend/transfero/importer_test.go index 4f87fe1..00d0748 100644 --- a/backend/transfer/importer_test.go +++ b/backend/transfero/importer_test.go @@ -1,4 +1,4 @@ -package transfer +package transfero import ( "bamort/database" diff --git a/backend/transfero/routes.go b/backend/transfero/routes.go new file mode 100644 index 0000000..28d254d --- /dev/null +++ b/backend/transfero/routes.go @@ -0,0 +1,32 @@ +package transfero + +import ( + "github.com/gin-gonic/gin" +) + +// RegisterRoutes registers the transfer routes +func RegisterRoutes(r *gin.RouterGroup) { + router := r.Group("/transfer") + { + // Export character as JSON (for API consumption) + router.GET("/export/:id", ExportCharacterHandler) + + // Download character as JSON file + router.GET("/download/:id", DownloadCharacterHandler) + + // Import character from JSON + router.POST("/import", ImportCharacterHandler) + + // Full database export/import + router.POST("/database/export", ExportDatabaseHandler) + router.POST("/database/import", ImportDatabaseHandler) + + // methods for new importer handling + router.POST("/vtt-import", dummyproc) + router.POST("/vtt-export", dummyproc) + router.POST("/csv-import", dummyproc) + router.POST("/csv-export", dummyproc) + router.POST("/moam-import", dummyproc) + router.POST("/moam-export", dummyproc) + } +}