StrafesNET/maps-service
6
Fork 0
Code Issues17 Pull Requests1 Packages Projects Releases Wiki Activity

submissions: rename SubmissionPublish to SubmissionUpload

Browse Source
This commit is contained in:
Quaternions 2025-03-26 11:59:42 -07:00
parent 7d57d1ac4d
commit 87fd7adb93
Signed by: Quaternions
GPG Key ID: D0DF5964F79AC131
2 changed files with 13 additions and 13 deletions

12
pkg/service/security.go

@ -18,7 +18,7 @@ var (
type Roles int32
var (
RolesScriptWrite Roles = 8
RolesSubmissionPublish Roles = 4
RolesSubmissionUpload Roles = 4
RolesSubmissionReview Roles = 2
RolesMapDownload Roles = 1
RolesEmpty Roles = 0
@ -31,10 +31,10 @@ var (
RoleQuat GroupRole = 255
RoleItzaname GroupRole = 254
RoleStagingDeveloper GroupRole = 240
RolesAll Roles = RolesScriptWrite|RolesSubmissionPublish|RolesSubmissionReview|RolesMapDownload
// has SubmissionPublish
RolesAll Roles = RolesScriptWrite|RolesSubmissionUpload|RolesSubmissionReview|RolesMapDownload
// has SubmissionUpload
RoleMapAdmin GroupRole = 128
RolesMapAdmin Roles = RolesSubmissionPublish|RolesSubmissionReview|RolesMapDownload
RolesMapAdmin Roles = RolesSubmissionUpload|RolesSubmissionReview|RolesMapDownload
// has SubmissionReview
RoleMapCouncil GroupRole = 64
RolesMapCouncil Roles = RolesSubmissionReview|RolesMapDownload
@ -128,8 +128,8 @@ func (usr UserInfoHandle) GetRoles() (Roles, error) {
// RoleThumbnail
// RoleMapDownload
func (usr UserInfoHandle) HasRoleSubmissionPublish() (bool, error) {
return usr.hasRoles(RolesSubmissionPublish)
func (usr UserInfoHandle) HasRoleSubmissionUpload() (bool, error) {
return usr.hasRoles(RolesSubmissionUpload)
}
func (usr UserInfoHandle) HasRoleSubmissionReview() (bool, error) {
return usr.hasRoles(RolesSubmissionReview)

14
pkg/service/submissions.go

@ -41,7 +41,7 @@ var (
ErrAcceptOwnSubmission = fmt.Errorf("%w: You cannot accept your own submission as the submitter", ErrPermissionDenied)
ErrDelayReset = errors.New("Please give the validator at least 10 seconds to operate before attempting to reset the status")
ErrPermissionDeniedNotSubmitter = fmt.Errorf("%w: You must be the submitter to perform this action", ErrPermissionDenied)
ErrPermissionDeniedNeedSubmissionPublish = fmt.Errorf("%w: Need Role SubmissionPublish", ErrPermissionDenied)
ErrPermissionDeniedNeedSubmissionUpload = fmt.Errorf("%w: Need Role SubmissionUpload", ErrPermissionDenied)
ErrPermissionDeniedNeedRoleSubmissionReview = fmt.Errorf("%w: Need Role SubmissionReview", ErrPermissionDenied)
ErrPermissionDeniedNeedRoleMapDownload = fmt.Errorf("%w: Need Role MapDownload", ErrPermissionDenied)
ErrPermissionDeniedNeedRoleScriptWrite = fmt.Errorf("%w: Need Role ScriptWrite", ErrPermissionDenied)
@ -395,13 +395,13 @@ func (svc *Service) ActionSubmissionTriggerUpload(ctx context.Context, params ap
return ErrUserInfo
}
has_role, err := userInfo.HasRoleSubmissionPublish()
has_role, err := userInfo.HasRoleSubmissionUpload()
if err != nil {
return err
}
// check if caller has required role
if !has_role {
return ErrPermissionDeniedNeedSubmissionPublish
return ErrPermissionDeniedNeedSubmissionUpload
}
// transaction
@ -460,13 +460,13 @@ func (svc *Service) ActionSubmissionValidated(ctx context.Context, params api.Ac
return ErrUserInfo
}
has_role, err := userInfo.HasRoleSubmissionPublish()
has_role, err := userInfo.HasRoleSubmissionUpload()
if err != nil {
return err
}
// check if caller has required role
if !has_role {
return ErrPermissionDeniedNeedSubmissionPublish
return ErrPermissionDeniedNeedSubmissionUpload
}
// check when submission was updated
@ -593,13 +593,13 @@ func (svc *Service) ReleaseSubmissions(ctx context.Context, request []api.Releas
return ErrUserInfo
}
has_role, err := userInfo.HasRoleSubmissionPublish()
has_role, err := userInfo.HasRoleSubmissionUpload()
if err != nil {
return err
}
// check if caller has required role
if !has_role {
return ErrPermissionDeniedNeedSubmissionPublish
return ErrPermissionDeniedNeedSubmissionUpload
}
idList := make([]int64, len(request))