diff --git a/pkg/model/mapfix.go b/pkg/model/mapfix.go index 6c9d9a7..a296359 100644 --- a/pkg/model/mapfix.go +++ b/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 TargetAssetID uint64 // where to upload map fix. if the TargetAssetID is 0, it's a new map. StatusID MapfixStatus - StatusMessage string } diff --git a/pkg/model/submission.go b/pkg/model/submission.go index 8001697..4840e5e 100644 --- a/pkg/model/submission.go +++ b/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 UploadedAssetID uint64 // where to upload map fix. if the TargetAssetID is 0, it's a new map. StatusID SubmissionStatus - StatusMessage string } diff --git a/pkg/service/mapfixes.go b/pkg/service/mapfixes.go index 20529fd..0d37705 100644 --- a/pkg/service/mapfixes.go +++ b/pkg/service/mapfixes.go @@ -154,7 +154,6 @@ func (svc *Service) GetMapfix(ctx context.Context, params api.GetMapfixParams) ( Completed: mapfix.Completed, TargetAssetID: int64(mapfix.TargetAssetID), StatusID: int32(mapfix.StatusID), - StatusMessage: mapfix.StatusMessage, }, nil } @@ -573,7 +572,6 @@ func (svc *Service) ActionMapfixResetSubmitting(ctx context.Context, params api. target_status := model.MapfixStatusUnderConstruction smap := datastore.Optional() 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) if err != nil { return err @@ -975,7 +973,6 @@ func (svc *Service) ActionMapfixAccepted(ctx context.Context, params api.ActionM target_status := model.MapfixStatusAcceptedUnvalidated smap := datastore.Optional() 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) if err != nil { return err diff --git a/pkg/service/submissions.go b/pkg/service/submissions.go index 3487fac..5af693f 100644 --- a/pkg/service/submissions.go +++ b/pkg/service/submissions.go @@ -143,7 +143,6 @@ func (svc *Service) GetSubmission(ctx context.Context, params api.GetSubmissionP Completed: submission.Completed, UploadedAssetID: api.NewOptInt64(int64(submission.UploadedAssetID)), StatusID: int32(submission.StatusID), - StatusMessage: submission.StatusMessage, }, nil } @@ -594,7 +593,6 @@ func (svc *Service) ActionSubmissionResetSubmitting(ctx context.Context, params target_status := model.SubmissionStatusUnderConstruction smap := datastore.Optional() 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) if err != nil { return err @@ -986,7 +984,6 @@ func (svc *Service) ActionSubmissionAccepted(ctx context.Context, params api.Act target_status := model.SubmissionStatusAcceptedUnvalidated smap := datastore.Optional() 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) if err != nil { return err diff --git a/pkg/service_internal/mapfixes.go b/pkg/service_internal/mapfixes.go index 8d8b576..7b2c906 100644 --- a/pkg/service_internal/mapfixes.go +++ b/pkg/service_internal/mapfixes.go @@ -124,7 +124,6 @@ func (svc *Service) ActionMapfixRequestChanges(ctx context.Context, params inter target_status := model.MapfixStatusChangesRequested smap := datastore.Optional() 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) if err != nil { return err @@ -176,7 +175,6 @@ func (svc *Service) ActionMapfixAccepted(ctx context.Context, params internal.Ac target_status := model.MapfixStatusAcceptedUnvalidated smap := datastore.Optional() 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) if err != nil { return err diff --git a/pkg/service_internal/submissions.go b/pkg/service_internal/submissions.go index 5b46efd..647ec65 100644 --- a/pkg/service_internal/submissions.go +++ b/pkg/service_internal/submissions.go @@ -123,7 +123,6 @@ func (svc *Service) ActionSubmissionRequestChanges(ctx context.Context, params i target_status := model.SubmissionStatusChangesRequested smap := datastore.Optional() 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) if err != nil { return err @@ -202,7 +201,6 @@ func (svc *Service) ActionSubmissionAccepted(ctx context.Context, params interna target_status := model.SubmissionStatusAcceptedUnvalidated smap := datastore.Optional() 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) if err != nil { return err