diff pkg/controllers/routes.go @ 442:fc37e7072022

Moved some models used in controllers to to model package because they may be needed elsewhere (e.g. GeoServer config).
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Tue, 21 Aug 2018 16:57:55 +0200
parents 76a76691a298
children 5e8ac1c67fe6
line wrap: on
line diff
--- a/pkg/controllers/routes.go	Tue Aug 21 14:59:36 2018 +0200
+++ b/pkg/controllers/routes.go	Tue Aug 21 16:57:55 2018 +0200
@@ -8,6 +8,7 @@
 
 	"gemma.intevation.de/gemma/pkg/auth"
 	"gemma.intevation.de/gemma/pkg/middleware"
+	"gemma.intevation.de/gemma/pkg/models"
 )
 
 func BindRoutes(m *mux.Router) {
@@ -25,7 +26,7 @@
 	})).Methods(http.MethodGet)
 
 	api.Handle("/users", sysAdmin(&JSONHandler{
-		Input:  func() interface{} { return new(User) },
+		Input:  func() interface{} { return new(models.User) },
 		Handle: createUser,
 	})).Methods(http.MethodPost)
 
@@ -34,7 +35,7 @@
 	})).Methods(http.MethodGet)
 
 	api.Handle("/users/{user}", all(&JSONHandler{
-		Input:  func() interface{} { return new(User) },
+		Input:  func() interface{} { return new(models.User) },
 		Handle: updateUser,
 	})).Methods(http.MethodPut)
 
@@ -44,7 +45,7 @@
 
 	// Password resets.
 	api.Handle("/users/passwordreset", &JSONHandler{
-		Input:  func() interface{} { return new(PWResetUser) },
+		Input:  func() interface{} { return new(models.PWResetUser) },
 		Handle: passwordResetRequest,
 	}).Methods(http.MethodPost)
 
@@ -54,7 +55,7 @@
 
 	// External proxies.
 	proxy := &httputil.ReverseProxy{
-		Director:       proxyDirector(externalServices.find),
+		Director:       proxyDirector(models.ExternalServices.Find),
 		ModifyResponse: proxyModifyResponse("/api/external/"),
 	}
 
@@ -70,7 +71,7 @@
 
 	// Internal proxies.
 	internal := &httputil.ReverseProxy{
-		Director:       proxyDirector(publishedServices.find),
+		Director:       proxyDirector(models.PublishedServices.Find),
 		ModifyResponse: proxyModifyResponse("/api/internal/"),
 	}