From d0b0be4dd4aa128f2d0d879ff31f3aa34a5b7a99 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Thu, 10 Nov 2022 15:01:47 +1100
Subject: [PATCH] Fix test database generator (#3112) [skip ci]

---
 scripts/test_db_generator/makeTestDB.go | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/scripts/test_db_generator/makeTestDB.go b/scripts/test_db_generator/makeTestDB.go
index 075c809ee..347e85873 100644
--- a/scripts/test_db_generator/makeTestDB.go
+++ b/scripts/test_db_generator/makeTestDB.go
@@ -227,20 +227,16 @@ func makePerformers(n int) {
 		if err := retry(100, func() error {
 			return withTxn(func(ctx context.Context) error {
 				name := generatePerformerName()
-				performer := models.Performer{
-					Name:     sql.NullString{String: name, Valid: true},
+				performer := &models.Performer{
+					Name:     name,
 					Checksum: md5.FromString(name),
-					Favorite: sql.NullBool{
-						Bool:  false,
-						Valid: true,
-					},
 				}
 
 				// TODO - set tags
 
-				_, err := repo.Performer.Create(ctx, performer)
+				err := repo.Performer.Create(ctx, performer)
 				if err != nil {
-					err = fmt.Errorf("error creating performer with name: %s: %s", performer.Name.String, err.Error())
+					err = fmt.Errorf("error creating performer with name: %s: %s", performer.Name, err.Error())
 				}
 				return err
 			})
@@ -444,8 +440,8 @@ func makeGalleries(n int) {
 			for ; i < batch && i < n; i++ {
 				gallery := generateGallery(i)
 				gallery.StudioID = getRandomStudioID(ctx)
-				gallery.TagIDs = getRandomTags(ctx, 0, 15)
-				gallery.PerformerIDs = getRandomPerformers(ctx)
+				gallery.TagIDs = models.NewRelatedIDs(getRandomTags(ctx, 0, 15))
+				gallery.PerformerIDs = models.NewRelatedIDs(getRandomPerformers(ctx))
 
 				path := md5.FromString("gallery/" + strconv.Itoa(i))
 				f, err := makeZipFile(ctx, path)
@@ -564,10 +560,10 @@ func getRandomStudioID(ctx context.Context) *int {
 
 func makeSceneRelationships(ctx context.Context, s *models.Scene) {
 	// add tags
-	s.TagIDs = getRandomTags(ctx, 0, 15)
+	s.TagIDs = models.NewRelatedIDs(getRandomTags(ctx, 0, 15))
 
 	// add performers
-	s.PerformerIDs = getRandomPerformers(ctx)
+	s.PerformerIDs = models.NewRelatedIDs(getRandomPerformers(ctx))
 }
 
 func makeImageRelationships(ctx context.Context, i *models.Image) {
@@ -576,12 +572,12 @@ func makeImageRelationships(ctx context.Context, i *models.Image) {
 
 	// add tags
 	if rand.Intn(100) == 0 {
-		i.TagIDs = getRandomTags(ctx, 1, 15)
+		i.TagIDs = models.NewRelatedIDs(getRandomTags(ctx, 1, 15))
 	}
 
 	// add performers
 	if rand.Intn(100) <= 1 {
-		i.PerformerIDs = getRandomPerformers(ctx)
+		i.PerformerIDs = models.NewRelatedIDs(getRandomPerformers(ctx))
 	}
 }