Development

.github/workflows/workflow.yml

@@ -37,12 +37,12 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      - name: ChatGPT comment
-        uses: kxxt/chatgpt-action@v0.3
-        id: chatgpr
-        with:
-          number: ${{ github.event.pull_request.number }}
-          sessionToken: ${{ secrets.CHATGPT_SESSION_TOKEN }}
-          split: "yolo"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      # - name: ChatGPT comment
+      #   uses: kxxt/chatgpt-action@v0.3
+      #   id: chatgpr
+      #   with:
+      #     number: ${{ github.event.pull_request.number }}
+      #     sessionToken: ${{ secrets.CHATGPT_SESSION_TOKEN }}
+      #     split: "yolo"
+      # env:
+      #   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

backend/src/cart/cart-item.mapper.ts

@@ -1,11 +1,12 @@
-import { Injectable } from '@nestjs/common';
+import { HttpStatus, Injectable } from '@nestjs/common';
 import { AuditMapper } from 'src/audit';
 import { IMapper } from 'src/domain';
 import { CartItemDataModel } from 'src/infrastructure/data_access/repositories/schemas/cartItem.schema';
 import { SelectedCartItemDataModel } from 'src/infrastructure/data_access/repositories/schemas/selected-cart-item.schema';
 import { CartItem } from './cart-item';
 import { SelectedCartItemMapper } from './selectedItems/selected-cart-item.mapper';
 import { SelectedCartItem } from './selectedItems/selectedCartItem';
+import { throwApplicationError } from 'src/infrastructure/utilities/exception-instance';
 
 @Injectable()
 export class CartItemMapper implements IMapper<CartItem, CartItemDataModel> {
@@ -40,8 +41,8 @@ export class CartItemMapper implements IMapper<CartItem, CartItemDataModel> {
         auditDeletedDateTime,
       };
       return cartItemDocument;
-    } catch (error) {
-      console.log(error);
+    } catch (error: any) {
+      throwApplicationError(HttpStatus.BAD_REQUEST, error.message);
     }
   }
 

backend/src/infrastructure/data_access/repositories/interfaces/order-repository.interface.ts

@@ -1,8 +1,10 @@
 import { Order } from 'src/order/order';
 import { OrderDataModel, OrderDocument } from '../schemas/order.schema';
 import { IGenericDocument } from 'src/infrastructure/database';
+import { CartItemDataModel } from '../schemas/cartItem.schema';
+import { Result } from 'src/domain';
 
 export interface IOrderRepository extends IGenericDocument<Order, OrderDocument> {
-  getOrders(): Promise<Order[]>;
-  createOrder(order: OrderDataModel): Promise<any>;
+  createOrder(order: OrderDataModel): Promise<Result<Order>>;
+  getDuplicateOrder(type: string, merchantId: string, cartItems: CartItemDataModel[]): Promise<boolean>;
 }

backend/src/infrastructure/data_access/repositories/order.repository.ts

@@ -7,6 +7,7 @@ import { OrderMapper } from './../../../order/order.mapper';
 import { IOrderRepository } from './interfaces/order-repository.interface';
 import { OrderDataModel, OrderDocument } from './schemas/order.schema';
 import { Result } from 'src/domain';
+import { CartItemDataModel } from './schemas/cartItem.schema';
 
 @Injectable()
 export class OrderRepository extends GenericDocumentRepository<Order, OrderDocument> implements IOrderRepository {
@@ -20,12 +21,22 @@ export class OrderRepository extends GenericDocumentRepository<Order, OrderDocum
     this.orderMapper = orderMapper;
   }
 
-  async getOrders(): Promise<Order[]> {
-    return (await this.find({})).getValue();
-  }
-
   async createOrder(order: OrderDataModel): Promise<Result<Order>> {
     const response = (await this.create(order)).getValue();
     return response ? Result.ok(response) : Result.fail('Could not create order', HttpStatus.INTERNAL_SERVER_ERROR);
   }
