refactor db functions
This commit is contained in:
@@ -31,8 +31,13 @@ func getUser(ctx context.Context, token string) (*User, error) {
|
||||
user, err := CacheGetUserById(userId)
|
||||
if err != nil {
|
||||
user = &User{Id: userId}
|
||||
err = DbUserSetById(ctx, user)
|
||||
if err != nil {
|
||||
if err = DbGetUserById(ctx, user); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err = DbGetUserGroups(ctx, user); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err = DbGetUserConnections(ctx, user); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
CacheSaveUser(user)
|
||||
@@ -45,8 +50,10 @@ func getGroup(ctx context.Context, groupId uint32) (*Group, error) {
|
||||
group, err := CacheGetGroup(groupId)
|
||||
if err != nil {
|
||||
group = &Group{Id: groupId}
|
||||
err = DbGroupSetById(ctx, group)
|
||||
if err != nil {
|
||||
if err = DbGetGroupById(ctx, group); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err = DbGetGroupMembers(ctx, group); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
CacheSaveGroup(group)
|
||||
@@ -125,7 +132,7 @@ func HttpHandleUserNew(response http.ResponseWriter, request *http.Request) {
|
||||
|
||||
ctx := request.Context()
|
||||
|
||||
err = DbUserSaveWithoutGroupsConnections(ctx, newUser)
|
||||
err = DbUserSave(ctx, newUser)
|
||||
if err != nil {
|
||||
http.Error(response, "name taken", http.StatusUnauthorized)
|
||||
return
|
||||
@@ -236,9 +243,15 @@ func HttpHandleNewToken(response http.ResponseWriter, request *http.Request) {
|
||||
user, err = CacheGetUserByName(username)
|
||||
if err != nil {
|
||||
user = &User{Name: username}
|
||||
|
||||
err := DbUserSetByName(ctx, user)
|
||||
if err != nil {
|
||||
if err = DbGetUserByName(ctx, user); err != nil {
|
||||
http.Error(response, "bad login1", http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
if err = DbGetUserGroups(ctx, user); err != nil {
|
||||
http.Error(response, "bad login1", http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
if err = DbGetUserConnections(ctx, user); err != nil {
|
||||
http.Error(response, "bad login1", http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
@@ -473,7 +486,7 @@ func HttpHandleGroupChangeOwner(response http.ResponseWriter, request *http.Requ
|
||||
newOwner, err := CacheGetUserByName(newOwnerName)
|
||||
if err != nil {
|
||||
newOwner = &User{Name: newOwnerName}
|
||||
err = DbUserSetByName(ctx, newOwner)
|
||||
err = DbGetUserByName(ctx, newOwner)
|
||||
if err != nil {
|
||||
http.Error(response, "user not in group", http.StatusBadRequest)
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user