DASB-600 - Report sink fixes and updates

pstatus-graphql-ktor/src/main/kotlin/gov/cdc/ocio/processingstatusapi/models/Report.kt

@@ -41,6 +41,9 @@ data class Report(
     @GraphQLDescription("Data stream route")
     var dataStreamRoute: String? = null,
 
+    @GraphQLDescription("Date/time of when the upload was first ingested into the data-exchange")
+    var dexIngestDateTime: OffsetDateTime? = null,
+
     @GraphQLDescription("Message metadata")
     var messageMetadata: MessageMetadata? = null,
 
@@ -68,6 +71,6 @@ data class Report(
     @GraphQLDescription("Content of the report.  If the report is JSON then the content will be shown as JSON.  Otherwise, the content is a base64 encoded string.")
     var content : Map<*, *>? = null,
 
-    @GraphQLDescription("Datestamp the report was recorded in the database")
+    @GraphQLDescription("Date/time of when the report was recorded in the database")
     var timestamp: OffsetDateTime? = null
 )

pstatus-graphql-ktor/src/main/kotlin/gov/cdc/ocio/processingstatusapi/models/ReportDeadLetter.kt

@@ -41,6 +41,9 @@ data class ReportDeadLetter(
     @GraphQLDescription("Data stream route")
     var dataStreamRoute: String? = null,
 
+    @GraphQLDescription("Date/time of when the upload was first ingested into the data-exchange")
+    var dexIngestDateTime: OffsetDateTime? = null,
+
     @GraphQLDescription("Stage name this report is associated with")
     var stageName: String? = null,
 
@@ -56,7 +59,7 @@ data class ReportDeadLetter(
     @GraphQLDescription("Content of the report.  If the report is JSON then the content will be shown as JSON.  Otherwise, the content is a base64 encoded string.")
     var content : Map<*, *>? = null,
 
-    @GraphQLDescription("Datestamp the report was recorded in the database")
+    @GraphQLDescription("Date/time of when the report was recorded in the database")
     var timestamp: OffsetDateTime? = null,
 
     @GraphQLDescription("Disposition type of the report")

pstatus-graphql-ktor/src/main/kotlin/gov/cdc/ocio/processingstatusapi/models/dao/ReportDao.kt

@@ -15,6 +15,7 @@ import java.util.*
  * @property reportId String?
  * @property dataStreamId String?
  * @property dataStreamRoute String?
+ * @property dexIngestDateTime Date?
  * @property messageMetadata MessageMetadata?
  * @property stageInfo StageInfo?
  * @property tags Map<String,String??
@@ -40,13 +41,15 @@ open class ReportDao(
 
     var dataStreamRoute: String? = null,
 
-    var  messageMetadata: MessageMetadata? = null,
+    var dexIngestDateTime: Date? = null,
 
-    var  stageInfo: StageInfo? = null,
+    var messageMetadata: MessageMetadata? = null,
 
-    var  tags: Map<String,String>? = null,
+    var stageInfo: StageInfo? = null,
 
-    var  data: Map<String,String>? = null,
+    var tags: Map<String, String>? = null,
+
+    var data: Map<String, String>? = null,
 
     var contentType : String? = null,
 
@@ -85,13 +88,14 @@ open class ReportDao(
         this.reportId = [email protected]
         this.dataStreamId = [email protected]
         this.dataStreamRoute = [email protected]
-        this.messageMetadata= [email protected]
-        this.stageInfo= [email protected]
-        this.tags= [email protected]
-        this.data= [email protected]
+        this.dexIngestDateTime = [email protected]?.toInstant()?.atOffset(ZoneOffset.UTC)
+        this.messageMetadata = [email protected]
+        this.stageInfo = [email protected]
+        this.tags = [email protected]
+        this.data = [email protected]
         this.messageId = [email protected]
-        this.jurisdiction= [email protected]
-        this.senderId= [email protected]
+        this.jurisdiction = [email protected]
+        this.senderId = [email protected]
         this.timestamp = [email protected]?.toInstant()?.atOffset(ZoneOffset.UTC)
         this.contentType = [email protected]
         this.content = [email protected] as? Map<*, *>

pstatus-graphql-ktor/src/main/kotlin/gov/cdc/ocio/processingstatusapi/models/dao/ReportDeadLetterDao.kt

@@ -2,6 +2,7 @@ package gov.cdc.ocio.processingstatusapi.models.dao
 
 import gov.cdc.ocio.processingstatusapi.models.ReportDeadLetter
 import java.time.ZoneOffset
+import java.util.*
 
 
 /**
@@ -25,6 +26,7 @@ data class ReportDeadLetterDao(
         this.reportId = [email protected]
         this.dataStreamId = [email protected]
         this.dataStreamRoute = [email protected]
+        this.dexIngestDateTime = [email protected]?.toInstant()?.atOffset(ZoneOffset.UTC)
        // this.messageId = [email protected]
        // this.status = [email protected]
         this.timestamp = [email protected]?.toInstant()?.atOffset(ZoneOffset.UTC)

pstatus-graphql-ktor/src/main/kotlin/gov/cdc/ocio/processingstatusapi/models/submission/SubmissionDetails.kt

@@ -37,7 +37,7 @@ data class SubmissionDetails(
     @GraphQLDescription("Upload Id of the report")
     var uploadId: String? = null,
 
-    @GraphQLDescription("Datestamp the report was recorded in the database")
+    @GraphQLDescription("Date/time of when the report was recorded in the database")
     var dexIngestDateTime: OffsetDateTime? = null,
 
     @GraphQLDescription("DataStreamId in the report")