diff --git a/src/controllers/tanksController.js b/src/controllers/tanksController.js index ff7e52fd..a8f8529d 100644 --- a/src/controllers/tanksController.js +++ b/src/controllers/tanksController.js @@ -116,7 +116,10 @@ exports.addTanks = async (req, reply) => { typeOfWater: req.body.typeOfWater, tankLocation: req.body.tankLocation.toLowerCase(), waterCapacityPerCm:req.body.waterCapacityPerCm, - height:req.body.height + height:req.body.height, + length:req.body.length, + width:req.body.width + // ... other fields }; diff --git a/src/controllers/userController.js b/src/controllers/userController.js index 05d93c95..e11a36d7 100644 --- a/src/controllers/userController.js +++ b/src/controllers/userController.js @@ -109,7 +109,7 @@ exports.editCuurentUserInfo = async (req, reply) => { const { customerId } = req.params; const userInfo = await User.findOne({ customerId: customerId.toString() }); const updateData = req.body; - + if (updateData.buildingName) userInfo.buildingName = updateData.buildingName if (updateData.firstName) userInfo.profile.firstName = updateData.firstName; if (updateData.lastName) userInfo.profile.lastName = updateData.lastName; if (updateData.username) userInfo.username = updateData.username; diff --git a/src/models/tanks.js b/src/models/tanks.js index 3a023f7f..33859a56 100644 --- a/src/models/tanks.js +++ b/src/models/tanks.js @@ -42,6 +42,8 @@ const tanksSchema = new mongoose.Schema({ blockName: { type: String, default: null }, capacity: { type: String, default: "0" }, height: { type: String, default: "0" }, + length: { type: String, default: "0" }, + width: { type: String, default: "0" }, tankLocation: { type: String, default: null }, waterCapacityPerCm: { type: String, default: "0" }, typeOfWater: { type: String, default: null }, diff --git a/src/routes/tanksRoute.js b/src/routes/tanksRoute.js index 1521856c..fe4fd075 100644 --- a/src/routes/tanksRoute.js +++ b/src/routes/tanksRoute.js @@ -34,6 +34,8 @@ module.exports = function (fastify, opts, next) { waterCapacityPerCm:{ type: "string" }, tankLocation: { type: "string" }, height:{ type: "string" }, + width:{ type: "string" }, + length:{ type: "string" }, }, }, security: [ @@ -86,6 +88,8 @@ module.exports = function (fastify, opts, next) { waterCapacityPerCm:{ type: "string" }, tankLocation: { type: "string" }, height:{ type: "string" }, + width:{ type: "string" }, + length:{ type: "string" }, }, }, security: [ diff --git a/src/routes/usersRoute.js b/src/routes/usersRoute.js index 8b75e74a..da2ce8ad 100644 --- a/src/routes/usersRoute.js +++ b/src/routes/usersRoute.js @@ -417,6 +417,7 @@ module.exports = function (fastify, opts, next) { properties: { phone: { type: "string" }, firstName: { type: "string" }, + buildingName: { type: "string" }, lastName: { type: "string" }, username: { type: "string" }, emails: {