Change /groups/{group id}/users route

controller/usergroups/update.go

@@ -0,0 +1,86 @@
+package usergroups
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strconv"
+
+	"github.com/go-chi/chi/v5"
+	"github.com/sirupsen/logrus"
+	"github.com/source-academy/stories-backend/controller"
+	"github.com/source-academy/stories-backend/internal/auth"
+	"github.com/source-academy/stories-backend/internal/database"
+	apierrors "github.com/source-academy/stories-backend/internal/errors"
+	userpermissiongroups "github.com/source-academy/stories-backend/internal/permissiongroups/users"
+	"github.com/source-academy/stories-backend/model"
+	usergroupparams "github.com/source-academy/stories-backend/params/usergroups"
+	userviews "github.com/source-academy/stories-backend/view/users"
+)
+
+func HandleUpdateRole(w http.ResponseWriter, r *http.Request) error {
+	userIDStr := chi.URLParam(r, "userID")
+	userID, err := strconv.Atoi(userIDStr)
+	if err != nil {
+		return apierrors.ClientBadRequestError{
+			Message: fmt.Sprintf("Invalid userID: %v", err),
+		}
+	}
+
+	err = auth.CheckPermissions(r, userpermissiongroups.Update(uint(userID)))
+	if err != nil {
+		logrus.Error(err)
+		return apierrors.ClientForbiddenError{
+			Message: fmt.Sprintf("Error batch creating users: %v", err),
+		}
+	}
+
+	var params usergroupparams.UpdateRole
+	if err := json.NewDecoder(r.Body).Decode(&params); err != nil {
+		e, ok := err.(*json.UnmarshalTypeError)
+		if !ok {
+			logrus.Error(err)
+			return apierrors.ClientBadRequestError{
+				Message: fmt.Sprintf("Bad JSON parsing: %v", err),
+			}
+		}
+
+		// TODO: Investigate if we should use errors.Wrap instead
+		return apierrors.ClientUnprocessableEntityError{
+			Message: fmt.Sprintf("Invalid JSON format: %s should be a %s.", e.Field, e.Type),
+		}
+	}
+
+	// TODO: add validation for updating user?
+	// err = params.Validate()
+	// if err != nil {
+	// 	logrus.Error(err)
+	// 	return apierrors.ClientUnprocessableEntityError{
+	// 		Message: fmt.Sprintf("JSON validation failed: %v", err),
+	// 	}
+	// }
+
+	userGroupModel := *params.ToModel()
+
+	// Get DB instance
+	db, err := database.GetDBFrom(r)
+	if err != nil {
+		logrus.Error(err)
+		return err
+	}
+
+	userGroup, err := model.UpdateUserGroupByUserID(db, uint(userID), &userGroupModel)
+	if err != nil {
+		logrus.Error(err)
+		return err
+	}
+
+	user, err := model.GetUserByID(db, userID)
+	if err != nil {
+		logrus.Error(err)
+		return err
+	}
+
+	controller.EncodeJSONResponse(w, userviews.SummaryFrom(user, userGroup))
+	return nil
+}

controller/users/list.go

@@ -8,8 +8,10 @@ import (
 	"github.com/source-academy/stories-backend/controller"
 	"github.com/source-academy/stories-backend/internal/auth"
 	"github.com/source-academy/stories-backend/internal/database"
+	groupenums "github.com/source-academy/stories-backend/internal/enums/groups"
 	apierrors "github.com/source-academy/stories-backend/internal/errors"
 	userpermissiongroups "github.com/source-academy/stories-backend/internal/permissiongroups/users"
+	"github.com/source-academy/stories-backend/internal/usergroups"
 	"github.com/source-academy/stories-backend/model"
 	userviews "github.com/source-academy/stories-backend/view/users"
 )
@@ -36,6 +38,21 @@ func HandleList(w http.ResponseWriter, r *http.Request) error {
 		return err
 	}
 
-	controller.EncodeJSONResponse(w, userviews.ListFrom(users))
+	groupId, err := usergroups.GetGroupIDFrom(r)
+	if err != nil {
+		logrus.Error(err)
+		return err
+	}
+
+	roles := make([]groupenums.Role, len(users))
+	for i, user := range users {
+		roles[i], err = model.GetUserRoleByID(db, user.ID, *groupId)
+		if err != nil {
+			logrus.Error(err)
+			return err
+		}
+	}
+
+	controller.EncodeJSONResponse(w, userviews.ListFrom(users, roles))
 	return nil
 }

internal/auth/middleware.go

