pull request merge from Nuwani - request router and frontend chages

Backend/package.json

@@ -22,7 +22,7 @@
     "moment": "^2.30.1",
     "mongoose": "^8.0.2",
     "multer": "^1.4.5-lts.1",
-    "nodemailer": "^6.9.13"
+    "nodemailer": "^6.9.14"
   },
   "devDependencies": {
     "nodemon": "^3.0.2"

Backend/src/config/database.config.js

@@ -24,7 +24,7 @@ export const dbconnect = async () => {
         console.log('Connected successfully!');
 
         // Watch for changes only after seeding is done
-        await watchUsers();
+        //await watchUsers();
     } catch (error) {
         console.log(error);
     }

Backend/src/models/disasterRequest.model.js

@@ -13,7 +13,8 @@ export const DisasterRequestSchema = new Schema(
                 }
             ],
             default: []},
-        affectedCount: {type: Number, required: true},
+        image: {type:[{type:String}], required:false},        
+        affectedCount: {type: String, required: true},
         medicalNeed: {type: Boolean, default: false},
         otherNeeds: {type: String, required: false},
         requestTime: {type: String, required: true},

Backend/src/models/news.model.js

@@ -7,7 +7,7 @@ export const NewsSchema = new Schema(
         author: {type: String, required: true},
         createdDate: {type: String, required: true},
         createdTime: {type: String, required: true},
-        image: {data: Buffer , contentType: String},
+        image: {type:String , default:false},
         newsBody: {type: String, required: true},
         show: {type: Boolean, default:false} //if and only if show is true news are displayed in the user's side
     },

Backend/src/models/user.model.js

