From b2882420799951a93062ba360c76fd8754a18c06 Mon Sep 17 00:00:00 2001 From: suresh Date: Tue, 24 Jan 2023 02:02:05 -0500 Subject: [PATCH] add changes in tankcontroller and creeate connection --- src/config/swagger.js | 4 +- src/controllers/createConnectionController.js | 45 +++++++++++++------ src/controllers/tanksController.js | 16 ++++--- 3 files changed, 45 insertions(+), 20 deletions(-) diff --git a/src/config/swagger.js b/src/config/swagger.js index 7308e53c..adf1ae84 100644 --- a/src/config/swagger.js +++ b/src/config/swagger.js @@ -14,8 +14,8 @@ exports.options = { }, // We have to change this beacause this is running on local // we have to run on this on swagger - // host: "localhost:3000", //Devlopemnt host on lcoal - host: "35.207.198.4:3000", //Production for swagger + host: "localhost:3000", //Devlopemnt host on lcoal + // host: "35.207.198.4:3000", //Production for swagger schemes: ["http"], consumes: ["application/json"], produces: ["application/json"], diff --git a/src/controllers/createConnectionController.js b/src/controllers/createConnectionController.js index 59b55167..22a79a6c 100644 --- a/src/controllers/createConnectionController.js +++ b/src/controllers/createConnectionController.js @@ -10,25 +10,44 @@ const fastify = require("fastify")({ // add new tanks -exports.createConnections = async (req, body) => { +exports.createConnections = async (req, reply) => { try { - var tankname = req.body.source; - - const tankInfo = await Tank.findOne({ tankName: tankname.toString() }) - const updateData = req.body; - console.log(updateData.inputConnections); - if (updateData.source) tankInfo.connections.source = updateData.source; - if (updateData.inputConnections) tankInfo.connections.inputConnections = updateData.inputConnections; - if (updateData.outputConnections) tankInfo.connections.outputConnections = updateData.outputConnections; - const tank_connections = await tankInfo.save(); - return tank_connections; - } catch (err) { + + //const username = loginObject.user.username; + + createConnections = { + //userName: username, + source: req.body.source, + inputConnections: req.body.inputConnections, + outputConnections:req.body.outputConnections, + }; + + + + var tank_name = req.body.source + var i_tank = await Tank.findOne({ tankName: tank_name}) + if(i_tank){ + throw new Error('tankname already exists'); + } + else { + var connections = new Connections(createConnections); + checkFormEncoding = isUserFormUrlEncoded(req); + if (checkFormEncoding.isUserFormUrlEncoded) { + usertobeInserted = checkFormEncoding.connections; + connections.source = usertobeInserted.source; + connections.inputConnections = req.body.inputConnections; + connections.outputConnections = req.body.outputConnections; + } + const insertedConnection = await connections.save(); + return insertedConnection; + } + } + catch (err) { throw boom.boomify(err); } }; - exports.updateconnectionInfo = async (req, reply) => { try { //const username = loginObject.user.username; diff --git a/src/controllers/tanksController.js b/src/controllers/tanksController.js index 3c70347a..ecc2ff88 100644 --- a/src/controllers/tanksController.js +++ b/src/controllers/tanksController.js @@ -65,14 +65,20 @@ exports.updateTanksInfo = async (req, reply) => { try { //const username = loginObject.user.username; const tankName = req.params.tankName; + + var tank_name = req.body.tankName + var i_tank = await Tank.findOne({ tankName: tank_name}) const tank = req.body; const { ...updateData } = tank; const update = await Tank.findOneAndUpdate({ tankName: tankName }, updateData, { new: true }); - //return update; - - reply.send({ status_code: 200, data: update }); - - + if(i_tank){ + throw new Error('tankname already exists'); + } + else + { + //return update; + reply.send({ status_code: 200, data: update }); + } } catch (err) { throw boom.boomify(err);