Merge branch 'main' into feature/PI-1939-mas-overview-offence-tab-con…

…victions

.github/workflows/access.yml

@@ -42,6 +42,7 @@ on:
           - '["prison-education-and-delius"]'
           - '["prison-identifier-and-delius"]'
           - '["prisoner-profile-and-delius"]'
+          - '["probation-search-and-delius"]'
           - '["refer-and-monitor-and-delius"]'
           - '["resettlement-passport-and-delius"]'
           - '["risk-assessment-scores-to-delius"]'

.github/workflows/build.yml

@@ -65,6 +65,7 @@ jobs:
           - prison-education-and-delius
           - prison-identifier-and-delius
           - prisoner-profile-and-delius
+          - probation-search-and-delius
           - refer-and-monitor-and-delius
           - resettlement-passport-and-delius
           - risk-assessment-scores-to-delius

.github/workflows/deploy.yml

@@ -56,6 +56,7 @@ on:
           - '["prison-education-and-delius"]'
           - '["prison-identifier-and-delius"]'
           - '["prisoner-profile-and-delius"]'
+          - '["probation-search-and-delius"]'
           - '["redrive-dead-letter-queue"]'
           - '["refer-and-monitor-and-delius"]'
           - '["resettlement-passport-and-delius"]'

doc/tech-docs/source/services.html.md.erb

