Removing some type alias statements in the GetCoursesProgressionRequest to prevent hitting a limit on our graphql server

reabbotted · reabbotted · commit a6bf05c0b920 · 2025-05-27T11:01:41.000-06:00
diff --git a/Core/Core/Features/Courses/CourseProgression/CDCourse.swift b/Core/Core/Features/Courses/CourseProgression/CDCourse.swift
@@ -133,7 +133,7 @@ public final class CDCourse: NSManagedObject, WriteableModel {
                 model.nextModuleID = node?.id
                 model.nextModuleItemID = firstItem.content?.id
                 model.nextModuleItemEstimatedTime = firstItem.estimatedDuration
-                model.nextModuleItemType = firstItem.content?.type
+                model.nextModuleItemType = firstItem.content?.__typename
                 model.nextModuleItemDueDate = firstItem.content?.dueAt
                 model.nextModuleName = node?.name
                 model.nextModuleItemURL = firstItem.url
@@ -153,7 +153,7 @@ public final class CDCourse: NSManagedObject, WriteableModel {
             model.nextModuleID = nextModule?.id
             model.nextModuleItemID = nextModuleItem?.id
             model.nextModuleItemEstimatedTime = nextModuleItem?.estimatedDuration
-            model.nextModuleItemType = nextModuleItem?.content?.type
+            model.nextModuleItemType = nextModuleItem?.content?.__typename
             model.nextModuleItemDueDate = nextModuleItem?.content?.dueAt
             model.nextModuleName = nextModule?.name
             model.nextModuleItemURL = nextModuleItem?.url
diff --git a/Core/Core/Features/Courses/CourseProgression/GetCoursesProgressionRequest.swift b/Core/Core/Features/Courses/CourseProgression/GetCoursesProgressionRequest.swift
@@ -62,47 +62,47 @@ public struct GetCoursesProgressionRequest: APIGraphQLRequestable {
                                            id
                                            title
                                            dueAt
-                                           type: __typename
+                                           __typename
                                          }
                                          ... on Discussion {
                                            id
                                            title
-                                           type: __typename
+                                           __typename
                                          }
                                          ... on ExternalTool {
                                            id: _id
                                            title: name
-                                           type: __typename
+                                           __typename
                                          }
                                          ... on ExternalUrl {
                                            id: _id
                                            title
-                                           type: __typename
+                                           __typename
                                          }
                                          ... on File {
                                            id
                                            title
-                                           type: __typename
+                                           __typename
                                          }
                                          ... on ModuleExternalTool {
                                            id: _id
                                            title
-                                           type: __typename
+                                           __typename
                                          }
                                          ... on Page {
                                            id
                                            title
-                                           type: __typename
+                                           __typename
                                          }
                                          ... on Quiz {
                                            id
                                            title
-                                           type: __typename
+                                           __typename
                                          }
                                          ... on SubHeader {
                                            id: title
                                            title
-                                           type: __typename
+                                           __typename
                                          }
                                        }
                                       }
@@ -133,48 +133,48 @@ public struct GetCoursesProgressionRequest: APIGraphQLRequestable {
                                                                     title
                                                                     dueAt
                                                                     position
-                                                                    type: __typename
+                                                                    __typename
                                                                 }
                                                                 ... on Discussion {
                                                                     id
                                                                     title
                                                                     position
-                                                                    type: __typename
+                                                                    __typename
                                                                 }
                                                                 ... on ExternalTool {
                                                                     id: _id
                                                                     title: name
-                                                                    type: __typename
+                                                                    __typename
                                                                 }
                                                                 ... on ExternalUrl {
                                                                     id: _id
                                                                     title
-                                                                    type: __typename
+                                                                    __typename
                                                                 }
                                                                 ... on File {
                                                                     id
                                                                     title
-                                                                    type: __typename
+                                                                    __typename
                                                                 }
                                                                 ... on ModuleExternalTool {
                                                                     id: _id
                                                                     title
-                                                                    type: __typename
+                                                                    __typename
                                                                 }
                                                                 ... on Page {
                                                                     id
                                                                     title
-                                                                    type: __typename
+                                                                    __typename
                                                                 }
                                                                 ... on Quiz {
                                                                     id
                                                                     title
-                                                                    type: __typename
+                                                                    __typename
                                                                 }
                                                                 ... on SubHeader {
                                                                     id: title
                                                                     title
-                                                                    type: __typename
+                                                                    __typename
                                                                 }
                                                             }
                                                         }
diff --git a/Core/Core/Features/Courses/CourseProgression/GetCoursesProgressionResponse.swift b/Core/Core/Features/Courses/CourseProgression/GetCoursesProgressionResponse.swift
@@ -100,7 +100,7 @@ public struct GetCoursesProgressionResponse: Codable {
         struct Content: Codable {
             let id: String?
             let title: String?
-            let type: String?
+            let __typename: String?
             let dueAt: Date?
         }
     }