@@ -28,7 +28,10 @@ func MakeMiddlewareFrom(conf *config.Config) func(http.Handler) http.Handler {
 	// Skip auth in development mode
 	if conf.Environment == envutils.ENV_DEVELOPMENT {
 		return func(next http.Handler) http.Handler {
-			return next
+			return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				r = injectUserIDToContext(r, 1)
+				next.ServeHTTP(w, r)
+			})
 		}
 	}
 

internal/router/router.go

@@ -64,6 +64,7 @@ func Setup(config *config.Config, injectMiddleWares []func(http.Handler) http.Ha
 			r.Route("/users", func(r chi.Router) {
 				r.Get("/", handleAPIError(users.HandleList))
 				r.Get("/{userID}", handleAPIError(users.HandleRead))
+				r.Put("/{userID}/role", handleAPIError(usergroupscontroller.HandleUpdateRole))
 				r.Delete("/{userID}", handleAPIError(users.HandleDelete))
 				r.Post("/", handleAPIError(users.HandleCreate))
 				r.Post("/batch", handleAPIError(usergroupscontroller.HandleBatchCreate))

model/usergroups.go

@@ -38,3 +38,24 @@ func CreateUserGroup(db *gorm.DB, userGroup *UserGroup) error {
 	}
 	return nil
 }
+
+func GetUserRoleByID(db *gorm.DB, userID uint, groupID uint) (groupenums.Role, error) {
+	userGroup, err := GetUserGroupByID(db, userID, groupID)
+	if err != nil {
+		return userGroup.Role, database.HandleDBError(err, "userGroup")
+	}
+	return userGroup.Role, nil
+}
+
+func UpdateUserGroupByUserID(db *gorm.DB, userID uint, userGroup *UserGroup) (UserGroup, error) {
+	err := db.Model(&userGroup).
+		Preload(clause.Associations).
+		Where("id = ?", userID).
+		Updates(&userGroup).
+		Error
+
+	if err != nil {
+		return *userGroup, database.HandleDBError(err, "userGroup")
+	}
+	return *userGroup, nil
+}

model/users.go

@@ -73,5 +73,19 @@ func DeleteUser(db *gorm.DB, userID int) (User, error) {
 	if err != nil {
 		return user, database.HandleDBError(err, "user")
 	}
+
 	return user, nil
 }
+
+func UpdateUser(db *gorm.DB, userID int, user *User) (User, error) {
+	err := db.
+		Model(&user).
+		Where("id = ?", userID).
+		First(&user).
+		Updates(&user).
+		Error
+	if err != nil {
+		return *user, database.HandleDBError(err, "user")
+	}
+	return *user, nil
+}

params/usergroups/update.go

@@ -0,0 +1,16 @@
+package usergroupparams
+
+import (
+	groupenums "github.com/source-academy/stories-backend/internal/enums/groups"
+	"github.com/source-academy/stories-backend/model"
+)
+
+type UpdateRole struct {
+	Role groupenums.Role `json:"role"`
+}
+
+func (params *UpdateRole) ToModel() *model.UserGroup {
+	return &model.UserGroup{
+		Role: params.Role,
+	}
+}

view/users/list.go

@@ -1,22 +1,29 @@
 package userviews
 
-import "github.com/source-academy/stories-backend/model"
+import (
+	groupenums "github.com/source-academy/stories-backend/internal/enums/groups"
+	"github.com/source-academy/stories-backend/model"
+)
 
 type ListView struct {
-	Name          string `json:"name"`
-	Username      string `json:"username"`
-	LoginProvider string `json:"provider"`
+	ID            uint            `json:"id"`
+	Name          string          `json:"name"`
+	Username      string          `json:"username"`
+	LoginProvider string          `json:"provider"`
+	Role          groupenums.Role `json:"role"`
 }
 
-func ListFrom(users []model.User) []ListView {
+func ListFrom(users []model.User, roles []groupenums.Role) []ListView {
 	usersListView := make([]ListView, len(users))
-	for i, user := range users {
+	for i := 0; i < len(users); i++ {
 		usersListView[i] = ListView{
 			// Unlike other views, we do not fallback an empty name to
 			// the username for the users' list view.
-			Name:          user.FullName,
-			Username:      user.Username,
-			LoginProvider: user.LoginProvider.ToString(),
+			ID:            users[i].ID,
+			Name:          users[i].FullName,
+			Username:      users[i].Username,
+			LoginProvider: users[i].LoginProvider.ToString(),
+			Role:          roles[i],
 		}
 	}
 	return usersListView