From ab2d51c5829311d693b37d08aff273ab41b2e510 Mon Sep 17 00:00:00 2001
From: Dustin Pianalto <dustin@djpianalto.com>
Date: Sat, 23 Jan 2021 14:59:35 -0900
Subject: [PATCH] fix bug in user service

---
 internal/database/user.go | 6 +-----
 user.go                   | 4 +---
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/internal/database/user.go b/internal/database/user.go
index 21f1b9b..2925b6f 100644
--- a/internal/database/user.go
+++ b/internal/database/user.go
@@ -21,11 +21,7 @@ func (s userService) User(id string) (geeksbot.User, error) {
 func (s userService) CreateUser(u geeksbot.User) (geeksbot.User, error) {
 	queryString := "INSERT INTO users (id, steam_id, active, staff, admin) VALUES ($1, $2, $3, $4, $5)"
 	var err error
-	if u.SteamID.Valid {
-		_, err = s.db.Exec(queryString, u.ID, u.SteamID.String, u.IsActive, u.IsStaff, u.IsAdmin)
-	} else {
-		_, err = s.db.Exec(queryString, u.ID, nil, u.IsActive, u.IsStaff, u.IsAdmin)
-	}
+	_, err = s.db.Exec(queryString, u.ID, u.SteamID, u.IsActive, u.IsStaff, u.IsAdmin)
 	return u, err
 }
 
diff --git a/user.go b/user.go
index dcba7c9..8fedccc 100644
--- a/user.go
+++ b/user.go
@@ -1,10 +1,8 @@
 package geeksbot
 
-import "database/sql"
-
 type User struct {
 	ID       string
-	SteamID  sql.NullString
+	SteamID  string
 	IsActive bool
 	IsStaff  bool
 	IsAdmin  bool