Merge branch 'feature_ticket_creation' of...

Merge branch 'feature_ticket_creation' of https://github.com/juhiagl8/grievance-service into feature_ticket_creation

src/main/java/org/upsmf/grievance/service/impl/UserServiceImpl.java

@@ -336,7 +336,7 @@ public class UserServiceImpl implements UserDetailsService, UserService {
 			LOGGER.info(randomPassword);
 			userDao.saveForgotPassword(userId, randomPassword);
 			keyValue.put(JsonKey.PSWRD, randomPassword);
-			SendMail.sendMail(keyValue, emails, Constants.PSWORD_REGENERATED, Constants.FORGOT_PSWORD_VM_FILE);
+			//SendMail.sendMail(keyValue, emails, Constants.PSWORD_REGENERATED, Constants.FORGOT_PSWORD_VM_FILE);
 		}
 		return response;
 	}

src/main/java/org/upsmf/grievance/util/Sql.java

@@ -82,7 +82,7 @@ public final class Sql {
 		public static final String OPEN_BRACE = "(";
 		public static final String CLOSE_BRACE = ")";
 		public static final String ADD_NEW_ORG = "INSERT INTO organization (org_name, url, logo, created_by, updated_by, description, color, domain) VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
-		public static final String NEW_GRIEVANCE_ADMIN_USER = "INSERT INTO user (name, username, phone, img_path) VALUES (?,?,?,?)";
+		public static final String NEW_GRIEVANCE_ADMIN_USER = "INSERT INTO \"user\" (name, username, phone, img_path) VALUES (?,?,?,?)";
 		public static final String DELETE_ORG = "UPDATE organization SET is_active = FALSE , updated_by = ? , updated_date = ? WHERE id = ?";
 		public static final String GET_ADMIN_BY_ORG = "SELECT DISTINCT a.id,a.name,a.username,a.phone FROM \"user\" a,organization b,roles c, user_org d, user_role e "
 				+ "WHERE a.id = d.user_id AND a.id = e.user_id " + "AND c.id = ? AND b.id = ? AND a.is_active IS TRUE";
@@ -256,7 +256,7 @@ public final class Sql {
 		public static final String AND_CONDITION = " AND ";
 		public static final String OR_CONDITION = " OR ";
 
-		public static final String UPDATE_USER = "UPDATE user SET name = ?,username = ?, phone = ?, is_active = ?, img_path = ? where id = ? ";
+		public static final String UPDATE_USER = "UPDATE \"user\" SET name = ?,username = ?, phone = ?, is_active = ?, img_path = ? where \"user\".id = ? ";
 		public static final String GET_USER_COUNT = "SELECT count(*) FROM \"user\" usr";
 		public static final String GET_USER_COUNT_ON_ACTIVE_STATUS = "SELECT count(*) FROM \"user\" usr where usr.is_active = ? ";
 		public static final String GET_USER_COUNT_FOR_ROLE = "SELECT count(*) FROM \"user\" usr LEFT JOIN user_role ur ON usr.id = ur.user_id where ur.role_id = ? and usr.is_active IS TRUE";

src/main/resources/application.properties

@@ -5,9 +5,9 @@ spring.main.allow-bean-definition-overriding=true
 spring.http.multipart.max-file-size=10MB
 spring.http.multipart.max-request-size=10MB
 
-spring.datasource.url=jdbc:postgresql://localhost:5432/aurora_desk?currentSchema=aurora
-spring.datasource.username=juhi
-spring.datasource.password=juhiagl8
+spring.datasource.url=jdbc:postgresql://localhost:5432/grievance_desk
+spring.datasource.username=postgres
+spring.datasource.password=
 spring.datasource.driver-class-name=org.postgresql.Driver
 spring.jpa.hibernate.ddl-auto=none
 spring.datasource.initialization-mode=always
@@ -19,7 +19,7 @@ services.esindexer.host=es.rain.idc.tarento.com
 services.esindexer.host.name=http://es.rain.idc.tarento.com/
 services.esindexer.host.port=9200
 services.esindexer.username=elastic
-services.esindexer.password=Elastic123
+services.esindexer.password=
 es.templates.index.name=tkt_templates
 es.templates.document.type=tkt_templates
 elasticsearch.url=elasticsearch-dev.idc.tarento.com