Development

backend/.vscode/launch.json

@@ -21,7 +21,7 @@
       "request": "launch",
       "name": "Test",
       "runtimeExecutable": "npm",
-      "runtimeArgs": ["run", "test:unit", "src/restaurant/restaurant-service.spec.ts", "--inspect-brk"],
+      "runtimeArgs": ["run", "test:unit", "src/order/order-service.spec.ts", "--inspect-brk"],
       // "src/infrastructure/data_access/db_repositories/worker_sql_repository.spec.ts",
       "console": "integratedTerminal",
       "restart": true,

backend/src/application/constants/types.ts

@@ -29,4 +29,5 @@ export const TYPES = {
   IOrderNoteService: Symbol('IOrderNoteService'),
   IOrderProcessingQueueRepository: Symbol('IOrderProcessingQueueRepository'),
   IOrderProcessingQueueService: Symbol('IOrderProcessingQueueService'),
+  IMerchantRepository: Symbol('IMerchantRepository'),
 };

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

@@ -0,0 +1,5 @@
+import { IGenericDocument } from 'src/infrastructure/database';
+import { Merchant } from 'src/merchant';
+import { MerchantDocument } from '../schemas';
+
+export interface IMerchantRepository extends IGenericDocument<Merchant, MerchantDocument> {}

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

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

backend/src/infrastructure/data_access/repositories/models/order-model.interface.ts

@@ -1,9 +1,10 @@
 import { Types } from 'mongoose';
-import { currentStatus, dinningType } from 'src/order/order-entity.interface';
+import { dinningType } from 'src/order/order-entity.interface';
 import { CartItemDataModel } from '../schemas/cartItem.schema';
