Allow professors to request all nodegroups

Author: asp345

controller/workspace.go

@@ -3,7 +3,6 @@ package controller
 import (
 	"log/slog"
 	"net/http"
-	"slices"
 	"strings"
 
 	"github.com/labstack/echo/v4"
@@ -81,7 +80,7 @@ func checkNodegroups(user *auth.User, nodegroup string) error {
 	if !model.Nodegroup(nodegroup).Valid() {
 		return echo.ErrBadRequest
 	}
-	if slices.Contains(user.Groups, nodegroup) {
+	if model.Nodegroup(nodegroup).AvailableToGroups(user.Groups) {
 		return nil
 	}
 	return echo.ErrForbidden

controller/workspace_test.go

@@ -0,0 +1,54 @@
+package controller
+
+import (
+	"testing"
+
+	"github.com/labstack/echo/v4"
+
+	"github.com/bacchus-snu/sgs/model"
+	"github.com/bacchus-snu/sgs/pkg/auth"
+)
+
+func TestCheckNodegroups(t *testing.T) {
+	tests := map[string]struct {
+		groups    []string
+		nodegroup string
+		wantErr   error
+	}{
+		"undergraduate user can request undergraduate": {
+			groups:    []string{string(model.NodegroupUndergraduate)},
+			nodegroup: string(model.NodegroupUndergraduate),
+		},
+		"graduate user can request graduate": {
+			groups:    []string{string(model.NodegroupGraduate)},
+			nodegroup: string(model.NodegroupGraduate),
+		},
+		"professor user can request undergraduate": {
+			groups:    []string{model.UserGroupProfessor},
+			nodegroup: string(model.NodegroupUndergraduate),
+		},
+		"professor user can request graduate": {
+			groups:    []string{model.UserGroupProfessor},
+			nodegroup: string(model.NodegroupGraduate),
+		},
+		"undergraduate user cannot request graduate": {
+			groups:    []string{string(model.NodegroupUndergraduate)},
+			nodegroup: string(model.NodegroupGraduate),
+			wantErr:   echo.ErrForbidden,
+		},
+		"invalid nodegroup is rejected": {
+			groups:    []string{model.UserGroupProfessor},
+			nodegroup: "invalid",
+			wantErr:   echo.ErrBadRequest,
+		},
+	}
+
+	for name, tt := range tests {
+		t.Run(name, func(t *testing.T) {
+			user := &auth.User{Groups: tt.groups}
+			if gotErr := checkNodegroups(user, tt.nodegroup); gotErr != tt.wantErr {
+				t.Fatalf("checkNodegroups() = %v; want %v", gotErr, tt.wantErr)
+			}
+		})
+	}
+}

docs/en/src/usage/request-workspace.md

@@ -4,7 +4,7 @@
 [sgs-request]: https://sgs.snucse.org/request
 
 > Before continuing, you must already have a [SNUCSE ID][id] account registered
-> in either the `undergraduate` or `graduate` groups.
+> in the `undergraduate`, `graduate`, or `professor` group.
 
 To request a workspace, fill out the Workspace request form on the SGS
 [workspace management page][sgs-request].

docs/ko/src/usage/request-workspace.md

@@ -3,7 +3,7 @@
 [id]: https://id.snucse.org
 [sgs-request]: https://sgs.snucse.org/request
 
-> 시작하기 전에 `undergraduate` 또는 `graduate` 그룹에 등록된 [스누씨 계정][id]이 필요합니다.
+> 시작하기 전에 `undergraduate`, `graduate`, 또는 `professor` 그룹에 등록된 [스누씨 계정][id]이 필요합니다.
 
 워크스페이스를 신청하려면 SGS [워크스페이스 관리 페이지][sgs-request]에서 신청 양식을 작성하세요.
 

model/workspace.go

@@ -2,6 +2,7 @@ package model
 
 import (
 	"context"
+	"slices"
 )
 
 // WorkspaceUser represents a user in a workspace with their acceptance status.
@@ -119,13 +120,13 @@ func (ws WorkspaceUpdate) Valid() bool {
 type Resource string
 
 const (
-	ResCPURequest          Resource = "requests.cpu"
-	ResCPULimit            Resource = "limits.cpu"
-	ResMemoryRequest       Resource = "requests.memory"
-	ResMemoryLimit         Resource = "limits.memory"
-	ResStorageRequest      Resource = "requests.storage"
-	ResGPURequest          Resource = "requests.nvidia.com/gpu"
-	ResGPUMemoryRequest    Resource = "requests.nvidia.com/gpumem"
+	ResCPURequest       Resource = "requests.cpu"
+	ResCPULimit         Resource = "limits.cpu"
+	ResMemoryRequest    Resource = "requests.memory"
+	ResMemoryLimit      Resource = "limits.memory"
+	ResStorageRequest   Resource = "requests.storage"
+	ResGPURequest       Resource = "requests.nvidia.com/gpu"
+	ResGPUMemoryRequest Resource = "requests.nvidia.com/gpumem"
 )
 
 var Resources = []Resource{
@@ -149,6 +150,8 @@ type Nodegroup string
 const (
 	NodegroupUndergraduate Nodegroup = "undergraduate"
 	NodegroupGraduate      Nodegroup = "graduate"
+
+	UserGroupProfessor = "professor"
 )
 
 var Nodegroups = []Nodegroup{
@@ -164,6 +167,13 @@ func (n Nodegroup) Valid() bool {
 	return false
 }
 
+func (n Nodegroup) AvailableToGroups(groups []string) bool {
+	if !n.Valid() {
+		return false
+	}
+	return slices.Contains(groups, string(n)) || slices.Contains(groups, UserGroupProfessor)
+}
+
 type WorkspaceService interface {
 	// Accept user-provided fields only.
 	CreateWorkspace(ctx context.Context, ws *Workspace, creatorEmail string) (*Workspace, error)

view/request.templ

@@ -2,7 +2,6 @@ package view
 
 import (
 	"github.com/bacchus-snu/sgs/model"
-	"slices"
 )
 
 const reasonPlaceholder = `Protein Language Model을 활용해 Protein의 특성을 예측하는 연구를 진행하고 있습니다. GPU 1장에서 모델 fine-tuning과 evaulation을 진행하고자 합니다.
@@ -18,7 +17,7 @@ templ PageRequestForm() {
 				<select id="nodegroup" name="nodegroup" required>
 					<option value="">Select a nodegroup</option>
 					for _, ng := range model.Nodegroups {
-						if slices.Contains(ctxUser(ctx).Groups, string(ng)) {
+						if ng.AvailableToGroups(ctxUser(ctx).Groups) {
 							<option value={ string(ng) }>{ string(ng) }</option>
 						}
 					}

view/request_templ.go

@@ -160,7 +160,7 @@ templ workspaceDetails(ws, newWS *model.Workspace) {
 			<select id="nodegroup" name="nodegroup" required>
 				<option value="">Select a nodegroup</option>
 				for _, ng := range model.Nodegroups {
-					if user := ctxUser(ctx); user.IsAdmin() || slices.Contains(user.Groups, string(ng)) {
+					if user := ctxUser(ctx); user.IsAdmin() || ng.AvailableToGroups(user.Groups) {
 						<option value={ string(ng) } selected?={ ng == newWS.Nodegroup }>{ string(ng) }</option>
 					}
 				}