richie-education 3.1.3-dev3 → 3.1.3-dev30

package/js/pages/TeacherDashboardCourseLearnersLayout/hooks/useCourseLearnersFilters/index.spec.tsx

@@ -1,7 +1,7 @@
 import fetchMock from 'fetch-mock';
 import { renderHook, waitFor, act } from '@testing-library/react';
 import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
-import { CourseProductRelationFactory, OrganizationFactory } from 'utils/test/factories/joanie';
+import { OfferingFactory, OrganizationFactory } from 'utils/test/factories/joanie';
 import { JoanieAppWrapper, setupJoanieSession } from 'utils/test/wrappers/JoanieAppWrapper';
 import useCourseLearnersFilters from '.';
 
@@ -32,12 +32,12 @@ describe('useCourseLearnersFilters', () => {
       expect(result.current.initialFilters).toStrictEqual({
         organization_id: undefined,
         course_id: undefined,
-        course_product_relation_id: undefined,
+        offering_id: undefined,
       });
       expect(result.current.filters).toStrictEqual({
         organization_id: undefined,
         course_id: undefined,
-        course_product_relation_id: undefined,
+        offering_id: undefined,
       });
     });
   });
@@ -46,7 +46,7 @@ describe('useCourseLearnersFilters', () => {
     const defaultOrganization = OrganizationFactory().one();
     const filteredOrganization = OrganizationFactory({ id: 'filtered' }).one();
     const routeOrganization = OrganizationFactory({ id: 'route' }).one();
-    const routeCourseProductRelation = CourseProductRelationFactory().one();
+    const routeOffering = OfferingFactory().one();
     // fetching user's organizations to initialize default organizationId.
     fetchMock.get('https://joanie.endpoint/api/v1.0/organizations/', [
       defaultOrganization,
@@ -56,9 +56,9 @@ describe('useCourseLearnersFilters', () => {
       wrapper: ({ children }) => (
         <JoanieAppWrapper
           routerOptions={{
-            path: '/:organizationId/:courseId/:courseProductRelationId',
+            path: '/:organizationId/:courseId/:offeringId',
             initialEntries: [
-              `/${routeOrganization.id}/${routeCourseProductRelation.course.id}/${routeCourseProductRelation.id}?organization_id=${filteredOrganization.id}`,
+              `/${routeOrganization.id}/${routeOffering.course.id}/${routeOffering.id}?organization_id=${filteredOrganization.id}`,
             ],
           }}
         >
@@ -70,13 +70,13 @@ describe('useCourseLearnersFilters', () => {
     await waitFor(() => {
       expect(result.current.initialFilters).toStrictEqual({
         organization_id: routeOrganization.id,
-        course_id: routeCourseProductRelation.course.id,
-        course_product_relation_id: routeCourseProductRelation.id,
+        course_id: routeOffering.course.id,
+        offering_id: routeOffering.id,
       });
       expect(result.current.filters).toStrictEqual({
         organization_id: routeOrganization.id,
-        course_id: routeCourseProductRelation.course.id,
-        course_product_relation_id: routeCourseProductRelation.id,
+        course_id: routeOffering.course.id,
+        offering_id: routeOffering.id,
       });
     });
   });
@@ -84,7 +84,7 @@ describe('useCourseLearnersFilters', () => {
   it("should use organizationId from query parameters when it's not in route params", async () => {
     const defaultOrganization = OrganizationFactory().one();
     const filteredOrganization = OrganizationFactory({ id: 'filtered' }).one();
-    const routeCourseProductRelation = CourseProductRelationFactory({ id: 'route' }).one();
+    const routeOffering = OfferingFactory({ id: 'route' }).one();
     // fetching user's organizations to initialize default organizationId.
     fetchMock.get('https://joanie.endpoint/api/v1.0/organizations/', [
       defaultOrganization,
@@ -94,9 +94,9 @@ describe('useCourseLearnersFilters', () => {
       wrapper: ({ children }) => (
         <JoanieAppWrapper
           routerOptions={{
-            path: '/:courseId/:courseProductRelationId',
+            path: '/:courseId/:offeringId',
             initialEntries: [
-              `/${routeCourseProductRelation.course.id}/${routeCourseProductRelation.id}/?organization_id=${filteredOrganization.id}`,
+              `/${routeOffering.course.id}/${routeOffering.id}/?organization_id=${filteredOrganization.id}`,
             ],
           }}
         >
@@ -108,13 +108,13 @@ describe('useCourseLearnersFilters', () => {
     await waitFor(() => {
       expect(result.current.initialFilters).toStrictEqual({
         organization_id: filteredOrganization.id,
-        course_id: routeCourseProductRelation.course.id,
-        course_product_relation_id: routeCourseProductRelation.id,
+        course_id: routeOffering.course.id,
+        offering_id: routeOffering.id,
       });
       expect(result.current.filters).toStrictEqual({
         organization_id: filteredOrganization.id,
-        course_id: routeCourseProductRelation.course.id,
-        course_product_relation_id: routeCourseProductRelation.id,
+        course_id: routeOffering.course.id,
+        offering_id: routeOffering.id,
       });
     });
   });
@@ -122,7 +122,7 @@ describe('useCourseLearnersFilters', () => {
   it('setFilters should update filter state', async () => {
     const defaultOrganization = OrganizationFactory({ id: 'all' }).one();
     const routeOrganization = OrganizationFactory({ id: 'route' }).one();
-    const routeCourseProductRelation = CourseProductRelationFactory().one();
+    const routeOffering = OfferingFactory().one();
     // fetching user's organizations to initialize default organizationId.
     fetchMock.get('https://joanie.endpoint/api/v1.0/organizations/', [defaultOrganization]);
     const { result } = renderHook(useCourseLearnersFilters, {
@@ -136,7 +136,7 @@ describe('useCourseLearnersFilters', () => {
     const expectedInitialFilters = {
       organization_id: defaultOrganization.id,
       course_id: undefined,
-      course_product_relation_id: undefined,
+      offering_id: undefined,
     };
     await waitFor(() => {
       expect(result.current.initialFilters).toStrictEqual(expectedInitialFilters);
@@ -144,8 +144,8 @@ describe('useCourseLearnersFilters', () => {
 
     const newFilters = {
       organization_id: routeOrganization.id,
-      course_id: routeCourseProductRelation.course.id,
-      course_product_relation_id: routeCourseProductRelation.id,
+      course_id: routeOffering.course.id,
+      offering_id: routeOffering.id,
     };
     act(() => {
       result.current.setFilters(newFilters);

package/js/pages/TeacherDashboardCourseLearnersLayout/hooks/useCourseLearnersFilters/index.ts

@@ -1,27 +1,22 @@
 import { useEffect, useMemo, useState } from 'react';
 import { useParams, useSearchParams } from 'react-router';
 import useDefaultOrganizationId from 'hooks/useDefaultOrganizationId';
-import {
-  CourseListItem,
-  CourseOrderResourceQuery,
-  CourseProductRelation,
-  Organization,
-} from 'types/Joanie';
+import { CourseListItem, CourseOrderResourceQuery, Offering, Organization } from 'types/Joanie';
 
 export type CourseLearnersParams = {
   courseId: CourseListItem['id'];
-  courseProductRelationId?: CourseProductRelation['id'];
+  offeringId?: Offering['id'];
   organizationId?: Organization['id'];
 };
 
 const useCourseLearnersFilters = () => {
-  const { courseId, courseProductRelationId } = useParams<CourseLearnersParams>();
+  const { courseId, offeringId } = useParams<CourseLearnersParams>();
   const [searchParams] = useSearchParams();
   const searchFilters: CourseOrderResourceQuery = useMemo(() => {
     return {
       course_id: courseId,
       organization_id: searchParams.get('organization_id') || undefined,
-      course_product_relation_id: searchParams.get('course_product_relation_id') || undefined,
+      offering_id: searchParams.get('offering_id') || undefined,
     };
   }, Array.from(searchParams.entries()));
 
@@ -32,7 +27,7 @@ const useCourseLearnersFilters = () => {
     return {
       ...searchFilters,
       organization_id: defaultOrganizationId,
-      course_product_relation_id: courseProductRelationId,
+      offering_id: offeringId,
     };
   }, [defaultOrganizationId]);
   const [filters, setFilters] = useState<CourseOrderResourceQuery>(initialFilters);

package/js/pages/TeacherDashboardCourseLearnersLayout/index.spec.tsx

@@ -4,7 +4,7 @@ import userEvent from '@testing-library/user-event';
 import queryString from 'query-string';
 import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
 import {
-  CourseProductRelationFactory,
+  OfferingFactory,
   NestedCourseOrderFactory,
   OrganizationFactory,
 } from 'utils/test/factories/joanie';
@@ -49,47 +49,44 @@ describe('pages/TeacherDashboardCourseLearnersLayout', () => {
       organizationFilterShouldBeDisplayed: true,
     },
   ])('$expectedLabel', async ({ nbOrganization, organizationFilterShouldBeDisplayed }) => {
-    const courseProductRelation = CourseProductRelationFactory().one();
+    const offering = OfferingFactory().one();
     const organizationList = OrganizationFactory().many(nbOrganization);
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/organizations/?course_product_relation_id=${courseProductRelation.id}`,
+      `https://joanie.endpoint/api/v1.0/organizations/?offering_id=${offering.id}`,
       organizationList,
     );
 
     // Course sidebar query
-    fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/course-product-relations/${courseProductRelation.id}/`,
-      {},
-    );
+    fetchMock.get(`https://joanie.endpoint/api/v1.0/offerings/${offering.id}/`, {});
 
     // First request before finding default organizationId
     const courseOrderListQueryParams = {
-      course_product_relation_id: courseProductRelation.id,
+      offering_id: offering.id,
       page: 1,
       page_size: PER_PAGE.courseLearnerList,
     };
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/courses/${courseProductRelation.course.id}/orders/?${queryString.stringify(courseOrderListQueryParams, { sort: false })}`,
+      `https://joanie.endpoint/api/v1.0/courses/${offering.course.id}/orders/?${queryString.stringify(courseOrderListQueryParams, { sort: false })}`,
       [],
     );
 
     if (organizationList.length > 0) {
       // Course sidebar query
       fetchMock.get(
-        `https://joanie.endpoint/api/v1.0/organizations/${organizationList[0].id}/contracts/?course_product_relation_id=${courseProductRelation.id}&signature_state=half_signed&page=1&page_size=${PER_PAGE.teacherContractList}`,
+        `https://joanie.endpoint/api/v1.0/organizations/${organizationList[0].id}/contracts/?offering_id=${offering.id}&signature_state=half_signed&page=1&page_size=${PER_PAGE.teacherContractList}`,
         [],
       );
 
       // Second request when default organizationId is fetched
       fetchMock.get(
-        `https://joanie.endpoint/api/v1.0/courses/${courseProductRelation.course.id}/orders/?${queryString.stringify({ organization_id: organizationList[0].id, ...courseOrderListQueryParams }, { sort: false })}`,
+        `https://joanie.endpoint/api/v1.0/courses/${offering.course.id}/orders/?${queryString.stringify({ organization_id: organizationList[0].id, ...courseOrderListQueryParams }, { sort: false })}`,
         [],
       );
     }
     render(<TeacherDashboardCourseLearnersLayout />, {
       routerOptions: {
-        path: '/:courseId/:courseProductRelationId',
-        initialEntries: [`/${courseProductRelation.course.id}/${courseProductRelation.id}`],
+        path: '/:courseId/:offeringId',
+        initialEntries: [`/${offering.course.id}/${offering.id}`],
       },
     });
 
@@ -112,45 +109,42 @@ describe('pages/TeacherDashboardCourseLearnersLayout', () => {
   });
 
   it('should call onFiltersChange on organization filter change', async () => {
-    const courseProductRelation = CourseProductRelationFactory().one();
+    const offering = OfferingFactory().one();
     const defaultOrganization = OrganizationFactory().one();
     const otherOrganization = OrganizationFactory().one();
     const organizationList = [defaultOrganization, otherOrganization];
 
     // Course sidebar queries
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/organizations/${defaultOrganization.id}/contracts/?course_product_relation_id=${courseProductRelation.id}&signature_state=half_signed&page=1&page_size=${PER_PAGE.teacherContractList}`,
+      `https://joanie.endpoint/api/v1.0/organizations/${defaultOrganization.id}/contracts/?offering_id=${offering.id}&signature_state=half_signed&page=1&page_size=${PER_PAGE.teacherContractList}`,
       [],
     );
-    fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/course-product-relations/${courseProductRelation.id}/`,
-      {},
-    );
+    fetchMock.get(`https://joanie.endpoint/api/v1.0/offerings/${offering.id}/`, {});
 
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/organizations/?course_product_relation_id=${courseProductRelation.id}`,
+      `https://joanie.endpoint/api/v1.0/organizations/?offering_id=${offering.id}`,
       organizationList,
     );
     // First request before finding default organizationId
     const courseOrderListQueryParams = {
-      course_product_relation_id: courseProductRelation.id,
+      offering_id: offering.id,
       page: 1,
       page_size: PER_PAGE.courseLearnerList,
     };
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/courses/${courseProductRelation.course.id}/orders/?${queryString.stringify(courseOrderListQueryParams, { sort: false })}`,
+      `https://joanie.endpoint/api/v1.0/courses/${offering.course.id}/orders/?${queryString.stringify(courseOrderListQueryParams, { sort: false })}`,
       [],
     );
     // Second request when default organizationId is fetched
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/courses/${courseProductRelation.course.id}/orders/?${queryString.stringify({ organization_id: defaultOrganization.id, ...courseOrderListQueryParams }, { sort: false })}`,
+      `https://joanie.endpoint/api/v1.0/courses/${offering.course.id}/orders/?${queryString.stringify({ organization_id: defaultOrganization.id, ...courseOrderListQueryParams }, { sort: false })}`,
       [],
     );
 
     render(<TeacherDashboardCourseLearnersLayout />, {
       routerOptions: {
-        path: '/:courseId/:courseProductRelationId',
-        initialEntries: [`/${courseProductRelation.course.id}/${courseProductRelation.id}`],
+        path: '/:courseId/:offeringId',
+        initialEntries: [`/${offering.course.id}/${offering.id}`],
       },
     });
 
@@ -164,60 +158,57 @@ describe('pages/TeacherDashboardCourseLearnersLayout', () => {
     const optionToSelect = screen.getByRole('option', { name: organizationList[1].title });
 
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/courses/${courseProductRelation.course.id}/orders/?${queryString.stringify({ organization_id: otherOrganization.id, ...courseOrderListQueryParams }, { sort: false })}`,
+      `https://joanie.endpoint/api/v1.0/courses/${offering.course.id}/orders/?${queryString.stringify({ organization_id: otherOrganization.id, ...courseOrderListQueryParams }, { sort: false })}`,
       [],
     );
     await user.click(optionToSelect);
     // onload default value is undefine and is onFiltersChange called once
     expect(
       fetchMock.called(
-        `https://joanie.endpoint/api/v1.0/courses/${courseProductRelation.course.id}/orders/?${queryString.stringify({ organization_id: otherOrganization.id, ...courseOrderListQueryParams }, { sort: false })}`,
+        `https://joanie.endpoint/api/v1.0/courses/${offering.course.id}/orders/?${queryString.stringify({ organization_id: otherOrganization.id, ...courseOrderListQueryParams }, { sort: false })}`,
       ),
     ).toBe(true);
   });
 
-  it('should render a list of course learners for a course product relation', async () => {
+  it('should render a list of course learners for an offering', async () => {
     const defaultOrganization = OrganizationFactory().one();
     const otherOrganization = OrganizationFactory().one();
     const organizationList = [defaultOrganization, otherOrganization];
-    const courseProductRelation = CourseProductRelationFactory().one();
+    const offering = OfferingFactory().one();
     const courseOrderList = NestedCourseOrderFactory().many(3);
 
     // Course sidebar queries
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/organizations/${defaultOrganization.id}/contracts/?course_product_relation_id=${courseProductRelation.id}&signature_state=half_signed&page=1&page_size=${PER_PAGE.teacherContractList}`,
+      `https://joanie.endpoint/api/v1.0/organizations/${defaultOrganization.id}/contracts/?offering_id=${offering.id}&signature_state=half_signed&page=1&page_size=${PER_PAGE.teacherContractList}`,
       [],
     );
-    fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/course-product-relations/${courseProductRelation.id}/`,
-      {},
-    );
+    fetchMock.get(`https://joanie.endpoint/api/v1.0/offerings/${offering.id}/`, {});
 
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/organizations/?course_product_relation_id=${courseProductRelation.id}`,
+      `https://joanie.endpoint/api/v1.0/organizations/?offering_id=${offering.id}`,
       organizationList,
     );
 
     // First request before finding default organizationId
     const courseOrderListQueryParams = {
-      course_product_relation_id: courseProductRelation.id,
+      offering_id: offering.id,
       page: 1,
       page_size: PER_PAGE.courseLearnerList,
     };
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/courses/${courseProductRelation.course.id}/orders/?${queryString.stringify(courseOrderListQueryParams, { sort: false })}`,
+      `https://joanie.endpoint/api/v1.0/courses/${offering.course.id}/orders/?${queryString.stringify(courseOrderListQueryParams, { sort: false })}`,
       courseOrderList,
     );
     // Second request when default organizationId is fetched
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/courses/${courseProductRelation.course.id}/orders/?${queryString.stringify({ organization_id: defaultOrganization.id, ...courseOrderListQueryParams }, { sort: false })}`,
+      `https://joanie.endpoint/api/v1.0/courses/${offering.course.id}/orders/?${queryString.stringify({ organization_id: defaultOrganization.id, ...courseOrderListQueryParams }, { sort: false })}`,
       courseOrderList,
     );
 
     render(<TeacherDashboardCourseLearnersLayout />, {
       routerOptions: {
-        path: '/:courseId/:courseProductRelationId',
-        initialEntries: [`/${courseProductRelation.course.id}/${courseProductRelation.id}`],
+        path: '/:courseId/:offeringId',
+        initialEntries: [`/${offering.course.id}/${offering.id}`],
       },
     });
 
@@ -239,42 +230,39 @@ describe('pages/TeacherDashboardCourseLearnersLayout', () => {
 
   it('should render a list of course learners for an organization', async () => {
     const organization = OrganizationFactory().one();
-    const courseProductRelation = CourseProductRelationFactory().one();
+    const offering = OfferingFactory().one();
     const courseOrderList = NestedCourseOrderFactory().many(3);
 
     // Course sidebar queries
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/contracts/?course_product_relation_id=${courseProductRelation.id}&signature_state=half_signed&page=1&page_size=${PER_PAGE.teacherContractList}`,
+      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/contracts/?offering_id=${offering.id}&signature_state=half_signed&page=1&page_size=${PER_PAGE.teacherContractList}`,
       [],
     );
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/course-product-relations/${courseProductRelation.id}/`,
+      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/offerings/${offering.id}/`,
       {},
     );
 
     // before default organization's fetched, we query all organization to decide if we should display organization filter or not.
-    fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/organizations/?course_product_relation_id=${courseProductRelation.id}`,
-      [organization],
-    );
+    fetchMock.get(`https://joanie.endpoint/api/v1.0/organizations/?offering_id=${offering.id}`, [
+      organization,
+    ]);
 
     const courseOrderListQueryParams = {
       organization_id: organization.id,
-      course_product_relation_id: courseProductRelation.id,
+      offering_id: offering.id,
       page: 1,
       page_size: PER_PAGE.courseLearnerList,
     };
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/courses/${courseProductRelation.course.id}/orders/?${queryString.stringify(courseOrderListQueryParams, { sort: false })}`,
+      `https://joanie.endpoint/api/v1.0/courses/${offering.course.id}/orders/?${queryString.stringify(courseOrderListQueryParams, { sort: false })}`,
       courseOrderList,
     );
 
     render(<TeacherDashboardCourseLearnersLayout />, {
       routerOptions: {
-        path: '/:organizationId/:courseId/:courseProductRelationId',
-        initialEntries: [
-          `/${organization.id}/${courseProductRelation.course.id}/${courseProductRelation.id}`,
-        ],
+        path: '/:organizationId/:courseId/:offeringId',
+        initialEntries: [`/${organization.id}/${offering.course.id}/${offering.id}`],
       },
     });
 
@@ -294,41 +282,38 @@ describe('pages/TeacherDashboardCourseLearnersLayout', () => {
 
   it('should render an empty table if there are no course learners', async () => {
     const organization = OrganizationFactory().one();
-    const courseProductRelation = CourseProductRelationFactory().one();
+    const offering = OfferingFactory().one();
 
     // Course sidebar queries
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/contracts/?course_product_relation_id=${courseProductRelation.id}&signature_state=half_signed&page=1&page_size=${PER_PAGE.teacherContractList}`,
+      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/contracts/?offering_id=${offering.id}&signature_state=half_signed&page=1&page_size=${PER_PAGE.teacherContractList}`,
       [],
     );
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/course-product-relations/${courseProductRelation.id}/`,
+      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/offerings/${offering.id}/`,
       {},
     );
 
     // before default organization's fetched, we query all organization to decide if we should display organization filter or not.
-    fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/organizations/?course_product_relation_id=${courseProductRelation.id}`,
-      [organization],
-    );
+    fetchMock.get(`https://joanie.endpoint/api/v1.0/organizations/?offering_id=${offering.id}`, [
+      organization,
+    ]);
 
     const courseOrderListQueryParams = {
       organization_id: organization.id,
-      course_product_relation_id: courseProductRelation.id,
+      offering_id: offering.id,
       page: 1,
       page_size: PER_PAGE.courseLearnerList,
     };
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/courses/${courseProductRelation.course.id}/orders/?${queryString.stringify(courseOrderListQueryParams, { sort: false })}`,
+      `https://joanie.endpoint/api/v1.0/courses/${offering.course.id}/orders/?${queryString.stringify(courseOrderListQueryParams, { sort: false })}`,
       [],
     );
 
     render(<TeacherDashboardCourseLearnersLayout />, {
       routerOptions: {
-        path: '/:organizationId/:courseId/:courseProductRelationId',
-        initialEntries: [
-          `/${organization.id}/${courseProductRelation.course.id}/${courseProductRelation.id}`,
-        ],
+        path: '/:organizationId/:courseId/:offeringId',
+        initialEntries: [`/${organization.id}/${offering.course.id}/${offering.id}`],
       },
     });
 
@@ -341,41 +326,38 @@ describe('pages/TeacherDashboardCourseLearnersLayout', () => {
 
   it('should render an error banner if an error occured during course learners fetching', async () => {
     const organization = OrganizationFactory().one();
-    const courseProductRelation = CourseProductRelationFactory().one();
+    const offering = OfferingFactory().one();
 
     // Course sidebar queries
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/contracts/?course_product_relation_id=${courseProductRelation.id}&signature_state=half_signed&page=1&page_size=${PER_PAGE.teacherContractList}`,
+      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/contracts/?offering_id=${offering.id}&signature_state=half_signed&page=1&page_size=${PER_PAGE.teacherContractList}`,
       [],
     );
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/course-product-relations/${courseProductRelation.id}/`,
+      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/offerings/${offering.id}/`,
       {},
     );
 
     // before default organization's fetched, we query all organization to decide if we should display organization filter or not.
-    fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/organizations/?course_product_relation_id=${courseProductRelation.id}`,
-      [organization],
-    );
+    fetchMock.get(`https://joanie.endpoint/api/v1.0/organizations/?offering_id=${offering.id}`, [
+      organization,
+    ]);
 
     const courseOrderListQueryParams = {
       organization_id: organization.id,
-      course_product_relation_id: courseProductRelation.id,
+      offering_id: offering.id,
       page: 1,
       page_size: PER_PAGE.courseLearnerList,
     };
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/courses/${courseProductRelation.course.id}/orders/?${queryString.stringify(courseOrderListQueryParams, { sort: false })}`,
+      `https://joanie.endpoint/api/v1.0/courses/${offering.course.id}/orders/?${queryString.stringify(courseOrderListQueryParams, { sort: false })}`,
       new Response('', { status: HttpStatusCode.NOT_FOUND }),
     );
 
     render(<TeacherDashboardCourseLearnersLayout />, {
       routerOptions: {
-        path: '/:organizationId/:courseId/:courseProductRelationId',
-        initialEntries: [
-          `/${organization.id}/${courseProductRelation.course.id}/${courseProductRelation.id}`,
-        ],
+        path: '/:organizationId/:courseId/:offeringId',
+        initialEntries: [`/${organization.id}/${offering.course.id}/${offering.id}`],
       },
     });
 

package/js/pages/TeacherDashboardCourseLearnersLayout/index.tsx

@@ -65,7 +65,7 @@ export const TeacherDashboardCourseLearnersLayout = () => {
   const {
     items: organizations,
     states: { isFetched: isOrganizationFetched },
-  } = useOrganizations({ course_product_relation_id: filters.course_product_relation_id });
+  } = useOrganizations({ offering_id: filters.offering_id });
   const {
     items: courseOrders,
     meta,

package/js/pages/TeacherDashboardCoursesLoader/index.spec.tsx

@@ -2,7 +2,7 @@ import { screen, waitFor } from '@testing-library/react';
 import fetchMock from 'fetch-mock';
 import userEvent from '@testing-library/user-event';
 import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
-import { CourseListItemFactory, CourseProductRelationFactory } from 'utils/test/factories/joanie';
+import { CourseListItemFactory, OfferingFactory } from 'utils/test/factories/joanie';
 import { expectNoSpinner } from 'utils/test/expectSpinner';
 import { mockPaginatedResponse } from 'utils/test/mockPaginatedResponse';
 import { PER_PAGE } from 'settings';
@@ -48,19 +48,19 @@ describe('components/TeacherDashboardCoursesLoader', () => {
       mockPaginatedResponse(CourseListItemFactory().many(15), 15, false),
     );
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/course-product-relations/?product_type=credential&page=1&page_size=${perPage}`,
-      mockPaginatedResponse(CourseProductRelationFactory().many(15), 15, false),
+      `https://joanie.endpoint/api/v1.0/offerings/?product_type=credential&page=1&page_size=${perPage}`,
+      mockPaginatedResponse(OfferingFactory().many(15), 15, false),
     );
 
     render(<TeacherDashboardCoursesLoader />);
     await expectNoSpinner('Loading courses...');
 
     nbApiCalls += 1; // course api call
-    nbApiCalls += 1; // course-product-relations api call
+    nbApiCalls += 1; // offerings api call
     const calledUrls = fetchMock.calls().map((call) => call[0]);
     expect(calledUrls).toHaveLength(nbApiCalls);
     expect(calledUrls).toContain(
-      `https://joanie.endpoint/api/v1.0/course-product-relations/?product_type=credential&page=1&page_size=${perPage}`,
+      `https://joanie.endpoint/api/v1.0/offerings/?product_type=credential&page=1&page_size=${perPage}`,
     );
 
     // section titles
@@ -80,8 +80,8 @@ describe('components/TeacherDashboardCoursesLoader', () => {
       mockPaginatedResponse(CourseListItemFactory().many(15), 15, false),
     );
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/course-product-relations/?product_type=credential&page=1&page_size=${perPage}`,
-      mockPaginatedResponse(CourseProductRelationFactory().many(15), 15, false),
+      `https://joanie.endpoint/api/v1.0/offerings/?product_type=credential&page=1&page_size=${perPage}`,
+      mockPaginatedResponse(OfferingFactory().many(15), 15, false),
     );
 
     render(<TeacherDashboardCoursesLoader />);
@@ -93,22 +93,22 @@ describe('components/TeacherDashboardCoursesLoader', () => {
       mockPaginatedResponse(CourseListItemFactory().many(5), 5, false),
     );
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/course-product-relations/?query=text+query&product_type=credential&page=1&page_size=${perPage}`,
-      mockPaginatedResponse(CourseProductRelationFactory().many(5), 5, false),
+      `https://joanie.endpoint/api/v1.0/offerings/?query=text+query&product_type=credential&page=1&page_size=${perPage}`,
+      mockPaginatedResponse(OfferingFactory().many(5), 5, false),
     );
     const user = userEvent.setup();
     await user.type(screen.getByRole('textbox', { name: /Search/ }), 'text query');
     await user.click(screen.getByRole('button', { name: /Search/ }));
 
     nbApiCalls = 1; // course api call
-    nbApiCalls += 1; // course-product-relations api call
+    nbApiCalls += 1; // offerings api call
     const calledUrls = fetchMock.calls().map((call) => call[0]);
     expect(calledUrls).toHaveLength(nbApiCalls);
     expect(calledUrls).toContain(
       `https://joanie.endpoint/api/v1.0/courses/?query=text+query&has_listed_course_runs=true&page=1&page_size=${perPage}`,
     );
     expect(calledUrls).toContain(
-      `https://joanie.endpoint/api/v1.0/course-product-relations/?query=text+query&product_type=credential&page=1&page_size=${perPage}`,
+      `https://joanie.endpoint/api/v1.0/offerings/?query=text+query&product_type=credential&page=1&page_size=${perPage}`,
     );
 
     await waitFor(() => {