hotfix : user Log에 필드 추가

hellokitty-coding-club · Oct 3, 2023 · 63cc0d8 · 63cc0d8
1 parent 7cf7cc7
commit 63cc0d8
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 51 deletions.
diff --git a/API-Server/src/main/java/swm/hkcc/LGTM/app/modules/userLog/dto/LogMessage.java b/API-Server/src/main/java/swm/hkcc/LGTM/app/modules/userLog/dto/LogMessage.java
@@ -14,7 +14,12 @@ public class LogMessage {
     private String eventLogName;
     private String screenName;
     private Integer logVersion;
+    private String sessionID;
     private Integer userID;
+    private String deviceOS;
+    private String deviceModel;
+    private String appVersion;
+    private String region;
 
     private Map<String, Object> logData;
 }
diff --git a/Kafka-Consumer-Server/src/main/java/swm/hkcc/consumer/app/domain/UserLog.java b/Kafka-Consumer-Server/src/main/java/swm/hkcc/consumer/app/domain/UserLog.java
@@ -27,12 +27,22 @@ public class UserLog {
 
     private Integer logVersion;
 
-    private Integer userID;
-
     @Type(JsonType.class)
     @Column(columnDefinition = "json")
     private Map<String, Object> logData;
 
+    private String sessionID;
+
+    private Integer userID;
+
+    private String deviceOS;
+
+    private String deviceModel;
+
+    private String appVersion;
+
+    private String region;
+
     private String topic;
 
     private int partitionNumber;

diff --git a/Kafka-Consumer-Server/src/main/java/swm/hkcc/consumer/app/dto/LogMessage.java b/Kafka-Consumer-Server/src/main/java/swm/hkcc/consumer/app/dto/LogMessage.java
@@ -13,31 +13,27 @@ public class LogMessage {
     private String eventLogName;
     private String screenName;
     private Integer logVersion;
+    private String sessionID;
     private Integer userID;
+    private String deviceOS;
+    private String deviceModel;
+    private String appVersion;
+    private String region;
 
     private Map<String, Object> logData;
 
-    public UserDataLog toUserDataLog(String topic, int partition, long receivedTimeStamp) {
-        return UserDataLog.builder()
-                .logId(eventLogName + "_" + receivedTimeStamp + "_" + topic + "_" + partition)
-                .eventLogName(eventLogName)
-                .screenName(screenName)
-                .logVersion(logVersion)
-                .userID(userID)
-                .logData(logData)
-                .topic(topic)
-                .partition(partition)
-                .receivedTimeStamp(receivedTimeStamp)
-                .build();
-    }
-
     public UserLog toUserLog(String topic, int partition, long receivedTimeStamp) {
         return UserLog.builder()
                 .eventLogName(eventLogName)
                 .screenName(screenName)
                 .logVersion(logVersion)
-                .userID(userID)
                 .logData(logData)
+                .sessionID(sessionID)
+                .userID(userID)
+                .deviceOS(deviceOS)
+                .deviceModel(deviceModel)
+                .appVersion(appVersion)
+                .region(region)
                 .topic(topic)
                 .partitionNumber(partition)
                 .receivedTimeStamp(receivedTimeStamp)

diff --git a/Kafka-Consumer-Server/src/main/java/swm/hkcc/consumer/app/dto/UserDataLog.java b/Kafka-Consumer-Server/src/main/java/swm/hkcc/consumer/app/dto/UserDataLog.java
diff --git a/...Consumer-Server/src/main/java/swm/hkcc/consumer/app/repository/UserDataLogRepository.java b/...Consumer-Server/src/main/java/swm/hkcc/consumer/app/repository/UserDataLogRepository.java
@@ -2,7 +2,6 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import swm.hkcc.consumer.app.domain.UserLog;
-import swm.hkcc.consumer.app.dto.UserDataLog;
 
 public interface UserDataLogRepository extends JpaRepository<UserLog, Long> {
 }