submissions: rename services

2025-07-17 19:06:43 -07:00
parent 3d08b144b1
commit dde6f3ebdb
26 changed files with 97 additions and 97 deletions
--- a/pkg/cmds/serve.go
+++ b/pkg/cmds/serve.go
@@ -11,8 +11,8 @@ import (
 	"git.itzana.me/strafesnet/maps-service/pkg/datastore/gormstore"
 	internal "git.itzana.me/strafesnet/maps-service/pkg/internal"
 	"git.itzana.me/strafesnet/maps-service/pkg/roblox"
-	"git.itzana.me/strafesnet/maps-service/pkg/service_external"
-	"git.itzana.me/strafesnet/maps-service/pkg/service_inner"
+	"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"
 	"github.com/nats-io/nats.go"
 	log "github.com/sirupsen/logrus"
@@ -131,14 +131,14 @@ func serve(ctx *cli.Context) error {
 	if err != nil {
 		log.Fatal(err)
 	}
-	svc_inner := service_inner.NewService(
+	svc_inner := service.NewService(
 		db,
 		js,
 		maps.NewMapsServiceClient(conn),
 		users.NewUsersServiceClient(conn),
 	)

-	svc_external := service_external.NewService(
+	svc_external := web_api.NewService(
 		&svc_inner,
 		roblox.Client{
 			HttpClient: http.DefaultClient,
@@ -150,7 +150,7 @@ func serve(ctx *cli.Context) error {
 	if err != nil {
 		log.Fatal(err)
 	}
-	sec := service_external.SecurityHandler{
+	sec := web_api.SecurityHandler{
 		Client: auth.NewAuthServiceClient(conn),
 	}

--- a/pkg/service_inner/audit_events.go
+++ b/pkg/service_inner/audit_events.go
@@ -1,4 +1,4 @@
-package service_inner
+package service

 import (
 	"context"
--- a/pkg/service_inner/mapfixes.go
+++ b/pkg/service_inner/mapfixes.go
@@ -1,4 +1,4 @@
-package service_inner
+package service

 import (
 	"context"
--- a/pkg/service_inner/maps.go
+++ b/pkg/service_inner/maps.go
@@ -1,4 +1,4 @@
-package service_inner
+package service

 import (
 	"context"
--- a/pkg/service_inner/nats_mapfix.go
+++ b/pkg/service_inner/nats_mapfix.go
@@ -1,4 +1,4 @@
-package service_inner
+package service

 import (
 	"encoding/json"
--- a/pkg/service_inner/nats_submission.go
+++ b/pkg/service_inner/nats_submission.go
@@ -1,4 +1,4 @@
-package service_inner
+package service

 import (
 	"encoding/json"
--- a/pkg/service_inner/operations.go
+++ b/pkg/service_inner/operations.go
@@ -1,4 +1,4 @@
-package service_inner
+package service

 import (
 	"context"
--- a/pkg/service_inner/script_policy.go
+++ b/pkg/service_inner/script_policy.go
@@ -1,4 +1,4 @@
-package service_inner
+package service

 import (
 	"context"
--- a/pkg/service_inner/scripts.go
+++ b/pkg/service_inner/scripts.go
@@ -1,4 +1,4 @@
-package service_inner
+package service

 import (
 	"context"
--- a/pkg/service_inner/service.go
+++ b/pkg/service_inner/service.go
@@ -1,4 +1,4 @@
-package service_inner
+package service

 import (
 	"git.itzana.me/strafesnet/go-grpc/maps"
--- a/pkg/service_inner/submissions.go
+++ b/pkg/service_inner/submissions.go
@@ -1,4 +1,4 @@
-package service_inner
+package service

 import (
 	"context"
--- a/pkg/service_internal/mapfixes.go
+++ b/pkg/service_internal/mapfixes.go
@@ -8,7 +8,7 @@ import (
 	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
 	internal "git.itzana.me/strafesnet/maps-service/pkg/internal"
 	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"git.itzana.me/strafesnet/maps-service/pkg/service_inner"
+	"git.itzana.me/strafesnet/maps-service/pkg/service"
 )

 var(
@@ -39,7 +39,7 @@ func (svc *Service) UpdateMapfixValidatedModel(ctx context.Context, params inter
 	ValidatedModelVersion := uint64(params.ValidatedModelVersion)

 	// check if Status is ChangesRequested|Submitted|UnderConstruction
-	update := service_inner.NewMapfixUpdate()
+	update := service.NewMapfixUpdate()
 	update.SetValidatedAssetID(ValidatedModelID)
 	update.SetValidatedAssetVersion(ValidatedModelVersion)
 	// DO NOT reset completed when validated model is updated
@@ -73,7 +73,7 @@ func (svc *Service) UpdateMapfixValidatedModel(ctx context.Context, params inter
 func (svc *Service) ActionMapfixSubmitted(ctx context.Context, params internal.ActionMapfixSubmittedParams) error {
 	// transaction
 	target_status := model.MapfixStatusSubmitted
-	update := service_inner.NewMapfixUpdate()
+	update := service.NewMapfixUpdate()
 	update.SetStatusID(target_status)
 	update.SetAssetVersion(uint64(params.ModelVersion))
 	update.SetDisplayName(params.DisplayName)
@@ -108,7 +108,7 @@ func (svc *Service) ActionMapfixSubmitted(ctx context.Context, params internal.A
 func (svc *Service) ActionMapfixRequestChanges(ctx context.Context, params internal.ActionMapfixRequestChangesParams) error {
 	// transaction
 	target_status := model.MapfixStatusChangesRequested
-	update := service_inner.NewMapfixUpdate()
+	update := service.NewMapfixUpdate()
 	update.SetStatusID(target_status)
 	err := svc.inner.UpdateMapfixIfStatus(ctx, params.MapfixID, []model.MapfixStatus{model.MapfixStatusSubmitting}, update)
 	if err != nil {
@@ -137,7 +137,7 @@ func (svc *Service) ActionMapfixRequestChanges(ctx context.Context, params inter
 // POST /mapfixes/{MapfixID}/status/validator-validated
 func (svc *Service) ActionMapfixValidated(ctx context.Context, params internal.ActionMapfixValidatedParams) error {
 	// transaction
-	update := service_inner.NewMapfixUpdate()
+	update := service.NewMapfixUpdate()
 	update.SetStatusID(model.MapfixStatusValidated)
 	return svc.inner.UpdateMapfixIfStatus(ctx, params.MapfixID, []model.MapfixStatus{model.MapfixStatusValidating}, update)
 }
@@ -150,7 +150,7 @@ func (svc *Service) ActionMapfixValidated(ctx context.Context, params internal.A
 func (svc *Service) ActionMapfixAccepted(ctx context.Context, params internal.ActionMapfixAcceptedParams) error {
 	// transaction
 	target_status := model.MapfixStatusAcceptedUnvalidated
-	update := service_inner.NewMapfixUpdate()
+	update := service.NewMapfixUpdate()
 	update.SetStatusID(target_status)
 	err := svc.inner.UpdateMapfixIfStatus(ctx, params.MapfixID, []model.MapfixStatus{model.MapfixStatusValidating}, update)
 	if err != nil {
@@ -181,7 +181,7 @@ func (svc *Service) ActionMapfixAccepted(ctx context.Context, params internal.Ac
 func (svc *Service) ActionMapfixUploaded(ctx context.Context, params internal.ActionMapfixUploadedParams) error {
 	// transaction
 	target_status := model.MapfixStatusUploaded
-	update := service_inner.NewMapfixUpdate()
+	update := service.NewMapfixUpdate()
 	update.SetStatusID(target_status)
 	err := svc.inner.UpdateMapfixIfStatus(ctx, params.MapfixID, []model.MapfixStatus{model.MapfixStatusUploading}, update)
 	if err != nil {
@@ -272,7 +272,7 @@ func (svc *Service) CreateMapfix(ctx context.Context, request *internal.MapfixCr

 	// Check if an active mapfix with the same asset id exists
 	{
-		filter := service_inner.NewMapfixFilter()
+		filter := service.NewMapfixFilter()
 		filter.SetAssetID(AssetID)
 		filter.SetAssetVersion(AssetVersion)
 		filter.SetStatuses(ActiveMapfixStatuses)
@@ -317,7 +317,7 @@ func (svc *Service) CreateMapfix(ctx context.Context, request *internal.MapfixCr
 	}

 	// mark the operation as completed and provide the path
-	params := service_inner.NewOperationCompleteParams(fmt.Sprintf("/mapfixes/%d", mapfix.ID))
+	params := service.NewOperationCompleteParams(fmt.Sprintf("/mapfixes/%d", mapfix.ID))
 	err = svc.inner.CompleteOperation(ctx, request.OperationID, params)
 	if err != nil {
 		return nil, err
--- a/pkg/service_internal/operations.go
+++ b/pkg/service_internal/operations.go
@@ -4,7 +4,7 @@ import (
 	"context"

 	internal "git.itzana.me/strafesnet/maps-service/pkg/internal"
-	"git.itzana.me/strafesnet/maps-service/pkg/service_inner"
+	"git.itzana.me/strafesnet/maps-service/pkg/service"
 )

 // ActionOperationFailed implements actionOperationFailed operation.
@@ -13,7 +13,7 @@ import (
 //
 // POST /operations/{OperationID}/status/operation-failed
 func (svc *Service) ActionOperationFailed(ctx context.Context, params internal.ActionOperationFailedParams) (error) {
-	fail_params := service_inner.NewOperationFailParams(
+	fail_params := service.NewOperationFailParams(
 		params.StatusMessage,
 	)
 	return svc.inner.FailOperation(ctx, params.OperationID, fail_params)
--- a/pkg/service_internal/script_policy.go
+++ b/pkg/service_internal/script_policy.go
@@ -5,7 +5,7 @@ import (

 	api "git.itzana.me/strafesnet/maps-service/pkg/internal"
 	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"git.itzana.me/strafesnet/maps-service/pkg/service_inner"
+	"git.itzana.me/strafesnet/maps-service/pkg/service"
 )

 // CreateScriptPolicy implements createScriptPolicy operation.
@@ -42,7 +42,7 @@ func (svc *Service) CreateScriptPolicy(ctx context.Context, req *api.ScriptPolic
 //
 // GET /script-policy
 func (svc *Service) ListScriptPolicy(ctx context.Context, params api.ListScriptPolicyParams) ([]api.ScriptPolicy, error) {
-	filter := service_inner.NewScriptPolicyFilter()
+	filter := service.NewScriptPolicyFilter()

 	if hash_hex, ok := params.FromScriptHash.Get(); ok{
 		hash_parsed, err := model.HashParse(hash_hex)
--- a/pkg/service_internal/scripts.go
+++ b/pkg/service_internal/scripts.go
@@ -5,7 +5,7 @@ import (

 	api "git.itzana.me/strafesnet/maps-service/pkg/internal"
 	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"git.itzana.me/strafesnet/maps-service/pkg/service_inner"
+	"git.itzana.me/strafesnet/maps-service/pkg/service"
 )

 // CreateScript implements createScript operation.
@@ -37,7 +37,7 @@ func (svc *Service) CreateScript(ctx context.Context, req *api.ScriptCreate) (*a
 //
 // GET /scripts
 func (svc *Service) ListScripts(ctx context.Context, params api.ListScriptsParams) ([]api.Script, error) {
-	filter := service_inner.NewScriptFilter()
+	filter := service.NewScriptFilter()
 	if hash_hex, ok := params.Hash.Get(); ok{
 		hash_parsed, err := model.HashParse(hash_hex)
 		if err != nil {
--- a/pkg/service_internal/service_internal.go
+++ b/pkg/service_internal/service_internal.go
@@ -7,7 +7,7 @@ import (

 	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
 	internal "git.itzana.me/strafesnet/maps-service/pkg/internal"
-	"git.itzana.me/strafesnet/maps-service/pkg/service_inner"
+	"git.itzana.me/strafesnet/maps-service/pkg/service"
 )

 const (
@@ -19,11 +19,11 @@ var (
 )

 type Service struct {
-	inner *service_inner.Service
+	inner *service.Service
 }

 func NewService(
-	inner *service_inner.Service,
+	inner *service.Service,
 ) Service {
 	return Service{
 		inner: inner,
--- a/pkg/service_internal/submissions.go
+++ b/pkg/service_internal/submissions.go
@@ -8,7 +8,7 @@ import (
 	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
 	internal "git.itzana.me/strafesnet/maps-service/pkg/internal"
 	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"git.itzana.me/strafesnet/maps-service/pkg/service_inner"
+	"git.itzana.me/strafesnet/maps-service/pkg/service"
 )

 var(
@@ -38,7 +38,7 @@ func (svc *Service) UpdateSubmissionValidatedModel(ctx context.Context, params i
 	ValidatedModelVersion := uint64(params.ValidatedModelVersion)

 	// check if Status is ChangesRequested|Submitted|UnderConstruction
-	update := service_inner.NewSubmissionUpdate()
+	update := service.NewSubmissionUpdate()
 	update.SetValidatedAssetID(ValidatedModelID)
 	update.SetValidatedAssetVersion(ValidatedModelVersion)
 	// DO NOT reset completed when validated model is updated
@@ -73,7 +73,7 @@ func (svc *Service) UpdateSubmissionValidatedModel(ctx context.Context, params i
 func (svc *Service) ActionSubmissionSubmitted(ctx context.Context, params internal.ActionSubmissionSubmittedParams) error {
 	// transaction
 	target_status := model.SubmissionStatusSubmitted
-	update := service_inner.NewSubmissionUpdate()
+	update := service.NewSubmissionUpdate()
 	update.SetStatusID(target_status)
 	update.SetAssetVersion(uint64(params.ModelVersion))
 	update.SetDisplayName(params.DisplayName)
@@ -108,7 +108,7 @@ func (svc *Service) ActionSubmissionSubmitted(ctx context.Context, params intern
 func (svc *Service) ActionSubmissionRequestChanges(ctx context.Context, params internal.ActionSubmissionRequestChangesParams) error {
 	// transaction
 	target_status := model.SubmissionStatusChangesRequested
-	update := service_inner.NewSubmissionUpdate()
+	update := service.NewSubmissionUpdate()
 	update.SetStatusID(target_status)
 	allowed_statuses :=[]model.SubmissionStatus{model.SubmissionStatusSubmitting}
 	err := svc.inner.UpdateSubmissionIfStatus(ctx, params.SubmissionID, allowed_statuses, update)
@@ -140,7 +140,7 @@ func (svc *Service) ActionSubmissionRequestChanges(ctx context.Context, params i
 func (svc *Service) ActionSubmissionValidated(ctx context.Context, params internal.ActionSubmissionValidatedParams) error {
 	// transaction
 	target_status := model.SubmissionStatusValidated
-	update := service_inner.NewSubmissionUpdate()
+	update := service.NewSubmissionUpdate()
 	update.SetStatusID(target_status)
 	allowed_statuses :=[]model.SubmissionStatus{model.SubmissionStatusValidating}
 	err := svc.inner.UpdateSubmissionIfStatus(ctx, params.SubmissionID, allowed_statuses, update)
@@ -171,7 +171,7 @@ func (svc *Service) ActionSubmissionValidated(ctx context.Context, params intern
 func (svc *Service) ActionSubmissionAccepted(ctx context.Context, params internal.ActionSubmissionAcceptedParams) error {
 	// transaction
 	target_status := model.SubmissionStatusAcceptedUnvalidated
-	update := service_inner.NewSubmissionUpdate()
+	update := service.NewSubmissionUpdate()
 	update.SetStatusID(target_status)
 	allowed_statuses :=[]model.SubmissionStatus{model.SubmissionStatusValidating}
 	err := svc.inner.UpdateSubmissionIfStatus(ctx, params.SubmissionID, allowed_statuses, update)
@@ -203,7 +203,7 @@ func (svc *Service) ActionSubmissionAccepted(ctx context.Context, params interna
 func (svc *Service) ActionSubmissionUploaded(ctx context.Context, params internal.ActionSubmissionUploadedParams) error {
 	// transaction
 	target_status := model.SubmissionStatusUploaded
-	update := service_inner.NewSubmissionUpdate()
+	update := service.NewSubmissionUpdate()
 	update.SetStatusID(target_status)
 	update.SetUploadedAssetID(uint64(params.UploadedAssetID))
 	allowed_statuses :=[]model.SubmissionStatus{model.SubmissionStatusUploading}
@@ -296,7 +296,7 @@ func (svc *Service) CreateSubmission(ctx context.Context, request *internal.Subm

 	// Check if an active submission with the same asset id exists
 	{
-		filter := service_inner.NewSubmissionFilter()
+		filter := service.NewSubmissionFilter()
 		filter.SetAssetID(AssetID)
 		filter.SetAssetVersion(AssetVersion)
 		filter.SetStatuses(ActiveSubmissionStatuses)
@@ -342,7 +342,7 @@ func (svc *Service) CreateSubmission(ctx context.Context, request *internal.Subm
 	}

 	// mark the operation as completed and provide the path
-	params := service_inner.NewOperationCompleteParams(fmt.Sprintf("/submissions/%d", submission.ID))
+	params := service.NewOperationCompleteParams(fmt.Sprintf("/submissions/%d", submission.ID))
 	err = svc.inner.CompleteOperation(ctx, request.OperationID, params)
 	if err != nil {
 		return nil, err
--- a/pkg/service_external/mapfixes.go
+++ b/pkg/service_external/mapfixes.go
@@ -1,4 +1,4 @@
-package service_external
+package web_api

 import (
 	"context"
@@ -10,7 +10,7 @@ import (
 	"git.itzana.me/strafesnet/maps-service/pkg/api"
 	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
 	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"git.itzana.me/strafesnet/maps-service/pkg/service_inner"
+	"git.itzana.me/strafesnet/maps-service/pkg/service"
 )

 var(
@@ -60,7 +60,7 @@ func (svc *Service) CreateMapfix(ctx context.Context, request *api.MapfixTrigger

 	// Check if user's mapfixes in the creation phase exceeds the limit
 	{
-		filter := service_inner.NewMapfixFilter()
+		filter := service.NewMapfixFilter()
 		filter.SetSubmitter(userId)
 		filter.SetStatuses(CreationPhaseMapfixStatuses)

@@ -79,7 +79,7 @@ func (svc *Service) CreateMapfix(ctx context.Context, request *api.MapfixTrigger

 	// Check if a mapfix targetting the same map exists in creation phase
 	{
-		filter := service_inner.NewMapfixFilter()
+		filter := service.NewMapfixFilter()
 		filter.SetSubmitter(userId)
 		filter.SetTargetAssetID(uint64(request.TargetAssetID))
 		filter.SetStatuses(CreationPhaseMapfixStatuses)
@@ -176,7 +176,7 @@ func (svc *Service) GetMapfix(ctx context.Context, params api.GetMapfixParams) (
 //
 // GET /mapfixes
 func (svc *Service) ListMapfixes(ctx context.Context, params api.ListMapfixesParams) (*api.Mapfixes, error) {
-	filter := service_inner.NewMapfixFilter()
+	filter := service.NewMapfixFilter()

 	if display_name, display_name_ok := params.DisplayName.Get(); display_name_ok{
 		filter.SetDisplayName(display_name)
@@ -254,7 +254,7 @@ func (svc *Service) SetMapfixCompleted(ctx context.Context, params api.SetMapfix
 		return ErrPermissionDeniedNeedRoleMaptest
 	}

-	update := service_inner.NewMapfixUpdate()
+	update := service.NewMapfixUpdate()
 	update.SetCompleted(true)
 	return svc.inner.UpdateMapfix(ctx, params.MapfixID, update)
 }
@@ -293,7 +293,7 @@ func (svc *Service) UpdateMapfixModel(ctx context.Context, params api.UpdateMapf
 	NewModelVersion := uint64(params.ModelVersion)

 	// check if Status is ChangesRequested|Submitted|UnderConstruction
-	update := service_inner.NewMapfixUpdate()
+	update := service.NewMapfixUpdate()
 	update.SetAssetID(NewModelID)
 	update.SetAssetVersion(NewModelVersion)
 	//always reset completed when model changes
@@ -349,7 +349,7 @@ func (svc *Service) ActionMapfixReject(ctx context.Context, params api.ActionMap

 	// transaction
 	target_status := model.MapfixStatusRejected
-	update := service_inner.NewMapfixUpdate()
+	update := service.NewMapfixUpdate()
 	update.SetStatusID(target_status)
 	allow_statuses := []model.MapfixStatus{model.MapfixStatusSubmitted}
 	err = svc.inner.UpdateMapfixIfStatus(ctx, params.MapfixID, allow_statuses, update)
@@ -399,7 +399,7 @@ func (svc *Service) ActionMapfixRequestChanges(ctx context.Context, params api.A

 	// transaction
 	target_status := model.MapfixStatusChangesRequested
-	update := service_inner.NewMapfixUpdate()
+	update := service.NewMapfixUpdate()
 	update.SetStatusID(target_status)
 	allow_statuses := []model.MapfixStatus{model.MapfixStatusValidated, model.MapfixStatusAcceptedUnvalidated, model.MapfixStatusSubmitted}
 	err = svc.inner.UpdateMapfixIfStatus(ctx, params.MapfixID, allow_statuses, update)
@@ -452,7 +452,7 @@ func (svc *Service) ActionMapfixRevoke(ctx context.Context, params api.ActionMap

 	// transaction
 	target_status := model.MapfixStatusUnderConstruction
-	update := service_inner.NewMapfixUpdate()
+	update := service.NewMapfixUpdate()
 	update.SetStatusID(target_status)
 	allow_statuses := []model.MapfixStatus{model.MapfixStatusSubmitted, model.MapfixStatusChangesRequested}
 	err = svc.inner.UpdateMapfixIfStatus(ctx, params.MapfixID, allow_statuses, update)
@@ -505,7 +505,7 @@ func (svc *Service) ActionMapfixTriggerSubmit(ctx context.Context, params api.Ac

 	// transaction
 	target_status := model.MapfixStatusSubmitting
-	update := service_inner.NewMapfixUpdate()
+	update := service.NewMapfixUpdate()
 	update.SetStatusID(target_status)
 	allow_statuses := []model.MapfixStatus{model.MapfixStatusUnderConstruction, model.MapfixStatusChangesRequested}
 	err = svc.inner.UpdateMapfixIfStatus(ctx, params.MapfixID, allow_statuses, update)
@@ -576,7 +576,7 @@ func (svc *Service) ActionMapfixTriggerSubmitUnchecked(ctx context.Context, para

 	// transaction
 	target_status := model.MapfixStatusSubmitting
-	update := service_inner.NewMapfixUpdate()
+	update := service.NewMapfixUpdate()
 	update.SetStatusID(target_status)
 	allow_statuses := []model.MapfixStatus{model.MapfixStatusChangesRequested}
 	err = svc.inner.UpdateMapfixIfStatus(ctx, params.MapfixID, allow_statuses, update)
@@ -642,7 +642,7 @@ func (svc *Service) ActionMapfixResetSubmitting(ctx context.Context, params api.

 	// transaction
 	target_status := model.MapfixStatusUnderConstruction
-	update := service_inner.NewMapfixUpdate()
+	update := service.NewMapfixUpdate()
 	update.SetStatusID(target_status)
 	allow_statuses := []model.MapfixStatus{model.MapfixStatusSubmitting}
 	err = svc.inner.UpdateMapfixIfStatus(ctx, params.MapfixID, allow_statuses, update)
@@ -692,7 +692,7 @@ func (svc *Service) ActionMapfixTriggerUpload(ctx context.Context, params api.Ac

 	// transaction
 	target_status := model.MapfixStatusUploading
-	update := service_inner.NewMapfixUpdate()
+	update := service.NewMapfixUpdate()
 	update.SetStatusID(target_status)
 	allow_statuses := []model.MapfixStatus{model.MapfixStatusValidated}
 	mapfix, err := svc.inner.UpdateAndGetMapfixIfStatus(ctx, params.MapfixID, allow_statuses, update)
@@ -763,7 +763,7 @@ func (svc *Service) ActionMapfixValidated(ctx context.Context, params api.Action

 	// transaction
 	target_status := model.MapfixStatusValidated
-	update := service_inner.NewMapfixUpdate()
+	update := service.NewMapfixUpdate()
 	update.SetStatusID(target_status)
 	allow_statuses := []model.MapfixStatus{model.MapfixStatusUploading}
 	err = svc.inner.UpdateMapfixIfStatus(ctx, params.MapfixID, allow_statuses, update)
@@ -825,7 +825,7 @@ func (svc *Service) ActionMapfixTriggerValidate(ctx context.Context, params api.

 	// Check if an active mapfix with the same target asset id exists
 	if mapfix.TargetAssetID != 0 {
-		filter := service_inner.NewMapfixFilter()
+		filter := service.NewMapfixFilter()
 		filter.SetTargetAssetID(mapfix.TargetAssetID)
 		filter.SetStatuses(ActiveAcceptedMapfixStatuses)
 		active_mapfixes, err := svc.inner.ListMapfixes(ctx, filter, model.Page{
@@ -842,7 +842,7 @@ func (svc *Service) ActionMapfixTriggerValidate(ctx context.Context, params api.

 	// transaction
 	target_status := model.MapfixStatusValidating
-	update := service_inner.NewMapfixUpdate()
+	update := service.NewMapfixUpdate()
 	update.SetStatusID(target_status)
 	allow_statuses := []model.MapfixStatus{model.MapfixStatusSubmitted}
 	mapfix, err = svc.inner.UpdateAndGetMapfixIfStatus(ctx, params.MapfixID, allow_statuses, update)
@@ -902,7 +902,7 @@ func (svc *Service) ActionMapfixRetryValidate(ctx context.Context, params api.Ac

 	// transaction
 	target_status := model.MapfixStatusValidating
-	update := service_inner.NewMapfixUpdate()
+	update := service.NewMapfixUpdate()
 	update.SetStatusID(target_status)
 	allow_statuses := []model.MapfixStatus{model.MapfixStatusAcceptedUnvalidated}
 	mapfix, err := svc.inner.UpdateAndGetMapfixIfStatus(ctx, params.MapfixID, allow_statuses, update)
@@ -972,7 +972,7 @@ func (svc *Service) ActionMapfixAccepted(ctx context.Context, params api.ActionM

 	// transaction
 	target_status := model.MapfixStatusAcceptedUnvalidated
-	update := service_inner.NewMapfixUpdate()
+	update := service.NewMapfixUpdate()
 	update.SetStatusID(target_status)
 	allow_statuses := []model.MapfixStatus{model.MapfixStatusValidating}
 	err = svc.inner.UpdateMapfixIfStatus(ctx, params.MapfixID, allow_statuses, update)
--- a/pkg/service_external/maps.go
+++ b/pkg/service_external/maps.go
@@ -1,4 +1,4 @@
-package service_external
+package web_api

 import (
 	"context"
@@ -7,7 +7,7 @@ import (
 	"git.itzana.me/strafesnet/maps-service/pkg/api"
 	"git.itzana.me/strafesnet/maps-service/pkg/model"
 	"git.itzana.me/strafesnet/maps-service/pkg/roblox"
-	"git.itzana.me/strafesnet/maps-service/pkg/service_inner"
+	"git.itzana.me/strafesnet/maps-service/pkg/service"
 )

 // ListMaps implements listMaps operation.
@@ -16,7 +16,7 @@ import (
 //
 // GET /maps
 func (svc *Service) ListMaps(ctx context.Context, params api.ListMapsParams) ([]api.Map, error) {
-	filter := service_inner.NewMapFilter()
+	filter := service.NewMapFilter()

 	if display_name, display_name_ok := params.DisplayName.Get(); display_name_ok{
 		filter.SetDisplayName(display_name)
--- a/pkg/service_external/operations.go
+++ b/pkg/service_external/operations.go
@@ -1,4 +1,4 @@
-package service_external
+package web_api

 import (
 	"context"
--- a/pkg/service_external/script_policy.go
+++ b/pkg/service_external/script_policy.go
@@ -1,11 +1,11 @@
-package service_external
+package web_api

 import (
 	"context"

 	"git.itzana.me/strafesnet/maps-service/pkg/api"
 	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"git.itzana.me/strafesnet/maps-service/pkg/service_inner"
+	"git.itzana.me/strafesnet/maps-service/pkg/service"
 )

 // CreateScriptPolicy implements createScriptPolicy operation.
@@ -48,7 +48,7 @@ func (svc *Service) CreateScriptPolicy(ctx context.Context, req *api.ScriptPolic
 //
 // GET /script-policy
 func (svc *Service) ListScriptPolicy(ctx context.Context, params api.ListScriptPolicyParams) ([]api.ScriptPolicy, error) {
-	filter := service_inner.NewScriptPolicyFilter()
+	filter := service.NewScriptPolicyFilter()

 	if hash_hex, ok := params.FromScriptHash.Get(); ok{
 		hash_parsed, err := model.HashParse(hash_hex)
@@ -130,7 +130,7 @@ func (svc *Service) UpdateScriptPolicy(ctx context.Context, req *api.ScriptPolic
 		return err
 	}

-	filter := service_inner.NewScriptPolicyFilter()
+	filter := service.NewScriptPolicyFilter()
 	if from_script_id, ok := req.FromScriptID.Get(); ok {
 		from_script, err := svc.inner.GetScript(ctx, from_script_id)
 		if err != nil {
--- a/pkg/service_external/scripts.go
+++ b/pkg/service_external/scripts.go
@@ -1,11 +1,11 @@
-package service_external
+package web_api

 import (
 	"context"

 	"git.itzana.me/strafesnet/maps-service/pkg/api"
 	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"git.itzana.me/strafesnet/maps-service/pkg/service_inner"
+	"git.itzana.me/strafesnet/maps-service/pkg/service"
 )

 func CheckHasRoleScriptWrite(ctx context.Context) error {
@@ -59,7 +59,7 @@ func (svc *Service) CreateScript(ctx context.Context, req *api.ScriptCreate) (*a
 //
 // GET /scripts
 func (svc *Service) ListScripts(ctx context.Context, params api.ListScriptsParams) ([]api.Script, error) {
-	filter := service_inner.NewScriptFilter()
+	filter := service.NewScriptFilter()

 	if hash_hex, ok := params.Hash.Get(); ok{
 		hash_parsed, err := model.HashParse(hash_hex)
@@ -151,7 +151,7 @@ func (svc *Service) UpdateScript(ctx context.Context, req *api.ScriptUpdate, par
 		return err
 	}

-	filter := service_inner.NewScriptFilter()
+	filter := service.NewScriptFilter()
 	if name, name_ok := req.Name.Get(); name_ok{
 		filter.SetName(name)
 	}
--- a/pkg/service_external/security.go
+++ b/pkg/service_external/security.go
@@ -1,4 +1,4 @@
-package service_external
+package web_api

 import (
 	"context"
--- a/pkg/service_external/service.go
+++ b/pkg/service_external/service.go
@@ -1,4 +1,4 @@
-package service_external
+package web_api

 import (
 	"context"
@@ -8,7 +8,7 @@ import (
 	"git.itzana.me/strafesnet/maps-service/pkg/api"
 	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
 	"git.itzana.me/strafesnet/maps-service/pkg/roblox"
-	"git.itzana.me/strafesnet/maps-service/pkg/service_inner"
+	"git.itzana.me/strafesnet/maps-service/pkg/service"
 )

 var (
@@ -30,12 +30,12 @@ var (
 )

 type Service struct {
-	inner *service_inner.Service
+	inner *service.Service
 	roblox roblox.Client
 }

 func NewService(
-	inner *service_inner.Service,
+	inner *service.Service,
 	roblox roblox.Client,
 ) Service {
 	return Service{
--- a/pkg/service_external/session.go
+++ b/pkg/service_external/session.go
@@ -1,4 +1,4 @@
-package service_external
+package web_api

 import (
 	"context"
--- a/pkg/service_external/submissions.go
+++ b/pkg/service_external/submissions.go
@@ -1,4 +1,4 @@
-package service_external
+package web_api

 import (
 	"context"
@@ -10,7 +10,7 @@ import (
 	"git.itzana.me/strafesnet/maps-service/pkg/api"
 	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
 	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"git.itzana.me/strafesnet/maps-service/pkg/service_inner"
+	"git.itzana.me/strafesnet/maps-service/pkg/service"
 )

 var(
@@ -61,7 +61,7 @@ func (svc *Service) CreateSubmission(ctx context.Context, request *api.Submissio

 	// Check if user's submissions in the creation phase exceeds the limit
 	{
-		filter := service_inner.NewSubmissionFilter()
+		filter := service.NewSubmissionFilter()
 		filter.SetSubmitter(userId)
 		filter.SetStatuses(CreationPhaseSubmissionStatuses)
 		creation_submissions, err := svc.inner.ListSubmissions(ctx, filter, model.Page{
@@ -219,7 +219,7 @@ func (svc *Service) GetSubmission(ctx context.Context, params api.GetSubmissionP
 //
 // GET /submissions
 func (svc *Service) ListSubmissions(ctx context.Context, params api.ListSubmissionsParams) (*api.Submissions, error) {
-	filter := service_inner.NewSubmissionFilter()
+	filter := service.NewSubmissionFilter()

 	if display_name, display_name_ok := params.DisplayName.Get(); display_name_ok{
 		filter.SetDisplayName(display_name)
@@ -295,7 +295,7 @@ func (svc *Service) SetSubmissionCompleted(ctx context.Context, params api.SetSu
 		return ErrPermissionDeniedNeedRoleMaptest
 	}

-	update := service_inner.NewSubmissionUpdate()
+	update := service.NewSubmissionUpdate()
 	update.SetCompleted(true)
 	return svc.inner.UpdateSubmission(ctx, params.SubmissionID, update)
 }
@@ -334,7 +334,7 @@ func (svc *Service) UpdateSubmissionModel(ctx context.Context, params api.Update
 	NewModelVersion := uint64(params.ModelVersion)

 	// check if Status is ChangesRequested|Submitted|UnderConstruction
-	update := service_inner.NewSubmissionUpdate()
+	update := service.NewSubmissionUpdate()
 	update.SetAssetID(NewModelID)
 	update.SetAssetVersion(NewModelVersion)
 	//always reset completed when model changes
@@ -389,7 +389,7 @@ func (svc *Service) ActionSubmissionReject(ctx context.Context, params api.Actio

 	// transaction
 	target_status := model.SubmissionStatusRejected
-	update := service_inner.NewSubmissionUpdate()
+	update := service.NewSubmissionUpdate()
 	update.SetStatusID(target_status)
 	allowed_statuses := []model.SubmissionStatus{model.SubmissionStatusSubmitted}
 	err = svc.inner.UpdateSubmissionIfStatus(ctx, params.SubmissionID, allowed_statuses, update)
@@ -439,7 +439,7 @@ func (svc *Service) ActionSubmissionRequestChanges(ctx context.Context, params a

 	// transaction
 	target_status := model.SubmissionStatusChangesRequested
-	update := service_inner.NewSubmissionUpdate()
+	update := service.NewSubmissionUpdate()
 	update.SetStatusID(target_status)
 	allowed_statuses := []model.SubmissionStatus{model.SubmissionStatusValidated, model.SubmissionStatusAcceptedUnvalidated, model.SubmissionStatusSubmitted}
 	err = svc.inner.UpdateSubmissionIfStatus(ctx, params.SubmissionID, allowed_statuses, update)
@@ -492,7 +492,7 @@ func (svc *Service) ActionSubmissionRevoke(ctx context.Context, params api.Actio

 	// transaction
 	target_status := model.SubmissionStatusUnderConstruction
-	update := service_inner.NewSubmissionUpdate()
+	update := service.NewSubmissionUpdate()
 	update.SetStatusID(target_status)
 	allowed_statuses := []model.SubmissionStatus{model.SubmissionStatusSubmitted, model.SubmissionStatusChangesRequested}
 	err = svc.inner.UpdateSubmissionIfStatus(ctx, params.SubmissionID, allowed_statuses, update)
@@ -553,7 +553,7 @@ func (svc *Service) ActionSubmissionTriggerSubmit(ctx context.Context, params ap

 	// transaction
 	target_status := model.SubmissionStatusSubmitting
-	update := service_inner.NewSubmissionUpdate()
+	update := service.NewSubmissionUpdate()
 	update.SetStatusID(target_status)
 	allowed_statuses := []model.SubmissionStatus{model.SubmissionStatusUnderConstruction, model.SubmissionStatusChangesRequested}
 	err = svc.inner.UpdateSubmissionIfStatus(ctx, params.SubmissionID, allowed_statuses, update)
@@ -624,7 +624,7 @@ func (svc *Service) ActionSubmissionTriggerSubmitUnchecked(ctx context.Context,

 	// transaction
 	target_status := model.SubmissionStatusSubmitting
-	update := service_inner.NewSubmissionUpdate()
+	update := service.NewSubmissionUpdate()
 	update.SetStatusID(target_status)
 	allowed_statuses := []model.SubmissionStatus{model.SubmissionStatusChangesRequested}
 	err = svc.inner.UpdateSubmissionIfStatus(ctx, params.SubmissionID, allowed_statuses, update)
@@ -690,7 +690,7 @@ func (svc *Service) ActionSubmissionResetSubmitting(ctx context.Context, params

 	// transaction
 	target_status := model.SubmissionStatusUnderConstruction
-	update := service_inner.NewSubmissionUpdate()
+	update := service.NewSubmissionUpdate()
 	update.SetStatusID(target_status)
 	allowed_statuses := []model.SubmissionStatus{model.SubmissionStatusSubmitting}
 	err = svc.inner.UpdateSubmissionIfStatus(ctx, params.SubmissionID, allowed_statuses, update)
@@ -740,7 +740,7 @@ func (svc *Service) ActionSubmissionTriggerUpload(ctx context.Context, params ap

 	// transaction
 	target_status := model.SubmissionStatusUploading
-	update := service_inner.NewSubmissionUpdate()
+	update := service.NewSubmissionUpdate()
 	update.SetStatusID(target_status)
 	allowed_statuses := []model.SubmissionStatus{model.SubmissionStatusValidated}
 	submission, err := svc.inner.UpdateAndGetSubmissionIfStatus(ctx, params.SubmissionID, allowed_statuses, update)
@@ -818,7 +818,7 @@ func (svc *Service) ActionSubmissionValidated(ctx context.Context, params api.Ac

 	// transaction
 	target_status := model.SubmissionStatusValidated
-	update := service_inner.NewSubmissionUpdate()
+	update := service.NewSubmissionUpdate()
 	update.SetStatusID(target_status)
 	allowed_statuses := []model.SubmissionStatus{model.SubmissionStatusUploading}
 	err = svc.inner.UpdateSubmissionIfStatus(ctx, params.SubmissionID, allowed_statuses, update)
@@ -880,7 +880,7 @@ func (svc *Service) ActionSubmissionTriggerValidate(ctx context.Context, params

 	// transaction
 	target_status := model.SubmissionStatusValidating
-	update := service_inner.NewSubmissionUpdate()
+	update := service.NewSubmissionUpdate()
 	update.SetStatusID(target_status)
 	allowed_statuses := []model.SubmissionStatus{model.SubmissionStatusSubmitted}
 	submission, err = svc.inner.UpdateAndGetSubmissionIfStatus(ctx, params.SubmissionID, allowed_statuses, update)
@@ -940,7 +940,7 @@ func (svc *Service) ActionSubmissionRetryValidate(ctx context.Context, params ap

 	// transaction
 	target_status := model.SubmissionStatusValidating
-	update := service_inner.NewSubmissionUpdate()
+	update := service.NewSubmissionUpdate()
 	update.SetStatusID(target_status)
 	allowed_statuses := []model.SubmissionStatus{model.SubmissionStatusAcceptedUnvalidated}
 	submission, err := svc.inner.UpdateAndGetSubmissionIfStatus(ctx, params.SubmissionID, allowed_statuses, update)
@@ -1010,7 +1010,7 @@ func (svc *Service) ActionSubmissionAccepted(ctx context.Context, params api.Act

 	// transaction
 	target_status := model.SubmissionStatusAcceptedUnvalidated
-	update := service_inner.NewSubmissionUpdate()
+	update := service.NewSubmissionUpdate()
 	update.SetStatusID(target_status)
 	allowed_statuses := []model.SubmissionStatus{model.SubmissionStatusValidating}
 	err = svc.inner.UpdateSubmissionIfStatus(ctx, params.SubmissionID, allowed_statuses, update)
@@ -1090,7 +1090,7 @@ func (svc *Service) ReleaseSubmissions(ctx context.Context, request []api.Releas
 		}

 		// update each status to Released
-		update := service_inner.NewSubmissionUpdate()
+		update := service.NewSubmissionUpdate()
 		update.SetStatusID(model.SubmissionStatusReleased)
 		err = svc.inner.UpdateSubmissionIfStatus(ctx, submission.ID, []model.SubmissionStatus{model.SubmissionStatusUploaded}, update)
 		if err != nil {