PI-1846

Author: anthony-britton-moj

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppstier/service/TierCalculationService.kt

@@ -34,11 +34,11 @@ class TierCalculationService(
             mapOf("crn" to crn, "reason" to reason),
         )
     } catch (e: Exception) {
-        log.error("Unable to remove tier calculations for $crn")
         telemetryService.trackEvent(
             TIER_CALCULATION_REMOVAL_FAILED,
             mapOf("crn" to crn, "reasonToDelete" to reason, "failureReason" to e.message),
         )
+        throw e
     }
 
     fun calculateTierForCrn(crn: String, recalculationSource: RecalculationSource, allowUpdates: Boolean) {
@@ -59,18 +59,15 @@ class TierCalculationService(
                 )
             }
         } catch (e: Exception) {
-            if (e is DataIntegrityViolationException) {
-                log.error("Multiple concurrent attempts to calculate tier for $crn => $recalculationSource")
-                return
-            }
             val eventType = if (allowUpdates) TIER_CALCULATION_FAILED else TIER_RECALCULATION_DRY_RUN_FAILURE
             telemetryService.trackEvent(
                 eventType,
                 mapOf(
                     "crn" to crn,
                     "exception" to e.message,
                     "recalculationSource" to recalculationSource::class.simpleName,
-                    "recalculationReason" to if (recalculationSource is RecalculationSource.EventSource) recalculationSource.type else ""
+                    "recalculationReason" to if (recalculationSource is RecalculationSource.EventSource) recalculationSource.type else "",
+                    "duplicateAttempt" to (e is DataIntegrityViolationException).toString()
                 ),
             )
             if (allowUpdates) {
@@ -80,10 +77,10 @@ class TierCalculationService(
     }
 
     private fun checkForCrnNotFound(crn: String, e: Exception) {
-        if (e is CrnNotFoundException) {
-            deleteCalculationsForCrn(crn, "Not Found in Delius")
-        } else {
-            throw e
+        when (e) {
+            is DataIntegrityViolationException -> return
+            is CrnNotFoundException -> deleteCalculationsForCrn(crn, "Not Found in Delius")
+            else -> throw e
         }
     }
 
@@ -138,8 +135,4 @@ class TierCalculationService(
         ).toMap()
 
     private fun NeedSection.mapSeverity(): Pair<Need, NeedSeverity>? = severity?.let { section to it }
-
-    companion object {
-        private val log = LoggerFactory.getLogger(this::class.java)
-    }
 }

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppstier/service/TierReader.kt

@@ -20,27 +20,19 @@ class TierReader(
 
     fun getLatestTierByCrn(crn: String): TierDto? =
         tierSummaryRepository.findByIdOrNull(crn)?.let {
-            log.info("Found latest tier calculation for $crn")
             TierDto.from(it)
         }
 
     fun getLatestTierDetailsByCrn(crn: String): TierDetailsDto? =
         getLatestTierCalculation(crn)?.let {
-            log.info("Found latest tier calculation for $crn")
             TierDetailsDto.from(it)
         }
 
     fun getTierByCalculationId(crn: String, calculationId: UUID): TierDto? =
         tierCalculationRepository.findByCrnAndUuid(crn, calculationId)?.let {
-            log.info("Found tier for $crn and $calculationId")
             TierDto.from(it)
         }
 
     private fun getLatestTierCalculation(crn: String): TierCalculationEntity? =
         tierCalculationRepository.findFirstByCrnOrderByCreatedDesc(crn)
-
-    companion object {
-        private val log =
-            LoggerFactory.getLogger(this::class.java)
-    }
 }

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppstier/integration/CannotCalculateTierTest.kt

@@ -20,7 +20,8 @@ class CannotCalculateTierTest : IntegrationTestBase() {
                 "crn" to "X123456",
                 "exception" to "404 Not Found from GET http://localhost:8093/tier-details/X123456",
                 "recalculationSource" to "OffenderEventRecalculation",
-                "recalculationReason" to "OFFENDER_MANAGEMENT_TIER_CALCULATION_REQUIRED"
+                "recalculationReason" to "OFFENDER_MANAGEMENT_TIER_CALCULATION_REQUIRED",
+                "duplicateAttempt" to "false"
             ),
             null,
         )