diff --git a/UI/css/main.css b/UI/css/main.css index 320fba2..bc3138c 100644 --- a/UI/css/main.css +++ b/UI/css/main.css @@ -156,7 +156,8 @@ nav{ } .profile_img{ padding-top: 10px; - background: white; + background: white; + height: 210px; } .profile_img > img{ @@ -323,6 +324,38 @@ article{ font-size: 20px; } +.home::before{ + position: absolute; + content: '\f015'; + font-weight: 900; + font-size: 25px; + top:-5px; + right:200px; +} + +.pos::before{ + position: absolute; + content: '\f067'; + font-weight: 900; + left:70px; + font-size:20px +} + +.ord::before{ + position: absolute; + content: '\f218'; + font-weight: 900; + font-size: 20px; + left: 70px +} +.mads::before{ + position: absolute; + content: '\f02c'; + font-weight: 900; + left:70px; + font-size:20px +} + .grow { transform: scale(1); } @@ -339,7 +372,7 @@ article{ justify-content: center } -.tag-button > button{ +.tag-button > button, .postAds{ margin: 60px 10px 10px 10px; padding:20px; font-size: 16px; @@ -350,6 +383,11 @@ article{ transition: all 0.25s linear; } +.postAds{ + margin:0; + margin-right:120px; +} + .tag-button > button:nth-child(1){ background: red; } @@ -429,6 +467,53 @@ article > p{ margin: 7px } +.loader { + border: 5px solid #f3f3f3; + border-radius: 50%; + border-top: 5px solid #3498db; + width: 20px; + height: 20px; + animation: spin 1s linear infinite; + position: absolute; + /* top: auto; */ + /* bottom: auto; */ + left: 0; + right:0; + margin: auto; + /* margin-top: -5px; */ + /* padding: */ + + } + + @keyframes spin { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } + } + + + .connn{ + display: flex; + align-items: center; + width: 100%; + /* position: relative; */ + } + .loaderw { + border: 5px solid #f3f3f3; + border-radius: 50%; + border-top: 5px solid #3498db; + width: 40px; + height: 40px; + animation: spin 1s linear infinite; + position: absolute; + top: 250px; + /* bottom: 0; */ + left: 0; + right:0; + margin: auto; + /* margin-top: -5px; */ + /* padding: */ + + } #main_bar{ height: 91vh; @@ -636,14 +721,15 @@ h3{ width:400px; height:300px; border:2px solid grey; - padding: 3px + padding: 3px; + margin-right: 150px; } .car-model > label{ display: flex; - margin: auto; + margin-left: 100px; margin-top: 20px; padding:10px; - width:25%; + width:20%; border: 2px solid slateblue; background: white; transition: all 0.25 linear ease; diff --git a/UI/css/style.css b/UI/css/style.css index 22c456e..e52ca4c 100644 --- a/UI/css/style.css +++ b/UI/css/style.css @@ -111,7 +111,7 @@ nav{ rgba(0,0,0,0.8), rgba(96,73,203,0.8) ), - url(../img/34.jpg) no-repeat; + url(http://res.cloudinary.com/amoslv/image/upload/v1582802896/f2srootnaczaeav2agsv.jpg) no-repeat; background-size: cover; display: flex; align-items: center; @@ -980,4 +980,4 @@ footer{ font-size: 16px } -} \ No newline at end of file +} diff --git a/UI/index.html b/UI/index.html index bd43f83..2b10484 100644 --- a/UI/index.html +++ b/UI/index.html @@ -269,8 +269,8 @@

24 Hour

- - + + diff --git a/UI/js/automart.js b/UI/js/automart.js new file mode 100644 index 0000000..1d1c505 --- /dev/null +++ b/UI/js/automart.js @@ -0,0 +1,112 @@ +/* eslint-disable no-unused-vars */ +/* eslint-disable no-undef */ + +const showBox = document.querySelector('.scrolling-ads'); +const input = document.querySelector('.iin'); +const post = document.querySelector('.postAds'); +const spinne = document.querySelector('.spinne'); +const spin = document.querySelector('.spin'); +const Bar = document.querySelector('#bar'); +const modelDetails = document.querySelector('.model-details'); +const profile = document.querySelector('.pross'); + + +modelDetails.style.display = 'none'; +showBox.style.display = 'none'; +Bar.style.display = 'none'; +let carStatus; +const displayCars = (carObj) => { + carStatus = 'newest'; + const { + id, car_image, manufacturer, model, status, price, + } = carObj; + // console.log(carObj); + if (status === 'sold') carStatus = 'solder'; + const carHtml = ` + +
+ +

${manufacturer} ${model}

+

Nigeria

+

N${price}

+
+ `; + + return carHtml; +}; + +const getCarDetails = () => { + const manufacturer = document.querySelector('.manufacturer').value; + const model = document.querySelector('.model').value; + const bodyType = document.querySelector('.body-type').value; + const price = document.querySelector('.price').value; + const state = document.querySelector('.state').value; + // const location = document.querySelector('.locationn').value; + const carObj = { + manufacturer, model, body_type: bodyType, price, state, + }; + return carObj; +}; +let carimage; + +input.addEventListener('input', async (e) => { + // console.log(profile); + profile.attributes.src.value = URL.createObjectURL(input.files[0]); + const fet = async (formData) => { + const object = { + method: 'post', + headers: new Headers({ + token, + }), + body: formData, + }; + + const response = await fetch(`${devURL}upload`, object); + const statusCode = response.status; + const responseObj = await response.json(); + return { responseObj, statusCode }; + }; + + const formData = new FormData(); + formData.append('photo', input.files[0]); + formData.append('files', 'photo'); + + spin.showModal(); + + carimage = await fet(formData); + // console.log(carimage); + + spin.className = 'grow'; + + if (carimage.statusCode === 200) { + modelDetails.style.display = 'block'; + spin.close(); + // post.disable = false; + } + + if (carimage.statusCode === 400) { + // modelDetails.style.display = 'none'; + notify.textContent = 'Network Error, Please Reload'; + spin.close(); + } +}); +// console.log(post.disable = true); +post.addEventListener('click', async () => { + if (carimage.responseObj.data) { + const carDetails = getCarDetails(); + const url = `${devURL}/car/`; + const postCar = await fetcher(url, 'POST', carDetails); + + if (postCar.statusCode === 201) { + const urx = `${devURL}cars/${postCar.responseObj.data.id}`; + const { responseObj, statusCode } = await fetcher(urx, 'PATCH', { car_image: carimage.responseObj.data }); + if (statusCode === 200) { + // console.log(responseObj); + window.location = 'main.html'; + } + } + // if (statusCode === 400) { + + // } + } +}); diff --git a/UI/js/config.js b/UI/js/config.js index 69ef56e..2234363 100644 --- a/UI/js/config.js +++ b/UI/js/config.js @@ -1,7 +1,7 @@ /* eslint-disable no-unused-vars */ /* eslint-disable no-undef */ -const { authtoken } = localStorage; +const { token } = localStorage; // const devURL = 'http://localhost:3000/api/v1/'; @@ -13,13 +13,15 @@ const fetcher = async (url, method, body = undefined) => { method, headers: new Headers({ 'Content-Type': 'application/json', - authtoken, + token, }), body: JSON.stringify(body), }; + // console.log(object); const response = await fetch(url, object); + // console.log(response); const statusCode = response.status; const responseObj = await response.json(); - console.log(responseObj); + // console.log(responseObj); return { responseObj, statusCode }; }; diff --git a/UI/js/login.js b/UI/js/login.js index 0c19323..a652305 100644 --- a/UI/js/login.js +++ b/UI/js/login.js @@ -75,7 +75,7 @@ display.addEventListener('click', async (event) => { display.classList.add('effect'); display.classList.remove('uuu'); } - + if (checker && !submitFlag) { const url = `${devURL}user`; const { responseObj, statusCode } = await fetcher(url, 'POST', details); @@ -83,9 +83,10 @@ display.addEventListener('click', async (event) => { if (statusCode === 200) { add.classList.add('move-left'); add.classList.remove('move-right'); - userName.textContent = `${responseObj.data.firstName} ${responseObj.data.lastName}`; + console.log(responseObj); + userName.textContent = `${responseObj.data.first_name} ${responseObj.data.last_name}`; userEmail.textContent = `${responseObj.data.email}`; - image.attributes.src.value = 'img/avatar.png'; + image.attributes.src.value = `${responseObj.data.profile_pic}`; detailss.style.opacity = '1'; goBack.style.display = 'initial'; spinner.style.display = 'none'; @@ -127,7 +128,9 @@ display.addEventListener('click', async (event) => { no.style.display = 'block'; no.style.color = 'rgb(23, 148, 23)'; const { token } = responseObj.data; - localStorage.setItem('authtoken', token); + localStorage = ''; + localStorage.setItem('token', token); + localStorage.setItem('userDet', input[1].value); if (responseObj.data.email === 'admin@automart.com') { setTimeout(() => { window.location = 'admin.html'; }, 3000); @@ -146,7 +149,6 @@ display.addEventListener('click', async (event) => { } if (!checker) { - console.log('im here'); spinner.style.display = 'none'; display.classList.add('effect'); display.classList.remove('uuu'); @@ -181,4 +183,4 @@ window.addEventListener('load', () => { inputs.forEach((input) => { input.value = ''; }); -}); \ No newline at end of file +}); diff --git a/UI/js/main.js b/UI/js/main.js index b3a5dae..5afe160 100644 --- a/UI/js/main.js +++ b/UI/js/main.js @@ -1,3 +1,4 @@ +/* eslint-disable no-undef */ const a = document.querySelectorAll('a'); const imgg = document.querySelector('.amos'); const purchase = document.querySelector('.purchase-btn'); @@ -7,7 +8,7 @@ const purchaseDialog = document.querySelector('.purchase'); const leftBar = document.querySelector('#left_bar'); const mainBar = document.querySelector('#main_bar'); const rightBar = document.querySelector('#right_bar'); -const Bar = document.querySelector('#bar'); +// const Bar = document.querySelector('#bar'); const updateDialog = document.querySelector('.update-dialog'); const acceptDialog = document.querySelector('.accept-dialog'); const counterDialog = document.querySelector('.counter-dialog'); @@ -21,8 +22,6 @@ const harsh = document.querySelector('.harsh'); const harsh111 = document.querySelector('.harsh111'); const counterPrice = document.querySelectorAll('.counter'); const dialog = document.querySelectorAll('dialog'); -const input = document.querySelector('.iin'); -const profile = document.querySelector('.pro'); const search = document.querySelector('.search'); const changer = document.querySelector('.changer'); const myOrder = document.querySelector('.ord'); @@ -31,86 +30,80 @@ const myAds = document.querySelector('.mads'); harsh.addEventListener('click', (event) => { - event.preventDefault(); - leftBar.style.display = 'inline-grid'; - leftBar.style.left = '0px'; - harsh111.style.opacity = '0' - }); + event.preventDefault(); + leftBar.style.display = 'inline-grid'; + leftBar.style.left = '0px'; + harsh111.style.opacity = '0'; +}); - harsh111.addEventListener('click', (event) => { - event.preventDefault(); - rightBar.style.display = 'inline-grid'; - rightBar.style.right = '0px'; - mainBar.style.opacity='0.6'; - harsh.style.opacity = '0'; - }); +harsh111.addEventListener('click', (event) => { + event.preventDefault(); + rightBar.style.display = 'inline-grid'; + rightBar.style.right = '0px'; + mainBar.style.opacity = '0.6'; + harsh.style.opacity = '0'; +}); - search.addEventListener('click', (event) => { - event.preventDefault(); - rightBar.style.right = '-500px'; - harsh.style.opacity = '1'; - mainBar.style.opacity='1' - }); +search.addEventListener('click', (event) => { + event.preventDefault(); + rightBar.style.right = '-500px'; + harsh.style.opacity = '1'; + mainBar.style.opacity = '1'; +}); - if(rightBar.style.right === '-500px'){ - rightBar.style.opacity= '0' - } +if (rightBar.style.right === '-500px') { + rightBar.style.opacity = '0'; +} -input.addEventListener('input',(e)=>{ - profile.attributes.src.value = URL.createObjectURL(input.files[0]) -}) -a.forEach(car =>{ - car.addEventListener('click', (e) =>{ - let details = (e.path[0]); - imgg.attributes.src.value = `${details.attributes.src.value}`; - }) -}) +// input.addEventListener('input', () => { +// profile.attributes.src.value = URL.createObjectURL(input.files[0]); +// }); -updatePrice.forEach(up =>{ - up.addEventListener('click', (e) =>{ - updateDialog.showModal(); - }) -}) +updatePrice.forEach((up) => { + up.addEventListener('click', () => { + updateDialog.showModal(); + }); +}); -small.forEach(mall =>{ - mall.addEventListener('click', (e) =>{ - leftBar.style.left = '-500px'; - harsh111.style.opacity = '1' - }) -}) -acceptPrice.forEach(accept =>{ - accept.addEventListener('click', (e) =>{ - acceptDialog.showModal(); - }) -}) -rejectPrice.forEach(reject =>{ - reject.addEventListener('click', (e) =>{ - rejectDialog.showModal(); - }) -}) -counterPrice.forEach(counter =>{ - counter.addEventListener('click', (e) =>{ - counterDialog.showModal(); - }) -}) +small.forEach((mall) => { + mall.addEventListener('click', () => { + leftBar.style.left = '-500px'; + harsh111.style.opacity = '1'; + }); +}); +acceptPrice.forEach((accept) => { + accept.addEventListener('click', () => { + acceptDialog.showModal(); + }); +}); +rejectPrice.forEach((reject) => { + reject.addEventListener('click', () => { + rejectDialog.showModal(); + }); +}); +counterPrice.forEach((counter) => { + counter.addEventListener('click', () => { + counterDialog.showModal(); + }); +}); -purchase.addEventListener('click', (e) =>{ - purchaseDialog.showModal(); - dialog[1].className = 'grow'; +purchase.addEventListener('click', () => { + purchaseDialog.showModal(); + dialog[1].className = 'grow'; }); -report.addEventListener('click', (e) =>{ - reportDialog.showModal(); - dialog[0].className = 'grow'; -}) +report.addEventListener('click', () => { + reportDialog.showModal(); + dialog[0].className = 'grow'; +}); -close.forEach(clo =>{ -clo.addEventListener('click',(e)=>{ - dialog.forEach(dia =>{ - setTimeout( function(){dia.close();}, 300); - dialog[0].classList.remove('grow'); - }) -}) -}) \ No newline at end of file +close.forEach((clo) => { + clo.addEventListener('click', () => { + dialog.forEach((dia) => { + setTimeout(() => { dia.close(); }, 300); + dialog[0].classList.remove('grow'); + }); + }); +}); diff --git a/UI/js/onLoad.js b/UI/js/onLoad.js new file mode 100644 index 0000000..387d2f9 --- /dev/null +++ b/UI/js/onLoad.js @@ -0,0 +1,165 @@ +/* eslint-disable no-use-before-define */ +/* eslint-disable no-undef */ + +const name = document.querySelector('.name'); +const email = document.querySelector('.email'); +const photo = document.querySelector('.photo'); +const notify = document.querySelector('.notify'); +const roll = document.querySelector('.roll'); +const purchaseError = document.querySelector('.purchase-error'); +const manu = document.querySelector('.manu'); +const mod = document.querySelector('.mod'); +const boo = document.querySelector('.boo'); +const cost = document.querySelector('.cost'); +const sta = document.querySelector('.sta'); +const stat = document.querySelector('.stat'); +const dialogStatus = document.querySelector('.dia-status'); +const dialogPrice = document.querySelector('.dia-price'); +const purchaseOrder = document.querySelector('.purchase-order'); + + +let idPath; +window.addEventListener('load', async (event) => { + event.preventDefault(); + try { + carLoader(); + getUserProfile(); + // a.forEach((car) => { + // // console.log(car); + // car.addEventListener('click', () => { + // // const details = (e.path[0]); + // // console.log('i am here'); + // }); + // }); + } catch (error) { + notify.append = `${error}`; + } +}); + +showBox.addEventListener('click', async (e) => { + let initialPath = e.path[0]; + idPath = e.path[1].id; + let namePath = e.path[1]; + + if (initialPath.tagName !== 'IMG') { + initialPath = e.path[0].parentElement.firstElementChild; + namePath = e.path[1].lastChild.previousSibling.lastElementChild; + if (initialPath.tagName !== 'IMG') { initialPath = initialPath.firstElementChild; } + namePath = e.path[1].lastChild.previousSibling.lastElementChild; + } + + imgg.attributes.src.value = `${initialPath.attributes.src.value}`; + + if (idPath === '') idPath = e.path[0].id; + + const url = `${devURL}car/${idPath}`; + const { responseObj, statusCode } = await fetcher(url, 'GET'); + + if (statusCode === 200) { + manu.textContent = `Manufacturer: ${responseObj.data.manufacturer}`; + mod.textContent = `Model: ${responseObj.data.model}`; + boo.textContent = `Body Type: ${responseObj.data.body_type}`; + cost.textContent = `Price: N${responseObj.data.price}`; + stat.textContent = `State: ${responseObj.data.state}`; + sta.textContent = `status: ${responseObj.data.status}`; + sta.textContent = `status: ${responseObj.data.status}`; + dialogPrice.textContent = `Price: N${responseObj.data.price}`; + dialogStatus.textContent = `Status: ${responseObj.data.status}`; + } +}); + +const amountPurchase = document.querySelector('.price-offered'); +const priceOff = () => { + const amount = amountPurchase.value; + const price = { amount, car_id: idPath }; + return price; +}; + +roll.style.display = 'none'; + +purchaseOrder.addEventListener('click', async () => { + purchaseError.style.color = 'red'; + purchaseOrder.style.color = 'slateblue'; + roll.style.display = 'initial'; + const details = priceOff(); + + if (details.amount === '') { + purchaseError.textContent = 'Amount is required'; + roll.style.display = 'none'; + purchaseOrder.style.color = 'white'; + return; + } + + const url = `${devURL}order`; + const { responseObj, statusCode } = await fetcher(url, 'POST', details); + + if (statusCode === 201) { + purchaseError.style.color = 'green'; + purchaseError.textContent = 'Order Successfully Created'; + await setTimeout(() => { + purchaseDialog.close(); + roll.style.display = 'none'; + purchaseOrder.style.color = 'white'; + purchaseError.textContent = ''; + amountPurchase.value = ''; + }, 4000); + } + + if (statusCode === 400) { + purchaseError.textContent = `${responseObj.error}`; + roll.style.display = 'none'; + purchaseOrder.style.color = 'white'; + } +}); + +const carLoader = async () => { + try { + const url = `${devURL}car`; + const { responseObj, statusCode } = await fetcher(url, 'GET'); + + if (statusCode === 200) { + const { data } = responseObj; + data.forEach(async (cars) => { + const { + id, manufacturer, model, price, car_image, status, + } = cars; + const carObj = { + id, manufacturer, model, price, car_image, status, + }; + showBox.innerHTML += displayCars(carObj); + }); + + notify.style.display = 'none'; + spinne.style.display = 'none'; + Bar.style.display = 'block'; + showBox.style.display = 'flex'; + } else if (statusCode === 404) { + showBox.innerHTML = ''; + showBox.innerHTML = responseObj.error; + } else if (statusCode === 401) { + window.location = 'index.html'; + } + } catch (err) { + spinne.style.display = 'none'; + notify.textContent = 'Network Error, Please Reload'; + } +}; + +const details = { + email: localStorage.userDet, +}; + +const getUserProfile = async () => { + try { + const url = `${devURL}user`; + const { responseObj, statusCode } = await fetcher(url, 'POST', details); + + if (statusCode === 400) window.location = 'index.html'; + + photo.attributes.src.value = `${responseObj.data.profile_pic}`; + name.textContent = `${responseObj.data.first_name} ${responseObj.data.last_name}`; + email.textContent = `${responseObj.data.email}`; + } catch (err) { + notify.appendChild = `${err}`; + } +}; diff --git a/UI/js/user.js b/UI/js/user.js index 02dcd3e..383b554 100644 --- a/UI/js/user.js +++ b/UI/js/user.js @@ -12,9 +12,9 @@ const getSignUpDetails = () => { const lastName = document.querySelectorAll('.userName')[1].value; const email = document.querySelectorAll('.userName')[2].value; const password = document.querySelector('#password').value; - const phoneNumber = document.querySelector('#number').value; + const address = document.querySelector('#address').value; const obj = { - firstName, lastName, email, password, phoneNumber, + first_name: firstName, last_name: lastName, email, password, address, }; return obj; }; @@ -29,14 +29,20 @@ form.addEventListener('submit', async (event) => { spinner.style.display = 'initial'; const url = `${devURL}auth/signup`; deet.style.transform = 'scale(0)'; + const { responseObj, statusCode } = await fetcher(url, 'POST', details); + if (statusCode === 201) { deh.style.color = 'green'; deh.textContent = 'Registered Successful'; de.textContent = 'Welcome'; deet.style.transform = 'scale(1)'; + const { token } = responseObj.data; - localStorage.setItem('authtoken', token); + localStorage = ''; + localStorage.setItem('token', token); + localStorage.setItem('userDet', document.querySelectorAll('.userName')[2].value); + setTimeout(() => { window.location = 'main.html'; }, 3000); } else { deh.textContent = 'Error'; diff --git a/UI/main.html b/UI/main.html index bdb755e..2d4b068 100644 --- a/UI/main.html +++ b/UI/main.html @@ -11,18 +11,16 @@
- @@ -327,49 +128,22 @@

2018 Toyota Supra

Post Ad

+
- - + +
- - - - - - - -
+ + + + +
+ + +
@@ -386,7 +160,7 @@

2018 Toyota Supra

2018 Toyota Supra

@@ -714,6 +375,9 @@

Status: Approved

+ + + \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 544807d..5f485d7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -874,6 +874,38 @@ "to-fast-properties": "^2.0.0" } }, + "@sinonjs/commons": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.4.0.tgz", + "integrity": "sha512-9jHK3YF/8HtJ9wCAbG+j8cD0i0+ATS9A7gXFqS36TblLPNy6rEEc+SB0imo91eCboGaBYGV/MT1/br/J+EE7Tw==", + "requires": { + "type-detect": "4.0.8" + } + }, + "@sinonjs/formatio": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.1.tgz", + "integrity": "sha512-tsHvOB24rvyvV2+zKMmPkZ7dXX6LSLKZ7aOtXY6Edklp0uRcgGpOsQTTGTcWViFyx4uhWc6GV8QdnALbIbIdeQ==", + "requires": { + "@sinonjs/commons": "^1", + "@sinonjs/samsam": "^3.1.0" + } + }, + "@sinonjs/samsam": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.2.tgz", + "integrity": "sha512-ILO/rR8LfAb60Y1Yfp9vxfYAASK43NFC2mLzpvLUbCQY/Qu8YwReboseu8aheCEkyElZF2L2T9mHcR2bgdvZyA==", + "requires": { + "@sinonjs/commons": "^1.0.2", + "array-from": "^2.1.1", + "lodash": "^4.17.11" + } + }, + "@sinonjs/text-encoding": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz", + "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==" + }, "@types/chai": { "version": "4.1.7", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.1.7.tgz", @@ -1083,6 +1115,11 @@ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" }, + "array-from": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz", + "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=" + }, "array-includes": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz", @@ -1390,6 +1427,38 @@ "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz", "integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==" }, + "busboy": { + "version": "0.2.14", + "resolved": "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz", + "integrity": "sha1-bCpiLvz0fFe7vh4qnDetNseSVFM=", + "requires": { + "dicer": "0.2.5", + "readable-stream": "1.1.x" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + } + } + }, "bytes": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", @@ -2024,6 +2093,38 @@ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" }, + "dicer": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz", + "integrity": "sha1-WZbAhrszIYyBLAkL3cCc0S+stw8=", + "requires": { + "readable-stream": "1.1.x", + "streamsearch": "0.1.2" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + } + } + }, "diff": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", @@ -2510,6 +2611,14 @@ "vary": "~1.1.2" } }, + "express-fileupload": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/express-fileupload/-/express-fileupload-1.1.5.tgz", + "integrity": "sha512-ZYxGkXm9y1dSMgbW+lwvtqld+dulYm3OU1GQF9n6NNEwulHTPUsz4mHGG5/LiUszz5jnh/j8AcpLFUdaj8UUtQ==", + "requires": { + "busboy": "^0.2.14" + } + }, "extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -2842,7 +2951,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -2863,12 +2973,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2883,17 +2995,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -3010,7 +3125,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -3022,6 +3138,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -3036,6 +3153,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -3043,12 +3161,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -3067,6 +3187,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -3147,7 +3268,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -3159,6 +3281,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -3244,7 +3367,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -3280,6 +3404,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -3299,6 +3424,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -3342,12 +3468,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -4348,6 +4476,11 @@ "verror": "1.10.0" } }, + "just-extend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.0.2.tgz", + "integrity": "sha512-FrLwOgm+iXrPV+5zDU6Jqu4gCRXbWEQg2O3SKONsWE4w7AXFRkryS53bpWdaL9cNol+AmR3AEYz6kn+o0fCPnw==" + }, "jwa": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", @@ -4436,9 +4569,9 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" + "version": "4.17.14", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz", + "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==" }, "lodash.flattendeep": { "version": "4.4.0", @@ -4495,6 +4628,11 @@ "chalk": "^2.0.1" } }, + "lolex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-4.1.0.tgz", + "integrity": "sha512-BYxIEXiVq5lGIXeVHnsFzqa1TxN5acnKnPCdlZSpzm8viNEOhiigupA4vTQ9HEFQ6nLTQ9wQOgBknJgzUYQ9Aw==" + }, "loose-envify": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", @@ -4678,9 +4816,9 @@ } }, "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dev": true, "requires": { "for-in": "^1.0.2", @@ -4858,6 +4996,33 @@ "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" }, + "nise": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.0.tgz", + "integrity": "sha512-Z3sfYEkLFzFmL8KY6xnSJLRxwQwYBjOXi/24lb62ZnZiGA0JUzGGTI6TBIgfCSMIDl9Jlu8SRmHNACLTemDHww==", + "requires": { + "@sinonjs/formatio": "^3.1.0", + "@sinonjs/text-encoding": "^0.7.1", + "just-extend": "^4.0.2", + "lolex": "^4.1.0", + "path-to-regexp": "^1.7.0" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "path-to-regexp": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", + "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=", + "requires": { + "isarray": "0.0.1" + } + } + } + }, "node-environment-flags": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz", @@ -6054,9 +6219,9 @@ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, "requires": { "extend-shallow": "^2.0.1", @@ -6099,6 +6264,30 @@ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" }, + "sinon": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-7.3.2.tgz", + "integrity": "sha512-thErC1z64BeyGiPvF8aoSg0LEnptSaWE7YhdWWbWXgelOyThent7uKOnnEh9zBxDbKixtr5dEko+ws1sZMuFMA==", + "requires": { + "@sinonjs/commons": "^1.4.0", + "@sinonjs/formatio": "^3.2.1", + "@sinonjs/samsam": "^3.3.1", + "diff": "^3.5.0", + "lolex": "^4.0.1", + "nise": "^1.4.10", + "supports-color": "^5.5.0" + }, + "dependencies": { + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "slash": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", @@ -6391,6 +6580,11 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" }, + "streamsearch": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz", + "integrity": "sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=" + }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -6900,38 +7094,15 @@ "dev": true }, "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dev": true, "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } + "set-value": "^2.0.1" } }, "unique-string": { diff --git a/package.json b/package.json index 375d59c..531c275 100644 --- a/package.json +++ b/package.json @@ -40,10 +40,12 @@ "cors": "^2.8.5", "dotenv": "^8.0.0", "express": "^4.17.0", + "express-fileupload": "^1.1.5", "joi": "^14.3.1", "jsonwebtoken": "^8.5.1", "mocha": "^6.1.4", "pg": "^7.11.0", + "sinon": "^7.3.2", "swagger-ui-express": "^4.0.5", "yamljs": "^0.3.0" }, diff --git a/server/app.js b/server/app.js index 8b9dd75..88f6d2d 100644 --- a/server/app.js +++ b/server/app.js @@ -3,17 +3,20 @@ import bodyParser from 'body-parser'; import swaggerUi from 'swagger-ui-express'; import yaml from 'yamljs'; import cors from 'cors'; +import fileUpload from 'express-fileupload'; import router from './router/userRoute'; import carRouter from './router/carRoute'; import orderRouter from './router/orderRoute'; import adminRouter from './router/adminRoute'; - +import uploadRouter from './router/uploadRoute'; import utilities from './helper/utilities'; + const app = express(); app.use(cors()); app.use(bodyParser.json()); app.use(bodyParser.urlencoded({ extended: true })); +app.use(fileUpload({ useTempFiles: true })); const swaggerdoc = yaml.load(`${__dirname}/../swagger.yaml`); app.use('/swagger', swaggerUi.serve, swaggerUi.setup(swaggerdoc)); @@ -22,6 +25,7 @@ app.use('/api/v1', router); app.use('/api/v1', carRouter); app.use('/api/v1', orderRouter); app.use('/api/v1', adminRouter); +app.use('/api/v1', uploadRouter); app.use('*', (req, res) => utilities.errorstatus(res, 404, 'This Route is Not On This Server')); diff --git a/server/controllers/carController.js b/server/controllers/carController.js index fb43a3e..8270eb4 100644 --- a/server/controllers/carController.js +++ b/server/controllers/carController.js @@ -6,16 +6,16 @@ import pool from '../db/config/config'; class carController { static async postAds(req, res) { try { - const { email } = req.user; + const { id } = req.user; const { - manufacturer, model, bodyType, price, state, + manufacturer, model, body_type, price, state, } = req.body; const status = 'available'; const carCreated = await dbMethods.insertToDb('cars', { - email, manufacturer, model, bodytype: bodyType, price, state, status, + owner: id, manufacturer, model, body_type, price, state, status, }, 'RETURNING *'); return utilities.successStatus(res, 201, 'data', carCreated); @@ -26,14 +26,14 @@ class carController { static async markSold(req, res) { try { - const { email } = req.user; + const { id } = req.user; const { carId } = req.params; const carCheck = await dbMethods.readFromDb('cars', '*', { id: Number(carId) }); if (!carCheck[0]) return utilities.errorstatus(res, 400, 'Car Does Not Exist'); - if (email === carCheck[0].email) { + if (id === carCheck[0].owner) { await dbMethods.updateDbRow('cars', { status: 'sold' }, { id: Number(carId) }); const carDetails = await dbMethods.readFromDb('cars', '*', { id: Number(carId) }); @@ -47,7 +47,7 @@ class carController { static async updateCar(req, res) { try { - const { email } = req.user; + const { id } = req.user; const { carId } = req.params; const updatePrice = req.body.price; @@ -55,15 +55,13 @@ class carController { if (!carCheck[0]) return utilities.errorstatus(res, 400, 'Car Does Not Exist'); - if (email !== carCheck[0].email) return utilities.errorstatus(res, 400, 'You Are not allowed to perform this action'); + if (id !== carCheck[0].owner) return utilities.errorstatus(res, 400, 'You Are not allowed to perform this action'); - if (carCheck[0].status !== 'sold') { - await dbMethods.updateDbRow('cars', { price: updatePrice }, { id: Number(carId) }); + await dbMethods.updateDbRow('cars', { price: updatePrice }, { id: Number(carId) }); - const carDetails = await dbMethods.readFromDb('cars', '*', { id: Number(carId) }); + const carDetails = await dbMethods.readFromDb('cars', '*', { id: Number(carId) }); - return utilities.successStatus(res, 200, 'data', carDetails); - } return utilities.errorstatus(res, 400, 'Car Already Sold'); + return utilities.successStatus(res, 200, 'data', carDetails[0]); } catch (error) { return utilities.errorstatus(res, 500, 'SERVER ERROR'); } @@ -84,17 +82,17 @@ class carController { } static async car(req, res) { - const { isAdmin } = req.user; +// const { isAdmin } = req.user; const { status } = req.query; const bodyType = req.query.body_type; const cars = await pool.query('select * from cars'); - if (isAdmin && !status && !bodyType) { + if (!status && !bodyType) { return utilities.successStatus(res, 200, 'data', cars.rows); } - if (!isAdmin) { +// if (!isAdmin) { if (status) { if (req.query.min_price && req.query.max_price) { const unsoldCars = await dbMethods.readFromDb('cars', '*', { status: status.toLowerCase() }); @@ -113,12 +111,12 @@ class carController { } if (bodyType) { - const carType = await dbMethods.readFromDb('cars', '*', { bodytype: bodyType.toLowerCase() }); + const carType = await dbMethods.readFromDb('cars', '*', { body_type: bodyType.toLowerCase() }); if (!carType[0]) return utilities.errorstatus(res, 404, 'No Car With This Body Type Found'); return utilities.successStatus(res, 200, 'data', carType); } - } return utilities.errorstatus(res, 403, 'Forbidden, You Are not allowed to perform this action'); +// } return utilities.errorstatus(res, 403, 'Forbidden, You Are not allowed to perform this action'); } static async flagCar(req, res) { @@ -129,10 +127,17 @@ class carController { if (!car[0]) return utilities.errorstatus(res, 404, 'Car Not Found'); - const flagObj = await dbMethods.insertToDb('flags', { carId, reason, description }, 'RETURNING *'); + const flagObj = await dbMethods.insertToDb('flags', { car_id: carId, reason, description }, 'RETURNING *'); return utilities.successStatus(res, 201, 'data', flagObj); } + + static async updateCarImage(req, res) { + const { car_image } = req.body; + const { car_id } = req.params; + await dbMethods.updateDbRow('cars', { car_image }, { id: Number(car_id) }); + return utilities.successStatus(res, 200, 'data', 'Updated Successfully'); + } } diff --git a/server/controllers/orderController.js b/server/controllers/orderController.js index 5f93d1a..8ebc069 100644 --- a/server/controllers/orderController.js +++ b/server/controllers/orderController.js @@ -5,20 +5,19 @@ class orderController { static async purchaseOrder(req, res) { try { const { id } = req.user; - const carId = Number(req.params.id); + const car_id = Number(req.body.car_id); - const isCar = await dbMethods.readFromDb('cars', '*', { id: carId }); + const isCar = await dbMethods.readFromDb('cars', '*', { id: car_id }); if (!isCar[0]) return utilities.errorstatus(res, 404, 'Car Not Found'); - const { priceOffered } = req.body; + const { amount } = req.body; const status = 'pending'; - const buyerId = id; + const buyer_id = id; const { price } = isCar[0]; - const orderCreated = await dbMethods.insertToDb('orders', { - buyerId, carId, status, price, priceOffered, - }, 'RETURNING id, created_on, carid, buyerid, status, price, priceoffered'); + buyer_id, car_id, status, price, price_offered: amount, + }, 'RETURNING id, created_on, car_id, buyer_id, status, price, price_offered'); return utilities.successStatus(res, 201, 'data', orderCreated); } catch (error) { @@ -29,25 +28,26 @@ class orderController { static async updatePurchase(req, res) { try { const { id } = req.user; - const { newPriceOffered } = req.body; + const { price } = req.body; const { orderId } = req.params; + const new_price_offered = price; const isOrder = await dbMethods.readFromDb('orders', '*', { id: Number(orderId) }); if (!isOrder[0]) return utilities.errorstatus(res, 400, 'Purchase Order Not found'); if (isOrder[0].status === 'pending') { - if (Number(isOrder[0].buyerid) !== id) return utilities.errorstatus(res, 400, 'You Are not allowed to perform this action'); + if (Number(isOrder[0].buyer_id) !== id) return utilities.errorstatus(res, 400, 'You Are not allowed to perform this action'); - if (isOrder[0].oldpriceoffered === null) { - await dbMethods.updateDbRow('orders', { oldpriceoffered: isOrder[0].priceoffered }, { id: Number(orderId) }); - } else await dbMethods.updateDbRow('orders', { oldpriceoffered: isOrder[0].newpriceoffered }, { id: Number(orderId) }); + if (isOrder[0].old_price_offered === null) { + await dbMethods.updateDbRow('orders', { old_price_offered: isOrder[0].price_offered }, { id: Number(orderId) }); + } else await dbMethods.updateDbRow('orders', { old_price_offered: isOrder[0].new_price_offered }, { id: Number(orderId) }); - await dbMethods.updateDbRow('orders', { newpriceoffered: newPriceOffered }, { id: Number(orderId) }); + await dbMethods.updateDbRow('orders', { new_price_offered }, { id: Number(orderId) }); const update = await dbMethods.readFromDb('orders', '*', { id: Number(orderId) }); - delete update[0].priceoffered; + delete update[0].price_offered; return utilities.successStatus(res, 200, 'data', update[0]); } return utilities.errorstatus(res, 400, 'Purchase Order Already Approved'); diff --git a/server/controllers/uploadController.js b/server/controllers/uploadController.js new file mode 100644 index 0000000..c815732 --- /dev/null +++ b/server/controllers/uploadController.js @@ -0,0 +1,32 @@ +import utilities from '../helper/utilities'; + +const cloudinary = require('cloudinary').v2; + +export const obj = { + getImage: async file => new Promise((resolve, reject) => { + cloudinary.uploader.upload(file.tempFilePath, (err, result) => { + if (err) reject(err); + resolve(result.url); + }); + }), +}; + +cloudinary.config({ + cloud_name: process.env.cloud_name, + api_key: process.env.api_key, + api_secret: process.env.api_secret, +}); + +export class uploadController { + static async upload(req, res) { + const file = req.files.photo; + try { + const result = await obj.getImage(file); + return utilities.successStatus(res, 200, 'data', result); + } catch (error) { + return utilities.errorstatus(res, 400, 'Network Error, Could not Upload Image'); + } + } +} + +// export default { uploadController, getImage }; diff --git a/server/controllers/userController.js b/server/controllers/userController.js index dc16e16..9557b3b 100644 --- a/server/controllers/userController.js +++ b/server/controllers/userController.js @@ -14,25 +14,25 @@ class userController { static async signupUser(req, res) { try { const { - firstName, lastName, email, password, phoneNumber, + first_name, last_name, email, password, address, } = req.body; const user = await dbMethods.readFromDb('users', '*', { email }); if (user[0]) { - return utilities.errorstatus(res, 400, 'User Already Exist'); + return utilities.errorstatus(res, 409, 'User Already Exist'); } - const isAdmin = false; + const is_admin = false; const hashpassword = secure.passwordhash(password); const fetchedUser = await dbMethods.insertToDb('users', { - firstName, lastName, email, hashpassword, isAdmin, phoneNumber, + first_name, last_name, email, hashpassword, is_admin, address, }, 'RETURNING id'); const { id } = fetchedUser; return utilities.successStatus(res, 201, 'data', { - token: token({ id: fetchedUser.id }), id, firstName, lastName, email, phoneNumber, + token: token({ id: fetchedUser.id }), id, first_name, last_name, email, address, }); } catch (err) { return utilities.errorstatus(res, 500, 'SERVER ERROR'); @@ -53,16 +53,16 @@ class userController { if (passwordcheck) { const { - id, firstname, lastname, phonenumber, + id, first_name, last_name, address, } = user[0]; return utilities.successStatus(res, 200, 'data', { token: token({ id }), id, - firstName: firstname, - lastName: lastname, + first_name, + last_name, email, - phoneNumber: phonenumber, + address, }); } @@ -82,16 +82,16 @@ class userController { return utilities.errorstatus(res, 400, 'Invalid User'); } const { - id, firstname, lastname, phonenumber, profilepic, + id, first_name, last_name, address, profile_pic, } = user[0]; return utilities.successStatus(res, 200, 'data', { id, - firstName: firstname, - lastName: lastname, + first_name, + last_name, email, - phoneNumber: phonenumber, - profilepic, + address, + profile_pic, }); } catch (error) { return utilities.errorstatus(res, 500, 'SERVER ERROR'); diff --git a/server/db/migrations/createTables.js b/server/db/migrations/createTables.js index af10d0a..5cf5697 100644 --- a/server/db/migrations/createTables.js +++ b/server/db/migrations/createTables.js @@ -16,52 +16,52 @@ function insertMultiple(table, array, returning = '') { const usersTable = `CREATE TABLE IF NOT EXISTS users( id serial PRIMARY KEY, - firstname text NOT NULL, - lastname text NOT NULL, + first_name text NOT NULL, + last_name text NOT NULL, email text NOT NULL, hashpassword text NOT NULL, - phonenumber text, - isadmin boolean NOT NULL, - profilepic text DEFAULT 'http://res.cloudinary.com/demo/image/upload/v1340625837/4srvcynxrf5j87niqcx6w.jpg' + address text, + is_admin boolean NOT NULL, + profile_pic text DEFAULT 'http://res.cloudinary.com/amoslv/image/upload/v1562438896/ytgtpwvbaw5ew8x8fwsb.png' ); `; const carsTable = `CREATE TABLE IF NOT EXISTS cars( id serial PRIMARY KEY, - email text NOT NULL, + owner int NOT NULL, created_on TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, manufacturer text NOT NULL, model text NOT NULL, - bodytype text NOT NULL, + body_type text NOT NULL, price text NOT NULL, state text NOT NULL, status text NOT NULL, - carimage text DEFAULT 'http://res.cloudinary.com/demo/image/upload/v1340625837/4srvcynxrf5j87niqcx6w.jpg' + car_image text ); `; const ordersTable = `CREATE TABLE IF NOT EXISTS orders( id serial PRIMARY KEY, created_on TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, - buyerid text NOT NULL, - carid text NOT NULL, + buyer_id text NOT NULL, + car_id text NOT NULL, status text NOT NULL, price text NOT NULL, - priceOffered text NOT NULL, - oldPriceOffered text, - newPriceOffered text + price_offered text NOT NULL, + old_price_offered text, + new_price_offered text ); `; const flagsTable = `CREATE TABLE IF NOT EXISTS flags( id serial PRIMARY KEY, created_on TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, - carid text NOT NULL, + car_id text NOT NULL, reason text NOT NULL, description text NOT NULL ); `; - +// DEFAULT 'http://res.cloudinary.com/amoslv/image/upload/v1562770121/p09iwdyzfz2u8b4mtf9d.jpg' async function create() { try { diff --git a/server/helper/schema.js b/server/helper/schema.js index cd11685..bb186fb 100644 --- a/server/helper/schema.js +++ b/server/helper/schema.js @@ -2,14 +2,14 @@ import Joi from 'joi'; const schema = { signup: Joi.object().keys({ - firstName: Joi.string().regex(/^[A-Za-z]{3,}$/).trim() + first_name: Joi.string().regex(/^[A-Za-z]{3,}$/).trim() .required(), - lastName: Joi.string().regex(/^[A-Za-z]{3,}$/).trim() + last_name: Joi.string().regex(/^[A-Za-z]{3,}$/).trim() .required(), email: Joi.string().email().required() .trim(), password: Joi.string().required().min(8), - phoneNumber: Joi.number().required(), + address: Joi.string().required(), }), signin: Joi.object().keys({ @@ -26,18 +26,23 @@ const schema = { car: Joi.object().keys({ manufacturer: Joi.string().trim().required(), model: Joi.string().trim().required(), - bodyType: Joi.string().trim().required() + body_type: Joi.string().trim().required().valid('car', 'van', 'truck', 'trailer', 'bus', 'motorbike', 'jeep') .trim(), price: Joi.number().required(), state: Joi.string().trim().valid('new', 'used').required(), }), order: Joi.object().keys({ - priceOffered: Joi.number().required(), + amount: Joi.number().required(), + car_id: Joi.number().required(), + }), + + sold: Joi.object().keys({ + status: Joi.string().required().valid('sold'), }), updateOrder: Joi.object().keys({ - newPriceOffered: Joi.number().required(), + price: Joi.number().required(), }), updateCar: Joi.object().keys({ diff --git a/server/middleware/authentication.js b/server/middleware/authentication.js index ba6a1ef..5e5631d 100644 --- a/server/middleware/authentication.js +++ b/server/middleware/authentication.js @@ -8,7 +8,7 @@ dotenv.config(); class authenticator { static async authenticateUser(req, res, next) { try { - const token = req.headers.authtoken; + const { token } = req.headers; if (!token) { return res.status(401).json({ status: 'Error', @@ -16,19 +16,23 @@ class authenticator { }); } const verify = jwt.verify(token, process.env.secretKey, (err, decoded) => decoded); + req.decoder = verify.id; + const isUser = await dbMethods.readFromDb('users', '*', { id: verify.id }); if (!isUser[0]) { return Utilities.errorstatus(res, 401, 'Unauthorise User, Please Sign Up'); } - req.user = { id: isUser[0].id, email: isUser[0].email, isAdmin: isUser[0].isadmin }; + + req.user = { id: isUser[0].id, email: isUser[0].email, isAdmin: isUser[0].is_admin }; + return next(); } catch (error) { return Utilities.errorstatus(res, 401, 'Unauthorization User'); } } - static isUser(req, res, next) { + static isRegularUser(req, res, next) { const { isAdmin } = req.user; if (isAdmin) { return Utilities.errorstatus(res, 403, 'Forbidden, You Are not allowed to perform this action'); diff --git a/server/middleware/validator.js b/server/middleware/validator.js index 3c05b6d..dff62e5 100644 --- a/server/middleware/validator.js +++ b/server/middleware/validator.js @@ -13,11 +13,11 @@ class validate { static validateSignup(req, res, next) { const { - firstName, lastName, email, password, phoneNumber, + first_name, last_name, email, password, address, } = req.body; const validateObject = { - firstName, lastName, email, password, phoneNumber, + first_name, last_name, email, password, address, }; const error = util.validateJoi(validateObject, schema.signup); @@ -25,10 +25,11 @@ class validate { return util.errorstatus(res, 400, error); } - req.body.firstName = firstName.trim(); - req.body.lastName = lastName.trim(); + req.body.first_name = first_name.trim(); + req.body.last_name = last_name.trim(); req.body.password = password.trim(); req.body.email = email.toLowerCase().trim(); + req.body.address = address.trim(); return next(); } @@ -92,11 +93,11 @@ class validate { */ static validateCar(req, res, next) { const { - manufacturer, model, bodyType, price, state, + manufacturer, model, body_type, price, state, } = req.body; const validateObject = { - manufacturer, model, bodyType, price, state, + manufacturer, model, body_type, price, state, }; const error = util.validateJoi(validateObject, schema.car); @@ -106,7 +107,7 @@ class validate { req.body.manufacturer = manufacturer.trim(); req.body.model = model.trim(); - req.body.bodyType = bodyType.trim(); + req.body.body_type = body_type.trim(); req.body.state = state.trim(); if (Number(req.body.price) < 0) return util.errorstatus(res, 400, 'Price must Not be Negative'); @@ -123,8 +124,8 @@ class validate { */ static validateOrder(req, res, next) { - const { priceOffered } = req.body; - const validateObject = { priceOffered }; + const { amount, car_id } = req.body; + const validateObject = { amount, car_id }; const error = util.validateJoi(validateObject, schema.order); @@ -132,7 +133,7 @@ class validate { return util.errorstatus(res, 400, error); } - if (Number(req.body.priceOffered) < 0) return util.errorstatus(res, 400, 'Price must Not be Negative'); + if (Number(req.body.amount) < 0) return util.errorstatus(res, 400, 'Amount Must Not be Negative'); return next(); } @@ -146,8 +147,8 @@ class validate { */ static validateUpdateOrder(req, res, next) { - const { newPriceOffered } = req.body; - const validateObject = { newPriceOffered }; + const { price } = req.body; + const validateObject = { price }; const error = util.validateJoi(validateObject, schema.updateOrder); @@ -155,7 +156,7 @@ class validate { return util.errorstatus(res, 400, error); } - if (Number(req.body.newPriceOffered) < 0) return util.errorstatus(res, 400, 'Price must Not be Negative'); + if (Number(req.body.price) < 0) return util.errorstatus(res, 400, 'Price must Not be Negative'); return next(); } @@ -168,6 +169,18 @@ class validate { * @memberof Controllers */ + static validateSold(req, res, next) { + const { status } = req.body; + const validateObject = { status }; + + const error = util.validateJoi(validateObject, schema.sold); + + if (error) { + return util.errorstatus(res, 400, error); + } + return next(); + } + static validateUpdateCar(req, res, next) { const { price } = req.body; const validateObject = { price }; @@ -253,6 +266,12 @@ class validate { return next(); } + + static validateImage(req, res, next) { + // console.log(req.files); + if (!req.files) return util.errorstatus(res, 404, 'NO IMAGE FOUND'); + return next(); + } } export default validate; diff --git a/server/model/cars.js b/server/model/cars.js index 5782d9f..59d77af 100644 --- a/server/model/cars.js +++ b/server/model/cars.js @@ -1,21 +1,23 @@ const cars = [ { - email: 'support@automart.com', + owner: '2', manufacturer: 'Toyota', model: 'Camry', - bodyType: 'car', + body_type: 'car', price: '70000000', state: 'new', status: 'available', + // carimage : 'http://res.cloudinary.com/amoslv/image/upload/v1562770121/p09iwdyzfz2u8b4mtf9d.jpg' }, { - email: 'support@automart.com', + owner: '4', manufacturer: 'Toyota', model: 'Camry', - bodyType: 'car', + body_type: 'car', price: '1000000', state: 'new', status: 'available', + // carimage : 'http://res.cloudinary.com/amoslv/image/upload/v1562770121/p09iwdyzfz2u8b4mtf9d.jpg' }, ]; diff --git a/server/model/flags.js b/server/model/flags.js index fb0a2d7..a534f2b 100644 --- a/server/model/flags.js +++ b/server/model/flags.js @@ -1,6 +1,6 @@ const flags = [ { - carId: '1', + car_id: '1', reason: 'demand', description: 'Price too high', }, diff --git a/server/model/order.js b/server/model/order.js index 3df7bfc..35eb47d 100644 --- a/server/model/order.js +++ b/server/model/order.js @@ -1,17 +1,17 @@ const orders = [ { - buyerId: '1', - carId: '1', + buyer_id: '1', + car_id: '1', status: 'pending', price: '70000000', - priceOffered: '50000000', + price_offered: '50000000', }, { - buyerId: '1', - carId: '1', + buyer_id: '1', + car_id: '1', status: 'approved', price: '70000000', - priceOffered: '50000000', + price_offered: '50000000', }, ]; diff --git a/server/model/user.js b/server/model/user.js index d7f1ae8..1fd9723 100644 --- a/server/model/user.js +++ b/server/model/user.js @@ -1,27 +1,27 @@ const users = [ { email: 'admin@automart.com', - firstname: 'admin', - lastname: 'admin', + first_name: 'admin', + last_name: 'admin', hashpassword: '$2b$10$jMVKhvrtL/5hBq6L.D.46eCEPT2Hhsi5tioRHe9wToBt3SmqqaTI6', - isAdmin: true, - phoneNumber: '090878985', + is_admin: true, + address: 'Lagos', }, { email: 'admin444@automart.com', - firstname: 'admin', - lastname: 'admin', + first_name: 'admin', + last_name: 'admin', hashpassword: 'automart', - isAdmin: false, - phoneNumber: '090878985', + is_admin: false, + address: 'Lagos', }, { email: 'popo@automart.com', - firstname: 'Bolu', - lastname: 'Baba', + first_name: 'Bolu', + last_name: 'Baba', hashpassword: 'uche123', - isAdmin: false, + is_admin: false, }, ]; diff --git a/server/router/carRoute.js b/server/router/carRoute.js index 851616a..d33d62e 100644 --- a/server/router/carRoute.js +++ b/server/router/carRoute.js @@ -4,12 +4,13 @@ import validator from '../middleware/validator'; import authenticator from '../middleware/authentication'; const carRouter = express(); -carRouter.post('/car/', authenticator.authenticateUser, authenticator.isUser, validator.validateCar, carController.postAds); -carRouter.patch('/car/:carId/status', authenticator.authenticateUser, authenticator.isUser, carController.markSold); -carRouter.patch('/car/:carId/price', authenticator.authenticateUser, authenticator.isUser, validator.validateUpdateCar, carController.updateCar); -carRouter.get('/car/:carId/', authenticator.authenticateUser, authenticator.isUser, carController.specificCar); -carRouter.get('/car', authenticator.authenticateUser, validator.validateGetCar, carController.car); -carRouter.post('/flag/:carId', authenticator.authenticateUser, authenticator.isUser, validator.validateFlag, carController.flagCar); +carRouter.post('/car/', authenticator.authenticateUser, authenticator.isRegularUser, validator.validateCar, carController.postAds); +carRouter.patch('/car/:carId/status', authenticator.authenticateUser, authenticator.isRegularUser, validator.validateSold, carController.markSold); +carRouter.patch('/car/:carId/price', authenticator.authenticateUser, authenticator.isRegularUser, validator.validateUpdateCar, carController.updateCar); +carRouter.get('/car/:carId/', authenticator.authenticateUser, authenticator.isRegularUser, carController.specificCar); +carRouter.get('/car', validator.validateGetCar, carController.car); +carRouter.post('/flag/:carId', authenticator.authenticateUser, authenticator.isRegularUser, validator.validateFlag, carController.flagCar); +carRouter.patch('/cars/:car_id', authenticator.authenticateUser, authenticator.isRegularUser, carController.updateCarImage); export default carRouter; diff --git a/server/router/orderRoute.js b/server/router/orderRoute.js index 6c46043..0b8bcc4 100644 --- a/server/router/orderRoute.js +++ b/server/router/orderRoute.js @@ -4,7 +4,7 @@ import validator from '../middleware/validator'; import authenticator from '../middleware/authentication'; const orderRouter = express(); -orderRouter.post('/order/:id', authenticator.authenticateUser, authenticator.isUser, validator.validateOrder, orderController.purchaseOrder); -orderRouter.patch('/order/:orderId/price', authenticator.authenticateUser, authenticator.isUser, validator.validateUpdateOrder, orderController.updatePurchase); +orderRouter.post('/order', authenticator.authenticateUser, authenticator.isRegularUser, validator.validateOrder, orderController.purchaseOrder); +orderRouter.patch('/order/:orderId/price', authenticator.authenticateUser, authenticator.isRegularUser, validator.validateUpdateOrder, orderController.updatePurchase); export default orderRouter; diff --git a/server/router/uploadRoute.js b/server/router/uploadRoute.js new file mode 100644 index 0000000..a4997e7 --- /dev/null +++ b/server/router/uploadRoute.js @@ -0,0 +1,9 @@ +import express from 'express'; +import { uploadController } from '../controllers/uploadController'; +import validator from '../middleware/validator'; +import authenticator from '../middleware/authentication'; + +const uploadRouter = express(); +uploadRouter.post('/upload', authenticator.authenticateUser, authenticator.isRegularUser, validator.validateImage, uploadController.upload); + +export default uploadRouter; diff --git a/server/test/data/car.js b/server/test/data/car.js index 86eda0e..92e1705 100644 --- a/server/test/data/car.js +++ b/server/test/data/car.js @@ -2,14 +2,14 @@ const car = [ { manufacturer: 'Toyota', model: 'Camry', - bodyType: 'car', + body_type: 'car', state: 'used', price: '70000000', }, { manufacturer: 'Toyota', model: 'Camry', - bodyType: 'car', + body_type: 'car', state: 'jhjhkjhk', price: 'jbkhjkhj', }, @@ -22,7 +22,7 @@ const car = [ { manufacturer: 'Toyota', model: 'Camry', - bodyType: 'car', + body_type: 'car', state: 'used', price: '-70000000', }, diff --git a/server/test/data/order.js b/server/test/data/order.js index f1c2a56..668ac0f 100644 --- a/server/test/data/order.js +++ b/server/test/data/order.js @@ -1,21 +1,24 @@ const orders = [ { - priceOffered: '50000000', + amount: '50000000', + car_id: '1', }, { - priceOffered: 'sdksdls', + amount: 'sdksdls', + car_id: '1', }, { - newPriceOffered: '30000000', + price: '30000000', }, { - newPriceOffered: 'sdksdls', + price: 'sdksdls', }, { - priceOffered: '-50000000', + amount: '-50000000', + car_id: '1', }, { - newPriceOffered: '-345453545', + price: '-345453545', }, ]; diff --git a/server/test/data/user.js b/server/test/data/user.js index f4a7692..b7cf3f0 100644 --- a/server/test/data/user.js +++ b/server/test/data/user.js @@ -1,16 +1,17 @@ const user = [ { - firstName: 'support', - lastName: 'automart', + first_name: 'support', + last_name: 'automart', email: 'support11@automart.com', password: 'automart', - phoneNumber: '09087897656', + address: '09087897656', }, { - lastName: 'automart', + first_name: 'as', + last_name: 'automart', email: 'support@automart.com', password: 'automart', - phoneNumber: '09087897656', + address: '09087897656', }, { email: 'support@automart.com', diff --git a/server/test/test.jpg b/server/test/test.jpg new file mode 100644 index 0000000..a52766c Binary files /dev/null and b/server/test/test.jpg differ diff --git a/server/test/test.js b/server/test/test.js index aaa367b..879271b 100644 --- a/server/test/test.js +++ b/server/test/test.js @@ -1,16 +1,19 @@ import chai from 'chai'; import chaihttp from 'chai-http'; +import sinon from 'sinon'; import app from '../app'; import user from './data/user'; import car from './data/car'; import order from './data/order'; import flag from './data/flag'; +import { obj } from '../controllers/uploadController'; const { expect } = chai; chai.use(chaihttp); let userToken; let adminToken; +let upload; describe('AutoMart Test', () => { describe('/Display welcome message', () => { @@ -53,7 +56,7 @@ describe('AutoMart Test', () => { .post('/api/v1/auth/signup') .send(user[0]) .end((err, res) => { - expect(res.statusCode).to.equal(400); + expect(res.statusCode).to.equal(409); expect(res.body).to.have.property('error'); expect(res.body.error).to.equal('User Already Exist'); done(); @@ -65,7 +68,7 @@ describe('AutoMart Test', () => { .send({ firstName: '' }) .end((err, res) => { expect(res.statusCode).to.equal(400); - expect(res.body).to.have.property('error').with.lengthOf(6); + expect(res.body).to.have.property('error').with.lengthOf(5); done(); }); }); @@ -143,9 +146,10 @@ describe('AutoMart Test', () => { .send(user[3]) .end((err, res) => { expect(res.statusCode).to.equal(200); + // console.log(res.body); expect(res.body).to.have.property('data'); expect(res.body.data).to.have.property('token'); - expect(res.body.data.firstName).to.equal('admin'); + expect(res.body.data.first_name).to.equal('admin'); adminToken = res.body.data.token; done(); }); @@ -176,7 +180,7 @@ describe('AutoMart Test', () => { it('should post a car ad for an existing user', (done) => { chai.request(app) .post('/api/v1/car/') - .set('authtoken', userToken) + .set('token', userToken) .send(car[0]) .end((err, res) => { expect(res.statusCode).to.equal(201); @@ -188,7 +192,7 @@ describe('AutoMart Test', () => { it('should not post an ad with negative car price', (done) => { chai.request(app) .post('/api/v1/car/') - .set('authtoken', userToken) + .set('token', userToken) .send(car[1]) .end((err, res) => { expect(res.statusCode).to.equal(400); @@ -200,7 +204,7 @@ describe('AutoMart Test', () => { it('should not post an ad with invalid car details', (done) => { chai.request(app) .post('/api/v1/car/') - .set('authtoken', userToken) + .set('token', userToken) .send(car[4]) .end((err, res) => { expect(res.statusCode).to.equal(400); @@ -209,10 +213,10 @@ describe('AutoMart Test', () => { }); }); - it('should not post cars with unauthorise token', (done) => { + it('should not post cars with unauthorised token', (done) => { chai.request(app) .post('/api/v1/car') - .set('authtoken', adminToken) + .set('token', adminToken) .send(car[0]) .end((err, res) => { expect(res.statusCode).to.equal(403); @@ -225,8 +229,8 @@ describe('AutoMart Test', () => { describe('Purchase Order', () => { it('should not make a purchase order with invalid input data', (done) => { chai.request(app) - .post('/api/v1/order/1') - .set('authtoken', userToken) + .post('/api/v1/order') + .set('token', userToken) .send(order[1]) .end((err, res) => { expect(res.statusCode).to.equal(400); @@ -237,8 +241,8 @@ describe('AutoMart Test', () => { it('should create a purchase order', (done) => { chai.request(app) - .post('/api/v1/order/1') - .set('authtoken', userToken) + .post('/api/v1/order') + .set('token', userToken) .send(order[0]) .end((err, res) => { expect(res.statusCode).to.equal(201); @@ -250,8 +254,8 @@ describe('AutoMart Test', () => { it('should not make a purchase order with negative price', (done) => { chai.request(app) - .post('/api/v1/order/1') - .set('authtoken', userToken) + .post('/api/v1/order') + .set('token', userToken) .send(order[4]) .end((err, res) => { expect(res.statusCode).to.equal(400); @@ -259,10 +263,10 @@ describe('AutoMart Test', () => { done(); }); }); - it('should not create a purchase order with unauthorise id', (done) => { + it('should not create a purchase order with unauthorised id', (done) => { chai.request(app) - .post('/api/v1/order/1') - .set('authtoken', adminToken) + .post('/api/v1/order') + .set('token', adminToken) .send(order[0]) .end((err, res) => { expect(res.statusCode).to.equal(403); @@ -275,7 +279,7 @@ describe('AutoMart Test', () => { it('should not make a purchase order if car does not exist', (done) => { chai.request(app) .post('/api/v1/order/6') - .set('authtoken', userToken) + .set('token', userToken) .send(order[0]) .end((err, res) => { expect(res.statusCode).to.equal(404); @@ -289,7 +293,7 @@ describe('AutoMart Test', () => { it('should not update the price of an order if buyerId !== userId', (done) => { chai.request(app) .patch('/api/v1/order/1/price') - .set('authtoken', userToken) + .set('token', userToken) .send(order[2]) .end((err, res) => { expect(res.statusCode).to.equal(400); @@ -301,7 +305,7 @@ describe('AutoMart Test', () => { it('should not update the price of a purchase order is status is approved', (done) => { chai.request(app) .patch('/api/v1/order/2/price') - .set('authtoken', userToken) + .set('token', userToken) .send(order[2]) .end((err, res) => { expect(res.statusCode).to.equal(400); @@ -313,7 +317,7 @@ describe('AutoMart Test', () => { it('should not update the price of a purchase order with negative price', (done) => { chai.request(app) .patch('/api/v1/order/2/price') - .set('authtoken', userToken) + .set('token', userToken) .send(order[5]) .end((err, res) => { expect(res.statusCode).to.equal(400); @@ -325,7 +329,7 @@ describe('AutoMart Test', () => { it('should update the price of a purchase order', (done) => { chai.request(app) .patch('/api/v1/order/3/price') - .set('authtoken', userToken) + .set('token', userToken) .send(order[2]) .end((err, res) => { expect(res.statusCode).to.equal(200); @@ -339,7 +343,7 @@ describe('AutoMart Test', () => { it('should update the price of a purchase order', (done) => { chai.request(app) .patch('/api/v1/order/3/price') - .set('authtoken', userToken) + .set('token', userToken) .send(order[2]) .end((err, res) => { expect(res.statusCode).to.equal(200); @@ -352,7 +356,7 @@ describe('AutoMart Test', () => { it('should return error if order is not found', (done) => { chai.request(app) .patch('/api/v1/order/9/price') - .set('authtoken', userToken) + .set('token', userToken) .send(order[2]) .end((err, res) => { expect(res.statusCode).to.equal(400); @@ -364,7 +368,7 @@ describe('AutoMart Test', () => { it('should not update the order price with wrong input details', (done) => { chai.request(app) .patch('/api/v1/order/3/price') - .set('authtoken', userToken) + .set('token', userToken) .send(order[3]) .end((err, res) => { expect(res.statusCode).to.equal(400); @@ -373,10 +377,10 @@ describe('AutoMart Test', () => { }); }); - it('should not update the order price with unauthorized user token', (done) => { + it('should not update the order price with unorized user token', (done) => { chai.request(app) .patch('/api/v1/order/3/price') - .set('authtoken', adminToken) + .set('token', adminToken) .send(order[2]) .end((err, res) => { expect(res.statusCode).to.equal(403); @@ -390,7 +394,19 @@ describe('AutoMart Test', () => { it('should not mark car as sold if not owner of car', (done) => { chai.request(app) .patch('/api/v1/car/1/status') - .set('authtoken', userToken) + .set('token', userToken) + .end((err, res) => { + expect(res.statusCode).to.equal(400); + expect(res.body).to.have.property('error'); + done(); + }); + }); + + it('should not mark car as sold if not owner of car', (done) => { + chai.request(app) + .patch('/api/v1/car/1/status') + .set('token', userToken) + .send({ email: '1' }) .end((err, res) => { expect(res.statusCode).to.equal(400); expect(res.body).to.have.property('error'); @@ -401,7 +417,7 @@ describe('AutoMart Test', () => { it('should not mark car that does not exist', (done) => { chai.request(app) .patch('/api/v1/car/12/status') - .set('authtoken', userToken) + .set('token', userToken) .end((err, res) => { expect(res.statusCode).to.equal(400); expect(res.body).to.have.property('error'); @@ -412,7 +428,8 @@ describe('AutoMart Test', () => { it('should mark a car as sold', (done) => { chai.request(app) .patch('/api/v1/car/3/status') - .set('authtoken', userToken) + .set('token', userToken) + .send({ status: 'sold' }) .end((err, res) => { expect(res.statusCode).to.equal(200); expect(res.body).to.have.property('data'); @@ -421,10 +438,10 @@ describe('AutoMart Test', () => { }); }); - it('should not mark a car as sold with unauthorize token', (done) => { + it('should not mark a car as sold with unorize token', (done) => { chai.request(app) .patch('/api/v1/car/2/status') - .set('authtoken', adminToken) + .set('token', adminToken) .end((err, res) => { expect(res.statusCode).to.equal(403); expect(res.body).to.have.property('error'); @@ -437,7 +454,7 @@ describe('AutoMart Test', () => { it('should not update the car price on invalid input', (done) => { chai.request(app) .patch('/api/v1/car/1/price') - .set('authtoken', userToken) + .set('token', userToken) .send(car[3]) .end((err, res) => { expect(res.statusCode).to.equal(400); @@ -449,7 +466,7 @@ describe('AutoMart Test', () => { it('should not update a car price that does not exist', (done) => { chai.request(app) .patch('/api/v1/car/12/price') - .set('authtoken', userToken) + .set('token', userToken) .send(car[2]) .end((err, res) => { expect(res.statusCode).to.equal(400); @@ -461,7 +478,7 @@ describe('AutoMart Test', () => { it('should not update a car price with negative input', (done) => { chai.request(app) .patch('/api/v1/car/12/price') - .set('authtoken', userToken) + .set('token', userToken) .send(car[5]) .end((err, res) => { expect(res.statusCode).to.equal(400); @@ -473,7 +490,7 @@ describe('AutoMart Test', () => { it('should post a car ad for an existing user', (done) => { chai.request(app) .post('/api/v1/car/') - .set('authtoken', userToken) + .set('token', userToken) .send(car[0]) .end((err, res) => { expect(res.statusCode).to.equal(201); @@ -482,21 +499,10 @@ describe('AutoMart Test', () => { done(); }); }); - it('should not update a car price that has been sold', (done) => { - chai.request(app) - .patch('/api/v1/car/3/price') - .set('authtoken', userToken) - .send(car[2]) - .end((err, res) => { - expect(res.statusCode).to.equal(400); - expect(res.body).to.have.property('error'); - done(); - }); - }); it('should update a car price', (done) => { chai.request(app) .patch('/api/v1/car/4/price') - .set('authtoken', userToken) + .set('token', userToken) .send(car[2]) .end((err, res) => { expect(res.statusCode).to.equal(200); @@ -508,7 +514,7 @@ describe('AutoMart Test', () => { it('should not update a car price with invalid owner', (done) => { chai.request(app) .patch('/api/v1/car/1/price') - .set('authtoken', userToken) + .set('token', userToken) .send(car[2]) .end((err, res) => { expect(res.statusCode).to.equal(400); @@ -517,10 +523,10 @@ describe('AutoMart Test', () => { }); }); - it('should not update a car price with unauthorize token', (done) => { + it('should not update a car price with unorize token', (done) => { chai.request(app) .patch('/api/v1/car/3/price') - .set('authtoken', adminToken) + .set('token', adminToken) .send(car[2]) .end((err, res) => { expect(res.statusCode).to.equal(403); @@ -534,7 +540,7 @@ describe('AutoMart Test', () => { it('should not view a car that does not exist', (done) => { chai.request(app) .get('/api/v1/car/5/') - .set('authtoken', userToken) + .set('token', userToken) .end((err, res) => { expect(res.statusCode).to.equal(404); expect(res.body).to.have.property('error'); @@ -545,7 +551,7 @@ describe('AutoMart Test', () => { it('should view a specific car', (done) => { chai.request(app) .get('/api/v1/car/3/') - .set('authtoken', userToken) + .set('token', userToken) .end((err, res) => { expect(res.statusCode).to.equal(200); expect(res.body).to.have.property('data'); @@ -555,10 +561,10 @@ describe('AutoMart Test', () => { }); - it('should not view a specific car with unauthorise token', (done) => { + it('should not view a specific car with unauthorised token', (done) => { chai.request(app) .get('/api/v1/car/2/') - .set('authtoken', adminToken) + .set('token', adminToken) .end((err, res) => { expect(res.statusCode).to.equal(403); expect(res.body).to.have.property('error'); @@ -571,7 +577,7 @@ describe('AutoMart Test', () => { it('should view all unsold car', (done) => { chai.request(app) .get('/api/v1/car?status=available') - .set('authtoken', userToken) + .set('token', userToken) .end((err, res) => { expect(res.statusCode).to.equal(200); expect(res.body).to.have.property('data'); @@ -582,7 +588,7 @@ describe('AutoMart Test', () => { it('should not view all unsold car with invalid input', (done) => { chai.request(app) .get('/api/v1/car?status=avail') - .set('authtoken', userToken) + .set('token', userToken) .end((err, res) => { expect(res.statusCode).to.equal(400); expect(res.body).to.have.property('error'); @@ -595,7 +601,7 @@ describe('AutoMart Test', () => { it('should view all unsold cars within a price range', (done) => { chai.request(app) .get('/api/v1/car?status=available&min_price=50000&max_price=90000000000') - .set('authtoken', userToken) + .set('token', userToken) .end((err, res) => { expect(res.statusCode).to.equal(200); expect(res.body).to.have.property('data'); @@ -606,7 +612,7 @@ describe('AutoMart Test', () => { it('should not view all unsold car if it does not meet the price range', (done) => { chai.request(app) .get('/api/v1/car?status=available&min_price=500000000000&max_price=90000000000') - .set('authtoken', userToken) + .set('token', userToken) .end((err, res) => { expect(res.statusCode).to.equal(404); expect(res.body).to.have.property('error'); @@ -632,7 +638,7 @@ describe('AutoMart Test', () => { it('should delete a car ad', (done) => { chai.request(app) .delete('/api/v1/car/2') - .set('authtoken', adminToken) + .set('token', adminToken) .end((err, res) => { expect(res.statusCode).to.equal(200); expect(res.body).to.have.property('data'); @@ -643,7 +649,7 @@ describe('AutoMart Test', () => { it('should not delete a car ad that does not exist', (done) => { chai.request(app) .delete('/api/v1/car/7') - .set('authtoken', adminToken) + .set('token', adminToken) .end((err, res) => { expect(res.statusCode).to.equal(404); expect(res.body).to.have.property('error'); @@ -654,7 +660,7 @@ describe('AutoMart Test', () => { it('should return an error with invild input details', (done) => { chai.request(app) .delete('/api/v1/car/hvhjv') - .set('authtoken', adminToken) + .set('token', adminToken) .end((err, res) => { expect(res.statusCode).to.equal(400); expect(res.body).to.have.property('error'); @@ -665,7 +671,7 @@ describe('AutoMart Test', () => { it('should not delete a car ad with unathorise user', (done) => { chai.request(app) .delete('/api/v1/car/2') - .set('authtoken', userToken) + .set('token', userToken) .end((err, res) => { expect(res.statusCode).to.equal(403); expect(res.body).to.have.property('error'); @@ -678,7 +684,7 @@ describe('AutoMart Test', () => { it('should view all car that exist', (done) => { chai.request(app) .get('/api/v1/car') - .set('authtoken', adminToken) + .set('token', adminToken) .end((err, res) => { expect(res.statusCode).to.equal(200); expect(res.body).to.have.property('data'); @@ -691,7 +697,7 @@ describe('AutoMart Test', () => { it('should view all car that exist', (done) => { chai.request(app) .get('/api/v1/car?body_type=car') - .set('authtoken', userToken) + .set('token', userToken) .end((err, res) => { expect(res.statusCode).to.equal(200); expect(res.body).to.have.property('data'); @@ -701,7 +707,37 @@ describe('AutoMart Test', () => { it('should not view all car that does not exist with a particular body type', (done) => { chai.request(app) .get('/api/v1/car?body_type=van') - .set('authtoken', userToken) + .set('token', userToken) + .end((err, res) => { + expect(res.statusCode).to.equal(404); + expect(res.body).to.have.property('error'); + done(); + }); + }); + }); + + describe('Upload', () => { + beforeEach(async () => { + }); + afterEach(() => { + upload.restore(); + }); + it('should upload an image ', async () => { + upload = sinon.stub(obj, 'getImage').resolves({ url: 'result' }); + const res = await chai.request(app) + .post('/api/v1/upload') + .set('token', userToken) + .field('Content-Type', 'multipart/form-data') + .attach('photo', './server/test/test.jpg', 'test.jpg'); + expect(res.statusCode).to.equal(200); + expect(res.body.data.url).to.equal('result'); + }); + + it('should not upload with an image file', (done) => { + chai.request(app) + .post('/api/v1/upload') + .set('token', userToken) + .send({ car_image: '' }) .end((err, res) => { expect(res.statusCode).to.equal(404); expect(res.body).to.have.property('error'); @@ -710,11 +746,25 @@ describe('AutoMart Test', () => { }); }); + describe('UploadCarImage', () => { + it('should update car image url', (done) => { + chai.request(app) + .patch('/api/v1/cars/2') + .set('token', userToken) + .send({ car_image: '' }) + .end((err, res) => { + expect(res.statusCode).to.equal(200); + expect(res.body).to.have.property('data'); + done(); + }); + }); + }); + describe('Flag Report', () => { it('should flag a car as fradulent', (done) => { chai.request(app) .post('/api/v1/flag/3') - .set('authtoken', userToken) + .set('token', userToken) .send(flag[0]) .end((err, res) => { expect(res.statusCode).to.equal(201); @@ -727,7 +777,7 @@ describe('AutoMart Test', () => { it('should flag a car as fradulent', (done) => { chai.request(app) .post('/api/v1/flag/39') - .set('authtoken', userToken) + .set('token', userToken) .send(flag[0]) .end((err, res) => { expect(res.statusCode).to.equal(404); @@ -738,7 +788,7 @@ describe('AutoMart Test', () => { it('should not flag a car with invalid input details', (done) => { chai.request(app) .post('/api/v1/flag/2') - .set('authtoken', userToken) + .set('token', userToken) .end((err, res) => { expect(res.statusCode).to.equal(400); expect(res.body).to.have.property('error'); @@ -746,10 +796,10 @@ describe('AutoMart Test', () => { }); }); - it('should not flag a car with unauthorise access', (done) => { + it('should not flag a car with unauthorised access', (done) => { chai.request(app) .post('/api/v1/flag/3') - .set('authtoken', adminToken) + .set('token', adminToken) .send(flag[0]) .end((err, res) => { expect(res.statusCode).to.equal(403); @@ -759,11 +809,11 @@ describe('AutoMart Test', () => { }); }); - describe('Authentication', () => { - it('should not post a car ads with unauthorized id', (done) => { + describe('entication', () => { + it('should not post a car ads with unorized id', (done) => { chai.request(app) .post('/api/v1/car') - .set('authtoken', 'jhosjfhaojfhoa') + .set('token', 'jhosjfhaojfhoa') .end((err, res) => { expect(res.statusCode).to.equal(401); expect(res.body).to.have.property('error'); diff --git a/swagger.yaml b/swagger.yaml index 3c34854..ade745b 100644 --- a/swagger.yaml +++ b/swagger.yaml @@ -34,8 +34,8 @@ paths: - Welcome summary : Test get request responses: - '201': - description: Created + '200': + description: Ok content: application/json: schema: @@ -54,16 +54,16 @@ paths: schema: type: object properties: - firstName: + first_name: type: string - lastName: + last_name: type: string email: type: string password: type: string - phoneNumber: - type: number + address: + type: string responses: 201: description: Created @@ -126,7 +126,7 @@ paths: type: string model: type: string - bodyType: + body_type: type: string state: type: string @@ -149,7 +149,7 @@ paths: get: tags: - - Admin + - Cars summary : View all posted ads whether sold or available. security: - ApiKeyAuth: [] @@ -168,20 +168,13 @@ paths: schema: $ref: "#/components/schemas/responce" - /order/{carId}: + /order/: post: tags: - Orders summary : Create a purchase order. security: - ApiKeyAuth: [] - parameters: - - name: carId - in: path - required: true - description: Car identity - schema: - type : integer requestBody: required: true @@ -190,7 +183,9 @@ paths: schema: type: object properties: - priceOffered: + amount: + type: number + car_id: type: number responses: @@ -229,7 +224,7 @@ paths: schema: type: object properties: - newPriceOffered: + price: type: number responses: @@ -262,6 +257,15 @@ paths: description: car Identity schema: type : number + requestBody: + required: true + content: + application/json: + schema: + type: object + properties: + status: + type: string responses: 200: @@ -501,7 +505,7 @@ components: ApiKeyAuth: type: apiKey in: header - name: authtoken + name: token description: Requests should pass an authtoken header. @@ -517,7 +521,7 @@ components: type: string createdOn: type: string - bodyType: + body_type: type: string state: type: string @@ -563,13 +567,13 @@ components: properties: token: type: string - firstName: + first_name: type: string - lastName: + last_name: type: string email: type: string - profilePic: + profile_pic: type: string responce: