PI-2584 Add missing LDAP username + add more Telemetry (#4394)

ministryofjustice · Nov 6, 2024 · 8ef5f5e · 8ef5f5e
1 parent 604c092
commit 8ef5f5e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/projects/justice-email-and-delius/deploy/values.yaml b/projects/justice-email-and-delius/deploy/values.yaml
@@ -14,6 +14,7 @@ generic-service:
     common:
       SPRING_DATASOURCE_URL: DB_URL
       SPRING_LDAP_URLS: LDAP_URL
+      SPRING_LDAP_USERNAME: LDAP_USERNAME
       SPRING_LDAP_PASSWORD: LDAP_PASSWORD
     justice-email-and-delius-database:
       SPRING_DATASOURCE_USERNAME: DB_USERNAME

diff --git a/...e-email-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/MailboxService.kt b/...e-email-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/MailboxService.kt
@@ -10,20 +10,24 @@ import uk.gov.justice.digital.hmpps.message.MessageAttributes
 import uk.gov.justice.digital.hmpps.message.Notification
 import uk.gov.justice.digital.hmpps.messaging.EmailMessage
 import uk.gov.justice.digital.hmpps.publisher.NotificationPublisher
+import uk.gov.justice.digital.hmpps.telemetry.TelemetryService
 
 @Service
 class MailboxService(
     @Value("\${microsoft-graph.email-address}")
     private val emailAddress: String,
     private val graphServiceClient: GraphServiceClient,
-    private val notificationPublisher: NotificationPublisher
+    private val notificationPublisher: NotificationPublisher,
+    private val telemetryService: TelemetryService,
 ) {
     @WithSpan("POLL mailbox", kind = SpanKind.SERVER)
     fun publishUnreadMessagesToQueue() {
-        getUnreadMessages().forEach { message ->
-            notificationPublisher.publish(message.asNotification())
-            message.markAsRead()
-        }
+        getUnreadMessages()
+            .also { telemetryService.trackEvent("ReceivedMessages", mapOf("count" to it.size.toString())) }
+            .forEach {
+                notificationPublisher.publish(it.asNotification())
+                it.markAsRead()
+            }
     }
 
     private fun getUnreadMessages() = graphServiceClient
@@ -37,7 +41,7 @@ class MailboxService(
             request.queryParameters.filter = "isRead ne true"
             request.queryParameters.select = arrayOf("subject", "from", "id", "receivedDateTime", "body", "isRead")
             request.queryParameters.orderby = arrayOf("receivedDateTime DESC")
-        }.value
+        }.value ?: emptyList()
 
     private fun Message.markAsRead() {
         graphServiceClient