Merge remote-tracking branch 'origin/develop'

.github/workflows/graphql-service-ci.yml

@@ -18,4 +18,4 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Run Gradle Test
-        run: ./gradlew test
+        run: ./gradlew test

pstatus-graphql-ktor/build.gradle

@@ -73,10 +73,6 @@ dependencies {
     testImplementation "io.ktor:ktor-server-tests-jvm:$ktor_version"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
 
-//    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
-//    testImplementation 'org.mockito:mockito-core:4.6.1'
-//    testImplementation 'org.mockito:mockito-junit-jupiter:4.6.1'
-
     testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.1"
     testImplementation "org.junit.jupiter:junit-jupiter-engine:5.8.1"
     testImplementation "org.mockito:mockito-core:4.5.1"
@@ -108,4 +104,35 @@ jib {
     }
 }
 
+test {
+
+    // Discover and execute JUnit Platform-based (JUnit 5, JUnit Jupiter) tests
+    // JUnit 5 has the ability to execute JUnit 4 tests as well
+    useJUnitPlatform()
+
+    //Change this to "true" if we want to execute unit tests
+    systemProperty("isTestEnvironment", "false")
+
+    // Set the test classpath, if required
+}
+
+sourceSets {
+    main {
+        java {
+            srcDir 'src/kotlin'
+        }
+        resources {
+            srcDir 'src/resources'
+        }
+    }
+    test {
+        java {
+            srcDir 'src/kotlin'
+        }
+        resources {
+            srcDir 'src/resources'
+        }
+    }
+}
+
 

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

@@ -26,6 +26,7 @@ fun KoinApplication.loadKoinModules(environment: ApplicationEnvironment): KoinAp
         // Create a CosmosDB config that can be dependency injected (for health checks)
         single(createdAtStart = true) { CosmosConfiguration(uri, authKey) }
     }
+
     return modules(listOf(cosmosModule))
 }
 
@@ -34,15 +35,20 @@ fun main(args: Array<String>) {
 }
 
 fun Application.module() {
-    graphQLModule()
-    configureRouting()
+
     install(Koin) {
         loadKoinModules(environment)
     }
+    graphQLModule()
+    configureRouting()
+
     install(ContentNegotiation) {
         jackson()
     }
 
+
+
+
     // See https://opensource.expediagroup.com/graphql-kotlin/docs/schema-generator/writing-schemas/scalars
     RuntimeWiring.newRuntimeWiring().scalar(ExtendedScalars.Date)
 }

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

@@ -0,0 +1,17 @@
+package gov.cdc.ocio.processingstatusapi.models
+
+/**
+ * Enumeration of the possible sort orders for queries.
+ */
+enum class ReportContentType (val type: String){
+    JSON("application/json"),
+    JSON_SHORT("json"),
+    BASE64("base64");
+
+    companion object {
+        fun fromString(type: String): ReportContentType {
+            return values().find { it.type.equals(type, ignoreCase = true) }
+                ?: throw IllegalArgumentException("Unsupported content type: $type")
+        }
+    }
+}

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

@@ -0,0 +1,13 @@
+package gov.cdc.ocio.processingstatusapi.models.query
+
+import com.expediagroup.graphql.generator.annotations.GraphQLDescription
+
+@GraphQLDescription("Collection of undelivered uploads found")
+data class PendingUploadCounts(
+
+    @GraphQLDescription("Total number of undelivered uploads.")
+    var totalCount: Long = 0,
+
+    @GraphQLDescription("Provides a list of all the uploads that have not been delivered. This means, the upload started, but according to the upload status reports we did not receive 100% of the expected chunks.")
+    var pendingUploads: List<UnDeliveredUpload> = listOf()
+)

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

@@ -0,0 +1,13 @@
+package gov.cdc.ocio.processingstatusapi.models.query
+
+import com.expediagroup.graphql.generator.annotations.GraphQLDescription
+
+@GraphQLDescription("Collection of undelivered found")
+data class UnDeliveredUpload(
+
+    @GraphQLDescription("UploadId of the file that is not delivered.")
+    var uploadId: String? = null,
+
+    @GraphQLDescription("Filename of the file that is not delivered.")
+    var filename: String? = null
+)

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

