add staging and prod group roles

openapi.yaml

@@ -121,11 +121,6 @@ paths:
         schema:
           type: string
           maxLength: 128
-      - name: DisplayNameSubstring
-        in: query
-        schema:
-          type: string
-          maxLength: 128
       - name: Creator
         in: query
         schema:

pkg/datastore/gormstore/maps.go

@@ -85,7 +85,7 @@ func (env *Maps) GetAll(ctx context.Context) ([]model.Map, error) {
 func (env *Maps) List(ctx context.Context, filters datastore.OptionalMap, page model.Page) ([]model.Map, error) {
 	var events []model.Map
 	tx := env.db.Model(&model.Map{})
-	if displayName, ok := filters.Pop("display_name_substring"); ok {
+	if displayName, ok := filters.Pop("display_name"); ok {
 		tx = tx.Where("display_name ILIKE ?", "%"+displayName.(string)+"%")
 	}
 	if err := tx.Where(filters.Map()).Offset(int((page.Number - 1) * page.Size)).Limit(int(page.Size)).Find(&events).Error; err != nil {

pkg/model/roles.go

@@ -14,20 +14,19 @@ var (
 )
 
 // StrafesNET group roles
-type GroupRole int32
+type GroupRole int64
 var (
 	// has ScriptWrite
-	RoleQuat GroupRole = 255
-	RoleItzaname GroupRole = 254
-	RoleStagingDeveloper GroupRole = 240
+	RoleAdmin GroupRole = 3022907289363790132
+	RoleStagingDeveloper GroupRole = 1755903544954609860
 	RolesAll Roles = ^RolesEmpty
 	// has SubmissionUpload
-	RoleMapAdmin GroupRole = 128
+	RoleMapAdmin GroupRole = 3407269374075634150
 	RolesMapAdmin Roles = RolesSubmissionRelease|RolesSubmissionUpload|RolesSubmissionReview|RolesMapCouncil
 	// has MapfixReview
-	RoleMapCouncil GroupRole = 64
+	RoleMapCouncil GroupRole = 607067793768903966
 	RolesMapCouncil Roles = RolesMapfixReview|RolesMapfixUpload|RolesMapAccess
 	// access to downloading maps
-	RoleMapAccess GroupRole = 32
+	RoleMapAccess GroupRole = 4002786327079647416
 	RolesMapAccess Roles = RolesMapDownload
 )

pkg/service/maps.go

@@ -67,9 +67,6 @@ func NewMapFilter(
 func (update MapFilter) SetDisplayName(display_name string) {
 	datastore.OptionalMap(update).Add("display_name", display_name)
 }
-func (update MapFilter) SetDisplayNameSubstring(display_name string) {
-	datastore.OptionalMap(update).Add("display_name_substring", display_name)
-}
 func (update MapFilter) SetCreator(creator string) {
 	datastore.OptionalMap(update).Add("creator", creator)
 }

pkg/web_api/maps.go

@@ -19,8 +19,6 @@ func (svc *Service) ListMaps(ctx context.Context, params api.ListMapsParams) ([]
 
 	if display_name, display_name_ok := params.DisplayName.Get(); display_name_ok{
 		filter.SetDisplayName(display_name)
-	}else if display_name_substring, display_name_substring_ok := params.DisplayNameSubstring.Get(); display_name_substring_ok{
-		filter.SetDisplayNameSubstring(display_name_substring)
 	}
 	if creator, creator_ok := params.Creator.Get(); creator_ok{
 		filter.SetCreator(creator)

pkg/web_api/security.go

@@ -79,7 +79,7 @@ func (usr UserInfoHandle) GetRoles() (model.Roles, error) {
 	rolesBitflag := model.RolesEmpty;
 	for _, r := range roles.Roles {
 		switch model.GroupRole(r.Rank){
-		case model.RoleQuat, model.RoleItzaname, model.RoleStagingDeveloper:
+		case model.RoleAdmin, model.RoleStagingDeveloper:
 		rolesBitflag|=model.RolesAll
 		case model.RoleMapAdmin:
 		rolesBitflag|=model.RolesMapAdmin