fix: regroup un-nested routes

api/v1/api.go

@@ -80,48 +80,44 @@ func InstallHTTPHandler(r *gin.RouterGroup, st *store.Store, im *importer.Import
 		shows.GET("", api.ListShows)
 		shows.POST(":show-id", api.CreateShow)
 		shows.DELETE(":show-id", api.DeleteShow)
-		// deprecated
+		// deprecated -> /imports
 		shows.GET(":show-id/imports", api.ListImportsOfShow)
 
-		// Show/Files
-		files := shows.Group(":show-id/files")
+		// Show/Files: deprecated -> /files
+		deprecated := shows.Group(":show-id/files")
 		{
-			// deprecated
-			files.GET("", api.ListFilesOfShow)
-			files.POST("", api.CreateFileForShow)
-			files.GET(":file-id", api.ReadFileOfShow)
-			files.PATCH(":file-id", api.PatchFileOfShow)
-			files.DELETE(":file-id", api.DeleteFileOfShow)
-
-			// deprecated
-			files.GET(":file-id/usage", api.ReadUsageOfFile)
-
-			// deprecated
-			files.GET(":file-id/logs", api.ReadLogsOfFile)
-
-			// deprecated
-			files.GET(":file-id/import", api.ReadImportOfFile)
-			files.DELETE(":file-id/import", api.CancelImportOfFile)
+			deprecated.GET("", api.ListFilesOfShow)
+			deprecated.POST("", api.CreateFileForShow)
+			deprecated.GET(":file-id", api.ReadFileOfShow)
+			deprecated.PATCH(":file-id", api.PatchFileOfShow)
+			deprecated.DELETE(":file-id", api.DeleteFileOfShow)
+			deprecated.GET(":file-id/usage", api.ReadUsageOfFile)
+			deprecated.GET(":file-id/logs", api.ReadLogsOfFile)
+			deprecated.GET(":file-id/import", api.ReadImportOfFile)
+			deprecated.DELETE(":file-id/import", api.CancelImportOfFile)
 
 			// TODO: distignuish between flow.js and simple upload using the content type?!?
-			// deprecated
-			files.PUT(":file-id/upload", api.UploadFileSimple)
-			files.POST(":file-id/upload", api.UploadFileFlowJS)
-			files.GET(":file-id/upload", api.TestFileFlowJS)
+			deprecated.PUT(":file-id/upload", api.UploadFileSimple)
+			deprecated.POST(":file-id/upload", api.UploadFileFlowJS)
+			deprecated.GET(":file-id/upload", api.TestFileFlowJS)
 		}
 
-		// Show/Playlists
-		playlists := shows.Group(":show-id/playlists")
+		// Show/Playlists: deprecated -> /playlists
+		deprecated2 := shows.Group(":show-id/playlists")
 		{
-			// deprecated
-			playlists.GET("", api.ListPlaylistsOfShow)
-			playlists.POST("", api.CreatePlaylistForShow)
-			playlists.GET(":playlist-id", api.ReadPlaylistOfShow)
-			playlists.PUT(":playlist-id", api.UpdatePlaylistOfShow)
-			playlists.DELETE(":playlist-id", api.DeletePlaylistOfShow)
+			deprecated2.GET("", api.ListPlaylistsOfShow)
+			deprecated2.POST("", api.CreatePlaylistForShow)
+			deprecated2.GET(":playlist-id", api.ReadPlaylistOfShow)
+			deprecated2.PUT(":playlist-id", api.UpdatePlaylistOfShow)
+			deprecated2.DELETE(":playlist-id", api.DeletePlaylistOfShow)
 		}
 	}
 
+	imports := r.Group("imports")
+	{
+		imports.GET("", api.ListImportsOfShow)
+	}
+
 	playlists := r.Group("playlists")
 	{
 		playlists.GET("", api.ListPlaylists) // behaves like ListPlaylistsOfShow with ?showID
@@ -131,29 +127,20 @@ func InstallHTTPHandler(r *gin.RouterGroup, st *store.Store, im *importer.Import
 		playlists.DELETE(":playlist-id", api.DeletePlaylistOfShow)
 	}
 
-	// FIXME: This should be done with r.Groups when nested routes are removed
-	// r.Group("imports")
-	r.GET("imports", api.ListImportsOfShow)
-
-	// r.Group("files")
-	r.GET("files", api.ListFilesOfShow)
-	r.POST("files", api.CreateFileForShow)
-	r.GET("files/:file-id", api.ReadFileOfShow)
-	r.PATCH("files/:file-id", api.PatchFileOfShow)
-	r.DELETE("files/:file-id", api.DeleteFileOfShow)
-
-	// r.Group("usage")
-	r.GET("usage/:file-id", api.ReadUsageOfFile)
-
-	// r.Group("logs")
-	r.GET("logs/:file-id", api.ReadLogsOfFile)
-
-	// r.Group("import")
-	r.GET("import/:file-id", api.ReadImportOfFile)
-	r.DELETE("import/:file-id", api.CancelImportOfFile)
+	files := r.Group("files")
+	{
+		files.GET("", api.ListFilesOfShow)
+		files.POST("", api.CreateFileForShow)
+		files.GET(":file-id", api.ReadFileOfShow)
+		files.PATCH(":file-id", api.PatchFileOfShow)
+		files.DELETE(":file-id", api.DeleteFileOfShow)
+		files.GET(":file-id/usage", api.ReadUsageOfFile)
+		files.GET(":file-id/logs", api.ReadLogsOfFile)
+		files.GET(":file-id/import", api.ReadImportOfFile)
+		files.DELETE(":file-id/import", api.CancelImportOfFile)
+		files.PUT(":file-id/upload", api.UploadFileSimple)
+		files.POST(":file-id/upload", api.UploadFileFlowJS)
+		files.GET(":file-id/upload", api.TestFileFlowJS)
 
-	// r.Group("upload")
-	r.PUT("upload/:file-id", api.UploadFileSimple)
-	r.POST("upload/:file-id", api.UploadFileFlowJS)
-	r.GET("upload/:file-id", api.TestFileFlowJS)
+	}
 }