@@ -0,0 +1,13 @@
+package gov.cdc.ocio.processingstatusapi.models.query
+
+import com.expediagroup.graphql.generator.annotations.GraphQLDescription
+
+@GraphQLDescription("Collection of undelivered uploads found")
+data class UnDeliveredUploadCounts(
+
+    @GraphQLDescription("Total number of undelivered uploads.")
+    var totalCount: Long = 0,
+
+    @GraphQLDescription("Provides a list of all the uploads that have not been delivered. This means, the upload started, but according to the upload status reports we did not receive 100% of the expected chunks.")
+    var unDeliveredUploads: List<UnDeliveredUpload> = listOf()
+)

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

@@ -21,5 +21,11 @@ data class UploadStats(
     var completedUploadsCount: Long = 0,
 
     @GraphQLDescription("Provides a list of all the duplicate filenames that were uploaded and how many.")
-    var duplicateFilenames: List<DuplicateFilenameCounts> = listOf()
+    var duplicateFilenames: List<DuplicateFilenameCounts> = listOf(),
+
+    @GraphQLDescription("Provides a list of all the uploads that have not been delivered. This means, the upload started, but according to the upload status reports we did not receive 100% of the expected chunks.")
+    var unDeliveredUploads: UnDeliveredUploadCounts = UnDeliveredUploadCounts(),
+
+    @GraphQLDescription("Provides a list of all the uploads that are pending. This means, the upload started, but according to the upload status reports we did not receive 100% of the expected chunks.")
+    var pendingUploads: PendingUploadCounts = PendingUploadCounts()
 )

pstatus-graphql-ktor/src/main/kotlin/gov/cdc/ocio/processingstatusapi/models/reports/inputs/DataInput.kt

@@ -0,0 +1,12 @@
+package gov.cdc.ocio.processingstatusapi.models.reports.inputs
+
+import com.expediagroup.graphql.generator.annotations.GraphQLDescription
+
+@GraphQLDescription("Input type for tags")
+data class DataInput(
+    @GraphQLDescription("Tag key")
+    val key: String,
+
+    @GraphQLDescription("Tag value")
+    val value: String
+)

pstatus-graphql-ktor/src/main/kotlin/gov/cdc/ocio/processingstatusapi/models/reports/inputs/IssueInput.kt

@@ -0,0 +1,12 @@
+package gov.cdc.ocio.processingstatusapi.models.reports.inputs
+
+import com.expediagroup.graphql.generator.annotations.GraphQLDescription
+
+@GraphQLDescription("Input type for issues")
+data class IssueInput(
+    @GraphQLDescription("Issue code")
+    val code: String? = null,
+
+    @GraphQLDescription("Issue description")
+    val description: String? = null
+)

pstatus-graphql-ktor/src/main/kotlin/gov/cdc/ocio/processingstatusapi/models/reports/inputs/MessageMetadataInput.kt

@@ -0,0 +1,19 @@
+package gov.cdc.ocio.processingstatusapi.models.reports.inputs
+
+import com.expediagroup.graphql.generator.annotations.GraphQLDescription
+import gov.cdc.ocio.processingstatusapi.models.submission.Aggregation
+
+@GraphQLDescription("Input type for message metadata")
+data class MessageMetadataInput(
+    @GraphQLDescription("Unique Identifier for that message")
+    val messageUUID: String? = null,
+
+    @GraphQLDescription("MessageHash value")
+    val messageHash: String? = null,
+
+    @GraphQLDescription("Single or Batch message")
+    val aggregation: Aggregation? = null,
+
+    @GraphQLDescription("Message Index")
+    val messageIndex: Int? = null
+)

pstatus-graphql-ktor/src/main/kotlin/gov/cdc/ocio/processingstatusapi/models/reports/inputs/ReportInput.kt

