TSPS-140 Add Teaspoons notification types (#360)

* TSPS-140 Add Teaspoons notification types * scalafmt * update workbench-libs version
broadinstitute · Dec 10, 2024 · d0a056c · d0a056c
1 parent 164d540
commit d0a056c
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 3 deletions.
diff --git a/build.sbt b/build.sbt
@@ -14,9 +14,9 @@ val slickV = "3.5.2"
 
 val scalaTestV = "3.2.19"
 
-val workbenchLibsHash = "9254729"
-val workbenchGoogleV = s"0.32-$workbenchLibsHash"
-val workbenchNotificationsV = s"0.7-$workbenchLibsHash"
+val workbenchLibsHash = "5d9c477"
+val workbenchGoogleV = s"0.33-$workbenchLibsHash"
+val workbenchNotificationsV = s"0.9-$workbenchLibsHash"
 
 resolvers ++= Seq(
   "Broad Artifactory Releases" at "https://broadinstitute.jfrog.io/broadinstitute/libs-release/",

diff --git a/src/main/scala/thurloe/notification/NotificationMonitor.scala b/src/main/scala/thurloe/notification/NotificationMonitor.scala
@@ -449,6 +449,62 @@ class NotificationMonitorActor(val pollInterval: FiniteDuration,
           ),
           Map.empty,
           Map.empty
+        )
+
+      case TeaspoonsJobSucceededNotification(recipientUserId,
+                                             pipelineDisplayName,
+                                             jobId,
+                                             timeSubmitted,
+                                             timeCompleted,
+                                             quotaConsumedByJob,
+                                             quotaRemaining,
+                                             userDescription
+          ) =>
+        thurloe.service.Notification(
+          Option(recipientUserId),
+          None,
+          None,
+          templateId,
+          Map(
+            "pipelineDisplayName" -> pipelineDisplayName,
+            "jobId" -> jobId,
+            "timeSubmitted" -> timeSubmitted,
+            "timeCompleted" -> timeCompleted,
+            "quotaConsumedByJob" -> quotaConsumedByJob,
+            "quotaRemaining" -> quotaRemaining,
+            "userDescription" -> userDescription
+          ),
+          Map.empty,
+          Map.empty
+        )
+
+      case TeaspoonsJobFailedNotification(recipientUserId,
+                                          pipelineDisplayName,
+                                          jobId,
+                                          errorMessage,
+                                          timeSubmitted,
+                                          timeCompleted,
+                                          quotaConsumedByJob,
+                                          quotaRemaining,
+                                          userDescription
+          ) =>
+        thurloe.service.Notification(
+          Option(recipientUserId),
+          None,
+          None,
+          templateId,
+          Map(
+            "pipelineDisplayName" -> pipelineDisplayName,
+            "jobId" -> jobId,
+            "errorMessage" -> errorMessage,
+            "timeSubmitted" -> timeSubmitted,
+            "timeCompleted" -> timeCompleted,
+            "quotaConsumedByJob" -> quotaConsumedByJob,
+            "quotaRemaining" -> quotaRemaining,
+            "userDescription" -> userDescription
+          ),
+          Map.empty,
+          Map.empty
         );
     }
   }