From 20af8994f5b202dcf86e0b1a4ea1cd2506d29c35 Mon Sep 17 00:00:00 2001 From: Rui Alves Date: Mon, 21 Oct 2024 16:06:04 +0100 Subject: [PATCH] Combine 2 models into generic --- frigate/api/defs/review_body.py | 7 +------ frigate/api/review.py | 9 +++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/frigate/api/defs/review_body.py b/frigate/api/defs/review_body.py index 3c7bcb2a1..991f190f8 100644 --- a/frigate/api/defs/review_body.py +++ b/frigate/api/defs/review_body.py @@ -1,11 +1,6 @@ from pydantic import BaseModel, conlist, constr -class ReviewSetMultipleReviewedBody(BaseModel): - # List of string with at least one element and each element with at least one char - ids: conlist(constr(min_length=1), min_length=1) - - -class ReviewDeleteMultipleReviewsBody(BaseModel): +class ReviewModifyMultipleBody(BaseModel): # List of string with at least one element and each element with at least one char ids: conlist(constr(min_length=1), min_length=1) diff --git a/frigate/api/review.py b/frigate/api/review.py index e13b977d8..21b468640 100644 --- a/frigate/api/review.py +++ b/frigate/api/review.py @@ -13,10 +13,7 @@ from peewee import Case, DoesNotExist, fn, operator from playhouse.shortcuts import model_to_dict from frigate.api.defs.generic_response import GenericResponse -from frigate.api.defs.review_body import ( - ReviewDeleteMultipleReviewsBody, - ReviewSetMultipleReviewedBody, -) +from frigate.api.defs.review_body import ReviewModifyMultipleBody from frigate.api.defs.review_query_parameters import ( ReviewActivityMotionQueryParams, ReviewQueryParams, @@ -311,7 +308,7 @@ def review_summary(params: ReviewSummaryQueryParams = Depends()): @router.post("/reviews/viewed", response_model=GenericResponse) -def set_multiple_reviewed(body: ReviewSetMultipleReviewedBody): +def set_multiple_reviewed(body: ReviewModifyMultipleBody): ReviewSegment.update(has_been_reviewed=True).where( ReviewSegment.id << body.ids ).execute() @@ -323,7 +320,7 @@ def set_multiple_reviewed(body: ReviewSetMultipleReviewedBody): @router.post("/reviews/delete", response_model=GenericResponse) -def delete_reviews(body: ReviewDeleteMultipleReviewsBody): +def delete_reviews(body: ReviewModifyMultipleBody): list_of_ids = body.ids reviews = ( ReviewSegment.select(