Exception handled in response

pom.xml

@@ -62,11 +62,11 @@
 			<artifactId>mysql-connector-j</artifactId>
 			<scope>runtime</scope>
 		</dependency>
-		<dependency>
+		<!--<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
-		</dependency>
+		</dependency>-->
 	</dependencies>
 
 	<build>

src/main/java/com/gcc/erppostdata/communityhall/CHPostData.java

@@ -218,8 +218,11 @@ public class CHPostData {
         if(response != null) {
             ObjectMapper objectMapper = new ObjectMapper();
             Map<String, Object> res = objectMapper.readValue(response.toString(), Map.class);
-             status = res.get("ResultStatus").toString();
+
              msgStatus = res.get("Message").toString();
+             if(res.get("ResultStatus")!=null) {
+                 status = res.get("ResultStatus").toString();
+             }
         }
 
         System.out.println("ResultStatus: " + status);
@@ -228,7 +231,10 @@ public class CHPostData {
         ErpCHPostData com = new ErpCHPostData();
         com.setBookingId(map.get("bookingId").toString());
         com.setTransactionId(map.get("TRANSACTIONNO").toString());
-        if(status.equals("true")){
+        String conFailure = "Connection Failure";
+        if(conFailure.equals(msgStatus) ) {
+            com.setStatus(2);;
+        }else if(status.equals("true")){
             com.setStatus(1);
         }else if(msg.equals(msgStatus) && status.equals("false")) {
             com.setStatus(1);
@@ -249,8 +255,11 @@ public class CHPostData {
         if(response != null) {
             ObjectMapper objectMapper = new ObjectMapper();
             Map<String, Object> res = objectMapper.readValue(response.toString(), Map.class);
-            status = res.get("ResultStatus").toString();
             msgStatus = res.get("Message").toString();
+            if(res.get("ResultStatus")!=null) {
+                status = res.get("ResultStatus").toString();
+            }
+
         }
 
         System.out.println("ResultStatus: " + status);
@@ -260,6 +269,10 @@ public class CHPostData {
         com.setBookingId(map.get("bookingId").toString());
         com.setTransactionId(map.get("TRANSACTIONNO").toString());
 
+        String conFailure = "Connection Failure";
+        if(conFailure.equals(msgStatus) ) {
+            com.setStatus(2);;
+        }
         if(msg.equals(msgStatus) && status.equals("false")) {
             com.setStatus(1);
         } else if ("Failure".equals(msgStatus) && status.equals("false")) {

src/main/java/com/gcc/erppostdata/config/AppConfig.java

@@ -8,6 +8,10 @@ import org.springframework.context.annotation.Configuration;
 @ConfigurationProperties(prefix = "app")
 public class AppConfig {
     private String erpUrl;
+    private String username;
+    private String password;
+    private String petDb;
+    private String cmhDb;
 
     public String getErpUrl() {
         return erpUrl;
@@ -16,4 +20,36 @@ public class AppConfig {
     public void setErpUrl(String erpUrl) {
         this.erpUrl = erpUrl;
     }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getPetDb() {
+        return petDb;
+    }
+
+    public void setPetDb(String petDb) {
+        this.petDb = petDb;
+    }
+
+    public String getCmhDb() {
+        return cmhDb;
+    }
+
+    public void setCmhDb(String cmhDb) {
+        this.cmhDb = cmhDb;
+    }
 }

src/main/java/com/gcc/erppostdata/config/DatabaseConfig.java

@@ -1,6 +1,7 @@
 package com.gcc.erppostdata.config;
 
 import jakarta.persistence.EntityManagerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
@@ -20,11 +21,20 @@ import javax.sql.DataSource;
 @EnableTransactionManagement
 public class DatabaseConfig {
 
-    String chDb="communityhalldemo";
+//    @Autowired
+//    private AppConfig appConfig;
+
+    String chDb="communityhall_live";
     String petDb="gcc_pets";
 
     String userName="root";
-    String password="root";
+    String password="gccroot";
+
+//    String chDb= appConfig.getCmhDb();
+//    String petDb= appConfig.getPetDb();
+//
+//    String userName= appConfig.getUsername();
+//    String password= appConfig.getPassword();
 
     @Configuration
     @EnableTransactionManagement
@@ -35,11 +45,13 @@ public class DatabaseConfig {
     )
     public class MysqlpetDataSourceConfig {
 
-        String petDb="gcc_pets";
+//        String petDb="gcc_pets";
 
         @Primary
         @Bean(name = "mysqlPetRegistrationDataSource")
         public DataSource mysqlPetRegistrationDataSource() {
+            System.out.println();
+
             return DataSourceBuilder.create()
                     .url("jdbc:mysql://localhost:3306/"+DatabaseConfig.this.petDb)
                     .username(DatabaseConfig.this.userName)
@@ -80,6 +92,8 @@ public class DatabaseConfig {
 
         @Bean(name = "mysqlCommunityHallDataSource")
         public DataSource mysqlCommunityHallDataSource() {
+            System.out.println("User Name:- "+DatabaseConfig.this.userName);
+            System.out.println("Password :- "+DatabaseConfig.this.password);
             return DataSourceBuilder.create()
                     .url("jdbc:mysql://localhost:3306/"+DatabaseConfig.this.chDb)
                     .username(DatabaseConfig.this.userName)
@@ -131,8 +145,8 @@ public class DatabaseConfig {
         DriverManagerDataSource dataSource = new DriverManagerDataSource();
         dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
         dataSource.setUrl("jdbc:mysql://localhost:3306/erppostdata");
-        dataSource.setUsername("root");
-        dataSource.setPassword("root");
+        dataSource.setUsername(this.userName);
+        dataSource.setPassword(this.password);
         return dataSource;
     }
 

src/main/java/com/gcc/erppostdata/petregistration/PRPostData.java

@@ -199,7 +199,7 @@ public class PRPostData {
         String msg = "Already Updated this collection";
         String conFailure = "Connection Failure";
         if(conFailure.equals(msgStatus) ) {
-            statusCode="1";
+            statusCode="2";
         }
         else if(msg.equals(msgStatus) && status.equals("false")) {
             statusCode="1";
@@ -225,13 +225,18 @@ public class PRPostData {
         if(response != null) {
             ObjectMapper objectMapper = new ObjectMapper();
             Map<String, Object> res = objectMapper.readValue(response.toString(), Map.class);
-            status = res.get("ResultStatus").toString();
             msgStatus = res.get("Message").toString();
+            if(res.get("ResultStatus") != null) {
+                status = res.get("ResultStatus").toString();
+            }
         }
 
         System.out.println("ResultStatus: " + status);
         String msg = "Already Updated this collection";
-        if(status.equals("true")){
+        String conFailure = "Connection Failure";
+        if(conFailure.equals(msgStatus) ) {
+            statusCode="2";
+        }else if(status.equals("true")){
             statusCode ="1";
         }else if(msg.equals(msgStatus) && status.equals("false")) {
             statusCode ="1";

src/main/resources/application-dev.properties

@@ -1,2 +1,7 @@
 app.erpUrl=http://coc-staging.egovernments.org:9980/pgr/external/mobileservice?
 
+app.username=root
+app.password=root
+
+app.petDb=gcc_pets
+app.cmhDb=communityhalldemo

src/main/resources/application-prod.properties

@@ -1 +1,7 @@
 app.erpUrl=https://erp.chennaicorporation.gov.in/pgr/external/mobileservice?
+
+app.username=root
+app.password=gccroot
+
+app.petDb=gcc_pets
+app.cmhDb=communityhall_live

src/main/resources/application.properties

@@ -8,4 +8,4 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.jpa.database-platform=org.hibernate.dialect.MySQL8Dialect
 spring.jpa.hibernate.ddl-auto=update
 
-spring.profiles.active=dev
+spring.profiles.active=prod

src/test/java/com/gcc/erppostdata/ErppostdataApplicationTests.java

@@ -1,13 +0,0 @@
-package com.gcc.erppostdata;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class ErppostdataApplicationTests {
-
-	@Test
-	void contextLoads() {
-	}
-
-}