Concurrent menu/bot. Disappearing option in menu. User groups.

Signed-off-by: Ettore Dreucci <ettore.dreucci@gmail.com>

src/manageUser.go

@@ -4,15 +4,28 @@ import (
 	"encoding/json"
 	"log"
 	"strconv"
+	"strings"
 
 	tb "gopkg.in/tucnak/telebot.v2"
 )
 
+type userGroup int
+
+const (
+	ugSoprano userGroup = iota
+	ugContralto
+	ugTenore
+	ugBasso
+	ugCommissario
+	ugReferente
+	ugPreparatore
+)
+
 func addUser(user *tb.User) error {
 	if redisClient == nil {
 		return ErrNilPointer
 	}
-	err := redisClient.SAdd(userSet, user.ID).Err()
+	err := redisClient.SAdd(usersID, user.ID).Err()
 	if err != nil {
 		log.Printf("Error in adding user ID: %v", err)
 		return ErrRedisAddSet
@@ -22,7 +35,7 @@ func addUser(user *tb.User) error {
 		log.Printf("Error in marshalling user to json: %v", err)
 		return ErrJSONMarshall
 	}
-	err = redisClient.HSet(userHash, strconv.Itoa(user.ID), jsonUser).Err()
+	err = redisClient.HSet(usersInfo, strconv.Itoa(user.ID), jsonUser).Err()
 	if err != nil {
 		log.Printf("Error adding user info in hash: %v", err)
 		return ErrRedisAddHash
@@ -35,7 +48,7 @@ func isUser(userID int) (bool, error) {
 	if redisClient == nil {
 		return false, ErrNilPointer
 	}
-	user, err := redisClient.SIsMember(userSet, strconv.Itoa(userID)).Result()
+	user, err := redisClient.SIsMember(usersID, strconv.Itoa(userID)).Result()
 	if err != nil {
 		log.Printf("Error checking if ID is bot user: %v", err)
 		return false, ErrRedisCheckSet
@@ -47,7 +60,7 @@ func getUserInfo(userID int) (*tb.User, error) {
 	if redisClient == nil {
 		return nil, ErrNilPointer
 	}
-	user, err := redisClient.HGet(userHash, strconv.Itoa(userID)).Result()
+	user, err := redisClient.HGet(usersInfo, strconv.Itoa(userID)).Result()
 	if err != nil {
 		log.Printf("Error retriving user info from hash: %v", err)
 		return nil, ErrRedisRetrieveHash
@@ -65,7 +78,7 @@ func isAuthrizedUser(userID int) (bool, error) {
 	if redisClient == nil {
 		return false, ErrNilPointer
 	}
-	auth, err := redisClient.SIsMember(authUserSet, strconv.Itoa(userID)).Result()
+	auth, err := redisClient.SIsMember(authUsers, strconv.Itoa(userID)).Result()
 	if err != nil {
 		log.Printf("Error checking if user is authorized: %v", err)
 		return false, ErrRedisCheckSet
@@ -78,13 +91,13 @@ func authorizeUser(userID int, authorized bool) error {
 		return ErrNilPointer
 	}
 	if authorized {
-		err := redisClient.SAdd(authUserSet, strconv.Itoa(userID)).Err()
+		err := redisClient.SAdd(authUsers, strconv.Itoa(userID)).Err()
 		if err != nil {
 			log.Printf("Error adding token to set: %v", err)
 			return ErrRedisAddSet
 		}
 	} else {
-		err := redisClient.SRem(authUserSet, strconv.Itoa(userID)).Err()
+		err := redisClient.SRem(authUsers, strconv.Itoa(userID)).Err()
 		if err != nil {
 			log.Printf("Error removing token from set: %v", err)
 			return ErrRedisRemSet
@@ -92,3 +105,43 @@ func authorizeUser(userID int, authorized bool) error {
 	}
 	return nil
 }
+
+func setUserGroups(userID int, groups ...userGroup) error {
+	if redisClient == nil {
+		return ErrNilPointer
+	}
+	var csvGroups string
+	for _, group := range groups {
+		csvGroups += strconv.Itoa(int(group)) + ","
+	}
+	err := redisClient.HSet(usersGroups, strconv.Itoa(userID), csvGroups).Err()
+	if err != nil {
+		log.Printf("Error adding user groups to hash: %v", err)
+		return ErrRedisAddHash
+	}
+
+	return nil
+}
+
+func getUserGroups(userID int) ([]userGroup, error) {
+	if redisClient == nil {
+		return nil, ErrNilPointer
+	}
+
+	csvGroups, err := redisClient.HGet(usersGroups, strconv.Itoa(userID)).Result()
+	if err != nil {
+		log.Printf("Error retrieving user groups: %v", err)
+		return nil, ErrRedisRetrieveHash
+	}
+	var retGroups []userGroup
+	groups := strings.Split(csvGroups, ",")
+	for _, group := range groups {
+		intGroup, err := strconv.Atoi(group)
+		if err != nil {
+			log.Printf("Error converting user group: %v", err)
+			return nil, ErrAtoiConv
+		}
+		retGroups = append(retGroups, userGroup(intGroup))
+	}
+	return retGroups, nil
+}