Check out version 1 of the FASTA API
")); diff --git a/fasta-backend/bin/www b/fasta-backend/bin/www index 3e29a63..7063be5 100644 --- a/fasta-backend/bin/www +++ b/fasta-backend/bin/www @@ -16,7 +16,7 @@ const http = require("http"); */ // eslint-disable-next-line no-use-before-define -const port = normalizePort(process.env.PORT || "3000"); +const port = normalizePort(process.env.PORT || "8080"); app.set("port", port); /** diff --git a/fasta-backend/package-lock.json b/fasta-backend/package-lock.json index c3ab3c3..43863a5 100644 --- a/fasta-backend/package-lock.json +++ b/fasta-backend/package-lock.json @@ -136,6 +136,29 @@ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz", "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==" }, + "agent-base": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.1.tgz", + "integrity": "sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==", + "requires": { + "debug": "4" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, "agentkeepalive": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.2.tgz", @@ -278,6 +301,17 @@ "safer-buffer": "~2.1.0" } }, + "asn1.js": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", + "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", + "requires": { + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "safer-buffer": "^2.1.0" + } + }, "assert-plus": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", @@ -366,6 +400,11 @@ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==" }, + "bn.js": { + "version": "4.11.9", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", + "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==" + }, "body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", @@ -1623,6 +1662,14 @@ "sshpk": "^1.7.0" } }, + "http_ece": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/http_ece/-/http_ece-1.1.0.tgz", + "integrity": "sha512-bptAfCDdPJxOs5zYSe7Y3lpr772s1G346R4Td5LgRUeCwIGpCGDUTJxRrhTNcAXbx37spge0kWEIH7QAYWNTlA==", + "requires": { + "urlsafe-base64": "~1.0.0" + } + }, "httpntlm": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/httpntlm/-/httpntlm-1.6.1.tgz", @@ -1642,6 +1689,30 @@ "resolved": "https://registry.npmjs.org/https/-/https-1.0.0.tgz", "integrity": "sha1-PDfHrhqO65ZpBKKtHpdaGUt+06Q=" }, + "https-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", + "requires": { + "agent-base": "6", + "debug": "4" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, "humanize-ms": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", @@ -2184,6 +2255,11 @@ "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", "dev": true }, + "minimalistic-assert": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" + }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", @@ -3632,6 +3708,11 @@ "prepend-http": "^2.0.0" } }, + "urlsafe-base64": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/urlsafe-base64/-/urlsafe-base64-1.0.0.tgz", + "integrity": "sha1-I/iQaabGL0bPOh07ABac77kL4MY=" + }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -3667,6 +3748,40 @@ "extsprintf": "^1.2.0" } }, + "web-push": { + "version": "3.4.4", + "resolved": "https://registry.npmjs.org/web-push/-/web-push-3.4.4.tgz", + "integrity": "sha512-tB0F+ccobsfw5jTWBinWJKyd/YdCdRbKj+CFSnsJeEgFYysOULvWFYyeCxn9KuQvG/3UF1t3cTAcJzBec5LCWA==", + "requires": { + "asn1.js": "^5.3.0", + "http_ece": "1.1.0", + "https-proxy-agent": "^5.0.0", + "jws": "^4.0.0", + "minimist": "^1.2.5", + "urlsafe-base64": "^1.0.0" + }, + "dependencies": { + "jwa": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz", + "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==", + "requires": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "jws": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz", + "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==", + "requires": { + "jwa": "^2.0.0", + "safe-buffer": "^5.0.1" + } + } + } + }, "which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", diff --git a/fasta-backend/package.json b/fasta-backend/package.json index 6fd881c..05cb854 100644 --- a/fasta-backend/package.json +++ b/fasta-backend/package.json @@ -28,7 +28,8 @@ "nodemailer": "^6.4.6", "nodemailer-smtp-transport": "^2.7.4", "reverse-geocoding": "^3.0.2", - "reverse-geocoding-google": "^1.1.0" + "reverse-geocoding-google": "^1.1.0", + "web-push": "^3.4.4" }, "devDependencies": { "nodemon": "^2.0.3" diff --git a/fasta-backend/public/car.png b/fasta-backend/public/car.png new file mode 100644 index 0000000..da5275b Binary files /dev/null and b/fasta-backend/public/car.png differ diff --git a/fasta-backend/public/index.html b/fasta-backend/public/index.html new file mode 100644 index 0000000..90f4a85 --- /dev/null +++ b/fasta-backend/public/index.html @@ -0,0 +1,14 @@ + + + + + +Push Notifications being implemented for FASTA...
+ + + \ No newline at end of file diff --git a/fasta-backend/public/pushClient.js b/fasta-backend/public/pushClient.js new file mode 100644 index 0000000..d3a5885 --- /dev/null +++ b/fasta-backend/public/pushClient.js @@ -0,0 +1,52 @@ +const VAPID_PUBLIC_KEY = "BJOK8gh8hHPlZbr5Ci4LmJMWNlDsTdmQ2bGfE7TA6c9UhGmEuHTvjS179aqzobeQfQgWE94ELR26qbozfOfAVpc"; + +// check for service Worker +if ("serviceWorker" in navigator) { + // eslint-disable-next-line no-use-before-define + send().catch((err) => console.log(err)); +} + +// Register SW, Regisster Push, Send Push +async function send() { +// Register SW + console.log("Registering service worker..."); + const register = await navigator.serviceWorker.register("/worker.js", { scope: "/" }); + console.log("Service Worker Registered"); + + // Register Push + console.log("Registering Push..."); + const subscription = await register.pushManager.subscribe({ + userVisibleOnly: true, + // eslint-disable-next-line no-use-before-define + applicationServerKey: urlBase64ToUint8Array(VAPID_PUBLIC_KEY) + }); + console.log("Push Registered..."); + + // Send Push Notification + console.log("Sending Push..."); + await fetch("api/v1/subscribe", { + method: "POST", + body: JSON.stringify(subscription), + headers: { + "content-type": "application/json" + } + }); +} + +function urlBase64ToUint8Array(base64String) { + // eslint-disable-next-line no-mixed-operators + const padding = "=".repeat((4 - base64String.length % 4) % 4); + const base64 = (base64String + padding) + // eslint-disable-next-line no-useless-escape + .replace(/\-/g, "+") + .replace(/_/g, "/"); + + const rawData = window.atob(base64); + const outputArray = new Uint8Array(rawData.length); + + // eslint-disable-next-line no-plusplus + for (let i = 0; i < rawData.length; ++i) { + outputArray[i] = rawData.charCodeAt(i); + } + return outputArray; +} diff --git a/fasta-backend/public/worker.js b/fasta-backend/public/worker.js new file mode 100644 index 0000000..cc0cfd5 --- /dev/null +++ b/fasta-backend/public/worker.js @@ -0,0 +1,26 @@ +console.log("Service worker loaded!"); + + +// eslint-disable-next-line no-restricted-globals +self.addEventListener("push", (e) => { + const { data } = e; + console.log(data, "Push received..."); + + + fetch("/api/v1/notification").then((ed) => ed.json()).then((d) => { + const { options } = d; + // eslint-disable-next-line no-restricted-globals + self.registration.showNotification(`${options.subject}`, { + body: `${options.text} + ${options.output}`, + icon: "/car.png" + }); + }) + .catch((ee) => console.log(ee)); + + // eslint-disable-next-line no-restricted-globals + // self.registration.showNotification("FASTA is here... Expect MORE!!!", { + // body: "Notified by FASTA.ng", + // icon: "/car.png" + // }); +}); diff --git a/fasta-backend/routes/index.js b/fasta-backend/routes/index.js index 459c834..37e5912 100644 --- a/fasta-backend/routes/index.js +++ b/fasta-backend/routes/index.js @@ -1,8 +1,25 @@ - const express = require("express"); const router = express.Router(); +const webpush = require("web-push"); + +const vpidkeys = webpush.generateVAPIDKeys(); +// console.log(vpidkeys.privateKey); + + +// eslint-disable-next-line max-len +// webpush.setVapidDetails("mailto:thevetdoctor@gmail.com", process.env.VAPID_PUBLIC_KEY, process.env.VAPID_PRIVATE_KEY); +webpush.setVapidDetails("mailto:thevetdoctor@gmail.com", vpidkeys.publicKey, vpidkeys.privateKey); + router.get("/", (req, res) => res.status(200).json({ message: "Welcome to FASTA, taking you faster in safety & convenience!" })); +router.post("/subscribe", (req, res) => { + const subscription = req.body; + + const payload = JSON.stringify({ title: "Push test" }); + webpush.sendNotification(subscription, payload).catch((err) => console.log(err)); + res.status(201).json({ message: "Push sent" }); +}); + module.exports = router; diff --git a/fasta-backend/routes/location-transporter.js b/fasta-backend/routes/location-transporter.js index 6a6376a..033c5ed 100644 --- a/fasta-backend/routes/location-transporter.js +++ b/fasta-backend/routes/location-transporter.js @@ -11,16 +11,26 @@ const TripInfo = require("../api/transporters-api"); const Transporters = require("../api/transporters-api"); const ScheduleTrip = require("../models/trip"); const authChecker = require("../middlewares/authChecker"); +const dotenv = require("dotenv"); +dotenv.config(); +const distancePath = "https://maps.googleapis.com/maps/api/distancematrix/json?units=imperial&"; +const placesPath = "https://maps.googleapis.com/maps/api/place/textsearch/json?query="; +const transporterPath = `https://maps.googleapis.com/maps/api/place/textsearch/json?location`; +const locationStr = "=&radius=1000&sensor=true&query=transport&key="; const router = express.Router(); +console.log((process.env.TEST_KEY ? "keyTrue" : "keyFalse")); + // api to get nearby transporters base on users location router.post("/location-transporter", (req, res) => { const trip = new TripInfo(req.body.latitude, req.body.longitude, req.body.method); const locationTrnasporter = trip.getPlaces(); - +console.log(locationTrnasporter); locationTrnasporter.then((data) => { +console.log(data); + res.send({ data }); }); }); @@ -34,14 +44,16 @@ router.post("/trip-distance", async (req, res) => { `https://maps.googleapis.com/maps/api/distancematrix/json?units=imperial&origins=${origin}&destinations=${destination}&key=${ process.env.TEST_KEY }` - ) + ) .then((response) => { - if (response.data.rows.length <= 0) { - return res.json({ error: response.data.error_message }); - } + // if (response.data.rows.length <= 0) { + // return res.json({ error: response.data.error_message }); + // } const result = response.data.rows[0].elements[0]; const { distance, duration } = result; - return res.json({ data: { distance: distance.text, duration: duration.text } }); + // return res.json({ data: { distance: distance.text, duration: duration.text } }); + console.log(response); + return res.json({ response }); // return res.json({ data: { result } }); // console.log(response); }) @@ -171,9 +183,69 @@ router.get("/trips/:id", authChecker, async (req, res) => { response: trip }); }).catch((e) => { - res.status(500).json({ e: e.message }); + return res.status(500).json({ e: e.message }); }); }); +router.get("/getplaces/:val", async (req, res) => { + const { val } = req.params; + console.log(req.params, val); + const placesUrl = `${placesPath}${val}&key=${process.env.TEST_KEY}`; + + try { + await axios + .get(placesUrl) + .then((response) => { + // console.log(response.data); + return res.json(response.data); + }) + .catch((e) => { + return res.status(500).json({ e: e.message }); + }); + } catch (e) { + return res.status(500).json({ e: e.message }); + } +}); + + +router.post("/getdistances/", async (req, res) => { + const { origin, destination } = req.body; + console.log(req.body); + const distancesUrl = `${distancePath}origins=${origin.lat},${origin.lng}&destinations=${destination.lat},${destination.lng}&key=${process.env.TEST_KEY}`; + + try { + await axios + .get(distancesUrl) + .then((response) => { + // console.log(response.data); + return res.json(response.data); + }) + .catch((e) => { + return res.status(500).json({ e: e.message }); + }); + } catch (e) { + return res.status(500).json({ e: e.message }); + } +}); + +router.post("/gettransporters", async (req, res) => { + const { origin } = req.body; + console.log(req.body); + const transportersUrl = `${transporterPath}${origin.lat},${origin.lng}${locationStr}${process.env.TEST_KEY}`; + + try { + await axios + .get(transportersUrl) + .then((response) => { + // console.log(response.data); + return res.json(response.data); + }) + .catch((e) => { + return res.status(500).json({ e: e.message }); + }); + } catch (e) { + return res.status(500).json({ e: e.message }); + } +}); module.exports = router; diff --git a/fasta-backend/helpers/notification.js b/fasta-backend/routes/notification.js similarity index 51% rename from fasta-backend/helpers/notification.js rename to fasta-backend/routes/notification.js index bc48e74..05fa7e3 100644 --- a/fasta-backend/helpers/notification.js +++ b/fasta-backend/routes/notification.js @@ -1,14 +1,10 @@ -/* eslint-disable consistent-return */ -/* eslint-disable func-names */ -/* eslint-disable no-undefined */ -const cron = require("node-cron"); +const router = require("express").Router(); const ScheduleTrip = require("../models/trip"); const Reports = require("../models/report"); -const mailer = require("./mailer"); const User = require("../models/index"); -const notification = async () => { +router.get("/notification", async (req, res) => { const reports = await Reports.find() .select("description location date") .exec(); @@ -19,19 +15,17 @@ const notification = async () => { reports.forEach((r) => { schedules.forEach((s) => { - if (r.location === s.destination && r.date < s.tripTime) { - const ids = User.findById(s.userId) - .select("email fullname") - .exec(); - ids + // if (r.location === s.destination && r.date < s.tripTime) { + if (r.location === s.destination) { + User.findById(s.userId) .then((id) => { const options = { - receiver: id.email, subject: "This is happening in your desiation!", text: `Hello ${id.fullname}`, - output: `${r.description}\n\n` + output: `${r.description}` }; - mailer(options); + + return res.send({ options }); }) .catch(() => { // console.log(e); @@ -39,12 +33,7 @@ const notification = async () => { } }); }); -}; +}); -const pushNotification = () => { - cron.schedule("* 08 * * *", () => { - notification(); - }); -}; -module.exports = pushNotification; +module.exports = router; diff --git a/fasta-backend/routes/report.js b/fasta-backend/routes/report.js index 36f1c05..62ae21f 100644 --- a/fasta-backend/routes/report.js +++ b/fasta-backend/routes/report.js @@ -19,10 +19,10 @@ router.post("/report", authChecker, async (req, res) => { return res.status(403).json({ response: "please all fields are required" }); } try { - const { lat, long } = location; + const { lat, lng } = location; let address; await axios.get( - `https://maps.googleapis.com/maps/api/geocode/json?latlng=${lat},${long}&key=${process.env.TEST_KEY}` + `https://maps.googleapis.com/maps/api/geocode/json?latlng=${lat},${lng}&key=${process.env.TEST_KEY}` ).then((data) => { if (data.data) { if (data.data.status === "OK") { @@ -30,6 +30,7 @@ router.post("/report", authChecker, async (req, res) => { address = data.data.results[0].formatted_address; } else { // console.log("error"); + address = "Unidentified Location"; throw new Error(); } } @@ -40,9 +41,10 @@ router.post("/report", authChecker, async (req, res) => { tripId, type, description, - location, + location, address }; + // console.log(reportDetails); const reports = await Reports.create(reportDetails); if (reports) { return res.status(200).json({ response: `${reports} Thanks for giving, your report has been saved` }); @@ -52,13 +54,13 @@ router.post("/report", authChecker, async (req, res) => { } }); -router.get("/reports", authChecker, async (req, res) => { +router.get("/reports", async (req, res) => { let { lat, lng } = req.query; lat = Number(lat); lng = Number(lng); - await Reports.find({ "location.lat": { $gte: lat - 1, $lte: lat + 1 }, "location.lng": { $gte: lng - 1, $lte: lng + 1 } }) + await Reports.find({ "location.lat": { $gte: lat - 0.07, $lte: lat + 0.07 }, "location.lng": { $gte: lng - 0.07, $lte: lng + 0.07 } }) // await Reports.find({ "location.lat": { lat }, "location.lng": { lng } }) - .select("_id type description location date") + .select("_id type description location address date") .exec() .then((allReports) => { if (!allReports || allReports < 1) { diff --git a/fasta-backend/routes/tripInfo.js b/fasta-backend/routes/tripInfo.js index 2e299d1..38ac8ce 100644 --- a/fasta-backend/routes/tripInfo.js +++ b/fasta-backend/routes/tripInfo.js @@ -1,69 +1,110 @@ +/* eslint-disable no-useless-return */ +/* eslint-disable array-callback-return */ +/* eslint-disable no-plusplus */ +/* eslint-disable max-len */ /* eslint-disable no-unused-vars */ /* eslint-disable consistent-return */ const express = require("express"); +const axios = require("axios"); +const router = express.Router(); const { PolyUtil } = require("node-geometry-library"); const ScheduleTrip = require("../models/trip"); const Reports = require("../models/report"); -const router = express.Router(); -router.get("/trip-info/:tripId", async (req, res) => { -// get allthe report locations - const reports = []; - let trips; - await Reports.find() - .select("-_id location") - .exec() - .then((allReports) => { - if (!allReports || allReports < 1) { - return res.status(404).json({ response: "unfortunetly, we dont have any report location schedule for you, check back" }); - } +const directionUrl = "https://maps.googleapis.com/maps/api/directions/json?"; - const valuesArray = Object.keys(allReports); - valuesArray.forEach((key) => { - const value = allReports[parseInt(key)]; - reports.push(value.location); - }); - }) - .catch((error) => { - res.status(500).json({ error }); - }); - // get schedule trip Id - await ScheduleTrip.findById({ _id: req.params.tripId }) - .select("-_id origin destination") - .exec() - .then((trip) => { - if (!trip || trip < 1) { - return res.status(404).json({ response: "unfortunetly, we dont have any report location schedule for you, check back" }); - } - trips = trip; - }) - .catch((error) => { - res.status(500).json({ error }); - }); +router.get("/trip-info/:tripId?", async (req, res) => { + + console.log("params: ", req.params); + console.log("query: ", req.query); + let { t } = req.query; + console.log("t: ", Number(t)); + const tolerance = Number(t) || PolyUtil.DEFAULT_TOLERANCE; + let reportsOnRoute; - try { - const response = await PolyUtil.containsLocation(trips, reports); - if (response) { - await Reports.find() - .select() - .exec() - .then((allReports) => { - if (!allReports || allReports < 1) { - return res.status(404).json({ response: "unfortunetly, we dont have any report location schedule for you, check back" }); + // identify trip by ID from database + const tripz = await ScheduleTrip.findById({ _id: req.params.tripId }) + .select("-_id mode originLatLng destinationLatLng") + .exec() + .then((trip) => { + if (!trip || trip < 1) { + return res.json({response: "Trip not found!"}); + } + console.log("trip: ", trip); + return trip; + }) + .catch((error) => { + return res.status(500).json({ error }); + }); + + // pull reports from database + const reportz = await Reports.find() + .select("-_id") + .exec() + .then((allReports) => { + if (!allReports || allReports < 1) { + return res.status(404).json({ response: "Reports not available at the moment, we're still checking" }); + } + // console.log("allReports: ", allReports); + return allReports; + }) + .catch((error) => { + return res.status(500).json({ error }); + }); + + // get list of points between from origin to destination + const getDirection = async (request) => { + const origin = `${request.originLatLng.lat},${request.originLatLng.lng}`; + const destination = `${request.destinationLatLng.lat},${request.destinationLatLng.lng}`; + // console.log(origin, destination); + return await axios + .get( + `${directionUrl}origin=${origin}&destination=${destination}&key=${process.env.TEST_KEY}` + ) + .then((response) => { + try { + if (response.data.length <= 0) { + return res.json({ error: response.data.error_message }); + } + // console.log("steps: ", response.data.routes[0].legs[0].steps); + // console.log("points: ", response.data.routes[0].overview_polyline.points); + return response.data.routes[0].overview_polyline.points; + } catch (err) { + console.error(err); + } + }) + .catch((error) => { + // throw new Error("Error fetching data"); + return res.json({response: "Error fetching data"}); + }); + }; + + try { + const triped = JSON.parse(JSON.stringify(tripz)); + const response = await getDirection(triped); + const path = PolyUtil.decode(response); + console.log("PolyUtil decoded points: ", path.length); + + const reportsOnPath = reportz.filter((report) => { + if (report.location !== undefined && report.location !== "unknown location") { + const reportFound = PolyUtil.isLocationOnEdge(report.location, path, tolerance); + if (reportFound) { + // console.log("PolyUtil tolerance", tolerance); + console.log(report.location,"is on path"); + return report; + } } - res.status(200).json({ response: allReports }); - }) - .catch((error) => { - res.status(500).json({ error }); - }); - } else { - res.send("Trip does match any incidence"); - } - } catch (err) { - // empty - } + }); + reportsOnRoute = reportsOnPath; + + } catch (err) { + console.log(err); + } + // console.log(reportsOnRoute); + + return res.json({response: reportsOnRoute}); }); -module.exports = router; +module.exports = router; \ No newline at end of file diff --git a/fasta-backend/routes/users.js b/fasta-backend/routes/users.js index 8d8db1f..faea3d4 100644 --- a/fasta-backend/routes/users.js +++ b/fasta-backend/routes/users.js @@ -11,7 +11,6 @@ const User = require("../models/index.js"); const bcrypt = require("../helpers/auth"); const authChecker = require("../middlewares/authChecker"); const mailer = require("../helpers/mailer"); -const notification = require("../helpers/notification"); // CREATE A NEW USER AND ADD TO DATABASE @@ -75,7 +74,7 @@ router.post("/login", async (req, res) => { const passwordcheck = bcrypt.comparePassword(password, user.password); if (passwordcheck) { const token = bcrypt.generateToken(user); - notification(); + return res.status(200).json({ response: "Login successful", token, @@ -109,7 +108,7 @@ router.get("/:id", authChecker, (req, res) => { _id: id }).then( (thisUser) => { - // console.log("Getting specific user by ID!"); + // console.log("Getting specific user by ID!"); res.status(200).json(thisUser); } ).catch(