From a45fbb370cfac2bbc48b1a7c1e956087656d37eb Mon Sep 17 00:00:00 2001 From: Rhys Lloyd Date: Thu, 17 Jul 2025 20:51:03 -0700 Subject: [PATCH] submissions: rename services --- pkg/cmds/serve.go | 4 ++-- .../controller.go} | 10 +++++----- .../mapfixes.go | 20 +++++++++---------- .../operations.go | 4 ++-- .../script_policy.go | 6 +++--- .../scripts.go | 8 ++++---- .../submissions.go | 20 +++++++++---------- 7 files changed, 36 insertions(+), 36 deletions(-) rename pkg/{service_internal/service_internal.go => validator_controller/controller.go} (78%) rename pkg/{service_internal => validator_controller}/mapfixes.go (87%) rename pkg/{service_internal => validator_controller}/operations.go (76%) rename pkg/{service_internal => validator_controller}/script_policy.go (87%) rename pkg/{service_internal => validator_controller}/scripts.go (86%) rename pkg/{service_internal => validator_controller}/submissions.go (88%) diff --git a/pkg/cmds/serve.go b/pkg/cmds/serve.go index 4de78a8..4a15f50 100644 --- a/pkg/cmds/serve.go +++ b/pkg/cmds/serve.go @@ -13,7 +13,7 @@ import ( "git.itzana.me/strafesnet/maps-service/pkg/roblox" "git.itzana.me/strafesnet/maps-service/pkg/web_api" "git.itzana.me/strafesnet/maps-service/pkg/service" - "git.itzana.me/strafesnet/maps-service/pkg/service_internal" + "git.itzana.me/strafesnet/maps-service/pkg/validator_controller" "github.com/nats-io/nats.go" log "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" @@ -159,7 +159,7 @@ func serve(ctx *cli.Context) error { log.WithError(err).Fatal("failed to initialize api server") } - svc_internal := service_internal.NewService(&svc_inner) + svc_internal := validator_controller.NewService(&svc_inner) srv_internal, err := internal.NewServer(&svc_internal, internal.WithPathPrefix("/v1")) if err != nil { diff --git a/pkg/service_internal/service_internal.go b/pkg/validator_controller/controller.go similarity index 78% rename from pkg/service_internal/service_internal.go rename to pkg/validator_controller/controller.go index 7f37c54..1852459 100644 --- a/pkg/service_internal/service_internal.go +++ b/pkg/validator_controller/controller.go @@ -1,4 +1,4 @@ -package service_internal +package validator_controller import ( "context" @@ -18,20 +18,20 @@ var ( ErrNegativeID = errors.New("A negative ID was provided") ) -type Service struct { +type Controller struct { inner *service.Service } func NewService( inner *service.Service, -) Service { - return Service{ +) Controller { + return Controller{ inner: inner, } } // yay duplicate code -func (svc *Service) NewError(ctx context.Context, err error) *internal.ErrorStatusCode { +func (svc *Controller) NewError(ctx context.Context, err error) *internal.ErrorStatusCode { status := 500 if errors.Is(err, datastore.ErrNotExist) { status = 404 diff --git a/pkg/service_internal/mapfixes.go b/pkg/validator_controller/mapfixes.go similarity index 87% rename from pkg/service_internal/mapfixes.go rename to pkg/validator_controller/mapfixes.go index 7c03282..cc0b3ac 100644 --- a/pkg/service_internal/mapfixes.go +++ b/pkg/validator_controller/mapfixes.go @@ -1,4 +1,4 @@ -package service_internal +package validator_controller import ( "context" @@ -34,7 +34,7 @@ var( // Update model following role restrictions. // // POST /mapfixes/{MapfixID}/validated-model -func (svc *Service) UpdateMapfixValidatedModel(ctx context.Context, params internal.UpdateMapfixValidatedModelParams) error { +func (svc *Controller) UpdateMapfixValidatedModel(ctx context.Context, params internal.UpdateMapfixValidatedModelParams) error { ValidatedModelID := uint64(params.ValidatedModelID) ValidatedModelVersion := uint64(params.ValidatedModelVersion) @@ -70,7 +70,7 @@ func (svc *Service) UpdateMapfixValidatedModel(ctx context.Context, params inter // Role Validator changes status from Submitting -> Submitted. // // POST /mapfixes/{MapfixID}/status/validator-submitted -func (svc *Service) ActionMapfixSubmitted(ctx context.Context, params internal.ActionMapfixSubmittedParams) error { +func (svc *Controller) ActionMapfixSubmitted(ctx context.Context, params internal.ActionMapfixSubmittedParams) error { // transaction target_status := model.MapfixStatusSubmitted update := service.NewMapfixUpdate() @@ -105,7 +105,7 @@ func (svc *Service) ActionMapfixSubmitted(ctx context.Context, params internal.A // (Internal endpoint) Role Validator changes status from Submitting -> RequestChanges. // // POST /mapfixes/{MapfixID}/status/validator-request-changes -func (svc *Service) ActionMapfixRequestChanges(ctx context.Context, params internal.ActionMapfixRequestChangesParams) error { +func (svc *Controller) ActionMapfixRequestChanges(ctx context.Context, params internal.ActionMapfixRequestChangesParams) error { // transaction target_status := model.MapfixStatusChangesRequested update := service.NewMapfixUpdate() @@ -135,7 +135,7 @@ func (svc *Service) ActionMapfixRequestChanges(ctx context.Context, params inter // Role Validator changes status from Validating -> Validated. // // POST /mapfixes/{MapfixID}/status/validator-validated -func (svc *Service) ActionMapfixValidated(ctx context.Context, params internal.ActionMapfixValidatedParams) error { +func (svc *Controller) ActionMapfixValidated(ctx context.Context, params internal.ActionMapfixValidatedParams) error { // transaction update := service.NewMapfixUpdate() update.SetStatusID(model.MapfixStatusValidated) @@ -147,7 +147,7 @@ func (svc *Service) ActionMapfixValidated(ctx context.Context, params internal.A // (Internal endpoint) Role Validator changes status from Validating -> Accepted. // // POST /mapfixes/{MapfixID}/status/validator-failed -func (svc *Service) ActionMapfixAccepted(ctx context.Context, params internal.ActionMapfixAcceptedParams) error { +func (svc *Controller) ActionMapfixAccepted(ctx context.Context, params internal.ActionMapfixAcceptedParams) error { // transaction target_status := model.MapfixStatusAcceptedUnvalidated update := service.NewMapfixUpdate() @@ -178,7 +178,7 @@ func (svc *Service) ActionMapfixAccepted(ctx context.Context, params internal.Ac // (Internal endpoint) Role Validator changes status from Uploading -> Uploaded. // // POST /mapfixes/{MapfixID}/status/validator-uploaded -func (svc *Service) ActionMapfixUploaded(ctx context.Context, params internal.ActionMapfixUploadedParams) error { +func (svc *Controller) ActionMapfixUploaded(ctx context.Context, params internal.ActionMapfixUploadedParams) error { // transaction target_status := model.MapfixStatusUploaded update := service.NewMapfixUpdate() @@ -208,7 +208,7 @@ func (svc *Service) ActionMapfixUploaded(ctx context.Context, params internal.Ac // Post an error to the audit log // // POST /mapfixes/{MapfixID}/error -func (svc *Service) CreateMapfixAuditError(ctx context.Context, params internal.CreateMapfixAuditErrorParams) (error) { +func (svc *Controller) CreateMapfixAuditError(ctx context.Context, params internal.CreateMapfixAuditErrorParams) (error) { event_data := model.AuditEventDataError{ Error: params.ErrorMessage, } @@ -229,7 +229,7 @@ func (svc *Service) CreateMapfixAuditError(ctx context.Context, params internal. // Post a checklist to the audit log // // POST /mapfixes/{MapfixID}/checklist -func (svc *Service) CreateMapfixAuditCheckList(ctx context.Context, check_list internal.CheckList, params internal.CreateMapfixAuditCheckListParams) (error) { +func (svc *Controller) CreateMapfixAuditCheckList(ctx context.Context, check_list internal.CheckList, params internal.CreateMapfixAuditCheckListParams) (error) { check_list2 := make([]model.Check, len(check_list)) for i, check := range check_list { check_list2[i] = model.Check{ @@ -255,7 +255,7 @@ func (svc *Service) CreateMapfixAuditCheckList(ctx context.Context, check_list i } // POST /mapfixes -func (svc *Service) CreateMapfix(ctx context.Context, request *internal.MapfixCreate) (*internal.MapfixID, error) { +func (svc *Controller) CreateMapfix(ctx context.Context, request *internal.MapfixCreate) (*internal.MapfixID, error) { // sanitization if request.GameID<0|| request.AssetOwner<0|| diff --git a/pkg/service_internal/operations.go b/pkg/validator_controller/operations.go similarity index 76% rename from pkg/service_internal/operations.go rename to pkg/validator_controller/operations.go index 8b02411..60d97e1 100644 --- a/pkg/service_internal/operations.go +++ b/pkg/validator_controller/operations.go @@ -1,4 +1,4 @@ -package service_internal +package validator_controller import ( "context" @@ -12,7 +12,7 @@ import ( // Fail the specified OperationID with a StatusMessage. // // POST /operations/{OperationID}/status/operation-failed -func (svc *Service) ActionOperationFailed(ctx context.Context, params internal.ActionOperationFailedParams) (error) { +func (svc *Controller) ActionOperationFailed(ctx context.Context, params internal.ActionOperationFailedParams) (error) { fail_params := service.NewOperationFailParams( params.StatusMessage, ) diff --git a/pkg/service_internal/script_policy.go b/pkg/validator_controller/script_policy.go similarity index 87% rename from pkg/service_internal/script_policy.go rename to pkg/validator_controller/script_policy.go index 6933146..633fdcb 100644 --- a/pkg/service_internal/script_policy.go +++ b/pkg/validator_controller/script_policy.go @@ -1,4 +1,4 @@ -package service_internal +package validator_controller import ( "context" @@ -13,7 +13,7 @@ import ( // Create a new script policy. // // POST /script-policy -func (svc *Service) CreateScriptPolicy(ctx context.Context, req *api.ScriptPolicyCreate) (*api.ScriptPolicyID, error) { +func (svc *Controller) CreateScriptPolicy(ctx context.Context, req *api.ScriptPolicyCreate) (*api.ScriptPolicyID, error) { from_script, err := svc.inner.GetScript(ctx, req.FromScriptID) if err != nil { return nil, err @@ -41,7 +41,7 @@ func (svc *Service) CreateScriptPolicy(ctx context.Context, req *api.ScriptPolic // Get list of script policies. // // GET /script-policy -func (svc *Service) ListScriptPolicy(ctx context.Context, params api.ListScriptPolicyParams) ([]api.ScriptPolicy, error) { +func (svc *Controller) ListScriptPolicy(ctx context.Context, params api.ListScriptPolicyParams) ([]api.ScriptPolicy, error) { filter := service.NewScriptPolicyFilter() if hash_hex, ok := params.FromScriptHash.Get(); ok{ diff --git a/pkg/service_internal/scripts.go b/pkg/validator_controller/scripts.go similarity index 86% rename from pkg/service_internal/scripts.go rename to pkg/validator_controller/scripts.go index dd1acf1..ba40758 100644 --- a/pkg/service_internal/scripts.go +++ b/pkg/validator_controller/scripts.go @@ -1,4 +1,4 @@ -package service_internal +package validator_controller import ( "context" @@ -13,7 +13,7 @@ import ( // Create a new script. // // POST /scripts -func (svc *Service) CreateScript(ctx context.Context, req *api.ScriptCreate) (*api.ScriptID, error) { +func (svc *Controller) CreateScript(ctx context.Context, req *api.ScriptCreate) (*api.ScriptID, error) { script, err := svc.inner.CreateScript(ctx, model.Script{ ID: 0, Name: req.Name, @@ -36,7 +36,7 @@ func (svc *Service) CreateScript(ctx context.Context, req *api.ScriptCreate) (*a // Get list of scripts. // // GET /scripts -func (svc *Service) ListScripts(ctx context.Context, params api.ListScriptsParams) ([]api.Script, error) { +func (svc *Controller) ListScripts(ctx context.Context, params api.ListScriptsParams) ([]api.Script, error) { filter := service.NewScriptFilter() if hash_hex, ok := params.Hash.Get(); ok{ hash_parsed, err := model.HashParse(hash_hex) @@ -86,7 +86,7 @@ func (svc *Service) ListScripts(ctx context.Context, params api.ListScriptsParam // Get the specified script by ID. // // GET /scripts/{ScriptID} -func (svc *Service) GetScript(ctx context.Context, params api.GetScriptParams) (*api.Script, error) { +func (svc *Controller) GetScript(ctx context.Context, params api.GetScriptParams) (*api.Script, error) { script, err := svc.inner.GetScript(ctx, params.ScriptID) if err != nil { return nil, err diff --git a/pkg/service_internal/submissions.go b/pkg/validator_controller/submissions.go similarity index 88% rename from pkg/service_internal/submissions.go rename to pkg/validator_controller/submissions.go index 32b9b95..c82626b 100644 --- a/pkg/service_internal/submissions.go +++ b/pkg/validator_controller/submissions.go @@ -1,4 +1,4 @@ -package service_internal +package validator_controller import ( "context" @@ -33,7 +33,7 @@ var( // Update model following role restrictions. // // POST /submissions/{SubmissionID}/validated-model -func (svc *Service) UpdateSubmissionValidatedModel(ctx context.Context, params internal.UpdateSubmissionValidatedModelParams) error { +func (svc *Controller) UpdateSubmissionValidatedModel(ctx context.Context, params internal.UpdateSubmissionValidatedModelParams) error { ValidatedModelID := uint64(params.ValidatedModelID) ValidatedModelVersion := uint64(params.ValidatedModelVersion) @@ -70,7 +70,7 @@ func (svc *Service) UpdateSubmissionValidatedModel(ctx context.Context, params i // Role Validator changes status from Submitting -> Submitted. // // POST /submissions/{SubmissionID}/status/validator-submitted -func (svc *Service) ActionSubmissionSubmitted(ctx context.Context, params internal.ActionSubmissionSubmittedParams) error { +func (svc *Controller) ActionSubmissionSubmitted(ctx context.Context, params internal.ActionSubmissionSubmittedParams) error { // transaction target_status := model.SubmissionStatusSubmitted update := service.NewSubmissionUpdate() @@ -105,7 +105,7 @@ func (svc *Service) ActionSubmissionSubmitted(ctx context.Context, params intern // (Internal endpoint) Role Validator changes status from Submitting -> RequestChanges. // // POST /submissions/{SubmissionID}/status/validator-request-changes -func (svc *Service) ActionSubmissionRequestChanges(ctx context.Context, params internal.ActionSubmissionRequestChangesParams) error { +func (svc *Controller) ActionSubmissionRequestChanges(ctx context.Context, params internal.ActionSubmissionRequestChangesParams) error { // transaction target_status := model.SubmissionStatusChangesRequested update := service.NewSubmissionUpdate() @@ -137,7 +137,7 @@ func (svc *Service) ActionSubmissionRequestChanges(ctx context.Context, params i // Role Validator changes status from Validating -> Validated. // // POST /submissions/{SubmissionID}/status/validator-validated -func (svc *Service) ActionSubmissionValidated(ctx context.Context, params internal.ActionSubmissionValidatedParams) error { +func (svc *Controller) ActionSubmissionValidated(ctx context.Context, params internal.ActionSubmissionValidatedParams) error { // transaction target_status := model.SubmissionStatusValidated update := service.NewSubmissionUpdate() @@ -168,7 +168,7 @@ func (svc *Service) ActionSubmissionValidated(ctx context.Context, params intern // (Internal endpoint) Role Validator changes status from Validating -> Accepted. // // POST /submissions/{SubmissionID}/status/validator-failed -func (svc *Service) ActionSubmissionAccepted(ctx context.Context, params internal.ActionSubmissionAcceptedParams) error { +func (svc *Controller) ActionSubmissionAccepted(ctx context.Context, params internal.ActionSubmissionAcceptedParams) error { // transaction target_status := model.SubmissionStatusAcceptedUnvalidated update := service.NewSubmissionUpdate() @@ -200,7 +200,7 @@ func (svc *Service) ActionSubmissionAccepted(ctx context.Context, params interna // (Internal endpoint) Role Validator changes status from Uploading -> Uploaded. // // POST /submissions/{SubmissionID}/status/validator-uploaded -func (svc *Service) ActionSubmissionUploaded(ctx context.Context, params internal.ActionSubmissionUploadedParams) error { +func (svc *Controller) ActionSubmissionUploaded(ctx context.Context, params internal.ActionSubmissionUploadedParams) error { // transaction target_status := model.SubmissionStatusUploaded update := service.NewSubmissionUpdate() @@ -232,7 +232,7 @@ func (svc *Service) ActionSubmissionUploaded(ctx context.Context, params interna // Post an error to the audit log // // POST /submissions/{SubmissionID}/error -func (svc *Service) CreateSubmissionAuditError(ctx context.Context, params internal.CreateSubmissionAuditErrorParams) (error) { +func (svc *Controller) CreateSubmissionAuditError(ctx context.Context, params internal.CreateSubmissionAuditErrorParams) (error) { event_data := model.AuditEventDataError{ Error: params.ErrorMessage, } @@ -253,7 +253,7 @@ func (svc *Service) CreateSubmissionAuditError(ctx context.Context, params inter // Post a checklist to the audit log // // POST /submissions/{SubmissionID}/checklist -func (svc *Service) CreateSubmissionAuditCheckList(ctx context.Context, check_list internal.CheckList, params internal.CreateSubmissionAuditCheckListParams) (error) { +func (svc *Controller) CreateSubmissionAuditCheckList(ctx context.Context, check_list internal.CheckList, params internal.CreateSubmissionAuditCheckListParams) (error) { check_list2 := make([]model.Check, len(check_list)) for i, check := range check_list { check_list2[i] = model.Check{ @@ -279,7 +279,7 @@ func (svc *Service) CreateSubmissionAuditCheckList(ctx context.Context, check_li } // POST /submissions -func (svc *Service) CreateSubmission(ctx context.Context, request *internal.SubmissionCreate) (*internal.SubmissionID, error) { +func (svc *Controller) CreateSubmission(ctx context.Context, request *internal.SubmissionCreate) (*internal.SubmissionID, error) { // sanitization if request.GameID<0|| request.AssetOwner<0||