Check for null disambiguation on validate (stashapp#5019)

randemgame · Jun 27, 2024 · b7f9385 · b7f9385
1 parent af6841b
commit b7f9385
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/pkg/performer/validate.go b/pkg/performer/validate.go
@@ -102,11 +102,15 @@ func validateName(ctx context.Context, name string, disambig string, existingID
 		},
 	}
 
+	modifier := models.CriterionModifierIsNull
+
 	if disambig != "" {
-		performerFilter.Disambiguation = &models.StringCriterionInput{
-			Value:    disambig,
-			Modifier: models.CriterionModifierEquals,
-		}
+		modifier = models.CriterionModifierEquals
+	}
+
+	performerFilter.Disambiguation = &models.StringCriterionInput{
+		Value:    disambig,
+		Modifier: modifier,
 	}
 
 	if existingID == nil {

diff --git a/pkg/performer/validate_test.go b/pkg/performer/validate_test.go
@@ -15,6 +15,9 @@ func nameFilter(n string) *models.PerformerFilterType {
 			Value:    n,
 			Modifier: models.CriterionModifierEquals,
 		},
+		Disambiguation: &models.StringCriterionInput{
+			Modifier: models.CriterionModifierIsNull,
+		},
 	}
 }
 
@@ -41,13 +44,6 @@ func TestValidateName(t *testing.T) {
 		newName     = "new name"
 		newDisambig = "new disambiguation"
 	)
-	// existing1 := models.Performer{
-	// 	Name: name1,
-	// }
-	// existing2 := models.Performer{
-	// 	Name:           name2,
-	// 	Disambiguation: disambig,
-	// }
 
 	pp := 1
 	findFilter := &models.FindFilterType{