richie 3.1.3.dev15__py2.py3-none-any.whl → 3.1.3.dev23__py2.py3-none-any.whl

frontend/js/api/joanie.ts

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

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

@@ -6,10 +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, OfferFactory, OrganizationFactory } from 'utils/test/factories/joanie';
+import { ContractFactory, OfferingFactory, OrganizationFactory } from 'utils/test/factories/joanie';
 import { createTestQueryClient } from 'utils/test/createTestQueryClient';
 import JoanieSessionProvider from 'contexts/SessionContext/JoanieSessionProvider';
-import { isOffer } from 'types/Joanie';
+import { isOffering } from 'types/Joanie';
 import { Props } from './AbstractContractFrame';
 import { OrganizationContractFrame } from '.';
 
@@ -73,28 +73,29 @@ describe('OrganizationContractFrame', () => {
 
   it.each([
     {
-      label: 'contractList: undefined, offer: undefined',
+      label: 'contractList: undefined, offering: undefined',
       contractList: undefined,
-      offer: undefined,
+      offering: undefined,
     },
     {
-      label: 'contractList: 2 Contract, offer: undefined',
+      label: 'contractList: 2 Contract, offering: undefined',
       contractList: ContractFactory().many(2),
-      offer: undefined,
+      offering: undefined,
     },
     {
-      label: 'contractList: undefined, offer: one Offer',
+      label: 'contractList: undefined, offering: one Offering',
       contractList: undefined,
-      offer: OfferFactory().one(),
+      offering: OfferingFactory().one(),
     },
   ])(
     'should implement AbstractContractFrame for organization and $label',
-    async ({ contractList, offer }) => {
+    async ({ contractList, offering }) => {
       const organization = OrganizationFactory().one();
       const contracts = contractList || ContractFactory().many(2);
       const isOpen = faker.datatype.boolean();
 
-      const invitationLinkQueryString = offer && isOffer(offer) ? `?offer_ids=${offer.id}` : '';
+      const invitationLinkQueryString =
+        offering && isOffering(offering) ? `?offering_ids=${offering.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}`,
@@ -126,7 +127,7 @@ describe('OrganizationContractFrame', () => {
           <Wrapper client={client}>
             <OrganizationContractFrame
               organizationId={organization.id}
-              offerIds={offer ? [offer.id] : undefined}
+              offeringIds={offering ? [offering.id] : undefined}
               isOpen={isOpen}
               onDone={handleDone}
               onClose={handleClose}

frontend/js/components/ContractFrame/OrganizationContractFrame.tsx

@@ -4,17 +4,17 @@ import { useJoanieApi } from 'contexts/JoanieApiContext';
 import AbstractContractFrame, {
   AbstractProps,
 } from 'components/ContractFrame/AbstractContractFrame';
-import { Contract, Offer } from 'types/Joanie';
+import { Contract, Offering } from 'types/Joanie';
 
 interface Props extends AbstractProps {
   contractIds?: Contract['id'][];
   organizationId: string;
-  offerIds?: Offer['id'][];
+  offeringIds?: Offering['id'][];
 }
 
 const OrganizationContractFrame = ({
   organizationId,
-  offerIds = [],
+  offeringIds = [],
   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({
-      offer_ids: offerIds,
+      offering_ids: offeringIds,
       organization_id: organizationId,
       contracts_ids: contractIds,
     });

frontend/js/components/CourseGlimpse/index.spec.tsx

@@ -59,6 +59,8 @@ describe('widgets/Search/components/CourseGlimpse', () => {
     certificate_offer: CourseCertificateOffer.FREE,
     certificate_price: null,
     price_currency: 'EUR',
+    discounted_price: null,
+    discount: null,
   };
 
   const contextProps: CommonDataProps['context'] = RichieContextFactory().one();

frontend/js/components/CourseGlimpse/index.tsx

@@ -47,6 +47,8 @@ export interface CourseGlimpseCourse {
   certificate_price: Nullable<number>;
   price: Nullable<number>;
   price_currency: string;
+  discounted_price: Nullable<number>;
+  discount: Nullable<string>;
 }
 
 export interface CourseGlimpseProps {

frontend/js/components/CourseGlimpse/utils.ts

@@ -6,18 +6,23 @@ import {
   Course as RichieCourse,
   isRichieCourse,
 } from 'types/Course';
-import { CourseListItem as JoanieCourse, OfferLight, isOffer, ProductType } from 'types/Joanie';
+import {
+  CourseListItem as JoanieCourse,
+  OfferingLight,
+  isOffering,
+  ProductType,
+} from 'types/Joanie';
 import { TeacherDashboardPaths } from 'widgets/Dashboard/utils/teacherDashboardPaths';
 import { CourseGlimpseCourse } from '.';
 
-const getCourseGlimpsePropsFromOffer = (
-  offer: OfferLight,
+const getCourseGlimpsePropsFromOffering = (
+  offering: OfferingLight,
   intl: IntlShape,
   organizationId?: string,
 ): CourseGlimpseCourse => {
   const courseRouteParams = {
-    courseId: offer.course.id,
-    offerId: offer.id,
+    courseId: offering.course.id,
+    offeringId: offering.id,
   };
   const courseRoute = organizationId
     ? generatePath(TeacherDashboardPaths.ORGANIZATION_PRODUCT, {
@@ -26,27 +31,30 @@ const getCourseGlimpsePropsFromOffer = (
       })
     : generatePath(TeacherDashboardPaths.COURSE_PRODUCT, courseRouteParams);
   return {
-    id: offer.id,
-    code: offer.course.code,
-    title: offer.product.title,
-    cover_image: offer.course.cover
+    id: offering.id,
+    code: offering.course.code,
+    title: offering.product.title,
+    cover_image: offering.course.cover
       ? {
-          src: offer.course.cover.src,
+          src: offering.course.cover.src,
         }
       : null,
     organization: {
-      title: offer.organizations[0].title,
-      image: offer.organizations[0].logo || null,
+      title: offering.organizations[0].title,
+      image: offering.organizations[0].logo || null,
     },
-    product_id: offer.product.id,
+    product_id: offering.product.id,
     course_route: courseRoute,
-    state: offer.product.state,
+    state: offering.product.state,
     certificate_offer:
-      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,
+      offering.product.type === ProductType.CERTIFICATE ? CourseCertificateOffer.PAID : null,
+    offer: offering.product.type === ProductType.CREDENTIAL ? CourseOffer.PAID : null,
+    certificate_price:
+      offering.product.type === ProductType.CERTIFICATE ? offering.product.price : null,
+    price: offering.product.type === ProductType.CREDENTIAL ? offering.product.price : null,
+    price_currency: offering.product.price_currency,
+    discounted_price: offering.product.discounted_price || null,
+    discount: offering.product.discount || null,
   };
 };
 
@@ -71,6 +79,8 @@ const getCourseGlimpsePropsFromRichieCourse = (course: RichieCourse): CourseGlim
   certificate_offer: course.certificate_offer,
   offer: course.offer,
   certificate_price: course.certificate_price,
+  discounted_price: course.discounted_price,
+  discount: course.discount,
 });
 
 const getCourseGlimpsePropsFromJoanieCourse = (
@@ -108,16 +118,18 @@ const getCourseGlimpsePropsFromJoanieCourse = (
     certificate_offer: null,
     offer: null,
     certificate_price: null,
+    discounted_price: null,
+    discount: null,
   };
 };
 
 export const getCourseGlimpseProps = (
-  course: RichieCourse | (JoanieCourse | OfferLight),
+  course: RichieCourse | (JoanieCourse | OfferingLight),
   intl?: IntlShape,
   organizationId?: string,
 ): CourseGlimpseCourse => {
-  if (isOffer(course)) {
-    return getCourseGlimpsePropsFromOffer(course, intl!, organizationId);
+  if (isOffering(course)) {
+    return getCourseGlimpsePropsFromOffering(course, intl!, organizationId);
   }
 
   if (isRichieCourse(course)) {

frontend/js/components/CourseGlimpseList/utils.ts

@@ -1,10 +1,10 @@
 import { IntlShape } from 'react-intl';
-import { OfferLight, CourseListItem as JoanieCourse } from 'types/Joanie';
+import { OfferingLight, 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 | OfferLight)[],
+  courses: RichieCourse[] | (JoanieCourse | OfferingLight)[],
   intl?: IntlShape,
   organizationId?: string,
 ): CourseGlimpseCourse[] => {

frontend/js/components/PurchaseButton/index.tsx

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

frontend/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, Offer, CreditCard, Order, OrderState, Product } from 'types/Joanie';
+import { Address, Offering, 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,7 +26,7 @@ export interface SaleTunnelContextType {
   order?: Order;
   product: Product;
   webAnalyticsEventKey: string;
-  offer?: Offer;
+  offering?: Offering;
 
   // internal
   step: SaleTunnelStep;
@@ -114,7 +114,7 @@ export const GenericSaleTunnel = (props: GenericSaleTunnelProps) => {
       webAnalyticsEventKey: props.eventKey,
       order,
       product: props.product,
-      offer: props.offer,
+      offering: props.offering,
       props,
       billingAddress,
       setBillingAddress,

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

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

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

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

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

@@ -15,7 +15,7 @@ import {
   AddressFactory,
   CertificateOrderFactory,
   CertificateProductFactory,
-  OfferFactory,
+  OfferingFactory,
   CredentialOrderFactory,
   CredentialProductFactory,
   CreditCardFactory,
@@ -453,7 +453,7 @@ describe.each([
     const intl = createIntl({ locale: 'en' });
     const schedule = PaymentInstallmentFactory().many(2);
 
-    const offer = OfferFactory({
+    const offering = OfferingFactory({
       product: ProductFactory({
         price: 840,
         price_currency: 'EUR',
@@ -463,7 +463,7 @@ describe.each([
         discount_rate: 0.3,
       },
     }).one();
-    const { product } = offer;
+    const { product } = offering;
 
     fetchMock
       .get(
@@ -475,7 +475,7 @@ describe.each([
         schedule,
       );
 
-    render(<Wrapper product={product} offer={offer} isWithdrawable={true} />, {
+    render(<Wrapper product={product} offering={offering} isWithdrawable={true} />, {
       queryOptions: { client: createTestQueryClient({ user: richieUser }) },
     });
 
@@ -515,7 +515,7 @@ describe.each([
     const $totalAmount = screen.getByTestId('sale-tunnel__total__amount');
     expect($totalAmount).toHaveTextContent(
       'Total' +
-        formatPrice(offer!.rules.discounted_price!, product.price_currency).replace(
+        formatPrice(offering!.rules.discounted_price!, product.price_currency).replace(
           /(\u202F|\u00a0)/g,
           ' ',
         ),

frontend/js/components/SaleTunnel/index.tsx

@@ -2,7 +2,7 @@ import { ModalProps } from '@openfun/cunningham-react';
 import {
   CertificateProduct,
   CourseLight,
-  Offer,
+  Offering,
   CredentialProduct,
   Enrollment,
   Order,
@@ -16,7 +16,7 @@ import { PacedCourse } from 'types';
 
 export interface SaleTunnelProps extends Pick<ModalProps, 'isOpen' | 'onClose'> {
   product: Product;
-  offer?: Offer;
+  offering?: Offering;
   organizations?: Organization[];
   isWithdrawable: boolean;
   course?: PacedCourse | CourseLight;

frontend/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, OfferFactory } from 'utils/test/factories/joanie';
+import { CourseListItemFactory, OfferingFactory } 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 = OfferFactory().many(2);
+    const trainings = OfferingFactory().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 = OfferFactory().many(2);
+    const trainings = OfferingFactory().many(2);
     const courses = CourseListItemFactory().many(2);
     const courseAndProductList = [...courses, ...trainings];
 

frontend/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, OfferLight } from 'types/Joanie';
+import { CourseListItem, OfferingLight } 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 | OfferLight)[];
+  courseAndProductList?: (CourseListItem | OfferingLight)[];
   isLoadingMore?: boolean;
   hasMore?: boolean;
   isNewSearchLoading?: boolean;

frontend/js/hooks/useContractArchive/index.ts

@@ -1,5 +1,5 @@
 import { useJoanieApi } from 'contexts/JoanieApiContext';
-import { Offer, Organization } from 'types/Joanie';
+import { Offering, 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'],
-        offerId?: Offer['id'],
+        offeringId?: Offering['id'],
       ): Promise<string> => {
         const response = await api.user.contracts.zip_archive.create({
           organization_id: organizationId,
-          offer_id: offerId,
+          offering_id: offeringId,
         });
 
         return extractArchiveId(response.url);

frontend/js/hooks/useCourseProductUnion/index.spec.tsx

@@ -2,13 +2,13 @@ import { renderHook, waitFor } from '@testing-library/react';
 import { QueryClient } from '@tanstack/react-query';
 import fetchMock from 'fetch-mock';
 import { PropsWithChildren } from 'react';
-import { CourseListItem, Offer } from 'types/Joanie';
+import { CourseListItem, Offering } from 'types/Joanie';
 import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
 import { createTestQueryClient } from 'utils/test/createTestQueryClient';
 import { SessionProvider } from 'contexts/SessionContext';
 import { getRoutes } from 'api/joanie';
 import { mockPaginatedResponse } from 'utils/test/mockPaginatedResponse';
-import { CourseListItemFactory, OfferFactory } from 'utils/test/factories/joanie';
+import { CourseListItemFactory, OfferingFactory } from 'utils/test/factories/joanie';
 import { BaseJoanieAppWrapper } from 'utils/test/wrappers/BaseJoanieAppWrapper';
 import { useCourseProductUnion } from '.';
 
@@ -41,12 +41,12 @@ const renderUseCourseProductUnion = ({ organizationId }: { organizationId?: stri
 
 describe('useCourseProductUnion', () => {
   let courseList: CourseListItem[];
-  let offerList: Offer[];
+  let offeringList: Offering[];
   let nbApiCalls: number;
 
   beforeEach(() => {
     courseList = CourseListItemFactory().many(6);
-    offerList = OfferFactory().many(6);
+    offeringList = OfferingFactory().many(6);
 
     fetchMock.get('https://joanie.endpoint/api/v1.0/orders/', [], { overwriteRoutes: true });
     fetchMock.get('https://joanie.endpoint/api/v1.0/credit-cards/', [], { overwriteRoutes: true });
@@ -59,38 +59,38 @@ describe('useCourseProductUnion', () => {
     fetchMock.restore();
   });
 
-  it('should call courses and offer endpoints', async () => {
+  it('should call courses and offering endpoints', async () => {
     const ROUTES = getRoutes();
     const coursesUrl = ROUTES.courses.get.replace(':id/', '');
-    const offersUrl = ROUTES.offers.get.replace(':id/', '');
+    const offeringsUrl = ROUTES.offerings.get.replace(':id/', '');
     fetchMock.get(
       `${coursesUrl}?has_listed_course_runs=true&page=1&page_size=${PER_PAGE}`,
       mockPaginatedResponse(courseList.slice(0, PER_PAGE), 0, false),
     );
     fetchMock.get(
-      `${offersUrl}?page=1&page_size=${PER_PAGE}`,
-      mockPaginatedResponse(offerList.slice(0, PER_PAGE), 0, false),
+      `${offeringsUrl}?page=1&page_size=${PER_PAGE}`,
+      mockPaginatedResponse(offeringList.slice(0, PER_PAGE), 0, false),
     );
     const { result } = renderUseCourseProductUnion();
     await waitFor(() => expect(result.current.isLoading).toBe(false));
     expect(result.current.data.length).toBe(PER_PAGE);
     nbApiCalls += 1; // courses page 1
-    nbApiCalls += 1; // offers page 1
+    nbApiCalls += 1; // offerings page 1
     const calledUrls = fetchMock.calls().map((call) => call[0]);
     expect(calledUrls).toHaveLength(nbApiCalls);
     expect(calledUrls).toContain(
       `${coursesUrl}?has_listed_course_runs=true&page=1&page_size=${PER_PAGE}`,
     );
-    expect(calledUrls).toContain(`${offersUrl}?page=1&page_size=${PER_PAGE}`);
+    expect(calledUrls).toContain(`${offeringsUrl}?page=1&page_size=${PER_PAGE}`);
   }, 25000);
 
-  it('should call organization courses and organization offer endpoints', async () => {
+  it('should call organization courses and organization offering endpoints', async () => {
     const organizationId = 'DUMMY_ORGANIZATION_ID';
     const ROUTES = getRoutes();
     const organizationCoursesUrl = ROUTES.organizations.courses.get
       .replace(':organization_id', organizationId)
       .replace(':id/', '');
-    const organizationOffersUrl = ROUTES.organizations.offers.get
+    const organizationOfferingsUrl = ROUTES.organizations.offerings.get
       .replace(':organization_id', organizationId)
       .replace(':id/', '');
     fetchMock.get(
@@ -98,19 +98,19 @@ describe('useCourseProductUnion', () => {
       mockPaginatedResponse(courseList.slice(0, PER_PAGE), 0, false),
     );
     fetchMock.get(
-      `${organizationOffersUrl}?page=1&page_size=${PER_PAGE}`,
-      mockPaginatedResponse(offerList.slice(0, PER_PAGE), 0, false),
+      `${organizationOfferingsUrl}?page=1&page_size=${PER_PAGE}`,
+      mockPaginatedResponse(offeringList.slice(0, PER_PAGE), 0, false),
     );
     const { result } = renderUseCourseProductUnion({ organizationId: 'DUMMY_ORGANIZATION_ID' });
     await waitFor(() => expect(result.current.isLoading).toBe(false));
     expect(result.current.data.length).toBe(PER_PAGE);
     nbApiCalls += 1; // courses page 1
-    nbApiCalls += 1; // offers page 1
+    nbApiCalls += 1; // offerings page 1
     const calledUrls = fetchMock.calls().map((call) => call[0]);
     expect(calledUrls).toHaveLength(nbApiCalls);
     expect(calledUrls).toContain(
       `${organizationCoursesUrl}?has_listed_course_runs=true&page=1&page_size=${PER_PAGE}`,
     );
-    expect(calledUrls).toContain(`${organizationOffersUrl}?page=1&page_size=${PER_PAGE}`);
+    expect(calledUrls).toContain(`${organizationOfferingsUrl}?page=1&page_size=${PER_PAGE}`);
   });
 });

frontend/js/hooks/useCourseProductUnion/index.ts

@@ -3,11 +3,11 @@ import { useJoanieApi } from 'contexts/JoanieApiContext';
 import {
   CourseListItem,
   Product,
-  Offer,
+  Offering,
   CourseQueryFilters,
-  OfferQueryFilters,
+  OfferingQueryFilters,
   ProductType,
-  OfferLight,
+  OfferingLight,
 } from 'types/Joanie';
 import useUnionResource, { ResourceUnionPaginationProps } from 'hooks/useUnionResource';
 
@@ -41,9 +41,9 @@ export const useCourseProductUnion = ({
   const api = useJoanieApi();
   return useUnionResource<
     CourseListItem,
-    Offer | OfferLight,
+    Offering | OfferingLight,
     CourseQueryFilters,
-    OfferQueryFilters
+    OfferingQueryFilters
   >({
     queryAConfig: {
       queryKey: ['user', 'courses'],
@@ -51,8 +51,8 @@ export const useCourseProductUnion = ({
       filters: { query, organization_id: organizationId, has_listed_course_runs: true },
     },
     queryBConfig: {
-      queryKey: ['user', 'offers'],
-      fn: api.offers.get,
+      queryKey: ['user', 'offerings'],
+      fn: api.offerings.get,
       filters: { query, organization_id: organizationId, product_type: productType },
     },
     perPage,