richie-education 3.1.2 → 3.1.3-dev12

package/js/api/joanie.ts

@@ -127,8 +127,8 @@ export const getRoutes = () => {
     },
     organizations: {
       get: `${baseUrl}/organizations/:id/`,
-      courseProductRelations: {
-        get: `${baseUrl}/organizations/:organization_id/course-product-relations/:id/`,
+      offers: {
+        get: `${baseUrl}/organizations/:organization_id/offers/:id/`,
       },
       courses: {
         get: `${baseUrl}/organizations/:organization_id/courses/:id/`,
@@ -156,8 +156,8 @@ export const getRoutes = () => {
     courseRuns: {
       get: `${baseUrl}/course-runs/:id/`,
     },
-    courseProductRelations: {
-      get: `${baseUrl}/course-product-relations/:id/`,
+    offers: {
+      get: `${baseUrl}/offers/:id/`,
     },
     contractDefinitions: {
       previewTemplate: `${baseUrl}/contract_definitions/:id/preview_template/`,
@@ -470,12 +470,12 @@ const API = (): Joanie.API => {
         ).then(checkStatus);
       },
     },
-    courseProductRelations: {
-      get: (filters?: Joanie.CourseProductRelationQueryFilters) => {
+    offers: {
+      get: (filters?: Joanie.OfferQueryFilters) => {
         return fetchWithJWT(
           filters?.organization_id
-            ? buildApiUrl(ROUTES.organizations.courseProductRelations.get, filters)
-            : buildApiUrl(ROUTES.courseProductRelations.get, filters),
+            ? buildApiUrl(ROUTES.organizations.offers.get, filters)
+            : buildApiUrl(ROUTES.offers.get, filters),
         ).then(checkStatus);
       },
     },

package/js/components/ContractFrame/OrganizationContractFrame.spec.tsx

@@ -6,14 +6,10 @@ import { IntlProvider } from 'react-intl';
 import fetchMock from 'fetch-mock';
 import { QueryStateFactory } from 'utils/test/factories/reactQuery';
 import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
-import {
-  ContractFactory,
-  CourseProductRelationFactory,
-  OrganizationFactory,
-} from 'utils/test/factories/joanie';
+import { ContractFactory, OfferFactory, OrganizationFactory } from 'utils/test/factories/joanie';
 import { createTestQueryClient } from 'utils/test/createTestQueryClient';
 import JoanieSessionProvider from 'contexts/SessionContext/JoanieSessionProvider';
-import { isCourseProductRelation } from 'types/Joanie';
+import { isOffer } from 'types/Joanie';
 import { Props } from './AbstractContractFrame';
 import { OrganizationContractFrame } from '.';
 
@@ -77,31 +73,28 @@ describe('OrganizationContractFrame', () => {
 
   it.each([
     {
-      label: 'contractList: undefined, courseProductRelation: undefined',
+      label: 'contractList: undefined, offer: undefined',
       contractList: undefined,
-      courseProductRelation: undefined,
+      offer: undefined,
     },
     {
-      label: 'contractList: 2 Contract, courseProductRelation: undefined',
+      label: 'contractList: 2 Contract, offer: undefined',
       contractList: ContractFactory().many(2),
-      courseProductRelation: undefined,
+      offer: undefined,
     },
     {
-      label: 'contractList: undefined, courseProductRelation: one CourseProductRelation',
+      label: 'contractList: undefined, offer: one Offer',
       contractList: undefined,
-      courseProductRelation: CourseProductRelationFactory().one(),
+      offer: OfferFactory().one(),
     },
   ])(
     'should implement AbstractContractFrame for organization and $label',
-    async ({ contractList, courseProductRelation }) => {
+    async ({ contractList, offer }) => {
       const organization = OrganizationFactory().one();
       const contracts = contractList || ContractFactory().many(2);
       const isOpen = faker.datatype.boolean();
 
-      const invitationLinkQueryString =
-        courseProductRelation && isCourseProductRelation(courseProductRelation)
-          ? `?course_product_relation_ids=${courseProductRelation.id}`
-          : '';
+      const invitationLinkQueryString = offer && isOffer(offer) ? `?offer_ids=${offer.id}` : '';
       const expectedUrls = {
         getInvitationLink: `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/contracts-signature-link/${invitationLinkQueryString}`,
         checkSignature: `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/contracts/?id=${contracts[0].id}&id=${contracts[1].id}`,
@@ -133,9 +126,7 @@ describe('OrganizationContractFrame', () => {
           <Wrapper client={client}>
             <OrganizationContractFrame
               organizationId={organization.id}
-              courseProductRelationIds={
-                courseProductRelation ? [courseProductRelation.id] : undefined
-              }
+              offerIds={offer ? [offer.id] : undefined}
               isOpen={isOpen}
               onDone={handleDone}
               onClose={handleClose}

package/js/components/ContractFrame/OrganizationContractFrame.tsx

@@ -4,17 +4,17 @@ import { useJoanieApi } from 'contexts/JoanieApiContext';
 import AbstractContractFrame, {
   AbstractProps,
 } from 'components/ContractFrame/AbstractContractFrame';
-import { Contract, CourseProductRelation } from 'types/Joanie';
+import { Contract, Offer } from 'types/Joanie';
 
 interface Props extends AbstractProps {
   contractIds?: Contract['id'][];
   organizationId: string;
-  courseProductRelationIds?: CourseProductRelation['id'][];
+  offerIds?: Offer['id'][];
 }
 
 const OrganizationContractFrame = ({
   organizationId,
-  courseProductRelationIds = [],
+  offerIds = [],
   contractIds,
   onDone,
   ...props
@@ -29,7 +29,7 @@ const OrganizationContractFrame = ({
      be signed. We need to keep track of these ids to check if all contracts have been signed.
      */
     const response = await api.organizations.contracts.getSignatureLinks({
-      course_product_relation_ids: courseProductRelationIds,
+      offer_ids: offerIds,
       organization_id: organizationId,
       contracts_ids: contractIds,
     });

package/js/components/CourseGlimpse/utils.ts

@@ -6,23 +6,18 @@ import {
   Course as RichieCourse,
   isRichieCourse,
 } from 'types/Course';
-import {
-  CourseListItem as JoanieCourse,
-  CourseProductRelationLight,
-  isCourseProductRelation,
-  ProductType,
-} from 'types/Joanie';
+import { CourseListItem as JoanieCourse, OfferLight, isOffer, ProductType } from 'types/Joanie';
 import { TeacherDashboardPaths } from 'widgets/Dashboard/utils/teacherDashboardPaths';
 import { CourseGlimpseCourse } from '.';
 
-const getCourseGlimpsePropsFromCourseProductRelation = (
-  courseProductRelation: CourseProductRelationLight,
+const getCourseGlimpsePropsFromOffer = (
+  offer: OfferLight,
   intl: IntlShape,
   organizationId?: string,
 ): CourseGlimpseCourse => {
   const courseRouteParams = {
-    courseId: courseProductRelation.course.id,
-    courseProductRelationId: courseProductRelation.id,
+    courseId: offer.course.id,
+    offerId: offer.id,
   };
   const courseRoute = organizationId
     ? generatePath(TeacherDashboardPaths.ORGANIZATION_PRODUCT, {
@@ -31,35 +26,27 @@ const getCourseGlimpsePropsFromCourseProductRelation = (
       })
     : generatePath(TeacherDashboardPaths.COURSE_PRODUCT, courseRouteParams);
   return {
-    id: courseProductRelation.id,
-    code: courseProductRelation.course.code,
-    title: courseProductRelation.product.title,
-    cover_image: courseProductRelation.course.cover
+    id: offer.id,
+    code: offer.course.code,
+    title: offer.product.title,
+    cover_image: offer.course.cover
       ? {
-          src: courseProductRelation.course.cover.src,
+          src: offer.course.cover.src,
         }
       : null,
     organization: {
-      title: courseProductRelation.organizations[0].title,
-      image: courseProductRelation.organizations[0].logo || null,
+      title: offer.organizations[0].title,
+      image: offer.organizations[0].logo || null,
     },
-    product_id: courseProductRelation.product.id,
+    product_id: offer.product.id,
     course_route: courseRoute,
-    state: courseProductRelation.product.state,
+    state: offer.product.state,
     certificate_offer:
-      courseProductRelation.product.type === ProductType.CERTIFICATE
-        ? CourseCertificateOffer.PAID
-        : null,
-    offer: courseProductRelation.product.type === ProductType.CREDENTIAL ? CourseOffer.PAID : null,
-    certificate_price:
-      courseProductRelation.product.type === ProductType.CERTIFICATE
-        ? courseProductRelation.product.price
-        : null,
-    price:
-      courseProductRelation.product.type === ProductType.CREDENTIAL
-        ? courseProductRelation.product.price
-        : null,
-    price_currency: courseProductRelation.product.price_currency,
+      offer.product.type === ProductType.CERTIFICATE ? CourseCertificateOffer.PAID : null,
+    offer: offer.product.type === ProductType.CREDENTIAL ? CourseOffer.PAID : null,
+    certificate_price: offer.product.type === ProductType.CERTIFICATE ? offer.product.price : null,
+    price: offer.product.type === ProductType.CREDENTIAL ? offer.product.price : null,
+    price_currency: offer.product.price_currency,
   };
 };
 
@@ -125,12 +112,12 @@ const getCourseGlimpsePropsFromJoanieCourse = (
 };
 
 export const getCourseGlimpseProps = (
-  course: RichieCourse | (JoanieCourse | CourseProductRelationLight),
+  course: RichieCourse | (JoanieCourse | OfferLight),
   intl?: IntlShape,
   organizationId?: string,
 ): CourseGlimpseCourse => {
-  if (isCourseProductRelation(course)) {
-    return getCourseGlimpsePropsFromCourseProductRelation(course, intl!, organizationId);
+  if (isOffer(course)) {
+    return getCourseGlimpsePropsFromOffer(course, intl!, organizationId);
   }
 
   if (isRichieCourse(course)) {

package/js/components/CourseGlimpseList/utils.ts

@@ -1,10 +1,10 @@
 import { IntlShape } from 'react-intl';
-import { CourseProductRelationLight, CourseListItem as JoanieCourse } from 'types/Joanie';
+import { OfferLight, CourseListItem as JoanieCourse } from 'types/Joanie';
 import { Course as RichieCourse } from 'types/Course';
 import { CourseGlimpseCourse, getCourseGlimpseProps } from 'components/CourseGlimpse';
 
 export const getCourseGlimpseListProps = (
-  courses: RichieCourse[] | (JoanieCourse | CourseProductRelationLight)[],
+  courses: RichieCourse[] | (JoanieCourse | OfferLight)[],
   intl?: IntlShape,
   organizationId?: string,
 ): CourseGlimpseCourse[] => {

package/js/components/PurchaseButton/index.tsx

@@ -42,7 +42,7 @@ const messages = defineMessages({
 
 interface PurchaseButtonPropsBase {
   product: Joanie.CredentialProduct | Joanie.CertificateProduct;
-  orderGroup?: Joanie.OrderGroup;
+  offer?: Joanie.Offer;
   isWithdrawable: boolean;
   disabled?: boolean;
   className?: string;
@@ -66,8 +66,8 @@ interface CertificatePurchaseButtonProps extends PurchaseButtonPropsBase {
 const PurchaseButton = ({
   product,
   course,
+  offer,
   enrollment,
-  orderGroup,
   isWithdrawable,
   organizations,
   disabled = false,
@@ -140,8 +140,8 @@ const PurchaseButton = ({
         {...saleTunnelModal}
         product={product}
         organizations={organizations}
+        offer={offer}
         enrollment={enrollment}
-        orderGroup={orderGroup}
         course={course}
         isWithdrawable={isWithdrawable}
         onFinish={onFinish}

package/js/components/SaleTunnel/CredentialSaleTunnel/index.tsx

@@ -19,9 +19,7 @@ export const CredentialSaleTunnel = (props: CredentialSaleTunnelProps) => {
   );
 };
 
-const CredentialPaymentButton = ({
-  course,
-}: Pick<CredentialSaleTunnelProps, 'course' | 'orderGroup'>) => {
+const CredentialPaymentButton = ({ course }: Pick<CredentialSaleTunnelProps, 'course'>) => {
   return (
     <SubscriptionButton
       buildOrderPayload={(payload) => ({

package/js/components/SaleTunnel/GenericSaleTunnel.tsx

@@ -10,7 +10,7 @@ import {
 } from 'react';
 import { SaleTunnelSponsors } from 'components/SaleTunnel/Sponsors/SaleTunnelSponsors';
 import { SaleTunnelProps } from 'components/SaleTunnel/index';
-import { Address, CreditCard, Order, OrderState, Product } from 'types/Joanie';
+import { Address, Offer, CreditCard, Order, OrderState, Product } from 'types/Joanie';
 import useProductOrder from 'hooks/useProductOrder';
 import { SaleTunnelSuccess } from 'components/SaleTunnel/SaleTunnelSuccess';
 import WebAnalyticsAPIHandler from 'api/web-analytics';
@@ -26,6 +26,7 @@ export interface SaleTunnelContextType {
   order?: Order;
   product: Product;
   webAnalyticsEventKey: string;
+  offer?: Offer;
 
   // internal
   step: SaleTunnelStep;
@@ -113,6 +114,7 @@ export const GenericSaleTunnel = (props: GenericSaleTunnelProps) => {
       webAnalyticsEventKey: props.eventKey,
       order,
       product: props.product,
+      offer: props.offer,
       props,
       billingAddress,
       setBillingAddress,

package/js/components/SaleTunnel/SaleTunnelInformation/index.tsx

@@ -99,7 +99,7 @@ const Email = () => {
 };
 
 const Total = () => {
-  const { product } = useSaleTunnelContext();
+  const { product, offer } = useSaleTunnelContext();
   return (
     <div className="sale-tunnel__total">
       <div className="sale-tunnel__total__amount mt-t" data-testid="sale-tunnel__total__amount">
@@ -108,7 +108,7 @@ const Total = () => {
         </div>
         <div className="block-title">
           <FormattedNumber
-            value={product.price}
+            value={offer?.discounted_price || product.price}
             style="currency"
             currency={product.price_currency}
           />

package/js/components/SaleTunnel/SubscriptionButton/index.tsx

@@ -72,7 +72,7 @@ interface Props {
   buildOrderPayload: (
     payload: Pick<
       OrderCreationPayload,
-      'product_id' | 'billing_address' | 'order_group_id' | 'has_waived_withdrawal_right'
+      'product_id' | 'billing_address' | 'has_waived_withdrawal_right'
     >,
   ) => OrderCreationPayload;
 }
@@ -124,7 +124,6 @@ const SubscriptionButton = ({ buildOrderPayload }: Props) => {
     const payload = buildOrderPayload({
       product_id: product.id,
       billing_address: billingAddress!,
-      order_group_id: saleTunnelProps.orderGroup?.id,
       has_waived_withdrawal_right: hasWaivedWithdrawalRight,
     });
 

package/js/components/SaleTunnel/index.credential.spec.tsx

@@ -1,5 +1,5 @@
 import fetchMock from 'fetch-mock';
-import { act, fireEvent, screen, waitFor } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import queryString from 'query-string';
 import {
   RichieContextFactory as mockRichieContextFactory,
@@ -11,11 +11,9 @@ import {
   AddressFactory,
   CredentialOrderFactory,
   CredentialProductFactory,
-  OrderGroupFactory,
 } from 'utils/test/factories/joanie';
 import type * as Joanie from 'types/Joanie';
-import { Maybe } from 'types/utils';
-import { NOT_CANCELED_ORDER_STATES, OrderCredentialCreationPayload } from 'types/Joanie';
+import { NOT_CANCELED_ORDER_STATES } from 'types/Joanie';
 import { SaleTunnel, SaleTunnelProps } from 'components/SaleTunnel/index';
 import { render } from 'utils/test/render';
 import { getAddressLabel } from 'components/SaleTunnel/AddressSelector';
@@ -83,11 +81,9 @@ describe('SaleTunnel / Credential', () => {
   it('should create an order with an order group', async () => {
     const course = PacedCourseFactory().one();
     const product = CredentialProductFactory().one();
-    const orderGroup = OrderGroupFactory().one();
     const billingAddress: Joanie.Address = AddressFactory({ is_main: true }).one();
 
-    let createOrderPayload: Maybe<OrderCredentialCreationPayload>;
-    const order = CredentialOrderFactory({ order_group_id: orderGroup.id }).one();
+    const order = CredentialOrderFactory().one();
     const orderQueryParameters = {
       course_code: course.code,
       product_id: product.id,
@@ -100,15 +96,12 @@ describe('SaleTunnel / Credential', () => {
         `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/payment-schedule/`,
         [],
       )
-      .post('https://joanie.endpoint/api/v1.0/orders/', (_, { body }) => {
-        createOrderPayload = JSON.parse(body as any);
-        return order;
-      })
+      .post('https://joanie.endpoint/api/v1.0/orders/', order)
       .get('https://joanie.endpoint/api/v1.0/addresses/', [billingAddress], {
         overwriteRoutes: true,
       });
 
-    render(<Wrapper product={product} course={course} orderGroup={orderGroup} />, {
+    render(<Wrapper product={product} course={course} />, {
       queryOptions: { client: createTestQueryClient({ user: richieUser }) },
     });
 
@@ -121,12 +114,5 @@ describe('SaleTunnel / Credential', () => {
 
     // - Payment button should not be disabled.
     expect($button.disabled).toBe(false);
-
-    // - User clicks on pay button
-    await act(async () => {
-      fireEvent.click($button);
-    });
-
-    await waitFor(() => expect(createOrderPayload?.order_group_id).toEqual(orderGroup.id));
   });
 });

package/js/components/SaleTunnel/index.full-process.spec.tsx

@@ -15,7 +15,7 @@ import CourseProductItem from 'widgets/SyllabusCourseRunsList/components/CourseP
 import {
   AddressFactory,
   ContractFactory,
-  CourseProductRelationFactory,
+  OfferFactory,
   CredentialOrderFactory,
   CreditCardFactory,
   PaymentFactory,
@@ -99,7 +99,7 @@ describe('SaleTunnel', () => {
      */
     const course = PacedCourseFactory().one();
     const product = ProductFactory().one();
-    const relation = CourseProductRelationFactory({
+    const offer = OfferFactory({
       course,
       product,
       is_withdrawable: false,
@@ -108,7 +108,7 @@ describe('SaleTunnel', () => {
 
     fetchMock.get(
       `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/`,
-      relation,
+      offer,
     );
     fetchMock.get(
       `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/payment-schedule/`,

package/js/components/SaleTunnel/index.spec.tsx

@@ -15,6 +15,7 @@ import {
   AddressFactory,
   CertificateOrderFactory,
   CertificateProductFactory,
+  OfferFactory,
   CredentialOrderFactory,
   CredentialProductFactory,
   CreditCardFactory,
@@ -432,6 +433,80 @@ describe.each([
         name: StringHelper.capitalizeFirst(installment.state.replace('_', ' '))!,
       });
     });
+
+    const $totalAmount = screen.getByTestId('sale-tunnel__total__amount');
+    expect($totalAmount).toHaveTextContent(
+      'Total' + formatPrice(product.price, product.price_currency).replace(/(\u202F|\u00a0)/g, ' '),
+    );
+  });
+
+  it('should show the product payment schedule with discounted price', async () => {
+    const intl = createIntl({ locale: 'en' });
+    const schedule = PaymentInstallmentFactory().many(2);
+
+    const offer = OfferFactory({
+      product: ProductFactory({
+        price: 840,
+        price_currency: 'EUR',
+      }).one(),
+      discounted_price: 800,
+      discount_rate: 0.3,
+    }).one();
+    const { product } = offer;
+
+    fetchMock
+      .get(
+        `https://joanie.endpoint/api/v1.0/orders/?${queryString.stringify(getFetchOrderQueryParams(product))}`,
+        [],
+      )
+      .get(
+        `https://joanie.endpoint/api/v1.0/courses/${course.code}/products/${product.id}/payment-schedule/`,
+        schedule,
+      );
+
+    render(<Wrapper product={product} offer={offer} isWithdrawable={true} />, {
+      queryOptions: { client: createTestQueryClient({ user: richieUser }) },
+    });
+
+    await screen.findByRole('heading', {
+      level: 4,
+      name: 'Payment schedule',
+    });
+
+    const scheduleTable = screen.getByRole('table');
+    const scheduleTableRows = within(scheduleTable).getAllByRole('row');
+    expect(scheduleTableRows).toHaveLength(schedule.length);
+
+    scheduleTableRows.forEach((row, index) => {
+      const installment = schedule[index];
+      // A first column should show the installment index
+      within(row).getByRole('cell', {
+        name: (index + 1).toString(),
+      });
+      // A 2nd column should show the installment amount
+      within(row).getByRole('cell', {
+        name: formatPrice(installment.amount, installment.currency),
+      });
+      // A 3rd column should show the installment withdraw date
+      within(row).getByRole('cell', {
+        name: `Withdrawn on ${intl.formatDate(installment.due_date, {
+          ...DEFAULT_DATE_FORMAT,
+        })}`,
+      });
+      // A 4th column should show the installment state
+      within(row).getByRole('cell', {
+        name: StringHelper.capitalizeFirst(installment.state.replace('_', ' '))!,
+      });
+    });
+
+    const $totalAmount = screen.getByTestId('sale-tunnel__total__amount');
+    expect($totalAmount).toHaveTextContent(
+      'Total' +
+        formatPrice(offer!.discounted_price!, product.price_currency).replace(
+          /(\u202F|\u00a0)/g,
+          ' ',
+        ),
+    );
   });
 
   it('should show a walkthrough to explain the subscription process', async () => {

package/js/components/SaleTunnel/index.stories.tsx

@@ -15,7 +15,6 @@ export default {
       isWithdrawable: true,
       // enrollment?: Enrollment;
       // product: CredentialProduct | CertificateProduct;
-      // orderGroup?: OrderGroup;
       // onFinish?: (order: Order) => void;
     };
     return (

package/js/components/SaleTunnel/index.tsx

@@ -2,10 +2,10 @@ import { ModalProps } from '@openfun/cunningham-react';
 import {
   CertificateProduct,
   CourseLight,
+  Offer,
   CredentialProduct,
   Enrollment,
   Order,
-  OrderGroup,
   Organization,
   Product,
   ProductType,
@@ -16,11 +16,11 @@ import { PacedCourse } from 'types';
 
 export interface SaleTunnelProps extends Pick<ModalProps, 'isOpen' | 'onClose'> {
   product: Product;
+  offer?: Offer;
   organizations?: Organization[];
   isWithdrawable: boolean;
   course?: PacedCourse | CourseLight;
   enrollment?: Enrollment;
-  orderGroup?: OrderGroup;
   onFinish?: (order: Order) => void;
 }
 

package/js/components/TeacherDashboardCourseList/index.spec.tsx

@@ -1,7 +1,7 @@
 import { screen } from '@testing-library/react';
 import fetchMock from 'fetch-mock';
 import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
-import { CourseListItemFactory, CourseProductRelationFactory } from 'utils/test/factories/joanie';
+import { CourseListItemFactory, OfferFactory } from 'utils/test/factories/joanie';
 import { render } from 'utils/test/render';
 import { setupJoanieSession } from 'utils/test/wrappers/JoanieAppWrapper';
 import { expectNoSpinner, expectSpinner } from 'utils/test/expectSpinner';
@@ -35,7 +35,7 @@ describe('components/TeacherDashboardCourseList', () => {
   });
 
   it('should render loading more state', async () => {
-    const trainings = CourseProductRelationFactory().many(2);
+    const trainings = OfferFactory().many(2);
     const courses = CourseListItemFactory().many(2);
     const courseAndProductList = [...courses, ...trainings];
 
@@ -60,7 +60,7 @@ describe('components/TeacherDashboardCourseList', () => {
   });
 
   it('should render courses and products list', async () => {
-    const trainings = CourseProductRelationFactory().many(2);
+    const trainings = OfferFactory().many(2);
     const courses = CourseListItemFactory().many(2);
     const courseAndProductList = [...courses, ...trainings];
 

package/js/components/TeacherDashboardCourseList/index.tsx

@@ -6,7 +6,7 @@ import { CourseGlimpseList, getCourseGlimpseListProps } from 'components/CourseG
 import { Spinner } from 'components/Spinner';
 import context from 'utils/context';
 import { useIntersectionObserver } from 'hooks/useIntersectionObserver';
-import { CourseListItem, CourseProductRelationLight } from 'types/Joanie';
+import { CourseListItem, OfferLight } from 'types/Joanie';
 import Banner from 'components/Banner';
 
 const messages = defineMessages({
@@ -31,7 +31,7 @@ interface TeacherDashboardCourseListProps {
   titleTranslated?: string;
   organizationId?: string;
   loadMore: () => void;
-  courseAndProductList?: (CourseListItem | CourseProductRelationLight)[];
+  courseAndProductList?: (CourseListItem | OfferLight)[];
   isLoadingMore?: boolean;
   hasMore?: boolean;
   isNewSearchLoading?: boolean;

package/js/hooks/useContractArchive/index.ts

@@ -1,5 +1,5 @@
 import { useJoanieApi } from 'contexts/JoanieApiContext';
-import { CourseProductRelation, Organization } from 'types/Joanie';
+import { Offer, Organization } from 'types/Joanie';
 import { browserDownloadFromBlob } from 'utils/download';
 import { HttpStatusCode } from 'utils/errors/HttpError';
 import { handle } from 'utils/errors/handle';
@@ -53,11 +53,11 @@ const useContractArchive = () => {
       },
       create: async (
         organizationId?: Organization['id'],
-        courseProductRelationId?: CourseProductRelation['id'],
+        offerId?: Offer['id'],
       ): Promise<string> => {
         const response = await api.user.contracts.zip_archive.create({
           organization_id: organizationId,
-          course_product_relation_id: courseProductRelationId,
+          offer_id: offerId,
         });
 
         return extractArchiveId(response.url);