API to delete user device token

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

@@ -587,4 +587,16 @@ public class UserController {
 		return ResponseGenerator.failureResponse("Check your request params");
 	}
 
+	@RequestMapping(value = PathRoutes.UserRoutes.DELETE_USER_DEVICE_TOKEN, method = RequestMethod.DELETE)
+	public String deleteDeviceToken(@RequestParam String deviceId,
+			@RequestHeader(value = "x-user-info", required = true) String xUserInfo) throws JsonProcessingException {
+		Gson gson = new GsonBuilder().setPrettyPrinting().create();
+		User thisUser = gson.fromJson(xUserInfo, User.class);
+
+		Boolean response = userService.deleteDeviceToken(thisUser.getId(), deviceId);
+		if (response)
+			return ResponseGenerator.successResponse("Success");
+
+		return ResponseGenerator.failureResponse(HttpStatus.UNPROCESSABLE_ENTITY.toString());
+	}
 }

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

@@ -262,4 +262,6 @@ public interface UserDao {
 
 	public Boolean validateUserPin(int pin, String username);
 
+	public Boolean deleteDeviceToken(Long userId, String deviceId);
+
 }

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

@@ -1014,4 +1014,15 @@ public class UserDaoImpl implements UserDao {
 		}
 		return Boolean.FALSE;
 	}
+
+	@Override
+	public Boolean deleteDeviceToken(Long userId, String deviceId) {
+		try {
+			jdbcTemplate.update(UserQueries.DELETE_DEVICE_TOKEN, new Object[] { userId, deviceId });
+			return Boolean.TRUE;
+		} catch (Exception e) {
+			LOGGER.error(String.format(Constants.EXCEPTION_METHOD, "deleteDeviceToken", e.getMessage()));
+		}
+		return Boolean.FALSE;
+	}
 }

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

@@ -241,4 +241,6 @@ public interface UserService {
 
 	public Boolean validateUserPin(String username, int pin);
 
+	public Boolean deleteDeviceToken(Long userId, String deviceId);
+
 }
\ No newline at end of file

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

@@ -607,4 +607,9 @@ public class UserServiceImpl implements UserDetailsService, UserService {
 		return userDao.validateUserPin(pin, username);
 	}
 
+	@Override
+	public Boolean deleteDeviceToken(Long userId, String deviceId) {
+		return userDao.deleteDeviceToken(userId, deviceId);
+	}
+
 }

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

@@ -41,6 +41,7 @@ public interface PathRoutes {
 		final String NUMBER_OF_USERS_ROLES_GET = "/getNumberOfUsersAndRoles";
 		final String GET_USER_DEVICE_TOKEN = "getDeviceTokenForUserIds";
 		final String GENERATE_PIN = "/generatePin";
+		final String DELETE_USER_DEVICE_TOKEN = "/deleteDeviceToken";
 	}
 
 	public interface AuthenticationRoutes {

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

@@ -178,6 +178,7 @@ public interface Sql {
 		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 SET_USER_PIN = "UPDATE user SET pin=? WHERE id= ?";
 		final String GET_USER_PIN = "SELECT pin FROM user where username = ?";
+		final String DELETE_DEVICE_TOKEN = "DELETE FROM user_device WHERE user_id= ? AND device_id =?";
 	}
 
 	public interface NamedUserQueries {