StrafesNET/maps-service
4
Fork 4
Code Issues 14 Pull Requests Packages Projects Releases Wiki Activity

make internal service fields private

Browse Source
This commit is contained in:
Rhys Lloyd
2025-07-15 20:31:44 -07:00
parent fbb936c07b
commit e6dc4c65d4
7 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cmds/serve.go
View File

@@ -159,11 +159,9 @@ func serve(ctx *cli.Context) error {
log.WithError(err).Fatal("failed to initialize api server")
}
svc_internal := &service_internal.Service{
Inner: svc_inner,
}
svc_internal := service_internal.MakeService(&svc_inner)
srv_internal, err := internal.NewServer(svc_internal, internal.WithPathPrefix("/v1"))
srv_internal, err := internal.NewServer(&svc_internal, internal.WithPathPrefix("/v1"))
if err != nil {
log.WithError(err).Fatal("failed to initialize api server")
}

14
pkg/service_internal/mapfixes.go
View File

@@ -53,7 +53,7 @@ func (svc *Service) UpdateMapfixValidatedModel(ctx context.Context, params inter
ValidatedModelVersion: ValidatedModelVersion,
}
return svc.Inner.CreateAuditEventChangeValidatedModel(
return svc.inner.CreateAuditEventChangeValidatedModel(
ctx,
ValidtorUserID,
model.Resource{
@@ -87,7 +87,7 @@ func (svc *Service) ActionMapfixSubmitted(ctx context.Context, params internal.A
TargetStatus: uint32(target_status),
}
return svc.Inner.CreateAuditEventAction(
return svc.inner.CreateAuditEventAction(
ctx,
ValidtorUserID,
model.Resource{
@@ -117,7 +117,7 @@ func (svc *Service) ActionMapfixRequestChanges(ctx context.Context, params inter
TargetStatus: uint32(target_status),
}
return svc.Inner.CreateAuditEventAction(
return svc.inner.CreateAuditEventAction(
ctx,
ValidtorUserID,
model.Resource{
@@ -160,7 +160,7 @@ func (svc *Service) ActionMapfixAccepted(ctx context.Context, params internal.Ac
TargetStatus: uint32(target_status),
}
return svc.Inner.CreateAuditEventAction(
return svc.inner.CreateAuditEventAction(
ctx,
ValidtorUserID,
model.Resource{
@@ -190,7 +190,7 @@ func (svc *Service) ActionMapfixUploaded(ctx context.Context, params internal.Ac
TargetStatus: uint32(target_status),
}
return svc.Inner.CreateAuditEventAction(
return svc.inner.CreateAuditEventAction(
ctx,
ValidtorUserID,
model.Resource{
@@ -211,7 +211,7 @@ func (svc *Service) CreateMapfixAuditError(ctx context.Context, params internal.
Error: params.ErrorMessage,
}
return svc.Inner.CreateAuditEventError(
return svc.inner.CreateAuditEventError(
ctx,
ValidtorUserID,
model.Resource{
@@ -241,7 +241,7 @@ func (svc *Service) CreateMapfixAuditCheckList(ctx context.Context, check_list i
CheckList: check_list2,
}
return svc.Inner.CreateAuditEventCheckList(
return svc.inner.CreateAuditEventCheckList(
ctx,
ValidtorUserID,
model.Resource{

2
pkg/service_internal/operations.go
View File

@@ -18,5 +18,5 @@ func (svc *Service) ActionOperationFailed(ctx context.Context, params internal.A
model.OperationStatusFailed,
params.StatusMessage,
)
return svc.Inner.FailOperation(ctx, params.OperationID, fail_params)
return svc.inner.FailOperation(ctx, params.OperationID, fail_params)
}

6
pkg/service_internal/script_policy.go
View File

@@ -14,14 +14,14 @@ import (
//
// POST /script-policy
func (svc *Service) CreateScriptPolicy(ctx context.Context, req *api.ScriptPolicyCreate) (*api.ScriptPolicyID, error) {
from_script, err := svc.Inner.GetScript(ctx, req.FromScriptID)
from_script, err := svc.inner.GetScript(ctx, req.FromScriptID)
if err != nil {
return nil, err
}
// the existence of ToScriptID does not need to be validated because it's checked by a foreign key constraint.
script, err := svc.Inner.CreateScriptPolicy(ctx, model.ScriptPolicy{
script, err := svc.inner.CreateScriptPolicy(ctx, model.ScriptPolicy{
ID: 0,
FromScriptHash: from_script.Hash,
ToScriptID: req.ToScriptID,
@@ -59,7 +59,7 @@ func (svc *Service) ListScriptPolicy(ctx context.Context, params api.ListScriptP
policy, policy_ok,
)
items, err := svc.Inner.ListScriptPolicies(ctx, filter, model.Page{
items, err := svc.inner.ListScriptPolicies(ctx, filter, model.Page{
Number: params.Page,
Size: params.Limit,
})

6
pkg/service_internal/scripts.go
View File

@@ -14,7 +14,7 @@ import (
//
// POST /scripts
func (svc *Service) CreateScript(ctx context.Context, req *api.ScriptCreate) (*api.ScriptID, error) {
script, err := svc.Inner.CreateScript(ctx, model.Script{
script, err := svc.inner.CreateScript(ctx, model.Script{
ID: 0,
Name: req.Name,
Hash: int64(model.HashSource(req.Source)),
@@ -58,7 +58,7 @@ func (svc *Service) ListScripts(ctx context.Context, params api.ListScriptsParam
resource_id, resource_id_ok,
)
items, err := svc.Inner.ListScripts(ctx, filter, model.Page{
items, err := svc.inner.ListScripts(ctx, filter, model.Page{
Number: params.Page,
Size: params.Limit,
})
@@ -87,7 +87,7 @@ func (svc *Service) ListScripts(ctx context.Context, params api.ListScriptsParam
//
// GET /scripts/{ScriptID}
func (svc *Service) GetScript(ctx context.Context, params api.GetScriptParams) (*api.Script, error) {
script, err := svc.Inner.GetScript(ctx, params.ScriptID)
script, err := svc.inner.GetScript(ctx, params.ScriptID)
if err != nil {
return nil, err
}

10
pkg/service_internal/service_internal.go
View File

@@ -19,7 +19,15 @@ var (
)
type Service struct {
Inner *service_inner.Service
inner *service_inner.Service
}
func MakeService(
inner *service_inner.Service,
) Service {
return Service{
inner: inner,
}
}
// yay duplicate code

16
pkg/service_internal/submissions.go
View File

@@ -53,7 +53,7 @@ func (svc *Service) UpdateSubmissionValidatedModel(ctx context.Context, params i
ValidatedModelVersion: ValidatedModelVersion,
}
return svc.Inner.CreateAuditEventChangeValidatedModel(
return svc.inner.CreateAuditEventChangeValidatedModel(
ctx,
ValidtorUserID,
model.Resource{
@@ -87,7 +87,7 @@ func (svc *Service) ActionSubmissionSubmitted(ctx context.Context, params intern
TargetStatus: uint32(target_status),
}
return svc.Inner.CreateAuditEventAction(
return svc.inner.CreateAuditEventAction(
ctx,
ValidtorUserID,
model.Resource{
@@ -118,7 +118,7 @@ func (svc *Service) ActionSubmissionRequestChanges(ctx context.Context, params i
TargetStatus: uint32(target_status),
}
return svc.Inner.CreateAuditEventAction(
return svc.inner.CreateAuditEventAction(
ctx,
ValidtorUserID,
model.Resource{
@@ -148,7 +148,7 @@ func (svc *Service) ActionSubmissionValidated(ctx context.Context, params intern
TargetStatus: uint32(target_status),
}
return svc.Inner.CreateAuditEventAction(
return svc.inner.CreateAuditEventAction(
ctx,
ValidtorUserID,
model.Resource{
@@ -179,7 +179,7 @@ func (svc *Service) ActionSubmissionAccepted(ctx context.Context, params interna
TargetStatus: uint32(target_status),
}
return svc.Inner.CreateAuditEventAction(
return svc.inner.CreateAuditEventAction(
ctx,
ValidtorUserID,
model.Resource{
@@ -210,7 +210,7 @@ func (svc *Service) ActionSubmissionUploaded(ctx context.Context, params interna
TargetStatus: uint32(target_status),
}
return svc.Inner.CreateAuditEventAction(
return svc.inner.CreateAuditEventAction(
ctx,
ValidtorUserID,
model.Resource{
@@ -231,7 +231,7 @@ func (svc *Service) CreateSubmissionAuditError(ctx context.Context, params inter
Error: params.ErrorMessage,
}
return svc.Inner.CreateAuditEventError(
return svc.inner.CreateAuditEventError(
ctx,
ValidtorUserID,
model.Resource{
@@ -261,7 +261,7 @@ func (svc *Service) CreateSubmissionAuditCheckList(ctx context.Context, check_li
CheckList: check_list2,
}
return svc.Inner.CreateAuditEventCheckList(
return svc.inner.CreateAuditEventCheckList(
ctx,
ValidtorUserID,
model.Resource{