fix(dgs): minor fixes in notifications query

Squashed commit of the following:

commit c786e3f7471deb104b136c90ef7278eb9ee1652f
Author: Rani <[email protected]>
Date:   Tue Jun 22 07:19:15 2021 +0300

    fix(dgs): convert level to enum

commit 2f8c17aed02b74609e59af6bede77dee75e4a277
Author: Rani <[email protected]>
Date:   Tue Jun 22 07:15:53 2021 +0300

    fix(dgs): make notification objects non-nullable (but keep the array nullable)

(cherry picked from commit de9fc62364d5b79494c65d4c32d5d7a75e15d876)

Author: Rani Horev

keel-web/src/main/kotlin/com/netflix/spinnaker/keel/rest/dgs/ApplicationFetcher.kt

@@ -297,12 +297,10 @@ class ApplicationFetcher(
    * Fetches the list of dismissible notifications for the application in context.
    */
   @DgsData(parentType = DgsConstants.MDAPPLICATION.TYPE_NAME, field = DgsConstants.MDAPPLICATION.Notifications)
-  fun applicationNotifications(dfe: DataFetchingEnvironment): CompletableFuture<List<MdNotification>>? {
+  fun applicationNotifications(dfe: DataFetchingEnvironment): List<MdNotification>? {
     val config = applicationFetcherSupport.getDeliveryConfigFromContext(dfe)
-    return CompletableFuture.supplyAsync {
-      notificationRepository.notificationHistory(config.application, true, setOf(WARNING, ERROR))
-        .map { it.toDgs() }
-    }
+    return notificationRepository.notificationHistory(config.application, true, setOf(WARNING, ERROR))
+      .map { it.toDgs() }
   }
 
 //  add function for putting the resources on the artifactVersion

keel-web/src/main/kotlin/com/netflix/spinnaker/keel/rest/dgs/conversions.kt

@@ -11,6 +11,7 @@ import com.netflix.spinnaker.keel.api.artifacts.GitMetadata
 import com.netflix.spinnaker.keel.bakery.diff.PackageDiff
 import com.netflix.spinnaker.keel.graphql.types.MdArtifact
 import com.netflix.spinnaker.keel.graphql.types.MdCommitInfo
+import com.netflix.spinnaker.keel.graphql.types.MdEventLevel
 import com.netflix.spinnaker.keel.graphql.types.MdGitMetadata
 import com.netflix.spinnaker.keel.graphql.types.MdLocation
 import com.netflix.spinnaker.keel.graphql.types.MdMoniker
@@ -106,7 +107,7 @@ fun Pause.toDgsPaused(): MdPausedInfo =
 fun DismissibleNotification.toDgs() =
   MdNotification(
     id = uid?.toString() ?: error("Can't convert application event with missing UID: $this"),
-    level = level.name,
+    level = MdEventLevel.valueOf(level.name),
     message = message,
     isActive = isActive,
     triggeredAt = triggeredAt,

keel-web/src/main/resources/schema/schema.graphql

@@ -12,7 +12,7 @@ type MdApplication {
   isPaused: Boolean
   pausedInfo: MdPausedInfo
   environments: [MdEnvironment!]!
-  notifications: [MdNotification]
+  notifications: [MdNotification!]
 }
 
 type MdEnvironment {
@@ -301,7 +301,7 @@ input MdUnpinArtifactVersionPayload {
 
 type MdNotification {
   id: String!
-  level: String!
+  level: MdEventLevel!
   message: String!
   triggeredAt: InstantTime
   triggeredBy: String
@@ -312,6 +312,10 @@ type MdNotification {
   dismissedBy: String
 }
 
+enum MdEventLevel {
+  SUCCESS, INFO, WARNING, ERROR
+}
+
 input MdDismissNotificationPayload {
   id: String!
 }