fix: fetchPaginatedData

Author: mathhulk

apps/datapuller/src/lib/api/sis-api.ts

@@ -1,12 +1,19 @@
 import { Logger } from "tslog";
 
-export async function fetchPaginatedData<T, R>(
+import { HttpResponse } from "@repo/sis-api/courses";
+
+export async function fetchPaginatedData<
+  T,
+  R,
+  API extends Record<string, (...args: any[]) => Promise<HttpResponse<any>>>,
+  Method extends keyof API,
+>(
   logger: Logger<unknown>,
-  api: any,
+  api: API,
   termIds: string[] | null,
-  method: string,
+  method: Method,
   headers: Record<string, string>,
-  responseProcessor: (data: any) => R[],
+  responseProcessor: (data: Awaited<ReturnType<API[Method]>>["data"]) => R[],
   itemFilter: (item: R) => boolean,
   itemProcessor: (item: R) => T
 ): Promise<T[]> {

apps/datapuller/src/lib/classes.ts

@@ -7,7 +7,7 @@ import { fetchPaginatedData } from "./api/sis-api";
 
 // Include relevant fields missing from the automatically generated type
 type CombinedClass = Class & {
-  requisites: {
+  requisites?: {
     code: {
       type: string;
     };
@@ -91,7 +91,7 @@ export const getClasses = async (
 ) => {
   const classesAPI = new ClassesAPI();
 
-  const courses = await fetchPaginatedData<IClassItem, CombinedClass>(
+  const courses = await fetchPaginatedData(
     logger,
     classesAPI.v1,
     termIds || null,
@@ -100,7 +100,7 @@ export const getClasses = async (
       app_id: id,
       app_key: key,
     },
-    (data) => data.apiResponse.response.classes || [],
+    (data) => data.apiResponse?.response.classes || [],
     filterClass,
     formatClass
   );

apps/datapuller/src/lib/courses.ts

@@ -6,10 +6,9 @@ import { Course, CoursesAPI } from "@repo/sis-api/courses";
 import { fetchPaginatedData } from "./api/sis-api";
 
 // Include relevant fields missing from the automically generated type
-type CombinedCourse = Course;
-// type CombinedCourse = Course & {
-//   gradeReplacement: ClassCourse["gradeReplacement"];
-// };
+type CombinedCourse = Course & {
+  gradeReplacement?: ICourseItem["gradeReplacement"];
+};
 
 const filterCourse = (input: CombinedCourse): boolean => {
   return input.status?.code === "ACTIVE";
@@ -73,13 +72,11 @@ const formatCourse = (input: CombinedCourse) => {
         (c) => c.identifiers?.find((i) => i.type === "cs-course-id")?.id || ""
       ),
     },
-    // gradeReplacement: {
-    //   text: input.gradeReplacement?.gradeReplacementText,
-    //   group: input.gradeReplacement?.gradeReplacementGroup,
-    //   courses: input.gradeReplacement?.gradeReplacementCourses?.map(
-    //     (c) => c.identifiers?.find((i) => i.type === "cs-course-id")?.id || ""
-    //   ),
-    // },
+    gradeReplacement: {
+      text: input.gradeReplacement?.text,
+      group: input.gradeReplacement?.group,
+      courses: input.gradeReplacement?.courses,
+    },
     crossListing: input.crossListing?.courses,
     formatsOffered: {
       description: input.formatsOffered?.description,
@@ -144,7 +141,7 @@ export const getCourses = async (
 ) => {
   const coursesAPI = new CoursesAPI();
 
-  const courses = await fetchPaginatedData<ICourseItem, CombinedCourse>(
+  const courses = await fetchPaginatedData(
     logger,
     coursesAPI.v5,
     null,
@@ -153,11 +150,7 @@ export const getCourses = async (
       app_id: id,
       app_key: key,
     },
-    (
-      data: Awaited<
-        ReturnType<typeof coursesAPI.v5.findCourseCollectionUsingGet>
-      >["data"]
-    ) => data.apiResponse?.response.courses || [],
+    (data) => data.apiResponse?.response.courses || [],
     filterCourse,
     formatCourse
   );

apps/datapuller/src/lib/enrollment.ts

@@ -86,10 +86,7 @@ export const getEnrollmentSingulars = async (
 ) => {
   const classesAPI = new ClassesAPI();
 
-  const sections = await fetchPaginatedData<
-    IEnrollmentSingularItem,
-    ClassSection
-  >(
+  const sections = await fetchPaginatedData(
     logger,
     classesAPI.v1,
     termIds || null,
@@ -98,7 +95,7 @@ export const getEnrollmentSingulars = async (
       app_id: id,
       app_key: key,
     },
-    (data) => data.apiResponse.response.classSections || [],
+    (data) => data.apiResponse?.response.classSections || [],
     filterSection,
     (input) => formatEnrollmentSingular(input, new Date())
   );

apps/datapuller/src/lib/sections.ts

@@ -119,7 +119,7 @@ export const getSections = async (
 ) => {
   const classesAPI = new ClassesAPI();
 
-  const sections = await fetchPaginatedData<ISectionItem, ClassSection>(
+  const sections = await fetchPaginatedData(
     logger,
     classesAPI.v1,
     termIds || null,
@@ -128,7 +128,7 @@ export const getSections = async (
       app_id: id,
       app_key: key,
     },
-    (data) => data.apiResponse.response.classSections || [],
+    (data) => data.apiResponse?.response.classSections || [],
     filterSection,
     formatSection
   );