From b7cf3d44aa891b396e5946b90b27c550bb16c26c Mon Sep 17 00:00:00 2001 From: Ben <36240171+benkyd@users.noreply.github.com> Date: Fri, 29 Apr 2022 04:35:14 +0100 Subject: [PATCH] orders Former-commit-id: df0cca4571f50a90d7da755bab48e06c4051bce7 --- README.md | Bin 7736 -> 9912 bytes client/public/auth.mjs | 14 +- client/public/basket/index.html | 2 +- client/public/checkout/index.html | 2 +- client/public/components/basket-popout.mjs | 2 +- client/public/components/checkout.mjs | 6 +- client/public/components/components.mjs | 2 + client/public/components/css/order.css | 233 ++++++++++++++++++ ...ble-basket-list.mjs => immutable-list.mjs} | 40 ++- client/public/components/navbar.mjs | 35 +-- client/public/components/order-list.mjs | 60 +++++ client/public/components/order.mjs | 129 ++++++++++ client/public/featured/index.html | 2 +- client/public/index.html | 2 +- client/public/orders/index.html | 37 +++ client/public/orders/order/index.html | 37 +++ client/public/product/index.html | 2 +- client/public/search/index.html | 2 +- db/schema.sql | 29 ++- src/controllers/order-controller.js | 142 ++++++++++- src/routes/api.js | 4 +- src/routes/order-router.js | 70 +++++- 22 files changed, 776 insertions(+), 76 deletions(-) create mode 100644 client/public/components/css/order.css rename client/public/components/{immutable-basket-list.mjs => immutable-list.mjs} (72%) create mode 100644 client/public/components/order-list.mjs create mode 100644 client/public/components/order.mjs create mode 100644 client/public/orders/index.html create mode 100644 client/public/orders/order/index.html diff --git a/README.md b/README.md index fe17397fe8bbe2ff78faa058090266e57dddb8b7..de33908f8bdd02121b2d819b9b3af824598b7f70 100644 GIT binary patch delta 2200 zcmZvd%}x|i5QU44AsAhVEJO@#Sg;vD62nRpkx1|dA!y>l7&FW?(4ptYnVuO~_1cYjM%p&V*{ZPh{LgFG7tjPAmN;?3IiperjF9O!DuwyF0_?h`SG6U+h93{0Bx+tAvIvhqRD-`Gd7T(V8uvvu3n`xo2M z^Ltws3O_@IAlV2q@Ju?HK_1+bIJR#B?^nQOaUcu$qB?faQ%6B4F*>9qH?`N*IuyM` z=n+83C$`+f!r4U@TkT4q6FDTCNPSs5>$gDz25DWfW@;0)(37}}pxiUv+kKvGoETXTGyr3=@=_n|R40}^=OZeERd_sSu zXPP3WlxPTN*V&G<(^ib zw*wi{{*AE_-QiQ$^#vSPhHD8Jh}Z`jGp8<>h?eo@bH1%R0IEK!^d?;u{~rJPx?l@B zwJO0p*L_D(5kyZEiNLj~DCF4t54y~FV*6ll{GmCt;^T-euNA8gW^zR5QPY5m*1Gzo zVQdri`XKWz<2=#(p?Y1#g%RWW`q=ZdS2#jH>zAkA(cK6*F_p#N^9zB_#_zyy=kQo2~ delta 135 zcmdntyTfLK6vyT(oK?d7E)0nbB|w}6#KjD$lWT<~HA@&W7*ZJ&7@Qc27%~}>8M1*g z3Jm!SX+Sa&h=YN$B@Da_T$9C>mQL1CHPH3~iYEg_vw^bSK$QhRHb~!JAU_SrF9Om~ PQzwV3ns1(?D#Hi>QraEO diff --git a/client/public/auth.mjs b/client/public/auth.mjs index d7977c4..a81f562 100644 --- a/client/public/auth.mjs +++ b/client/public/auth.mjs @@ -7,11 +7,13 @@ const AUTH0CONFIG = { }; let auth0 = null; +let ready = false; async function CheckRedirect() { const isAuthenticated = await auth0.isAuthenticated(); if (isAuthenticated) { localStorage.setItem('loggedIn', true); + ready = true; return; } @@ -23,6 +25,7 @@ async function CheckRedirect() { } catch (e) { window.alert(e.message || 'authentication error, sorry'); localStorage.setItem('loggedIn', false); + ready = false; Signout(); } @@ -32,9 +35,7 @@ async function CheckRedirect() { } export async function InitAuth0() { - // localStorage.setItem('loggedIn', false); - // localStorage.setItem('user', 'Guest'); - // localStorage.setItem('admin', false); + ready = false; auth0 = await window.createAuth0Client({ domain: AUTH0CONFIG.domain, @@ -50,6 +51,7 @@ export async function InitAuth0() { localStorage.setItem('user', user.given_name || user.nickname); NotifyNavbar('login', user); localStorage.setItem('loggedIn', true); + ready = true; // tell the server about the logon, so that it can make the proper // entry in the database, if there is for example an address @@ -69,6 +71,11 @@ export async function InitAuth0() { } export async function GetToken() { + /* eslint-disable-next-line */ + while (!ready) { + await new Promise(resolve => setTimeout(resolve, 100)); + } + const token = await auth0.getTokenSilently(); return token; } @@ -90,6 +97,7 @@ export async function LoginSignup() { export async function Signout() { localStorage.setItem('loggedIn', false); + ready = false; localStorage.setItem('user', 'Guest'); localStorage.setItem('admin', false); await auth0.logout({ diff --git a/client/public/basket/index.html b/client/public/basket/index.html index c46bece..11018d9 100644 --- a/client/public/basket/index.html +++ b/client/public/basket/index.html @@ -20,7 +20,7 @@ - + diff --git a/client/public/checkout/index.html b/client/public/checkout/index.html index fa6c7ac..b61df1d 100644 --- a/client/public/checkout/index.html +++ b/client/public/checkout/index.html @@ -19,7 +19,7 @@ - + diff --git a/client/public/components/basket-popout.mjs b/client/public/components/basket-popout.mjs index c17c69b..762d5af 100644 --- a/client/public/components/basket-popout.mjs +++ b/client/public/components/basket-popout.mjs @@ -66,7 +66,7 @@ class BasketPopout extends Component { {this.state.total} Items
- +
Subtotal: £${parseFloat(this.state.subtotal).toFixed(2)} diff --git a/client/public/components/checkout.mjs b/client/public/components/checkout.mjs index d048c52..88e1fc3 100644 --- a/client/public/components/checkout.mjs +++ b/client/public/components/checkout.mjs @@ -79,7 +79,7 @@ class Checkout extends Component {
Your Order edit basket
- +
@@ -363,10 +363,10 @@ class Checkout extends Component { } // clear basket - await Basket.ClearBasket(); + Basket.ClearBasket(); // redirect to receipt - window.location.href = `/order/${req.data.receipt_id}`; + window.location.href = `/orders/order?id=${req.data.receipt_id}`; // we're done ! }); } diff --git a/client/public/components/components.mjs b/client/public/components/components.mjs index a0baf63..371ab48 100644 --- a/client/public/components/components.mjs +++ b/client/public/components/components.mjs @@ -32,6 +32,7 @@ export class Component extends HTMLElement { Update() { } Render() { Component.__WARN('Render'); } OnRender() { } + OnUnMount() { } static __IDENTIFY() { Component.__WARN('identify'); } async connectedCallback() { @@ -60,6 +61,7 @@ export class Component extends HTMLElement { disconnectedCallback() { this.root.innerHTML = ''; + this.OnUnMount(); } watchAttributeChange(callback) { diff --git a/client/public/components/css/order.css b/client/public/components/css/order.css new file mode 100644 index 0000000..9e1fa4f --- /dev/null +++ b/client/public/components/css/order.css @@ -0,0 +1,233 @@ +.order-header { + display: flex; + flex-direction: column; + margin-top: 20px; + font-size: 2em; + border-bottom: 1px solid #ccc; +} + +.monospace { + font-family: monospace; + background-color: rgb(209, 209, 209); + font-size: 0.9em; + padding: 5px; +} + +.order-header-subtitle { + font-size: 0.6em; + margin-bottom: 20px; + margin-top: 10px; +} + +.order-body { + margin-top: 20px; + display: flex; + flex-direction: column; + align-items: flex-start; + justify-content: space-between; + width: 100%; +} + +.order-body-item { + display: flex; + flex-direction: column; + width: 100%; + order: 0; +} + +.order-breakdown-table { + margin-top: 20px; + width: 100%; + flex-wrap: wrap; + display: flex; + flex-direction: row; + align-items: flex-start; + justify-content: space-between; +} + +.order-breakdown-table-item { + display: flex; + flex-direction: column; + width: 30%; + height: 7em; + border: #ccc 1px solid; + /* background-color: #FAFBFB; */ + padding: 10px; + margin-bottom: 10px; + box-shadow: 0 0 5px rgba(0,0,0,0.75); + clip-path: inset(0px -5px 0px 0px); +} + +.order-breakdown-table-header { + font-size: 1.2em; + font-weight: bold; + color: #444; + margin-bottom: 10px; + text-transform: uppercase; +} + +.order-breakdown-table-row { + display: flex; + flex-direction: column; + align-items: flex-start; + justify-content: flex-start; + width: 100%; + margin-bottom: 10px; +} + +.order-breakdown-table-row-value { + font-size: 1em; + margin-bottom: 6px; +} + +.order-price-table-row { + width: 100%; + margin-top: 10px; + font-size: 1em; + color: #444; + font-weight: lighter; + border-bottom: 1px solid #ccc; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: flex-end; +} + +@media (pointer:none), (pointer:coarse), screen and (max-width: 900px) { + .order-breakdown-table { + flex-direction: column; + } + + .order-breakdown-table-item { + width: 100%; + height: auto; + } +} + +/* loosely based on https://codepen.io/luisar/pen/JjoOZav */ + +.order-body-item-table { + width: 100%; + margin-top: 10px; + display: flex; + flex-direction: row; + justify-content: space-between; +} + +.order-body-item-left { + width: 49%; + order: 0; +} + +.order-body-item-right { + width: 49%; + order: 1; +} + +.order-body-header { + margin-top: 20px; + font-size: 1.3em; + padding-bottom: 5px; + border-bottom: 1px solid #ccc; + margin-bottom: 10px; +} + +.order-track-step { + display: flex; + height: 7rem; +} + +.order-track-step:last-child { + overflow: hidden; + height: 4rem; +} + +.order-track-step:last-child .order-track-status div:last-of-type { + display: none; +} + +.order-track-status { + margin-right: 1.5rem; + position: relative; +} + +.order-track-step-icon { + display: block; + width: 1.8em; + height: 1.8em; + border-radius: 50%; + background: #F2CA52; +} + +.order-track-step-line { + display: block; + margin: 0 auto; + width: 4px; + height: 7rem; + background: #F2CA52; +} + +.completed { + background: #0EAD69; +} + +.order-body-status-title { + transform: translateY(-0.6em); + font-size: 1.2em; + font-weight: 500; + margin-bottom: 3px; +} + +.when { + font-size: 1em; + color: #444; + font-weight: lighter; +} + +.order-track { + margin-top: 20px; + transition: all .3s height 0.3s; + transform-origin: top center; +} + + +a { + text-decoration: none; + color: #444; +} + +.orders-list-body { + height: 100%; + display: flex; + flex-direction: column; + align-items: flex-start; + width: 100%; +} + +.orders-list-item { + display: flex; + flex-direction: column; + margin-top: 30px; + width: 100%; + order: 0; + border-bottom: 1px solid #ccc; +} + +.order-list-item-header { + display: flex; + flex-direction: row; + justify-content: space-between; + font-weight: bold; + margin-bottom: 10px; +} + +.order-list-item-header-subtitle { + font-weight: lighter; +} + +.order-list-item-body { + display: flex; + flex-direction: column; + width: 100%; + order: 0; +} diff --git a/client/public/components/immutable-basket-list.mjs b/client/public/components/immutable-list.mjs similarity index 72% rename from client/public/components/immutable-basket-list.mjs rename to client/public/components/immutable-list.mjs index 33d84fb..d59f059 100644 --- a/client/public/components/immutable-basket-list.mjs +++ b/client/public/components/immutable-list.mjs @@ -1,26 +1,25 @@ import { RegisterComponent, Component } from './components.mjs'; -import { GetBasketTotalPrice } from '../basket.mjs'; import * as LocalStorageListener from '../localstorage-listener.mjs'; -class ImmutableBasketList extends Component { - static __IDENTIFY() { return 'immutable-basket-list'; } +// This was changed to be generic from the original: ImmutableBasketList +// so it acts now on a local storage "source" instead of just basket +// works i guess /shrug +class ImmutableList extends Component { + static __IDENTIFY() { return 'immutable-list'; } constructor() { - super(ImmutableBasketList); + super(ImmutableList); } - async OnLocalBasketUpdate() { - const basket = localStorage.getItem('basket'); + OnLocalStorageListener() { + const itemsList = localStorage.getItem(this.state.source); - if (basket) { + if (itemsList) { try { - const basketJSON = JSON.parse(basket); - const subtotal = await GetBasketTotalPrice(); + const itemsJson = JSON.parse(itemsList); this.setState({ ...this.getState, - items: basketJSON.items, - total: basketJSON.total, - subtotal, + items: itemsJson.items, }); } catch (e) { console.log(e); @@ -29,26 +28,17 @@ class ImmutableBasketList extends Component { this.setState({ ...this.getState, items: {}, - total: 0, - subtotal: 0, }); } } OnMount() { - LocalStorageListener.ListenOnKey('basket', () => { - this.OnLocalBasketUpdate(Object.bind(this)); + LocalStorageListener.ListenOnKey(this.state.source, () => { + this.OnLocalStorageListener(Object.bind(this)); }); - this.setState({ - ...this.getState, - items: {}, - total: 0, - subtotal: 0, - }, false); - - this.OnLocalBasketUpdate(Object.bind(this)); + this.OnLocalStorageListener(Object.bind(this)); } Render() { @@ -115,4 +105,4 @@ class ImmutableBasketList extends Component { } } -RegisterComponent(ImmutableBasketList); +RegisterComponent(ImmutableList); diff --git a/client/public/components/navbar.mjs b/client/public/components/navbar.mjs index 59cfd1b..0dc5d91 100644 --- a/client/public/components/navbar.mjs +++ b/client/public/components/navbar.mjs @@ -46,22 +46,29 @@ class NavBar extends Component { return; } - if (localStorage.admin === 'true' || localStorage.admin === true) { - this.root.querySelector('.stock-mode').style.display = 'flex'; - } else { - this.root.querySelector('.stock-mode').style.display = 'none'; - } - const account = this.root.querySelector('.account-item'); - // doing this with proper dom manipulation wasn't working - account.innerHTML = ` - ${localStorage.user}▾ - - `; + if (localStorage.admin === 'true' || localStorage.admin === true) { + this.root.querySelector('.stock-mode').style.display = 'flex'; + account.innerHTML = ` + ${localStorage.user}▾ + + `; + } else { + this.root.querySelector('.stock-mode').style.display = 'none'; + account.innerHTML = ` + ${localStorage.user}▾ + + `; + } const logoutButton = account.querySelector('.logout-button'); logoutButton.addEventListener('click', () => { diff --git a/client/public/components/order-list.mjs b/client/public/components/order-list.mjs new file mode 100644 index 0000000..4380603 --- /dev/null +++ b/client/public/components/order-list.mjs @@ -0,0 +1,60 @@ +import { RegisterComponent, Component, SideLoad } from './components.mjs'; +import * as Auth from '../auth.mjs'; + +class OrderList extends Component { + static __IDENTIFY() { return 'order-list'; } + + constructor() { + super(OrderList); + } + + async OnMount() { + const options = { + method: 'GET', + headers: { Authorization: `Bearer ${await Auth.GetToken()}` }, + }; + + const res = await fetch('/api/auth/orders', options).then(res => res.json()); + + console.log(res); + + this.setState({ + ...this.getState, + orders: res.data, + }, false); + console.log(this.state); + } + + Render() { + return { + template: /* html */` +
+ Your Orders +
+ +
+ ${this.state.orders.map(order => /* html */` +
+
+
+ Order #${order.id} + Placed on ${new Date(order.date_placed).toDateString()} +
+
+ Paid: £${parseFloat(order.subtotal_paid).toFixed(2)} + Shipped? ${order.shipped ? 'Yes' : 'No'} +
+
+
+ `).join('')} +
+ `, + style: SideLoad('/components/css/order.css'), + }; + } + + OnRender() { + } +} + +RegisterComponent(OrderList); diff --git a/client/public/components/order.mjs b/client/public/components/order.mjs new file mode 100644 index 0000000..ee82c4b --- /dev/null +++ b/client/public/components/order.mjs @@ -0,0 +1,129 @@ +import { RegisterComponent, Component, SideLoad } from './components.mjs'; + +class Order extends Component { + static __IDENTIFY() { return 'order'; } + + constructor() { + super(Order); + } + + async OnMount() { + // get order id from search param + const query = new URLSearchParams(window.location.search); + const id = query.get('id'); + + const res = (await fetch(`/api/order/${id}`).then(res => res.json())).data; + + this.setState({ + ...this.getState, + id, + ...res, + }, false); + + console.log(this.state); + localStorage.setItem('viewing-order', JSON.stringify({ items: res.items })); + } + + Render() { + return { + template: /* html */` +
+ Thank You For Your Order! + Your order number is {this.state.id} +
+ +
+
+ Placed on ${new Date(this.state.date_placed).toDateString()} at ${new Date(this.state.date_placed).toLocaleTimeString()} +
+
+
+
+
Address
+
+ John Doe + 123 Example Av, + Portsmouth, + PO1 1EA +
+
+
+
Payment Card
+
+ **** **** **** 1111 + Expires: 01/20 +
+
+
+
+
Payment Breakdown
+
+ Discount Applied + £${parseFloat(this.state.discount).toFixed(2)} +
+
+ Total Paid + £${parseFloat(this.state.subtotal_paid).toFixed(2)} +
+
+
+
+
+
+
+
+
Order Status
+
+
+ +
+
+ +
+ Ordered + ${new Date(this.state.date_placed).toDateString()} +
+
+
+ +
+
+ +
+ Posted + +
+
+
+ +
+
+ +
+ Delivered + +
+
+
+
+
+
Your LegoLog Order
+ +
+
+
+ `, + style: SideLoad('/components/css/order.css'), + }; + } + + OnRender() { + // todo: add order tracking, the data is already there + } + + OnUnMount() { + localStorage.removeItem('viewing-order'); + } +} + +RegisterComponent(Order); diff --git a/client/public/featured/index.html b/client/public/featured/index.html index 052a891..3dbf3eb 100644 --- a/client/public/featured/index.html +++ b/client/public/featured/index.html @@ -23,7 +23,7 @@ - + diff --git a/client/public/index.html b/client/public/index.html index 0098619..491d276 100644 --- a/client/public/index.html +++ b/client/public/index.html @@ -24,7 +24,7 @@ - + diff --git a/client/public/orders/index.html b/client/public/orders/index.html new file mode 100644 index 0000000..7883009 --- /dev/null +++ b/client/public/orders/index.html @@ -0,0 +1,37 @@ + + + LegoLog Basket + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/public/orders/order/index.html b/client/public/orders/order/index.html new file mode 100644 index 0000000..7493d7a --- /dev/null +++ b/client/public/orders/order/index.html @@ -0,0 +1,37 @@ + + + LegoLog Basket + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/public/product/index.html b/client/public/product/index.html index b986128..e8dddec 100644 --- a/client/public/product/index.html +++ b/client/public/product/index.html @@ -19,7 +19,7 @@ - + diff --git a/client/public/search/index.html b/client/public/search/index.html index ec55e73..4ac10d0 100644 --- a/client/public/search/index.html +++ b/client/public/search/index.html @@ -24,7 +24,7 @@ - + diff --git a/db/schema.sql b/db/schema.sql index 83cb8c9..1c54257 100644 --- a/db/schema.sql +++ b/db/schema.sql @@ -90,15 +90,29 @@ CREATE TABLE IF NOT EXISTS users ( date_updated TIMESTAMP WITHOUT TIME ZONE NOT NULL ); + +CREATE TABLE IF NOT EXISTS offer_code ( + code TEXT NOT NULL PRIMARY KEY, + discount DECIMAL NOT NULL, -- percentage or fixed amount + discount_type INT NOT NULL, -- 0 = percentage, 1 = fixed amount + min_order_value DECIMAL NOT NULL, + type TEXT NOT NULL, -- set or brick + expiry_date TIMESTAMP WITHOUT TIME ZONE NOT NULL +); + CREATE TABLE IF NOT EXISTS order_log ( id VARCHAR (50) NOT NULL PRIMARY KEY, user_id VARCHAR (50), -- null if guest - offer_code SERIAL, subtotal_paid DECIMAL NOT NULL, + offer_code TEXT, discount DECIMAL, date_placed TIMESTAMP WITHOUT TIME ZONE NOT NULL, + shipped BOOLEAN NOT NULL, + date_shipped TIMESTAMP WITHOUT TIME ZONE, + recieved BOOLEAN NOT NULL, + date_recieved TIMESTAMP WITHOUT TIME ZONE, FOREIGN KEY ( user_id ) REFERENCES users( id ), - FOREIGN KEY ( offer_code ) REFERENCES offer_code( id ) + FOREIGN KEY ( offer_code ) REFERENCES offer_code( code ) ); CREATE TABLE IF NOT EXISTS order_item ( @@ -108,19 +122,8 @@ CREATE TABLE IF NOT EXISTS order_item ( brick_colour INT, set_id VARCHAR (50), amount INT NOT NULL, - price_paid DECIMAL NOT NULL, FOREIGN KEY ( order_id ) REFERENCES order_log( id ), FOREIGN KEY ( brick_id ) REFERENCES lego_brick( id ), FOREIGN KEY ( brick_colour ) REFERENCES lego_brick_colour( id ), FOREIGN KEY ( set_id ) REFERENCES lego_set( id ) ); - -CREATE TABLE IF NOT EXISTS offer_code ( - id SERIAL NOT NULL PRIMARY KEY, - code TEXT NOT NULL, - discount DECIMAL NOT NULL, -- percentage or fixed amount - discount_type INT NOT NULL, -- 0 = percentage, 1 = fixed amount - min_order_value DECIMAL NOT NULL, - type TEXT NOT NULL, -- set or brick - expiry_date TIMESTAMP WITHOUT TIME ZONE NOT NULL -); diff --git a/src/controllers/order-controller.js b/src/controllers/order-controller.js index de728cb..17da9e8 100644 --- a/src/controllers/order-controller.js +++ b/src/controllers/order-controller.js @@ -1,14 +1,154 @@ const Database = require('../database/database.js'); const Logger = require('../logger.js'); +const Crypto = require('crypto'); // C +async function NewOrder(userId, total, items, discountId = null, discountApplied = null) { + // generate unique hex order id xxxx-xxxx-xxxx-xxxx "somewhat securely" + const orderId = (Crypto.randomBytes(2).toString('hex') + '-' + + Crypto.randomBytes(2).toString('hex') + '-' + + Crypto.randomBytes(2).toString('hex') + '-' + + Crypto.randomBytes(2).toString('hex')).toUpperCase(); + + // user_id and discount_id are optional and can be null + await Database.Query('BEGIN TRANSACTION;'); + const dbres = await Database.Query(` + INSERT INTO order_log (id, user_id, subtotal_paid, offer_code, discount, date_placed, shipped, recieved) + VALUES ($1, $2, $3, $4, $5, NOW(), FALSE, FALSE) + `, [orderId, userId, total, discountId, discountApplied]).catch(() => { + return { + error: 'Database error', + }; + }); + + let dbresOrderItemError = false; + + // this worked first time, it MUST be wrong + for (const [key, item] of Object.entries(items)) { + const brickId = item.type === 'brick' ? key.split('~')[0] : null; + const brickModifier = key.split('~')[1] || null; + const setId = item.type === 'set' ? key : null; + + await Database.Query(` + INSERT INTO order_item (order_id, brick_id, brick_colour, set_id, amount) + VALUES ($1, $2, $3, $4, $5) + `, [orderId, brickId, brickModifier, setId, item.quantity]).catch(() => { + dbresOrderItemError = true; + }); + } + + if (dbres.error || dbresOrderItemError) { + Database.Query('ROLLBACK TRANSACTION;'); + Logger.Error('Something went wrong inserting an order into the database'); + return { + error: 'Database error', + }; + } + Database.Query('COMMIT TRANSACTION;'); + + return orderId; +} + // R +async function GetOrderById(orderid) { + await Database.Query('BEGIN TRANSACTION;'); + const dbres = await Database.Query(` + SELECT order_log.id, order_log.user_id, subtotal_paid, offer_code, + discount, date_placed, shipped, date_shipped, recieved, + date_recieved, item.brick_id, item.brick_colour, item.set_id, item.amount + FROM order_log + LEFT JOIN order_item AS item ON item.order_id = order_log.id + WHERE order_log.id = $1 + `, [orderid]).catch(() => { + return { + error: 'Database error', + }; + }); + + if (dbres.error) { + Database.Query('ROLLBACK TRANSACTION;'); + Logger.Error(dbres.error); + return { + error: 'Database error', + }; + } + Database.Query('COMMIT TRANSACTION;'); + + const result = dbres.rows; + + const items = {}; + for (const item of result) { + if (item.brick_id) { + items[`${item.brick_id}~${item.brick_colour}`] = { + type: 'brick', + quantity: item.amount, + }; + } else if (item.set_id) { + items[item.set_id] = { + type: 'set', + quantity: item.amount, + }; + } + } + + return { + id: result[0].id, + user_id: result[0].user_id, + subtotal_paid: result[0].subtotal_paid, + offer_code: result[0].offer_code, + discount: result[0].discount, + date_placed: result[0].date_placed, + shipped: result[0].shipped, + date_shipped: result[0].date_shipped, + recieved: result[0].recieved, + date_recieved: result[0].date_recieved, + items, + }; +} + +async function GetOrdersByUser(userId) { + await Database.Query('BEGIN TRANSACTION;'); + const dbres = await Database.Query(` + SELECT order_log.id, order_log.user_id, subtotal_paid, + discount, date_placed, shipped + FROM order_log + WHERE order_log.user_id = $1 + `, [userId]).catch(() => { + return { + error: 'Database error', + }; + }); + if (dbres.error) { + Database.Query('ROLLBACK TRANSACTION;'); + Logger.Error(dbres.error); + return { + error: 'Database error', + }; + } + Database.Query('COMMIT TRANSACTION;'); + + const result = dbres.rows; + return result; +} + // U +async function OrderShipped(orderid) { + +} + +async function OrderRecieved(orderid) { + +} + // D module.exports = { - + NewOrder, + GetOrderById, + GetOrdersByUser, + OrderShipped, + OrderRecieved, }; diff --git a/src/routes/api.js b/src/routes/api.js index 8fbcf3c..55ac369 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -25,11 +25,11 @@ function Init() { Server.App.post('/api/basket/price/', Helpers.CalculateBasketPrice); Server.App.get('/api/discount/', Helpers.DiscountCode); Server.App.post('/api/order/', Order.ProcessNew); - Server.App.get('/api/order:id'); + Server.App.get('/api/order/:id', Order.GetOrder); Server.App.get('/api/auth/login/', Auth0.JWTMiddleware, Auth0.Login); Server.App.post('/api/auth/order/', Auth0.JWTMiddleware, Order.ProcessNew); - Server.App.get('/api/auth/orders/'); + Server.App.get('/api/auth/orders/', Auth0.JWTMiddleware, Order.GetOrders); Logger.Module('API', 'API Routes Initialized'); } diff --git a/src/routes/order-router.js b/src/routes/order-router.js index b994652..c6ade31 100644 --- a/src/routes/order-router.js +++ b/src/routes/order-router.js @@ -2,11 +2,10 @@ const ControllerMaster = require('../controllers/controller-master.js'); const MiscController = require('../controllers/misc-controller.js'); const BrickController = require('../controllers/brick-controller.js'); const SetController = require('../controllers/set-controller.js'); +const OrderController = require('../controllers/order-controller.js'); const AuthRouter = require('./auth0-router.js'); async function ProcessNew(req, res) { - console.log(req.body); - // as it's optional auth, 0 is guest let userID = null; if (req.auth) { @@ -16,8 +15,6 @@ async function ProcessNew(req, res) { } } - console.log(userID); - // validate the request if (!req.body.basket) { return res.send({ @@ -26,7 +23,7 @@ async function ProcessNew(req, res) { } const basket = req.body.basket; - const discountCode = req.body.discountCode || ''; + const discountCode = req.body.discountCode || null; // validate the basket @@ -114,11 +111,13 @@ async function ProcessNew(req, res) { // now we need to calculate the discount (if applicable) // again, this could do with some consolidation - let discount = 0; - if (discountCode !== '') { + let discount = { + discount: 0, + }; + if (discountCode !== null) { const sanatisedCode = ControllerMaster.SanatiseQuery(req.query.code); - const discount = await MiscController.GetDiscount(sanatisedCode); + discount = await MiscController.GetDiscount(sanatisedCode); if (discount.error) { return res.send({ @@ -133,9 +132,64 @@ async function ProcessNew(req, res) { } } + const total = basketSubtotal - discount.discount; + const order = await OrderController.NewOrder(userID, total, basket, discountCode, discount.discount); + + if (order.error) { + return res.send({ + error: order.error, + }); + } + + return res.send({ + data: { + receipt_id: order, + }, + }); +} + +async function GetOrder(req, res) { + const orderId = req.params.id; + + if (!orderId) { + return res.send({ + error: 'No order id in request', + }); + } + + const order = await OrderController.GetOrderById(orderId); + + if (order.error) { + return res.send({ + error: order.error, + }); + } + + return res.send({ + data: order, + }); +} + +async function GetOrders(req, res) { + const user = await AuthRouter.Auth0GetUser(req); + const userId = user.sub.split('|')[1]; + + const orders = await OrderController.GetOrdersByUser(userId); + + if (orders.error) { + return res.send({ + error: orders.error, + }); + } + + return res.send({ + data: orders, + }); } module.exports = { ProcessNew, + GetOrder, + GetOrders, };