Bundling functionality in server.go and improving code flow.

1 files changed, 9 insertions, 10 deletions

diff --git a/struct.go b/struct.go
index 27b73c1..b8ccf38 100644
--- a/struct.go
+++ b/struct.go
@@ -17,26 +17,25 @@ type User struct {
 
 // Domains for which we do E-Mail hosting
 type VirtualDomain struct {
-	Id int64
+	Id   int64
+	Name string
+	//DomainId int64 `gorm:"primary_key"`
 	//	User   User
-	UserId int64
-	Name   string
+	//UserId int64
 }
 
 // User for postfix
 type VirtualUser struct {
-	Id              int64
-	UserId          int64
-	VirtualDomain   VirtualDomain
-	VirtualDomainId int64
-	Password        string
-	Email           string
+	Id       int64
+	DomainId int64
+	Password string
+	Email    string
+	//UserId          int64
 }
 
 // E-Mail aliase for postfix
 type VirtualAliase struct {
 	Id              int64
-	VirtualDomain   VirtualDomain
 	VirtualDomainId int64
 	Source          string
 	Destination     string