Reverted changes for Gifter{Id,Name,Login}

Author: aaricdev

internal/database/subscriptions.go

@@ -9,18 +9,18 @@ import (
 )
 
 type Subscription struct {
-	BroadcasterID    string `db:"broadcaster_id" json:"broadcaster_id"`
-	BroadcasterLogin string `db:"broadcaster_login" json:"broadcaster_login"`
-	BroadcasterName  string `db:"broadcaster_name" json:"broadcaster_name"`
-	UserID           string `db:"user_id" json:"user_id"`
-	UserLogin        string `db:"user_login" json:"user_login"`
-	UserName         string `db:"user_name" json:"user_name"`
-	IsGift           bool   `db:"is_gift" json:"is_gift"`
-	GifterID         string `db:"gifter_id" json:"gifter_id"`
-	GifterName       string `db:"gifter_name" json:"gifter_name"`
-	GifterLogin      string `db:"gifter_login" json:"gifter_login"`
-	Tier             string `db:"tier" json:"tier"`
-	CreatedAt        string `db:"created_at" json:"-"`
+	BroadcasterID    string          `db:"broadcaster_id" json:"broadcaster_id"`
+	BroadcasterLogin string          `db:"broadcaster_login" json:"broadcaster_login"`
+	BroadcasterName  string          `db:"broadcaster_name" json:"broadcaster_name"`
+	UserID           string          `db:"user_id" json:"user_id"`
+	UserLogin        string          `db:"user_login" json:"user_login"`
+	UserName         string          `db:"user_name" json:"user_name"`
+	IsGift           bool            `db:"is_gift" json:"is_gift"`
+	GifterID         *sql.NullString `db:"gifter_id" json:"gifter_id"`
+	GifterName       *sql.NullString `db:"gifter_name" json:"gifter_name"`
+	GifterLogin      *sql.NullString `db:"gifter_login" json:"gifter_login"`
+	Tier             string          `db:"tier" json:"tier"`
+	CreatedAt        string          `db:"created_at" json:"-"`
 	// calculated fields
 	PlanName string `json:"plan_name"`
 }
@@ -36,7 +36,7 @@ type SubscriptionInsert struct {
 
 func (q *Query) GetSubscriptions(s Subscription) (*DBResponse, error) {
 	r := []Subscription{}
-	sql := generateSQL("SELECT u1.id as user_id, u1.user_login as user_login, u1.display_name as user_name, u2.id as broadcaster_id, u2.user_login as broadcaster_login, u2.display_name as broadcaster_name, ifnull(u3.id, '') as gifter_id, ifnull(u3.user_login, '') as gifter_login, ifnull(u3.display_name, '') as gifter_name, s.tier as tier, s.is_gift as is_gift FROM subscriptions as s JOIN users u1 ON s.user_id = u1.id JOIN users u2 ON s.broadcaster_id = u2.id LEFT JOIN users u3 ON s.gifter_id = u3.id", s, SEP_AND)
+	sql := generateSQL("SELECT u1.id as user_id, u1.user_login as user_login, u1.display_name as user_name, u2.id as broadcaster_id, u2.user_login as broadcaster_login, u2.display_name as broadcaster_name, u3.id as gifter_id, u3.user_login as gifter_login, u3.display_name as gifter_name, s.tier as tier, s.is_gift as is_gift FROM subscriptions as s JOIN users u1 ON s.user_id = u1.id JOIN users u2 ON s.broadcaster_id = u2.id LEFT JOIN users u3 ON s.gifter_id = u3.id", s, SEP_AND)
 	sql += " order by s.created_at desc"
 	sql += q.SQL