Tweaks to API and model

This commit is contained in:
Nick Mowen 2022-03-11 14:18:48 -07:00
parent 3996b17b30
commit b7b62a32e3
2 changed files with 15 additions and 12 deletions

View File

@ -126,14 +126,14 @@ def set_retain(id):
event = Event.get(Event.id == id) event = Event.get(Event.id == id)
except DoesNotExist: except DoesNotExist:
return make_response( 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.retain_indefinitely = True
event.save() event.save()
return make_response( 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) event = Event.get(Event.id == id)
except DoesNotExist: except DoesNotExist:
return make_response( 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.retain_indefinitely = False
event.save() event.save()
return make_response( 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",)) @bp.route("/events/<id>/sub_label", methods=("POST",))
@ -159,23 +159,26 @@ def set_sub_label(id):
event = Event.get(Event.id == id) event = Event.get(Event.id == id)
except DoesNotExit: except DoesNotExit:
return make_response( 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": if event.label != "person":
return make_response( 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: if new_sub_label:
event.sub_label = new_sub_label event.sub_label = new_sub_label
event.save() 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( 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",)) @bp.route("/events/<id>/sub_label", methods=("DELETE",))
@ -184,13 +187,13 @@ def delete_sub_label(id):
event = Event.get(Event.id == id) event = Event.get(Event.id == id)
except DoesNotExit: except DoesNotExit:
return make_response( 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.sub_label = ""
event.save() event.save()
return make_response( 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",)) @bp.route("/events/<id>", methods=("DELETE",))

View File

@ -6,7 +6,7 @@ from playhouse.sqlite_ext import *
class Event(Model): class Event(Model):
id = CharField(null=False, primary_key=True, max_length=30) id = CharField(null=False, primary_key=True, max_length=30)
label = CharField(index=True, max_length=20) 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) camera = CharField(index=True, max_length=20)
start_time = DateTimeField() start_time = DateTimeField()
end_time = DateTimeField() end_time = DateTimeField()