StrafesNET/maps-service
5
Fork 0
Code Issues15 Pull Requests Packages Projects Releases Wiki Activity

submissions: remove StatusMessage

Browse Source
This commit is contained in:
Quaternions 2025-04-09 20:09:11 -07:00
parent f25be9dc4e
commit e748290e82
Signed by: Quaternions
GPG Key ID: D0DF5964F79AC131
6 changed files with 0 additions and 12 deletions

1
pkg/model/mapfix.go

@ -39,5 +39,4 @@ type Mapfix struct {
Completed bool // Has this version of the map been completed at least once on maptest Completed bool // Has this version of the map been completed at least once on maptest
TargetAssetID uint64 // where to upload map fix. if the TargetAssetID is 0, it's a new map. TargetAssetID uint64 // where to upload map fix. if the TargetAssetID is 0, it's a new map.
StatusID MapfixStatus StatusID MapfixStatus
StatusMessage string
} }

1
pkg/model/submission.go

@ -40,5 +40,4 @@ type Submission struct {
Completed bool // Has this version of the map been completed at least once on maptest Completed bool // Has this version of the map been completed at least once on maptest
UploadedAssetID uint64 // where to upload map fix. if the TargetAssetID is 0, it's a new map. UploadedAssetID uint64 // where to upload map fix. if the TargetAssetID is 0, it's a new map.
StatusID SubmissionStatus StatusID SubmissionStatus
StatusMessage string
} }

3
pkg/service/mapfixes.go

