richie-education 3.1.3-dev3 → 3.1.3-dev30

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

@@ -4,7 +4,7 @@ import userEvent from '@testing-library/user-event';
 import { RichieContextFactory as mockRichieContextFactory } from 'utils/test/factories/richie';
 import {
   CourseListItemFactory,
-  CourseProductRelationFactory,
+  OfferingFactory,
   OrganizationFactory,
 } from 'utils/test/factories/joanie';
 import { expectNoSpinner } from 'utils/test/expectSpinner';
@@ -59,8 +59,8 @@ describe('components/TeacherDashboardOrganizationCourseLoader', () => {
       mockPaginatedResponse(CourseListItemFactory().many(15), 15, false),
     );
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/course-product-relations/?product_type=credential&page=1&page_size=${perPage}`,
-      mockPaginatedResponse(CourseProductRelationFactory().many(15), 15, false),
+      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/offerings/?product_type=credential&page=1&page_size=${perPage}`,
+      mockPaginatedResponse(OfferingFactory().many(15), 15, false),
     );
     fetchMock.get(
       `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/contracts/?signature_state=half_signed&page=1`,
@@ -76,7 +76,7 @@ describe('components/TeacherDashboardOrganizationCourseLoader', () => {
     await expectNoSpinner('Loading courses...');
 
     nbApiCalls += 1; // course api call
-    nbApiCalls += 1; // course-product-relations api call
+    nbApiCalls += 1; // offerings api call
     nbApiCalls += 1; // contracts api call
     const calledUrls = fetchMock.calls().map((call) => call[0]);
     expect(calledUrls).toHaveLength(nbApiCalls);
@@ -84,7 +84,7 @@ describe('components/TeacherDashboardOrganizationCourseLoader', () => {
       `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/courses/?has_listed_course_runs=true&page=1&page_size=${perPage}`,
     );
     expect(calledUrls).toContain(
-      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/course-product-relations/?product_type=credential&page=1&page_size=${perPage}`,
+      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/offerings/?product_type=credential&page=1&page_size=${perPage}`,
     );
     await expectNoSpinner('Loading organization...');
 
@@ -117,8 +117,8 @@ describe('components/TeacherDashboardOrganizationCourseLoader', () => {
       mockPaginatedResponse(CourseListItemFactory().many(15), 15, false),
     );
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/course-product-relations/?product_type=credential&page=1&page_size=${perPage}`,
-      mockPaginatedResponse(CourseProductRelationFactory().many(15), 15, false),
+      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/offerings/?product_type=credential&page=1&page_size=${perPage}`,
+      mockPaginatedResponse(OfferingFactory().many(15), 15, false),
     );
 
     render(<TeacherDashboardOrganizationCourseLoader />, {
@@ -136,22 +136,22 @@ describe('components/TeacherDashboardOrganizationCourseLoader', () => {
       mockPaginatedResponse(CourseListItemFactory().many(5), 5, false),
     );
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/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/organizations/${organization.id}/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/organizations/${organization.id}/courses/?query=text+query&has_listed_course_runs=true&page=1&page_size=${perPage}`,
     );
     expect(calledUrls).toContain(
-      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/course-product-relations/?query=text+query&product_type=credential&page=1&page_size=${perPage}`,
+      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/offerings/?query=text+query&product_type=credential&page=1&page_size=${perPage}`,
     );
 
     await waitFor(() => {

package/js/pages/TeacherDashboardTraining/TeacherDashboardTrainingLoader.tsx

@@ -1,10 +1,10 @@
 import { FormattedMessage, defineMessages } from 'react-intl';
 import { useParams } from 'react-router';
 
+import { useOffering } from 'hooks/useOffering';
 import { DashboardLayout } from 'widgets/Dashboard/components/DashboardLayout';
 import { TeacherDashboardCourseSidebar } from 'widgets/Dashboard/components/TeacherDashboardCourseSidebar';
 import { Spinner } from 'components/Spinner';
-import { useCourseProductRelation } from 'hooks/useCourseProductRelation';
 import { useBreadcrumbsPlaceholders } from 'hooks/useBreadcrumbsPlaceholders';
 import { TeacherDashboardTraining } from '.';
 
@@ -22,17 +22,17 @@ const messages = defineMessages({
 });
 
 export const TeacherDashboardTrainingLoader = () => {
-  const { courseProductRelationId, organizationId } = useParams<{
-    courseProductRelationId: string;
+  const { offeringId, organizationId } = useParams<{
+    offeringId: string;
     organizationId?: string;
   }>();
 
   const {
-    item: courseProductRelation,
+    item: offering,
     states: { fetching },
-  } = useCourseProductRelation(courseProductRelationId, { organization_id: organizationId });
+  } = useOffering(offeringId, { organization_id: organizationId });
   useBreadcrumbsPlaceholders({
-    courseTitle: courseProductRelation?.product.title ?? '',
+    courseTitle: offering?.product.title ?? '',
   });
   return (
     <DashboardLayout sidebar={<TeacherDashboardCourseSidebar />}>
@@ -48,7 +48,7 @@ export const TeacherDashboardTrainingLoader = () => {
           </span>
         </Spinner>
       ) : (
-        <TeacherDashboardTraining courseProductRelation={courseProductRelation} />
+        <TeacherDashboardTraining offering={offering} />
       )}
     </DashboardLayout>
   );

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

@@ -11,7 +11,7 @@ import {
   UserFactory,
 } from 'utils/test/factories/richie';
 import JoanieSessionProvider from 'contexts/SessionContext/JoanieSessionProvider';
-import { CourseProductRelationFactory, OrganizationFactory } from 'utils/test/factories/joanie';
+import { OfferingFactory, OrganizationFactory } from 'utils/test/factories/joanie';
 import { createTestQueryClient } from 'utils/test/createTestQueryClient';
 import { expectNoSpinner } from 'utils/test/expectSpinner';
 import { DashboardBreadcrumbsProvider } from 'widgets/Dashboard/contexts/DashboardBreadcrumbsContext';
@@ -46,15 +46,9 @@ describe('components/TeacherDashboardTrainingLoader', () => {
   });
 
   it('should render TeacherDashboardTrainingLoader page', async () => {
-    const courseProductRelation = CourseProductRelationFactory().one();
-    fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/organizations/?course_product_relation_id=${courseProductRelation.id}`,
-      [],
-    );
-    fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/course-product-relations/${courseProductRelation.id}/`,
-      courseProductRelation,
-    );
+    const offering = OfferingFactory().one();
+    fetchMock.get(`https://joanie.endpoint/api/v1.0/organizations/?offering_id=${offering.id}`, []);
+    fetchMock.get(`https://joanie.endpoint/api/v1.0/offerings/${offering.id}/`, offering);
 
     const user = UserFactory().one();
     render(
@@ -67,12 +61,12 @@ describe('components/TeacherDashboardTrainingLoader', () => {
                   router={createMemoryRouter(
                     [
                       {
-                        path: ':courseProductRelationId',
+                        path: ':offeringId',
                         element: <TeacherDashboardTrainingLoader />,
                       },
                     ],
                     {
-                      initialEntries: [`/${courseProductRelation.id}`],
+                      initialEntries: [`/${offering.id}`],
                     },
                   )}
                 />
@@ -88,12 +82,10 @@ describe('components/TeacherDashboardTrainingLoader', () => {
     await expectNoSpinner('Loading course...');
 
     nbApiCalls += 1; // organizations 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/${courseProductRelation.id}/`,
-    );
+    expect(calledUrls).toContain(`https://joanie.endpoint/api/v1.0/offerings/${offering.id}/`);
 
     // main titles
     expect(
@@ -103,27 +95,27 @@ describe('components/TeacherDashboardTrainingLoader', () => {
     ).toBeInTheDocument();
 
     expect(
-      screen.getAllByRole('heading', { name: capitalize(courseProductRelation.product.title) }),
+      screen.getAllByRole('heading', { name: capitalize(offering.product.title) }),
     ).toHaveLength(2);
 
-    const nbCourseRun = courseProductRelation.product.target_courses.reduce(
+    const nbCourseRun = offering.product.target_courses.reduce(
       (acc, course) => acc + course.course_runs.length,
       0,
     );
     expect(screen.getAllByRole('link', { name: 'Go to course area' })).toHaveLength(nbCourseRun);
   });
 
-  it('should fetch course product relation with organization id if there is one in the path', async () => {
+  it('should fetch offering with organization id if there is one in the path', async () => {
     const organization = OrganizationFactory().one();
-    const courseProductRelation = CourseProductRelationFactory({
+    const offering = OfferingFactory({
       organizations: [organization],
     }).one();
     fetchMock.get(
-      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/course-product-relations/${courseProductRelation.id}/`,
-      courseProductRelation,
+      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/offerings/${offering.id}/`,
+      offering,
     );
     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=25`,
+      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/contracts/?offering_id=${offering.id}&signature_state=half_signed&page=1&page_size=25`,
       [],
     );
 
@@ -138,12 +130,12 @@ describe('components/TeacherDashboardTrainingLoader', () => {
                   router={createMemoryRouter(
                     [
                       {
-                        path: '/:organizationId/:courseProductRelationId',
+                        path: '/:organizationId/:offeringId',
                         element: <TeacherDashboardTrainingLoader />,
                       },
                     ],
                     {
-                      initialEntries: [`/${organization.id}/${courseProductRelation.id}`],
+                      initialEntries: [`/${organization.id}/${offering.id}`],
                     },
                   )}
                 />
@@ -159,11 +151,11 @@ describe('components/TeacherDashboardTrainingLoader', () => {
     await expectNoSpinner('Loading course...');
 
     nbApiCalls += 1; // contracts 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/organizations/${organization.id}/course-product-relations/${courseProductRelation.id}/`,
+      `https://joanie.endpoint/api/v1.0/organizations/${organization.id}/offerings/${offering.id}/`,
     );
 
     // main titles
@@ -174,10 +166,10 @@ describe('components/TeacherDashboardTrainingLoader', () => {
     ).toBeInTheDocument();
 
     expect(
-      screen.getAllByRole('heading', { name: capitalize(courseProductRelation.product.title) }),
+      screen.getAllByRole('heading', { name: capitalize(offering.product.title) }),
     ).toHaveLength(2);
 
-    const nbCourseRun = courseProductRelation.product.target_courses.reduce(
+    const nbCourseRun = offering.product.target_courses.reduce(
       (acc, course) => acc + course.course_runs.length,
       0,
     );

package/js/pages/TeacherDashboardTraining/index.tsx

@@ -6,37 +6,33 @@ import { DashboardLayout } from 'widgets/Dashboard/components/DashboardLayout';
 import { DashboardCard } from 'widgets/Dashboard/components/DashboardCard';
 import { Icon, IconTypeEnum } from 'components/Icon';
 import Banner, { BannerType } from 'components/Banner';
-import { CourseProductRelation } from 'types/Joanie';
+import { Offering } from 'types/Joanie';
 
 const messages = defineMessages({
-  errorNoCourseProductRelation: {
+  errorNoOffering: {
     defaultMessage: "This product doesn't exist",
-    description: 'Message displayed when requested course product relation is not found',
-    id: 'components.TeacherDashboardTraining.errorNoCourseProductRelation',
+    description: 'Message displayed when requested offering is not found',
+    id: 'components.TeacherDashboardTraining.errorNoOffering',
   },
 });
 
 interface TeacherDashboardTrainingProps {
-  courseProductRelation: CourseProductRelation;
+  offering: Offering;
 }
 
-export const TeacherDashboardTraining = ({
-  courseProductRelation,
-}: TeacherDashboardTrainingProps) => {
+export const TeacherDashboardTraining = ({ offering }: TeacherDashboardTrainingProps) => {
   const intl = useIntl();
-  return courseProductRelation ? (
+  return offering ? (
     <div className="teacher-course-page">
       <DashboardCard
         className="icon-arrow-right-rounded"
         header={
           <div>
             <div className="dashboard__title_container--small">
-              <h2 className="dashboard__title--large">
-                {capitalize(courseProductRelation.product.title)}
-              </h2>
+              <h2 className="dashboard__title--large">{capitalize(offering.product.title)}</h2>
             </div>
-            {courseProductRelation.product.description && (
-              <div className="dashboard__quote">{courseProductRelation.product.description}</div>
+            {offering.product.description && (
+              <div className="dashboard__quote">{offering.product.description}</div>
             )}
           </div>
         }
@@ -44,7 +40,7 @@ export const TeacherDashboardTraining = ({
         fullWidth
       />
       <DashboardLayout.NestedSection>
-        {courseProductRelation.product.target_courses.map((course) => (
+        {offering.product.target_courses.map((course) => (
           <DashboardLayout.Section key={`course_target_${course.code}`}>
             <DashboardCard
               className="icon-arrow-right-rounded"
@@ -67,7 +63,7 @@ export const TeacherDashboardTraining = ({
     </div>
   ) : (
     <Banner
-      message={intl.formatMessage(messages.errorNoCourseProductRelation)}
+      message={intl.formatMessage(messages.errorNoOffering)}
       type={BannerType.ERROR}
       rounded
     />

package/js/types/Course.ts

@@ -47,6 +47,10 @@ export interface Course extends Resource {
   certificate_price: Nullable<number>;
   price: Nullable<number>;
   price_currency: string;
+  discounted_price: Nullable<number>;
+  discount: Nullable<string>;
+  certificate_discounted_price: Nullable<number>;
+  certificate_discount: Nullable<string>;
 }
 
 export function isRichieCourse(course: Course | JoanieCourse): course is Course {

package/js/types/Joanie.ts

@@ -38,7 +38,7 @@ export interface Organization {
 }
 
 export interface OrganizationResourceQuery extends ResourcesQuery {
-  course_product_relation_id?: CourseProductRelation['id'];
+  offering_id?: Offering['id'];
 }
 
 export interface ContractDefinition {
@@ -149,6 +149,10 @@ export interface Product {
   state: CourseState;
   instructions: Nullable<string>;
   contract_definition?: ContractDefinition;
+  discounted_price: Nullable<number>;
+  discount: Nullable<string>;
+  certificate_discounted_price: Nullable<number>;
+  certificate_discount: Nullable<string>;
 }
 
 export interface CredentialProduct extends Product {
@@ -174,7 +178,7 @@ export interface DefinitionResourcesProduct {
   contract_definition_id: Nullable<ContractDefinition['id']>;
 }
 
-export interface CourseProductRelationLight {
+export interface OfferingLight {
   id: string;
   course: CourseLight;
   organizations: Organization[];
@@ -182,13 +186,25 @@ export interface CourseProductRelationLight {
   created_on: string;
 }
 
-export interface CourseProductRelation extends CourseProductRelationLight {
-  order_groups: OrderGroup[];
+export interface OfferingRule {
+  discounted_price: Nullable<number>;
+  discount_rate: Nullable<number>;
+  discount_amount: Nullable<number>;
+  discount_start: Nullable<string>;
+  discount_end: Nullable<string>;
+  description: Nullable<string>;
+  nb_available_seats: Nullable<number>;
+  has_seat_limit: boolean;
+  has_seats_left: boolean;
+}
+
+export interface Offering extends OfferingLight {
   is_withdrawable: boolean;
+  rules: OfferingRule;
 }
-export function isCourseProductRelation(
-  entity: CourseListItem | CourseProductRelationLight | RichieCourse,
-): entity is CourseProductRelationLight {
+export function isOffering(
+  entity: CourseListItem | OfferingLight | RichieCourse,
+): entity is OfferingLight {
   return 'course' in entity && 'product' in entity;
 }
 
@@ -233,7 +249,7 @@ export interface Enrollment {
   was_created_by_order: boolean;
   created_on: string;
   orders: OrderEnrollment[];
-  product_relations: CourseProductRelation[];
+  offerings: Offering[];
   certificate_id: Nullable<string>;
 }
 export const isEnrollment = (obj: unknown | Enrollment | OpenEdXEnrollment): obj is Enrollment => {
@@ -247,7 +263,7 @@ export const isEnrollment = (obj: unknown | Enrollment | OpenEdXEnrollment): obj
     'was_created_by_order' in obj &&
     'created_on' in obj &&
     'orders' in obj &&
-    'product_relations' in obj &&
+    'offerings' in obj &&
     'certificate_id' in obj
   );
 };
@@ -325,7 +341,6 @@ export interface Order {
   enrollment: Nullable<EnrollmentLight>;
   organization_id: Organization['id'];
   organization: Organization;
-  order_group_id?: OrderGroup['id'];
   payment_schedule?: PaymentSchedule;
   credit_card_id?: CreditCard['id'];
 }
@@ -398,18 +413,11 @@ export interface NestedCourseOrder {
 
 export interface CourseOrderResourceQuery extends PaginatedResourceQuery {
   course_id?: CourseListItem['id'];
-  course_product_relation_id?: CourseProductRelation['id'];
+  offering_id?: Offering['id'];
   organization_id?: Organization['id'];
   product_id?: Product['id'];
 }
 
-export interface OrderGroup {
-  id: string;
-  is_active: boolean;
-  nb_seats: number;
-  nb_available_seats: number;
-}
-
 export enum CreditCardBrand {
   MASTERCARD = 'mastercard',
   MAESTRO = 'maestro',
@@ -481,7 +489,6 @@ export interface AddressCreationPayload extends Omit<Address, 'id' | 'is_main'>
 
 interface AbstractOrderProductCreationPayload {
   product_id: Product['id'];
-  order_group_id?: OrderGroup['id'];
   billing_address: Omit<Address, 'id' | 'is_main'>;
   has_waived_withdrawal_right: boolean;
 }
@@ -541,8 +548,8 @@ export interface CourseProductQueryFilters extends ResourcesQuery {
   id?: Product['id'];
   course_id?: CourseListItem['id'];
 }
-export interface CourseProductRelationQueryFilters extends PaginatedResourceQuery {
-  id?: CourseProductRelation['id'];
+export interface OfferingQueryFilters extends PaginatedResourceQuery {
+  id?: Offering['id'];
   organization_id?: Organization['id'];
   product_type?: ProductType;
   query?: string;
@@ -555,7 +562,7 @@ export enum ContractState {
 }
 export interface ContractResourceQuery extends PaginatedResourceQuery {
   organization_id?: Organization['id'];
-  course_product_relation_id?: CourseProductRelation['id'];
+  offering_id?: Offering['id'];
   contract_ids?: Contract['id'][];
   signature_state?: ContractState;
 }
@@ -563,7 +570,7 @@ export interface ContractResourceQuery extends PaginatedResourceQuery {
 export interface OrganizationContractSignatureLinksFilters {
   contracts_ids?: string[];
   organization_id: Organization['id'];
-  course_product_relation_ids?: CourseProductRelation['id'][];
+  offering_ids?: Offering['id'][];
 }
 
 export interface ContractInvitationLinkResponse {
@@ -657,10 +664,10 @@ interface APIUser {
       check: (id: string) => Promise<Response>;
       create: ({
         organization_id,
-        course_product_relation_id,
+        offering_id,
       }: {
         organization_id?: Organization['id'];
-        course_product_relation_id?: CourseProductRelation['id'];
+        offering_id?: Offering['id'];
       }) => Promise<{ url: string }>;
       get: (id: string) => Promise<File>;
     };
@@ -676,7 +683,7 @@ export interface API {
       ? Promise<Nullable<CourseListItem>>
       : Promise<PaginatedResponse<CourseListItem>>;
     products: {
-      get(filters?: CourseProductQueryFilters): Promise<Nullable<CourseProductRelation>>;
+      get(filters?: CourseProductQueryFilters): Promise<Nullable<Offering>>;
       paymentSchedule: {
         get(filters?: CourseProductQueryFilters): Promise<Nullable<PaymentSchedule>>;
       };
@@ -709,12 +716,12 @@ export interface API {
       filters?: CourseRunFilters,
     ): CourseRunFilters extends { id: string } ? Promise<Nullable<CourseRun>> : Promise<CourseRun>;
   };
-  courseProductRelations: {
+  offerings: {
     get<Filters extends PaginatedResourceQuery = PaginatedResourceQuery>(
       filters?: Filters,
     ): Filters extends { id: string }
-      ? Promise<Nullable<CourseProductRelation>>
-      : Promise<PaginatedResponse<CourseProductRelationLight>>;
+      ? Promise<Nullable<Offering>>
+      : Promise<PaginatedResponse<OfferingLight>>;
   };
   contractDefinitions: {
     previewTemplate(id: string): Promise<File>;

package/js/types/index.ts

@@ -35,11 +35,15 @@ export interface CourseRun {
   title?: string;
   snapshot?: string;
   display_mode: CourseRunDisplayMode;
-  price?: number;
+  price?: Nullable<number>;
   price_currency?: string;
   offer?: string;
-  certificate_price?: number;
+  certificate_price?: Nullable<number>;
   certificate_offer?: string;
+  discounted_price: Nullable<number>;
+  discount: Nullable<string>;
+  certificate_discounted_price: Nullable<number>;
+  certificate_discount: Nullable<string>;
 }
 
 export enum Priority {

package/js/utils/ProductHelper/index.ts

@@ -1,5 +1,5 @@
 import { IntlShape } from 'react-intl';
-import { CourseProductRelation, Product, TargetCourse } from 'types/Joanie';
+import { Product, TargetCourse } from 'types/Joanie';
 import { Maybe } from 'types/utils';
 import { IntlHelper } from 'utils/IntlHelper';
 import * as Joanie from 'types/Joanie';
@@ -44,10 +44,6 @@ export class ProductHelper {
     return IntlHelper.getLocalizedLanguages(uniqueLanguages, intl);
   }
 
-  static getActiveOrderGroups(courseProductRelation: CourseProductRelation) {
-    return courseProductRelation.order_groups?.filter((orderGroup) => orderGroup.is_active);
-  }
-
   static hasRemainingSeats(product: Maybe<Product>) {
     if (!product) return false;
     return typeof product?.remaining_order_count !== 'number' || product.remaining_order_count > 0;

package/js/utils/test/factories/joanie.ts

@@ -12,7 +12,7 @@ import {
   CourseLight,
   CourseListItem,
   CourseProduct,
-  CourseProductRelation,
+  Offering,
   CourseRun,
   CredentialOrder,
   CredentialProduct,
@@ -28,7 +28,6 @@ import {
   NestedCredentialOrder,
   Order,
   OrderEnrollment,
-  OrderGroup,
   PaymentInstallment,
   OrderLite,
   OrderState,
@@ -90,7 +89,7 @@ export const EnrollmentFactory = factory((): Enrollment => {
     id: faker.string.uuid(),
     course_run: CourseRunWithCourseFactory().one(),
     is_active: true,
-    product_relations: CourseProductRelationFactory().many(1),
+    offerings: OfferingFactory().many(1),
     state: EnrollmentState.SET,
     was_created_by_order: false,
     created_on: faker.date.past({ years: 1 }).toISOString(),
@@ -197,7 +196,7 @@ export const CredentialProductFactory = factory((): CredentialProduct => {
     created_on: faker.date.past().toISOString(),
     title: FactoryHelper.sequence((counter) => `Certificate Product ${counter}`),
     type: ProductType.CREDENTIAL,
-    price: faker.number.int(),
+    price: faker.number.int({ min: 1, max: 1000, multipleOf: 10 }),
     price_currency: faker.finance.currencyCode(),
     call_to_action: faker.lorem.words(3),
     certificate_definition: CertificationDefinitionFactory().one(),
@@ -206,6 +205,10 @@ export const CredentialProductFactory = factory((): CredentialProduct => {
     remaining_order_count: faker.number.int({ min: 1, max: 100 }),
     state: CourseStateFactory().one(),
     instructions: null,
+    discounted_price: null,
+    discount: null,
+    certificate_discounted_price: null,
+    certificate_discount: null,
   };
 });
 
@@ -294,25 +297,6 @@ export const CourseLightFactory = factory((): CourseLight => {
   };
 });
 
-export const OrderGroupFactory = factory((): OrderGroup => {
-  const seats = faker.number.int({ min: 5, max: 100 });
-  return {
-    id: faker.string.uuid(),
-    is_active: true,
-    nb_seats: seats,
-    nb_available_seats: faker.number.int({ min: 2, max: seats }),
-  };
-});
-
-export const OrderGroupFullFactory = factory((): OrderGroup => {
-  return {
-    id: faker.string.uuid(),
-    is_active: true,
-    nb_seats: faker.number.int({ min: 5, max: 100 }),
-    nb_available_seats: 0,
-  };
-});
-
 export const NestedCourseOrderFactory = factory((): NestedCourseOrder => {
   return {
     id: faker.string.uuid(),
@@ -329,15 +313,25 @@ export const NestedCourseOrderFactory = factory((): NestedCourseOrder => {
   };
 });
 
-export const CourseProductRelationFactory = factory((): CourseProductRelation => {
+export const OfferingFactory = factory((): Offering => {
   return {
     id: faker.string.uuid(),
     created_on: faker.date.past().toISOString(),
     course: CourseFactory().one(),
     product: ProductFactory().one(),
     organizations: OrganizationFactory().many(1),
-    order_groups: [],
     is_withdrawable: true,
+    rules: {
+      discounted_price: null,
+      discount_rate: null,
+      discount_amount: null,
+      discount_start: null,
+      discount_end: null,
+      description: null,
+      nb_available_seats: null,
+      has_seat_limit: false,
+      has_seats_left: true,
+    },
   };
 });