Optimize allData queries (#3452)

* Add specific fields to allData queries
* Add additional allData endpoints

graphql/documents/queries/misc.graphql

@@ -8,18 +8,25 @@ query MarkerStrings($q: String, $sort: String) {
 
 query AllPerformersForFilter {
   allPerformers {
-    ...SlimPerformerData
+    id
+    name
+    disambiguation
+    alias_list
   }
 }
 
 query AllStudiosForFilter {
   allStudios {
-    ...SlimStudioData
+    id
+    name
+    aliases
   }
 }
+
 query AllMoviesForFilter {
   allMovies {
-    ...SlimMovieData
+    id
+    name
   }
 }
 

graphql/schema/schema.graphql

@@ -144,6 +144,10 @@ type Query {
 
   # Get everything
 
+  allScenes: [Scene!]!
+  allSceneMarkers: [SceneMarker!]!
+  allImages: [Image!]!
+  allGalleries: [Gallery!]!
   allPerformers: [Performer!]!
   allStudios: [Studio!]!
   allMovies: [Movie!]!

internal/api/resolver_query_find_gallery.go

@@ -41,3 +41,14 @@ func (r *queryResolver) FindGalleries(ctx context.Context, galleryFilter *models
 
 	return ret, nil
 }
+
+func (r *queryResolver) AllGalleries(ctx context.Context) (ret []*models.Gallery, err error) {
+	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+		ret, err = r.repository.Gallery.All(ctx)
+		return err
+	}); err != nil {
+		return nil, err
+	}
+
+	return ret, nil
+}

internal/api/resolver_query_find_image.go

@@ -84,3 +84,14 @@ func (r *queryResolver) FindImages(ctx context.Context, imageFilter *models.Imag
 
 	return ret, nil
 }
+
+func (r *queryResolver) AllImages(ctx context.Context) (ret []*models.Image, err error) {
+	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+		ret, err = r.repository.Image.All(ctx)
+		return err
+	}); err != nil {
+		return nil, err
+	}
+
+	return ret, nil
+}

internal/api/resolver_query_find_scene.go

@@ -232,3 +232,14 @@ func (r *queryResolver) FindDuplicateScenes(ctx context.Context, distance *int)
 
 	return ret, nil
 }
+
+func (r *queryResolver) AllScenes(ctx context.Context) (ret []*models.Scene, err error) {
+	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+		ret, err = r.repository.Scene.All(ctx)
+		return err
+	}); err != nil {
+		return nil, err
+	}
+
+	return ret, nil
+}

internal/api/resolver_query_find_scene_marker.go

@@ -24,3 +24,14 @@ func (r *queryResolver) FindSceneMarkers(ctx context.Context, sceneMarkerFilter
 
 	return ret, nil
 }
+
+func (r *queryResolver) AllSceneMarkers(ctx context.Context) (ret []*models.SceneMarker, err error) {
+	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
+		ret, err = r.repository.SceneMarker.All(ctx)
+		return err
+	}); err != nil {
+		return nil, err
+	}
+
+	return ret, nil
+}

pkg/models/mocks/SceneMarkerReaderWriter.go

@@ -14,6 +14,50 @@ type SceneMarkerReaderWriter struct {
 	mock.Mock
 }
 