@@ -127,6 +127,6 @@ public struct GetCoursesProgressionResponse: Codable {
         public let title: String?
         public let dueAt: Date?
         public let position: Double?
-        public let type: String?
+        public let __typename: String?
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -62,47 +62,47 @@ public struct GetCoursesProgressionRequest: APIGraphQLRequestable {`
`62`	`62`	`id`
`63`	`63`	`title`
`64`	`64`	`dueAt`
`65`		`- type: __typename`
	`65`	`+ __typename`
`66`	`66`	`}`
`67`	`67`	`... on Discussion {`
`68`	`68`	`id`
`69`	`69`	`title`
`70`		`- type: __typename`
	`70`	`+ __typename`
`71`	`71`	`}`
`72`	`72`	`... on ExternalTool {`
`73`	`73`	`id: _id`
`74`	`74`	`title: name`
`75`		`- type: __typename`
	`75`	`+ __typename`
`76`	`76`	`}`
`77`	`77`	`... on ExternalUrl {`
`78`	`78`	`id: _id`
`79`	`79`	`title`
`80`		`- type: __typename`
	`80`	`+ __typename`
`81`	`81`	`}`
`82`	`82`	`... on File {`
`83`	`83`	`id`
`84`	`84`	`title`
`85`		`- type: __typename`
	`85`	`+ __typename`
`86`	`86`	`}`
`87`	`87`	`... on ModuleExternalTool {`
`88`	`88`	`id: _id`
`89`	`89`	`title`
`90`		`- type: __typename`
	`90`	`+ __typename`
`91`	`91`	`}`
`92`	`92`	`... on Page {`
`93`	`93`	`id`
`94`	`94`	`title`
`95`		`- type: __typename`
	`95`	`+ __typename`
`96`	`96`	`}`
`97`	`97`	`... on Quiz {`
`98`	`98`	`id`
`99`	`99`	`title`
`100`		`- type: __typename`
	`100`	`+ __typename`
`101`	`101`	`}`
`102`	`102`	`... on SubHeader {`
`103`	`103`	`id: title`
`104`	`104`	`title`
`105`		`- type: __typename`
	`105`	`+ __typename`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`	`}`
`@@ -133,48 +133,48 @@ public struct GetCoursesProgressionRequest: APIGraphQLRequestable {`
`133`	`133`	`title`
`134`	`134`	`dueAt`
`135`	`135`	`position`
`136`		`- type: __typename`
	`136`	`+ __typename`
`137`	`137`	`}`
`138`	`138`	`... on Discussion {`
`139`	`139`	`id`
`140`	`140`	`title`
`141`	`141`	`position`
`142`		`- type: __typename`
	`142`	`+ __typename`
`143`	`143`	`}`
`144`	`144`	`... on ExternalTool {`
`145`	`145`	`id: _id`
`146`	`146`	`title: name`
`147`		`- type: __typename`
	`147`	`+ __typename`
`148`	`148`	`}`
`149`	`149`	`... on ExternalUrl {`
`150`	`150`	`id: _id`
`151`	`151`	`title`
`152`		`- type: __typename`
	`152`	`+ __typename`
`153`	`153`	`}`
`154`	`154`	`... on File {`
`155`	`155`	`id`
`156`	`156`	`title`
`157`		`- type: __typename`
	`157`	`+ __typename`
`158`	`158`	`}`
`159`	`159`	`... on ModuleExternalTool {`
`160`	`160`	`id: _id`
`161`	`161`	`title`
`162`		`- type: __typename`
	`162`	`+ __typename`
`163`	`163`	`}`
`164`	`164`	`... on Page {`
`165`	`165`	`id`
`166`	`166`	`title`
`167`		`- type: __typename`
	`167`	`+ __typename`
`168`	`168`	`}`
`169`	`169`	`... on Quiz {`
`170`	`170`	`id`
`171`	`171`	`title`
`172`		`- type: __typename`
	`172`	`+ __typename`
`173`	`173`	`}`
`174`	`174`	`... on SubHeader {`
`175`	`175`	`id: title`
`176`	`176`	`title`
`177`		`- type: __typename`
	`177`	`+ __typename`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public struct GetCoursesProgressionResponse: Codable {`
`100`	`100`	`struct Content: Codable {`
`101`	`101`	`let id: String?`
`102`	`102`	`let title: String?`
`103`		`- let type: String?`
	`103`	`+ let __typename: String?`
`104`	`104`	`let dueAt: Date?`
`105`	`105`	`}`
`106`	`106`	`}`
`@@ -127,6 +127,6 @@ public struct GetCoursesProgressionResponse: Codable {`
`127`	`127`	`public let title: String?`
`128`	`128`	`public let dueAt: Date?`
`129`	`129`	`public let position: Double?`
`130`		`- public let type: String?`
	`130`	`+ public let __typename: String?`
`131`	`131`	`}`
`132`	`132`	`}`