Reorg and add services

internal/postgres/guild.go

@@ -2,6 +2,7 @@ package postgres
 
 import (
 	"database/sql"
+	"log"
 
 	"github.com/dustinpianalto/goff"
 )
@@ -49,17 +50,78 @@ func (s *GuildService) Guild(id string) (*goff.Guild, error) {
 }
 
 func (s *GuildService) CreateGuild(g *goff.Guild) error {
-	return nil
+	queryString := `INSERT INTO guilds (id, 
+					welcome_message, 
+					goodbye_message, 
+					logging_channel, 
+					welcome_channel, 
+					puzzle_channel, 
+					puzzle_role) 
+					VALUES ($1, $2, $3, $4, $5, $6, $7)`
+	_, err := s.DB.Exec(queryString,
+		g.ID,
+		g.WelcomeMessage,
+		g.GoodbyeMessage,
+		g.LoggingChannel,
+		g.WelcomeChannel,
+		g.PuzzleChannel,
+		g.PuzzleRole,
+	)
+	return err
 }
 
 func (s *GuildService) DeleteGuild(g *goff.Guild) error {
-	return nil
+	queryString := `DELETE CASCADE FROM guilds WHERE id = $1`
+	_, err := s.DB.Exec(queryString, g.ID)
+	return err
 }
 
 func (s *GuildService) GuildUsers(g *goff.Guild) ([]*goff.User, error) {
-	return []*goff.User{}, nil
+	var users []*goff.User
+	queryString := `SELECT u.id, u.banned, u.logging, u.steam_id, u.is_active, u.is_staff, u.is_admin
+					FROM users u, x_users_guilds xug
+					WHERE xug.guild_id = $1
+					AND xug.user_id = u.id`
+	rows, err := s.DB.Query(queryString, g.ID)
+	if err != nil {
+		return nil, err
+	}
+	for rows.Next() {
+		var user goff.User
+		err := rows.Scan(&user.ID,
+			&user.Banned,
+			&user.Logging,
+			&user.SteamID,
+			&user.IsActive,
+			&user.IsStaff,
+			&user.IsAdmin,
+		)
+		if err != nil {
+			log.Println(err)
+			continue
+		}
+		users = append(users, &user)
+	}
+	return users, nil
 }
 
 func (s *GuildService) UpdateGuild(g *goff.Guild) error {
-	return nil
+	queryString := `UPDATE guilds SET 
+					welcome_message = $1,
+					goodbye_message = $2,
+					logging_channel = $3,
+					welcome_channel = $4,
+					puzzle_channel = $5,
+					puzzle_role = $6
+					WHERE id = $7`
+	_, err := s.DB.Exec(queryString,
+		g.WelcomeMessage,
+		g.GoodbyeMessage,
+		g.LoggingChannel,
+		g.WelcomeChannel,
+		g.PuzzleChannel,
+		g.PuzzleRole,
+		g.ID,
+	)
+	return err
 }

internal/postgres/user.go

@@ -44,7 +44,7 @@ func (s *UserService) CreateUser(u *goff.User) error {
 }
 
 func (s *UserService) DeleteUser(u *goff.User) error {
-	queryString := `DELETE FROM x_users_guilds WHERE user_id = $1; DELETE FROM users WHERE id = $1`
+	queryString := `DELETE CASCADE FROM x_users_guilds WHERE user_id = $1; DELETE FROM users WHERE id = $1`
 	_, err := s.DB.Exec(queryString, u.ID)
 	return err
 }
@@ -72,11 +72,11 @@ func (s *UserService) RemoveUserFromGuild(u *goff.User, g *goff.Guild) error {
 
 func (s *UserService) UpdateUser(u *goff.User) error {
 	queryString := `UPDATE users SET 
-						banned = $1 
-						logging = $2 
-						steam_id = $3 
-						is_active = $4 
-						is_staff = $5 
+						banned = $1,
+						logging = $2, 
+						steam_id = $3, 
+						is_active = $4, 
+						is_staff = $5,
 						is_admin = $6
 						WHERE id = $7`
 	_, err := s.DB.Exec(queryString, u.Banned, u.Logging, u.SteamID, u.IsActive, u.IsStaff, u.IsAdmin)