From 197618ca9ba8736c29c9a1ebb33925af6601e6f3 Mon Sep 17 00:00:00 2001 From: InfiniteStash <117855276+InfiniteStash@users.noreply.github.com> Date: Tue, 10 Dec 2024 10:31:09 +0000 Subject: [PATCH 1/3] Add performer `deathdate` --- .../src/components/editCard/ModifyEdit.tsx | 7 + .../src/graphql/fragments/EditFragment.gql | 2 + .../graphql/fragments/PerformerFragment.gql | 1 + frontend/src/graphql/queries/EditUpdate.gql | 1 + frontend/src/graphql/types.ts | 366 ++++++++++++++++++ frontend/src/pages/drafts/parse.ts | 1 + .../performers/components/performerInfo.tsx | 21 +- .../performerForm/PerformerForm.tsx | 29 +- .../pages/performers/performerForm/diff.ts | 2 + .../pages/performers/performerForm/schema.ts | 13 + .../pages/performers/performerForm/types.ts | 1 + graphql/schema/types/performer.graphql | 9 + pkg/api/graphql_client_test.go | 1 + pkg/api/integration_test.go | 4 + pkg/api/performer_edit_integration_test.go | 9 + pkg/api/performer_integration_test.go | 12 + pkg/api/resolver_model_performer.go | 18 +- pkg/api/resolver_mutation_draft.go | 1 + pkg/database/database.go | 2 +- .../postgres/44_performer_death_date.up.sql | 1 + pkg/models/extension_edit_details.go | 7 + pkg/models/extension_edit_details_test.go | 4 + pkg/models/generated_exec.go | 253 +++++++++++- pkg/models/generated_models.go | 9 +- pkg/models/model_draft.go | 1 + pkg/models/model_edit.go | 1 + pkg/models/model_performer.go | 3 + pkg/models/model_performer_test.go | 2 + 28 files changed, 758 insertions(+), 23 deletions(-) create mode 100644 pkg/database/migrations/postgres/44_performer_death_date.up.sql diff --git a/frontend/src/components/editCard/ModifyEdit.tsx b/frontend/src/components/editCard/ModifyEdit.tsx index 9a182f4fd..79f7a1be3 100644 --- a/frontend/src/components/editCard/ModifyEdit.tsx +++ b/frontend/src/components/editCard/ModifyEdit.tsx @@ -116,6 +116,7 @@ export interface PerformerDetails { gender?: GenderEnum | null; disambiguation?: string | null; birthdate?: string | null; + deathdate?: string | null; career_start_year?: number | null; career_end_year?: number | null; height?: number | null; @@ -199,6 +200,12 @@ export const renderPerformerDetails = ( oldValue={oldPerformerDetails?.birthdate} showDiff={showDiff} /> + ; created: Scalars["Time"]["output"]; cup_size?: Maybe; + death_date?: Maybe; deleted: Scalars["Boolean"]["output"]; disambiguation?: Maybe; edits: Array; @@ -911,6 +912,7 @@ export type PerformerCreateInput = { career_start_year?: InputMaybe; country?: InputMaybe; cup_size?: InputMaybe; + deathdate?: InputMaybe; disambiguation?: InputMaybe; draft_id?: InputMaybe; ethnicity?: InputMaybe; @@ -939,6 +941,7 @@ export type PerformerDraft = { career_end_year?: Maybe; career_start_year?: Maybe; country?: Maybe; + deathdate?: Maybe; disambiguation?: Maybe; ethnicity?: Maybe; eye_color?: Maybe; @@ -961,6 +964,7 @@ export type PerformerDraftInput = { career_end_year?: InputMaybe; career_start_year?: InputMaybe; country?: InputMaybe; + deathdate?: InputMaybe; disambiguation?: InputMaybe; ethnicity?: InputMaybe; eye_color?: InputMaybe; @@ -991,6 +995,7 @@ export type PerformerEdit = { career_start_year?: Maybe; country?: Maybe; cup_size?: Maybe; + deathdate?: Maybe; disambiguation?: Maybe; draft_id?: Maybe; ethnicity?: Maybe; @@ -1022,6 +1027,7 @@ export type PerformerEditDetailsInput = { career_start_year?: InputMaybe; country?: InputMaybe; cup_size?: InputMaybe; + deathdate?: InputMaybe; disambiguation?: InputMaybe; draft_id?: InputMaybe; ethnicity?: InputMaybe; @@ -1073,6 +1079,7 @@ export type PerformerQueryInput = { career_start_year?: InputMaybe; country?: InputMaybe; cup_size?: InputMaybe; + deathdate?: InputMaybe; direction?: SortDirectionEnum; disambiguation?: InputMaybe; ethnicity?: InputMaybe; @@ -1114,6 +1121,7 @@ export enum PerformerSortEnum { BIRTHDATE = "BIRTHDATE", CAREER_START_YEAR = "CAREER_START_YEAR", CREATED_AT = "CREATED_AT", + DEATHDATE = "DEATHDATE", DEBUT = "DEBUT", LAST_SCENE = "LAST_SCENE", NAME = "NAME", @@ -1136,6 +1144,7 @@ export type PerformerUpdateInput = { career_start_year?: InputMaybe; country?: InputMaybe; cup_size?: InputMaybe; + deathdate?: InputMaybe; disambiguation?: InputMaybe; ethnicity?: InputMaybe; eye_color?: InputMaybe; @@ -2133,6 +2142,7 @@ export type EditFragment = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -2280,6 +2290,7 @@ export type EditFragment = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -2401,6 +2412,7 @@ export type EditFragment = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -2457,6 +2469,7 @@ export type EditFragment = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -2634,6 +2647,7 @@ export type EditFragment = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -2709,6 +2723,7 @@ export type EditFragment = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -2765,6 +2780,7 @@ export type EditFragment = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -2918,6 +2934,7 @@ export type EditFragment = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -3088,6 +3105,7 @@ export type PerformerFragment = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -3481,6 +3499,7 @@ export type ApplyEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -3643,6 +3662,7 @@ export type ApplyEditMutation = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -3784,6 +3804,7 @@ export type ApplyEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -3840,6 +3861,7 @@ export type ApplyEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -4027,6 +4049,7 @@ export type ApplyEditMutation = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -4112,6 +4135,7 @@ export type ApplyEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -4168,6 +4192,7 @@ export type ApplyEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -4321,6 +4346,7 @@ export type ApplyEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -4720,6 +4746,7 @@ export type PerformerEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -4882,6 +4909,7 @@ export type PerformerEditMutation = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -5023,6 +5051,7 @@ export type PerformerEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -5079,6 +5108,7 @@ export type PerformerEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -5266,6 +5296,7 @@ export type PerformerEditMutation = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -5351,6 +5382,7 @@ export type PerformerEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -5407,6 +5439,7 @@ export type PerformerEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -5560,6 +5593,7 @@ export type PerformerEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -5769,6 +5803,7 @@ export type PerformerEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -5931,6 +5966,7 @@ export type PerformerEditUpdateMutation = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -6072,6 +6108,7 @@ export type PerformerEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -6128,6 +6165,7 @@ export type PerformerEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -6315,6 +6353,7 @@ export type PerformerEditUpdateMutation = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -6400,6 +6439,7 @@ export type PerformerEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -6456,6 +6496,7 @@ export type PerformerEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -6609,6 +6650,7 @@ export type PerformerEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -6862,6 +6904,7 @@ export type SceneEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -7024,6 +7067,7 @@ export type SceneEditMutation = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -7165,6 +7209,7 @@ export type SceneEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -7221,6 +7266,7 @@ export type SceneEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -7408,6 +7454,7 @@ export type SceneEditMutation = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -7493,6 +7540,7 @@ export type SceneEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -7549,6 +7597,7 @@ export type SceneEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -7702,6 +7751,7 @@ export type SceneEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -7911,6 +7961,7 @@ export type SceneEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -8073,6 +8124,7 @@ export type SceneEditUpdateMutation = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -8214,6 +8266,7 @@ export type SceneEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -8270,6 +8323,7 @@ export type SceneEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -8457,6 +8511,7 @@ export type SceneEditUpdateMutation = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -8542,6 +8597,7 @@ export type SceneEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -8598,6 +8654,7 @@ export type SceneEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -8751,6 +8808,7 @@ export type SceneEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -8959,6 +9017,7 @@ export type StudioEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -9121,6 +9180,7 @@ export type StudioEditMutation = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -9262,6 +9322,7 @@ export type StudioEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -9318,6 +9379,7 @@ export type StudioEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -9505,6 +9567,7 @@ export type StudioEditMutation = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -9590,6 +9653,7 @@ export type StudioEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -9646,6 +9710,7 @@ export type StudioEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -9799,6 +9864,7 @@ export type StudioEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -10008,6 +10074,7 @@ export type StudioEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -10170,6 +10237,7 @@ export type StudioEditUpdateMutation = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -10311,6 +10379,7 @@ export type StudioEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -10367,6 +10436,7 @@ export type StudioEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -10554,6 +10624,7 @@ export type StudioEditUpdateMutation = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -10639,6 +10710,7 @@ export type StudioEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -10695,6 +10767,7 @@ export type StudioEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -10848,6 +10921,7 @@ export type StudioEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -11056,6 +11130,7 @@ export type TagEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -11218,6 +11293,7 @@ export type TagEditMutation = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -11359,6 +11435,7 @@ export type TagEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -11415,6 +11492,7 @@ export type TagEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -11602,6 +11680,7 @@ export type TagEditMutation = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -11687,6 +11766,7 @@ export type TagEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -11743,6 +11823,7 @@ export type TagEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -11896,6 +11977,7 @@ export type TagEditMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -12105,6 +12187,7 @@ export type TagEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -12267,6 +12350,7 @@ export type TagEditUpdateMutation = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -12408,6 +12492,7 @@ export type TagEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -12464,6 +12549,7 @@ export type TagEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -12651,6 +12737,7 @@ export type TagEditUpdateMutation = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -12736,6 +12823,7 @@ export type TagEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -12792,6 +12880,7 @@ export type TagEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -12945,6 +13034,7 @@ export type TagEditUpdateMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -13298,6 +13388,7 @@ export type VoteMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -13460,6 +13551,7 @@ export type VoteMutation = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -13601,6 +13693,7 @@ export type VoteMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -13657,6 +13750,7 @@ export type VoteMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -13844,6 +13938,7 @@ export type VoteMutation = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -13929,6 +14024,7 @@ export type VoteMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -13985,6 +14081,7 @@ export type VoteMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -14138,6 +14235,7 @@ export type VoteMutation = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -14457,6 +14555,7 @@ export type DraftQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -14599,6 +14698,7 @@ export type EditQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -14761,6 +14861,7 @@ export type EditQuery = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -14902,6 +15003,7 @@ export type EditQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -14958,6 +15060,7 @@ export type EditQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -15145,6 +15248,7 @@ export type EditQuery = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -15230,6 +15334,7 @@ export type EditQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -15286,6 +15391,7 @@ export type EditQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -15439,6 +15545,7 @@ export type EditQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -15641,6 +15748,7 @@ export type EditUpdateQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -15906,6 +16014,7 @@ export type EditUpdateQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -16093,6 +16202,7 @@ export type EditsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -16259,6 +16369,7 @@ export type EditsQuery = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -16404,6 +16515,7 @@ export type EditsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -16460,6 +16572,7 @@ export type EditsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -16651,6 +16764,7 @@ export type EditsQuery = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -16740,6 +16854,7 @@ export type EditsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -16796,6 +16911,7 @@ export type EditsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -16953,6 +17069,7 @@ export type EditsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -17135,6 +17252,7 @@ export type FullPerformerQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -17222,6 +17340,7 @@ export type PerformerQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -17368,6 +17487,7 @@ export type QueryExistingPerformerQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -17446,6 +17566,7 @@ export type QueryExistingPerformerQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -17612,6 +17733,7 @@ export type QueryExistingPerformerQuery = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -17757,6 +17879,7 @@ export type QueryExistingPerformerQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -17813,6 +17936,7 @@ export type QueryExistingPerformerQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -18004,6 +18128,7 @@ export type QueryExistingPerformerQuery = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -18093,6 +18218,7 @@ export type QueryExistingPerformerQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -18149,6 +18275,7 @@ export type QueryExistingPerformerQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -18306,6 +18433,7 @@ export type QueryExistingPerformerQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -18582,6 +18710,7 @@ export type QueryExistingSceneQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -18748,6 +18877,7 @@ export type QueryExistingSceneQuery = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -18893,6 +19023,7 @@ export type QueryExistingSceneQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -18949,6 +19080,7 @@ export type QueryExistingSceneQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -19140,6 +19272,7 @@ export type QueryExistingSceneQuery = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -19229,6 +19362,7 @@ export type QueryExistingSceneQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -19285,6 +19419,7 @@ export type QueryExistingSceneQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -19442,6 +19577,7 @@ export type QueryExistingSceneQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -19654,6 +19790,7 @@ export type NotificationCommentFragment = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -19816,6 +19953,7 @@ export type NotificationCommentFragment = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -19957,6 +20095,7 @@ export type NotificationCommentFragment = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -20013,6 +20152,7 @@ export type NotificationCommentFragment = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -20200,6 +20340,7 @@ export type NotificationCommentFragment = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -20285,6 +20426,7 @@ export type NotificationCommentFragment = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -20341,6 +20483,7 @@ export type NotificationCommentFragment = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -20494,6 +20637,7 @@ export type NotificationCommentFragment = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -20726,6 +20870,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -20896,6 +21041,7 @@ export type NotificationsQuery = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -21041,6 +21187,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -21097,6 +21244,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -21288,6 +21436,7 @@ export type NotificationsQuery = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -21377,6 +21526,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -21433,6 +21583,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -21590,6 +21741,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -21816,6 +21968,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -21986,6 +22139,7 @@ export type NotificationsQuery = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -22131,6 +22285,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -22187,6 +22342,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -22378,6 +22534,7 @@ export type NotificationsQuery = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -22467,6 +22624,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -22523,6 +22681,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -22680,6 +22839,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -22906,6 +23066,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -23076,6 +23237,7 @@ export type NotificationsQuery = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -23221,6 +23383,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -23277,6 +23440,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -23468,6 +23632,7 @@ export type NotificationsQuery = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -23557,6 +23722,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -23613,6 +23779,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -23770,6 +23937,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -23983,6 +24151,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -24153,6 +24322,7 @@ export type NotificationsQuery = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -24298,6 +24468,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -24354,6 +24525,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -24545,6 +24717,7 @@ export type NotificationsQuery = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -24634,6 +24807,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -24690,6 +24864,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -24847,6 +25022,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -25058,6 +25234,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -25228,6 +25405,7 @@ export type NotificationsQuery = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -25373,6 +25551,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -25429,6 +25608,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -25620,6 +25800,7 @@ export type NotificationsQuery = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -25709,6 +25890,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -25765,6 +25947,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -25922,6 +26105,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -26133,6 +26317,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -26303,6 +26488,7 @@ export type NotificationsQuery = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -26448,6 +26634,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -26504,6 +26691,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -26695,6 +26883,7 @@ export type NotificationsQuery = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -26784,6 +26973,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -26840,6 +27030,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -26997,6 +27188,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -27281,6 +27473,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -27451,6 +27644,7 @@ export type NotificationsQuery = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -27596,6 +27790,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -27652,6 +27847,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -27843,6 +28039,7 @@ export type NotificationsQuery = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -27932,6 +28129,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -27988,6 +28186,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -28145,6 +28344,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -28429,6 +28629,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -28599,6 +28800,7 @@ export type NotificationsQuery = { removed_aliases?: Array | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -28744,6 +28946,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -28800,6 +29003,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -28991,6 +29195,7 @@ export type NotificationsQuery = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -29080,6 +29285,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -29136,6 +29342,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -29293,6 +29500,7 @@ export type NotificationsQuery = { aliases: Array; gender?: GenderEnum | null; birth_date?: string | null; + death_date?: string | null; age?: number | null; height?: number | null; hair_color?: HairColorEnum | null; @@ -30569,6 +30777,7 @@ export const PerformerFragmentDoc = { { kind: "Field", name: { kind: "Name", value: "aliases" } }, { kind: "Field", name: { kind: "Name", value: "gender" } }, { kind: "Field", name: { kind: "Name", value: "birth_date" } }, + { kind: "Field", name: { kind: "Name", value: "death_date" } }, { kind: "Field", name: { kind: "Name", value: "age" } }, { kind: "Field", name: { kind: "Name", value: "height" } }, { kind: "Field", name: { kind: "Name", value: "hair_color" } }, @@ -31243,6 +31452,10 @@ export const EditFragmentDoc = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -31755,6 +31968,10 @@ export const EditFragmentDoc = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -32272,6 +32489,7 @@ export const EditFragmentDoc = { { kind: "Field", name: { kind: "Name", value: "aliases" } }, { kind: "Field", name: { kind: "Name", value: "gender" } }, { kind: "Field", name: { kind: "Name", value: "birth_date" } }, + { kind: "Field", name: { kind: "Name", value: "death_date" } }, { kind: "Field", name: { kind: "Name", value: "age" } }, { kind: "Field", name: { kind: "Name", value: "height" } }, { kind: "Field", name: { kind: "Name", value: "hair_color" } }, @@ -32700,6 +32918,7 @@ export const NotificationCommentFragmentDoc = { { kind: "Field", name: { kind: "Name", value: "aliases" } }, { kind: "Field", name: { kind: "Name", value: "gender" } }, { kind: "Field", name: { kind: "Name", value: "birth_date" } }, + { kind: "Field", name: { kind: "Name", value: "death_date" } }, { kind: "Field", name: { kind: "Name", value: "age" } }, { kind: "Field", name: { kind: "Name", value: "height" } }, { kind: "Field", name: { kind: "Name", value: "hair_color" } }, @@ -33242,6 +33461,10 @@ export const NotificationCommentFragmentDoc = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -33754,6 +33977,10 @@ export const NotificationCommentFragmentDoc = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -34848,6 +35075,7 @@ export const ApplyEditDocument = { { kind: "Field", name: { kind: "Name", value: "aliases" } }, { kind: "Field", name: { kind: "Name", value: "gender" } }, { kind: "Field", name: { kind: "Name", value: "birth_date" } }, + { kind: "Field", name: { kind: "Name", value: "death_date" } }, { kind: "Field", name: { kind: "Name", value: "age" } }, { kind: "Field", name: { kind: "Name", value: "height" } }, { kind: "Field", name: { kind: "Name", value: "hair_color" } }, @@ -35390,6 +35618,10 @@ export const ApplyEditDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -35902,6 +36134,10 @@ export const ApplyEditDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -37345,6 +37581,7 @@ export const PerformerEditDocument = { { kind: "Field", name: { kind: "Name", value: "aliases" } }, { kind: "Field", name: { kind: "Name", value: "gender" } }, { kind: "Field", name: { kind: "Name", value: "birth_date" } }, + { kind: "Field", name: { kind: "Name", value: "death_date" } }, { kind: "Field", name: { kind: "Name", value: "age" } }, { kind: "Field", name: { kind: "Name", value: "height" } }, { kind: "Field", name: { kind: "Name", value: "hair_color" } }, @@ -37887,6 +38124,10 @@ export const PerformerEditDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -38399,6 +38640,10 @@ export const PerformerEditDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -38970,6 +39215,7 @@ export const PerformerEditUpdateDocument = { { kind: "Field", name: { kind: "Name", value: "aliases" } }, { kind: "Field", name: { kind: "Name", value: "gender" } }, { kind: "Field", name: { kind: "Name", value: "birth_date" } }, + { kind: "Field", name: { kind: "Name", value: "death_date" } }, { kind: "Field", name: { kind: "Name", value: "age" } }, { kind: "Field", name: { kind: "Name", value: "height" } }, { kind: "Field", name: { kind: "Name", value: "hair_color" } }, @@ -39512,6 +39758,10 @@ export const PerformerEditUpdateDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -40024,6 +40274,10 @@ export const PerformerEditUpdateDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -40781,6 +41035,7 @@ export const SceneEditDocument = { { kind: "Field", name: { kind: "Name", value: "aliases" } }, { kind: "Field", name: { kind: "Name", value: "gender" } }, { kind: "Field", name: { kind: "Name", value: "birth_date" } }, + { kind: "Field", name: { kind: "Name", value: "death_date" } }, { kind: "Field", name: { kind: "Name", value: "age" } }, { kind: "Field", name: { kind: "Name", value: "height" } }, { kind: "Field", name: { kind: "Name", value: "hair_color" } }, @@ -41323,6 +41578,10 @@ export const SceneEditDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -41835,6 +42094,10 @@ export const SceneEditDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -42403,6 +42666,7 @@ export const SceneEditUpdateDocument = { { kind: "Field", name: { kind: "Name", value: "aliases" } }, { kind: "Field", name: { kind: "Name", value: "gender" } }, { kind: "Field", name: { kind: "Name", value: "birth_date" } }, + { kind: "Field", name: { kind: "Name", value: "death_date" } }, { kind: "Field", name: { kind: "Name", value: "age" } }, { kind: "Field", name: { kind: "Name", value: "height" } }, { kind: "Field", name: { kind: "Name", value: "hair_color" } }, @@ -42945,6 +43209,10 @@ export const SceneEditUpdateDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -43457,6 +43725,10 @@ export const SceneEditUpdateDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -44012,6 +44284,7 @@ export const StudioEditDocument = { { kind: "Field", name: { kind: "Name", value: "aliases" } }, { kind: "Field", name: { kind: "Name", value: "gender" } }, { kind: "Field", name: { kind: "Name", value: "birth_date" } }, + { kind: "Field", name: { kind: "Name", value: "death_date" } }, { kind: "Field", name: { kind: "Name", value: "age" } }, { kind: "Field", name: { kind: "Name", value: "height" } }, { kind: "Field", name: { kind: "Name", value: "hair_color" } }, @@ -44554,6 +44827,10 @@ export const StudioEditDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -45066,6 +45343,10 @@ export const StudioEditDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -45634,6 +45915,7 @@ export const StudioEditUpdateDocument = { { kind: "Field", name: { kind: "Name", value: "aliases" } }, { kind: "Field", name: { kind: "Name", value: "gender" } }, { kind: "Field", name: { kind: "Name", value: "birth_date" } }, + { kind: "Field", name: { kind: "Name", value: "death_date" } }, { kind: "Field", name: { kind: "Name", value: "age" } }, { kind: "Field", name: { kind: "Name", value: "height" } }, { kind: "Field", name: { kind: "Name", value: "hair_color" } }, @@ -46176,6 +46458,10 @@ export const StudioEditUpdateDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -46688,6 +46974,10 @@ export const StudioEditUpdateDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -47243,6 +47533,7 @@ export const TagEditDocument = { { kind: "Field", name: { kind: "Name", value: "aliases" } }, { kind: "Field", name: { kind: "Name", value: "gender" } }, { kind: "Field", name: { kind: "Name", value: "birth_date" } }, + { kind: "Field", name: { kind: "Name", value: "death_date" } }, { kind: "Field", name: { kind: "Name", value: "age" } }, { kind: "Field", name: { kind: "Name", value: "height" } }, { kind: "Field", name: { kind: "Name", value: "hair_color" } }, @@ -47785,6 +48076,10 @@ export const TagEditDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -48297,6 +48592,10 @@ export const TagEditDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -48865,6 +49164,7 @@ export const TagEditUpdateDocument = { { kind: "Field", name: { kind: "Name", value: "aliases" } }, { kind: "Field", name: { kind: "Name", value: "gender" } }, { kind: "Field", name: { kind: "Name", value: "birth_date" } }, + { kind: "Field", name: { kind: "Name", value: "death_date" } }, { kind: "Field", name: { kind: "Name", value: "age" } }, { kind: "Field", name: { kind: "Name", value: "height" } }, { kind: "Field", name: { kind: "Name", value: "hair_color" } }, @@ -49407,6 +49707,10 @@ export const TagEditUpdateDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -49919,6 +50223,10 @@ export const TagEditUpdateDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -51151,6 +51459,7 @@ export const VoteDocument = { { kind: "Field", name: { kind: "Name", value: "aliases" } }, { kind: "Field", name: { kind: "Name", value: "gender" } }, { kind: "Field", name: { kind: "Name", value: "birth_date" } }, + { kind: "Field", name: { kind: "Name", value: "death_date" } }, { kind: "Field", name: { kind: "Name", value: "age" } }, { kind: "Field", name: { kind: "Name", value: "height" } }, { kind: "Field", name: { kind: "Name", value: "hair_color" } }, @@ -51693,6 +52002,10 @@ export const VoteDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -52205,6 +52518,10 @@ export const VoteDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -53270,6 +53587,7 @@ export const DraftDocument = { { kind: "Field", name: { kind: "Name", value: "aliases" } }, { kind: "Field", name: { kind: "Name", value: "gender" } }, { kind: "Field", name: { kind: "Name", value: "birth_date" } }, + { kind: "Field", name: { kind: "Name", value: "death_date" } }, { kind: "Field", name: { kind: "Name", value: "age" } }, { kind: "Field", name: { kind: "Name", value: "height" } }, { kind: "Field", name: { kind: "Name", value: "hair_color" } }, @@ -53605,6 +53923,7 @@ export const EditDocument = { { kind: "Field", name: { kind: "Name", value: "aliases" } }, { kind: "Field", name: { kind: "Name", value: "gender" } }, { kind: "Field", name: { kind: "Name", value: "birth_date" } }, + { kind: "Field", name: { kind: "Name", value: "death_date" } }, { kind: "Field", name: { kind: "Name", value: "age" } }, { kind: "Field", name: { kind: "Name", value: "height" } }, { kind: "Field", name: { kind: "Name", value: "hair_color" } }, @@ -54147,6 +54466,10 @@ export const EditDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -54659,6 +54982,10 @@ export const EditDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -55809,6 +56136,7 @@ export const EditUpdateDocument = { { kind: "Field", name: { kind: "Name", value: "aliases" } }, { kind: "Field", name: { kind: "Name", value: "gender" } }, { kind: "Field", name: { kind: "Name", value: "birth_date" } }, + { kind: "Field", name: { kind: "Name", value: "death_date" } }, { kind: "Field", name: { kind: "Name", value: "age" } }, { kind: "Field", name: { kind: "Name", value: "height" } }, { kind: "Field", name: { kind: "Name", value: "hair_color" } }, @@ -56266,6 +56594,7 @@ export const EditsDocument = { { kind: "Field", name: { kind: "Name", value: "aliases" } }, { kind: "Field", name: { kind: "Name", value: "gender" } }, { kind: "Field", name: { kind: "Name", value: "birth_date" } }, + { kind: "Field", name: { kind: "Name", value: "death_date" } }, { kind: "Field", name: { kind: "Name", value: "age" } }, { kind: "Field", name: { kind: "Name", value: "height" } }, { kind: "Field", name: { kind: "Name", value: "hair_color" } }, @@ -56808,6 +57137,10 @@ export const EditsDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -57320,6 +57653,10 @@ export const EditsDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -57857,6 +58194,7 @@ export const FullPerformerDocument = { { kind: "Field", name: { kind: "Name", value: "aliases" } }, { kind: "Field", name: { kind: "Name", value: "gender" } }, { kind: "Field", name: { kind: "Name", value: "birth_date" } }, + { kind: "Field", name: { kind: "Name", value: "death_date" } }, { kind: "Field", name: { kind: "Name", value: "age" } }, { kind: "Field", name: { kind: "Name", value: "height" } }, { kind: "Field", name: { kind: "Name", value: "hair_color" } }, @@ -58144,6 +58482,7 @@ export const PerformerDocument = { { kind: "Field", name: { kind: "Name", value: "aliases" } }, { kind: "Field", name: { kind: "Name", value: "gender" } }, { kind: "Field", name: { kind: "Name", value: "birth_date" } }, + { kind: "Field", name: { kind: "Name", value: "death_date" } }, { kind: "Field", name: { kind: "Name", value: "age" } }, { kind: "Field", name: { kind: "Name", value: "height" } }, { kind: "Field", name: { kind: "Name", value: "hair_color" } }, @@ -58755,6 +59094,7 @@ export const QueryExistingPerformerDocument = { { kind: "Field", name: { kind: "Name", value: "aliases" } }, { kind: "Field", name: { kind: "Name", value: "gender" } }, { kind: "Field", name: { kind: "Name", value: "birth_date" } }, + { kind: "Field", name: { kind: "Name", value: "death_date" } }, { kind: "Field", name: { kind: "Name", value: "age" } }, { kind: "Field", name: { kind: "Name", value: "height" } }, { kind: "Field", name: { kind: "Name", value: "hair_color" } }, @@ -59297,6 +59637,10 @@ export const QueryExistingPerformerDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -59809,6 +60153,10 @@ export const QueryExistingPerformerDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -60405,6 +60753,7 @@ export const QueryExistingSceneDocument = { { kind: "Field", name: { kind: "Name", value: "aliases" } }, { kind: "Field", name: { kind: "Name", value: "gender" } }, { kind: "Field", name: { kind: "Name", value: "birth_date" } }, + { kind: "Field", name: { kind: "Name", value: "death_date" } }, { kind: "Field", name: { kind: "Name", value: "age" } }, { kind: "Field", name: { kind: "Name", value: "height" } }, { kind: "Field", name: { kind: "Name", value: "hair_color" } }, @@ -60928,6 +61277,10 @@ export const QueryExistingSceneDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -61440,6 +61793,10 @@ export const QueryExistingSceneDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -62342,6 +62699,7 @@ export const NotificationsDocument = { { kind: "Field", name: { kind: "Name", value: "aliases" } }, { kind: "Field", name: { kind: "Name", value: "gender" } }, { kind: "Field", name: { kind: "Name", value: "birth_date" } }, + { kind: "Field", name: { kind: "Name", value: "death_date" } }, { kind: "Field", name: { kind: "Name", value: "age" } }, { kind: "Field", name: { kind: "Name", value: "height" } }, { kind: "Field", name: { kind: "Name", value: "hair_color" } }, @@ -62865,6 +63223,10 @@ export const NotificationsDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, @@ -63377,6 +63739,10 @@ export const NotificationsDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, diff --git a/frontend/src/pages/drafts/parse.ts b/frontend/src/pages/drafts/parse.ts index 292e92258..1c54ab964 100644 --- a/frontend/src/pages/drafts/parse.ts +++ b/frontend/src/pages/drafts/parse.ts @@ -243,6 +243,7 @@ export const parsePerformerDraft = ( HairColorEnum, ) as HairColorEnum | null, birthdate: draft.birthdate, + deathdate: draft.deathdate, height: Number.parseInt(draft.height ?? "") || null, country: draft?.country?.length === 2 ? draft.country : null, aliases: draftAliases ?? existingPerformer?.aliases, diff --git a/frontend/src/pages/performers/components/performerInfo.tsx b/frontend/src/pages/performers/components/performerInfo.tsx index 96259b634..214a4fe67 100644 --- a/frontend/src/pages/performers/components/performerInfo.tsx +++ b/frontend/src/pages/performers/components/performerInfo.tsx @@ -88,15 +88,11 @@ const Actions: FC = ({ performer }) => { }; const PerformerAge = ({ - birthdate, + age, }: { - birthdate?: null | string; + age?: number | null; }): React.ReactNode => { - if (!birthdate) return ""; - const date = parseISO(birthdate); - if (!date) return ""; - - const age = differenceInYears(new Date(), date); + if (!age) return ""; return {`${age} years old`}; }; @@ -151,9 +147,18 @@ export const PerformerInfo: FC = ({ performer }) => { Birthdate {performer.birth_date} - + { !performer.death_date && } + { performer.death_date && ( + + Deathdate + + {performer.death_date} + + + + )} Height diff --git a/frontend/src/pages/performers/performerForm/PerformerForm.tsx b/frontend/src/pages/performers/performerForm/PerformerForm.tsx index bc3cbf16e..cd2321fd2 100644 --- a/frontend/src/pages/performers/performerForm/PerformerForm.tsx +++ b/frontend/src/pages/performers/performerForm/PerformerForm.tsx @@ -156,6 +156,7 @@ const PerformerForm: FC = ({ aliases: initialAliases, gender: initial?.gender ?? performer?.gender ?? "", birthdate: initial?.birthdate ?? performer?.birth_date ?? undefined, + deathdate: initial?.deathdate ?? performer?.death_date ?? undefined, eye_color: getEnumValue( EYE, initial?.eye_color ?? performer?.eye_color ?? null, @@ -234,6 +235,7 @@ const PerformerForm: FC = ({ disambiguation: data.disambiguation, gender: GenderEnum[data.gender as keyof typeof GenderEnum] || null, birthdate: data.birthdate, + deathdate: data.deathdate, eye_color: EyeColorEnum[data.eye_color as keyof typeof EyeColorEnum] || null, hair_color: @@ -296,6 +298,7 @@ const PerformerForm: FC = ({ { error: errors.name?.message, tab: "personal" }, { error: errors.gender?.message, tab: "personal" }, { error: errors.birthdate?.message, tab: "personal" }, + { error: errors.deathdate?.message, tab: "personal" }, { error: errors.career_start_year?.message, tab: "personal" }, { error: errors.career_end_year?.message, tab: "personal" }, { error: errors.height?.message, tab: "personal" }, @@ -369,7 +372,7 @@ const PerformerForm: FC = ({ )} - + Aliases = ({ - - + + Gender = ({ - + Birthdate = ({ {errors?.birthdate?.message} + + + + Deathdate + + + {errors?.deathdate?.message} + + + + If the precise date is unknown the day and/or month can be omitted. - + + Eye Color diff --git a/frontend/src/pages/performers/performerForm/diff.ts b/frontend/src/pages/performers/performerForm/diff.ts index eaf7d06e7..c6447b8ee 100644 --- a/frontend/src/pages/performers/performerForm/diff.ts +++ b/frontend/src/pages/performers/performerForm/diff.ts @@ -69,6 +69,7 @@ const selectPerformerDetails = ( disambiguation: diffValue(original?.disambiguation, data.disambiguation), gender: diffValue(original?.gender, genderEnum(data.gender)), birthdate: diffValue(original?.birth_date, data.birthdate), + deathdate: diffValue(original?.death_date, data.deathdate), career_start_year: diffValue( original?.career_start_year, data.career_start_year, @@ -96,6 +97,7 @@ const selectPerformerDetails = ( disambiguation: diffValue(data.disambiguation, original?.disambiguation), gender: diffValue(genderEnum(data.gender), original?.gender), birthdate: diffValue(data.birthdate, original?.birth_date), + deathdate: diffValue(data.deathdate, original?.death_date), career_start_year: diffValue( data.career_start_year, original?.career_start_year, diff --git a/frontend/src/pages/performers/performerForm/schema.ts b/frontend/src/pages/performers/performerForm/schema.ts index b0412e44c..50c45a95f 100644 --- a/frontend/src/pages/performers/performerForm/schema.ts +++ b/frontend/src/pages/performers/performerForm/schema.ts @@ -37,6 +37,19 @@ export const PerformerSchema = yup.object({ dateWithinRange(date, "1900-01-01", addYears(new Date(), -18)), ) .nullable(), + deathdate: yup + .string() + .trim() + .transform(nullCheck) + .matches(/^\d{4}$|^\d{4}-\d{2}$|^\d{4}-\d{2}-\d{2}$/, { + excludeEmptyString: true, + message: "Invalid date, must be YYYY, YYYY-MM, or YYYY-MM-DD", + }) + .test("valid-date", "Invalid date", isValidDate) + .test("date-outside-range", "Outside of range", (date) => + dateWithinRange(date, "1900-01-01", new Date().toISOString().slice(10)), + ) + .nullable(), career_start_year: yup .number() .transform(zeroCheck) diff --git a/frontend/src/pages/performers/performerForm/types.ts b/frontend/src/pages/performers/performerForm/types.ts index 6dec48d80..2397caca8 100644 --- a/frontend/src/pages/performers/performerForm/types.ts +++ b/frontend/src/pages/performers/performerForm/types.ts @@ -11,6 +11,7 @@ export type InitialPerformer = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; height?: number | null; hair_color?: HairColorEnum | null; eye_color?: EyeColorEnum | null; diff --git a/graphql/schema/types/performer.graphql b/graphql/schema/types/performer.graphql index a50133cf9..8f4dce6aa 100644 --- a/graphql/schema/types/performer.graphql +++ b/graphql/schema/types/performer.graphql @@ -93,6 +93,7 @@ type Performer { urls: [URL!]! birthdate: FuzzyDate @deprecated(reason: "Please use `birth_date`") birth_date: String + death_date: String age: Int # resolver ethnicity: EthnicityEnum country: String @@ -148,6 +149,7 @@ input PerformerCreateInput { gender: GenderEnum urls: [URLInput!] birthdate: String + deathdate: String ethnicity: EthnicityEnum country: String eye_color: EyeColorEnum @@ -174,6 +176,7 @@ input PerformerUpdateInput { gender: GenderEnum urls: [URLInput!] birthdate: String + deathdate: String ethnicity: EthnicityEnum country: String eye_color: EyeColorEnum @@ -202,6 +205,7 @@ input PerformerEditDetailsInput { gender: GenderEnum urls: [URLInput!] birthdate: String + deathdate: String ethnicity: EthnicityEnum country: String eye_color: EyeColorEnum @@ -244,6 +248,7 @@ type PerformerEdit { added_urls: [URL!] removed_urls: [URL!] birthdate: String + deathdate: String ethnicity: EthnicityEnum country: String eye_color: EyeColorEnum @@ -308,6 +313,7 @@ input BodyModificationCriterionInput { enum PerformerSortEnum { NAME BIRTHDATE + DEATHDATE SCENE_COUNT CAREER_START_YEAR DEBUT @@ -334,6 +340,7 @@ input PerformerQueryInput { url: String birthdate: DateCriterionInput + deathdate: DateCriterionInput birth_year: IntCriterionInput age: IntCriterionInput @@ -376,6 +383,7 @@ type PerformerDraft { aliases: String gender: String birthdate: String + deathdate: String urls: [String!] ethnicity: String country: String @@ -398,6 +406,7 @@ input PerformerDraftInput { aliases: String gender: String birthdate: String + deathdate: String urls: [String!] ethnicity: String country: String diff --git a/pkg/api/graphql_client_test.go b/pkg/api/graphql_client_test.go index fd59ccebd..df20ed706 100644 --- a/pkg/api/graphql_client_test.go +++ b/pkg/api/graphql_client_test.go @@ -76,6 +76,7 @@ type performerOutput struct { Disambiguation *string `json:"disambiguation"` Gender *string `json:"gender"` Birthdate *string `json:"birth_date"` + Deathdate *string `json:"death_date"` Ethnicity *string `json:"ethnicity"` Country *string `json:"country"` EyeColor *string `json:"eye_color"` diff --git a/pkg/api/integration_test.go b/pkg/api/integration_test.go index 5d71fa613..62943ff08 100644 --- a/pkg/api/integration_test.go +++ b/pkg/api/integration_test.go @@ -286,6 +286,7 @@ func (s *testRunner) createFullPerformerCreateInput() *models.PerformerCreateInp careerend := 2020 tattoodesc := "Tatto Desc" birthdate := "2000-02-03" + deathdate := "2024-01-02" site, err := s.createTestSite(nil) if err != nil { return nil @@ -303,6 +304,7 @@ func (s *testRunner) createFullPerformerCreateInput() *models.PerformerCreateInp }, }, Birthdate: &birthdate, + Deathdate: &deathdate, Ethnicity: ðnicity, Country: &country, EyeColor: &eyecolor, @@ -732,6 +734,7 @@ func (s *testRunner) createPerformerEditDetailsInput() *models.PerformerEditDeta careerend := 2020 tattoodesc := "Tatto Desc" birthdate := "2000-02-03" + deathdate := "2024-01-02" site, err := s.createTestSite(nil) if err != nil { return nil @@ -749,6 +752,7 @@ func (s *testRunner) createPerformerEditDetailsInput() *models.PerformerEditDeta }, }, Birthdate: &birthdate, + Deathdate: &deathdate, Ethnicity: ðnicity, Country: &country, EyeColor: &eyecolor, diff --git a/pkg/api/performer_edit_integration_test.go b/pkg/api/performer_edit_integration_test.go index accf506e8..3ed0ea66c 100644 --- a/pkg/api/performer_edit_integration_test.go +++ b/pkg/api/performer_edit_integration_test.go @@ -54,9 +54,11 @@ func (s *performerEditTestRunner) testModifyPerformerEdit() { existingName := "performerName" existingBirthdate := "1990-01-02" + existingDeathdate := "2024-11-22" performerCreateInput := models.PerformerCreateInput{ Name: existingName, Birthdate: &existingBirthdate, + Deathdate: &existingDeathdate, } createdPerformer, err := s.createTestPerformer(&performerCreateInput) assert.NilError(s.t, err) @@ -90,6 +92,7 @@ func (s *performerEditTestRunner) verifyPerformerEditDetails(input models.Perfor c.strPtrStrPtr(input.Name, performerDetails.Name, "Name") c.strPtrStrPtr(input.Disambiguation, performerDetails.Disambiguation, "Disambiguation") c.strPtrStrPtr(input.Birthdate, performerDetails.Birthdate, "Birthdate") + c.strPtrStrPtr(input.Deathdate, performerDetails.Deathdate, "Deathdate") assert.DeepEqual(s.t, input.Aliases, performerDetails.AddedAliases) assert.Assert(s.t, input.Gender.IsValid() && (input.Gender.String() == *performerDetails.Gender)) @@ -146,6 +149,12 @@ func (s *performerEditTestRunner) verifyPerformerEdit(input models.PerformerEdit assert.Equal(s.t, *input.Birthdate, performer.Birthdate.String) } + if input.Deathdate == nil { + assert.Assert(s.t, !performer.Deathdate.Valid) + } else { + assert.Equal(s.t, *input.Deathdate, performer.Deathdate.String) + } + if input.Ethnicity == nil { assert.Assert(s.t, !performer.Ethnicity.Valid) } else { diff --git a/pkg/api/performer_integration_test.go b/pkg/api/performer_integration_test.go index 043463811..3577bf502 100644 --- a/pkg/api/performer_integration_test.go +++ b/pkg/api/performer_integration_test.go @@ -35,6 +35,7 @@ func (s *performerTestRunner) testCreatePerformer() { hairColor := models.HairColorEnumBlonde breastType := models.BreastTypeEnumNatural birthdate := "2001-02-03" + deathdate := "2024-12-23" site, err := s.createTestSite(nil) assert.NilError(s.t, err) @@ -50,6 +51,7 @@ func (s *performerTestRunner) testCreatePerformer() { }, }, Birthdate: &birthdate, + Deathdate: &deathdate, Ethnicity: ðnicity, Country: &country, EyeColor: &eyeColor, @@ -105,6 +107,9 @@ func (s *performerTestRunner) verifyCreatedPerformer(input models.PerformerCreat birthdate, _ := r.BirthDate(s.ctx, performer) assert.DeepEqual(s.t, birthdate, input.Birthdate) + deathdate, _ := r.DeathDate(s.ctx, performer) + assert.DeepEqual(s.t, deathdate, input.Deathdate) + ethnicity, _ := r.Ethnicity(s.ctx, performer) assert.DeepEqual(s.t, ethnicity, input.Ethnicity) @@ -166,6 +171,7 @@ func (s *performerTestRunner) testUpdatePerformer() { bandSize := 32 tattooDesc := "Foobar" date := "2001-02-03" + deathdate := "2024-11-23" site, err := s.createTestSite(nil) assert.NilError(s.t, err) @@ -179,6 +185,7 @@ func (s *performerTestRunner) testUpdatePerformer() { }, }, Birthdate: &date, + Deathdate: &deathdate, CupSize: &cupSize, BandSize: &bandSize, WaistSize: &bandSize, @@ -212,6 +219,7 @@ func (s *performerTestRunner) testUpdatePerformer() { }, }, Birthdate: &date, + Deathdate: &deathdate, CupSize: &cupSize, BandSize: &bandSize, WaistSize: &bandSize, @@ -235,6 +243,7 @@ func (s *performerTestRunner) testUpdatePerformer() { "aliases", "urls", "birthdate", + "deathdate", "tattoos", "piercings", "cup_size", @@ -265,6 +274,9 @@ func (s *performerTestRunner) verifyUpdatedPerformer(input models.PerformerUpdat birthdate, _ := s.resolver.Performer().BirthDate(s.ctx, performer) assert.DeepEqual(s.t, birthdate, input.Birthdate) + deathdate, _ := s.resolver.Performer().DeathDate(s.ctx, performer) + assert.DeepEqual(s.t, deathdate, input.Deathdate) + tattoos, _ := s.resolver.Performer().Tattoos(s.ctx, performer) assert.Assert(s.t, compareBodyMods(input.Tattoos, tattoos)) diff --git a/pkg/api/resolver_model_performer.go b/pkg/api/resolver_model_performer.go index a34e43e10..ffea7bd32 100644 --- a/pkg/api/resolver_model_performer.go +++ b/pkg/api/resolver_model_performer.go @@ -55,6 +55,10 @@ func (r *performerResolver) BirthDate(ctx context.Context, obj *models.Performer return resolveNullString(obj.Birthdate), nil } +func (r *performerResolver) DeathDate(ctx context.Context, obj *models.Performer) (*string, error) { + return resolveNullString(obj.Deathdate), nil +} + func (r *performerResolver) Age(ctx context.Context, obj *models.Performer) (*int, error) { if !obj.Birthdate.Valid { return nil, nil @@ -65,11 +69,19 @@ func (r *performerResolver) Age(ctx context.Context, obj *models.Performer) (*in return nil, nil } + end := time.Now() + if obj.Deathdate.Valid { + deathdate, err := utils.ParseDateStringAsTime(obj.Deathdate.String) + if err == nil { + end = deathdate + } + } + birthYear := birthdate.Year() - now := time.Now() - thisYear := now.Year() + thisYear := end.Year() age := thisYear - birthYear - if now.YearDay() < birthdate.YearDay() { + + if end.YearDay() < birthdate.YearDay() { age-- } diff --git a/pkg/api/resolver_mutation_draft.go b/pkg/api/resolver_mutation_draft.go index b296ad969..cb5a98f30 100644 --- a/pkg/api/resolver_mutation_draft.go +++ b/pkg/api/resolver_mutation_draft.go @@ -93,6 +93,7 @@ func (r *mutationResolver) SubmitPerformerDraft(ctx context.Context, input model Aliases: input.Aliases, Gender: input.Gender, Birthdate: input.Birthdate, + Deathdate: input.Deathdate, Urls: input.Urls, Ethnicity: input.Ethnicity, Country: input.Country, diff --git a/pkg/database/database.go b/pkg/database/database.go index 3210deaa7..338803918 100644 --- a/pkg/database/database.go +++ b/pkg/database/database.go @@ -4,7 +4,7 @@ import ( "github.com/jmoiron/sqlx" ) -var appSchemaVersion uint = 43 +var appSchemaVersion uint = 44 var databaseProviders map[string]databaseProvider diff --git a/pkg/database/migrations/postgres/44_performer_death_date.up.sql b/pkg/database/migrations/postgres/44_performer_death_date.up.sql new file mode 100644 index 000000000..bf60fef74 --- /dev/null +++ b/pkg/database/migrations/postgres/44_performer_death_date.up.sql @@ -0,0 +1 @@ +ALTER TABLE "performers" ADD COLUMN "deathdate" TEXT; diff --git a/pkg/models/extension_edit_details.go b/pkg/models/extension_edit_details.go index 89c38eecd..a6f7c33f1 100644 --- a/pkg/models/extension_edit_details.go +++ b/pkg/models/extension_edit_details.go @@ -47,6 +47,10 @@ func (e PerformerEditDetailsInput) PerformerEditFromDiff(orig Performer, inputAr return nil, err } + if err := ValidateFuzzyString(e.Deathdate); err != nil { + return nil, err + } + newData := &PerformerEdit{} oldData := &PerformerEdit{} @@ -63,6 +67,9 @@ func (e PerformerEditDetailsInput) PerformerEditFromDiff(orig Performer, inputAr if e.Birthdate != nil || inputArgs.Field("birthdate").IsNull() { oldData.Birthdate, newData.Birthdate = ed.nullString(orig.Birthdate, e.Birthdate) } + if e.Deathdate != nil || inputArgs.Field("deathdate").IsNull() { + oldData.Deathdate, newData.Deathdate = ed.nullString(orig.Deathdate, e.Deathdate) + } if e.Ethnicity != nil || inputArgs.Field("ethnicity").IsNull() { oldData.Ethnicity, newData.Ethnicity = ed.nullStringEnum(orig.Ethnicity, e.Ethnicity) } diff --git a/pkg/models/extension_edit_details_test.go b/pkg/models/extension_edit_details_test.go index d63d8baf8..adaf7aa14 100644 --- a/pkg/models/extension_edit_details_test.go +++ b/pkg/models/extension_edit_details_test.go @@ -25,6 +25,7 @@ var ( bGenderStr = bGender.String() aDate = "2001-01-01" bDate = "2002-01" + dDate = "2024-11" aEthnicity = EthnicityEnumAsian bEthnicity = EthnicityEnumBlack aEthnicityStr = aEthnicity.String() @@ -161,6 +162,7 @@ func TestPerformerEditFromDiff(t *testing.T) { Disambiguation: &bDisambiguation, Gender: &bGender, Birthdate: &bDate, + Deathdate: &dDate, Ethnicity: &bEthnicity, Country: &bCountry, EyeColor: &bEyeColor, @@ -183,6 +185,7 @@ func TestPerformerEditFromDiff(t *testing.T) { Disambiguation: &bDisambiguation, Gender: &bGenderStr, Birthdate: &bDate, + Deathdate: &dDate, Ethnicity: &bEthnicityStr, Country: &bCountry, EyeColor: &bEyeColorStr, @@ -227,6 +230,7 @@ func TestPerformerEditFromDiff(t *testing.T) { Disambiguation: &bDisambiguation, Gender: &bGenderStr, Birthdate: &bDate, + Deathdate: &dDate, Ethnicity: &bEthnicityStr, Country: &bCountry, EyeColor: &bEyeColorStr, diff --git a/pkg/models/generated_exec.go b/pkg/models/generated_exec.go index 5f324e6cc..bce1d751b 100644 --- a/pkg/models/generated_exec.go +++ b/pkg/models/generated_exec.go @@ -290,6 +290,7 @@ type ComplexityRoot struct { Country func(childComplexity int) int Created func(childComplexity int) int CupSize func(childComplexity int) int + DeathDate func(childComplexity int) int Deleted func(childComplexity int) int Disambiguation func(childComplexity int) int Edits func(childComplexity int) int @@ -328,6 +329,7 @@ type ComplexityRoot struct { CareerEndYear func(childComplexity int) int CareerStartYear func(childComplexity int) int Country func(childComplexity int) int + Deathdate func(childComplexity int) int Disambiguation func(childComplexity int) int Ethnicity func(childComplexity int) int EyeColor func(childComplexity int) int @@ -357,6 +359,7 @@ type ComplexityRoot struct { CareerStartYear func(childComplexity int) int Country func(childComplexity int) int CupSize func(childComplexity int) int + Deathdate func(childComplexity int) int Disambiguation func(childComplexity int) int DraftID func(childComplexity int) int Ethnicity func(childComplexity int) int @@ -784,6 +787,7 @@ type PerformerResolver interface { Urls(ctx context.Context, obj *Performer) ([]*URL, error) Birthdate(ctx context.Context, obj *Performer) (*FuzzyDate, error) BirthDate(ctx context.Context, obj *Performer) (*string, error) + DeathDate(ctx context.Context, obj *Performer) (*string, error) Age(ctx context.Context, obj *Performer) (*int, error) Ethnicity(ctx context.Context, obj *Performer) (*EthnicityEnum, error) Country(ctx context.Context, obj *Performer) (*string, error) @@ -2271,6 +2275,13 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.Performer.CupSize(childComplexity), true + case "Performer.death_date": + if e.complexity.Performer.DeathDate == nil { + break + } + + return e.complexity.Performer.DeathDate(childComplexity), true + case "Performer.deleted": if e.complexity.Performer.Deleted == nil { break @@ -2500,6 +2511,13 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.PerformerDraft.Country(childComplexity), true + case "PerformerDraft.deathdate": + if e.complexity.PerformerDraft.Deathdate == nil { + break + } + + return e.complexity.PerformerDraft.Deathdate(childComplexity), true + case "PerformerDraft.disambiguation": if e.complexity.PerformerDraft.Disambiguation == nil { break @@ -2682,6 +2700,13 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in return e.complexity.PerformerEdit.CupSize(childComplexity), true + case "PerformerEdit.deathdate": + if e.complexity.PerformerEdit.Deathdate == nil { + break + } + + return e.complexity.PerformerEdit.Deathdate(childComplexity), true + case "PerformerEdit.disambiguation": if e.complexity.PerformerEdit.Disambiguation == nil { break @@ -5037,6 +5062,7 @@ type Performer { urls: [URL!]! birthdate: FuzzyDate @deprecated(reason: "Please use ` + "`" + `birth_date` + "`" + `") birth_date: String + death_date: String age: Int # resolver ethnicity: EthnicityEnum country: String @@ -5092,6 +5118,7 @@ input PerformerCreateInput { gender: GenderEnum urls: [URLInput!] birthdate: String + deathdate: String ethnicity: EthnicityEnum country: String eye_color: EyeColorEnum @@ -5118,6 +5145,7 @@ input PerformerUpdateInput { gender: GenderEnum urls: [URLInput!] birthdate: String + deathdate: String ethnicity: EthnicityEnum country: String eye_color: EyeColorEnum @@ -5146,6 +5174,7 @@ input PerformerEditDetailsInput { gender: GenderEnum urls: [URLInput!] birthdate: String + deathdate: String ethnicity: EthnicityEnum country: String eye_color: EyeColorEnum @@ -5188,6 +5217,7 @@ type PerformerEdit { added_urls: [URL!] removed_urls: [URL!] birthdate: String + deathdate: String ethnicity: EthnicityEnum country: String eye_color: EyeColorEnum @@ -5252,6 +5282,7 @@ input BodyModificationCriterionInput { enum PerformerSortEnum { NAME BIRTHDATE + DEATHDATE SCENE_COUNT CAREER_START_YEAR DEBUT @@ -5278,6 +5309,7 @@ input PerformerQueryInput { url: String birthdate: DateCriterionInput + deathdate: DateCriterionInput birth_year: IntCriterionInput age: IntCriterionInput @@ -5320,6 +5352,7 @@ type PerformerDraft { aliases: String gender: String birthdate: String + deathdate: String urls: [String!] ethnicity: String country: String @@ -5342,6 +5375,7 @@ input PerformerDraftInput { aliases: String gender: String birthdate: String + deathdate: String urls: [String!] ethnicity: String country: String @@ -13429,6 +13463,8 @@ func (ec *executionContext) fieldContext_Mutation_performerCreate(ctx context.Co return ec.fieldContext_Performer_birthdate(ctx, field) case "birth_date": return ec.fieldContext_Performer_birth_date(ctx, field) + case "death_date": + return ec.fieldContext_Performer_death_date(ctx, field) case "age": return ec.fieldContext_Performer_age(ctx, field) case "ethnicity": @@ -13580,6 +13616,8 @@ func (ec *executionContext) fieldContext_Mutation_performerUpdate(ctx context.Co return ec.fieldContext_Performer_birthdate(ctx, field) case "birth_date": return ec.fieldContext_Performer_birth_date(ctx, field) + case "death_date": + return ec.fieldContext_Performer_death_date(ctx, field) case "age": return ec.fieldContext_Performer_age(ctx, field) case "ethnicity": @@ -18693,6 +18731,47 @@ func (ec *executionContext) fieldContext_Performer_birth_date(_ context.Context, return fc, nil } +func (ec *executionContext) _Performer_death_date(ctx context.Context, field graphql.CollectedField, obj *Performer) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_Performer_death_date(ctx, field) + if err != nil { + return graphql.Null + } + ctx = graphql.WithFieldContext(ctx, fc) + defer func() { + if r := recover(); r != nil { + ec.Error(ctx, ec.Recover(ctx, r)) + ret = graphql.Null + } + }() + resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { + ctx = rctx // use context from middleware stack in children + return ec.resolvers.Performer().DeathDate(rctx, obj) + }) + if err != nil { + ec.Error(ctx, err) + return graphql.Null + } + if resTmp == nil { + return graphql.Null + } + res := resTmp.(*string) + fc.Result = res + return ec.marshalOString2ᚖstring(ctx, field.Selections, res) +} + +func (ec *executionContext) fieldContext_Performer_death_date(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "Performer", + Field: field, + IsMethod: true, + IsResolver: true, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return nil, errors.New("field of type String does not have child fields") + }, + } + return fc, nil +} + func (ec *executionContext) _Performer_age(ctx context.Context, field graphql.CollectedField, obj *Performer) (ret graphql.Marshaler) { fc, err := ec.fieldContext_Performer_age(ctx, field) if err != nil { @@ -20021,6 +20100,8 @@ func (ec *executionContext) fieldContext_PerformerAppearance_performer(_ context return ec.fieldContext_Performer_birthdate(ctx, field) case "birth_date": return ec.fieldContext_Performer_birth_date(ctx, field) + case "death_date": + return ec.fieldContext_Performer_death_date(ctx, field) case "age": return ec.fieldContext_Performer_age(ctx, field) case "ethnicity": @@ -20372,6 +20453,47 @@ func (ec *executionContext) fieldContext_PerformerDraft_birthdate(_ context.Cont return fc, nil } +func (ec *executionContext) _PerformerDraft_deathdate(ctx context.Context, field graphql.CollectedField, obj *PerformerDraft) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_PerformerDraft_deathdate(ctx, field) + if err != nil { + return graphql.Null + } + ctx = graphql.WithFieldContext(ctx, fc) + defer func() { + if r := recover(); r != nil { + ec.Error(ctx, ec.Recover(ctx, r)) + ret = graphql.Null + } + }() + resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { + ctx = rctx // use context from middleware stack in children + return obj.Deathdate, nil + }) + if err != nil { + ec.Error(ctx, err) + return graphql.Null + } + if resTmp == nil { + return graphql.Null + } + res := resTmp.(*string) + fc.Result = res + return ec.marshalOString2ᚖstring(ctx, field.Selections, res) +} + +func (ec *executionContext) fieldContext_PerformerDraft_deathdate(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "PerformerDraft", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return nil, errors.New("field of type String does not have child fields") + }, + } + return fc, nil +} + func (ec *executionContext) _PerformerDraft_urls(ctx context.Context, field graphql.CollectedField, obj *PerformerDraft) (ret graphql.Marshaler) { fc, err := ec.fieldContext_PerformerDraft_urls(ctx, field) if err != nil { @@ -21259,6 +21381,47 @@ func (ec *executionContext) fieldContext_PerformerEdit_birthdate(_ context.Conte return fc, nil } +func (ec *executionContext) _PerformerEdit_deathdate(ctx context.Context, field graphql.CollectedField, obj *PerformerEdit) (ret graphql.Marshaler) { + fc, err := ec.fieldContext_PerformerEdit_deathdate(ctx, field) + if err != nil { + return graphql.Null + } + ctx = graphql.WithFieldContext(ctx, fc) + defer func() { + if r := recover(); r != nil { + ec.Error(ctx, ec.Recover(ctx, r)) + ret = graphql.Null + } + }() + resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) { + ctx = rctx // use context from middleware stack in children + return obj.Deathdate, nil + }) + if err != nil { + ec.Error(ctx, err) + return graphql.Null + } + if resTmp == nil { + return graphql.Null + } + res := resTmp.(*string) + fc.Result = res + return ec.marshalOString2ᚖstring(ctx, field.Selections, res) +} + +func (ec *executionContext) fieldContext_PerformerEdit_deathdate(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { + fc = &graphql.FieldContext{ + Object: "PerformerEdit", + Field: field, + IsMethod: false, + IsResolver: false, + Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) { + return nil, errors.New("field of type String does not have child fields") + }, + } + return fc, nil +} + func (ec *executionContext) _PerformerEdit_ethnicity(ctx context.Context, field graphql.CollectedField, obj *PerformerEdit) (ret graphql.Marshaler) { fc, err := ec.fieldContext_PerformerEdit_ethnicity(ctx, field) if err != nil { @@ -22613,6 +22776,8 @@ func (ec *executionContext) fieldContext_Query_findPerformer(ctx context.Context return ec.fieldContext_Performer_birthdate(ctx, field) case "birth_date": return ec.fieldContext_Performer_birth_date(ctx, field) + case "death_date": + return ec.fieldContext_Performer_death_date(ctx, field) case "age": return ec.fieldContext_Performer_age(ctx, field) case "ethnicity": @@ -24834,6 +24999,8 @@ func (ec *executionContext) fieldContext_Query_searchPerformer(ctx context.Conte return ec.fieldContext_Performer_birthdate(ctx, field) case "birth_date": return ec.fieldContext_Performer_birth_date(ctx, field) + case "death_date": + return ec.fieldContext_Performer_death_date(ctx, field) case "age": return ec.fieldContext_Performer_age(ctx, field) case "ethnicity": @@ -26296,6 +26463,8 @@ func (ec *executionContext) fieldContext_QueryExistingPerformerResult_performers return ec.fieldContext_Performer_birthdate(ctx, field) case "birth_date": return ec.fieldContext_Performer_birth_date(ctx, field) + case "death_date": + return ec.fieldContext_Performer_death_date(ctx, field) case "age": return ec.fieldContext_Performer_age(ctx, field) case "ethnicity": @@ -26724,6 +26893,8 @@ func (ec *executionContext) fieldContext_QueryPerformersResultType_performers(_ return ec.fieldContext_Performer_birthdate(ctx, field) case "birth_date": return ec.fieldContext_Performer_birth_date(ctx, field) + case "death_date": + return ec.fieldContext_Performer_death_date(ctx, field) case "age": return ec.fieldContext_Performer_age(ctx, field) case "ethnicity": @@ -37519,7 +37690,7 @@ func (ec *executionContext) unmarshalInputPerformerCreateInput(ctx context.Conte asMap[k] = v } - fieldsInOrder := [...]string{"name", "disambiguation", "aliases", "gender", "urls", "birthdate", "ethnicity", "country", "eye_color", "hair_color", "height", "cup_size", "band_size", "waist_size", "hip_size", "breast_type", "career_start_year", "career_end_year", "tattoos", "piercings", "image_ids", "draft_id"} + fieldsInOrder := [...]string{"name", "disambiguation", "aliases", "gender", "urls", "birthdate", "deathdate", "ethnicity", "country", "eye_color", "hair_color", "height", "cup_size", "band_size", "waist_size", "hip_size", "breast_type", "career_start_year", "career_end_year", "tattoos", "piercings", "image_ids", "draft_id"} for _, k := range fieldsInOrder { v, ok := asMap[k] if !ok { @@ -37568,6 +37739,13 @@ func (ec *executionContext) unmarshalInputPerformerCreateInput(ctx context.Conte return it, err } it.Birthdate = data + case "deathdate": + ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("deathdate")) + data, err := ec.unmarshalOString2ᚖstring(ctx, v) + if err != nil { + return it, err + } + it.Deathdate = data case "ethnicity": ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("ethnicity")) data, err := ec.unmarshalOEthnicityEnum2ᚖgithubᚗcomᚋstashappᚋstashᚑboxᚋpkgᚋmodelsᚐEthnicityEnum(ctx, v) @@ -37720,7 +37898,7 @@ func (ec *executionContext) unmarshalInputPerformerDraftInput(ctx context.Contex asMap[k] = v } - fieldsInOrder := [...]string{"id", "disambiguation", "name", "aliases", "gender", "birthdate", "urls", "ethnicity", "country", "eye_color", "hair_color", "height", "measurements", "breast_type", "tattoos", "piercings", "career_start_year", "career_end_year", "image"} + fieldsInOrder := [...]string{"id", "disambiguation", "name", "aliases", "gender", "birthdate", "deathdate", "urls", "ethnicity", "country", "eye_color", "hair_color", "height", "measurements", "breast_type", "tattoos", "piercings", "career_start_year", "career_end_year", "image"} for _, k := range fieldsInOrder { v, ok := asMap[k] if !ok { @@ -37769,6 +37947,13 @@ func (ec *executionContext) unmarshalInputPerformerDraftInput(ctx context.Contex return it, err } it.Birthdate = data + case "deathdate": + ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("deathdate")) + data, err := ec.unmarshalOString2ᚖstring(ctx, v) + if err != nil { + return it, err + } + it.Deathdate = data case "urls": ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("urls")) data, err := ec.unmarshalOString2ᚕstringᚄ(ctx, v) @@ -37873,7 +38058,7 @@ func (ec *executionContext) unmarshalInputPerformerEditDetailsInput(ctx context. asMap[k] = v } - fieldsInOrder := [...]string{"name", "disambiguation", "aliases", "gender", "urls", "birthdate", "ethnicity", "country", "eye_color", "hair_color", "height", "cup_size", "band_size", "waist_size", "hip_size", "breast_type", "career_start_year", "career_end_year", "tattoos", "piercings", "image_ids", "draft_id"} + fieldsInOrder := [...]string{"name", "disambiguation", "aliases", "gender", "urls", "birthdate", "deathdate", "ethnicity", "country", "eye_color", "hair_color", "height", "cup_size", "band_size", "waist_size", "hip_size", "breast_type", "career_start_year", "career_end_year", "tattoos", "piercings", "image_ids", "draft_id"} for _, k := range fieldsInOrder { v, ok := asMap[k] if !ok { @@ -37922,6 +38107,13 @@ func (ec *executionContext) unmarshalInputPerformerEditDetailsInput(ctx context. return it, err } it.Birthdate = data + case "deathdate": + ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("deathdate")) + data, err := ec.unmarshalOString2ᚖstring(ctx, v) + if err != nil { + return it, err + } + it.Deathdate = data case "ethnicity": ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("ethnicity")) data, err := ec.unmarshalOEthnicityEnum2ᚖgithubᚗcomᚋstashappᚋstashᚑboxᚋpkgᚋmodelsᚐEthnicityEnum(ctx, v) @@ -38142,7 +38334,7 @@ func (ec *executionContext) unmarshalInputPerformerQueryInput(ctx context.Contex asMap["sort"] = "CREATED_AT" } - fieldsInOrder := [...]string{"names", "name", "alias", "disambiguation", "gender", "url", "birthdate", "birth_year", "age", "ethnicity", "country", "eye_color", "hair_color", "height", "cup_size", "band_size", "waist_size", "hip_size", "breast_type", "career_start_year", "career_end_year", "tattoos", "piercings", "is_favorite", "performed_with", "studio_id", "page", "per_page", "direction", "sort"} + fieldsInOrder := [...]string{"names", "name", "alias", "disambiguation", "gender", "url", "birthdate", "deathdate", "birth_year", "age", "ethnicity", "country", "eye_color", "hair_color", "height", "cup_size", "band_size", "waist_size", "hip_size", "breast_type", "career_start_year", "career_end_year", "tattoos", "piercings", "is_favorite", "performed_with", "studio_id", "page", "per_page", "direction", "sort"} for _, k := range fieldsInOrder { v, ok := asMap[k] if !ok { @@ -38198,6 +38390,13 @@ func (ec *executionContext) unmarshalInputPerformerQueryInput(ctx context.Contex return it, err } it.Birthdate = data + case "deathdate": + ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("deathdate")) + data, err := ec.unmarshalODateCriterionInput2ᚖgithubᚗcomᚋstashappᚋstashᚑboxᚋpkgᚋmodelsᚐDateCriterionInput(ctx, v) + if err != nil { + return it, err + } + it.Deathdate = data case "birth_year": ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("birth_year")) data, err := ec.unmarshalOIntCriterionInput2ᚖgithubᚗcomᚋstashappᚋstashᚑboxᚋpkgᚋmodelsᚐIntCriterionInput(ctx, v) @@ -38413,7 +38612,7 @@ func (ec *executionContext) unmarshalInputPerformerUpdateInput(ctx context.Conte asMap[k] = v } - fieldsInOrder := [...]string{"id", "name", "disambiguation", "aliases", "gender", "urls", "birthdate", "ethnicity", "country", "eye_color", "hair_color", "height", "cup_size", "band_size", "waist_size", "hip_size", "breast_type", "career_start_year", "career_end_year", "tattoos", "piercings", "image_ids"} + fieldsInOrder := [...]string{"id", "name", "disambiguation", "aliases", "gender", "urls", "birthdate", "deathdate", "ethnicity", "country", "eye_color", "hair_color", "height", "cup_size", "band_size", "waist_size", "hip_size", "breast_type", "career_start_year", "career_end_year", "tattoos", "piercings", "image_ids"} for _, k := range fieldsInOrder { v, ok := asMap[k] if !ok { @@ -38469,6 +38668,13 @@ func (ec *executionContext) unmarshalInputPerformerUpdateInput(ctx context.Conte return it, err } it.Birthdate = data + case "deathdate": + ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("deathdate")) + data, err := ec.unmarshalOString2ᚖstring(ctx, v) + if err != nil { + return it, err + } + it.Deathdate = data case "ethnicity": ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("ethnicity")) data, err := ec.unmarshalOEthnicityEnum2ᚖgithubᚗcomᚋstashappᚋstashᚑboxᚋpkgᚋmodelsᚐEthnicityEnum(ctx, v) @@ -43647,6 +43853,39 @@ func (ec *executionContext) _Performer(ctx context.Context, sel ast.SelectionSet continue } + out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) + case "death_date": + field := field + + innerFunc := func(ctx context.Context, _ *graphql.FieldSet) (res graphql.Marshaler) { + defer func() { + if r := recover(); r != nil { + ec.Error(ctx, ec.Recover(ctx, r)) + } + }() + res = ec._Performer_death_date(ctx, field, obj) + return res + } + + if field.Deferrable != nil { + dfs, ok := deferred[field.Deferrable.Label] + di := 0 + if ok { + dfs.AddField(field) + di = len(dfs.Values) - 1 + } else { + dfs = graphql.NewFieldSet([]graphql.CollectedField{field}) + deferred[field.Deferrable.Label] = dfs + } + dfs.Concurrently(di, func(ctx context.Context) graphql.Marshaler { + return innerFunc(ctx, dfs) + }) + + // don't run the out.Concurrently() call below + out.Values[i] = graphql.Null + continue + } + out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) }) case "age": field := field @@ -44631,6 +44870,8 @@ func (ec *executionContext) _PerformerDraft(ctx context.Context, sel ast.Selecti out.Values[i] = ec._PerformerDraft_gender(ctx, field, obj) case "birthdate": out.Values[i] = ec._PerformerDraft_birthdate(ctx, field, obj) + case "deathdate": + out.Values[i] = ec._PerformerDraft_deathdate(ctx, field, obj) case "urls": out.Values[i] = ec._PerformerDraft_urls(ctx, field, obj) case "ethnicity": @@ -44769,6 +45010,8 @@ func (ec *executionContext) _PerformerEdit(ctx context.Context, sel ast.Selectio out.Values[i] = ec._PerformerEdit_removed_urls(ctx, field, obj) case "birthdate": out.Values[i] = ec._PerformerEdit_birthdate(ctx, field, obj) + case "deathdate": + out.Values[i] = ec._PerformerEdit_deathdate(ctx, field, obj) case "ethnicity": field := field diff --git a/pkg/models/generated_models.go b/pkg/models/generated_models.go index a5ef1c3f7..7bdbb495d 100644 --- a/pkg/models/generated_models.go +++ b/pkg/models/generated_models.go @@ -329,6 +329,7 @@ type PerformerCreateInput struct { Gender *GenderEnum `json:"gender,omitempty"` Urls []*URLInput `json:"urls,omitempty"` Birthdate *string `json:"birthdate,omitempty"` + Deathdate *string `json:"deathdate,omitempty"` Ethnicity *EthnicityEnum `json:"ethnicity,omitempty"` Country *string `json:"country,omitempty"` EyeColor *EyeColorEnum `json:"eye_color,omitempty"` @@ -358,6 +359,7 @@ type PerformerDraftInput struct { Aliases *string `json:"aliases,omitempty"` Gender *string `json:"gender,omitempty"` Birthdate *string `json:"birthdate,omitempty"` + Deathdate *string `json:"deathdate,omitempty"` Urls []string `json:"urls,omitempty"` Ethnicity *string `json:"ethnicity,omitempty"` Country *string `json:"country,omitempty"` @@ -380,6 +382,7 @@ type PerformerEditDetailsInput struct { Gender *GenderEnum `json:"gender,omitempty"` Urls []*URLInput `json:"urls,omitempty"` Birthdate *string `json:"birthdate,omitempty"` + Deathdate *string `json:"deathdate,omitempty"` Ethnicity *EthnicityEnum `json:"ethnicity,omitempty"` Country *string `json:"country,omitempty"` EyeColor *EyeColorEnum `json:"eye_color,omitempty"` @@ -432,6 +435,7 @@ type PerformerQueryInput struct { // Filter to search urls - assumes like query unless quoted URL *string `json:"url,omitempty"` Birthdate *DateCriterionInput `json:"birthdate,omitempty"` + Deathdate *DateCriterionInput `json:"deathdate,omitempty"` BirthYear *IntCriterionInput `json:"birth_year,omitempty"` Age *IntCriterionInput `json:"age,omitempty"` Ethnicity *EthnicityFilterEnum `json:"ethnicity,omitempty"` @@ -477,6 +481,7 @@ type PerformerUpdateInput struct { Gender *GenderEnum `json:"gender,omitempty"` Urls []*URLInput `json:"urls,omitempty"` Birthdate *string `json:"birthdate,omitempty"` + Deathdate *string `json:"deathdate,omitempty"` Ethnicity *EthnicityEnum `json:"ethnicity,omitempty"` Country *string `json:"country,omitempty"` EyeColor *EyeColorEnum `json:"eye_color,omitempty"` @@ -1591,6 +1596,7 @@ type PerformerSortEnum string const ( PerformerSortEnumName PerformerSortEnum = "NAME" PerformerSortEnumBirthdate PerformerSortEnum = "BIRTHDATE" + PerformerSortEnumDeathdate PerformerSortEnum = "DEATHDATE" PerformerSortEnumSceneCount PerformerSortEnum = "SCENE_COUNT" PerformerSortEnumCareerStartYear PerformerSortEnum = "CAREER_START_YEAR" PerformerSortEnumDebut PerformerSortEnum = "DEBUT" @@ -1602,6 +1608,7 @@ const ( var AllPerformerSortEnum = []PerformerSortEnum{ PerformerSortEnumName, PerformerSortEnumBirthdate, + PerformerSortEnumDeathdate, PerformerSortEnumSceneCount, PerformerSortEnumCareerStartYear, PerformerSortEnumDebut, @@ -1612,7 +1619,7 @@ var AllPerformerSortEnum = []PerformerSortEnum{ func (e PerformerSortEnum) IsValid() bool { switch e { - case PerformerSortEnumName, PerformerSortEnumBirthdate, PerformerSortEnumSceneCount, PerformerSortEnumCareerStartYear, PerformerSortEnumDebut, PerformerSortEnumLastScene, PerformerSortEnumCreatedAt, PerformerSortEnumUpdatedAt: + case PerformerSortEnumName, PerformerSortEnumBirthdate, PerformerSortEnumDeathdate, PerformerSortEnumSceneCount, PerformerSortEnumCareerStartYear, PerformerSortEnumDebut, PerformerSortEnumLastScene, PerformerSortEnumCreatedAt, PerformerSortEnumUpdatedAt: return true } return false diff --git a/pkg/models/model_draft.go b/pkg/models/model_draft.go index 537ff2d24..e47abde7f 100644 --- a/pkg/models/model_draft.go +++ b/pkg/models/model_draft.go @@ -50,6 +50,7 @@ type PerformerDraft struct { Aliases *string `json:"aliases,omitempty"` Gender *string `json:"gender,omitempty"` Birthdate *string `json:"birthdate,omitempty"` + Deathdate *string `json:"deathdate,omitempty"` Urls []string `json:"urls,omitempty"` Ethnicity *string `json:"ethnicity,omitempty"` Country *string `json:"country,omitempty"` diff --git a/pkg/models/model_edit.go b/pkg/models/model_edit.go index 7f63ee0d4..74422445f 100644 --- a/pkg/models/model_edit.go +++ b/pkg/models/model_edit.go @@ -312,6 +312,7 @@ type PerformerEdit struct { AddedUrls []*URL `json:"added_urls,omitempty"` RemovedUrls []*URL `json:"removed_urls,omitempty"` Birthdate *string `json:"birthdate,omitempty"` + Deathdate *string `json:"deathdate,omitempty"` Ethnicity *string `json:"ethnicity,omitempty"` Country *string `json:"country,omitempty"` EyeColor *string `json:"eye_color,omitempty"` diff --git a/pkg/models/model_performer.go b/pkg/models/model_performer.go index dca8907d6..c83f83972 100644 --- a/pkg/models/model_performer.go +++ b/pkg/models/model_performer.go @@ -14,6 +14,7 @@ type Performer struct { Disambiguation sql.NullString `db:"disambiguation" json:"disambiguation"` Gender sql.NullString `db:"gender" json:"gender"` Birthdate sql.NullString `db:"birthdate" json:"birthdate"` + Deathdate sql.NullString `db:"deathdate" json:"deathdate"` Ethnicity sql.NullString `db:"ethnicity" json:"ethnicity"` Country sql.NullString `db:"country" json:"country"` EyeColor sql.NullString `db:"eye_color" json:"eye_color"` @@ -350,6 +351,7 @@ func (p *Performer) CopyFromPerformerEdit(input PerformerEdit, old PerformerEdit fe.nullInt64(&p.HipSize, input.HipSize, old.HipSize) fe.nullInt64(&p.WaistSize, input.WaistSize, old.WaistSize) fe.nullString(&p.Birthdate, input.Birthdate, old.Birthdate) + fe.nullString(&p.Deathdate, input.Deathdate, old.Deathdate) p.UpdatedAt = time.Now() } @@ -373,6 +375,7 @@ func (p *Performer) ValidateModifyEdit(edit PerformerEditData) error { v.int64("hip size", edit.Old.HipSize, p.HipSize.Int64) v.int64("waist size", edit.Old.WaistSize, p.WaistSize.Int64) v.string("birthdate", edit.Old.Birthdate, p.Birthdate.String) + v.string("deathdate", edit.Old.Deathdate, p.Deathdate.String) return v.err } diff --git a/pkg/models/model_performer_test.go b/pkg/models/model_performer_test.go index 4a208fa1c..be37607a7 100644 --- a/pkg/models/model_performer_test.go +++ b/pkg/models/model_performer_test.go @@ -13,6 +13,7 @@ func TestCopyFromPerformerEdit(t *testing.T) { Disambiguation: &bDisambiguation, Gender: &bGenderStr, Birthdate: &bDate, + Deathdate: &dDate, Ethnicity: &bEthnicityStr, Country: &bCountry, EyeColor: &bEyeColorStr, @@ -73,6 +74,7 @@ func TestCopyFromPerformerEdit(t *testing.T) { Disambiguation: sql.NullString{String: bDisambiguation, Valid: true}, Gender: sql.NullString{String: bGender.String(), Valid: true}, Birthdate: sql.NullString{String: bDate, Valid: true}, + Deathdate: sql.NullString{String: dDate, Valid: true}, Ethnicity: sql.NullString{String: bEthnicityStr, Valid: true}, Country: sql.NullString{String: bCountry, Valid: true}, EyeColor: sql.NullString{String: bEyeColorStr, Valid: true}, From 176ea378fe51be6740a5ae3f25b0a6764313a48d Mon Sep 17 00:00:00 2001 From: InfiniteStash <117855276+InfiniteStash@users.noreply.github.com> Date: Tue, 10 Dec 2024 13:22:11 +0000 Subject: [PATCH 2/3] FOrmat/generate --- frontend/src/graphql/types.ts | 5 +++++ .../pages/performers/components/performerInfo.tsx | 12 +++++------- .../pages/performers/performerForm/PerformerForm.tsx | 3 +-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/frontend/src/graphql/types.ts b/frontend/src/graphql/types.ts index 589fcac2a..b125d04db 100644 --- a/frontend/src/graphql/types.ts +++ b/frontend/src/graphql/types.ts @@ -15909,6 +15909,7 @@ export type EditUpdateQuery = { disambiguation?: string | null; gender?: GenderEnum | null; birthdate?: string | null; + deathdate?: string | null; ethnicity?: EthnicityEnum | null; country?: string | null; eye_color?: EyeColorEnum | null; @@ -55671,6 +55672,10 @@ export const EditUpdateDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "ethnicity" }, diff --git a/frontend/src/pages/performers/components/performerInfo.tsx b/frontend/src/pages/performers/components/performerInfo.tsx index 214a4fe67..de1d4b886 100644 --- a/frontend/src/pages/performers/components/performerInfo.tsx +++ b/frontend/src/pages/performers/components/performerInfo.tsx @@ -87,11 +87,7 @@ const Actions: FC = ({ performer }) => { ); }; -const PerformerAge = ({ - age, -}: { - age?: number | null; -}): React.ReactNode => { +const PerformerAge = ({ age }: { age?: number | null }): React.ReactNode => { if (!age) return ""; return {`${age} years old`}; }; @@ -147,10 +143,12 @@ export const PerformerInfo: FC = ({ performer }) => { Birthdate {performer.birth_date} - { !performer.death_date && } + {!performer.death_date && ( + + )} - { performer.death_date && ( + {performer.death_date && ( Deathdate diff --git a/frontend/src/pages/performers/performerForm/PerformerForm.tsx b/frontend/src/pages/performers/performerForm/PerformerForm.tsx index cd2321fd2..9ad89be15 100644 --- a/frontend/src/pages/performers/performerForm/PerformerForm.tsx +++ b/frontend/src/pages/performers/performerForm/PerformerForm.tsx @@ -429,7 +429,7 @@ const PerformerForm: FC = ({ - + If the precise date is unknown the day and/or month can be omitted. @@ -437,7 +437,6 @@ const PerformerForm: FC = ({ - Eye Color From 167fa0a358a959b8cac4ec7a45524f4d2d263fae Mon Sep 17 00:00:00 2001 From: InfiniteStash <117855276+InfiniteStash@users.noreply.github.com> Date: Tue, 10 Dec 2024 21:09:04 +0000 Subject: [PATCH 3/3] Lint --- frontend/src/graphql/queries/Draft.gql | 1 + frontend/src/graphql/types.ts | 5 +++++ frontend/src/pages/performers/components/performerInfo.tsx | 1 - 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/frontend/src/graphql/queries/Draft.gql b/frontend/src/graphql/queries/Draft.gql index 4939a9251..ed3a301a5 100644 --- a/frontend/src/graphql/queries/Draft.gql +++ b/frontend/src/graphql/queries/Draft.gql @@ -15,6 +15,7 @@ query Draft($id: ID!) { aliases gender birthdate + deathdate urls ethnicity country diff --git a/frontend/src/graphql/types.ts b/frontend/src/graphql/types.ts index b125d04db..24df45d12 100644 --- a/frontend/src/graphql/types.ts +++ b/frontend/src/graphql/types.ts @@ -14468,6 +14468,7 @@ export type DraftQuery = { aliases?: string | null; gender?: string | null; birthdate?: string | null; + deathdate?: string | null; urls?: Array | null; ethnicity?: string | null; country?: string | null; @@ -53137,6 +53138,10 @@ export const DraftDocument = { kind: "Field", name: { kind: "Name", value: "birthdate" }, }, + { + kind: "Field", + name: { kind: "Name", value: "deathdate" }, + }, { kind: "Field", name: { kind: "Name", value: "urls" }, diff --git a/frontend/src/pages/performers/components/performerInfo.tsx b/frontend/src/pages/performers/components/performerInfo.tsx index de1d4b886..7b4309df3 100644 --- a/frontend/src/pages/performers/components/performerInfo.tsx +++ b/frontend/src/pages/performers/components/performerInfo.tsx @@ -1,5 +1,4 @@ import { FC, useContext } from "react"; -import { parseISO, differenceInYears } from "date-fns"; import { Link } from "react-router-dom"; import { Button, Card, Col, Row, Table } from "react-bootstrap"; import { faCodeMerge } from "@fortawesome/free-solid-svg-icons";