From b7b62a32e35f53dfc0c91fb04194e8f572e6c5d9 Mon Sep 17 00:00:00 2001
From: Nick Mowen <nickmowen213@gmail.com>
Date: Fri, 11 Mar 2022 14:18:48 -0700
Subject: [PATCH] Tweaks to API and model

---
 frigate/http.py   | 25 ++++++++++++++-----------
 frigate/models.py |  2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/frigate/http.py b/frigate/http.py
index 37bc4e50a..cd82e614a 100644
--- a/frigate/http.py
+++ b/frigate/http.py
@@ -126,14 +126,14 @@ def set_retain(id):
         event = Event.get(Event.id == id)
     except DoesNotExist:
         return make_response(
-            jsonify({"success": False, "message": "Event" + id + " not found"}), 404
+            jsonify({"success": False, "message": "Event " + id + " not found"}), 404
         )
 
     event.retain_indefinitely = True
     event.save()
 
     return make_response(
-        jsonify({"success": True, "message": "Event" + id + " retained"}), 200
+        jsonify({"success": True, "message": "Event " + id + " retained"}), 200
     )
 
 
@@ -143,14 +143,14 @@ def delete_retain(id):
         event = Event.get(Event.id == id)
     except DoesNotExist:
         return make_response(
-            jsonify({"success": False, "message": "Event" + id + " not found"}), 404
+            jsonify({"success": False, "message": "Event " + id + " not found"}), 404
         )
 
     event.retain_indefinitely = False
     event.save()
 
     return make_response(
-        jsonify({"success": True, "message": "Event" + id + " un-retained"}), 200
+        jsonify({"success": True, "message": "Event " + id + " un-retained"}), 200
     )
 
 @bp.route("/events/<id>/sub_label", methods=("POST",))
@@ -159,23 +159,26 @@ def set_sub_label(id):
         event = Event.get(Event.id == id)
     except DoesNotExit:
         return make_response(
-            jsonify({"success": False, "message": "Event" + id + " not found"}), 404
+            jsonify({"success": False, "message": "Event " + id + " not found"}), 404
         )
 
     if event.label != "person":
         return make_response(
-            jsonify({"success": False, "message": "Event" + id + " is not a person event"}), 400
+            jsonify({"success": False, "message": "Event " + id + " is not a person event"}), 400
         )
 
-    new_sub_label = request.form.get("subLabel", "")
+    new_sub_label = request.json.get("subLabel", "")
+    print(f'Found value as {request.json} with {request.json.get("subLabel", "")}')
 
     if new_sub_label:
         event.sub_label = new_sub_label
         event.save()
-        jsonify({"success": True, "message": "Event" + id + " sub label set to " + new_sub_label}), 200
+        return make_response(
+            jsonify({"success": True, "message": "Event " + id + " sub label set to " + new_sub_label}), 200
+        )
 
     return make_response(
-        jsonify({"success": False, "message": "Sublabel not provided."}), 400
+        jsonify({"success": False, "message": "Sublabel " + new_sub_label + " not provided."}), 400
     )
 
 @bp.route("/events/<id>/sub_label", methods=("DELETE",))
@@ -184,13 +187,13 @@ def delete_sub_label(id):
         event = Event.get(Event.id == id)
     except DoesNotExit:
         return make_response(
-            jsonify({"success": False, "message": "Event" + id + " not found"}), 404
+            jsonify({"success": False, "message": "Event " + id + " not found"}), 404
         )
 
     event.sub_label = ""
     event.save()
     return make_response(
-        jsonify({"success": True, "message": "Event" + id + " sub label removed"}), 200
+        jsonify({"success": True, "message": "Event " + id + " sub label removed"}), 200
     )
 
 @bp.route("/events/<id>", methods=("DELETE",))
diff --git a/frigate/models.py b/frigate/models.py
index 48180e870..9eacdcca1 100644
--- a/frigate/models.py
+++ b/frigate/models.py
@@ -6,7 +6,7 @@ from playhouse.sqlite_ext import *
 class Event(Model):
     id = CharField(null=False, primary_key=True, max_length=30)
     label = CharField(index=True, max_length=20)
-    sub_label = CharField(index=True, max_length=12)
+    sub_label = CharField(index=True, max_length=12, default="")
     camera = CharField(index=True, max_length=20)
     start_time = DateTimeField()
     end_time = DateTimeField()