refactor naming in db, add user delete, update todo
This commit is contained in:
@@ -31,7 +31,7 @@ func getUser(ctx context.Context, token string) (*User, error) {
|
||||
user, err := CacheGetUserById(userId)
|
||||
if err != nil {
|
||||
user = &User{Id: userId}
|
||||
err = DbSetUserById(ctx, user)
|
||||
err = DbUserSetById(ctx, user)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -45,7 +45,7 @@ func getGroup(ctx context.Context, groupId uint32) (*Group, error) {
|
||||
group, err := CacheGetGroup(groupId)
|
||||
if err != nil {
|
||||
group = &Group{Id: groupId}
|
||||
err = DbSetGroupById(ctx, group)
|
||||
err = DbGroupSetById(ctx, group)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -125,7 +125,7 @@ func HttpHandleNewUser(response http.ResponseWriter, request *http.Request) {
|
||||
|
||||
ctx := request.Context()
|
||||
|
||||
err = DbSaveUserWithoutGroups(ctx, newUser)
|
||||
err = DbUserSaveWithoutGroups(ctx, newUser)
|
||||
if err != nil {
|
||||
http.Error(response, "name taken", http.StatusUnauthorized)
|
||||
return
|
||||
@@ -134,6 +134,24 @@ func HttpHandleNewUser(response http.ResponseWriter, request *http.Request) {
|
||||
response.WriteHeader(http.StatusCreated)
|
||||
}
|
||||
|
||||
func HttpHandleDeleteUser(response http.ResponseWriter, request *http.Request) {
|
||||
ctx := request.Context()
|
||||
|
||||
userId, err := TokenValidateGetId(request.FormValue("token"))
|
||||
if err != nil {
|
||||
http.Error(response, "invalid token", http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
|
||||
err = DbUserDelete(ctx, userId)
|
||||
if err != nil {
|
||||
http.Error(response, "internal server error", http.StatusInternalServerError)
|
||||
}
|
||||
|
||||
CacheDeleteUser(userId)
|
||||
response.WriteHeader(http.StatusAccepted)
|
||||
}
|
||||
|
||||
func HttpHandleNewToken(response http.ResponseWriter, request *http.Request) {
|
||||
if !isMethodAllowed(&response, request) {
|
||||
return
|
||||
@@ -162,7 +180,7 @@ func HttpHandleNewToken(response http.ResponseWriter, request *http.Request) {
|
||||
if err != nil {
|
||||
user = &User{Name: username}
|
||||
|
||||
err := DbSetUserByName(ctx, user)
|
||||
err := DbUserSetByName(ctx, user)
|
||||
if err != nil {
|
||||
http.Error(response, "bad login1", http.StatusUnauthorized)
|
||||
return
|
||||
@@ -221,7 +239,7 @@ func HttpHandeGroupCreate(response http.ResponseWriter, request *http.Request) {
|
||||
group.EnableUserColors = true
|
||||
}
|
||||
|
||||
err = DbSaveGroupWithoutUsers(ctx, &group)
|
||||
err = DbGroupSaveWithoutUsers(ctx, &group)
|
||||
if err != nil {
|
||||
http.Error(response, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
@@ -241,7 +259,7 @@ func HttpHandleGroupRemove(response http.ResponseWriter, request *http.Request)
|
||||
return
|
||||
}
|
||||
|
||||
err = DbDeleteGroup(ctx, group)
|
||||
err = DbGroupDelete(ctx, group)
|
||||
if err != nil {
|
||||
http.Error(response, "internal server error", http.StatusInternalServerError)
|
||||
return
|
||||
@@ -293,7 +311,7 @@ func HttpHandleGroupAddUser(response http.ResponseWriter, request *http.Request)
|
||||
return
|
||||
}
|
||||
|
||||
err = DbAddUsersToGroup(ctx, group.Id, &ids)
|
||||
err = DbGroupAddUsers(ctx, group.Id, &ids)
|
||||
if err != nil {
|
||||
http.Error(response, "internal server error", http.StatusInternalServerError)
|
||||
return
|
||||
@@ -340,7 +358,7 @@ func HttpHandleGroupRemoveUser(response http.ResponseWriter, request *http.Reque
|
||||
return
|
||||
}
|
||||
|
||||
count, err := DbRemoveUsersFromGroup(ctx, group.Id, &ids)
|
||||
count, err := DbGroupRemoveUsers(ctx, group.Id, &ids)
|
||||
if err != nil {
|
||||
http.Error(response, "internal server error", http.StatusInternalServerError)
|
||||
return
|
||||
@@ -372,7 +390,7 @@ func HttpHandleGroupChangeColor(response http.ResponseWriter, request *http.Requ
|
||||
}
|
||||
|
||||
group.Color = color
|
||||
err = DbSetGroupColor(ctx, group)
|
||||
err = DbGroupSetColor(ctx, group)
|
||||
if err != nil {
|
||||
http.Error(response, "internal server error", http.StatusInternalServerError)
|
||||
return
|
||||
@@ -398,7 +416,7 @@ func HttpHandleGroupChangeOwner(response http.ResponseWriter, request *http.Requ
|
||||
newOwner, err := CacheGetUserByName(newOwnerName)
|
||||
if err != nil {
|
||||
newOwner = &User{Name: newOwnerName}
|
||||
err = DbSetUserByName(ctx, newOwner)
|
||||
err = DbUserSetByName(ctx, newOwner)
|
||||
if err != nil {
|
||||
http.Error(response, "user not in group", http.StatusBadRequest)
|
||||
return
|
||||
@@ -414,7 +432,7 @@ func HttpHandleGroupChangeOwner(response http.ResponseWriter, request *http.Requ
|
||||
}
|
||||
|
||||
group.OwnerId = newOwner.Id
|
||||
err = DbSetGroupOwnerId(ctx, group)
|
||||
err = DbGroupSetOwnerId(ctx, group)
|
||||
if err != nil {
|
||||
http.Error(response, "internal server error", http.StatusInternalServerError)
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user