From e525fdc9285faca9289acf531f443cf98e48d736 Mon Sep 17 00:00:00 2001
From: Jan Bader <jan.bader@ub-software.de>
Date: Tue, 27 Dec 2016 00:47:10 +0100
Subject: [PATCH] Rename to Service

Add ModelService interface to merge all Services
---
 cmd/budgeteer/main.go | 2 +-
 http/data.go          | 2 +-
 http/http.go          | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmd/budgeteer/main.go b/cmd/budgeteer/main.go
index 5fc64cb..cf1cf94 100644
--- a/cmd/budgeteer/main.go
+++ b/cmd/budgeteer/main.go
@@ -26,7 +26,7 @@ func main() {
 	tv := &jwt.TokenVerifier{}
 
 	h := &http.Handler{
-		UserService:         us,
+		Service:             us,
 		TokenVerifier:       tv,
 		CredentialsVerifier: bv,
 	}
diff --git a/http/data.go b/http/data.go
index 81bc013..703fd9a 100644
--- a/http/data.go
+++ b/http/data.go
@@ -5,7 +5,7 @@ import "git.javil.eu/jacob1123/budgeteer"
 
 type TemplateData struct {
 	token         jwt.Token
-	budgetService budgeteer.BudgetService
+	budgetService budgeteer.ModelService
 }
 
 func (d *TemplateData) GetToken() jwt.Token {
diff --git a/http/http.go b/http/http.go
index d7485da..81c4937 100644
--- a/http/http.go
+++ b/http/http.go
@@ -11,7 +11,7 @@ import (
 
 // Handler handles incoming requests
 type Handler struct {
-	UserService         budgeteer.UserService
+	Service             budgeteer.ModelService
 	TokenVerifier       budgeteer.TokenVerifier
 	CredentialsVerifier budgeteer.CredentialVerifier
 }
@@ -120,7 +120,7 @@ func (h *Handler) loginPost(c *gin.Context) {
 	username, _ := c.GetPostForm("username")
 	password, _ := c.GetPostForm("password")
 
-	user, err := h.UserService.UserByUsername(username)
+	user, err := h.Service.UserByUsername(username)
 	if err != nil {
 		c.AbortWithError(http.StatusUnauthorized, err)
 		return
@@ -149,7 +149,7 @@ func (h *Handler) registerPost(c *gin.Context) {
 	password, _ := c.GetPostForm("password")
 	name, _ := c.GetPostForm("name")
 
-	user, err := h.UserService.UserByUsername(email)
+	user, err := h.Service.UserByUsername(email)
 	if err == nil {
 		c.AbortWithStatus(http.StatusUnauthorized)
 		return
@@ -166,7 +166,7 @@ func (h *Handler) registerPost(c *gin.Context) {
 		Password: hash,
 		Email:    email,
 	}
-	err = h.UserService.CreateUser(user)
+	err = h.Service.CreateUser(user)
 	if err != nil {
 		c.AbortWithError(http.StatusInternalServerError, err)
 	}