+import { OrderStatusModel } from '../schemas/order-status.schema';
 
 export interface IOrderDataModel {
-  readonly state: currentStatus;
+  readonly state: OrderStatusModel;
   readonly type: dinningType;
   readonly merchantId: Types.ObjectId;
   readonly customerId?: Types.ObjectId;

backend/src/infrastructure/data_access/repositories/models/order-note-model.interface.ts

@@ -2,5 +2,6 @@ import { Types } from 'mongoose';
 
 export interface IOrderNoteModel {
   orderId: Types.ObjectId;
+  menuId: Types.ObjectId;
   note: string;
 }

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

@@ -8,6 +8,7 @@ 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';
+import { CreateCartItemsDTO } from 'src/order/dto/create-order.dto';
 
 @Injectable()
 export class OrderRepository extends GenericDocumentRepository<Order, OrderDocument> implements IOrderRepository {
@@ -26,15 +27,21 @@ export class OrderRepository extends GenericDocumentRepository<Order, OrderDocum
     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> {
+  async getDuplicateOrder(type: string, merchantId: string, cartItems: CreateCartItemsDTO[]): Promise<boolean> {
     const currentTime: Date = new Date();
-    const duplicateTimeFrameInMinutes = 60 * 1000;
-    const selectedItemIds = cartItems.map((item) => item._id);
+    const initDuplicateTimeFrameInMinutes = 60 * 1000;
+    const finalDuplicateTimeFrameInMinutes = initDuplicateTimeFrameInMinutes * 4;
+    const initDuplicateTimeInMilliSeconds = new Date(currentTime.getMilliseconds() - initDuplicateTimeFrameInMinutes);
+    const selectedItems = cartItems.flatMap((item) => item.selectedItems);
+    const selectedItemIds = selectedItems.map((item) => item.itemId);
     const result: Result<Order[]> = await this.find({
       type,
       merchantId,
       cartItems: { $elemMatch: { $in: selectedItemIds } },
-      auditCreatedDateTime: { $gte: new Date(currentTime.getMilliseconds() - duplicateTimeFrameInMinutes) },
+      auditCreatedDateTime: {
+        $gte: initDuplicateTimeInMilliSeconds,
+        $lt: new Date(currentTime.getMilliseconds() + finalDuplicateTimeFrameInMinutes),
+      },
     });
     const potentialDuplicateOrder = result.getValue();
     return potentialDuplicateOrder.length > 0;

backend/src/infrastructure/data_access/repositories/schemas/menu.schema.ts

@@ -16,9 +16,6 @@ export class MenuDataModel extends BaseDocument implements IMenuDataModel {
   @Prop({ type: String, required: false })
   description: string;
 
-  @Prop({ type: String, required: false })
-  note: string;
-
   @Prop({ type: String })
   imageUrl: string;
 

backend/src/infrastructure/data_access/repositories/schemas/order-note.schema.ts

@@ -4,6 +4,7 @@ import { IOrderNoteModel } from '../models/order-note-model.interface';
 import mongoose, { Document, Types } from 'mongoose';
 import { Type } from 'class-transformer';
 import { OrderDataModel } from './order.schema';
+import { MenuDataModel } from './menu.schema';
 
 export type OrderNoteDocument = OrderNoteModel & Document;
 export class OrderNoteModel extends BaseDocument implements IOrderNoteModel {
@@ -13,6 +14,10 @@ export class OrderNoteModel extends BaseDocument implements IOrderNoteModel {
   @Prop({ type: mongoose.Schema.Types.ObjectId })
   @Type(() => OrderDataModel)
   orderId: Types.ObjectId;
+
+  @Prop({ type: mongoose.Schema.Types.ObjectId })
+  @Type(() => MenuDataModel)
+  menuId: Types.ObjectId;
 }
 
 export const OrderNoteSchema = SchemaFactory.createForClass(OrderNoteModel);

backend/src/infrastructure/data_access/repositories/schemas/order.schema.ts

@@ -7,14 +7,12 @@ import { currentStatus, dinningType } from './../../../../order/order-entity.int
 import { MerchantDataModel } from './merchant.schema';
 import { OrderManagerDataModel } from './order-manger.schema';
 import { CartItemDataModel } from './cartItem.schema';
+import { OrderStatusModel } from './order-status.schema';
 
 export type OrderDocument = OrderDataModel & Document;
 
 @Schema({ versionKey: 'false' })
 export class OrderDataModel extends BaseDocument implements IOrderDataModel {
-  @Prop({ type: String, required: true, default: 'CREATED' })
-  state: currentStatus;
-
   @Prop({ type: String, required: true })
   type: dinningType;
 
@@ -32,9 +30,13 @@ export class OrderDataModel extends BaseDocument implements IOrderDataModel {
   @Prop({ type: Number, required: true })
   total: number;
 
-  @Prop({ type: [{ type: mongoose.Schema.Types.ObjectId, ref: CartItemDataModel }] })
+  @Prop({ type: [{ type: mongoose.Schema.Types.ObjectId, ref: () => CartItemDataModel }] })
   @Type(() => CartItemDataModel)
   cartItems?: CartItemDataModel[];
+
+  @Prop({ type: [{ type: mongoose.Schema.Types.ObjectId, ref: () => OrderStatusModel }] })
+  @Type(() => OrderStatusModel)
+  state: OrderStatusModel;
 }
 
 export const OrderSchema = SchemaFactory.createForClass(OrderDataModel);

backend/src/menu/menu.mapper.ts

@@ -16,7 +16,7 @@ export class MenuMapper implements IMapper<Menu, MenuDataModel> {
     private readonly categoryMapper: CategoryMapper,
   ) {}
   toPersistence(entity: Menu): MenuDataModel {
-    const { items, name, description, audit, discount, imageUrl, basePrice, category, restaurantId, note } = entity;
+    const { items, name, description, audit, discount, imageUrl, basePrice, category, restaurantId } = entity;
     const {
       auditCreatedBy,
       auditCreatedDateTime,
@@ -36,7 +36,6 @@ export class MenuMapper implements IMapper<Menu, MenuDataModel> {
       discount,
       imageUrl,
       basePrice,
-      note,
       restaurantId,
       category: this.categoryMapper.toPersistence(category),
       items: itemsToPersistence,
@@ -51,7 +50,7 @@ export class MenuMapper implements IMapper<Menu, MenuDataModel> {
   }
 
   toDomain(model: MenuDataModel): Menu {
-    const { _id, items, name, description, discount, imageUrl, basePrice, category, restaurantId, note } = model;
+    const { _id, items, name, description, discount, imageUrl, basePrice, category, restaurantId } = model;
     let itemsToDomain: Item[] = [];
     if (items?.length) {
       itemsToDomain = items.map((item) => this.itemMapper.toDomain(item));
@@ -66,7 +65,6 @@ export class MenuMapper implements IMapper<Menu, MenuDataModel> {
         discount,
         imageUrl,
         basePrice,
-        note,
         audit: this.auditMapper.toDomain(model),
       },
       _id,

backend/src/menu/menu.ts

@@ -17,7 +17,6 @@ export class Menu extends Entity<IMenu> implements IMenu {
   _basePrice: number;
   _category: Category;
   _restaurantId: Types.ObjectId;
-  _note?: string;
   constructor(id: Types.ObjectId, props: IMenu) {
     super(id);
     this._name = props.name;
@@ -29,7 +28,6 @@ export class Menu extends Entity<IMenu> implements IMenu {
     this._basePrice = props.basePrice;
     this._category = props.category;
     this._restaurantId = props.restaurantId;
-    this._note = props.note;
   }
 
   get name(): string {
@@ -40,14 +38,6 @@ export class Menu extends Entity<IMenu> implements IMenu {
     this._name = value;
   }
 
-  get note(): string | undefined {
-    return this._note;
-  }
-
-  set note(value: string) {
-    this._note = value;
-  }
-
   get description(): string | undefined {
     return this._description;
   }

backend/src/merchant/merchant-service.spec.ts

@@ -45,7 +45,7 @@ describe('Test merchant service', () => {
         email: 'ola@tesla.com',
         passwordHash: '',
       };
-      validateUserStub.getUser = async (): Promise<any | undefined> => {
+      validateUserStub.getUser = async (): Promise<any> => {
         return merchantMockData;
       };
       contextServiceStub.getContext = (): Context => {
@@ -98,7 +98,7 @@ describe('Test merchant service', () => {
     contextServiceStub.getContext = (): Context => {
       return new Context('ola@tesla.com', '');
     };
-    validateUserStub.getUser = async (): Promise<any | undefined> => {
+    validateUserStub.getUser = async (): Promise<any> => {
       return merchantMockData;
     };
     merchantRepositoryStub.findById = async (): Promise<Result<Merchant>> => {
@@ -143,7 +143,7 @@ describe('Test merchant service', () => {
       auditModifiedBy: 'Ola@gmail.com',
       auditModifiedDateTime: new Date().toString(),
     };
-    validateUserStub.getUser = async (): Promise<any | undefined> => {
+    validateUserStub.getUser = async (): Promise<any> => {
       return merchantMockData;
     };
     merchantRepositoryStub.findById = async (): Promise<Result<Merchant>> => {

backend/src/order/dto/create-order.dto.ts

@@ -1,6 +1,6 @@
 import { IsArray, IsNotEmpty, IsNumber, IsOptional, IsString } from 'class-validator';
 import { currentStatus, dinningType } from '../order-entity.interface';
-import { CartItemDataModel } from 'src/infrastructure/data_access/repositories/schemas/cartItem.schema';
+import { Types } from 'mongoose';
 
 export class CreateOrderDTO {
   @IsString()
@@ -21,5 +21,48 @@ export class CreateOrderDTO {
 
   @IsOptional()
   @IsArray()
-  cartItems: CartItemDataModel[];
+  cartItems: CreateCartItemsDTO[];
+}
+
+export class CreateCartItemsDTO {
+  @IsString()
+  @IsNotEmpty()
+  menuId: Types.ObjectId;
+
+  @IsNotEmpty()
+  orderId: Types.ObjectId;
+
+  @IsString()
+  @IsNotEmpty()
+  note: string;
+
+  @IsNumber()
+  @IsNotEmpty()
+  total: number;
+
+  @IsNotEmpty()
+  @IsArray()
+  selectedItems: CreateSelectedItemsDTO[];
+}
+
+class CreateSelectedItemsDTO {
+  @IsNotEmpty()
+  @IsString()
+  cartItemId: string;
+
+  @IsString()
+  @IsNotEmpty()
+  menuId: string;
+
+  @IsString()
+  @IsNotEmpty()
+  itemId: string;
+
+  @IsNumber()
+  @IsNotEmpty()
+  price: number;
+
+  @IsNumber()
+  @IsNotEmpty()
+  quantity: number;
 }

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

@@ -1,12 +1,13 @@
 import { Types } from 'mongoose';
 import { CartItem } from 'src/cart/cart-item';
 import { Audit } from 'src/domain';
+import { OrderStatus } from 'src/order_statuses/order_status';
 
 export type currentStatus = 'CREATED' | 'ACCEPTED' | 'DENIED' | 'FINISHED' | 'CANCELLED';
 export type dinningType = 'PICK_UP' | 'DINE_IN' | 'DELIVERY';
 
 export interface IOrder {
-  state: currentStatus;
+  state: OrderStatus;
   type: dinningType;
   merchantId: Types.ObjectId;
   customerId?: Types.ObjectId;

backend/src/order/order-response.dto.ts

@@ -1,9 +1,10 @@
 import { Types } from 'mongoose';
 import { IAudit } from 'src/infrastructure';
+import { OrderStatus } from 'src/order_statuses/order_status';
 
 export interface IOrderResponseDTO extends IAudit {
   id: Types.ObjectId;
-  state: string;
+  state: OrderStatus;
   type: string;
   merchantId: Types.ObjectId;
   customerId?: Types.ObjectId;

backend/src/order/order.mapper.ts

@@ -4,10 +4,15 @@ import { IMapper } from 'src/domain';
 import { OrderDataModel } from 'src/infrastructure/data_access/repositories/schemas/order.schema';
 import { Order } from './order';
 import { AuditMapper } from 'src/audit';
+import { OrderStatusMapper } from 'src/order_statuses/order_status.mapper';
 
 @Injectable()
 export class OrderMapper implements IMapper<Order, OrderDataModel> {
-  constructor(private readonly auditMapper: AuditMapper, private readonly cartItemMapper: CartItemMapper) {}
+  constructor(
+    private readonly auditMapper: AuditMapper,
+    private readonly cartItemMapper: CartItemMapper,
+    private readonly orderStatusMapper: OrderStatusMapper,
+  ) {}
   toPersistence(entity: Order): OrderDataModel {
     const { id, state, type, merchantId, total, discount, orderManagerId, audit, cartItems } = entity;
     const {
@@ -20,7 +25,7 @@ export class OrderMapper implements IMapper<Order, OrderDataModel> {
     } = audit;
     const orderDocument: OrderDataModel = {
       _id: id,
-      state,
+      state: this.orderStatusMapper.toPersistence(state),
       type,
       merchantId,
       total,
@@ -41,7 +46,7 @@ export class OrderMapper implements IMapper<Order, OrderDataModel> {
     const { state, type, merchantId, total, discount, orderManagerId, _id, cartItems } = model;
     const entity: Order = Order.create(
       {
-        state,
+        state: this.orderStatusMapper.toDomain(state),
         type,
         merchantId,
         total,

backend/src/order/order.module.ts

@@ -28,6 +28,12 @@ import { OrderMapper } from './order.mapper';
 import { OrderService } from './order.service';
 import { OrderController } from './order.controller';
 import { ContextMiddleWare } from 'src/infrastructure/middlewares';
+import { OrderStatusRepository } from 'src/infrastructure/data_access/repositories/order-status.repository';
+import {
+  OrderStatusModel,
+  OrderStatusSchema,
+} from 'src/infrastructure/data_access/repositories/schemas/order-status.schema';
+import { OrderStatusMapper } from 'src/order_statuses/order_status.mapper';
 
 @Module({
   imports: [
@@ -37,6 +43,7 @@ import { ContextMiddleWare } from 'src/infrastructure/middlewares';
       { name: ItemDataModel.name, schema: ItemSchema },
       { name: CartItemDataModel.name, schema: CartItemSchema },
       { name: SelectedCartItemDataModel.name, schema: SelectedCartItemSchema },
+      { name: OrderStatusModel.name, schema: OrderStatusSchema },
     ]),
   ],
   controllers: [OrderController],
@@ -47,6 +54,7 @@ import { ContextMiddleWare } from 'src/infrastructure/middlewares';
     { provide: TYPES.IMerchantService, useClass: MerchantService },
     { provide: TYPES.IContextService, useClass: ContextService },
     { provide: TYPES.IValidateUser, useClass: ValidateUser },
+    { provide: TYPES.IOrderStatusRepository, useClass: OrderStatusRepository },
     MerchantRepository,
     CartItemRepository,
     SelectedCartItemRepository,
@@ -56,6 +64,7 @@ import { ContextMiddleWare } from 'src/infrastructure/middlewares';
     JwtService,
     MerchantMapper,
     AuditMapper,
+    OrderStatusMapper,
   ],
 })
 export class OrderModule implements NestModule {