La inn felt for antall ignorerte varsler

Author: naviktthomas

apps/min-side-varsler/src/main/kotlin/no/nav/paw/arbeidssoekerregisteret/model/ResponseConverter.kt

@@ -62,14 +62,16 @@ private fun VarselEventName.asResponse(): HendelseName = when (this) {
 fun BestillingRow.asResponse(
     varslerTotalt: Long,
     varslerSendt: Long,
-    varslerFeilet: Long
+    varslerFeilet: Long,
+    varslerIgnorert: Long
 ): BestillingResponse = BestillingResponse(
     bestillingId = this.bestillingId,
     bestiller = this.bestiller,
     status = this.status.asResponse(),
     varslerTotalt = varslerTotalt,
     varslerSendt = varslerSendt,
     varslerFeilet = varslerFeilet,
+    varslerIgnorert = varslerIgnorert,
     insertedTimestamp = this.insertedTimestamp,
     updatedTimestamp = this.updatedTimestamp
 )

apps/min-side-varsler/src/main/kotlin/no/nav/paw/arbeidssoekerregisteret/service/BestillingService.kt

@@ -43,17 +43,22 @@ class BestillingService(
     fun hentBestilling(bestillingId: UUID): BestillingResponse = transaction {
         val bestilling = bestillingRepository.findByBestillingId(bestillingId)
             ?: throw BestillingIkkeFunnetException("Bestilling ikke funnet")
-        val totalCount = bestiltVarselRepository.countByBestillingId(bestillingId)
-        val sendtCount = bestiltVarselRepository.countByBestillingIdAndStatus(bestillingId, BestiltVarselStatus.SENDT)
-        val feiletCount = bestiltVarselRepository.countByBestillingIdAndStatus(bestillingId, BestiltVarselStatus.FEILET)
-        bestilling.asResponse(totalCount, sendtCount, feiletCount)
+        val totalCount = bestiltVarselRepository
+            .countByBestillingId(bestillingId)
+        val sendtCount = bestiltVarselRepository
+            .countByBestillingIdAndStatus(bestillingId, BestiltVarselStatus.SENDT)
+        val feiletCount = bestiltVarselRepository
+            .countByBestillingIdAndStatus(bestillingId, BestiltVarselStatus.FEILET)
+        val ignorertCount = bestiltVarselRepository
+            .countByBestillingIdAndStatus(bestillingId, BestiltVarselStatus.IGNORERT)
+        bestilling.asResponse(totalCount, sendtCount, feiletCount, ignorertCount)
     }
 
     @WithSpan("opprettBestilling")
     fun opprettBestilling(bestiller: String): BestillingResponse = transaction {
         val bestillingId = UUID.randomUUID()
         bestillingRepository.insert(InsertBestillingRow(bestillingId, bestiller))
-        bestillingRepository.findByBestillingId(bestillingId)?.asResponse(0, 0, 0)
+        bestillingRepository.findByBestillingId(bestillingId)?.asResponse(0, 0, 0, 0)
             ?: throw BestillingIkkeFunnetException("Bestilling ikke funnet")
     }
 

apps/min-side-varsler/src/main/resources/openapi/documentation.yaml

@@ -225,6 +225,9 @@ components:
         varslerFeilet:
           type: integer
           format: int64
+        varslerIgnorert:
+          type: integer
+          format: int64
         insertedTimestamp:
           type: "string"
           format: "date-time"
@@ -238,6 +241,7 @@ components:
         - "varslerTotalt"
         - "varslerSendt"
         - "varslerFeilet"
+        - "varslerIgnorert"
         - "insertedTimestamp"
       example:
         bestillingId: "84201f96-363b-4aab-a589-89fa4b9b1feb"