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

submissions: use explicit ID types

Browse Source
This commit is contained in:
Quaternions 2025-04-03 11:10:34 -07:00 committed by Quaternions
parent 1e012af52e
commit c9041168e5
6 changed files with 18 additions and 18 deletions

6
pkg/service/script_policy.go

@ -13,7 +13,7 @@ import (
// Create a new script policy. // Create a new script policy.
// //
// POST /script-policy // POST /script-policy
func (svc *Service) CreateScriptPolicy(ctx context.Context, req *api.ScriptPolicyCreate) (*api.ID, error) { func (svc *Service) CreateScriptPolicy(ctx context.Context, req *api.ScriptPolicyCreate) (*api.ScriptPolicyID, error) {
userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle) userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
if !ok { if !ok {
return nil, ErrUserInfo return nil, ErrUserInfo
@ -44,8 +44,8 @@ func (svc *Service) CreateScriptPolicy(ctx context.Context, req *api.ScriptPolic
return nil, err return nil, err
} }
return &api.ID{ return &api.ScriptPolicyID{
ID: script.ID, ScriptPolicyID: script.ID,
}, nil }, nil
} }

6
pkg/service/scripts.go

@ -13,7 +13,7 @@ import (
// Create a new script. // Create a new script.
// //
// POST /scripts // POST /scripts
func (svc *Service) CreateScript(ctx context.Context, req *api.ScriptCreate) (*api.ID, error) { func (svc *Service) CreateScript(ctx context.Context, req *api.ScriptCreate) (*api.ScriptID, error) {
userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle) userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
if !ok { if !ok {
return nil, ErrUserInfo return nil, ErrUserInfo
@ -39,8 +39,8 @@ func (svc *Service) CreateScript(ctx context.Context, req *api.ScriptCreate) (*a
return nil, err return nil, err
} }
return &api.ID{ return &api.ScriptID{
ID: script.ID, ScriptID: script.ID,
}, nil }, nil
} }

6
pkg/service_internal/mapfixes.go

@ -80,7 +80,7 @@ func (svc *Service) ActionMapfixUploaded(ctx context.Context, params internal.Ac
} }
// POST /mapfixes // POST /mapfixes
func (svc *Service) CreateMapfix(ctx context.Context, request *internal.MapfixCreate) (*internal.ID, error) { func (svc *Service) CreateMapfix(ctx context.Context, request *internal.MapfixCreate) (*internal.MapfixID, error) {
// Check if an active mapfix with the same asset id exists // Check if an active mapfix with the same asset id exists
{ {
filter := datastore.Optional() filter := datastore.Optional()
@ -125,7 +125,7 @@ func (svc *Service) CreateMapfix(ctx context.Context, request *internal.MapfixCr
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &internal.ID{ return &internal.MapfixID{
ID: mapfix.ID, MapfixID: mapfix.ID,
}, nil }, nil
} }

6
pkg/service_internal/script_policy.go

@ -13,7 +13,7 @@ import (
// Create a new script policy. // Create a new script policy.
// //
// POST /script-policy // POST /script-policy
func (svc *Service) CreateScriptPolicy(ctx context.Context, req *api.ScriptPolicyCreate) (*api.ID, error) { func (svc *Service) CreateScriptPolicy(ctx context.Context, req *api.ScriptPolicyCreate) (*api.ScriptPolicyID, error) {
from_script, err := svc.DB.Scripts().Get(ctx, req.FromScriptID) from_script, err := svc.DB.Scripts().Get(ctx, req.FromScriptID)
if err != nil { if err != nil {
return nil, err return nil, err
@ -31,8 +31,8 @@ func (svc *Service) CreateScriptPolicy(ctx context.Context, req *api.ScriptPolic
return nil, err return nil, err
} }
return &api.ID{ return &api.ScriptPolicyID{
ID: script.ID, ScriptPolicyID: script.ID,
}, nil }, nil
} }

6
pkg/service_internal/scripts.go

@ -13,7 +13,7 @@ import (
// Create a new script. // Create a new script.
// //
// POST /scripts // POST /scripts
func (svc *Service) CreateScript(ctx context.Context, req *api.ScriptCreate) (*api.ID, error) { func (svc *Service) CreateScript(ctx context.Context, req *api.ScriptCreate) (*api.ScriptID, error) {
script, err := svc.DB.Scripts().Create(ctx, model.Script{ script, err := svc.DB.Scripts().Create(ctx, model.Script{
ID: 0, ID: 0,
Name: req.Name, Name: req.Name,
@ -26,8 +26,8 @@ func (svc *Service) CreateScript(ctx context.Context, req *api.ScriptCreate) (*a
return nil, err return nil, err
} }
return &api.ID{ return &api.ScriptID{
ID: script.ID, ScriptID: script.ID,
}, nil }, nil
} }

6
pkg/service_internal/submissions.go

@ -80,7 +80,7 @@ func (svc *Service) ActionSubmissionUploaded(ctx context.Context, params interna
} }
// POST /submissions // POST /submissions
func (svc *Service) CreateSubmission(ctx context.Context, request *internal.SubmissionCreate) (*internal.ID, error) { func (svc *Service) CreateSubmission(ctx context.Context, request *internal.SubmissionCreate) (*internal.SubmissionID, error) {
// Check if an active submission with the same asset id exists // Check if an active submission with the same asset id exists
{ {
filter := datastore.Optional() filter := datastore.Optional()
@ -124,7 +124,7 @@ func (svc *Service) CreateSubmission(ctx context.Context, request *internal.Subm
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &internal.ID{ return &internal.SubmissionID{
ID: submission.ID, SubmissionID: submission.ID,
}, nil }, nil
} }