From 436fc70263c4963b736acfd72dbf7190e6eaea68 Mon Sep 17 00:00:00 2001
From: Nathan Denny <ndenny@purdue.edu>
Date: Mon, 28 Oct 2024 11:00:30 -0400
Subject: [PATCH] better separation of request and receipt

---
 lib/Bastion/CARP.py | 42 ++++++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/lib/Bastion/CARP.py b/lib/Bastion/CARP.py
index 0b1754b..11b5b58 100644
--- a/lib/Bastion/CARP.py
+++ b/lib/Bastion/CARP.py
@@ -109,6 +109,27 @@ def is_inconclusive(self):
 ResultStatus = ReplyStatus #-- Alias for ReplyStatus
 
 
+class isRequest:
+	def __init__(self, action, *args, **kwargs):
+		self.ID     = kwargs.get('ID', str(uuid.uuid4()))
+		self.action = action
+		self.args   = args
+		self.when   = kwargs.get('when', datetime.datetime.now())
+
+	def toJDN(self, **kwargs):
+		jdn = {
+			'ID':      self.ID,
+			'action':  self.action,
+			'args':    list(self.args),
+			'opened':  self.when.isoformat()
+		}
+		return jdn
+
+
+class Request(isRequest):
+	pass
+
+
 class isReceipt:
 	def __init__(self, request, status, brief, obj, context = None, **kwargs):
 		#-- request is a 2-tuple of (action, [arg1, ...])
@@ -116,16 +137,18 @@ def __init__(self, request, status, brief, obj, context = None, **kwargs):
 		#-- brief is an arbitrary (assumed human readable) text string
 		#-- obj is any JSON serializable object.
 		#-- context, if given, is a dict of extra key-value associations.
+		if not isinstance(request, isRequest):
+			raise ValueError("request must be of type isRequest")
+
 		if not isinstance(status, ReplyStatus):
 			raise ValueError("status must be of type ReplyStatus")
 
-		self.RID     = kwargs.get('ID', str(uuid.uuid4()))
-		self.action  = request[0]
-		self.args    = request[1]
+		self.request = request
 		self.status  = status
 		self.brief   = str(msg)
 		self.body    = obj
 		self.context = { }
+		self.when    = kwargs.get('when', datetime.datetime.now())
 
 		if context is not None:
 			self.context = context.copy()
@@ -143,20 +166,19 @@ def toJDN(self, **kwargs):
 
 		jdn = { }
 
-		jdn['request'] = {
-			'ID':      self.RID,
-			'action':  self.action,
-			'args':    list(self.args),
-			'context': self.context.copy(),
-		}
+		jdn['request'] = self.request.toJDN(**kwargs)
+	
 		jdn['request']['result'] = {
 			'status':  self.status.code,
 			'message': self.status.gloss,
 			'summary': self.brief,
+			'closed':  self.when.isoformat()
 		}
+
 		jdn['request']['result']['body'] = {
 			'data': payload
 		}
+
 		return jdn
 
 	@property
@@ -183,7 +205,7 @@ def __init__(self, status, brief, doc, obj = None, **kwargs):
 
 	def toJDN(self, **kwargs):
 		jdn = isReceipt.toJDN(self, **kwargs)
-		jdn['request']['result']['report'] = str(self.report)
+		jdn['request']['result']['body']['report'] = str(self.report)
 		return jdn