From 0cf704dba3d1f004a3e17de69b8093281b813393 Mon Sep 17 00:00:00 2001
From: ze0s <43699394+zze0s@users.noreply.github.com>
Date: Thu, 26 Dec 2024 01:04:39 +0100
Subject: [PATCH] fix(releases): add null handling for new fields (#1892)

* fix(web): react fragment props warnings

* fix(releases): handle new NULL values
---
 internal/database/postgres_migrate.go |  2 +-
 internal/database/release.go          | 11 +++++++----
 internal/database/sqlite_migrate.go   |  2 +-
 web/src/components/inputs/select.tsx  |  4 ++--
 web/src/screens/settings/Releases.tsx |  4 ++--
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/internal/database/postgres_migrate.go b/internal/database/postgres_migrate.go
index 399f9c5..208919e 100644
--- a/internal/database/postgres_migrate.go
+++ b/internal/database/postgres_migrate.go
@@ -1257,7 +1257,7 @@ ALTER TABLE "release"
     ADD IF NOT EXISTS cut TEXT;
 
 ALTER TABLE "release"
-    ADD IF NOT EXISTS hybrid TEXT;
+    ADD IF NOT EXISTS hybrid BOOLEAN DEFAULT FALSE;
 
 ALTER TABLE "release"
     ADD IF NOT EXISTS region TEXT;
diff --git a/internal/database/release.go b/internal/database/release.go
index 36aeff6..627330e 100644
--- a/internal/database/release.go
+++ b/internal/database/release.go
@@ -367,7 +367,7 @@ func (repo *ReleaseRepo) findReleases(ctx context.Context, tx *Tx, params domain
 		var rls domain.Release
 		var ras domain.ReleaseActionStatus
 
-		var rlsIndexer, rlsIndexerName, rlsIndexerExternalName, rlsFilter, rlsAnnounceType, infoUrl, downloadUrl, subTitle, normalizedHash, codec, hdr, rlsType, audioStr, languageStr, editionStr, cutStr, website sql.NullString
+		var rlsIndexer, rlsIndexerName, rlsIndexerExternalName, rlsFilter, rlsAnnounceType, infoUrl, downloadUrl, subTitle, normalizedHash, codec, hdr, rlsType, audioStr, audioChannels, region, languageStr, editionStr, cutStr, website, mediaProcessing sql.NullString
 
 		var rlsIndexerID sql.NullInt64
 		var rasId, rasFilterId, rasReleaseId, rasActionId sql.NullInt64
@@ -403,9 +403,9 @@ func (repo *ReleaseRepo) findReleases(ctx context.Context, tx *Tx, params domain
 			&rls.Container,
 			&hdr,
 			&audioStr,
-			&rls.AudioChannels,
+			&audioChannels,
 			&rls.Group,
-			&rls.Region,
+			&region,
 			&languageStr,
 			&editionStr,
 			&cutStr,
@@ -413,7 +413,7 @@ func (repo *ReleaseRepo) findReleases(ctx context.Context, tx *Tx, params domain
 			&rls.Proper,
 			&rls.Repack,
 			&website,
-			&rls.MediaProcessing,
+			&mediaProcessing,
 			&rlsType,
 			&rls.Timestamp,
 			&rasId, &rasStatus, &rasAction, &rasActionId, &rasType, &rasClient, &rasFilter, &rasFilterId, &rasReleaseId, pq.Array(&rasRejections), &rasTimestamp, &resp.TotalCount,
@@ -471,10 +471,13 @@ func (repo *ReleaseRepo) findReleases(ctx context.Context, tx *Tx, params domain
 		rls.Codec = strings.Split(codec.String, ",")
 		rls.HDR = strings.Split(hdr.String, ",")
 		rls.Audio = strings.Split(audioStr.String, ",")
+		rls.AudioChannels = audioChannels.String
 		rls.Language = strings.Split(languageStr.String, ",")
+		rls.Region = region.String
 		rls.Edition = strings.Split(editionStr.String, ",")
 		rls.Cut = strings.Split(cutStr.String, ",")
 		rls.Website = website.String
+		rls.MediaProcessing = mediaProcessing.String
 		//rls.Type = rlsType.String
 		if rlsType.Valid {
 			rls.ParseType(rlsType.String)
diff --git a/internal/database/sqlite_migrate.go b/internal/database/sqlite_migrate.go
index 6e1801d..2130290 100644
--- a/internal/database/sqlite_migrate.go
+++ b/internal/database/sqlite_migrate.go
@@ -1902,7 +1902,7 @@ ALTER TABLE "release"
     ADD cut TEXT;
 
 ALTER TABLE "release"
-    ADD hybrid TEXT;
+    ADD hybrid BOOLEAN DEFAULT FALSE;
 
 ALTER TABLE "release"
     ADD region TEXT;
diff --git a/web/src/components/inputs/select.tsx b/web/src/components/inputs/select.tsx
index f8698ab..8368bd2 100644
--- a/web/src/components/inputs/select.tsx
+++ b/web/src/components/inputs/select.tsx
@@ -510,7 +510,7 @@ export const AgeSelect = ({
         setDuration(value);
       }}>
         {({ open }) => (
-          <>
+          <div>
             <div className="mt-0 relative">
               <ListboxButton className="block w-full relative shadow-sm text-sm text-left rounded-md border pl-3 pr-10 py-2.5 focus:ring-blue-500 dark:focus:ring-blue-500 focus:border-blue-500 dark:focus:border-blue-500 border-gray-300 dark:border-gray-700 bg-gray-100 dark:bg-gray-815 dark:text-gray-400">
                 <span className="block truncate text-gray-500 dark:text-white">
@@ -552,7 +552,7 @@ export const AgeSelect = ({
                 </ListboxOptions>
               </Transition>
             </div>
-          </>
+          </div>
         )}
       </Listbox>
     </div>
diff --git a/web/src/screens/settings/Releases.tsx b/web/src/screens/settings/Releases.tsx
index 06d7419..752239c 100644
--- a/web/src/screens/settings/Releases.tsx
+++ b/web/src/screens/settings/Releases.tsx
@@ -278,10 +278,10 @@ function DeleteReleases() {
           {[
             {
               label: (
-                <>
+                <span>
                   Older than:
                   <span className="text-red-600 dark:text-red-500"> *</span>
-                </>
+                </span>
               ),
               content: <AgeSelect duration={duration} setDuration={setDuration} setParsedDuration={setParsedDuration}/>
             },