@ -154,7 +154,6 @@ func (svc *Service) GetMapfix(ctx context.Context, params api.GetMapfixParams) (
Completed: mapfix.Completed, Completed: mapfix.Completed,
TargetAssetID: int64(mapfix.TargetAssetID), TargetAssetID: int64(mapfix.TargetAssetID),
StatusID: int32(mapfix.StatusID), StatusID: int32(mapfix.StatusID),
StatusMessage: mapfix.StatusMessage,
}, nil }, nil
} }
@ -573,7 +572,6 @@ func (svc *Service) ActionMapfixResetSubmitting(ctx context.Context, params api.
target_status := model.MapfixStatusUnderConstruction target_status := model.MapfixStatusUnderConstruction
smap := datastore.Optional() smap := datastore.Optional()
smap.Add("status_id", target_status) smap.Add("status_id", target_status)
smap.Add("status_message", "Manually forced reset")
err = svc.DB.Mapfixes().IfStatusThenUpdate(ctx, params.MapfixID, []model.MapfixStatus{model.MapfixStatusSubmitting}, smap) err = svc.DB.Mapfixes().IfStatusThenUpdate(ctx, params.MapfixID, []model.MapfixStatus{model.MapfixStatusSubmitting}, smap)
if err != nil { if err != nil {
return err return err
@ -975,7 +973,6 @@ func (svc *Service) ActionMapfixAccepted(ctx context.Context, params api.ActionM
target_status := model.MapfixStatusAcceptedUnvalidated target_status := model.MapfixStatusAcceptedUnvalidated
smap := datastore.Optional() smap := datastore.Optional()
smap.Add("status_id", target_status) smap.Add("status_id", target_status)
smap.Add("status_message", "Manually forced reset")
err = svc.DB.Mapfixes().IfStatusThenUpdate(ctx, params.MapfixID, []model.MapfixStatus{model.MapfixStatusValidating}, smap) err = svc.DB.Mapfixes().IfStatusThenUpdate(ctx, params.MapfixID, []model.MapfixStatus{model.MapfixStatusValidating}, smap)
if err != nil { if err != nil {
return err return err

3
pkg/service/submissions.go

@ -143,7 +143,6 @@ func (svc *Service) GetSubmission(ctx context.Context, params api.GetSubmissionP
Completed: submission.Completed, Completed: submission.Completed,
UploadedAssetID: api.NewOptInt64(int64(submission.UploadedAssetID)), UploadedAssetID: api.NewOptInt64(int64(submission.UploadedAssetID)),
StatusID: int32(submission.StatusID), StatusID: int32(submission.StatusID),
StatusMessage: submission.StatusMessage,
}, nil }, nil
} }
@ -594,7 +593,6 @@ func (svc *Service) ActionSubmissionResetSubmitting(ctx context.Context, params
target_status := model.SubmissionStatusUnderConstruction target_status := model.SubmissionStatusUnderConstruction
smap := datastore.Optional() smap := datastore.Optional()
smap.Add("status_id", target_status) smap.Add("status_id", target_status)
smap.Add("status_message", "Manually forced reset")
err = svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.SubmissionStatus{model.SubmissionStatusSubmitting}, smap) err = svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.SubmissionStatus{model.SubmissionStatusSubmitting}, smap)
if err != nil { if err != nil {
return err return err
@ -986,7 +984,6 @@ func (svc *Service) ActionSubmissionAccepted(ctx context.Context, params api.Act
target_status := model.SubmissionStatusAcceptedUnvalidated target_status := model.SubmissionStatusAcceptedUnvalidated
smap := datastore.Optional() smap := datastore.Optional()
smap.Add("status_id", target_status) smap.Add("status_id", target_status)
smap.Add("status_message", "Manually forced reset")
err = svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.SubmissionStatus{model.SubmissionStatusValidating}, smap) err = svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.SubmissionStatus{model.SubmissionStatusValidating}, smap)
if err != nil { if err != nil {
return err return err

2
pkg/service_internal/mapfixes.go

@ -124,7 +124,6 @@ func (svc *Service) ActionMapfixRequestChanges(ctx context.Context, params inter
target_status := model.MapfixStatusChangesRequested target_status := model.MapfixStatusChangesRequested
smap := datastore.Optional() smap := datastore.Optional()
smap.Add("status_id", target_status) smap.Add("status_id", target_status)
smap.Add("status_message", params.StatusMessage)
err := svc.DB.Mapfixes().IfStatusThenUpdate(ctx, params.MapfixID, []model.MapfixStatus{model.MapfixStatusSubmitting}, smap) err := svc.DB.Mapfixes().IfStatusThenUpdate(ctx, params.MapfixID, []model.MapfixStatus{model.MapfixStatusSubmitting}, smap)
if err != nil { if err != nil {
return err return err
@ -176,7 +175,6 @@ func (svc *Service) ActionMapfixAccepted(ctx context.Context, params internal.Ac
target_status := model.MapfixStatusAcceptedUnvalidated target_status := model.MapfixStatusAcceptedUnvalidated
smap := datastore.Optional() smap := datastore.Optional()
smap.Add("status_id", target_status) smap.Add("status_id", target_status)
smap.Add("status_message", params.StatusMessage)
err := svc.DB.Mapfixes().IfStatusThenUpdate(ctx, params.MapfixID, []model.MapfixStatus{model.MapfixStatusValidating}, smap) err := svc.DB.Mapfixes().IfStatusThenUpdate(ctx, params.MapfixID, []model.MapfixStatus{model.MapfixStatusValidating}, smap)
if err != nil { if err != nil {
return err return err

2
pkg/service_internal/submissions.go

@ -123,7 +123,6 @@ func (svc *Service) ActionSubmissionRequestChanges(ctx context.Context, params i
target_status := model.SubmissionStatusChangesRequested target_status := model.SubmissionStatusChangesRequested
smap := datastore.Optional() smap := datastore.Optional()
smap.Add("status_id", target_status) smap.Add("status_id", target_status)
smap.Add("status_message", params.StatusMessage)
err := svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.SubmissionStatus{model.SubmissionStatusSubmitting}, smap) err := svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.SubmissionStatus{model.SubmissionStatusSubmitting}, smap)
if err != nil { if err != nil {
return err return err
@ -202,7 +201,6 @@ func (svc *Service) ActionSubmissionAccepted(ctx context.Context, params interna
target_status := model.SubmissionStatusAcceptedUnvalidated target_status := model.SubmissionStatusAcceptedUnvalidated
smap := datastore.Optional() smap := datastore.Optional()
smap.Add("status_id", target_status) smap.Add("status_id", target_status)
smap.Add("status_message", params.StatusMessage)
err := svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.SubmissionStatus{model.SubmissionStatusValidating}, smap) err := svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.SubmissionStatus{model.SubmissionStatusValidating}, smap)
if err != nil { if err != nil {
return err return err