From 8213502407b9fcc7c4d4346f0a073670167aed84 Mon Sep 17 00:00:00 2001 From: Yamel Senih Date: Fri, 15 Nov 2019 10:09:37 -0400 Subject: [PATCH] - Add User UUID and ID - Add SQLStatement for Context Info --- .../org/spin/grpc/util/AccessServiceImplementation.java | 1 + .../spin/grpc/util/DictionaryServiceImplementation.java | 3 ++- src/main/proto/access.proto | 8 +++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/spin/grpc/util/AccessServiceImplementation.java b/src/main/java/org/spin/grpc/util/AccessServiceImplementation.java index 4e89c0d05..13dec67b1 100644 --- a/src/main/java/org/spin/grpc/util/AccessServiceImplementation.java +++ b/src/main/java/org/spin/grpc/util/AccessServiceImplementation.java @@ -816,6 +816,7 @@ private Session.Builder getSessionInfo(SessionRequest request) { */ private UserInfo.Builder convertUserInfo(MUser user) { UserInfo.Builder userInfo = UserInfo.newBuilder(); + userInfo.setUuid(validateNull(user.getUUID())); userInfo.setName(validateNull(user.getName())); userInfo.setDescription(validateNull(user.getDescription())); userInfo.setComments(validateNull(user.getComments())); diff --git a/src/main/java/org/spin/grpc/util/DictionaryServiceImplementation.java b/src/main/java/org/spin/grpc/util/DictionaryServiceImplementation.java index 7f3cce329..374f43674 100644 --- a/src/main/java/org/spin/grpc/util/DictionaryServiceImplementation.java +++ b/src/main/java/org/spin/grpc/util/DictionaryServiceImplementation.java @@ -774,7 +774,8 @@ private ContextInfo.Builder convertContextInfo(Properties context, int contextIn .setUuid(validateNull(contextInfoValue.getUUID())) .setName(validateNull(contextInfoValue.getName())) .setDescription(validateNull(contextInfoValue.getDescription())) - .setMessageText(messageText); + .setMessageText(messageText) + .setSqlStatement(validateNull(contextInfoValue.getSQLStatement())); } return builder; } diff --git a/src/main/proto/access.proto b/src/main/proto/access.proto index 81224bc1a..bce633c41 100644 --- a/src/main/proto/access.proto +++ b/src/main/proto/access.proto @@ -93,9 +93,11 @@ message UserInfoValue { // User information message UserInfo { - string name = 1; - string description = 2; - string comments = 3; + int32 id = 1; + string uuid = 2; + string name = 3; + string description = 4; + string comments = 5; }