Merge pull request #4 from fawazsullia/fawaz-backend

Fawaz backend

.gitignore

@@ -1,2 +1,3 @@
 node_modules
-.env
+.env
+apitest.http

README.md

@@ -1,3 +1,11 @@
+<<<<<<< HEAD
+# Link-Trim
+A minimal web app for URL shortner service
+
+# Branches
+1. **Main** : <a href="https://github.com/WE-FOSS/Link-Trim/tree/main">Checkout</a>
+2. **Web-Services-API** : <a href="https://github.com/WE-FOSS/Link-Trim/tree/Web-Services-API">Checkout</a>
+=======
 # Link-Trim Web Service API 🚀
 
 <img src="https://cdn.discordapp.com/attachments/848998092518064153/849281320525758494/Logo---WeFoss.jpg" height=250px width=250px>
@@ -65,3 +73,4 @@
 - Varun
 - Bilalumrani
 - Fawaz
+>>>>>>> Web-Services-Api

package.json

@@ -2,7 +2,7 @@
   "name": "link-trim",
   "version": "1.0.0",
   "description": "A minimal web app for URL shortner service",
-  "main": "index.js",
+  "main": "app.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "start": "node src/app.js",
@@ -23,6 +23,7 @@
     "dotenv": "^10.0.0",
     "express": "^4.17.1",
     "mongoose": "^5.12.12",
+    "nanoid": "^3.1.23",
     "nodemon": "^2.0.7",
     "validator": "^13.6.0"
   }

src/app.js

@@ -1,6 +1,7 @@
 const express = require('express');
+
 const app = express();
-const DNS = require('./models/urls')
+const allRoutes = require('./routes/allRoutes.js')
 
 // require db connection
 require('./db/connection');
@@ -10,47 +11,13 @@ const port = process.env.PORT || 3000;
 
 app.use(express.json())
 
-app.get("/:inpURL",async(req,res)=>{
-    try{
-        const getUrl = await DNS.find({
-            "inputText": req.params.inpURL
-        });
-        res.status(201).send(getUrl);
-    }catch(e){
-        res.status(400).send(e);
-    }
-});
-
-app.get("/",async(req,res)=>{
-    try{
-        const getUrl = await DNS.find({
-
-        });
-        res.status(201).send(getUrl);
-    }catch(e){
-        res.status(400).send(e);
-    }
-});
-
-// Create a new URL
-app.post("/url",(req,res)=>{
-    const inputURL = req.body.inputURL;
-    const inputText = req.body.inputText;
-    const outputText = req.get('host')+"/"+inputText;
-
-    const body = {
-        "inputURL" : inputURL,
-        "inputText" : inputText,
-        "outputText" : outputText
-    }
-    console.log(body)
-    const newDNS = new DNS(body)
-    newDNS.save().then(()=>{
-        res.status(201).send(newDNS);
-    }).catch((e)=>{
-        res.status(400).send(e);
-    })
-});
+
+//Routes middleware
+app.use('/', allRoutes)
+
+
+
+
 
 
 app.listen(port,()=>{

src/db/connection.js

@@ -1,6 +1,10 @@
 require('dotenv').config()
 const mongoose = require('mongoose');
+
+
 const connectionURL = "mongodb+srv://"+process.env.DB_USER_NAME+":"+process.env.DB_PASSWORD+"@we-foss.qpkiw.mongodb.net/"+process.env.DB_DATABASE_NAME+"?retryWrites=true&w=majority/DNS-map";
+
+
 mongoose.connect(connectionURL,{
     useCreateIndex:true,
     useNewUrlParser:true,

src/routes/allRoutes.js

@@ -0,0 +1,66 @@
+const express = require('express');
+const router = express.Router();
+const {nanoid} = require('nanoid')
+const DNS = require('../models/urls')
+
+
+
+
+router.get("/:inpURL",async(req,res)=>{
+
+    try{
+        const { inputURL } = await DNS.findOne({
+            "inputText": req.params.inpURL
+        }, 'inputURL');
+
+
+        await res.redirect(302,inputURL);
+    }catch(e){
+        res.status(400).send(e).end();
+    }
+});
+
+
+
+router.get("/",async(req,res)=>{
+    try{
+        const getUrl = await DNS.find({
+
+        });
+        res.status(201).send(getUrl);
+    }catch(e){
+        res.status(400).send(e);
+    }
+});
+
+
+
+// Create a new URL
+router.post("/url", async (req,res)=>{
+
+    try{
+    const randomstring = nanoid(4);
+    const inputURL = req.body.inputURL;
+    const inputText = `${randomstring}-${req.body.inputText}`;
+    const outputText = inputText!== "" ? req.get('host')+"/"+inputText : req.get('host')+"/"+nanoid(10);
+
+
+    const body = {
+        "inputURL" : inputURL,
+        "inputText" : inputText,
+        "outputText" : outputText
+    }
+
+    const newDNS = new DNS(body);
+
+   await newDNS.save();
+   await res.status(201).send(newDNS);    
+}
+
+catch(e){
+        res.status(400).send(e);
+
+}}
+)
+
+module.exports = router