Deserialized notification schedule type

Author: samgst-amazon

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationCustomDeserializers.kt

@@ -114,6 +114,13 @@ class NotConditionDeserializer : JsonDeserializer<NotificationExpression.NotCond
     }
 }
 
+// Create a custom deserializer if needed
+class NotificationTypeDeserializer : JsonDeserializer<NotificationScheduleType>() {
+    override fun deserialize(p: JsonParser, ctxt: DeserializationContext): NotificationScheduleType {
+        return NotificationScheduleType.fromString(p.valueAsString)
+    }
+}
+
 private fun JsonNode.toNotificationExpressions(p: JsonParser): List<NotificationExpression> = this.map { element ->
     val parser = element.traverse(p.codec)
     parser.nextToken()

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt

@@ -27,15 +27,32 @@ data class NotificationData(
 )
 
 data class NotificationSchedule(
-    val type: String,
-)
+    @JsonDeserialize(using = NotificationTypeDeserializer::class)
+    val type: NotificationScheduleType,
+) {
+    constructor(type: String) : this(NotificationScheduleType.fromString(type))
+}
 
 enum class NotificationSeverity {
     INFO,
     WARNING,
     CRITICAL,
 }
 
+enum class NotificationScheduleType {
+    STARTUP,
+    EMERGENCY;
+
+    companion object {
+        fun fromString(value: String): NotificationScheduleType {
+            return when (value.lowercase()) {
+                "startup" -> STARTUP
+                else -> EMERGENCY
+            }
+        }
+    }
+}
+
 data class NotificationContentDescriptionLocale(
     @JsonProperty("en-US")
     val locale: NotificationContentDescription,

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/ProcessNotificationsBase.kt

@@ -44,24 +44,20 @@ class ProcessNotificationsBase(
     }
 
     fun retrieveStartupAndEmergencyNotifications() {
+        val isStartupPoll = isStartup.compareAndSet(true,false)
         val notifications = getNotificationsFromFile()
-
         notifications?.let { notificationsList ->
-            val (startupNotifications, emergencyNotifications) = notificationsList.notifications
-                ?.partition { notification ->
-                    notification.schedule.type.equals("StartUp", ignoreCase = true)
+            val activeNotifications = notificationsList.notifications
+                ?.filter { notification ->
+                    // Keep notification if:
+                    // - it's not a startup notification, OR
+                    // - it is a startup notification AND this is the first poll
+                    notification.schedule.type != NotificationScheduleType.STARTUP || isStartupPoll
                 }
-                ?: Pair(emptyList(), emptyList())
-
-            val dismissalState = NotificationDismissalState.getInstance()
-            val startupList = if (isStartup.compareAndSet(true, false)) {
-                startupNotifications
-            } else {
-                emptyList()
-            }
-
-            val combinedNotifications = startupList.plus(emergencyNotifications)
-            val activeNotifications = combinedNotifications.filter { !dismissalState.isDismissed(it.id) }
+                ?.filter { notification ->
+                    !NotificationDismissalState.getInstance().isDismissed(notification.id)
+                }
+                ?: emptyList()
 
             activeNotifications.forEach { processNotification(project, it) }
         }