removed redundant auth level | reuse models.UserRole

backend/src/models/user.go

@@ -4,7 +4,7 @@ import "github.com/google/uuid"
 
 type UserRole string
 
-const (
+var (
 	Super   UserRole = "super"
 	Student UserRole = "student"
 )

backend/tests/api/helpers.go

@@ -27,14 +27,6 @@ import (
 	"gorm.io/gorm"
 )
 
-type AuthLevel string
-
-var (
-	SuperUser   AuthLevel = "super_user"
-	StudentUser AuthLevel = "sample_user"
-	LoggedOut   AuthLevel = "logged_out"
-)
-
 type TestUser struct {
 	Email        string
 	Password     string
@@ -76,8 +68,8 @@ func SampleStudentJSONFactory(sampleStudent models.User, rawPassword string) *ma
 	}
 }
 
-func (app *TestApp) Auth(level AuthLevel) {
-	if level == SuperUser {
+func (app *TestApp) Auth(role models.UserRole) {
+	if role == models.Super {
 		superUser, superUserErr := database.SuperUser(app.Settings.SuperUser)
 		if superUserErr != nil {
 			panic(superUserErr)
@@ -119,7 +111,7 @@ func (app *TestApp) Auth(level AuthLevel) {
 			AccessToken:  accessToken,
 			RefreshToken: refreshToken,
 		}
-	} else if level == StudentUser {
+	} else if role == models.Student {
 		studentUser, rawPassword := SampleStudentFactory()
 
 		_, err := app.Send(TestRequest{
@@ -275,11 +267,11 @@ func (eaa ExistingAppAssert) Close() {
 }
 
 type TestRequest struct {
-	Method    string
-	Path      string
-	Body      *map[string]interface{}
-	Headers   *map[string]string
-	AuthLevel *AuthLevel
+	Method  string
+	Path    string
+	Body    *map[string]interface{}
+	Headers *map[string]string
+	Role    *models.UserRole
 }
 
 func (app TestApp) Send(request TestRequest) (*http.Response, error) {
@@ -331,8 +323,8 @@ func (request TestRequest) Test(t *testing.T, existingAppAssert *ExistingAppAsse
 	if existingAppAssert == nil {
 		app, assert := InitTest(t)
 
-		if request.AuthLevel != nil {
-			app.Auth(*request.AuthLevel)
+		if request.Role != nil {
+			app.Auth(*request.Role)
 		}
 		existingAppAssert = &ExistingAppAssert{
 			App:    app,

backend/tests/api/user_test.go

@@ -21,9 +21,9 @@ import (
 
 func TestGetUsersWorksForSuper(t *testing.T) {
 	TestRequest{
-		Method:    fiber.MethodGet,
-		Path:      "/api/v1/users/",
-		AuthLevel: &SuperUser,
+		Method: fiber.MethodGet,
+		Path:   "/api/v1/users/",
+		Role:   &models.Super,
 	}.TestOnStatusAndDB(t, nil,
 		DBTesterWithStatus{
 			Status: fiber.StatusOK,
@@ -61,9 +61,9 @@ func TestGetUsersWorksForSuper(t *testing.T) {
 
 func TestGetUsersFailsForStudent(t *testing.T) {
 	TestRequest{
-		Method:    fiber.MethodGet,
-		Path:      "/api/v1/users/",
-		AuthLevel: &StudentUser,
+		Method: fiber.MethodGet,
+		Path:   "/api/v1/users/",
+		Role:   &models.Student,
 	}.TestOnError(t, nil, errors.Unauthorized).Close()
 }