adding device token

src/main/java/com/tarento/retail/controller/UserController.java

@@ -144,7 +144,7 @@ public class UserController {
 	public String getNumberOfRoles() throws JsonProcessingException {
 		return ResponseGenerator.successResponse(userService.getNumberOfRoles());
 	}
-	
+
 	@RequestMapping(value = PathRoutes.UserRoutes.NUMBER_OF_USERS_ROLES_GET, method = RequestMethod.GET)
 	public String getNumberOfUserAndRoles() throws JsonProcessingException {
 		return ResponseGenerator.successResponse(userService.getNumberOfUsersAndRoles());
@@ -214,7 +214,7 @@ public class UserController {
 		}
 		Long authTokenRef = userService.fetchAuthTokenReference(thisUser.getAuthToken());
 		Boolean updateStatus = userService.updateUserDeviceToken(thisUser.getId(), deviceToken.getDeviceToken(),
-				authTokenRef);
+				deviceToken.getDeviceId(), authTokenRef);
 		if (updateStatus)
 			return ResponseGenerator.successResponse("Success");
 

src/main/java/com/tarento/retail/dao/UserDao.java

@@ -201,7 +201,7 @@ public interface UserDao {
 	 * @param deviceToken
 	 * @return
 	 */
-	public Boolean insertUserDeviceToken(Long userId, String deviceToken, Long authTokenRef);
+	public Boolean insertUserDeviceToken(Long userId, String deviceToken, String deviceId, Long authTokenRef);
 
 	/**
 	 * This method receives the List of User IDs and fetches the FCM Device Token
@@ -255,7 +255,7 @@ public interface UserDao {
 	UserProfile getUserProfile(String username);
 
 	public UserProfileMapper findAll(SearchRequest searchRequest);
-	
+
 	public List<KeyValue> getNumberOfUsersAndRoles();
 
 }

src/main/java/com/tarento/retail/dao/impl/UserDaoImpl.java

@@ -628,10 +628,10 @@ public class UserDaoImpl implements UserDao {
 	}
 
 	@Override
-	public Boolean insertUserDeviceToken(Long userId, String deviceToken, Long authTokenRef) {
+	public Boolean insertUserDeviceToken(Long userId, String deviceToken, String deviceId, Long authTokenRef) {
 		try {
 			jdbcTemplate.update(UserQueries.INSERT_USER_DEVICE_TOKEN,
-					new Object[] { userId, deviceToken, new Date().getTime(), authTokenRef });
+					new Object[] { userId, deviceToken, deviceId, new Date().getTime(), authTokenRef });
 		} catch (Exception e) {
 			LOGGER.error("Encountered an error while inserting new User Device Token : " + e.getMessage());
 			return false;

src/main/java/com/tarento/retail/service/UserService.java

@@ -191,7 +191,7 @@ public interface UserService {
 
 	Boolean checkUserTokenExists(Long userId, String deviceToken);
 
-	Boolean updateUserDeviceToken(Long userId, String deviceToken, Long authTokenRef);
+	Boolean updateUserDeviceToken(Long userId, String deviceToken, String deviceId, Long authTokenRef);
 
 	/**
 	 * This method receives the list of Users IDs and passes the same to Data layer
@@ -234,7 +234,7 @@ public interface UserService {
 	Boolean validateUserOTP(String username, String otp);
 
 	public List<UserProfile> findAll(SearchRequest searchRequest);
-	
+
 	List<KeyValue> getNumberOfUsersAndRoles();
 
 }
\ No newline at end of file

src/main/java/com/tarento/retail/service/impl/UserServiceImpl.java

@@ -418,8 +418,8 @@ public class UserServiceImpl implements UserDetailsService, UserService {
 	}
 
 	@Override
-	public Boolean updateUserDeviceToken(Long userId, String deviceToken, Long authTokenRef) {
-		return userDao.insertUserDeviceToken(userId, deviceToken, authTokenRef);
+	public Boolean updateUserDeviceToken(Long userId, String deviceToken, String deviceId, Long authTokenRef) {
+		return userDao.insertUserDeviceToken(userId, deviceToken, deviceId, authTokenRef);
 	}
 
 	@Override

src/main/java/com/tarento/retail/util/Sql.java

@@ -145,7 +145,7 @@ public interface Sql {
 
 		final String INVALIDATE_TOKEN = "DELETE from user_authentication WHERE auth_token = ? ";
 		final String CHECK_USER_DEVICE_TOKEN = "SELECT COUNT(*) FROM user_device WHERE user_id = ? AND device_token = ? ";
-		final String INSERT_USER_DEVICE_TOKEN = "INSERT INTO user_device (user_id, device_token, created_date, user_auth_id) VALUES (?,?,?,?) ";
+		final String INSERT_USER_DEVICE_TOKEN = "INSERT INTO user_device (user_id, device_token, device_id, created_date, user_auth_id) VALUES (?,?,?,?,?) ";
 		final String UPDATE_USER_DEVICE_TOKEN = "UPDATE user_device SET device_token = ?, created_date = ? WHERE user_id = ? ";
 		final String FETCH_USER_DEVICE_TOKEN = " SELECT device.id, device.user_id, device.device_token FROM user_device device WHERE device.user_id IN ";
 		final String USER_DEVICE_ROLE_CONDITION = " and exists (select 1 from user_role where user_id = device.user_id and role_id IN (1,2)) "
@@ -174,7 +174,7 @@ public interface Sql {
 
 		final String GET_USER_ID = "SELECT id FROM user WHERE username = ? OR email_id = ? OR phone_no = ?";
 		final String GET_USER_PROFILE = "SELECT user.id, user.username, user.email_id as emailId, user.phone_no as phoneNo, user.avatar_url  as avatarUrl, user_profile.first_name, user_profile.last_name, user_profile.dob FROM user LEFT JOIN user_profile on user_profile.user_id = user.id WHERE (user.username = ? or user.email_id = ? ) and is_active is TRUE";
-		final String GET_NUMBER_USER_ROLES = "SELECT count(*) as 'numberOfUsers', r.role_name as 'roleName' from user usr LEFT JOIN user_role ur ON usr.id = ur.user_id LEFT JOIN role r ON ur.role_id = r.id where r.id > 2090 group by r.role_name "; 
+		final String GET_NUMBER_USER_ROLES = "SELECT count(*) as 'numberOfUsers', r.role_name as 'roleName' from user usr LEFT JOIN user_role ur ON usr.id = ur.user_id LEFT JOIN role r ON ur.role_id = r.id where r.id > 2090 group by r.role_name ";
 	}
 
 	public interface NamedUserQueries {