From 79776371e7d556baaccada107c4200187c415243 Mon Sep 17 00:00:00 2001 From: jedi04 Date: Wed, 9 Oct 2024 21:25:09 +0530 Subject: [PATCH] fix(server): update person count sql --- server/src/queries/person.repository.sql | 34 +++++++++++++++--------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/server/src/queries/person.repository.sql b/server/src/queries/person.repository.sql index 5616559d7d06d..7d43277431db2 100644 --- a/server/src/queries/person.repository.sql +++ b/server/src/queries/person.repository.sql @@ -250,22 +250,30 @@ WHERE -- PersonRepository.getNumberOfPeople SELECT - COUNT(DISTINCT ("person"."id")) AS "total", - COUNT(DISTINCT ("person"."id")) FILTER ( + COUNT(person.id) AS "total", + COUNT(person.id) FILTER ( WHERE - "person"."isHidden" = true + person."isHidden" = true ) AS "hidden" FROM - "person" "person" - LEFT JOIN "asset_faces" "face" ON "face"."personId" = "person"."id" - INNER JOIN "assets" "asset" ON "asset"."id" = "face"."assetId" - AND ("asset"."deletedAt" IS NULL) -WHERE - "person"."ownerId" = $1 - AND "asset"."isArchived" = false - AND "person"."thumbnailPath" != '' -HAVING - COUNT("face"."assetId") != 0 + ( + SELECT + "person"."id" AS "id", + "person"."isHidden" AS "isHidden" + FROM + "person" "person" + LEFT JOIN "asset_faces" "face" ON "face"."personId" = "person"."id" + INNER JOIN "assets" "asset" ON "asset"."id" = "face"."assetId" + AND ("asset"."deletedAt" IS NULL) + WHERE + "person"."ownerId" = $1 + AND "asset"."isArchived" = false + AND "person"."thumbnailPath" != '' + GROUP BY + "person"."id" + HAVING + COUNT("face"."assetId") >= $2 + ) "person" -- PersonRepository.getFacesByIds SELECT