use v2 enrollments, hide org enrollments in my learning (#2604)

* Update transform functions and enrollment displays throughout the dashboard to use v2 enrollments, hide org enrollments from My Learning

* fix mistake with casing

* more casing issues

* fix more issues

* more casing issues...

Author: gumaerc

frontends/api/src/mitxonline/hooks/enrollment/queries.ts

@@ -1,6 +1,6 @@
 import { queryOptions } from "@tanstack/react-query"
 import type {
-  CourseRunEnrollment,
+  CourseRunEnrollmentRequestV2,
   UserProgramEnrollmentDetail,
 } from "@mitodl/mitxonline-api-axios/v2"
 
@@ -26,8 +26,10 @@ const enrollmentQueries = {
   courseRunEnrollmentsList: () =>
     queryOptions({
       queryKey: enrollmentKeys.courseRunEnrollmentsList(),
-      queryFn: async (): Promise<CourseRunEnrollment[]> => {
-        return courseRunEnrollmentsApi.enrollmentsList().then((res) => res.data)
+      queryFn: async (): Promise<CourseRunEnrollmentRequestV2[]> => {
+        return courseRunEnrollmentsApi
+          .userEnrollmentsListV2()
+          .then((res) => res.data)
       },
     }),
   programEnrollmentsList: (opts?: RawAxiosRequestConfig) =>

frontends/api/src/mitxonline/test-utils/factories/enrollment.ts

@@ -3,6 +3,7 @@ import { mergeOverrides } from "ol-test-utilities"
 import type { PartialFactory } from "ol-test-utilities"
 import type {
   CourseRunEnrollment,
+  CourseRunEnrollmentRequestV2,
   CourseRunGrade,
   UserProgramEnrollmentDetail,
 } from "@mitodl/mitxonline-api-axios/v2"
@@ -28,14 +29,16 @@ const grade: PartialFactory<CourseRunGrade> = (overrides = {}) => {
   return mergeOverrides<CourseRunGrade>(defaults, overrides)
 }
 
-const courseEnrollment: PartialFactory<CourseRunEnrollment> = (
+const courseEnrollment: PartialFactory<CourseRunEnrollmentRequestV2> = (
   overrides = {},
 ) => {
   const title =
     overrides.run?.title ?? overrides.run?.course?.title ?? faker.word.words(3)
 
-  const defaults: CourseRunEnrollment = {
+  const defaults: CourseRunEnrollmentRequestV2 = {
     id: uniqueEnrollmentId.enforce(() => faker.number.int()),
+    b2b_contract_id: null, // Default to personal enrollment (not B2B)
+    b2b_organization_id: null, // Default to personal enrollment (not B2B)
     certificate: {
       uuid: faker.string.uuid(),
       link: faker.internet.url(),
@@ -95,10 +98,52 @@ const courseEnrollment: PartialFactory<CourseRunEnrollment> = (
           ],
         },
         programs: null,
+        topics: faker.helpers.multiple(
+          () => ({ name: faker.lorem.word(), id: faker.number.int() }),
+          { count: { min: 0, max: 5 } },
+        ),
+        certificate_type: faker.helpers.arrayElement([
+          "completion",
+          "verified",
+          "professional",
+          "micromasters",
+        ]),
+        required_prerequisites: faker.datatype.boolean(),
+        duration: `${faker.number.int({ min: 4, max: 16 })} weeks`,
+        min_weeks: faker.number.int({ min: 4, max: 8 }),
+        max_weeks: faker.number.int({ min: 12, max: 20 }),
+        min_price: faker.number.int({ min: 0, max: 500 }),
+        max_price: faker.number.int({ min: 500, max: 2000 }),
+        time_commitment: `${faker.number.int({ min: 2, max: 15 })} hours per week`,
+        availability: faker.helpers.arrayElement([
+          "current",
+          "starting_soon",
+          "upcoming",
+          "archived",
+        ]),
+        min_weekly_hours: faker.number.int({ min: 2, max: 5 }).toString(),
+        max_weekly_hours: faker.number.int({ min: 8, max: 15 }).toString(),
+        include_in_learn_catalog: faker.datatype.boolean({ probability: 0.8 }),
+        ingest_content_files_for_ai: faker.datatype.boolean({
+          probability: 0.3,
+        }),
       },
     },
   }
-  return mergeOverrides<CourseRunEnrollment>(defaults, overrides)
+  return mergeOverrides<CourseRunEnrollmentRequestV2>(defaults, overrides)
+}
+
+// Type-safe conversion from V2 to V1 enrollment for compatibility
+const convertV2ToV1Enrollment = (
+  v2Enrollment: CourseRunEnrollmentRequestV2,
+): CourseRunEnrollment => {
+  // Remove V2-specific fields and return V1 compatible object
+  const {
+    b2b_contract_id: b2bContractId,
+    b2b_organization_id: b2bOrganizationId,
+    ...v1Compatible
+  } = v2Enrollment
+  return v1Compatible as CourseRunEnrollment
 }
 
 const programEnrollment: PartialFactory<UserProgramEnrollmentDetail> = (
@@ -143,13 +188,13 @@ const programEnrollment: PartialFactory<UserProgramEnrollmentDetail> = (
       ],
       live: faker.datatype.boolean(),
     },
-    enrollments: [courseEnrollment()],
+    enrollments: [convertV2ToV1Enrollment(courseEnrollment())],
   }
   return mergeOverrides<UserProgramEnrollmentDetail>(defaults, overrides)
 }
 
 // Not paginated
-const courseEnrollments = (count: number): CourseRunEnrollment[] => {
+const courseEnrollments = (count: number): CourseRunEnrollmentRequestV2[] => {
   return new Array(count).fill(null).map(() => courseEnrollment())
 }
 

frontends/api/src/mitxonline/test-utils/urls.ts

@@ -21,6 +21,7 @@ const enrollment = {
   enrollmentsList: () => `${API_BASE_URL}/api/v1/enrollments/`,
   courseEnrollment: (id?: number) =>
     `${API_BASE_URL}/api/v1/enrollments/${id ? `${id}/` : ""}`,
+  enrollmentsListV2: () => `${API_BASE_URL}/api/v2/enrollments/`,
 }
 
 const programEnrollments = {

frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardDialogs.test.tsx

@@ -37,7 +37,7 @@ describe("DashboardDialogs", () => {
 
     mockedUseFeatureFlagEnabled.mockReturnValue(true)
     setMockResponse.get(
-      mitxonline.urls.enrollment.courseEnrollment(),
+      mitxonline.urls.enrollment.enrollmentsListV2(),
       enrollments,
     )
 

frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/EnrollmentDisplay.test.tsx

@@ -25,7 +25,7 @@ describe("EnrollmentDisplay", () => {
 
     mockedUseFeatureFlagEnabled.mockReturnValue(true)
     setMockResponse.get(
-      mitxonline.urls.enrollment.courseEnrollment(),
+      mitxonline.urls.enrollment.enrollmentsListV2(),
       enrollments,
     )
 

frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/EnrollmentDisplay.tsx

@@ -91,20 +91,22 @@ const sortEnrollments = (resources: DashboardCourse[]) => {
   const started: DashboardCourse[] = []
   const notStarted: DashboardCourse[] = []
   resources.forEach((resource) => {
-    if (resource.enrollment?.status === EnrollmentStatus.Completed) {
-      completed.push(resource)
-    } else if (
-      resource.run.endDate &&
-      new Date(resource.run.endDate) < new Date()
-    ) {
-      expired.push(resource)
-    } else if (
-      resource.run.startDate &&
-      new Date(resource.run.startDate) < new Date()
-    ) {
-      started.push(resource)
-    } else {
-      notStarted.push(resource)
+    if (!resource.enrollment?.b2b_contract_id) {
+      if (resource.enrollment?.status === EnrollmentStatus.Completed) {
+        completed.push(resource)
+      } else if (
+        resource.run.endDate &&
+        new Date(resource.run.endDate) < new Date()
+      ) {
+        expired.push(resource)
+      } else if (
+        resource.run.startDate &&
+        new Date(resource.run.startDate) < new Date()
+      ) {
+        started.push(resource)
+      } else {
+        notStarted.push(resource)
+      }
     }
   })
 

frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/test-utils.ts

@@ -13,7 +13,7 @@ import { setMockResponse } from "../../../test-utils"
 import moment from "moment"
 import {
   ContractPage,
-  CourseRunEnrollment,
+  CourseRunEnrollmentRequestV2,
   CourseWithCourseRunsSerializerV2,
   IntegrationTypeEnum,
   OrganizationPage,
@@ -56,19 +56,22 @@ const dashboardCourse: PartialFactory<DashboardCourse> = (...overrides) => {
 const setupEnrollments = (includeExpired: boolean) => {
   const completed = [
     makeCourseEnrollment({
+      b2b_contract_id: null, // Personal enrollment, not B2B
       run: { title: "C Course Ended" },
       grades: [makeGrade({ passed: true })],
     }),
   ]
   const expired = includeExpired
     ? [
         makeCourseEnrollment({
+          b2b_contract_id: null, // Personal enrollment, not B2B
           run: {
             title: "A Course Ended",
             end_date: faker.date.past().toISOString(),
           },
         }),
         makeCourseEnrollment({
+          b2b_contract_id: null, // Personal enrollment, not B2B
           run: {
             title: "B Course Ended",
             end_date: faker.date.past().toISOString(),
@@ -78,12 +81,14 @@ const setupEnrollments = (includeExpired: boolean) => {
     : []
   const started = [
     makeCourseEnrollment({
+      b2b_contract_id: null, // Personal enrollment, not B2B
       run: {
         title: "A Course Started",
         start_date: faker.date.past().toISOString(),
       },
     }),
     makeCourseEnrollment({
+      b2b_contract_id: null, // Personal enrollment, not B2B
       run: {
         title: "B Course Started",
         start_date: faker.date.past().toISOString(),
@@ -92,11 +97,13 @@ const setupEnrollments = (includeExpired: boolean) => {
   ]
   const notStarted = [
     makeCourseEnrollment({
+      b2b_contract_id: null, // Personal enrollment, not B2B
       run: {
         start_date: moment().add(1, "day").toISOString(), // Sooner first
       },
     }),
     makeCourseEnrollment({
+      b2b_contract_id: null, // Personal enrollment, not B2B
       run: {
         start_date: moment().add(5, "day").toISOString(), // Later second
       },
@@ -192,14 +199,14 @@ const setupProgramsAndCourses = () => {
 const createEnrollmentsForContractRuns = (
   courses: CourseWithCourseRunsSerializerV2[],
   contractIds: number[],
-): CourseRunEnrollment[] => {
+): CourseRunEnrollmentRequestV2[] => {
   return courses.flatMap((course) =>
     course.courseruns
       .filter(
         (run) => run.b2b_contract && contractIds.includes(run.b2b_contract),
       )
-      .map((run) =>
-        factories.enrollment.courseEnrollment({
+      .map((run) => ({
+        ...factories.enrollment.courseEnrollment({
           run: {
             id: run.id,
             course: {
@@ -209,7 +216,9 @@ const createEnrollmentsForContractRuns = (
             title: run.title,
           },
         }),
-      ),
+        b2b_contract_id: run.b2b_contract ?? null,
+        b2b_organization_id: null, // Will be set by individual tests as needed
+      })),
   )
 }