@@ -0,0 +1,55 @@
+package gov.cdc.ocio.processingstatusapi.models.reports.inputs
+
+import com.expediagroup.graphql.generator.annotations.GraphQLDescription
+import java.time.OffsetDateTime
+
+@GraphQLDescription("Input type for creating or updating a report")
+data class ReportInput(
+    @GraphQLDescription("Identifier of the report recorded by the database")
+    val id: String? = null,
+
+    @GraphQLDescription("Upload identifier this report belongs to")
+    val uploadId: String? = null,
+
+    @GraphQLDescription("Unique report identifier")
+    val reportId: String? = null,
+
+    @GraphQLDescription("Data stream ID")
+    val dataStreamId: String? = null,
+
+    @GraphQLDescription("Data stream route")
+    val dataStreamRoute: String? = null,
+
+    @GraphQLDescription("Date/time of when the upload was first ingested into the data-exchange")
+    val dexIngestDateTime: OffsetDateTime? = null,
+
+    @GraphQLDescription("Message metadata")
+    val messageMetadata: MessageMetadataInput? = null,
+
+    @GraphQLDescription("Stage info")
+    val stageInfo: StageInfoInput? = null,
+
+    @GraphQLDescription("Tags")
+    val tags: List<TagInput>? = null,
+
+    @GraphQLDescription("Data")
+    val data: List<DataInput>? = null,
+
+    @GraphQLDescription("Indicates the content type of the content; e.g. JSON, XML")
+    val contentType: String? = null,
+
+    @GraphQLDescription("Jurisdiction report belongs to; set to null if not applicable")
+    val jurisdiction: String? = null,
+
+    @GraphQLDescription("Sender ID this report belongs to; set to null if not applicable")
+    val senderId: String? = null,
+
+    @GraphQLDescription("Data Producer ID stated in the report; set to null if not applicable")
+    val dataProducerId: String? = null,
+
+    @GraphQLDescription("Content of the report. If the report is JSON then the content will be a map, otherwise, it will be a string")
+    var content : String? = null,
+
+    @GraphQLDescription("Timestamp when the report was recorded in the database")
+    val timestamp: OffsetDateTime? = null
+)

pstatus-graphql-ktor/src/main/kotlin/gov/cdc/ocio/processingstatusapi/models/reports/inputs/StageInfoInput.kt

@@ -0,0 +1,29 @@
+package gov.cdc.ocio.processingstatusapi.models.reports.inputs
+
+import com.expediagroup.graphql.generator.annotations.GraphQLDescription
+import gov.cdc.ocio.processingstatusapi.models.submission.Status
+import java.time.OffsetDateTime
+
+@GraphQLDescription("Input type for stage info")
+data class StageInfoInput(
+    @GraphQLDescription("Service")
+    val service: String? = null,
+
+    @GraphQLDescription("Stage name a.k.a action")
+    val action: String? = null,
+
+    @GraphQLDescription("Version")
+    val version: String? = null,
+
+    @GraphQLDescription("Status- SUCCESS OR FAILURE")
+    val status: Status? = null,
+
+    @GraphQLDescription("Issues array")
+    val issues: List<IssueInput>? = null,
+
+    @GraphQLDescription("Start processing time")
+    val startProcessingTime: OffsetDateTime? = null,
+
+    @GraphQLDescription("End processing time")
+    val endProcessingTime: OffsetDateTime? = null
+)

pstatus-graphql-ktor/src/main/kotlin/gov/cdc/ocio/processingstatusapi/models/reports/inputs/TagInput.kt

@@ -0,0 +1,12 @@
+package gov.cdc.ocio.processingstatusapi.models.reports.inputs
+
+import com.expediagroup.graphql.generator.annotations.GraphQLDescription
+
+@GraphQLDescription("Input type for tags")
+data class TagInput(
+    @GraphQLDescription("Tag key")
+    val key: String,
+
+    @GraphQLDescription("Tag value")
+    val value: String
+)