From 5d57233882cba3c0589d615c241a650f651135f6 Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Tue, 9 May 2017 12:14:12 +0200
Subject: [PATCH] Cleanup of user model

---
 model/user.go | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/model/user.go b/model/user.go
index 829243d2..f7a033b1 100644
--- a/model/user.go
+++ b/model/user.go
@@ -4,9 +4,6 @@ import (
 	"time"
 )
 
-// omit is the bool type for omitting a field of struct.
-type omit bool
-
 type User struct {
 	Id              uint      `gorm:"column:user_id;primary_key"`
 	Username        string    `gorm:"column:username"`
@@ -15,19 +12,18 @@ type User struct {
 	Status          int       `gorm:"column:status"`
 	CreatedAt       time.Time `gorm:"column:created_at"`
 	UpdatedAt       time.Time `gorm:"column:updated_at"`
-	/*Api*/Token    string    `gorm:"column:api_token"`
-	//ApiTokenExpiry
-
-	// Liking
-	LikingCount int    `json:"likingCount"`
-	LikedCount  int    `json:"likedCount"`
-	Likings     []User `gorm:"foreignkey:userId;associationforeignkey:follower_id;many2many:users_followers;"`
-	Liked       []User `gorm:"foreignkey:follower_id;associationforeignkey:userId;many2many:users_followers;"`
-
-	Md5 string `json:"md5"`
+	Token           string    `gorm:"column:api_token"`
 	TokenExpiration time.Time `gorm:"column:api_token_expiry"`
 	Language        string    `gorm:"column:language"`
-	Torrents    []Torrents `gorm:"ForeignKey:UploaderId"`
+
+	// TODO: move this to PublicUser
+	LikingCount     int       `json:"likingCount" gorm:"-"`
+	LikedCount      int       `json:"likedCount" gorm:"-"`
+	Likings         []User    `gorm:"foreignkey:userId;associationforeignkey:follower_id;many2many:users_followers;"`
+	Liked           []User    `gorm:"foreignkey:follower_id;associationforeignkey:userId;many2many:users_followers;"`
+
+	Md5             string     `json:"md5" gorm:"-"`
+	Torrents        []Torrents `gorm:"ForeignKey:UploaderId"`
 }
 
 type PublicUser struct {
@@ -36,6 +32,10 @@ type PublicUser struct {
 
 // UsersFollowers is a relation table to relate users each other.
 type UsersFollowers struct {
-	UserID     uint `gorm:"column:userId"`
-	FollowerID uint `gorm:"column:follower_id"`
+	UserID     uint `gorm:"column:user_id"`
+	FollowerID uint `gorm:"column:following"`
+}
+
+func (c UsersFollowers) TableName() string {
+	return "user_follows"
 }