Merge pull request #245 from GLYASAI/V5.1

[REV] rename event_id and eventId to eventID
goodrain · Mar 21, 2019 · a2897f4 · a2897f4
2 parents 5cb66ee + 45f41a1
commit a2897f4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/api/api_routers/version2/v2Routers.go b/api/api_routers/version2/v2Routers.go
@@ -245,19 +245,19 @@ func (v2 *V2) prometheusRouter() chi.Router {
 func (v2 *V2) appRouter() chi.Router {
 	r := chi.NewRouter()
 	r.Post("/export", controller.GetManager().ExportApp)
-	r.Get("/export/{eventId}", controller.GetManager().ExportApp)
+	r.Get("/export/{eventID}", controller.GetManager().ExportApp)
 
 	r.Get("/download/{format}/{fileName}", controller.GetManager().Download)
-	r.Post("/upload/{event_id}", controller.GetManager().NewUpload)
-	r.Options("/upload/{event_id}", controller.GetManager().NewUpload)
+	r.Post("/upload/{eventID}", controller.GetManager().NewUpload)
+	r.Options("/upload/{eventID}", controller.GetManager().NewUpload)
 
-	r.Post("/import/ids/{eventId}", controller.GetManager().ImportID)
-	r.Get("/import/ids/{eventId}", controller.GetManager().ImportID)
-	r.Delete("/import/ids/{eventId}", controller.GetManager().ImportID)
+	r.Post("/import/ids/{eventID}", controller.GetManager().ImportID)
+	r.Get("/import/ids/{eventID}", controller.GetManager().ImportID)
+	r.Delete("/import/ids/{eventID}", controller.GetManager().ImportID)
 
 	r.Post("/import", controller.GetManager().ImportApp)
-	r.Get("/import/{eventId}", controller.GetManager().ImportApp)
-	r.Delete("/import/{eventId}", controller.GetManager().ImportApp)
+	r.Get("/import/{eventID}", controller.GetManager().ImportApp)
+	r.Delete("/import/{eventID}", controller.GetManager().ImportApp)
 	return r
 }
 

diff --git a/api/api_routers/websocket/websocket.go b/api/api_routers/websocket/websocket.go
@@ -47,7 +47,7 @@ func LogRoutes() chi.Router {
 func AppRoutes() chi.Router {
 	r := chi.NewRouter()
 	r.Get("/download/{format}/{fileName}", controller.GetManager().Download)
-	r.Post("/upload/{event_id}", controller.GetManager().Upload)
-	r.Options("/upload/{event_id}", controller.GetManager().Upload)
+	r.Post("/upload/{eventID}", controller.GetManager().Upload)
+	r.Options("/upload/{eventID}", controller.GetManager().Upload)
 	return r
 }
diff --git a/api/controller/app.go b/api/controller/app.go
@@ -156,7 +156,7 @@ func (a *AppStruct) ImportID(w http.ResponseWriter, r *http.Request) {
 
 //NewUpload -
 func (a *AppStruct) NewUpload(w http.ResponseWriter, r *http.Request) {
-	eventID := strings.TrimSpace(chi.URLParam(r, "event_id"))
+	eventID := strings.TrimSpace(chi.URLParam(r, "eventID"))
 	switch r.Method {
 	case "OPTIONS":
 		origin := r.Header.Get("Origin")
@@ -181,7 +181,7 @@ func (a *AppStruct) NewUpload(w http.ResponseWriter, r *http.Request) {
 
 //Upload -
 func (a *AppStruct) Upload(w http.ResponseWriter, r *http.Request) {
-	eventID := strings.TrimSpace(chi.URLParam(r, "event_id"))
+	eventID := strings.TrimSpace(chi.URLParam(r, "eventID"))
 	switch r.Method {
 	case "POST":
 		if eventID == "" {