+
+  async getDuplicateOrder(type: string, merchantId: string, cartItems: CartItemDataModel[]): Promise<boolean> {
+    const currentTime: Date = new Date();
+    const duplicateTimeFrameInMinutes = 60 * 1000;
+    const selectedItemIds = cartItems.map((item) => item._id);
+    const result: Result<Order[]> = await this.find({
+      type,
+      merchantId,
+      cartItems: { $elemMatch: { $in: selectedItemIds } },
+      auditCreatedDateTime: { $gte: new Date(currentTime.getMilliseconds() - duplicateTimeFrameInMinutes) },
+    });
+    const potentialDuplicateOrder = result.getValue();
+    return potentialDuplicateOrder.length > 0;
+  }
 }

backend/src/infrastructure/database/mongoDB/generic-document.repository.ts

@@ -81,9 +81,6 @@ export abstract class GenericDocumentRepository<TEntity, T extends Document> imp
         .limit(options ? options.limit : null)
         .lean()
         .exec();
-      if (!documents?.length) {
-        throwApplicationError(HttpStatus.INTERNAL_SERVER_ERROR, 'documents does not exist');
-      }
       const entities = documents?.length ? documents.map((document) => this.mapper.toDomain(document)) : [];
       return Result.ok(entities);
     } catch (error) {

backend/src/order/order-entity.interface.ts

@@ -16,3 +16,6 @@ export interface IOrder {
   audit: Audit;
   cartItems?: CartItem[];
 }
+
+//tableNumber
+//status comment if any

backend/src/order/order.service.ts

@@ -1,11 +1,10 @@
 import { HttpStatus, Inject } from '@nestjs/common';
-import { Types } from 'mongoose';
 import { TYPES } from 'src/application';
 import { CartItem } from 'src/cart/cart-item';
 import { SelectedCartItem } from 'src/cart/selectedItems/selectedCartItem';
 import { Audit, Result } from 'src/domain';
 import { Context, IContextService, MerchantRepository } from 'src/infrastructure';
-import { CartItemRepository } from 'src/infrastructure/data_access/repositories/cart-item.repository';
+import { ICartItemRepository } from 'src/infrastructure/data_access/repositories/interfaces/cart-item-repository.interface';
 import { IOrderRepository } from 'src/infrastructure/data_access/repositories/interfaces/order-repository.interface';
 import { CartItemDataModel } from 'src/infrastructure/data_access/repositories/schemas/cartItem.schema';
 import { OrderDataModel } from 'src/infrastructure/data_access/repositories/schemas/order.schema';
@@ -20,7 +19,6 @@ import { Order } from './order';
 import { IOrderResponseDTO } from './order-response.dto';
 import { OrderMapper } from './order.mapper';
 import { OrderParser } from './order.parser';
-import { ICartItemRepository } from 'src/infrastructure/data_access/repositories/interfaces/cart-item-repository.interface';
 
 export class OrderService implements IOrderService {
   private context: Context;
@@ -42,6 +40,10 @@ export class OrderService implements IOrderService {
   async createOrder(orderSummary: CreateOrderDTO): Promise<Result<IOrderResponseDTO>> {
     await this.merchantService.validateContext();
     const { state, type, merchantId, total, cartItems } = orderSummary;
+    const orderDuplicate = await this.orderRepository.getDuplicateOrder(type, merchantId, cartItems);
+    if (orderDuplicate) {
+      throwApplicationError(HttpStatus.NOT_FOUND, 'Duplicate order detected. Please confirm.');
+    }
     const validateMerchant: Result<Merchant> = await this.merchantRepository.findOne({ _id: merchantId });
     if (!validateMerchant.isSuccess) {
       throwApplicationError(HttpStatus.NOT_FOUND, `Merchant does not exist`);
@@ -99,7 +101,6 @@ export class OrderService implements IOrderService {
         } else {
           throwApplicationError(HttpStatus.INTERNAL_SERVER_ERROR, `Could not create an order`);
         }
-
         const savedSelectedItems = insertedItems.getValue();
         const savedItemsMap = savedSelectedItems.reduce((map, item) => {
           const cartItemIdToString = this.cartItemRepository.objectIdToString(item.cartItemId);
@@ -116,6 +117,7 @@ export class OrderService implements IOrderService {
         return Result.ok(response);
       }
     } catch (error) {
+      console.error(error);
       session.abortTransaction();
     } finally {
       await session.endSession();