From 5b001f98a4593f1fa97624c24d9c3d1b748224e2 Mon Sep 17 00:00:00 2001 From: Abhay Verma <55607738+Danko-chan@users.noreply.github.com> Date: Sun, 20 Mar 2022 08:57:32 +0530 Subject: [PATCH 1/6] Update minify.js --- backend/controllers/minify.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backend/controllers/minify.js b/backend/controllers/minify.js index a5ce1c3..b436030 100644 --- a/backend/controllers/minify.js +++ b/backend/controllers/minify.js @@ -94,6 +94,10 @@ module.exports.addURLAuthed = async (req, res) => { minifiedUrl, createdBy, } + if (!alias) { + res.send('success alias does not exist'); + } + Minfy.create(data) .then((data) => { res.send(data) From 478d4e577bacdcd58bc7b6c02a94d3784983f4e5 Mon Sep 17 00:00:00 2001 From: Danko-chan <55607738+Danko-chan@users.noreply.github.com> Date: Tue, 22 Mar 2022 12:28:13 +0530 Subject: [PATCH 2/6] added alias status and check for duplicate --- backend/controllers/minify.js | 27 +++++++++++++++++++++++++++ backend/routers/minify.js | 1 + 2 files changed, 28 insertions(+) diff --git a/backend/controllers/minify.js b/backend/controllers/minify.js index a5ce1c3..ffb8e47 100644 --- a/backend/controllers/minify.js +++ b/backend/controllers/minify.js @@ -1,6 +1,7 @@ const Minfy = require('../models/minifed_urls') const base_url = 'https://minfy.xyz/' const { nanoid } = require('nanoid') +const minifed_urls = require('../models/minifed_urls') module.exports.getAllData = async (req, res) => { Minfy.find({}) @@ -41,9 +42,34 @@ module.exports.findUrlById = async (req, res) => { }) } +module.exports.getAliasStatus = async (req, res) => { + try{ + const alias = req.body.alias; + const aliasStatus = await minifed_urls.findOne({ alias }); + + if(!aliasStatus){ + return res.status(200).json("success: true"); + }else{ + return res.status(400).json("success: false") + } + }catch (error){ + console.error(error) + } +} + module.exports.addURL = async (req, res) => { const alias = nanoid(5) const minifiedUrl = base_url + alias + + try{ + const aliasPresent = await minifed_urls.findOne({ alias }); + if(aliasPresent){ + return res.status(400).json("success: false"); + } + }catch (error){ + console.error(error) + } + Minfy.create({ originalUrl: req.body.originalUrl, alias: alias, @@ -56,6 +82,7 @@ module.exports.addURL = async (req, res) => { console.error(err) res.sendStatus(500) }) + } module.exports.deleteUrlData = async (req, res) => { diff --git a/backend/routers/minify.js b/backend/routers/minify.js index 4e5941f..f2d0079 100644 --- a/backend/routers/minify.js +++ b/backend/routers/minify.js @@ -10,6 +10,7 @@ router.get('/alias/:alias', controller.getURLData) router.post('/add', controller.addURL) router.post('/add/custom', auth, controller.addURLAuthed) +router.post('/alias/:alias/status', controller.getAliasStatus) router.patch('/edit/:id', auth, controller.updateUrlData) From bbebe832c141a6be55f790f75eab56417fdc23a4 Mon Sep 17 00:00:00 2001 From: Danko-chan <55607738+Danko-chan@users.noreply.github.com> Date: Tue, 22 Mar 2022 12:53:24 +0530 Subject: [PATCH 3/6] Update minify.js --- backend/controllers/minify.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backend/controllers/minify.js b/backend/controllers/minify.js index c1453db..f04d909 100644 --- a/backend/controllers/minify.js +++ b/backend/controllers/minify.js @@ -1,7 +1,6 @@ const Minfy = require('../models/minifed_urls') const base_url = 'https://minfy.xyz/' const { nanoid } = require('nanoid') -const minifed_urls = require('../models/minifed_urls') module.exports.getAllData = async (req, res) => { Minfy.find({}) @@ -63,7 +62,7 @@ module.exports.addURL = async (req, res) => { try{ const aliasPresent = await minifed_urls.findOne({ alias }); - if(aliasPresent){ + if(aliasPresent){ return res.status(400).json("success: false"); } }catch (error){ From e6931bd13a2ad77e48b26c9b1150517230c1b3ac Mon Sep 17 00:00:00 2001 From: Danko-chan <55607738+Danko-chan@users.noreply.github.com> Date: Tue, 22 Mar 2022 12:56:22 +0530 Subject: [PATCH 4/6] Update minify.js --- backend/controllers/minify.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/backend/controllers/minify.js b/backend/controllers/minify.js index f04d909..9674221 100644 --- a/backend/controllers/minify.js +++ b/backend/controllers/minify.js @@ -120,9 +120,6 @@ module.exports.addURLAuthed = async (req, res) => { minifiedUrl, createdBy, } - if (!alias) { - res.send('success alias does not exist'); - } Minfy.create(data) .then((data) => { From fba9a1f062770b10cfc1fdcf9a3f0278af18b698 Mon Sep 17 00:00:00 2001 From: Danko-chan <55607738+Danko-chan@users.noreply.github.com> Date: Tue, 22 Mar 2022 20:46:59 +0530 Subject: [PATCH 5/6] minor changes --- backend/controllers/minify.js | 8 ++++---- backend/routers/minify.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/controllers/minify.js b/backend/controllers/minify.js index 9674221..0219945 100644 --- a/backend/controllers/minify.js +++ b/backend/controllers/minify.js @@ -43,13 +43,13 @@ module.exports.findUrlById = async (req, res) => { module.exports.getAliasStatus = async (req, res) => { try{ - const alias = req.body.alias; + const alias = req.params.alias; const aliasStatus = await minifed_urls.findOne({ alias }); if(!aliasStatus){ - return res.status(200).json("success: true"); + return res.status(200).json({success: true}); }else{ - return res.status(400).json("success: false") + return res.status(400).json({success: false}) } }catch (error){ console.error(error) @@ -63,7 +63,7 @@ module.exports.addURL = async (req, res) => { try{ const aliasPresent = await minifed_urls.findOne({ alias }); if(aliasPresent){ - return res.status(400).json("success: false"); + return res.status(400).json({success: false}); } }catch (error){ console.error(error) diff --git a/backend/routers/minify.js b/backend/routers/minify.js index f2d0079..2f7a00e 100644 --- a/backend/routers/minify.js +++ b/backend/routers/minify.js @@ -7,10 +7,10 @@ const router = Router() router.get('/all', controller.getAllData) router.get('/id/:id', controller.findUrlById) router.get('/alias/:alias', controller.getURLData) +router.get('/alias/:alias/status', controller.getAliasStatus) router.post('/add', controller.addURL) router.post('/add/custom', auth, controller.addURLAuthed) -router.post('/alias/:alias/status', controller.getAliasStatus) router.patch('/edit/:id', auth, controller.updateUrlData) From 78488bfb17f50099f5a6275fc3087790c1a87e15 Mon Sep 17 00:00:00 2001 From: Danko-chan <55607738+Danko-chan@users.noreply.github.com> Date: Thu, 24 Mar 2022 11:11:56 +0530 Subject: [PATCH 6/6] updated minify.js --- backend/controllers/minify.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/controllers/minify.js b/backend/controllers/minify.js index 0219945..47e8c87 100644 --- a/backend/controllers/minify.js +++ b/backend/controllers/minify.js @@ -44,7 +44,7 @@ module.exports.findUrlById = async (req, res) => { module.exports.getAliasStatus = async (req, res) => { try{ const alias = req.params.alias; - const aliasStatus = await minifed_urls.findOne({ alias }); + const aliasStatus = await Minfy.findOne({ alias }); if(!aliasStatus){ return res.status(200).json({success: true}); @@ -61,7 +61,7 @@ module.exports.addURL = async (req, res) => { const minifiedUrl = base_url + alias try{ - const aliasPresent = await minifed_urls.findOne({ alias }); + const aliasPresent = await Minfy.findOne({ alias }); if(aliasPresent){ return res.status(400).json({success: false}); }