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

submissions: tweak script data model

Browse Source
This commit is contained in:
Quaternions 2025-03-31 18:13:31 -07:00
parent 746c7aa9b7
commit 8366b84d90
Signed by: Quaternions
GPG Key ID: D0DF5964F79AC131
2 changed files with 17 additions and 8 deletions
pkg
service
scripts.go
service_internal
scripts.go

16
pkg/service/scripts.go

@ -32,7 +32,8 @@ func (svc *Service) CreateScript(ctx context.Context, req *api.ScriptCreate) (*a
Name: req.Name, Name: req.Name,
Hash: int64(model.HashSource(req.Source)), Hash: int64(model.HashSource(req.Source)),
Source: req.Source, Source: req.Source,
SubmissionID: req.SubmissionID.Or(0), ResourceType: model.ResourceType(req.ResourceType),
ResourceID: req.ResourceID.Or(0),
}) })
if err != nil { if err != nil {
return nil, err return nil, err
@ -82,7 +83,8 @@ func (svc *Service) ListScripts(ctx context.Context, params api.ListScriptsParam
ID: item.ID, ID: item.ID,
Hash: model.HashFormat(uint64(item.Hash)), Hash: model.HashFormat(uint64(item.Hash)),
Source: item.Source, Source: item.Source,
SubmissionID: item.SubmissionID, ResourceType: int32(item.ResourceType),
ResourceID: item.ResourceID,
}) })
} }
@ -134,7 +136,8 @@ func (svc *Service) GetScript(ctx context.Context, params api.GetScriptParams) (
Name: script.Name, Name: script.Name,
Hash: model.HashFormat(uint64(script.Hash)), Hash: model.HashFormat(uint64(script.Hash)),
Source: script.Source, Source: script.Source,
SubmissionID: script.SubmissionID, ResourceType: int32(script.ResourceType),
ResourceID: script.ResourceID,
}, nil }, nil
} }
@ -165,8 +168,11 @@ func (svc *Service) UpdateScript(ctx context.Context, req *api.ScriptUpdate, par
pmap.Add("source", source) pmap.Add("source", source)
pmap.Add("hash", int64(model.HashSource(source))) // No type safety! pmap.Add("hash", int64(model.HashSource(source))) // No type safety!
} }
if SubmissionID, ok := req.SubmissionID.Get(); ok { if ResourceType, ok := req.ResourceType.Get(); ok {
pmap.Add("submission_id", SubmissionID) pmap.Add("resource_type", ResourceType)
}
if ResourceID, ok := req.ResourceID.Get(); ok {
pmap.Add("resource_id", ResourceID)
} }
return svc.DB.Scripts().Update(ctx, req.ID, pmap) return svc.DB.Scripts().Update(ctx, req.ID, pmap)
} }

9
pkg/service_internal/scripts.go

@ -19,7 +19,8 @@ func (svc *Service) CreateScript(ctx context.Context, req *api.ScriptCreate) (*a
Name: req.Name, Name: req.Name,
Hash: int64(model.HashSource(req.Source)), Hash: int64(model.HashSource(req.Source)),
Source: req.Source, Source: req.Source,
SubmissionID: req.SubmissionID.Or(0), ResourceType: model.ResourceType(req.ResourceType),
ResourceID: req.ResourceID.Or(0),
}) })
if err != nil { if err != nil {
return nil, err return nil, err
@ -69,7 +70,8 @@ func (svc *Service) ListScripts(ctx context.Context, params api.ListScriptsParam
ID: item.ID, ID: item.ID,
Hash: model.HashFormat(uint64(item.Hash)), Hash: model.HashFormat(uint64(item.Hash)),
Source: item.Source, Source: item.Source,
SubmissionID: item.SubmissionID, ResourceType: int32(item.ResourceType),
ResourceID: item.ResourceID,
}) })
} }
@ -92,6 +94,7 @@ func (svc *Service) GetScript(ctx context.Context, params api.GetScriptParams) (
Name: script.Name, Name: script.Name,
Hash: model.HashFormat(uint64(script.Hash)), Hash: model.HashFormat(uint64(script.Hash)),
Source: script.Source, Source: script.Source,
SubmissionID: script.SubmissionID, ResourceType: int32(script.ResourceType),
ResourceID: script.ResourceID,
}, nil }, nil
} }