From 7cf7cc71de8659f6493f1b2ade9cd9ac892e1a8e Mon Sep 17 00:00:00 2001 From: great-park Date: Tue, 3 Oct 2023 19:19:10 +0900 Subject: [PATCH] =?UTF-8?q?hotfix=20:=20user=20Log=EC=97=90=20userID=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../swm/hkcc/LGTM/app/modules/userLog/UserLogController.java | 5 +---- .../swm/hkcc/LGTM/app/modules/userLog/dto/LogMessage.java | 1 + .../src/main/java/swm/hkcc/consumer/app/domain/UserLog.java | 2 ++ .../src/main/java/swm/hkcc/consumer/app/dto/LogMessage.java | 3 +++ .../src/main/java/swm/hkcc/consumer/app/dto/UserDataLog.java | 2 ++ 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/API-Server/src/main/java/swm/hkcc/LGTM/app/modules/userLog/UserLogController.java b/API-Server/src/main/java/swm/hkcc/LGTM/app/modules/userLog/UserLogController.java index f34e78cf..78e07f85 100644 --- a/API-Server/src/main/java/swm/hkcc/LGTM/app/modules/userLog/UserLogController.java +++ b/API-Server/src/main/java/swm/hkcc/LGTM/app/modules/userLog/UserLogController.java @@ -21,11 +21,8 @@ public class UserLogController { @PostMapping public ApiDataResponse userlog( - @RequestBody LogMessage logMessage, - @AuthenticationPrincipal CustomUserDetails customUserDetails + @RequestBody LogMessage logMessage ) { - - Long memberId = customUserDetails.getMemberId(); String topic = logProducer.sendMessage(logMessage); return ApiDataResponse.of(topic); 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 index 08e11383..6a048db8 100644 --- 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,6 +14,7 @@ public class LogMessage { private String eventLogName; private String screenName; private Integer logVersion; + private Integer userID; private Map 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 index e42d53a9..d744a02f 100644 --- 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,6 +27,8 @@ public class UserLog { private Integer logVersion; + private Integer userID; + @Type(JsonType.class) @Column(columnDefinition = "json") private Map logData; 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 index 95e5764e..c598c068 100644 --- 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,6 +13,7 @@ public class LogMessage { private String eventLogName; private String screenName; private Integer logVersion; + private Integer userID; private Map logData; @@ -22,6 +23,7 @@ public UserDataLog toUserDataLog(String topic, int partition, long receivedTimeS .eventLogName(eventLogName) .screenName(screenName) .logVersion(logVersion) + .userID(userID) .logData(logData) .topic(topic) .partition(partition) @@ -34,6 +36,7 @@ public UserLog toUserLog(String topic, int partition, long receivedTimeStamp) { .eventLogName(eventLogName) .screenName(screenName) .logVersion(logVersion) + .userID(userID) .logData(logData) .topic(topic) .partitionNumber(partition) 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 index 53102011..b6d69dbc 100644 --- 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 @@ -21,6 +21,8 @@ public class UserDataLog { private Integer logVersion; + private Integer userID; + private Map logData; private String topic;