@@ -78,4 +78,5 @@ weight: 20
 * [Manage Supervision And Oasys](https://ministryofjustice.github.io/hmpps-probation-integration-services/tech-docs/projects/manage-supervision-and-oasys)
 * [Manage Supervision And Delius](https://ministryofjustice.github.io/hmpps-probation-integration-services/tech-docs/projects/manage-supervision-and-delius)
 * [Oasys And Delius](https://ministryofjustice.github.io/hmpps-probation-integration-services/tech-docs/projects/oasys-and-delius)
+* [Probation Search And Delius](https://ministryofjustice.github.io/hmpps-probation-integration-services/tech-docs/projects/probation-search-and-delius)
 <li style="display: none">^ add new projects here</li>

projects/probation-search-and-delius/README.md

@@ -0,0 +1,3 @@
+# probation-search-and-delius
+
+// TODO Describe the service

projects/probation-search-and-delius/applicationinsights.json

@@ -0,0 +1,51 @@
+{
+  "role": {
+    "name": "probation-search-and-delius"
+  },
+  "customDimensions": {
+    "service.version": "${VERSION}",
+    "service.team": "probation-integration"
+  },
+  "instrumentation": {
+    "logging": {
+      "level": "DEBUG"
+    },
+    "springScheduling": {
+      "enabled": false
+    }
+  },
+  "selfDiagnostics": {
+    "destination": "console"
+  },
+  "sampling": {
+    "percentage": 100
+  },
+  "preview": {
+    "sampling": {
+      "overrides": [
+        {
+          "telemetryType": "request",
+          "attributes": [
+            {
+              "key": "http.url",
+              "value": "https?://[^/]+/health/?.*",
+              "matchType": "regexp"
+            }
+          ],
+          "percentage": 0
+        },
+        {
+          "telemetryType": "dependency",
+          "attributes": [
+            {
+              "key": "db.operation",
+              "value": "SELECT",
+              "matchType": "strict"
+            }
+          ],
+          "percentage": 10
+        }
+      ]
+    }
+  }
+}

projects/probation-search-and-delius/build.gradle.kts

@@ -0,0 +1,36 @@
+import uk.gov.justice.digital.hmpps.extensions.ClassPathExtension
+
+apply(plugin = "com.google.cloud.tools.jib")
+
+dependencies {
+    implementation(project(":libs:audit"))
+    implementation(project(":libs:commons"))
+    implementation(project(":libs:oauth-server"))
+
+    implementation("org.springframework.boot:spring-boot-starter-actuator")
+    implementation("org.springframework.boot:spring-boot-starter-data-jpa")
+    implementation("org.springframework.boot:spring-boot-starter-security")
+    implementation("org.springframework.boot:spring-boot-starter-validation")
+    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.jetbrains.kotlin:kotlin-reflect")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
+    implementation(libs.springdoc)
+
+    dev(project(":libs:dev-tools"))
+    dev("com.h2database:h2")
+    dev("org.testcontainers:oracle-xe")
+
+    runtimeOnly("com.oracle.database.jdbc:ojdbc11")
+
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation(libs.bundles.mockito)
+}
+
+configure<ClassPathExtension> {
+    jacocoExclusions = listOf(
+        "**/config/**",
+        "**/entity/**",
+        "**/AppKt.class"
+    )
+}

projects/probation-search-and-delius/deploy/Chart.yaml

@@ -0,0 +1,13 @@
+apiVersion: v2
+appVersion: '1.0'
+description: A Helm chart for Kubernetes
+name: probation-search-and-delius
+version: 1.0.0
+
+dependencies:
+  - name: generic-service
+    version: "2.9"
+    repository: https://ministryofjustice.github.io/hmpps-helm-charts
+  - name: generic-prometheus-alerts
+    version: "1.4"
+    repository: https://ministryofjustice.github.io/hmpps-helm-charts

projects/probation-search-and-delius/deploy/database/access.yml

@@ -0,0 +1,11 @@
+database:
+  access:
+    username_key: /probation-search-and-delius/db-username
+    password_key: /probation-search-and-delius/db-password
+    tables:
+      - audited_interaction
+
+  audit:
+    username: ProbationSearchAndDelius
+    forename: Probation Search
+    surname: Service

projects/probation-search-and-delius/deploy/values-dev.yml

@@ -0,0 +1,21 @@
+enabled: false # TODO set this to true when you're ready to deploy your service
+
+generic-service:
+  ingress:
+    host: probation-search-and-delius-dev.hmpps.service.justice.gov.uk
+
+  scheduledDowntime:
+    enabled: true
+
+  env:
+    SENTRY_ENVIRONMENT: dev
+    SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/.well-known/jwks.json
+    SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-dev.hmpps.service.justice.gov.uk/auth/issuer
+
+    SPRING_DATASOURCE_HIKARI_MAXIMUMPOOLSIZE: 5
+    SPRING_DATASOURCE_HIKARI_MINIMUMIDLE: 0
+
+    LOGGING_LEVEL_UK_GOV_DIGITAL_JUSTICE_HMPPS: DEBUG
+
+generic-prometheus-alerts:
+  businessHoursOnly: true

projects/probation-search-and-delius/deploy/values-preprod.yml

@@ -0,0 +1,16 @@
+enabled: false # TODO set this to true when you're ready to deploy your service
+
+generic-service:
+  ingress:
+    host: probation-search-and-delius-preprod.hmpps.service.justice.gov.uk
+
+  scheduledDowntime:
+    enabled: true
+
+  env:
+    SENTRY_ENVIRONMENT: preprod
+    SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: https://sign-in-preprod.hmpps.service.justice.gov.uk/auth/.well-known/jwks.json
+    SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in-preprod.hmpps.service.justice.gov.uk/auth/issuer
+
+generic-prometheus-alerts:
+  businessHoursOnly: true

projects/probation-search-and-delius/deploy/values-prod.yml

@@ -0,0 +1,10 @@
+enabled: false # TODO set this to true when you're ready to deploy your service
+
+generic-service:
+  ingress:
+    host: probation-search-and-delius.hmpps.service.justice.gov.uk
+
+  env:
+    SENTRY_ENVIRONMENT: prod
+    SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: https://sign-in.hmpps.service.justice.gov.uk/auth/.well-known/jwks.json
+    SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: https://sign-in.hmpps.service.justice.gov.uk/auth/issuer

projects/probation-search-and-delius/deploy/values.yaml

@@ -0,0 +1,22 @@
+# Common values
+generic-service:
+  nameOverride: probation-search-and-delius
+
+  image:
+    repository: ghcr.io/ministryofjustice/hmpps-probation-integration-services/probation-search-and-delius
+
+  ingress:
+    tlsSecretName: probation-search-and-delius-cert
+
+  namespace_secrets:
+    common:
+      SPRING_DATASOURCE_URL: DB_URL
+    probation-search-and-delius-database:
+      SPRING_DATASOURCE_USERNAME: DB_USERNAME
+      SPRING_DATASOURCE_PASSWORD: DB_PASSWORD
+    probation-search-and-delius-sentry:
+      SENTRY_DSN: SENTRY_DSN
+
+generic-prometheus-alerts:
+  targetApplication: probation-search-and-delius
+

projects/probation-search-and-delius/settings.gradle.kts

@@ -0,0 +1 @@
+rootProject.name = "probation-search-and-delius"

projects/probation-search-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/DataLoader.kt

@@ -0,0 +1,25 @@
+package uk.gov.justice.digital.hmpps.data
+
+import jakarta.annotation.PostConstruct
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
+import org.springframework.boot.context.event.ApplicationReadyEvent
+import org.springframework.context.ApplicationListener
+import org.springframework.stereotype.Component
+import uk.gov.justice.digital.hmpps.data.generator.UserGenerator
+import uk.gov.justice.digital.hmpps.user.AuditUserRepository
+
+@Component
+@ConditionalOnProperty("seed.database")
+class DataLoader(
+    private val auditUserRepository: AuditUserRepository
+) : ApplicationListener<ApplicationReadyEvent> {
+
+    @PostConstruct
+    fun saveAuditUser() {
+        auditUserRepository.save(UserGenerator.AUDIT_USER)
+    }
+
+    override fun onApplicationEvent(are: ApplicationReadyEvent) {
+        // Perform dev/test database setup here, using JPA repositories and generator classes...
+    }
+}

projects/probation-search-and-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/UserGenerator.kt

@@ -0,0 +1,7 @@
+package uk.gov.justice.digital.hmpps.data.generator
+
+import uk.gov.justice.digital.hmpps.user.AuditUser
+
+object UserGenerator {
+    val AUDIT_USER = AuditUser(IdGenerator.getAndIncrement(), "ProbationSearchAndDelius")
+}

projects/probation-search-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt

@@ -0,0 +1,30 @@
+package uk.gov.justice.digital.hmpps
+
+import org.junit.jupiter.api.Test
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT
+import org.springframework.boot.test.mock.mockito.MockBean
+import org.springframework.test.web.servlet.MockMvc
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
+import uk.gov.justice.digital.hmpps.test.MockMvcExtensions.withToken
+import uk.gov.justice.digital.hmpps.telemetry.TelemetryService
+
+@AutoConfigureMockMvc
+@SpringBootTest(webEnvironment = RANDOM_PORT)
+internal class IntegrationTest {
+    @Autowired
+    lateinit var mockMvc: MockMvc
+
+    @MockBean
+    lateinit var telemetryService: TelemetryService
+
+    @Test
+    fun `API call retuns a success response`() {
+        mockMvc
+            .perform(get("/example/123").withToken())
+            .andExpect(status().is2xxSuccessful)
+    }
+}

projects/probation-search-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/App.kt

@@ -0,0 +1,11 @@
+package uk.gov.justice.digital.hmpps
+
+import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.runApplication
+
+@SpringBootApplication
+class App
+
+fun main(args: Array<String>) {
+    runApplication<App>(*args)
+}

projects/probation-search-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/controller/ApiController.kt

@@ -0,0 +1,17 @@
+package uk.gov.justice.digital.hmpps.controller
+
+import org.springframework.security.access.prepost.PreAuthorize
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+class ApiController {
+    @PreAuthorize("hasRole('ROLE_EXAMPLE')")
+    @GetMapping(value = ["/example/{inputId}"])
+    fun handle(
+        @PathVariable("inputId") inputId: String
+    ) {
+        // TODO Not yet implemented
+    }
+}