From f6e5d609812549bb381b49ee616b3374c5a855e7 Mon Sep 17 00:00:00 2001
From: kavi castelo <kavindu123450@gmail.com>
Date: Sat, 27 Apr 2024 23:19:55 +0530
Subject: [PATCH] Fixed

fixed null pointer bug
---
 .idea/workspace.xml                           | 53 +++++++++++--------
 .../controller/ContactController.java         |  8 +--
 .../api/air_quality/model/ContactModel.java   |  4 +-
 3 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6278a44d..6377e09d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,7 +5,6 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="b092ee41-c077-498f-bce5-460d7a6fbea3" name="Changes" comment="">
-<<<<<<< HEAD
       <change afterPath="$PROJECT_DIR$/client/src/app/components/dashbord/graphs/graphs-air/graphs-air.component.html" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/client/src/app/components/dashbord/graphs/graphs-air/graphs-air.component.scss" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/client/src/app/components/dashbord/graphs/graphs-air/graphs-air.component.spec.ts" afterDir="false" />
@@ -15,15 +14,19 @@
       <change afterPath="$PROJECT_DIR$/client/src/app/components/dashbord/graphs/graphs-metro/graphs-metro.component.spec.ts" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/client/src/app/components/dashbord/graphs/graphs-metro/graphs-metro.component.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/codestream.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/codestream.xml" afterDir="false" />
-=======
-    <list default="true" id="4a36a721-f3b9-4dac-a630-bdf244605597" name="Changes" comment="">
+    </list>
+    <list default="true" id="4a36a721-f3b9-4dac-a630-bdf244605597" name="Changes" comment=""></list>
     <list default="true" id="1b74e0a6-bc86-4c44-930a-d1d3078118d2" name="Changes" comment="">
->>>>>>> cbcae96abf9c046e3883394b4a83b21886fc237e
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/client/src/app/app-routing.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/app/app-routing.module.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/client/src/app/app.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/app/app.module.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/client/src/app/components/dashbord/graphs/graphs.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/app/components/dashbord/graphs/graphs.component.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/client/src/app/components/dashbord/graphs/graphs.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/client/src/app/components/dashbord/graphs/graphs.component.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/codestream.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/codestream.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/api/air_quality/controller/ContactController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/api/air_quality/controller/ContactController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/api/air_quality/model/ContactModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/api/air_quality/model/ContactModel.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -62,18 +65,22 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    &quot;last_opened_file_path&quot;: &quot;E:/PROJECTS/HTML/Ethical-AI-driven-Geographic-Analytics-Platform/client/src/docs&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;spring.configuration.checksum&quot;: &quot;d5f73674f4485e14aac5b80b81aca5c3&quot;,
-    &quot;ts.external.directory.path&quot;: &quot;E:\\PROJECTS\\HTML\\Ethical-AI-driven-Geographic-Analytics-Platform\\client\\node_modules\\typescript\\lib&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ASKED_ADD_EXTERNAL_FILES": "true",
+    "RequestMappingsPanelOrder0": "0",
+    "RequestMappingsPanelOrder1": "1",
+    "RequestMappingsPanelWidth0": "75",
+    "RequestMappingsPanelWidth1": "75",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "last_opened_file_path": "E:/PROJECTS/HTML/Ethical-AI-driven-Geographic-Analytics-Platform/client/src/docs",
+    "nodejs_package_manager_path": "npm",
+    "spring.configuration.checksum": "d5f73674f4485e14aac5b80b81aca5c3",
+    "ts.external.directory.path": "E:\\PROJECTS\\HTML\\Ethical-AI-driven-Geographic-Analytics-Platform\\client\\node_modules\\typescript\\lib"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="E:\PROJECTS\HTML\Ethical-AI-driven-Geographic-Analytics-Platform\client\src\docs" />
@@ -83,7 +90,14 @@
       <recent name="com.api.air_quality.service" />
     </key>
   </component>
-  <component name="RunManager" selected="Spring Boot.AirQualityApplication">
+  <component name="RunDashboard">
+    <option name="configurationTypes">
+      <set>
+        <option value="SpringBootApplicationConfigurationType" />
+      </set>
+    </option>
+  </component>
+  <component name="RunManager">
     <configuration name="AirQualityApplication (1)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="air_quality" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.api.air_quality.AirQualityApplication" />
@@ -91,13 +105,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="AirQualityApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="Ethical-AI-driven-Geographic-Analytics-Platform" />
-      <option name="SPRING_BOOT_MAIN_CLASS" value="com.api.air_quality.AirQualityApplication" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
   </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
diff --git a/src/main/java/com/api/air_quality/controller/ContactController.java b/src/main/java/com/api/air_quality/controller/ContactController.java
index 4e25243f..65ae3395 100644
--- a/src/main/java/com/api/air_quality/controller/ContactController.java
+++ b/src/main/java/com/api/air_quality/controller/ContactController.java
@@ -23,14 +23,14 @@ public class ContactController {
     public ResponseEntity<ApiResponse> sendMail(@RequestBody ContactModel contactModel){
         emailService.sendSimpleEmail("kavindu.kokila.info@gmail.com","Urban air quality platform - contact","" +
                 "Dear Administration,"+"\n" +
-                "You got an contact email from: "+contactModel.getSender()+"\n" +
-                "Email Address: "+contactModel.getSenderEmail()+"\n\n" +
+                "You got an contact email from: "+contactModel.getName()+"\n" +
+                "Email Address: "+contactModel.getEmail()+"\n\n" +
                 ""+contactModel.getMessage()+"\n\n" +
                 "Client is waiting for your response. Reply ASAP\n\n\n" +
                 "System Automated Email - Urban Air Quality Platform");
 
-        emailService.sendSimpleEmail(contactModel.getSenderEmail(),"Urban air quality platform - contact","" +
-                "Dear "+contactModel.getSender()+","+"\n" +
+        emailService.sendSimpleEmail(contactModel.getEmail(),"Urban air quality platform - contact","" +
+                "Dear "+contactModel.getName()+","+"\n" +
                 "We got your contact message. Our agent will be contact you ASAP. Thank you for contacting with us! \n\n" +
                 "Sincerely,\n" +
                 "Urban Air Quality Platform.\n\n" +
diff --git a/src/main/java/com/api/air_quality/model/ContactModel.java b/src/main/java/com/api/air_quality/model/ContactModel.java
index af966939..b792cfd3 100644
--- a/src/main/java/com/api/air_quality/model/ContactModel.java
+++ b/src/main/java/com/api/air_quality/model/ContactModel.java
@@ -14,7 +14,7 @@
 public class ContactModel {
     @Id
     private String id;
-    private String sender;
-    private String senderEmail;
+    private String name;
+    private String email;
     private String message;
 }