@@ -9,7 +9,7 @@ export const UserSchema = new Schema(
         address: {type: String, default: "none"},
         accessLevel: {type: Number, default: 1},
         department: {type: String, default: "None"},
-        telephoneNumber: {type: String, required: true},
+        telephoneNumber: {type: String, required: false},
         lastLogged: {type: Date, default: "2023/10/12"}
     },
     {

Backend/src/routers/maps.router.js

@@ -23,7 +23,7 @@ router.post('/getGeoCode', handler(async(req,res) => {
 
 router.post ('/getProvince',handler( async(req,res) => {
     const {location} = req.body;
-    const apiKey = 'AIzaSyCqnhZFna6jPPizSKO88sNgdYLc3SHAGhk';
+    const apiKey = process.env.GOOGLEMAP_API;
     const url = `https://maps.googleapis.com/maps/api/geocode/json?address=${encodeURIComponent(location)},Sri%20Lanka&key=${apiKey}`;
 
     try {

Backend/src/routers/news.router.js

@@ -11,9 +11,9 @@ const router = Router();
 const storage = multer.memoryStorage();
 const upload = multer({ storage: storage });
 
-router.post('/createNews', upload.single('image'), handler(async (req, res) => {
+router.post('/createNews', handler(async (req, res) => {
 
-    const {heading, author, newsBody} = req.body;
+    const {heading, author, newsBody, image} = req.body;
     const currentDateTime = new Date(); //real time
     const createdDate = currentDateTime.toDateString();
     const createdTime = currentDateTime.toTimeString();
@@ -24,22 +24,13 @@ router.post('/createNews', upload.single('image'), handler(async (req, res) => {
             return res.status(BAD_REQUEST).send("Missing required fields");
           }
     const newID = await generateNewsId(heading);
-
-    let imageData;
-    let contentType;
-    if (req.file) {
-        imageData = req.file.buffer; // Convert image buffer to base64 string
-        contentType = req.file.mimetype;
-    }
 
     try {
         const newNews = await NewsModel.create({
             newsId: newID,
             heading,
             author,
-
-            image : { data: imageData, contentType: contentType },
-
+            image,
             newsBody,
             createdDate,
             createdTime,
@@ -54,24 +45,17 @@ router.post('/createNews', upload.single('image'), handler(async (req, res) => {
 
 }));
 
-router.patch('/updateNews/:newsId', upload.single('image'), handler(async (req, res) => {
+router.patch('/updateNews/:newsId', handler(async (req, res) => {
     const { newsId } = req.params;
-    const {heading, author, newsBody, show} = req.body;
+    const {heading, author, newsBody, show, image} = req.body;
     const currentDateTime = new Date(); //real time
     const createdDate = currentDateTime.toDateString();
     const createdTime = currentDateTime.toTimeString();
         // Validate required fields
         if (!heading || !author || !newsBody ) {
             return res.status(BAD_REQUEST).send("Missing required fields");
         }    
-        let updateData = { heading, author, newsBody, show, createdDate, createdTime};
-
-        if (req.file) {
-          updateData.image = {
-            data: req.file.buffer,
-            contentType: req.file.mimetype
-          };
-        } 
+        let updateData = { heading, author, newsBody, show, createdDate, createdTime, image};
     try{
         const updatedNews = await NewsModel.findOneAndUpdate(
             { newsId: newsId },

Backend/src/routers/report.router.js

@@ -12,6 +12,7 @@ router.post('/addReport', handler(async (req,res) => {
     const {disasterType,
         severity,
         disasterLocation,
+        disasterRequests,
         affectedCount,
         affectedLocations,
         finished
@@ -28,6 +29,7 @@ router.post('/addReport', handler(async (req,res) => {
         disasterLocation,
         affectedCount,
         affectedLocations,
+        disasterRequests,
         createdDate: currentDate,
         updatedDate: currentDate,
         finished: isFinished

Backend/src/routers/request.router.js

@@ -2,10 +2,11 @@ import { Router } from "express";
 import { BAD_REQUEST, INTERNAL_SERVER_ERROR } from "../constants/httpStatus.js";
 import handler from 'express-async-handler';
 import { DisasterRequestModel } from "../models/disasterRequest.model.js";
+import { DisasterReportModel } from "../models/disasterReport.model.js";
 
 const router = Router();
 
-router.get('/request',handler(async (req,res) => {
+router.post('/request',handler(async (req,res) => {
 
     const {
         disasterType,
@@ -16,13 +17,14 @@ router.get('/request',handler(async (req,res) => {
         otherNeeds,
         disasterLocationLatLan,
         read,
-        requestProvince} = req.body;
+        image} = req.body;
 
         const currentDateTime = new Date();
         const requestDate = currentDateTime.toDateString();
         const requestTime = currentDateTime.toTimeString();
 
         const newID = await generateRequestID(disasterType);
+        const requestProvince = await getRequestProvince(disasterLocationLatLan);
 
         const newRequest = {
             requestID: newID,
@@ -36,7 +38,8 @@ router.get('/request',handler(async (req,res) => {
             requestTime,
             requestDate,
             read,
-            requestProvince
+            image,
+            requestProvince: requestProvince
         };
 
         const result = await DisasterRequestModel.create(newRequest);
@@ -88,9 +91,9 @@ router.put('/updateRequest/:requestID', handler(async (req, res) => {
             { read: true },
             { new: true } // Return the updated document
         );
-        return res.status(INTERNAL_SERVER_ERROR).send(request);
+        res.status(200).send(request);
+
     } catch (error) {
-        console.error(error);
         return res.status(INTERNAL_SERVER_ERROR).send("Internal server error");
     }
 }));
@@ -132,7 +135,6 @@ router.post('/showUnverify', handler(async (req, res) =>{
 
 //not finished
 const sendingResponds = async(requests) =>{
-
     try{
         const sendTo = "engerrev897@gmail.com";
         const sendFrom = process.env.Email_USER;
@@ -161,26 +163,36 @@ const generateRequestID = async(disasterType) => {
 
     const disasterCode = disasterType.substring(0, 2);
     const min = 0;
-    const max = 100;
-    const requestNumber = Math.floor(Math.random() * (max - min + 1)) + min;
+    const max = 1000;
+    let requestNumber = Math.floor(Math.random() * (max - min + 1)) + min;
 
-    const newID = disasterCode + requestNumber.toString();
-    console.log("ID",newID);
+    let newID = disasterCode + requestNumber.toString();
+
+    try{
+        while(await DisasterRequestModel.findOne({requestID: newID})){
+            requestNumber++;
+            newID = disasterCode + requestNumber.toString();
+        }
+        console.log("ID",newID);
+        return newID;
+    }catch(error){
+        console.log("ID generate error");
+    }
 
     return newID;
 
 };
 
-const getRequestProvince = async (lat, lng) => {
+const getRequestProvince = async (locationLat) => {
     try{
-        const url = `https://maps.googleapis.com/maps/api/geocode/json?latlng=${lat},${lng}&key=${process.env.GOOGLEMAP_API}`;
+        const url = `https://maps.googleapis.com/maps/api/geocode/json?latlng=${locationLat[0]},${locationLat[1]}&key=${process.env.GOOGLEMAP_API}`;
 
-        const response = await axios.get(url);
-        const results = response.data.results;
+        const response = await fetch(url);
+        const data = await response.json();
 
-        if (results.length > 0) {
+        if (data.results.length > 0) {
             // Loop through the address components to find the province
-            for (const component of results[0].address_components) {
+            for (const component of data.results[0].address_components) {
                 if (component.types.includes("administrative_area_level_1")) {
                     return component.long_name;  // Return the province name
                 }
@@ -191,4 +203,5 @@ const getRequestProvince = async (lat, lng) => {
     }
 }
 
-export default router
+export default router
+

Backend/src/server.js

@@ -20,7 +20,6 @@ dbconnect();
 
 const app = express();
 
-
 app.use(express.json());
 
 app.use(cors({