From 220ea84e223d50b4bba5a9aa64f13023606c7e79 Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Sat, 5 Apr 2025 19:36:36 -0700
Subject: [PATCH] submissions: AddNotNil is for pointers
---
pkg/service/mapfixes.go | 4 ++--
pkg/service/script_policy.go | 6 +++---
pkg/service/scripts.go | 10 +++++-----
pkg/service/submissions.go | 4 ++--
pkg/service_internal/mapfixes.go | 4 ++--
pkg/service_internal/script_policy.go | 6 +++---
pkg/service_internal/scripts.go | 10 +++++-----
pkg/service_internal/submissions.go | 4 ++--
8 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/pkg/service/mapfixes.go b/pkg/service/mapfixes.go
index b8e0de3..d81f7fe 100644
--- a/pkg/service/mapfixes.go
+++ b/pkg/service/mapfixes.go
@@ -257,8 +257,8 @@ func (svc *Service) UpdateMapfixModel(ctx context.Context, params api.UpdateMapf
// check if Status is ChangesRequested|Submitted|UnderConstruction
pmap := datastore.Optional()
- pmap.AddNotNil("asset_id", params.ModelID)
- pmap.AddNotNil("asset_version", params.ModelVersion)
+ pmap.Add("asset_id", params.ModelID)
+ pmap.Add("asset_version", params.ModelVersion)
//always reset completed when model changes
pmap.Add("completed", false)
return svc.DB.Mapfixes().IfStatusThenUpdate(ctx, params.MapfixID, []model.MapfixStatus{model.MapfixStatusChangesRequested, model.MapfixStatusSubmitted, model.MapfixStatusUnderConstruction}, pmap)
diff --git a/pkg/service/script_policy.go b/pkg/service/script_policy.go
index a1a2711..771ab5c 100644
--- a/pkg/service/script_policy.go
+++ b/pkg/service/script_policy.go
@@ -63,13 +63,13 @@ func (svc *Service) ListScriptPolicy(ctx context.Context, params api.ListScriptP
if err != nil {
return nil, err
}
- filter.AddNotNil("from_script_hash", int64(hash)) // No type safety!
+ filter.Add("from_script_hash", int64(hash)) // No type safety!
}
if params.ToScriptID.IsSet(){
- filter.AddNotNil("to_script_id", params.ToScriptID.Value)
+ filter.Add("to_script_id", params.ToScriptID.Value)
}
if params.Policy.IsSet(){
- filter.AddNotNil("policy", params.Policy.Value)
+ filter.Add("policy", params.Policy.Value)
}
items, err := svc.DB.ScriptPolicy().List(ctx, filter, model.Page{
diff --git a/pkg/service/scripts.go b/pkg/service/scripts.go
index 75a03c0..e1f35de 100644
--- a/pkg/service/scripts.go
+++ b/pkg/service/scripts.go
@@ -57,19 +57,19 @@ func (svc *Service) ListScripts(ctx context.Context, params api.ListScriptsParam
if err != nil {
return nil, err
}
- filter.AddNotNil("hash", int64(hash)) // No type safety!
+ filter.Add("hash", int64(hash)) // No type safety!
}
if params.Name.IsSet(){
- filter.AddNotNil("name", params.Name.Value)
+ filter.Add("name", params.Name.Value)
}
if params.Source.IsSet(){
- filter.AddNotNil("source", params.Source.Value)
+ filter.Add("source", params.Source.Value)
}
if params.ResourceType.IsSet(){
- filter.AddNotNil("resource_type", params.ResourceType.Value)
+ filter.Add("resource_type", params.ResourceType.Value)
}
if params.ResourceID.IsSet(){
- filter.AddNotNil("resource_id", params.ResourceID.Value)
+ filter.Add("resource_id", params.ResourceID.Value)
}
items, err := svc.DB.Scripts().List(ctx, filter, model.Page{
diff --git a/pkg/service/submissions.go b/pkg/service/submissions.go
index d7fccf0..cca0206 100644
--- a/pkg/service/submissions.go
+++ b/pkg/service/submissions.go
@@ -246,8 +246,8 @@ func (svc *Service) UpdateSubmissionModel(ctx context.Context, params api.Update
// check if Status is ChangesRequested|Submitted|UnderConstruction
pmap := datastore.Optional()
- pmap.AddNotNil("asset_id", params.ModelID)
- pmap.AddNotNil("asset_version", params.ModelVersion)
+ pmap.Add("asset_id", params.ModelID)
+ pmap.Add("asset_version", params.ModelVersion)
//always reset completed when model changes
pmap.Add("completed", false)
return svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.SubmissionStatus{model.SubmissionStatusChangesRequested, model.SubmissionStatusUnderConstruction}, pmap)
diff --git a/pkg/service_internal/mapfixes.go b/pkg/service_internal/mapfixes.go
index f270021..1897398 100644
--- a/pkg/service_internal/mapfixes.go
+++ b/pkg/service_internal/mapfixes.go
@@ -36,8 +36,8 @@ var(
func (svc *Service) UpdateMapfixValidatedModel(ctx context.Context, params internal.UpdateMapfixValidatedModelParams) error {
// check if Status is ChangesRequested|Submitted|UnderConstruction
pmap := datastore.Optional()
- pmap.AddNotNil("validated_asset_id", params.ValidatedModelID)
- pmap.AddNotNil("validated_asset_version", params.ValidatedModelVersion)
+ pmap.Add("validated_asset_id", params.ValidatedModelID)
+ pmap.Add("validated_asset_version", params.ValidatedModelVersion)
// DO NOT reset completed when validated model is updated
// pmap.Add("completed", false)
return svc.DB.Mapfixes().IfStatusThenUpdate(ctx, params.MapfixID, []model.MapfixStatus{model.MapfixStatusValidating}, pmap)
diff --git a/pkg/service_internal/script_policy.go b/pkg/service_internal/script_policy.go
index b7fda34..3fd9b4e 100644
--- a/pkg/service_internal/script_policy.go
+++ b/pkg/service_internal/script_policy.go
@@ -49,13 +49,13 @@ func (svc *Service) ListScriptPolicy(ctx context.Context, params api.ListScriptP
if err != nil {
return nil, err
}
- filter.AddNotNil("from_script_hash", int64(hash)) // No type safety!
+ filter.Add("from_script_hash", int64(hash)) // No type safety!
}
if params.ToScriptID.IsSet(){
- filter.AddNotNil("to_script_id", params.ToScriptID.Value)
+ filter.Add("to_script_id", params.ToScriptID.Value)
}
if params.Policy.IsSet(){
- filter.AddNotNil("policy", params.Policy.Value)
+ filter.Add("policy", params.Policy.Value)
}
items, err := svc.DB.ScriptPolicy().List(ctx, filter, model.Page{
diff --git a/pkg/service_internal/scripts.go b/pkg/service_internal/scripts.go
index cd4983d..6e19c98 100644
--- a/pkg/service_internal/scripts.go
+++ b/pkg/service_internal/scripts.go
@@ -44,19 +44,19 @@ func (svc *Service) ListScripts(ctx context.Context, params api.ListScriptsParam
if err != nil {
return nil, err
}
- filter.AddNotNil("hash", int64(hash)) // No type safety!
+ filter.Add("hash", int64(hash)) // No type safety!
}
if params.Name.IsSet(){
- filter.AddNotNil("name", params.Name.Value)
+ filter.Add("name", params.Name.Value)
}
if params.Source.IsSet(){
- filter.AddNotNil("source", params.Source.Value)
+ filter.Add("source", params.Source.Value)
}
if params.ResourceType.IsSet(){
- filter.AddNotNil("resource_type", params.ResourceType.Value)
+ filter.Add("resource_type", params.ResourceType.Value)
}
if params.ResourceID.IsSet(){
- filter.AddNotNil("resource_id", params.ResourceID.Value)
+ filter.Add("resource_id", params.ResourceID.Value)
}
items, err := svc.DB.Scripts().List(ctx, filter, model.Page{
diff --git a/pkg/service_internal/submissions.go b/pkg/service_internal/submissions.go
index 0100189..2fc0465 100644
--- a/pkg/service_internal/submissions.go
+++ b/pkg/service_internal/submissions.go
@@ -35,8 +35,8 @@ var(
func (svc *Service) UpdateSubmissionValidatedModel(ctx context.Context, params internal.UpdateSubmissionValidatedModelParams) error {
// check if Status is ChangesRequested|Submitted|UnderConstruction
pmap := datastore.Optional()
- pmap.AddNotNil("validated_asset_id", params.ValidatedModelID)
- pmap.AddNotNil("validated_asset_version", params.ValidatedModelVersion)
+ pmap.Add("validated_asset_id", params.ValidatedModelID)
+ pmap.Add("validated_asset_version", params.ValidatedModelVersion)
// DO NOT reset completed when validated model is updated
// pmap.Add("completed", false)
return svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.SubmissionStatus{model.SubmissionStatusValidating}, pmap)