Add group graphql interfaces (#5017)

* Deprecate movie and add group interfaces
* UI changes

pkg/sqlite/gallery_test.go

@@ -1881,7 +1881,7 @@ func TestGalleryQueryIsMissingPerformers(t *testing.T) {
 
 		assert.True(t, len(galleries) > 0)
 
-		// ensure non of the ids equal the one with movies
+		// ensure non of the ids equal the one with galleries
 		for _, gallery := range galleries {
 			assert.NotEqual(t, galleryIDs[galleryIdxWithPerformer], gallery.ID)
 		}

pkg/sqlite/image_test.go

@@ -2053,7 +2053,7 @@ func TestImageQueryIsMissingPerformers(t *testing.T) {
 
 		assert.True(t, len(images) > 0)
 
-		// ensure non of the ids equal the one with movies
+		// ensure non of the ids equal the one with performers
 		for _, image := range images {
 			assert.NotEqual(t, imageIDs[imageIdxWithPerformer], image.ID)
 		}

pkg/sqlite/performer_test.go

@@ -1330,7 +1330,7 @@ func verifyPerformerQuery(t *testing.T, filter models.PerformerFilterType, verif
 
 		for _, performer := range performers {
 			if err := performer.LoadURLs(ctx, db.Performer); err != nil {
-				t.Errorf("Error loading movie relationships: %v", err)
+				t.Errorf("Error loading url relationships: %v", err)
 			}
 		}
 

pkg/sqlite/saved_filter.go

@@ -228,10 +228,21 @@ func (qb *SavedFilterStore) getMany(ctx context.Context, q *goqu.SelectDataset)
 func (qb *SavedFilterStore) FindByMode(ctx context.Context, mode models.FilterMode) ([]*models.SavedFilter, error) {
 	// SELECT * FROM %s WHERE mode = ? AND name != ? ORDER BY name ASC
 	table := qb.table()
-	sq := qb.selectDataset().Prepared(true).Where(
-		table.Col("mode").Eq(mode),
-		table.Col("name").Neq(savedFilterDefaultName),
-	).Order(table.Col("name").Asc())
+
+	// TODO - querying on groups needs to include movies
+	// remove this when we migrate to remove the movies filter mode in the database
+	var whereClause exp.Expression
+
+	if mode == models.FilterModeGroups || mode == models.FilterModeMovies {
+		whereClause = goqu.Or(
+			table.Col("mode").Eq(models.FilterModeGroups),
+			table.Col("mode").Eq(models.FilterModeMovies),
+		)
+	} else {
+		whereClause = table.Col("mode").Eq(mode)
+	}
+
+	sq := qb.selectDataset().Prepared(true).Where(whereClause).Order(table.Col("name").Asc())
 	ret, err := qb.getMany(ctx, sq)
 
 	if err != nil {

pkg/sqlite/scene.go

@@ -1074,6 +1074,7 @@ var sceneSortOptions = sortOptions{
 	"duration",
 	"file_mod_time",
 	"framerate",
+	"group_scene_number",
 	"id",
 	"interactive",
 	"interactive_speed",
@@ -1140,7 +1141,7 @@ func (qb *SceneStore) setSceneSort(query *queryBuilder, findFilter *models.FindF
 
 	direction := findFilter.GetDirection()
 	switch sort {
-	case "movie_scene_number":
+	case "movie_scene_number", "group_scene_number":
 		query.join(moviesScenesTable, "", "scenes.id = movies_scenes.scene_id")
 		query.sortAndPagination += getSort("scene_index", direction, moviesScenesTable)
 	case "tag_count":

pkg/sqlite/scene_filter.go

@@ -147,7 +147,10 @@ func (qb *sceneFilterHandler) criterionHandler() criterionHandler {
 		qb.performersCriterionHandler(sceneFilter.Performers),
 		qb.performerCountCriterionHandler(sceneFilter.PerformerCount),
 		studioCriterionHandler(sceneTable, sceneFilter.Studios),
-		qb.moviesCriterionHandler(sceneFilter.Movies),
+
+		qb.groupsCriterionHandler(sceneFilter.Groups),
+		qb.groupsCriterionHandler(sceneFilter.Movies),
+
 		qb.galleriesCriterionHandler(sceneFilter.Galleries),
 		qb.performerTagsCriterionHandler(sceneFilter.PerformerTags),
 		qb.performerFavoriteCriterionHandler(sceneFilter.PerformerFavorite),
@@ -480,7 +483,7 @@ func (qb *sceneFilterHandler) performerAgeCriterionHandler(performerAge *models.
 	}
 }
 
-func (qb *sceneFilterHandler) moviesCriterionHandler(movies *models.MultiCriterionInput) criterionHandlerFunc {
+func (qb *sceneFilterHandler) groupsCriterionHandler(movies *models.MultiCriterionInput) criterionHandlerFunc {
 	addJoinsFunc := func(f *filterBuilder) {
 		sceneRepository.movies.join(f, "", "scenes.id")
 		f.addLeftJoin("movies", "", "movies_scenes.movie_id = movies.id")

pkg/sqlite/setup_test.go

@@ -278,9 +278,7 @@ const (
 )
 
 const (
-	savedFilterIdxDefaultScene = iota
-	savedFilterIdxDefaultImage
-	savedFilterIdxScene
+	savedFilterIdxScene = iota
 	savedFilterIdxImage
 
 	// new indexes above
@@ -1777,9 +1775,9 @@ func createChapter(ctx context.Context, mqb models.GalleryChapterReaderWriter, c
 
 func getSavedFilterMode(index int) models.FilterMode {
 	switch index {
-	case savedFilterIdxScene, savedFilterIdxDefaultScene:
+	case savedFilterIdxScene:
 		return models.FilterModeScenes
-	case savedFilterIdxImage, savedFilterIdxDefaultImage:
+	case savedFilterIdxImage:
 		return models.FilterModeImages
 	default:
 		return models.FilterModeScenes
@@ -1787,11 +1785,6 @@ func getSavedFilterMode(index int) models.FilterMode {
 }
 
 func getSavedFilterName(index int) string {
-	if index <= savedFilterIdxDefaultImage {
-		// empty string for default filters
-		return ""
-	}
-
 	if index <= savedFilterIdxImage {
 		// use the same name for the first two - should be possible
 		return firstSavedFilterName

pkg/sqlite/tag.go

@@ -683,7 +683,7 @@ func (qb *TagStore) getTagSort(query *queryBuilder, findFilter *models.FindFilte
 		sortQuery += getCountSort(tagTable, performersTagsTable, tagIDColumn, direction)
 	case "studios_count":
 		sortQuery += getCountSort(tagTable, studiosTagsTable, tagIDColumn, direction)
-	case "movies_count":
+	case "movies_count", "groups_count":
 		sortQuery += getCountSort(tagTable, moviesTagsTable, tagIDColumn, direction)
 	default:
 		sortQuery += getSort(sort, direction, "tags")

pkg/sqlite/tag_filter.go

@@ -67,7 +67,10 @@ func (qb *tagFilterHandler) criterionHandler() criterionHandler {
 		qb.galleryCountCriterionHandler(tagFilter.GalleryCount),
 		qb.performerCountCriterionHandler(tagFilter.PerformerCount),
 		qb.studioCountCriterionHandler(tagFilter.StudioCount),
-		qb.movieCountCriterionHandler(tagFilter.MovieCount),
+
+		qb.groupCountCriterionHandler(tagFilter.GroupCount),
+		qb.groupCountCriterionHandler(tagFilter.MovieCount),
+
 		qb.markerCountCriterionHandler(tagFilter.MarkerCount),
 		qb.parentsCriterionHandler(tagFilter.Parents),
 		qb.childrenCriterionHandler(tagFilter.Children),
@@ -187,7 +190,7 @@ func (qb *tagFilterHandler) studioCountCriterionHandler(studioCount *models.IntC
 	}
 }
 
-func (qb *tagFilterHandler) movieCountCriterionHandler(movieCount *models.IntCriterionInput) criterionHandlerFunc {
+func (qb *tagFilterHandler) groupCountCriterionHandler(movieCount *models.IntCriterionInput) criterionHandlerFunc {
 	return func(ctx context.Context, f *filterBuilder) {
 		if movieCount != nil {
 			f.addLeftJoin("movies_tags", "", "movies_tags.tag_id = tags.id")