Order fixes

src/controllers/BookingController.ts

@@ -64,37 +64,42 @@ export class BookingController implements IBookingController {
     );
     this.checkRestrictions(bookingModel.optionModel, schema.unitItems);
 
-    if (capabilities.includes(CapabilityId.Cart)) {
-      let orderModel;
-      let primary;
-
-      if (schema.orderId === undefined) {
-        orderModel = OrderModelFactory.createByBooking(bookingModel, schema);
-        await this.orderRepository.createOrder(orderModel);
-        primary = true;
-      } else {
-        orderModel = await this.orderRepository.getOrderById(schema.orderId);
-
-        if (orderModel === null) {
-          throw new InvalidOrderIdError(schema.orderId);
-        }
-
-        orderModel.bookingModels = [...orderModel.bookingModels, bookingModel];
-        await this.orderRepository.updateOrder(orderModel);
-        primary = false;
-      }
+    let orderModel;
+    let primary;
 
-      const bookingCartModel = new BookingCartModel({
-        orderId: orderModel.id,
-        primary,
-      });
+    if (schema.orderId === undefined) {
+      orderModel = OrderModelFactory.createByBooking(bookingModel, schema);
+      await this.orderRepository.createOrder(orderModel);
+      primary = true;
+    } else {
+      orderModel = await this.orderRepository.getOrderById(schema.orderId);
 
-      bookingModel.bookingCartModel = bookingCartModel;
+      if (orderModel === null) {
+        throw new InvalidOrderIdError(schema.orderId);
+      }
+
+      orderModel.bookingModels = [...orderModel.bookingModels, bookingModel];
+      await this.orderRepository.updateOrder(orderModel);
+      primary = false;
     }
 
+    const bookingCartModel = new BookingCartModel({
+      orderId: orderModel.id,
+      orderReference: bookingModel.resellerReference ?? orderModel.supplierReference,
+      primary,
+    });
+
+    bookingModel.bookingCartModel = bookingCartModel;
+
     await this.bookingRepository.createBooking(bookingModel);
 
-    return this.bookingParser.parseModelToPOJOWithSpecificCapabilities(bookingModel, capabilities);
+    const additionalCapabilities = capabilities;
+
+    if (!capabilities.includes(CapabilityId.Cart)) {
+      additionalCapabilities.push(CapabilityId.Cart);
+    }
+
+    return this.bookingParser.parseModelToPOJOWithSpecificCapabilities(bookingModel, additionalCapabilities);
   };
 
   public confirmBooking = async (schema: ConfirmBookingSchema, capabilities: CapabilityId[]): Promise<Booking> => {

src/factories/OrderModelFactory.ts

@@ -33,7 +33,7 @@ export abstract class OrderModelFactory {
 
     return this.orderModelGenerator.generateOrder({
       orderData: {
-        id: bookingModel.bookingCartModel?.orderId ?? DataGenerator.generateUUID(),
+        id: DataGenerator.generateUUID(),
         supplierReference: bookingModel.supplierReference ?? DataGenerator.generateSupplierReference(),
         settlementMethod: 'settlementMethod',
         status,

src/repositories/OrderRepository.ts

@@ -22,10 +22,10 @@ export default class OrderRepository implements IOrderRepository {
       .getDB()
       .run(
         `
-        INSERT INTO booking (
+        INSERT INTO \`order\` (
           id,
           status,
-          supplierReference
+          supplierReference,
           data
         ) VALUES (?, ?, ?, ?)
     `,
@@ -43,7 +43,7 @@ export default class OrderRepository implements IOrderRepository {
       .getDB()
       .run(
         `
-        UPDATE booking
+        UPDATE \`order\`
           SET status = ?,
               supplierReference = ?,
               data = ?
@@ -62,17 +62,18 @@ export default class OrderRepository implements IOrderRepository {
     await this.getOrderById(getOrderSchema.id);
 
   public getOrderById = async (orderId: string): Promise<OrderModel> => {
-    const result = (await DB.getInstance().getDB().get('SELECT * FROM order WHERE id = ?', orderId)) ?? null;
+    const result = (await DB.getInstance().getDB().get('SELECT * FROM `order` WHERE id = ?', orderId)) ?? null;
 
     if (result === null) {
       throw new InvalidOrderIdError(orderId);
     }
+
     const order = JSON.parse(result.data) as Order;
     this.handleExpiredOrder(order);
 
     const orderModel = this.orderParser.parsePOJOToModel(order);
     const upToDateBookingModels = this.getUpToDateBookingModels(orderModel);
-    orderModel.bookingModels = upToDateBookingModels;
+    orderModel.bookingModels = await upToDateBookingModels;
 
     return orderModel;
   };
@@ -83,13 +84,15 @@ export default class OrderRepository implements IOrderRepository {
     }
   };
 
-  private readonly getUpToDateBookingModels = (orderModel: OrderModel): BookingModel[] => {
+  private readonly getUpToDateBookingModels = async (orderModel: OrderModel): Promise<BookingModel[]> => {
     const upToDateBookingModels: BookingModel[] = [];
 
-    orderModel.bookingModels.forEach(async (bookingModel) => {
-      const upToDateBookingModel = await this.BookingRepository.getBookingByUuid(bookingModel.uuid);
-      upToDateBookingModels.push(upToDateBookingModel);
-    });
+    await Promise.all(
+      orderModel.bookingModels.map(async (bookingModel) => {
+        const upToDateBookingModel = await this.BookingRepository.getBookingByUuid(bookingModel.uuid);
+        upToDateBookingModels.push(upToDateBookingModel);
+      }),
+    );
 
     return upToDateBookingModels;
   };

src/router/middlewares.ts

@@ -3,6 +3,6 @@ import { CapabilityId } from '@octocloud/types';
 
 export async function parseCapabilities(ctx: Koa.Context, next: Koa.Next): Promise<void> {
   const capabilities: string = ctx.get('Octo-Capabilities') ?? '';
-  ctx.capabilities = capabilities.split(',') as CapabilityId[];
+  ctx.capabilities = capabilities.replaceAll(' ', '').split(',') as CapabilityId[];
   await next();
 }