Add global per-request timestamp.

lakesuperior/endpoints/ldp.py

@@ -4,9 +4,12 @@ from collections import defaultdict
 from pprint import pformat
 from uuid import uuid4
 
+import arrow
+
 from flask import Blueprint, current_app, g, request, send_file, url_for
 from rdflib import Graph
 from rdflib.namespace import RDF, XSD
+from rdflib.term import Literal
 from werkzeug.datastructures import FileStorage
 
 from lakesuperior.dictionaries.namespaces import ns_collection as nsc
@@ -71,6 +74,12 @@ def bp_url_value_preprocessor(endpoint, values):
     g.url_prefix = values.pop('url_prefix')
 
 
+@ldp.before_request
+def request_timestamp():
+    g.timestamp = arrow.utcnow()
+    g.timestamp_term = Literal(g.timestamp, datatype=XSD.dateTime)
+
+
 ## REST SERVICES ##
 
 @ldp.route('/<path:uuid>', methods=['GET'], strict_slashes=False)
@@ -130,6 +139,7 @@ def post_resource(parent):
 
     try:
         uuid = uuid_for_post(parent, slug)
+        logger.debug('Generated UUID for POST: {}'.format(uuid))
         rsrc = Ldpr.inbound_inst(uuid, content_length=request.content_length,
                 stream=stream, mimetype=mimetype, handling=handling,
                 disposition=disposition)

lakesuperior/model/ldpr.py

@@ -10,7 +10,7 @@ from uuid import uuid4
 import arrow
 import rdflib
 
-from flask import current_app, request
+from flask import current_app, g, request
 from rdflib import Graph
 from rdflib.resource import Resource
 from rdflib.namespace import RDF, XSD
@@ -131,6 +131,8 @@ class Ldpr(metaclass=ABCMeta):
         imr_urn = nsc['fcres'][uuid] if uuid else cls.ROOT_NODE_URN
 
         imr = current_app.rdfly.extract_imr(imr_urn, **repr_opts)
+        cls._logger.debug('Extracted graph: {}'.format(
+                pformat(set(imr.graph))))
         rdf_types = set(imr.graph.objects(imr.identifier, RDF.type))
 
         if cls.LDP_NR_TYPE in rdf_types:
@@ -598,9 +600,8 @@ class Ldpr(metaclass=ABCMeta):
                 add_trp.add((self.urn, nsc['fcsystem'].tombstone,
                         tstone_pointer))
             else:
-                ts = Literal(arrow.utcnow(), datatype=XSD.dateTime)
                 add_trp.add((self.urn, RDF.type, nsc['fcsystem'].Tombstone))
-                add_trp.add((self.urn, nsc['fcrepo'].created, ts))
+                add_trp.add((self.urn, nsc['fcrepo'].created, g.timestamp_term))
         else:
             self._logger.info('NOT leaving tombstone.')
 
@@ -643,7 +644,7 @@ class Ldpr(metaclass=ABCMeta):
 
         return self.rdfly.modify_dataset(remove_trp, add_trp, metadata={
             'ev_type' : ev_type,
-            'time' : arrow.utcnow(),
+            'time' : g.timestamp,
             'type' : type,
             'actor' : actor,
         })
@@ -769,12 +770,11 @@ class Ldpr(metaclass=ABCMeta):
                 URIRef('urn:sha1:{}'.format(cksum)))
 
         # Create and modify timestamp.
-        ts = Literal(arrow.utcnow(), datatype=XSD.dateTime)
         if create:
-            self.provided_imr.set(nsc['fcrepo'].created, ts)
+            self.provided_imr.set(nsc['fcrepo'].created, g.timestamp_term)
             self.provided_imr.set(nsc['fcrepo'].createdBy, self.DEFAULT_USER)
 
-        self.provided_imr.set(nsc['fcrepo'].lastModified, ts)
+        self.provided_imr.set(nsc['fcrepo'].lastModified, g.timestamp_term)
         self.provided_imr.set(nsc['fcrepo'].lastModifiedBy, self.DEFAULT_USER)