diff --git a/src/main/java/com/uci/adapter/firebase/web/FirebaseNotificationService.java b/src/main/java/com/uci/adapter/firebase/web/FirebaseNotificationService.java index b28fa26..c21a97b 100644 --- a/src/main/java/com/uci/adapter/firebase/web/FirebaseNotificationService.java +++ b/src/main/java/com/uci/adapter/firebase/web/FirebaseNotificationService.java @@ -17,6 +17,9 @@ public class FirebaseNotificationService { public static final String url = "https://fcm.googleapis.com/fcm/send"; + private long sentCount; + private long notSentCount; + /** * Send FCM Notification to token with title & body * @param token @@ -32,10 +35,9 @@ public Mono sendNotificationMessage(String serviceKey, String token, St httpHeaders.set("Content-Type", "application/json"); }) .build(); - String token1 = "d6oo7uBfIHlJvQktBLpF31:APA91bEXkLLFFgoesrBC4yfMahjvFz8AWBqL_C-uS-91_qMm2GohIwZ4EdpB6BoDCIps6xhrlpVuYlWHiXEsElVfLagwaWg1LAIb1wbNnXAvD0c6GozuEtk14VN5oX1gmMwMDQf-EEeG";; ObjectMapper mapper = new ObjectMapper(); ObjectNode node = mapper.createObjectNode(); - node.put("to", token1); + node.put("to", token); node.put("collapse_key", "type_a"); // Notification Key Enable and Disable from Payload if (notificationKeyEnable != null && notificationKeyEnable.equalsIgnoreCase("true")) { @@ -53,7 +55,7 @@ public Mono sendNotificationMessage(String serviceKey, String token, St dataNode.put("title", title); dataNode.put("externalId", channelMessageId); dataNode.put("destAdd", phone); - dataNode.put("fcmDestAdd", token1); + dataNode.put("fcmDestAdd", token); dataNode.put("click_action", click_action); if (data != null) { @@ -71,10 +73,12 @@ public Mono sendNotificationMessage(String serviceKey, String token, St try { ObjectNode resultNode = (ObjectNode) mapper.readTree(response); if (resultNode.get("success") != null && Integer.parseInt(resultNode.get("success").toString()) >= 1) { - log.info("Notification triggered success : " + phone + " fcm token : " + token1 + " FCM Response : " + resultNode.toString()); + sentCount++; + log.info("Notification triggered success : " + phone + " fcm token : " + token + " FCM Response : " + resultNode.toString() + " :: sent count : " + sentCount); return true; } else { - log.error("Notification not sent : " + phone + " fcm Token : " + token1 + " error :" + resultNode.toString()); + notSentCount++; + log.error("Notification not sent : " + phone + " fcm Token : " + token + " error :" + resultNode.toString() + " :: count : " + notSentCount); } } catch (JsonProcessingException jsonMappingException) { log.error("Exception in sendNotificationMessage: " + jsonMappingException.getMessage());