added details, deathdate, hair color, weight to performers and added details to studios

graphql/documents/data/performer.graphql

@@ -29,4 +29,8 @@ fragment PerformerData on Performer {
     stash_id
     endpoint
   }
+  details
+  deathdate
+  hair_color
+  weight
 }

graphql/documents/data/scrapers.graphql

@@ -19,6 +19,10 @@ fragment ScrapedPerformerData on ScrapedPerformer {
     ...ScrapedSceneTagData
   }
   image
+  details
+  deathdate
+  hair_color
+  weight
 }
 
 fragment ScrapedScenePerformerData on ScrapedScenePerformer {
@@ -44,6 +48,10 @@ fragment ScrapedScenePerformerData on ScrapedScenePerformer {
   }
   remote_site_id
   images
+  details
+  deathdate
+  hair_color
+  weight
 }
 
 fragment ScrapedMovieStudioData on ScrapedMovieStudio {

graphql/documents/data/studio-slim.graphql

@@ -9,4 +9,5 @@ fragment SlimStudioData on Studio {
   parent_studio {
     id
   }
+  details
 }

graphql/documents/data/studio.graphql

@@ -25,4 +25,5 @@ fragment StudioData on Studio {
     stash_id
     endpoint
   }
+  details
 }

graphql/documents/mutations/performer.graphql