+// All provides a mock function with given fields: ctx
+func (_m *SceneMarkerReaderWriter) All(ctx context.Context) ([]*models.SceneMarker, error) {
+	ret := _m.Called(ctx)
+
+	var r0 []*models.SceneMarker
+	if rf, ok := ret.Get(0).(func(context.Context) []*models.SceneMarker); ok {
+		r0 = rf(ctx)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]*models.SceneMarker)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context) error); ok {
+		r1 = rf(ctx)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// Count provides a mock function with given fields: ctx
+func (_m *SceneMarkerReaderWriter) Count(ctx context.Context) (int, error) {
+	ret := _m.Called(ctx)
+
+	var r0 int
+	if rf, ok := ret.Get(0).(func(context.Context) int); ok {
+		r0 = rf(ctx)
+	} else {
+		r0 = ret.Get(0).(int)
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context) error); ok {
+		r1 = rf(ctx)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // CountByTagID provides a mock function with given fields: ctx, tagID
 func (_m *SceneMarkerReaderWriter) CountByTagID(ctx context.Context, tagID int) (int, error) {
 	ret := _m.Called(ctx, tagID)

pkg/models/mocks/SceneReaderWriter.go

@@ -638,29 +638,8 @@ func (_m *SceneReaderWriter) GetTagIDs(ctx context.Context, relatedID int) ([]in
 	return r0, r1
 }
 
-// SaveActivity provides a mock function with given fields: ctx, id, resumeTime, playDuration
+// IncrementOCounter provides a mock function with given fields: ctx, id
-func (_m *SceneReaderWriter) SaveActivity(ctx context.Context, id int, resumeTime *float64, playDuration *float64) (bool, error) {
+func (_m *SceneReaderWriter) IncrementOCounter(ctx context.Context, id int) (int, error) {
-	ret := _m.Called(ctx, id, resumeTime, playDuration)
-
-	var r0 bool
-	if rf, ok := ret.Get(0).(func(context.Context, int, *float64, *float64) bool); ok {
-		r0 = rf(ctx, id, resumeTime, playDuration)
-	} else {
-		r0 = ret.Get(0).(bool)
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, int, *float64, *float64) error); ok {
-		r1 = rf(ctx, id, resumeTime, playDuration)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// IncrementWatchCount provides a mock function with given fields: ctx, id
-func (_m *SceneReaderWriter) IncrementWatchCount(ctx context.Context, id int) (int, error) {
 	ret := _m.Called(ctx, id)
 
 	var r0 int
@@ -680,8 +659,8 @@ func (_m *SceneReaderWriter) IncrementWatchCount(ctx context.Context, id int) (i
 	return r0, r1
 }
 
-// IncrementOCounter provides a mock function with given fields: ctx, id
+// IncrementWatchCount provides a mock function with given fields: ctx, id
-func (_m *SceneReaderWriter) IncrementOCounter(ctx context.Context, id int) (int, error) {
+func (_m *SceneReaderWriter) IncrementWatchCount(ctx context.Context, id int) (int, error) {
 	ret := _m.Called(ctx, id)
 
 	var r0 int
@@ -745,6 +724,27 @@ func (_m *SceneReaderWriter) ResetOCounter(ctx context.Context, id int) (int, er
 	return r0, r1
 }
 
+// SaveActivity provides a mock function with given fields: ctx, id, resumeTime, playDuration
+func (_m *SceneReaderWriter) SaveActivity(ctx context.Context, id int, resumeTime *float64, playDuration *float64) (bool, error) {
+	ret := _m.Called(ctx, id, resumeTime, playDuration)
+
+	var r0 bool
+	if rf, ok := ret.Get(0).(func(context.Context, int, *float64, *float64) bool); ok {
+		r0 = rf(ctx, id, resumeTime, playDuration)
+	} else {
+		r0 = ret.Get(0).(bool)
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, int, *float64, *float64) error); ok {
+		r1 = rf(ctx, id, resumeTime, playDuration)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // Size provides a mock function with given fields: ctx
 func (_m *SceneReaderWriter) Size(ctx context.Context) (float64, error) {
 	ret := _m.Called(ctx)

pkg/models/scene_marker.go

@@ -36,6 +36,8 @@ type SceneMarkerReader interface {
 	CountByTagID(ctx context.Context, tagID int) (int, error)
 	GetMarkerStrings(ctx context.Context, q *string, sort *string) ([]*MarkerStringsResultType, error)
 	Wall(ctx context.Context, q *string) ([]*SceneMarker, error)
+	Count(ctx context.Context) (int, error)
+	All(ctx context.Context) ([]*SceneMarker, error)
 	Query(ctx context.Context, sceneMarkerFilter *SceneMarkerFilterType, findFilter *FindFilterType) ([]*SceneMarker, int, error)
 	GetTagIDs(ctx context.Context, imageID int) ([]int, error)
 }

pkg/sqlite/scene_marker.go

@@ -346,3 +346,11 @@ func (qb *sceneMarkerQueryBuilder) UpdateTags(ctx context.Context, id int, tagID
 	// Delete the existing joins and then create new ones
 	return qb.tagsRepository().replace(ctx, id, tagIDs)
 }
+
+func (qb *sceneMarkerQueryBuilder) Count(ctx context.Context) (int, error) {
+	return qb.runCountQuery(ctx, qb.buildCountQuery("SELECT scene_markers.id FROM scene_markers"), nil)
+}
+
+func (qb *sceneMarkerQueryBuilder) All(ctx context.Context) ([]*models.SceneMarker, error) {
+	return qb.querySceneMarkers(ctx, selectAll("scene_markers")+qb.getSceneMarkerSort(nil, nil), nil)
+}

pkg/sqlite/scene_marker_test.go

@@ -222,4 +222,6 @@ func queryMarkers(ctx context.Context, t *testing.T, sqb models.SceneMarkerReade
 // TODO Find
 // TODO GetMarkerStrings
 // TODO Wall
+// TODO Count
+// TODO All
 // TODO Query

ui/v2.5/src/components/List/Filters/HierarchicalLabelValueFilter.tsx

@@ -1,9 +1,9 @@
 import React from "react";
 import { Form } from "react-bootstrap";
 import { defineMessages, MessageDescriptor, useIntl } from "react-intl";
-import { FilterSelect, ValidTypes } from "../../Shared";
+import { FilterSelect, SelectObject } from "src/components/Shared/Select";
-import { Criterion } from "../../../models/list-filter/criteria/criterion";
+import { Criterion } from "src/models/list-filter/criteria/criterion";
-import { IHierarchicalLabelValue } from "../../../models/list-filter/types";
+import { IHierarchicalLabelValue } from "src/models/list-filter/types";
 
 interface IHierarchicalLabelValueFilterProps {
   criterion: Criterion<IHierarchicalLabelValue>;
@@ -36,11 +36,11 @@ export const HierarchicalLabelValueFilter: React.FC<IHierarchicalLabelValueFilte
     },
   });
 
-  function onSelectionChanged(items: ValidTypes[]) {
+  function onSelectionChanged(items: SelectObject[]) {
     const { value } = criterion;
     value.items = items.map((i) => ({
       id: i.id,
-      label: i.name!,
+      label: i.name ?? i.title ?? "",
     }));
     onValueChanged(value);
   }

ui/v2.5/src/components/List/Filters/LabeledIdFilter.tsx

@@ -1,8 +1,8 @@
 import React from "react";
 import { Form } from "react-bootstrap";
-import { FilterSelect, ValidTypes } from "../../Shared";
+import { FilterSelect, SelectObject } from "src/components/Shared/Select";
-import { Criterion } from "../../../models/list-filter/criteria/criterion";
+import { Criterion } from "src/models/list-filter/criteria/criterion";
-import { ILabeledId } from "../../../models/list-filter/types";
+import { ILabeledId } from "src/models/list-filter/types";
 
 interface ILabeledIdFilterProps {
   criterion: Criterion<ILabeledId[]>;
@@ -26,11 +26,11 @@ export const LabeledIdFilter: React.FC<ILabeledIdFilterProps> = ({
   )
     return null;
 
-  function onSelectionChanged(items: ValidTypes[]) {
+  function onSelectionChanged(items: SelectObject[]) {
     onValueChanged(
       items.map((i) => ({
         id: i.id,
-        label: i.name!,
+        label: i.name ?? i.title ?? "",
       }))
     );
   }

ui/v2.5/src/components/Shared/MultiSet.tsx

@@ -3,13 +3,7 @@ import { useIntl } from "react-intl";
 
 import * as GQL from "src/core/generated-graphql";
 import { Button, ButtonGroup } from "react-bootstrap";
-import { FilterSelect } from "./Select";
+import { FilterSelect, SelectObject } from "./Select";
-
-type ValidTypes =
-  | GQL.SlimPerformerDataFragment
-  | GQL.SlimTagDataFragment
-  | GQL.SlimStudioDataFragment
-  | GQL.SlimMovieDataFragment;
 
 interface IMultiSetProps {
   type: "performers" | "studios" | "tags" | "movies";
@@ -31,7 +25,7 @@ const MultiSet: React.FunctionComponent<IMultiSetProps> = (
     GQL.BulkUpdateIdMode.Remove,
   ];
 
-  function onUpdate(items: ValidTypes[]) {
+  function onUpdate(items: SelectObject[]) {
     props.onUpdate(items.map((i) => i.id));
   }
 

ui/v2.5/src/components/Shared/Select.tsx

@@ -31,11 +31,11 @@ import { objectTitle } from "src/core/files";
 import { galleryTitle } from "src/core/galleries";
 import { TagPopover } from "../Tags/TagPopover";
 
-export type ValidTypes =
+export type SelectObject = {
-  | GQL.SlimPerformerDataFragment
+  id: string;
-  | GQL.SlimTagDataFragment
+  name?: string | null;
-  | GQL.SlimStudioDataFragment
+  title?: string | null;
-  | GQL.SlimMovieDataFragment;
+};
 type Option = { value: string; label: string };
 
 interface ITypeProps {
@@ -53,7 +53,7 @@ interface ITypeProps {
 interface IFilterProps {
   ids?: string[];
   initialIds?: string[];
-  onSelect?: (item: ValidTypes[]) => void;
+  onSelect?: (item: SelectObject[]) => void;
   noSelectionString?: string;
   className?: string;
   isMulti?: boolean;
@@ -90,9 +90,9 @@ interface ISelectProps<T extends boolean> {
   noOptionsMessage?: string | null;
 }
 interface IFilterComponentProps extends IFilterProps {
-  items: Array<ValidTypes>;
+  items: SelectObject[];
-  toOption?: (item: ValidTypes) => Option;
+  toOption?: (item: SelectObject) => Option;
-  onCreate?: (name: string) => Promise<{ item: ValidTypes; message: string }>;
+  onCreate?: (name: string) => Promise<{ item: SelectObject; message: string }>;
 }
 interface IFilterSelectProps<T extends boolean>
   extends Omit<ISelectProps<T>, "onChange" | "items" | "onCreateOption"> {}
@@ -272,7 +272,7 @@ const FilterSelectComponent = <T extends boolean>(
     }
     return {
       value: i.id,
-      label: i.name ?? "",
+      label: i.name ?? i.title ?? "",
     };
   });
 

ui/v2.5/src/components/Tagger/scenes/PerformerResult.tsx

@@ -8,7 +8,7 @@ import {
   Icon,
   OperationButton,
   PerformerSelect,
-  ValidTypes,
+  SelectObject,
 } from "src/components/Shared";
 import { OptionalField } from "../IncludeButton";
 import { faSave } from "@fortawesome/free-solid-svg-icons";
@@ -43,7 +43,7 @@ const PerformerResult: React.FC<IPerformerResultProps> = ({
     (stashID) => stashID.endpoint === endpoint && stashID.stash_id
   );
 
-  const handlePerformerSelect = (performers: ValidTypes[]) => {
+  const handlePerformerSelect = (performers: SelectObject[]) => {
     if (performers.length) {
       setSelectedID(performers[0].id);
     } else {

ui/v2.5/src/components/Tagger/scenes/StudioResult.tsx

@@ -7,7 +7,7 @@ import {
   Icon,
   OperationButton,
   StudioSelect,
-  ValidTypes,
+  SelectObject,
 } from "src/components/Shared";
 import * as GQL from "src/core/generated-graphql";
 
@@ -41,7 +41,7 @@ const StudioResult: React.FC<IStudioResultProps> = ({
     (stashID) => stashID.endpoint === endpoint && stashID.stash_id
   );
 
-  const handleSelect = (studios: ValidTypes[]) => {
+  const handleSelect = (studios: SelectObject[]) => {
     if (studios.length) {
       setSelectedID(studios[0].id);
     } else {