refactor: streamline GraphQL schema by removing deprecated fields and…

apis/api-gateway/schema.graphql

@@ -86,12 +86,7 @@ enum join__Graph {
 """
 A date-time string at UTC, such as 2007-12-03T10:15:30Z, compliant with the `date-time` format outlined in section 5.6 of the RFC 3339 profile of the ISO 8601 standard for representation of dates and times using the Gregorian calendar.
 """
-scalar DateTime @join__type(graph: API_JOURNEYS)  @join__type(graph: API_JOURNEYS_MODERN)  @join__type(graph: API_MEDIA)  @join__type(graph: API_LANGUAGES)
-
-input DateTimeFilter @join__type(graph: API_MEDIA)  @join__type(graph: API_LANGUAGES)  {
-  gte: DateTime
-  lte: DateTime
-}
+scalar DateTime @join__type(graph: API_JOURNEYS)  @join__type(graph: API_JOURNEYS_MODERN)  @join__type(graph: API_LANGUAGES)  @join__type(graph: API_MEDIA) 
 
 """
 The `JSONObject` scalar type represents JSON objects as specified by [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf).
@@ -173,15 +168,6 @@ type Mutation @join__type(graph: API_ANALYTICS)  @join__type(graph: API_JOURNEYS
   blockRestore is used for redo/undo
   """
   blockRestore(id: ID!) : [Block!]! @join__field(graph: API_JOURNEYS) 
-  cardBlockCreate(input: CardBlockCreateInput!) : CardBlock! @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
-  cardBlockUpdate(
-    id: ID!
-    input: CardBlockUpdateInput!
-    """
-    drop this parameter after merging teams
-    """
-    journeyId: ID
-  ): CardBlock! @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
   iconBlockCreate(input: IconBlockCreateInput!) : IconBlock! @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
   iconBlockUpdate(
     id: ID!
@@ -356,15 +342,24 @@ type Mutation @join__type(graph: API_ANALYTICS)  @join__type(graph: API_JOURNEYS
   Allow current user to update specific allowable fields of their visitor record
   """
   visitorUpdateForCurrentUser(input: VisitorUpdateInput!) : Visitor! @join__field(graph: API_JOURNEYS) 
-  buttonBlockCreate(input: ButtonBlockCreateInput!) : ButtonBlock! @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
+  buttonBlockCreate(input: ButtonBlockCreateInput!) : ButtonBlock! @join__field(graph: API_JOURNEYS_MODERN) 
   buttonBlockUpdate(
     id: ID!
     input: ButtonBlockUpdateInput!
     """
     drop this parameter after merging teams
     """
     journeyId: ID
-  ): ButtonBlock @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
+  ): ButtonBlock @join__field(graph: API_JOURNEYS_MODERN) 
+  cardBlockCreate(input: CardBlockCreateInput!) : CardBlock! @join__field(graph: API_JOURNEYS_MODERN) 
+  cardBlockUpdate(
+    id: ID!
+    input: CardBlockUpdateInput!
+    """
+    drop this parameter after merging teams
+    """
+    journeyId: ID
+  ): CardBlock! @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
   multiselectBlockCreate(input: MultiselectBlockCreateInput!) : MultiselectBlock! @join__field(graph: API_JOURNEYS_MODERN) 
   multiselectBlockUpdate(
     id: ID!
@@ -418,7 +413,7 @@ type Mutation @join__type(graph: API_ANALYTICS)  @join__type(graph: API_JOURNEYS
   journeyAiTranslateCreate(input: JourneyAiTranslateInput!) : Journey! @join__field(graph: API_JOURNEYS_MODERN) 
   createJourneyEventsExportLog(input: JourneyEventsExportLogInput!) : JourneyEventsExportLog! @join__field(graph: API_JOURNEYS_MODERN) 
   journeyLanguageAiDetect(input: MutationJourneyLanguageAiDetectInput!) : Boolean! @join__field(graph: API_JOURNEYS_MODERN) 
-  journeyProfileUpdate(input: JourneyProfileUpdateInput!) : JourneyProfile! @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
+  journeyProfileUpdate(input: JourneyProfileUpdateInput!) : JourneyProfile! @join__field(graph: API_JOURNEYS_MODERN) 
   journeyVisitorExportToGoogleSheet(
     journeyId: ID!
     filter: JourneyEventsFilter
@@ -722,7 +717,6 @@ type Query @join__type(graph: API_ANALYTICS)  @join__type(graph: API_JOURNEYS)
   hosts(teamId: ID!) : [Host!]! @join__field(graph: API_JOURNEYS) 
   integrations(teamId: ID!) : [Integration!]! @join__field(graph: API_JOURNEYS) 
   adminJourneysReport(reportType: JourneysReportType!) : PowerBiEmbed @join__field(graph: API_JOURNEYS) 
-  adminJourney(id: ID!, idType: IdType = slug) : Journey! @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
   journeys(where: JourneysFilter, options: JourneysQueryOptions) : [Journey!]! @join__field(graph: API_JOURNEYS) 
   journey(id: ID!, idType: IdType, options: JourneysQueryOptions) : Journey! @join__field(graph: API_JOURNEYS) 
   journeyCollection(id: ID!) : JourneyCollection! @join__field(graph: API_JOURNEYS) 
@@ -790,6 +784,7 @@ type Query @join__type(graph: API_ANALYTICS)  @join__type(graph: API_JOURNEYS)
   journeySimpleGet(id: ID!) : Json @join__field(graph: API_JOURNEYS_MODERN) 
   googleSheetsSyncs(filter: GoogleSheetsSyncsFilter!) : [GoogleSheetsSync!]! @join__field(graph: API_JOURNEYS_MODERN) 
   integrationGooglePickerToken(integrationId: ID!) : String! @join__field(graph: API_JOURNEYS_MODERN) 
+  adminJourney(id: ID!, idType: IdType = slug) : Journey! @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
   adminJourneys(
     status: [JourneyStatus!]
     template: Boolean
@@ -849,7 +844,7 @@ type Query @join__type(graph: API_ANALYTICS)  @join__type(graph: API_JOURNEYS)
     """
     status: [JourneyStatus!]
   ): [TemplateFamilyStatsBreakdownResponse!] @join__field(graph: API_JOURNEYS_MODERN) 
-  getUserRole: UserRole @join__field(graph: API_JOURNEYS_MODERN, override: "api-journeys") 
+  getUserRole: UserRole @join__field(graph: API_JOURNEYS_MODERN) 
   language(id: ID!, idType: LanguageIdType = databaseId) : Language @join__field(graph: API_LANGUAGES) 
   languages(offset: Int, limit: Int, where: LanguagesFilter, term: String) : [Language!]! @join__field(graph: API_LANGUAGES) 
   languagesCount(where: LanguagesFilter, term: String) : Int! @join__field(graph: API_LANGUAGES) 
@@ -873,10 +868,10 @@ type Query @join__type(graph: API_ANALYTICS)  @join__type(graph: API_JOURNEYS)
     color: UnsplashColor
     orientation: UnsplashPhotoOrientation
   ): UnsplashQueryResponse! @join__field(graph: API_MEDIA) 
-  bibleBooks(where: BibleBooksFilter): [BibleBook!]! @join__field(graph: API_MEDIA) 
+  bibleBooks(where: BibleBooksFilter) : [BibleBook!]! @join__field(graph: API_MEDIA) 
   bibleCitations(videoId: ID) : [BibleCitation!]! @join__field(graph: API_MEDIA) 
   bibleCitation(id: ID!) : BibleCitation! @join__field(graph: API_MEDIA) 
-  keywords(where: KeywordsFilter): [Keyword!]! @join__field(graph: API_MEDIA) 
+  keywords(where: KeywordsFilter) : [Keyword!]! @join__field(graph: API_MEDIA) 
   getMyMuxVideos(offset: Int, limit: Int) : [MuxVideo!]! @join__field(graph: API_MEDIA) 
   getMyMuxVideo(id: ID!, userGenerated: Boolean) : MuxVideo! @join__field(graph: API_MEDIA) 
   getMuxVideo(id: ID!, userGenerated: Boolean) : MuxVideo @join__field(graph: API_MEDIA) 
@@ -1237,10 +1232,10 @@ type Video @join__type(graph: API_JOURNEYS, key: "id primaryLanguageId", extensi
   images(aspectRatio: ImageAspectRatio) : [CloudflareImage!]! @join__field(graph: API_MEDIA) 
   restrictDownloadPlatforms: [Platform!]! @join__field(graph: API_MEDIA) 
   restrictViewPlatforms: [Platform!]! @join__field(graph: API_MEDIA) 
-  publishedAt: Date @join__field(graph: API_MEDIA)
-  children: [Video!]! @join__field(graph: API_MEDIA)
-  parents: [Video!]! @join__field(graph: API_MEDIA)
-  updatedAt: DateTime! @join__field(graph: API_MEDIA)
+  publishedAt: Date @join__field(graph: API_MEDIA) 
+  updatedAt: DateTime! @join__field(graph: API_MEDIA) 
+  children: [Video!]! @join__field(graph: API_MEDIA) 
+  parents: [Video!]! @join__field(graph: API_MEDIA) 
 }
 
 type VideoBlock implements Block @join__type(graph: API_JOURNEYS, key: "id")  @join__type(graph: API_JOURNEYS_MODERN, key: "id")  @join__implements(graph: API_JOURNEYS, interface: "Block")  @join__implements(graph: API_JOURNEYS_MODERN, interface: "Block")  {
@@ -1325,11 +1320,11 @@ type VideoBlock implements Block @join__type(graph: API_JOURNEYS, key: "id")  @j
   subtitleLanguage: Language
   showGeneratedSubtitles: Boolean
   customizable: Boolean
-  mediaVideo: MediaVideo @join__field(graph: API_JOURNEYS_MODERN) 
   """
   Publisher notes for template adapters (e.g. trailer, intro).
   """
-  notes: String @join__field(graph: API_JOURNEYS_MODERN) 
+  notes: String
+  mediaVideo: MediaVideo @join__field(graph: API_JOURNEYS_MODERN) 
 }
 
 """
@@ -1474,14 +1469,14 @@ type MultiselectSubmissionEvent implements Event @join__type(graph: API_JOURNEYS
 
 type Language @join__type(graph: API_JOURNEYS, key: "id", extension: true)  @join__type(graph: API_JOURNEYS_MODERN, key: "id", extension: true)  @join__type(graph: API_LANGUAGES, key: "id")  @join__type(graph: API_MEDIA, key: "id", extension: true)  {
   id: ID!
+  updatedAt: DateTime! @join__field(graph: API_LANGUAGES) 
   bcp47: String @join__field(graph: API_LANGUAGES) 
   iso3: String @join__field(graph: API_LANGUAGES) 
   slug: String @join__field(graph: API_LANGUAGES) 
   name(languageId: ID, primary: Boolean) : [LanguageName!]! @join__field(graph: API_LANGUAGES) 
   countryLanguages: [CountryLanguage!]! @join__field(graph: API_LANGUAGES) 
   audioPreview: AudioPreview @join__field(graph: API_LANGUAGES) 
-  labeledVideoCounts: LabeledVideoCounts! @join__field(graph: API_MEDIA)
-  updatedAt: DateTime! @join__field(graph: API_LANGUAGES)
+  labeledVideoCounts: LabeledVideoCounts! @join__field(graph: API_MEDIA) 
 }
 
 type JourneyViewEvent implements Event @join__type(graph: API_JOURNEYS)  @join__type(graph: API_JOURNEYS_MODERN)  @join__implements(graph: API_JOURNEYS, interface: "Event")  @join__implements(graph: API_JOURNEYS_MODERN, interface: "Event")  {
@@ -2596,6 +2591,7 @@ type ContinentName @join__type(graph: API_LANGUAGES)  {
 
 type Country @join__type(graph: API_LANGUAGES, key: "id")  {
   id: ID!
+  updatedAt: DateTime!
   population: Int
   latitude: Float
   longitude: Float
@@ -2607,7 +2603,6 @@ type Country @join__type(graph: API_LANGUAGES, key: "id")  {
   countryLanguages: [CountryLanguage!]!
   languageCount: Int!
   languageHavingMediaCount: Int!
-  updatedAt: DateTime! @join__field(graph: API_LANGUAGES)
 }
 
 type CountryLanguage @join__type(graph: API_LANGUAGES)  {
@@ -2641,13 +2636,13 @@ type ArclightApiKey @join__type(graph: API_MEDIA, key: "key")  {
 
 type BibleBook @join__type(graph: API_MEDIA)  {
   id: ID!
+  updatedAt: DateTime!
   name(languageId: ID, primary: Boolean) : [BibleBookName!]!
   osisId: String!
   alternateName: String
   paratextAbbreviation: String!
   isNewTestament: Boolean!
   order: Int!
-  updatedAt: DateTime! @join__field(graph: API_MEDIA)
 }
 
 type BibleBookName @join__type(graph: API_MEDIA)  {
@@ -2780,9 +2775,9 @@ type ForeignKeyConstraintErrorLocation @join__type(graph: API_MEDIA)  {
 
 type Keyword @join__type(graph: API_MEDIA)  {
   id: ID!
+  updatedAt: DateTime!
   value: String!
   language: Language!
-  updatedAt: DateTime! @join__field(graph: API_MEDIA)
 }
 
 type LabeledVideoCounts @join__type(graph: API_MEDIA)  {
@@ -3145,10 +3140,10 @@ type VideoDescription @join__type(graph: API_MEDIA)  {
 
 type VideoEdition @join__type(graph: API_MEDIA)  {
   id: ID!
+  updatedAt: DateTime!
   name: String
   videoVariants: [VideoVariant!]!
   videoSubtitles: [VideoSubtitle!]!
-  updatedAt: DateTime! @join__field(graph: API_MEDIA)
 }
 
 type VideoImageAlt @join__type(graph: API_MEDIA)  {
@@ -3232,6 +3227,7 @@ type VideoTitle @join__type(graph: API_MEDIA)  {
 
 type VideoVariant @join__type(graph: API_MEDIA)  {
   id: ID!
+  updatedAt: DateTime!
   """
   master video file
   """
@@ -3260,7 +3256,6 @@ type VideoVariant @join__type(graph: API_MEDIA)  {
   """
   version: Int!
   video: Video
-  updatedAt: DateTime! @join__field(graph: API_MEDIA)
 }
 
 type VideoVariantDownload @join__type(graph: API_MEDIA)  {
@@ -3926,29 +3921,6 @@ input ButtonBlockSettingsInput @join__type(graph: API_JOURNEYS)  @join__type(gra
   color: String
 }
 
-input CardBlockCreateInput @join__type(graph: API_JOURNEYS)  @join__type(graph: API_JOURNEYS_MODERN)  {
-  id: ID
-  journeyId: ID!
-  parentBlockId: ID!
-  eventLabel: BlockEventLabel
-  backgroundColor: String
-  backdropBlur: Int
-  fullscreen: Boolean
-  themeMode: ThemeMode
-  themeName: ThemeName
-}
-
-input CardBlockUpdateInput @join__type(graph: API_JOURNEYS)  @join__type(graph: API_JOURNEYS_MODERN)  {
-  parentBlockId: ID
-  eventLabel: BlockEventLabel
-  coverBlockId: ID
-  backgroundColor: String
-  backdropBlur: Int
-  fullscreen: Boolean
-  themeMode: ThemeMode
-  themeName: ThemeName
-}
-
 input IconBlockCreateInput @join__type(graph: API_JOURNEYS)  @join__type(graph: API_JOURNEYS_MODERN)  {
   """
   ID should be unique Response UUID (Provided for optimistic mutation result matching)
@@ -4761,6 +4733,29 @@ input ButtonClickEventCreateInput @join__type(graph: API_JOURNEYS_MODERN)  {
   actionValue: String
 }
 
+input CardBlockCreateInput @join__type(graph: API_JOURNEYS_MODERN)  {
+  id: ID
+  journeyId: ID!
+  parentBlockId: ID!
+  eventLabel: BlockEventLabel
+  backgroundColor: String
+  backdropBlur: Int
+  fullscreen: Boolean
+  themeMode: ThemeMode
+  themeName: ThemeName
+}
+
+input CardBlockUpdateInput @join__type(graph: API_JOURNEYS_MODERN)  {
+  parentBlockId: ID
+  eventLabel: BlockEventLabel
+  coverBlockId: ID
+  backgroundColor: String
+  backdropBlur: Int
+  fullscreen: Boolean
+  themeMode: ThemeMode
+  themeName: ThemeName
+}
+
 input ChatActionInput @join__type(graph: API_JOURNEYS_MODERN)  {
   gtmEventName: String
   chatUrl: String!
@@ -5088,22 +5083,19 @@ input VideoBlockUpdateInput @join__type(graph: API_JOURNEYS_MODERN)  {
   notes: String
 }
 
-input LanguagesFilter @join__type(graph: API_LANGUAGES)  {
-  ids: [ID!]
-  bcp47: [String!]
-  iso3: [String!]
-  updatedAt: DateTimeFilter
-}
-
 input CountriesFilter @join__type(graph: API_LANGUAGES)  {
   updatedAt: DateTimeFilter
 }
 
-input KeywordsFilter @join__type(graph: API_MEDIA)  {
-  updatedAt: DateTimeFilter
+input DateTimeFilter @join__type(graph: API_LANGUAGES)  @join__type(graph: API_MEDIA)  {
+  gte: DateTime
+  lte: DateTime
 }
 
-input BibleBooksFilter @join__type(graph: API_MEDIA)  {
+input LanguagesFilter @join__type(graph: API_LANGUAGES)  {
+  ids: [ID!]
+  bcp47: [String!]
+  iso3: [String!]
   updatedAt: DateTimeFilter
 }
 
@@ -5125,6 +5117,10 @@ input MutationAudioPreviewUpdateInput @join__type(graph: API_LANGUAGES)  {
   codec: String
 }
 
+input BibleBooksFilter @join__type(graph: API_MEDIA)  {
+  updatedAt: DateTimeFilter
+}
+
 input CloudflareR2CompleteMultipartInput @join__type(graph: API_MEDIA)  {
   """
   CloudflareR2 id for the asset being uploaded
@@ -5217,6 +5213,10 @@ input ImageInput @join__type(graph: API_MEDIA)  {
   videoId: ID
 }
 
+input KeywordsFilter @join__type(graph: API_MEDIA)  {
+  updatedAt: DateTimeFilter
+}
+
 input MutationBibleCitationCreateInput @join__type(graph: API_MEDIA)  {
   id: ID
   osisId: String!

apis/api-journeys-modern/schema.graphql

@@ -1337,15 +1337,15 @@ input MultiselectSubmissionEventCreateInput {
 }
 
 type Mutation {
-  buttonBlockCreate(input: ButtonBlockCreateInput!): ButtonBlock! @override(from: "api-journeys")
+  buttonBlockCreate(input: ButtonBlockCreateInput!): ButtonBlock!
   buttonBlockUpdate(
     id: ID!
     input: ButtonBlockUpdateInput!
 
     """drop this parameter after merging teams"""
     journeyId: ID
-  ): ButtonBlock @override(from: "api-journeys")
-  cardBlockCreate(input: CardBlockCreateInput!): CardBlock! @override(from: "api-journeys")
+  ): ButtonBlock
+  cardBlockCreate(input: CardBlockCreateInput!): CardBlock!
   cardBlockUpdate(
     id: ID!
     input: CardBlockUpdateInput!
@@ -1405,7 +1405,7 @@ type Mutation {
   journeyAiTranslateCreate(input: JourneyAiTranslateInput!): Journey!
   createJourneyEventsExportLog(input: JourneyEventsExportLogInput!): JourneyEventsExportLog!
   journeyLanguageAiDetect(input: MutationJourneyLanguageAiDetectInput!): Boolean!
-  journeyProfileUpdate(input: JourneyProfileUpdateInput!): JourneyProfile! @override(from: "api-journeys")
+  journeyProfileUpdate(input: JourneyProfileUpdateInput!): JourneyProfile!
   journeyVisitorExportToGoogleSheet(
     journeyId: ID!
     filter: JourneyEventsFilter
@@ -1795,7 +1795,7 @@ type Query {
     """
     status: [JourneyStatus!]
   ): [TemplateFamilyStatsBreakdownResponse!]
-  getUserRole: UserRole @override(from: "api-journeys")
+  getUserRole: UserRole
 }
 
 type RadioOptionBlock implements Block

apis/api-journeys-modern/src/schema/block/button/buttonBlockCreate.mutation.ts

@@ -17,9 +17,6 @@ builder.mutationField('buttonBlockCreate', (t) =>
   t.withAuth({ $any: { isAuthenticated: true, isAnonymous: true } }).field({
     type: ButtonBlock,
     nullable: false,
-    override: {
-      from: 'api-journeys'
-    },
     args: {
       input: t.arg({ type: ButtonBlockCreateInput, required: true })
     },

apis/api-journeys-modern/src/schema/block/button/buttonBlockUpdate.mutation.ts

@@ -23,9 +23,6 @@ builder.mutationField('buttonBlockUpdate', (t) =>
   t.withAuth({ $any: { isAuthenticated: true, isAnonymous: true } }).field({
     type: ButtonBlock,
     nullable: true,
-    override: {
-      from: 'api-journeys'
-    },
     args: {
       id: t.arg({ type: 'ID', required: true }),
       input: t.arg({ type: ButtonBlockUpdateInput, required: true }),

apis/api-journeys-modern/src/schema/block/card/cardBlockCreate.mutation.ts

@@ -17,9 +17,6 @@ builder.mutationField('cardBlockCreate', (t) =>
   t.withAuth({ $any: { isAuthenticated: true, isAnonymous: true } }).field({
     type: CardBlock,
     nullable: false,
-    override: {
-      from: 'api-journeys'
-    },
     args: {
       input: t.arg({ type: CardBlockCreateInput, required: true })
     },