Use case: "load an RDF document into a user graph, and be able to edit the content"

(logged as that user),
which amounts to short-circuiting the history when there is none.

Author: jmvanel

scala/forms/src/main/scala/deductions/runtime/abstract_syntax/UserTraceability.scala

@@ -7,7 +7,7 @@ import org.w3.banana.RDF
 import scala.collection.mutable
 import scala.language.{existentials, postfixOps}
 
-
+/** TODO move to package user */
 trait UserTraceability[Rdf <: RDF, DATASET]
   extends FormModule[Rdf#Node, Rdf#URI]
     with TimeSeries[Rdf, DATASET] {
@@ -55,15 +55,45 @@ trait UserTraceability[Rdf <: RDF, DATASET]
     }
 
 //    println(s"YYYYYYYY Before add User Info\n${formSyntax.fields.mkString("\n")}\n")
-    val entries = for (field: Entry <- formSyntax.fields) yield {
+    val entries =
+      for (field: Entry <- formSyntax.fields) yield {
       if (resultsUser.contains( (field.property.toString, field.value.toString) ) ){
 //    	  println(s"ZZZZ add User Info ${field.label} ${field.value}")
         field.copyEntry(
             fromMetadata = resultsUser( (field.property.toString, field.value.toString)),
-            fromTimeMetadata = resultsTimestamp( (field.property.toString, field.value.toString)) )
-      } else field
+            fromTimeMetadata = resultsTimestamp.getOrElse( (field.property.toString, field.value.toString), 0 ) )
+      } else {
+        addUserFromGraph(field)
+      }
     }
     formSyntax . fields = entries
     formSyntax
   }
+
+  private def addUserFromGraph(field: Entry): Entry = {
+    val resMainDatabase = {
+      if (nodeToString(field.value) != "") {
+        val queryMainDatabase = s"""
+      SELECT ?USER
+      WHERE {
+        GRAPH ?USER {
+         <${field.subject}> <${field.property}> ${makeTurtleTerm(field.value)} . }
+      } """
+//        println(s"addUserFromGraph: queryMainDatabase $queryMainDatabase")
+        sparqlSelectQueryVariables(
+          queryMainDatabase,
+          Seq("USER"),
+          dataset)
+      } else List(Seq())
+    }
+//    println(s"addUserFromGraph: resMainDatabase $resMainDatabase")
+    val fieldWithUsers = for (
+      row <- resMainDatabase;
+      node <- row
+    ) yield {
+      println(s"addUserFromGraph: ?USER node ${node.getClass()} $node")
+      field.copyEntry(fromMetadata = node.toString)
+    }
+    fieldWithUsers.headOption.getOrElse(field)
+  }
 }

scala/forms/src/main/scala/deductions/runtime/semlogs/TimeSeries.scala

@@ -133,7 +133,7 @@ with SPARQLHelpers[Rdf, DATASET] {
   def getMetadataAboutSubject(subject: Rdf#Node, limit: Int =100, offset: Int = 0)
   : List[Seq[Rdf#Node]] = {
 
-    /* TODO:
+    /* NOTE:
      * - timestamp should be facultative
      * - user is both in GRAPH <$metadataGraph> ,
      *   and typically (always?) user graph is in main TDB
@@ -160,30 +160,12 @@ with SPARQLHelpers[Rdf, DATASET] {
     val resHistoryDatabase = sparqlSelectQueryVariables( queryHistoryDatabase,
         Seq("PROP", "OBJECT", "TIME", "USER"),
         dataset2 )
-    logger.debug("getMetadata: res " + resHistoryDatabase)
-    
-//    val queryMainDatabase = s"""
-//      ${declarePrefix(xsd)}
-//      SELECT ?PROP ?OBJECT ?TIME ?USER
-//      WHERE {
-//        BIND ( 0 as ?TIME)
-//        GRAPH ?USER {
-//         <$subject> ?PROP ?OBJECT . }
-//      }
-//      # GROUP BY ?OBJECT ?PROP ?USER
-//      LIMIT $limit
-//      OFFSET $offset
-//    """
-//    val resMainDatabase = sparqlSelectQueryVariables( queryMainDatabase,
-//        Seq("PROP", "OBJECT", "TIME", "USER"),
-//        dataset )
-    // TOD merge resHistoryDatabase & resMainDatabase
-//    println(s"==== getMetadataAboutSubject: resHistoryDatabase $resHistoryDatabase")
-//    println(s"resMainDatabase $resMainDatabase")
-    resHistoryDatabase // ++ resMainDatabase
+    logger.debug(s"getMetadataAboutSubject: resHistoryDatabase $resHistoryDatabase")
+    resHistoryDatabase
   }
 
-  /** get Metadata About given triple, searching in history (TDB2) for all user updates,
+  /** UNUSED!
+   *  get Metadata About given triple, searching in history (TDB2) for all user updates,
    *  and keeping the most recent;
    * transactional
    * @return rows of

scala/html/src/main/scala/deductions/runtime/html/Form2HTML.scala

@@ -252,7 +252,9 @@ import deductions.runtime.utils.I18NMessages
 
     val isCreateRequest = request.path.contains("create")
     val editableByUser =
-              field.metadata == request.userId()
+              field.metadata == request.userId() ||
+              field.metadata == userURI(request)
+//    println(s"DEBUG !!!!!!!!!! editableByUser=$editableByUser <- field.metadata=${field.metadata} =? request.userId()=${request.userId()}")
 
     // hack instead of true form separator in the form spec in RDF:
     if (field.label.contains("----"))
@@ -310,6 +312,10 @@ import deductions.runtime.utils.I18NMessages
     }
   }
 
+  private def userURI(request: HTTPrequest): String = {
+    makeAbsoluteURIForSaving(request.userId())
+  }
+
   /** make Field Data (display) Or Input (edit)
    *  TODO: does not do much! */
   private def makeFieldDataOrInput(field: formMod#Entry, hrefPrefix: String = config.hrefDisplayPrefix,