From 1fe0d9c8a63b1b1418add163206846a2e73eb468 Mon Sep 17 00:00:00 2001
From: mreid-tt <943378+mreid-tt@users.noreply.github.com>
Date: Sun, 19 Jan 2025 21:15:17 -0400
Subject: [PATCH 1/2] Fix: Improve beta property to handle None and empty
 report_url

---
 spkrepo/models.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/spkrepo/models.py b/spkrepo/models.py
index 2cc0613..8ca17c4 100644
--- a/spkrepo/models.py
+++ b/spkrepo/models.py
@@ -462,7 +462,7 @@ def version_string(self):
 
     @hybrid_property
     def beta(self):
-        return self.report_url != None  # noqa: E711
+        return bool(self.report_url)  # Treats None and "" as False
 
     @hybrid_property
     def all_builds_active(self):
@@ -484,6 +484,10 @@ def all_builds_active(cls):
             .label("total_builds")
         )
 
+    @beta.expression
+    def beta(cls):
+        return db.and_(cls.report_url.isnot(None), cls.report_url != "")
+
     @property
     def path(self):
         return os.path.join(self.package.name, str(self.version))

From 1fb4ec5d6ed303e176b96739aa356ecb7c979bb3 Mon Sep 17 00:00:00 2001
From: mreid-tt <943378+mreid-tt@users.noreply.github.com>
Date: Mon, 20 Jan 2025 19:13:58 -0400
Subject: [PATCH 2/2] Fix: Update beta logic and query to handle empty
 report_url

---
 spkrepo/views/nas.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spkrepo/views/nas.py b/spkrepo/views/nas.py
index 9cbeeed..1f8b071 100644
--- a/spkrepo/views/nas.py
+++ b/spkrepo/views/nas.py
@@ -64,7 +64,9 @@ def get_catalog(arch, build, language, beta):
     ).select_from(Version)
 
     if not beta:
-        latest_version = latest_version.filter(Version.report_url.is_(None))
+        latest_version = latest_version.filter(
+            db.or_(Version.report_url.is_(None), Version.report_url == "")
+        )
 
     latest_version = (
         latest_version.join(Build)