[#55] 푸시 서비스 구현

src/main/java/com/delfood/dao/FcmDao.java

@@ -2,15 +2,18 @@
 
 import com.delfood.utils.RedisKeyFactory;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.log4j.Log4j2;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+import javax.management.RuntimeErrorException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Repository;
 
 @Repository
+@Log4j2
 public class FcmDao {
 
   @Autowired
@@ -33,11 +36,22 @@ public class FcmDao {
    */
   public void addMemberToken(String memberId, String token) {
     String key = RedisKeyFactory.generateFcmMemberKey(memberId);
-    if (getMemberTokens(memberId).contains(token)) { // 토큰이 이미 있을 경우
-      return;
+    redisTemplate.watch(key);
+    try {
+      if (getMemberTokens(memberId).contains(token)) { // 토큰이 이미 있을 경우
+        return;
+      }
+      redisTemplate.multi();
+
+      redisTemplate.opsForList().rightPush(key, token);
+      redisTemplate.expire(key, MEMBER_TOKEN_EXPIRE_SECOND, TimeUnit.SECONDS);
+
+      redisTemplate.exec();
+    } catch (Exception e) {
+      log.error("Redis Add Member Token ERROR! key : {}", key);
+      redisTemplate.discard();
+      throw new RuntimeException("Redis ERROR");
     }
-    redisTemplate.opsForList().rightPush(key, token);
-    redisTemplate.expire(key, MEMBER_TOKEN_EXPIRE_SECOND, TimeUnit.SECONDS);
   }
 
   /**
@@ -48,11 +62,22 @@ public void addMemberToken(String memberId, String token) {
    */
   public void addOwnerToken(String ownerId, String token) {
     String key = RedisKeyFactory.generateFcmOwnerKey(ownerId);
-    if (getOwnerTokens(ownerId).contains(token)) { // 토큰이 이미 있을 경우
-      return;
+    redisTemplate.watch(key);
+    try {
+      if (getOwnerTokens(ownerId).contains(token)) { // 토큰이 이미 있을 경우
+        return;
+      }
+      redisTemplate.multi();
+
+      redisTemplate.opsForList().rightPush(key, token);
+      redisTemplate.expire(key, OWNER_TOKEN_EXPIRE_SECOND, TimeUnit.SECONDS);
+
+      redisTemplate.exec();
+    } catch (Exception e) {
+      log.error("Redis Add Owner Token ERROR! key : {}", key);
+      redisTemplate.discard();
+      throw new RuntimeException("Redis ERROR");
     }
-    redisTemplate.opsForList().rightPush(key, token);
-    redisTemplate.expire(key, OWNER_TOKEN_EXPIRE_SECOND, TimeUnit.SECONDS);
   }
 
   /**

src/main/java/com/delfood/service/PushService.java

@@ -22,6 +22,7 @@
 import lombok.extern.log4j.Log4j2;
 import org.joda.time.LocalDateTime;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Service;
 
@@ -37,8 +38,8 @@ public class PushService {
   @Autowired
   private FcmDao fcmDao;
 
-  private static final String FCM_PRIVATE_KEY_PATH =
-      "delfood-8385c-firebase-adminsdk-p6vk2-9d667ced9e.json";
+  @Value("${fcm.key.path}")
+  private String FCM_PRIVATE_KEY_PATH;
 
   /**
    * FCM 기본 설정을 진행한다.
@@ -69,7 +70,7 @@ public void init() {
    * @author jun
    * @param messageInfo 전송할 푸시 정보
    */
-  public void send(PushMessageForOne messageInfo) {
+  public void sendByToken(PushMessageForOne messageInfo) {
     Message message = Message.builder()
         .setToken(messageInfo.getToken())
         .putData("title", messageInfo.getTitle())
@@ -89,13 +90,13 @@ public void send(PushMessageForOne messageInfo) {
   /**
    * 해당 토픽을 가진 사용자들에게 메세지를 전송한다.
    * @author jun
-   * @param messageInfo 전송할 푸시 정보
+   * @param topicMessageInfo 전송할 푸시 정보
    */
-  public void send(PushMessageForTopic messageInfo) {
+  public void sendByTopic(PushMessageForTopic topicMessageInfo) {
     Message message = Message.builder()
-        .setTopic(messageInfo.getTopic())
-        .putData("title", messageInfo.getTitle())
-        .putData("message", messageInfo.getMessage())
+        .setTopic(topicMessageInfo.getTopic())
+        .putData("title", topicMessageInfo.getTitle())
+        .putData("message", topicMessageInfo.getMessage())
         .putData("time", LocalDateTime.now().toString())
         .build();
     String response;

src/main/resources/application-dev.properties

@@ -49,3 +49,6 @@ log.config.path=/home/delfood/log
 log.config.filename=delfood-dev
 
 logging.level.jdbc.sqlonly=DEBUG
+
+# FCM
+fcm.key.path=delfood-8385c-firebase-adminsdk-p6vk2-9d667ced9e.json