From 91d94ecc827a5b7bd005e269a47f17bfa1c4ccab Mon Sep 17 00:00:00 2001 From: viktorstrate Date: Fri, 26 Feb 2021 21:29:58 +0100 Subject: [PATCH] Fix bug related to faces feature --- api/graphql/resolvers/faces.go | 6 +++--- ui/src/Pages/PeoplePage/PeoplePage.js | 2 +- ui/src/Pages/PeoplePage/SingleFaceGroup/SingleFaceGroup.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/graphql/resolvers/faces.go b/api/graphql/resolvers/faces.go index 6a03e245..f2833860 100644 --- a/api/graphql/resolvers/faces.go +++ b/api/graphql/resolvers/faces.go @@ -79,7 +79,7 @@ func (r *queryResolver) FaceGroup(ctx context.Context, id int) (*models.FaceGrou } faceGroupQuery := r.Database. - Joins("LEFT JOIN image_faces ON image_faces.id = face_groups.id"). + Joins("LEFT JOIN image_faces ON image_faces.face_group_id = face_groups.id"). Where("face_groups.id = ?", id). Where("image_faces.media_id IN (?)", r.Database.Select("media_id").Table("media").Where("media.album_id IN (?)", userAlbumIDs)) @@ -107,8 +107,8 @@ func (r *queryResolver) MyFaceGroups(ctx context.Context, paginate *models.Pagin } faceGroupQuery := r.Database. - Joins("LEFT JOIN image_faces ON image_faces.face_group_id = face_groups.id"). - Where("image_faces.media_id IN (?)", r.Database.Select("media_id").Table("media").Where("media.album_id IN (?)", userAlbumIDs)). + Joins("JOIN image_faces ON image_faces.face_group_id = face_groups.id"). + Where("image_faces.media_id IN (?)", r.Database.Select("media.id").Table("media").Where("media.album_id IN (?)", userAlbumIDs)). Group("image_faces.face_group_id"). Order("CASE WHEN label IS NULL THEN 1 ELSE 0 END"). Order("COUNT(image_faces.id) DESC") diff --git a/ui/src/Pages/PeoplePage/PeoplePage.js b/ui/src/Pages/PeoplePage/PeoplePage.js index c6bad273..78d19ba7 100644 --- a/ui/src/Pages/PeoplePage/PeoplePage.js +++ b/ui/src/Pages/PeoplePage/PeoplePage.js @@ -11,7 +11,7 @@ import useScrollPagination from '../../hooks/useScrollPagination' import PaginateLoader from '../../components/PaginateLoader' export const MY_FACES_QUERY = gql` - query myFaces($limit: Int!, $offset: Int!) { + query myFaces($limit: Int, $offset: Int) { myFaceGroups(paginate: { limit: $limit, offset: $offset }) { id label diff --git a/ui/src/Pages/PeoplePage/SingleFaceGroup/SingleFaceGroup.js b/ui/src/Pages/PeoplePage/SingleFaceGroup/SingleFaceGroup.js index b51823fb..60ab14cd 100644 --- a/ui/src/Pages/PeoplePage/SingleFaceGroup/SingleFaceGroup.js +++ b/ui/src/Pages/PeoplePage/SingleFaceGroup/SingleFaceGroup.js @@ -41,7 +41,7 @@ export const SINGLE_FACE_GROUP = gql` const SingleFaceGroup = ({ faceGroupID }) => { const { data, error, loading, fetchMore } = useQuery(SINGLE_FACE_GROUP, { variables: { - limit: 2, + limit: 200, offset: 0, id: faceGroupID, },