replace id with performer_id

stashapp · Nov 27, 2023 · f5db2c5 · f5db2c5
1 parent dbc7f73
commit f5db2c5
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 19 deletions.
diff --git a/graphql/documents/queries/studio.graphql b/graphql/documents/queries/studio.graphql
@@ -28,7 +28,7 @@ query FindStudioPerformers(
     ) {
       count
       studioPerformer {
-        id
+        performer_id
         studio_id
         scene_count
         image_count

diff --git a/graphql/schema/types/studio-performer.graphql b/graphql/schema/types/studio-performer.graphql
@@ -1,5 +1,5 @@
 type StudioPerformer {
-  id: ID!
+  performer_id: ID!
   studio_id: ID!
   "Number of Scenes the Performer appears in for the Studio"
   scene_count: Int! # Resolver

diff --git a/internal/api/resolver_model_studio.go b/internal/api/resolver_model_studio.go
@@ -155,10 +155,10 @@ func (r *studioResolver) Performers(ctx context.Context, obj *models.Studio, per
 	for _, performer := range performers {
 
 		studioPerformer := &models.StudioPerformer{
-			ID:        performer.ID,
-			StudioID:  obj.ID,
-			Depth:     depth,
-			Performer: *performer,
+			PerformerID: performer.ID,
+			StudioID:    obj.ID,
+			Depth:       depth,
+			Performer:   *performer,
 		}
 
 		studioPerformers = append(studioPerformers, studioPerformer)

diff --git a/internal/api/resolver_model_studio_performer.go b/internal/api/resolver_model_studio_performer.go
@@ -12,7 +12,7 @@ import (
 
 func (r *studioPerformerResolver) SceneCount(ctx context.Context, obj *models.StudioPerformer) (ret int, err error) {
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		ret, err = scene.CountByPerformerIDStudioID(ctx, r.repository.Scene, obj.ID, obj.StudioID, obj.Depth)
+		ret, err = scene.CountByPerformerIDStudioID(ctx, r.repository.Scene, obj.PerformerID, obj.StudioID, obj.Depth)
 		return err
 	}); err != nil {
 		return 0, err
@@ -23,7 +23,7 @@ func (r *studioPerformerResolver) SceneCount(ctx context.Context, obj *models.St
 
 func (r *studioPerformerResolver) GalleryCount(ctx context.Context, obj *models.StudioPerformer) (ret int, err error) {
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		ret, err = gallery.CountByPerformerIDStudioID(ctx, r.repository.Gallery, obj.ID, obj.StudioID, obj.Depth)
+		ret, err = gallery.CountByPerformerIDStudioID(ctx, r.repository.Gallery, obj.PerformerID, obj.StudioID, obj.Depth)
 		return err
 	}); err != nil {
 		return 0, err
@@ -34,7 +34,7 @@ func (r *studioPerformerResolver) GalleryCount(ctx context.Context, obj *models.
 
 func (r *studioPerformerResolver) ImageCount(ctx context.Context, obj *models.StudioPerformer) (ret int, err error) {
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		ret, err = image.CountByPerformerIDStudioID(ctx, r.repository.Image, obj.ID, obj.StudioID, obj.Depth)
+		ret, err = image.CountByPerformerIDStudioID(ctx, r.repository.Image, obj.PerformerID, obj.StudioID, obj.Depth)
 		return err
 	}); err != nil {
 		return 0, err
@@ -45,7 +45,7 @@ func (r *studioPerformerResolver) ImageCount(ctx context.Context, obj *models.St
 
 func (r *studioPerformerResolver) MovieCount(ctx context.Context, obj *models.StudioPerformer) (ret int, err error) {
 	if err := r.withReadTxn(ctx, func(ctx context.Context) error {
-		ret, err = movie.CountByPerformerIDStudioID(ctx, r.repository.Movie, obj.ID, obj.StudioID, obj.Depth)
+		ret, err = movie.CountByPerformerIDStudioID(ctx, r.repository.Movie, obj.PerformerID, obj.StudioID, obj.Depth)
 		return err
 	}); err != nil {
 		return 0, err

diff --git a/pkg/models/model_studio_performer.go b/pkg/models/model_studio_performer.go
@@ -1,8 +1,8 @@
 package models
 
 type StudioPerformer struct {
-	ID        int       `json:"id"`
-	StudioID  int       `json:"studio_id"`
-	Performer Performer `json:"performer"`
-	Depth     *int
+	PerformerID int       `json:"performer_id"`
+	StudioID    int       `json:"studio_id"`
+	Performer   Performer `json:"performer"`
+	Depth       *int
 }
diff --git a/ui/v2.5/src/components/Performers/PerformerList.tsx b/ui/v2.5/src/components/Performers/PerformerList.tsx
@@ -160,9 +160,9 @@ export const PerformerList: React.FC<IPerformerList> = ({
       if (
         singleResult.data.findStudio?.performers.studioPerformer.length === 1
       ) {
-        const { id } =
+        const { performer_id } =
           singleResult.data.findStudio?.performers.studioPerformer[0]!;
-        history.push(`/performers/${id}`);
+        history.push(`/performers/${performer_id}`);
       }
     } else if (performersQuery) {
       const { count } = performersQuery;

diff --git a/ui/v2.5/src/core/createClient.ts b/ui/v2.5/src/core/createClient.ts
@@ -104,9 +104,6 @@ const typePolicies: TypePolicies = {
       },
     },
   },
-  StudioPerformer: {
-    keyFields: false,
-  }
 };
 
 const possibleTypes = {
-Original file line number
+Diff line change
@@ Expand Up / @@ -104,9 +104,6 @@ const typePolicies: TypePolicies = { @@
           },
         },
       },
-      StudioPerformer: {
-        keyFields: false,
-      }
     };
     const possibleTypes = {
@@ Expand Down @@