@@ -18,7 +18,11 @@ mutation PerformerCreate(
   $favorite: Boolean,
   $tag_ids: [ID!],
   $stash_ids: [StashIDInput!],
-  $image: String) {
+  $image: String
+  $details: String,
+  $deathdate: String,
+  $hair_color: String,
+  $weight: String) {
 
   performerCreate(input: {
                             name: $name,
@@ -41,6 +45,10 @@ mutation PerformerCreate(
                             tag_ids: $tag_ids,
                             stash_ids: $stash_ids,
                             image: $image
+                            details: $details,
+                            deathdate: $deathdate,
+                            hair_color: $hair_color,
+                            weight: $weight
                           }) {
       ...PerformerData
   }

graphql/documents/mutations/studio.graphql

@@ -3,9 +3,10 @@ mutation StudioCreate(
   $url: String,
   $image: String,
   $stash_ids: [StashIDInput!],
-  $parent_id: ID) {
+  $parent_id: ID
+  $details: String) {
 
-  studioCreate(input: { name: $name, url: $url, image: $image, stash_ids: $stash_ids, parent_id: $parent_id }) {
+  studioCreate(input: { name: $name, url: $url, image: $image, stash_ids: $stash_ids, parent_id: $parent_id, details: $details }) {
     ...StudioData
   }
 }

graphql/documents/queries/scrapers/freeones.graphql

@@ -15,6 +15,10 @@ query ScrapeFreeones($performer_name: String!) {
     tattoos
     piercings
     aliases
+    details
+    deathdate
+    hair_color
+    weight
   }
 }
 

graphql/schema/types/filters.graphql

@@ -73,6 +73,12 @@ input PerformerFilterType {
   stash_id: String
   """Filter by url"""
   url: StringCriterionInput
+  """Filter by hair color"""
+  hair_color: StringCriterionInput
+  """Filter by weight"""
+  weight: StringCriterionInput
+  """Filter by death year"""
+  death_year: IntCriterionInput
 }
 
 input SceneMarkerFilterType {

graphql/schema/types/performer.graphql

@@ -33,6 +33,10 @@ type Performer {
   scene_count: Int # Resolver
   scenes: [Scene!]!
   stash_ids: [StashID!]!
+  details: String
+  deathdate: String
+  hair_color: String
+  weight: String
 }
 
 input PerformerCreateInput {
@@ -57,6 +61,10 @@ input PerformerCreateInput {
   """This should be a URL or a base64 encoded data URL"""
   image: String
   stash_ids: [StashIDInput!]
+  details: String
+  deathdate: String
+  hair_color: String
+  weight: String
 }
 
 input PerformerUpdateInput {
@@ -82,6 +90,10 @@ input PerformerUpdateInput {
   """This should be a URL or a base64 encoded data URL"""
   image: String
   stash_ids: [StashIDInput!]
+  details: String
+  deathdate: String
+  hair_color: String
+  weight: String
 }
 
 input BulkPerformerUpdateInput {
@@ -104,6 +116,10 @@ input BulkPerformerUpdateInput {
   instagram: String
   favorite: Boolean
   tag_ids: BulkUpdateIds
+  details: String
+  deathdate: String
+  hair_color: String
+  weight: String
 }
 
 input PerformerDestroyInput {

graphql/schema/types/scraped-performer.graphql

@@ -21,6 +21,10 @@ type ScrapedPerformer {
 
   """This should be a base64 encoded data URL"""
   image: String
+  details: String
+  deathdate: String
+  hair_color: String
+  weight: String
 }
 
 input ScrapedPerformerInput {
@@ -43,4 +47,8 @@ input ScrapedPerformerInput {
 
   # not including tags for the input
   # not including image for the input
+  details: String
+  deathdate: String
+  hair_color: String
+  weight: String
 }

graphql/schema/types/scraper.graphql

@@ -49,6 +49,10 @@ type ScrapedScenePerformer {
 
   remote_site_id: String
   images: [String!]
+  details: String
+  deathdate: String
+  hair_color: String
+  weight: String
 }
 
 type ScrapedSceneMovie {

graphql/schema/types/studio.graphql

@@ -9,6 +9,7 @@ type Studio {
   image_path: String # Resolver
   scene_count: Int # Resolver
   stash_ids: [StashID!]!
+  details: String
 }
 
 input StudioCreateInput {
@@ -18,6 +19,7 @@ input StudioCreateInput {
   """This should be a URL or a base64 encoded data URL"""
   image: String
   stash_ids: [StashIDInput!]
+  details: String
 }
 
 input StudioUpdateInput {
@@ -28,6 +30,7 @@ input StudioUpdateInput {
   """This should be a URL or a base64 encoded data URL"""
   image: String
   stash_ids: [StashIDInput!]
+  details: String
 }
 
 input StudioDestroyInput {

graphql/stash-box/query.graphql

@@ -75,6 +75,11 @@ fragment PerformerFragment on Performer {
   piercings {
     ...BodyModificationFragment
   }
+  details
+  deathdate {
+    ...FuzzyDateFragment
+  }
+  weight
 }
 
 fragment PerformerAppearanceFragment on PerformerAppearance {

pkg/api/resolver_model_performer.go

@@ -182,3 +182,31 @@ func (r *performerResolver) StashIds(ctx context.Context, obj *models.Performer)
 
 	return ret, nil
 }
+
+func (r *performerResolver) Details(ctx context.Context, obj *models.Performer) (*string, error) {
+	if obj.Details.Valid {
+		return &obj.Details.String, nil
+	}
+	return nil, nil
+}
+
+func (r *performerResolver) Deathdate(ctx context.Context, obj *models.Performer) (*string, error) {
+	if obj.Deathdate.Valid {
+		return &obj.Deathdate.String, nil
+	}
+	return nil, nil
+}
+
+func (r *performerResolver) HairColor(ctx context.Context, obj *models.Performer) (*string, error) {
+	if obj.HairColor.Valid {
+		return &obj.HairColor.String, nil
+	}
+	return nil, nil
+}
+
+func (r *performerResolver) Weight(ctx context.Context, obj *models.Performer) (*string, error) {
+	if obj.Weight.Valid {
+		return &obj.Weight.String, nil
+	}
+	return nil, nil
+}

pkg/api/resolver_model_studio.go

@@ -90,3 +90,10 @@ func (r *studioResolver) StashIds(ctx context.Context, obj *models.Studio) (ret
 
 	return ret, nil
 }
+
+func (r *studioResolver) Details(ctx context.Context, obj *models.Studio) (*string, error) {
+	if obj.Details.Valid {
+		return &obj.Details.String, nil
+	}
+	return nil, nil
+}

pkg/api/resolver_mutation_performer.go

@@ -3,6 +3,7 @@ package api
 import (
 	"context"
 	"database/sql"
+	"errors"
 	"strconv"
 	"time"
 
@@ -83,6 +84,24 @@ func (r *mutationResolver) PerformerCreate(ctx context.Context, input models.Per
 	} else {
 		newPerformer.Favorite = sql.NullBool{Bool: false, Valid: true}
 	}
+	if input.Details != nil {
+		newPerformer.Details = sql.NullString{String: *input.Details, Valid: true}
+	}
+	if input.Deathdate != nil {
+		newPerformer.Deathdate = models.SQLiteDate{String: *input.Deathdate, Valid: true}
+
+		if *input.Deathdate != "" {
+			if utils.IfDateHigherThanAnotherDate(*input.Birthdate, *input.Deathdate) {
+				return nil, errors.New("The date of Death should be higher than the date of Birth")
+			}
+		}
+	}
+	if input.HairColor != nil {
+		newPerformer.HairColor = sql.NullString{String: *input.HairColor, Valid: true}
+	}
+	if input.Weight != nil {
+		newPerformer.Weight = sql.NullString{String: *input.Weight, Valid: true}
+	}
 
 	// Start the transaction and save the performer
 	var performer *models.Performer
@@ -153,6 +172,12 @@ func (r *mutationResolver) PerformerUpdate(ctx context.Context, input models.Per
 		updatedPerformer.Checksum = &checksum
 	}
 
+	if *input.Deathdate != "" {
+		if utils.IfDateHigherThanAnotherDate(*input.Birthdate, *input.Deathdate) {
+			return nil, errors.New("The date of Death should be higher than the date of Birth")
+		}
+	}
+
 	updatedPerformer.URL = translator.nullString(input.URL, "url")
 
 	if translator.hasField("gender") {
@@ -177,6 +202,10 @@ func (r *mutationResolver) PerformerUpdate(ctx context.Context, input models.Per
 	updatedPerformer.Twitter = translator.nullString(input.Twitter, "twitter")
 	updatedPerformer.Instagram = translator.nullString(input.Instagram, "instagram")
 	updatedPerformer.Favorite = translator.nullBool(input.Favorite, "favorite")
+	updatedPerformer.Details = translator.nullString(input.Details, "details")
+	updatedPerformer.Deathdate = translator.sqliteDate(input.Deathdate, "deathdate")
+	updatedPerformer.HairColor = translator.nullString(input.HairColor, "hair_color")
+	updatedPerformer.Weight = translator.nullString(input.Weight, "weight")
 
 	// Start the transaction and save the performer
 	var performer *models.Performer
@@ -264,6 +293,10 @@ func (r *mutationResolver) BulkPerformerUpdate(ctx context.Context, input models
 	updatedPerformer.Twitter = translator.nullString(input.Twitter, "twitter")
 	updatedPerformer.Instagram = translator.nullString(input.Instagram, "instagram")
 	updatedPerformer.Favorite = translator.nullBool(input.Favorite, "favorite")
+	updatedPerformer.Details = translator.nullString(input.Details, "details")
+	updatedPerformer.Deathdate = translator.sqliteDate(input.Deathdate, "deathdate")
+	updatedPerformer.HairColor = translator.nullString(input.HairColor, "hair_color")
+	updatedPerformer.Weight = translator.nullString(input.Weight, "weight")
 
 	if translator.hasField("gender") {
 		if input.Gender != nil {
@@ -273,6 +306,12 @@ func (r *mutationResolver) BulkPerformerUpdate(ctx context.Context, input models
 		}
 	}
 
+	if *input.Deathdate != "" {
+		if utils.IfDateHigherThanAnotherDate(*input.Birthdate, *input.Deathdate) {
+			return nil, errors.New("The date of Death should be higher than the date of Birth")
+		}
+	}
+
 	ret := []*models.Performer{}
 
 	// Start the transaction and save the scene marker

pkg/api/resolver_mutation_studio.go

@@ -42,6 +42,10 @@ func (r *mutationResolver) StudioCreate(ctx context.Context, input models.Studio
 		newStudio.ParentID = sql.NullInt64{Int64: parentID, Valid: true}
 	}
 
+	if input.Details != nil {
+		newStudio.Details = sql.NullString{String: *input.Details, Valid: true}
+	}
+
 	// Start the transaction and save the studio
 	var studio *models.Studio
 	if err := r.withTxn(ctx, func(repo models.Repository) error {
@@ -109,6 +113,7 @@ func (r *mutationResolver) StudioUpdate(ctx context.Context, input models.Studio
 	}
 
 	updatedStudio.URL = translator.nullString(input.URL, "url")
+	updatedStudio.Details = translator.nullString(input.Details, "details")
 	updatedStudio.ParentID = translator.nullInt64FromString(input.ParentID, "parent_id")
 
 	// Start the transaction and save the studio

pkg/database/database.go

@@ -23,7 +23,7 @@ import (
 var DB *sqlx.DB
 var WriteMu *sync.Mutex
 var dbPath string
-var appSchemaVersion uint = 20
+var appSchemaVersion uint = 21
 var databaseSchemaVersion uint
 
 var (

pkg/database/migrations/21_performers_studios_details.up.sql

@@ -0,0 +1,5 @@
+ALTER TABLE `performers` ADD COLUMN `details` text;
+ALTER TABLE `performers` ADD COLUMN `deathdate` date;
+ALTER TABLE `performers` ADD COLUMN `hair_color` varchar(255);
+ALTER TABLE `performers` ADD COLUMN `weight` varchar(255);
+ALTER TABLE `studios` ADD COLUMN `details` text;

pkg/manager/jsonschema/performer.go

@@ -30,6 +30,10 @@ type Performer struct {
 	Image        string          `json:"image,omitempty"`
 	CreatedAt    models.JSONTime `json:"created_at,omitempty"`
 	UpdatedAt    models.JSONTime `json:"updated_at,omitempty"`
+	Details      string          `json:"details,omitempty"`
+	Deathdate    string          `json:"deathdate,omitempty"`
+	HairColor    string          `json:"hair_color,omitempty"`
+	Weight       string          `json:"weight,omitempty"`
 }
 
 func LoadPerformerFile(filePath string) (*Performer, error) {

pkg/manager/jsonschema/studio.go

@@ -15,6 +15,7 @@ type Studio struct {
 	Image        string          `json:"image,omitempty"`
 	CreatedAt    models.JSONTime `json:"created_at,omitempty"`
 	UpdatedAt    models.JSONTime `json:"updated_at,omitempty"`
+	Details      string          `json:"details,omitempty"`
 }
 
 func LoadStudioFile(filePath string) (*Studio, error) {