Merge pull request #45 from nevermore3/fix_3_7

fix 3,7
vesoft-inc · Nov 8, 2022 · b63c835 · b63c835
2 parents 0bf4c2a + 6b8188d
commit b63c835
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/nebula/queries/interactive-complex-3.ngql b/nebula/queries/interactive-complex-3.ngql
@@ -7,8 +7,8 @@ WITH DISTINCT friend
 MATCH (friend)<-[:POST_HAS_CREATOR|COMMENT_HAS_CREATOR]-(message)-[:IS_LOCATED_IN]->(country)
 WHERE
     CASE
-    WHEN  message.`Comment`.creationDate < $durationDays AND message.`Comment`.creationDate >= $startDate AND (country.Place.name == $countryXName OR country.Place.name == $countryYName) THEN true
-    WHEN message.Post.creationDate < $durationDays AND message.Post.creationDate >= $startDate AND (country.Place.name == $countryXName OR country.Place.name == $countryYName) THEN true
+    WHEN  message.`Comment`.creationDate < $startDate+Duration({days:$durationDays}) AND message.`Comment`.creationDate >= $startDate AND (country.Place.name == $countryXName OR country.Place.name == $countryYName) THEN true
+    WHEN message.Post.creationDate < $startDate+Duration({days:$durationDays}) AND message.Post.creationDate >= $startDate AND (country.Place.name == $countryXName OR country.Place.name == $countryYName) THEN true
     ELSE false
     END
 WITH friend,

diff --git a/nebula/queries/interactive-complex-7.ngql b/nebula/queries/interactive-complex-7.ngql
@@ -20,11 +20,9 @@ RETURN
     liker.Person.lastName AS personLastName,
     latestLike.likeTime AS likeCreationDate,
     id(latestLike.msg) AS messageId,
-    CASE exists(latestLike.msg.message.content)
-      WHEN true THEN latestLike.msg.message.content
-      ELSE latestLike.msg.message.imageFile
-    END AS messageContent,
-    latestLike.msg.message.creationDate AS messageCreationDate,
+    CASE WHEN tags(latestLike.msg) == ["Post"] THEN latestLike.msg.imageFile
+      ELSE latestLike.msg.content END AS messageContent,
+    latestLike.msg.creationDate AS messageCreationDate,
     p IS NULL AS isNew
 ORDER BY
     likeCreationDate DESC,