From eb028fe5610a429a9e4f66115cec83b2ea2bae54 Mon Sep 17 00:00:00 2001
From: Brandon Thomas <echelon@gmail.com>
Date: Fri, 7 Jan 2022 02:59:29 -0500
Subject: [PATCH] Filter out deleted category assignments

---
 .../list_tts_model_category_assignments.rs    |  6 +-
 sqlx-data.json                                | 76 +++++++++----------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/crates/app/storyteller_web/src/database/queries/categories/list_tts_model_category_assignments.rs b/crates/app/storyteller_web/src/database/queries/categories/list_tts_model_category_assignments.rs
index e1c4ee0077..f4aabcffb9 100644
--- a/crates/app/storyteller_web/src/database/queries/categories/list_tts_model_category_assignments.rs
+++ b/crates/app/storyteller_web/src/database/queries/categories/list_tts_model_category_assignments.rs
@@ -40,9 +40,7 @@ pub struct CategoryAssignment {
   pub category_token: String,
 }
 
-// NB: This shows for all models, including deleted and unapproved.
-// However, it does not return deleted/unapproved categories.
-pub async fn list_tts_model_category_assignments(mysql_pool: &MySqlPool) -> AnyhowResult<Vec<CategoryAssignment>> {
+async fn list_tts_model_category_assignments(mysql_pool: &MySqlPool) -> AnyhowResult<Vec<CategoryAssignment>> {
   let maybe_results = sqlx::query_as!(
       CategoryAssignment,
         r#"
@@ -58,6 +56,8 @@ WHERE
     tts.is_locked_from_use IS FALSE
     AND tts.user_deleted_at IS NULL
     AND tts.mod_deleted_at IS NULL
+    AND assignments.deleted_at IS NULL
+
         "#,
     )
       .fetch_all(mysql_pool)
diff --git a/sqlx-data.json b/sqlx-data.json
index bfde92b74c..3034afff0e 100644
--- a/sqlx-data.json
+++ b/sqlx-data.json
@@ -337,44 +337,6 @@
       ]
     }
   },
-  "013e26fbe298b3de8403f9541807190fe556470c55b7ca342a50aaafea1bbb87": {
-    "query": "\nSELECT\n    assignments.model_token AS tts_model_token,\n    assignments.category_token\nFROM\n    tts_category_assignments AS assignments\nJOIN\n    tts_models AS tts\n    ON assignments.model_token = tts.token\nWHERE\n    tts.is_locked_from_use IS FALSE\n    AND tts.user_deleted_at IS NULL\n    AND tts.mod_deleted_at IS NULL\n        ",
-    "describe": {
-      "columns": [
-        {
-          "ordinal": 0,
-          "name": "tts_model_token",
-          "type_info": {
-            "type": "VarString",
-            "flags": {
-              "bits": 4233
-            },
-            "char_set": 224,
-            "max_size": 128
-          }
-        },
-        {
-          "ordinal": 1,
-          "name": "category_token",
-          "type_info": {
-            "type": "VarString",
-            "flags": {
-              "bits": 4233
-            },
-            "char_set": 224,
-            "max_size": 128
-          }
-        }
-      ],
-      "parameters": {
-        "Right": 0
-      },
-      "nullable": [
-        false,
-        false
-      ]
-    }
-  },
   "02060ab9b8ca472a2bd4d4fa3120743e90148ccd6a4cb13bc491d00f36ed7a8f": {
     "query": "\nSELECT\n  id,\n  status\nFROM w2l_inference_jobs\nWHERE id = ?\nFOR UPDATE\n        ",
     "describe": {
@@ -1854,6 +1816,44 @@
       ]
     }
   },
+  "12a176252df63d1e3a958362d754c828991d64ade427ab11a2025098d1581976": {
+    "query": "\nSELECT\n    assignments.model_token AS tts_model_token,\n    assignments.category_token\nFROM\n    tts_category_assignments AS assignments\nJOIN\n    tts_models AS tts\n    ON assignments.model_token = tts.token\nWHERE\n    tts.is_locked_from_use IS FALSE\n    AND tts.user_deleted_at IS NULL\n    AND tts.mod_deleted_at IS NULL\n    AND assignments.deleted_at IS NULL\n\n        ",
+    "describe": {
+      "columns": [
+        {
+          "ordinal": 0,
+          "name": "tts_model_token",
+          "type_info": {
+            "type": "VarString",
+            "flags": {
+              "bits": 4233
+            },
+            "char_set": 224,
+            "max_size": 128
+          }
+        },
+        {
+          "ordinal": 1,
+          "name": "category_token",
+          "type_info": {
+            "type": "VarString",
+            "flags": {
+              "bits": 4233
+            },
+            "char_set": 224,
+            "max_size": 128
+          }
+        }
+      ],
+      "parameters": {
+        "Right": 0
+      },
+      "nullable": [
+        false,
+        false
+      ]
+    }
+  },
   "150c98c00f4cd6954428736583eae913be578c4e69dac317d4445bc0e97743c9": {
     "query": "\nSELECT\n  next_id\nFROM\n  tts_result_synthetic_ids\nWHERE\n  user_token = ?\nLIMIT 1\n        ",
     "describe": {