fix: mod creation with logo (#96)

satisfactorymodding · Oct 8, 2024 · d2bc3c1 · d2bc3c1
1 parent 4363f9b
commit d2bc3c1
Show file tree

Hide file tree

Showing 11 changed files with 98 additions and 27 deletions.
diff --git a/db/schema/mod.go b/db/schema/mod.go
@@ -26,7 +26,7 @@ func (Mod) Fields() []ent.Field {
 		field.String("name").MaxLen(32),
 		field.String("short_description").MaxLen(128),
 		field.String("full_description"),
-		field.String("logo"),
+		field.String("logo").Optional(),
 		field.String("logo_thumbhash").Optional(),
 		field.String("source_url").Optional(),
 		field.String("creator_id"),

diff --git a/generated/ent/internal/schema.go b/generated/ent/internal/schema.go
diff --git a/generated/ent/migrate/schema.go b/generated/ent/migrate/schema.go
diff --git a/generated/ent/mod/where.go b/generated/ent/mod/where.go
diff --git a/generated/ent/mod_create.go b/generated/ent/mod_create.go
diff --git a/generated/ent/mod_update.go b/generated/ent/mod_update.go
diff --git a/generated/ent/mutation.go b/generated/ent/mutation.go
diff --git a/gql/resolver_mods.go b/gql/resolver_mods.go
@@ -80,23 +80,6 @@ func (r *mutationResolver) CreateMod(ctx context.Context, newMod generated.NewMo
 
 	dbMod.SetCreatorID(user.ID)
 
-	var logoData []byte
-	var thumbHash string
-
-	if newMod.Logo != nil {
-		file, err := io.ReadAll(newMod.Logo.File)
-		if err != nil {
-			return nil, fmt.Errorf("failed to read logo file: %w", err)
-		}
-
-		logoData, thumbHash, err = converter.ConvertAnyImageToWebp(ctx, file)
-		if err != nil {
-			return nil, fmt.Errorf("failed to convert logo file: %w", err)
-		}
-	} else {
-		dbMod.SetLogo("")
-	}
-
 	// Allow only new 4 mods per 24h
 	existingMods, err := db.From(ctx).Mod.Query().
 		Order(mod.ByCreatedAt(sql.OrderAsc())).
@@ -136,12 +119,22 @@ func (r *mutationResolver) CreateMod(ctx context.Context, newMod generated.NewMo
 		return nil, err
 	}
 
-	if logoData != nil {
+	if newMod.Logo != nil {
+		file, err := io.ReadAll(newMod.Logo.File)
+		if err != nil {
+			return nil, fmt.Errorf("failed to read logo file: %w", err)
+		}
+
+		logoData, thumbHash, err := converter.ConvertAnyImageToWebp(ctx, file)
+		if err != nil {
+			return nil, fmt.Errorf("failed to convert logo file: %w", err)
+		}
+
 		logoKey, err := storage.UploadModLogo(ctx, resultMod.ID, bytes.NewReader(logoData))
 		if err == nil {
 			resultMod, err = resultMod.Update().
 				SetLogo(storage.GenerateDownloadLink(ctx, logoKey)).
-				SetNillableLogoThumbhash(util.ContainsOrNil(thumbHash)).
+				SetLogoThumbhash(thumbHash).
 				Save(ctx)
 			if err != nil {
 				return nil, err
@@ -208,7 +201,7 @@ func (r *mutationResolver) UpdateMod(ctx context.Context, modID string, updateMo
 			dbUpdate.SetLogo(storage.GenerateDownloadLink(ctx, logoKey))
 			dbUpdate.SetLogoThumbhash(thumbHash)
 		} else {
-			dbUpdate.SetLogo("")
+			dbUpdate.ClearLogo()
 			dbUpdate.ClearLogoThumbhash()
 		}
 	}

diff --git a/migrations/sql/20241008092121_nullable_mod_logo.down.sql b/migrations/sql/20241008092121_nullable_mod_logo.down.sql
@@ -0,0 +1,2 @@
+-- reverse: modify "mods" table
+ALTER TABLE "mods" ALTER COLUMN "logo" SET NOT NULL;
diff --git a/migrations/sql/20241008092121_nullable_mod_logo.up.sql b/migrations/sql/20241008092121_nullable_mod_logo.up.sql
@@ -0,0 +1,2 @@
+-- modify "mods" table
+ALTER TABLE "mods" ALTER COLUMN "logo" DROP NOT NULL;
diff --git a/migrations/sql/atlas.sum b/migrations/sql/atlas.sum
@@ -1,4 +1,4 @@
-h1:EOAzeUdvTGahAD3VGUxcEW7xEMJthrP36wbaIBYE6Fs=
+h1:NVXwUmNMPEOBFBSqgQGuw/OMarJOpSsxkE/8o1qQH3k=
 000001_create_initial_tables.down.sql h1:QcXXwE8ir3PM3vZjQfBihY55WiuLYjN8pbbk/L6U+bs=
 000001_create_initial_tables.up.sql h1:EfAqETefs7TW9BDVS4ukiB7wUFs+HQzVdc3qHhdAFd4=
 000002_create_user_group_table.down.sql h1:uJjRbQ3H7yvPGNXLD5iSPmderEoWhCNGdsqN8yqBIRY=
@@ -77,3 +77,5 @@ h1:EOAzeUdvTGahAD3VGUxcEW7xEMJthrP36wbaIBYE6Fs=
 20241002191358_state_fix.up.sql h1:4bVw9fxEP9MrHBSYuRF3vFCgaWF79EUeacD3e+vSQR4=
 20241003161005_create_virustotal_results_table.down.sql h1:BPUQ6UnWq6Inwz2GhZLoy4/QghPhClf1PlfZHis92P4=
 20241003161005_create_virustotal_results_table.up.sql h1:mXMWj998hZ59bbkZYIbbyxU9foptzWuXHnlS2UuY4bY=
+20241008092121_nullable_mod_logo.down.sql h1:vKZrz/FqaaQctvzrTR0EvQcyQ6ENWgTbcud7q2/NvnY=
+20241008092121_nullable_mod_logo.up.sql h1:7ePponYitScS4NnMP+hRoEAKnvPPpbCHXMxilYzfmD8=
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- reverse: modify "mods" table
		ALTER TABLE "mods" ALTER COLUMN "logo" SET NOT NULL;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- modify "mods" table
		ALTER TABLE "mods" ALTER COLUMN "logo" DROP NOT NULL;