From 96f8e6a3f1f27e484a1166c111039888a608344f Mon Sep 17 00:00:00 2001 From: Olasunkanmi Oyinlola Date: Tue, 24 Oct 2023 10:10:02 +0800 Subject: [PATCH 1/2] fix errors and remove env from application --- backend/.gitignore | 4 +++- .../middlewares/context.middleware.ts | 2 +- frontend/src/apis/orderApi.ts | 24 ++++++++++--------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/backend/.gitignore b/backend/.gitignore index 7ce7d985..6021dc60 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -33,4 +33,6 @@ lerna-debug.log* !.vscode/tasks.json !.vscode/launch.json !.vscode/extensions.json -.vscode/launch.json \ No newline at end of file +.vscode/launch.json + +.env \ No newline at end of file diff --git a/backend/src/infrastructure/middlewares/context.middleware.ts b/backend/src/infrastructure/middlewares/context.middleware.ts index f9abcf52..63251c08 100644 --- a/backend/src/infrastructure/middlewares/context.middleware.ts +++ b/backend/src/infrastructure/middlewares/context.middleware.ts @@ -21,7 +21,7 @@ export class ContextMiddleWare implements NestMiddleware { // if (!Object.hasOwn(headers, APIResponseMessage.emailHeader)) { // errors.email = APIResponseMessage.emailHeaderError; // } - if (!Object.hasOwn(headers, APIResponseMessage.correlationIdHeader)) { + if (!Object.hasOwnProperty.call(headers, APIResponseMessage.correlationIdHeader)) { errors.correlationId = APIResponseMessage.correlationIdHeaderError; } for (const [key, value] of Object.entries(headers)) { diff --git a/frontend/src/apis/orderApi.ts b/frontend/src/apis/orderApi.ts index c913ed2c..be372538 100644 --- a/frontend/src/apis/orderApi.ts +++ b/frontend/src/apis/orderApi.ts @@ -18,7 +18,9 @@ const reduceSelectedItems = () => { if (menu.selectedItems) { menu.selectedItems.forEach((selectedItem) => { const itemId = selectedItem.id; - const existingItem = result.find((item: any) => item.id === itemId); + const existingItem = result.find( + (item: any) => item.id === itemId + ); if (existingItem) { existingItem.price += selectedItem.price; existingItem.quantity! += selectedItem.quantity!; @@ -35,13 +37,13 @@ const reduceSelectedItems = () => { return selectedItems; }; -const getCartItems = () => { - const orderSummary = getOrderSummary(); - if (orderSummary?.length) { - const selectedItemsMap = new Map(); - reduceSelectedItems.forEach((item) => {}); - orderSummary.map((summary) => { - const cartItem = summary.menus; - }); - } -}; +// const getCartItems = () => { +// const orderSummary = getOrderSummary(); +// if (orderSummary?.length) { +// const selectedItemsMap = new Map(); +// reduceSelectedItems.forEach((item) => {}); +// orderSummary.map((summary) => { +// const cartItem = summary.menus; +// }); +// } +// }; From 7f252c8af8d560717edf47089ccef64a868549da Mon Sep 17 00:00:00 2001 From: Olasunkanmi Oyinlola Date: Tue, 24 Oct 2023 10:40:34 +0800 Subject: [PATCH 2/2] fix build errors --- frontend/src/models/order.model.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/models/order.model.ts b/frontend/src/models/order.model.ts index 6054b762..ae40de81 100644 --- a/frontend/src/models/order.model.ts +++ b/frontend/src/models/order.model.ts @@ -1,4 +1,4 @@ -interface IOrder { +export interface IOrder { state: string; type: string; merchantId: string; @@ -6,14 +6,14 @@ interface IOrder { cartItems: IcartItems[]; } -interface IcartItems { +export interface IcartItems { menuId: string; total: number; quantity: number; selectedItems: IselectedItems[]; } -interface IselectedItems { +export interface IselectedItems { itemId: string; menuId: string; price: number;