[incubator-nlpcraft] branch NLPCRAFT-278 updated: WIP.

[aradzinski]

This is an automated email from the ASF dual-hosted git repository.

aradzinski pushed a commit to branch NLPCRAFT-278
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git


The following commit(s) were added to refs/heads/NLPCRAFT-278 by this push:
     new b96ed58  WIP.
b96ed58 is described below

commit b96ed58c4eda75500586dcdb07844bb3de83a503
Author: Aaron Radzinski <aradizn...@apache.org>
AuthorDate: Tue Mar 23 12:44:32 2021 -0700

    WIP.
---
 .../model/intent/compiler/NCIdlCompilerBase.scala      |  6 +++---
 .../idl/compiler/functions/NCIdlFunctionsUser.scala    | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/NCIdlCompilerBase.scala
 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/NCIdlCompilerBase.scala
index 210b684..b5e8ef5 100644
--- 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/NCIdlCompilerBase.scala
+++ 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/NCIdlCompilerBase.scala
@@ -858,9 +858,9 @@ trait NCIdlCompilerBase {
 
             // User data.
             case "user_id" ⇒ z0(() ⇒ Z(termCtx.req.getUser.getId, 0))
-            case "user_fname" ⇒ z0(() ⇒ Z(termCtx.req.getUser.getFirstName, 0))
-            case "user_lname" ⇒ z0(() ⇒ Z(termCtx.req.getUser.getLastName, 0))
-            case "user_email" ⇒ z0(() ⇒ Z(termCtx.req.getUser.getEmail, 0))
+            case "user_fname" ⇒ z0(() ⇒ 
Z(termCtx.req.getUser.getFirstName.orElse(null), 0))
+            case "user_lname" ⇒ z0(() ⇒ 
Z(termCtx.req.getUser.getLastName.orElse(null), 0))
+            case "user_email" ⇒ z0(() ⇒ 
Z(termCtx.req.getUser.getEmail.orElse(null), 0))
             case "user_admin" ⇒ z0(() ⇒ Z(termCtx.req.getUser.isAdmin, 0))
             case "user_signup_tstamp" ⇒ z0(() ⇒ 
Z(termCtx.req.getUser.getSignupTimestamp, 0))
 
diff --git 
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsUser.scala
 
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsUser.scala
index 771d748..cbbaf1f 100644
--- 
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsUser.scala
+++ 
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsUser.scala
@@ -32,26 +32,26 @@ class NCIdlFunctionsUser extends NCIdlFunctions {
     def test(): Unit = {
         test(
             new NCUser {
-                override def getId: Long = -1  // TODO: No REST API data 
(user_id() cannot be used)
+                override def getId: Long = -1
                 override def getFirstName: Optional[String] = 
Optional.of("firstName")
                 override def getLastName: Optional[String] = 
Optional.of("lastName")
                 override def getEmail: Optional[String] = Optional.of("email")
                 override def getAvatarUrl: Optional[String] = 
Optional.of("avatar")
                 override def isAdmin: Boolean = true
-                override def getSignupTimestamp: Long = -1 // TODO: No REST 
API data (user_signup_tstamp() cannot be used)
+                override def getSignupTimestamp: Long = -1
                 override def getMetadata: util.Map[String, AnyRef] =
                     Map("k1" → "v1").map(p ⇒ p._1 → 
p._2.asInstanceOf[AnyRef]).asJava
             }
         )
         test(
             new NCUser {
-                override def getId: Long = -1  // TODO: No REST API data 
(user_id() cannot be used)
+                override def getId: Long = -1
                 override def getFirstName: Optional[String] = Optional.empty()
                 override def getLastName: Optional[String] = Optional.empty()
                 override def getEmail: Optional[String] = Optional.empty()
                 override def getAvatarUrl: Optional[String] = Optional.empty()
                 override def isAdmin: Boolean = false
-                override def getSignupTimestamp: Long = -1 // TODO: No REST 
API data (user_signup_tstamp() cannot be used)
+                override def getSignupTimestamp: Long = -1
                 override def getMetadata: util.Map[String, AnyRef] =
                     Map("k1" → "v1").map(p ⇒ p._1 → 
p._2.asInstanceOf[AnyRef]).asJava
             }
@@ -62,13 +62,13 @@ class NCIdlFunctionsUser extends NCIdlFunctions {
         val idlCtx = ctx(usr = usr)
 
         def mkTestDesc(truth: String): TestDesc = TestDesc(truth = truth, 
idlCtx = idlCtx)
-        def get(opt: Optional[String]): String = if (opt.isEmpty) null else 
opt.get()
+        def get(opt: Optional[String]): String = if (opt.isEmpty) null else 
s"'${opt.get()}'"
 
         test(
-            mkTestDesc(s"user_fname() == '${get(usr.getFirstName)}'"),
-            mkTestDesc(s"user_lname() == '${get(usr.getLastName)}'"),
-            mkTestDesc(s"user_email() == '${get(usr.getEmail)}'"),
-            mkTestDesc(s"user_admin() == '${usr.isAdmin}'")
+            mkTestDesc(s"user_fname() == ${get(usr.getFirstName)}"),
+            mkTestDesc(s"user_lname() == ${get(usr.getLastName)}"),
+            mkTestDesc(s"user_email() == ${get(usr.getEmail)}"),
+            mkTestDesc(s"user_admin() == ${usr.isAdmin}")
         )
     }
 }