Fix bug related to faces feature
This commit is contained in:
parent
51123ed8b4
commit
91d94ecc82
|
@ -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")
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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,
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue