From 2d2a23eaf837a381feb5213f07114d966073dc1c Mon Sep 17 00:00:00 2001
From: aligungr <aligng1620@gmail.com>
Date: Fri, 28 May 2021 19:29:50 +0300
Subject: [PATCH] UE CLI improvements

---
 src/ue/app/task.cpp |  6 ++----
 src/ue/types.cpp    | 14 ++++++--------
 src/ue/types.hpp    |  4 ++--
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/ue/app/task.cpp b/src/ue/app/task.cpp
index 3aedc5a5c..fc4c8bcfb 100644
--- a/src/ue/app/task.cpp
+++ b/src/ue/app/task.cpp
@@ -130,10 +130,8 @@ void UeAppTask::receiveStatusUpdate(NwUeStatusUpdate &msg)
         UePduSessionInfo sessionInfo{};
         sessionInfo.psi = session->psi;
 
-        if (session->apn.has_value())
-            sessionInfo.apn = session->apn.value();
-        if(session->sNssai.has_value())
-            sessionInfo.sNssai = session->sNssai.value();
+        sessionInfo.apn = session->apn;
+        sessionInfo.sNssai = session->sNssai;
         sessionInfo.type = nas::utils::EnumToString(session->sessionType);
         if (session->pduAddress.has_value())
             sessionInfo.address = utils::OctetStringToIp(session->pduAddress->pduAddressInformation);
diff --git a/src/ue/types.cpp b/src/ue/types.cpp
index 7a3e7aed5..8e9842da0 100644
--- a/src/ue/types.cpp
+++ b/src/ue/types.cpp
@@ -237,14 +237,12 @@ Json ToJson(const EPsState &state)
 
 Json ToJson(const UePduSessionInfo &v)
 {
-    return Json::Obj({
-        {"id", v.psi},
-        {"type", v.type},
-        {"address", v.address},
-        {"emergency", v.isEmergency},
-        {"apn", v.apn},
-        {"sNssai", ToJson(v.sNssai)}
-    });
+    return Json::Obj({{"id", v.psi},
+                      {"type", v.type},
+                      {"address", v.address},
+                      {"emergency", v.isEmergency},
+                      {"apn", ::ToJson(v.apn)},
+                      {"s-nssai", ToJson(v.sNssai)}});
 }
 
 Json ToJson(const EServiceReqCause &v)
diff --git a/src/ue/types.hpp b/src/ue/types.hpp
index 3c4ffe301..5ed808b90 100644
--- a/src/ue/types.hpp
+++ b/src/ue/types.hpp
@@ -390,8 +390,8 @@ struct UePduSessionInfo
     std::string address{};
     bool isEmergency{};
     bool uplinkPending{};
-    std::string apn{};
-    SingleSlice sNssai{};
+    std::optional<std::string> apn{};
+    std::optional<SingleSlice> sNssai{};
 };
 
 enum class ERegUpdateCause