[RELEASE] - release version: 0.5.0

- add UpdateType end-to-end
- add updateType to TypeController
- add updateType to TypeService
- add sql 004-create_type_description_data.sql
- update TypesEndpoint to use Types.Response
- update type end-to-end test
  - update TypeEndpoint with CreateType
  - add reset test table
  - add test data
- add getType to TypeController
- add getType to TypeService
- add findTypeWithDescription to TypeRepository
- update type end-to-end test
- update TypeController for changes for adding type
- update type mapping for latest changes in Mapping.kt
- update addType to use TypeDescriptionRepository and return TypeWithDescription in TypeService
- add TypeWithDescription
- add TypeDescriptionRepository
- add TypeDescriptionEntity
- add missing device mapping test
- add type_descriptions sql script for database changes
- update TypesEndpoint
  - update TypesController to use Types.Response
  - add TypeEntity.toTypesResponse to Mapping.kt

.editorconfig

@@ -14,6 +14,10 @@ max_line_length = 1024
 indent_size = 2
 tab_width = 2
 
+[*.data]
+max_line_length = 1024
+insert_final_newline = false
+
 [*.bat]
 end_of_line = crlf
 

.gitignore

@@ -40,4 +40,4 @@ out/
 .kotlin
 
 ### Cert ###
-/keys/
+/cert/

README.md

@@ -5,14 +5,14 @@ Classes crafted, identities bestowed, Each device recorded, their functions unfo
 ## Properties for deployment
 
 | name                   | required | info                    |
-|------------------------|----------|-------------------------|
+|------------------------|:--------:|-------------------------|
-| spring.profiles.active | *        | Spring Boot environment |
+| spring.profiles.active | ✓  | Spring Boot environment |
-| spring.r2dbc.url       | *        | Postgres host url       |
+| spring.r2dbc.url       | ✓  | Postgres host url       |
-| spring.r2dbc.username  | *        | Postgres username       |
+| spring.r2dbc.username  | ✓  | Postgres username       |
-| spring.r2dbc.password  | **       | Postgres password       |
+| spring.r2dbc.password  | ✗  | Postgres password       |
-| jwt.private-key        |          | JWT private cert        |
+| jwt.private-key        | ✓  | JWT private cert        |
 
-Required: * can be stored as text, and ** need to be stored as secret.  
+*Required: ✓ can be stored as text, and ✗ need to be stored as secret.*
 
 ## Releasing Service
 
@@ -20,34 +20,28 @@ Run `release.sh` script from `master` branch.
 
 ## Development Information
 
-### Generate Private and Public RSA Key
+### Private RSA Key
 
-OpenSSL Project is dedicated to providing a simple installation of OpenSSL for Microsoft Windows. [Download](https://slproweb.com/products/Win32OpenSSL.html)
+This service uses RAS keys to create identities for devices. The private key is used here to generate identities, while the public key is used by **[Hlæja Device API](https://github.com/swordsteel/hlaeja-device-api)** to identify a device and accept data.
 
-Generate an RSA private key, of size 2048, and output it to a file named `private_key.pem` in to `./keys`
+*For instructions on how to set these up, please refer to our [generate RSA key](https://github.com/swordsteel/hlaeja-development/blob/master/doc/rsa_key.md) documentation.*
 
-```shell
+### Global Setting
-openssl genrsa -out private_key.pem 2048
+
+The following global settings are used in Hlaeja Device Registry. You can configure these settings using either Gradle properties or alternatively environment variables. 
+
+*For instructions on how to set these up, please refer to our [set global settings](https://github.com/swordsteel/hlaeja-development/blob/master/doc/global_settings.md) documentation.*
+
+#### Gradle Properties
+
+```properties
+repository.user=your_user
+repository.token=your_token_value
 ```
 
-Extract the public key from `private_key.pem` from `./keys`, and output it to a file named `public_key.pem` in to `./keys`
+#### Environment Variables
 
-```shell
+```properties
-openssl rsa -in private_key.pem -pubout -out public_key.pem
+REPOSITORY_USER=your_user
+REPOSITORY_TOKEN=your_token_value
 ```
-
-### Global gradle properties
-
-To authenticate with Gradle to access repositories that require authentication, you can set your user and token in the `gradle.properties` file.
-
-Here's how you can do it:
-
-1. Open or create the `gradle.properties` file in your Gradle user home directory:
-   - On Unix-like systems (Linux, macOS), this directory is typically `~/.gradle/`.
-   - On Windows, this directory is typically `C:\Users\<YourUsername>\.gradle\`.
-2. Add the following lines to the `gradle.properties` file:
-    ```properties
-    repository.user=your_user
-    repository.token=your_token_value
-    ```
-   or use environment variables `REPOSITORY_USER` and `REPOSITORY_TOKEN`

build.gradle.kts

@@ -1,47 +1,48 @@
 plugins {
     alias(hlaeja.plugins.kotlin.jvm)
     alias(hlaeja.plugins.kotlin.spring)
+    alias(hlaeja.plugins.ltd.hlaeja.plugin.certificate)
     alias(hlaeja.plugins.ltd.hlaeja.plugin.service)
     alias(hlaeja.plugins.spring.dependency.management)
     alias(hlaeja.plugins.springframework.boot)
 }
 
 dependencies {
-    implementation(hlaeja.com.fasterxml.jackson.module.kotlin)
+    implementation(hlaeja.fasterxml.jackson.module.kotlin)
-    implementation(hlaeja.jjwt.api)
     implementation(hlaeja.kotlin.logging)
     implementation(hlaeja.kotlin.reflect)
     implementation(hlaeja.kotlinx.coroutines)
-    implementation(hlaeja.ltd.hlaeja.library.common.messages)
+    implementation(hlaeja.library.common.messages)
-    implementation(hlaeja.org.springframework.springboot.actuator.starter)
+    implementation(hlaeja.library.jwt)
-    implementation(hlaeja.org.springframework.springboot.r2dbc.starter)
+    implementation(hlaeja.springboot.starter.actuator)
-    implementation(hlaeja.org.springframework.springboot.webflux.starter)
+    implementation(hlaeja.springboot.starter.r2dbc)
+    implementation(hlaeja.springboot.starter.validation)
+    implementation(hlaeja.springboot.starter.webflux)
 
-    runtimeOnly(hlaeja.jjwt.impl)
+    runtimeOnly(hlaeja.postgresql)
-    runtimeOnly(hlaeja.jjwt.jackson)
+    runtimeOnly(hlaeja.postgresql.r2dbc)
-    runtimeOnly(hlaeja.org.postgresql)
-    runtimeOnly(hlaeja.org.postgresql.r2dbc)
 
     testImplementation(hlaeja.assertj.core)
-    testImplementation(hlaeja.io.mockk)
+    testImplementation(hlaeja.library.test)
-    testImplementation(hlaeja.io.projectreactor.reactor.test)
+    testImplementation(hlaeja.mockk)
+    testImplementation(hlaeja.projectreactor.reactor.test)
     testImplementation(hlaeja.kotlin.test.junit5)
     testImplementation(hlaeja.kotlinx.coroutines.test)
-    testImplementation(hlaeja.org.springframework.springboot.test.starter)
 
-    testRuntimeOnly(hlaeja.org.junit.platform.launcher)
+    testRuntimeOnly(hlaeja.junit.platform.launcher)
+
+    integrationTestImplementation(hlaeja.assertj.core)
+    integrationTestImplementation(hlaeja.library.test)
+    integrationTestImplementation(hlaeja.projectreactor.reactor.test)
+    integrationTestImplementation(hlaeja.kotlin.test.junit5)
+    integrationTestImplementation(hlaeja.kotlinx.coroutines.test)
+    integrationTestImplementation(hlaeja.springboot.starter.test)
+
+    integrationTestRuntimeOnly(hlaeja.junit.platform.launcher)
 }
 
 group = "ltd.hlaeja"
 
-tasks {
+tasks.named("processResources") {
-    named("processResources") {
+    dependsOn("copyCertificates")
-        dependsOn("copyPrivateKey")
-    }
-    register<Copy>("copyPrivateKey") {
-        group = "hlaeja"
-        from("keys/private_key.pem")
-        into("${layout.buildDirectory.get()}/resources/main/keys")
-        onlyIf { file("keys/private_key.pem").exists() }
-    }
 }

gradle.properties

@@ -1,4 +1,4 @@
 kotlin.code.style=official
-version=0.1.0
+version=0.5.0
-catalog=0.4.0
+catalog=0.10.0
 container.port.host=9010

http/device.http

@@ -5,3 +5,6 @@ Content-Type: application/json
 {
   "type": "00000000-0000-0000-0000-000000000000"
 }
+
+### register device for a type
+GET {{hostname}}/device-00000000-0000-0000-0000-000000000000

http/type.http

@@ -1,11 +1,20 @@
-### let all types
+### add type
-GET {{hostname}}/types
-
-
-### add type by name
 POST {{hostname}}/type
 Content-Type: application/json
 
 {
-  "name": "Test C"
+  "name": "Test Device 001",
+  "description": "Description of test device."
+}
+
+### get type by id
+GET {{hostname}}/type-00000000-0000-0000-0000-000000000000
+
+### update type by id
+PUT {{hostname}}/type-00000000-0000-0000-0000-000000000000
+Content-Type: application/json
+
+{
+  "name": "Test Device 001",
+  "description": "Description of test device."
 }

http/types.http

@@ -0,0 +1,17 @@
+### get all types
+GET {{hostname}}/types
+
+### get all types
+GET {{hostname}}/types/page-1
+
+### get all types
+GET {{hostname}}/types/page-1/show-2
+
+### get all types
+GET {{hostname}}/types/filter-{filter}
+
+### get all types
+GET {{hostname}}/types/filter-{filter}/page-1
+
+### get all types
+GET {{hostname}}/types/filter-{filter}/page-1/show-2

release.sh

@@ -71,6 +71,17 @@ snapshot_version() {
   sed -i "s/\(version\s*=\s*\)[0-9.]*/\1$new_version-SNAPSHOT/" gradle.properties
 }
 
+handle_sql_files() {
+  version=$(current_version)
+  sql_dir="sql"
+  version_dir="${sql_dir}/v${version}"
+  if [ -d "$sql_dir" ] && [ -n "$(ls -A $sql_dir/*.sql 2>/dev/null)" ]; then
+    mkdir -p "$version_dir"
+    mv "$sql_dir"/*.sql "$version_dir/"
+    git add "$sql_dir"
+  fi
+}
+
 # check and prepare for release
 check_active_branch master
 check_uncommitted_changes
@@ -85,5 +96,6 @@ un_snapshot_version catalog
 # release changes and prepare for next release
 commit_change "release version: $(current_version)"
 add_release_tag
+handle_sql_files
 snapshot_version
 commit_change 'bump version'

sql/001-nodes.sql

@@ -0,0 +1,5 @@
+-- make device index unique
+
+DROP INDEX IF EXISTS public.i_nodes_type;
+
+CREATE UNIQUE INDEX IF NOT EXISTS i_nodes_device ON public.nodes (device);

sql/002-types.sql

@@ -1,22 +1,6 @@
--- Table: public.types
+-- make name index unique order by name
--- DROP TABLE IF EXISTS public.types;
 
-CREATE TABLE IF NOT EXISTS public.types
+DROP INDEX IF EXISTS types_name_key;
-(
-  id         UUID                              DEFAULT gen_uuid_v7(),
-  timestamp timestamp with time zone NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  name      VARCHAR(50) UNIQUE       NOT NULL,
-  CONSTRAINT pk_contact_types PRIMARY KEY (id)
-);
 
-ALTER TABLE IF EXISTS public.types
+CREATE UNIQUE INDEX IF NOT EXISTS  types_name_key
-  OWNER to role_administrator;
+  ON types (name ASC);
-
-
--- Revoke all permissions from existing roles
-REVOKE ALL ON TABLE public.types FROM role_administrator, role_maintainer, role_support, role_service;
-
--- Grant appropriate permissions
-GRANT ALL ON TABLE public.types TO role_administrator;
-GRANT SELECT, INSERT, UPDATE ON TABLE public.types TO role_maintainer, role_service;
-GRANT SELECT ON TABLE public.types TO role_support;

sql/003-type_descriptions.sql

@@ -0,0 +1,24 @@
+-- Table: public.type_descriptions
+-- DROP TABLE IF EXISTS public.type_descriptions;
+
+CREATE TABLE IF NOT EXISTS public.type_descriptions
+(
+  type_id     uuid                                                 NOT NULL,
+  description character varying(1000) COLLATE pg_catalog."default" NOT NULL DEFAULT ''::character varying,
+  CONSTRAINT pk_type_descriptions PRIMARY KEY (type_id),
+  CONSTRAINT fk_type_descriptions_types FOREIGN KEY (type_id)
+    REFERENCES public.types (id) MATCH SIMPLE
+    ON UPDATE NO ACTION
+    ON DELETE CASCADE
+);
+
+ALTER TABLE IF EXISTS public.type_descriptions
+  OWNER to role_administrator;
+
+-- Revoke all permissions from existing roles
+REVOKE ALL ON TABLE public.type_descriptions FROM role_administrator, role_maintainer, role_support, role_service;
+
+-- Grant appropriate permissions
+GRANT ALL ON TABLE public.type_descriptions TO role_administrator;
+GRANT SELECT, INSERT, UPDATE ON TABLE public.type_descriptions TO role_maintainer, role_service;
+GRANT SELECT ON TABLE public.type_descriptions TO role_support;

sql/004-create_type_description_data.sql

@@ -0,0 +1,5 @@
+-- make type description for existing types
+INSERT INTO public.type_descriptions (type_id)
+SELECT id
+FROM public.types
+ON CONFLICT (type_id) DO NOTHING;

sql/initial/002-types.sql

@@ -0,0 +1,27 @@
+-- Table: public.types
+-- DROP TABLE IF EXISTS public.types;
+
+CREATE TABLE IF NOT EXISTS public.types
+(
+  id        UUID                              DEFAULT gen_uuid_v7(),
+  timestamp timestamp with time zone NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  name      VARCHAR(50)              NOT NULL,
+  CONSTRAINT pk_contact_types PRIMARY KEY (id)
+);
+
+ALTER TABLE IF EXISTS public.types
+  OWNER to role_administrator;
+
+-- Index: types_name_key
+-- DROP INDEX IF EXISTS types_name_key;
+
+CREATE UNIQUE INDEX IF NOT EXISTS  types_name_key
+  ON types (name ASC);
+
+-- Revoke all permissions from existing roles
+REVOKE ALL ON TABLE public.types FROM role_administrator, role_maintainer, role_support, role_service;
+
+-- Grant appropriate permissions
+GRANT ALL ON TABLE public.types TO role_administrator;
+GRANT SELECT, INSERT, UPDATE ON TABLE public.types TO role_maintainer, role_service;
+GRANT SELECT ON TABLE public.types TO role_support;

sql/initial/004-nodes.sql

@@ -19,7 +19,7 @@ ALTER TABLE IF EXISTS public.nodes
 -- Index: public.i_nodes_type
 -- DROP INDEX IF EXISTS public.i_nodes_type;
 
-CREATE INDEX IF NOT EXISTS i_nodes_device ON public.nodes (device);
+CREATE UNIQUE INDEX IF NOT EXISTS i_nodes_device ON public.nodes (device);
 
 
 -- Revoke all permissions from existing roles

sql/initial/005-type_descriptions.sql

@@ -0,0 +1,24 @@
+-- Table: public.type_descriptions
+-- DROP TABLE IF EXISTS public.type_descriptions;
+
+CREATE TABLE IF NOT EXISTS public.type_descriptions
+(
+  type_id     uuid                                                 NOT NULL,
+  description character varying(1000) COLLATE pg_catalog."default" NOT NULL DEFAULT ''::character varying,
+  CONSTRAINT pk_type_descriptions PRIMARY KEY (type_id),
+  CONSTRAINT fk_type_descriptions_types FOREIGN KEY (type_id)
+    REFERENCES public.types (id) MATCH SIMPLE
+    ON UPDATE NO ACTION
+    ON DELETE CASCADE
+);
+
+ALTER TABLE IF EXISTS public.type_descriptions
+  OWNER to role_administrator;
+
+-- Revoke all permissions from existing roles
+REVOKE ALL ON TABLE public.type_descriptions FROM role_administrator, role_maintainer, role_support, role_service;
+
+-- Grant appropriate permissions
+GRANT ALL ON TABLE public.type_descriptions TO role_administrator;
+GRANT SELECT, INSERT, UPDATE ON TABLE public.type_descriptions TO role_maintainer, role_service;
+GRANT SELECT ON TABLE public.type_descriptions TO role_support;

src/integration-test/kotlin/ltd/hlaeja/ApplicationTests.kt

@@ -0,0 +1,10 @@
+package ltd.hlaeja
+
+@org.springframework.boot.test.context.SpringBootTest
+class ApplicationTests {
+
+    @org.junit.jupiter.api.Test
+    fun contextLoads() {
+        // place holder
+    }
+}

src/integration-test/kotlin/ltd/hlaeja/controller/DeviceEndpoint.kt

@@ -0,0 +1,96 @@
+package ltd.hlaeja.controller
+
+import java.util.UUID
+import ltd.hlaeja.library.deviceRegistry.Device
+import ltd.hlaeja.test.compareToFile
+import ltd.hlaeja.test.container.PostgresContainer
+import ltd.hlaeja.test.isEqualToUuid
+import org.assertj.core.api.SoftAssertions
+import org.assertj.core.api.junit.jupiter.InjectSoftAssertions
+import org.assertj.core.api.junit.jupiter.SoftAssertionsExtension
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Nested
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT
+import org.springframework.boot.test.web.server.LocalServerPort
+import org.springframework.test.web.reactive.server.WebTestClient
+import org.springframework.test.web.reactive.server.expectBody
+
+@PostgresContainer
+@SpringBootTest(webEnvironment = RANDOM_PORT)
+@ExtendWith(SoftAssertionsExtension::class)
+class DeviceEndpoint {
+
+    @InjectSoftAssertions
+    lateinit var softly: SoftAssertions
+
+    @LocalServerPort
+    var port: Int = 0
+
+    lateinit var webClient: WebTestClient
+
+    @BeforeEach
+    fun setup() {
+        webClient = WebTestClient.bindToServer().baseUrl("http://localhost:$port").build()
+    }
+
+    @Nested
+    inner class GetDevice {
+
+        @Test
+        fun `get account - success valid uuid`() {
+            // given
+            val uuid = UUID.fromString("00000000-0000-0000-0002-000000000001")
+
+            // when
+            val result = webClient.get().uri("/device-$uuid").exchange()
+
+            // then
+            result.expectStatus().isOk()
+                .expectBody<Device.Response>()
+                .consumeWith {
+                    softly.assertThat(it.responseBody?.id).isEqualTo(uuid)
+                    softly.assertThat(it.responseBody?.type).isEqualToUuid("00000000-0000-0000-0001-000000000001")
+                    softly.assertThat(it.responseBody?.identity).compareToFile("identity/first-device.data")
+                }
+        }
+
+        @Test
+        fun `get account - fail non-existent uuid`() {
+            // given
+            val uuid = UUID.fromString("00000000-0000-0000-0002-000000000000")
+
+            // when
+            val result = webClient.get().uri("/device-$uuid").exchange()
+
+            // then
+            result.expectStatus().isNotFound
+        }
+    }
+
+    @Nested
+    inner class CreateDevice {
+
+        @Test
+        fun `added device - success`() {
+            // given
+            val uuid = UUID.fromString("00000000-0000-0000-0001-000000000003")
+            val request = Device.Request(
+                type = uuid,
+            )
+
+            // when
+            val result = webClient.post().uri("/device").bodyValue(request).exchange()
+
+            // then
+            result.expectStatus().isOk()
+                .expectBody<Device.Response>()
+                .consumeWith {
+                    softly.assertThat(it.responseBody?.id?.version()).isEqualTo(7)
+                    softly.assertThat(it.responseBody?.type).isEqualTo(uuid)
+                }
+        }
+    }
+}

src/integration-test/kotlin/ltd/hlaeja/controller/IdentityEndpoint.kt

@@ -0,0 +1,79 @@
+package ltd.hlaeja.controller
+
+import java.util.UUID
+import ltd.hlaeja.library.deviceRegistry.Identity
+import ltd.hlaeja.test.container.PostgresContainer
+import ltd.hlaeja.test.isEqualToUuid
+import org.assertj.core.api.SoftAssertions
+import org.assertj.core.api.junit.jupiter.InjectSoftAssertions
+import org.assertj.core.api.junit.jupiter.SoftAssertionsExtension
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT
+import org.springframework.boot.test.web.server.LocalServerPort
+import org.springframework.test.web.reactive.server.WebTestClient
+import org.springframework.test.web.reactive.server.expectBody
+
+@PostgresContainer
+@SpringBootTest(webEnvironment = RANDOM_PORT)
+@ExtendWith(SoftAssertionsExtension::class)
+class IdentityEndpoint {
+
+    @InjectSoftAssertions
+    lateinit var softly: SoftAssertions
+
+    @LocalServerPort
+    var port: Int = 0
+
+    lateinit var webClient: WebTestClient
+
+    @BeforeEach
+    fun setup() {
+        webClient = WebTestClient.bindToServer().baseUrl("http://localhost:$port").build()
+    }
+
+    @Test
+    fun `get identity - success`() {
+        // given
+        val device = UUID.fromString("00000000-0000-0000-0002-000000000002")
+
+        // when
+        val result = webClient.get().uri("/identity/device-$device").exchange()
+
+        // then
+        result.expectStatus()
+            .isOk
+            .expectBody<Identity.Response>()
+            .consumeWith {
+                softly.assertThat(it.responseBody?.client).isEqualToUuid("00000000-0000-0000-0000-000000000000")
+                softly.assertThat(it.responseBody?.node).isEqualToUuid("00000000-0000-0000-0003-000000000001")
+                softly.assertThat(it.responseBody?.device).isEqualTo(device)
+            }
+    }
+
+    @Test
+    fun `get identity - fail device exist but not a node`() {
+        // given
+        val device = UUID.fromString("00000000-0000-0000-0002-000000000001")
+
+        // when
+        val result = webClient.get().uri("/identity/device-$device").exchange()
+
+        // then
+        result.expectStatus().isNotFound
+    }
+
+    @Test
+    fun `get identity - fail device dont exist`() {
+        // given
+        val device = UUID.fromString("00000000-0000-0000-0002-000000000000")
+
+        // when
+        val result = webClient.get().uri("/identity/device-$device").exchange()
+
+        // then
+        result.expectStatus().isNotFound
+    }
+}

src/integration-test/kotlin/ltd/hlaeja/controller/NodeEndpoint.kt

@@ -0,0 +1,81 @@
+package ltd.hlaeja.controller
+
+import java.util.UUID
+import ltd.hlaeja.library.deviceRegistry.Node
+import ltd.hlaeja.test.container.PostgresContainer
+import org.assertj.core.api.SoftAssertions
+import org.assertj.core.api.junit.jupiter.InjectSoftAssertions
+import org.assertj.core.api.junit.jupiter.SoftAssertionsExtension
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.CsvSource
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT
+import org.springframework.boot.test.web.server.LocalServerPort
+import org.springframework.test.web.reactive.server.WebTestClient
+import org.springframework.test.web.reactive.server.expectBody
+
+@PostgresContainer
+@SpringBootTest(webEnvironment = RANDOM_PORT)
+@ExtendWith(SoftAssertionsExtension::class)
+class NodeEndpoint {
+
+    @InjectSoftAssertions
+    lateinit var softly: SoftAssertions
+
+    @LocalServerPort
+    var port: Int = 0
+
+    lateinit var webClient: WebTestClient
+
+    @BeforeEach
+    fun setup() {
+        webClient = WebTestClient.bindToServer().baseUrl("http://localhost:$port").build()
+    }
+
+    @Test
+    fun `added node - success`() {
+        // given
+        val name = "Node 4"
+        val device = UUID.fromString("00000000-0000-0000-0002-000000000001")
+        val client = UUID.fromString("00000000-0000-0000-0000-000000000000")
+        val request = Node.Request(device = device, client = client, name = name)
+
+        // when
+        val result = webClient.post().uri("/node").bodyValue(request).exchange()
+
+        // then
+        result.expectStatus()
+            .isCreated
+            .expectBody<Node.Response>()
+            .consumeWith {
+                softly.assertThat(it.responseBody?.id?.version()).isEqualTo(7)
+                softly.assertThat(it.responseBody?.device).isEqualTo(device)
+                softly.assertThat(it.responseBody?.client).isEqualTo(client)
+                softly.assertThat(it.responseBody?.name).isEqualTo(name)
+            }
+    }
+
+    @ParameterizedTest
+    @CsvSource(
+        // not a device
+        "'00000000-0000-0000-0002-000000000000'",
+        // already a node
+        "'00000000-0000-0000-0002-000000000002'",
+    )
+    fun `added node - fail`(device: String) {
+        // given
+        val name = "Node 5"
+        val client = UUID.fromString("00000000-0000-0000-0000-000000000000")
+        val request = Node.Request(device = UUID.fromString(device), client = client, name = name)
+
+        // when
+        val result = webClient.post().uri("/node").bodyValue(request).exchange()
+
+        // then
+        result.expectStatus()
+            .isBadRequest
+    }
+}

src/integration-test/kotlin/ltd/hlaeja/controller/TypeEndpoint.kt

@@ -0,0 +1,291 @@
+package ltd.hlaeja.controller
+
+import ltd.hlaeja.library.deviceRegistry.Type
+import ltd.hlaeja.test.container.PostgresContainer
+import ltd.hlaeja.test.isEqualToUuid
+import org.assertj.core.api.SoftAssertions
+import org.assertj.core.api.junit.jupiter.InjectSoftAssertions
+import org.assertj.core.api.junit.jupiter.SoftAssertionsExtension
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Nested
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.extension.ExtendWith
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.CsvSource
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT
+import org.springframework.boot.test.web.server.LocalServerPort
+import org.springframework.http.HttpStatus.ACCEPTED
+import org.springframework.http.HttpStatus.CONFLICT
+import org.springframework.http.MediaType.APPLICATION_JSON
+import org.springframework.test.web.reactive.server.WebTestClient
+import org.springframework.test.web.reactive.server.expectBody
+
+@PostgresContainer
+@SpringBootTest(webEnvironment = RANDOM_PORT)
+@ExtendWith(SoftAssertionsExtension::class)
+class TypeEndpoint {
+
+    @InjectSoftAssertions
+    lateinit var softly: SoftAssertions
+
+    @LocalServerPort
+    var port: Int = 0
+
+    lateinit var webClient: WebTestClient
+
+    @BeforeEach
+    fun setup() {
+        webClient = WebTestClient.bindToServer().baseUrl("http://localhost:$port").build()
+    }
+
+    @Nested
+    inner class CreateType {
+
+        @Test
+        fun `added type - success`() {
+            // given
+            val name = "Thing 5 v1"
+            val description = "Thing 5 description"
+            val request = Type.Request(
+                name = name,
+                description = description,
+            )
+
+            // when
+            val result = webClient.post().uri("/type").bodyValue(request).exchange()
+
+            // then
+            result.expectStatus()
+                .isCreated
+                .expectBody<Type.Response>()
+                .consumeWith {
+                    softly.assertThat(it.responseBody?.id?.version()).isEqualTo(7)
+                    softly.assertThat(it.responseBody?.name).isEqualTo(name)
+                    softly.assertThat(it.responseBody?.description).isEqualTo(description)
+                }
+        }
+
+        @Test
+        fun `added type - fail name take`() {
+            // given
+            val request = Type.Request(
+                name = "Thing 1 v1",
+                description = "Thing 1 description",
+            )
+
+            // when
+            val result = webClient.post().uri("/type").bodyValue(request).exchange()
+
+            // then
+            result.expectStatus().isEqualTo(CONFLICT)
+        }
+
+        @ParameterizedTest
+        @CsvSource(
+            value = [
+                "{}",
+                "{'name': 'Thing 0 v1'}",
+                "{'description': 'Thing 0 description'}",
+            ],
+        )
+        fun `added type - fail bad request`(jsonRequest: String) {
+            // when
+            val result = webClient.post()
+                .uri("/type")
+                .contentType(APPLICATION_JSON) // Set Content-Type header
+                .bodyValue(jsonRequest) // Send raw JSON string
+                .exchange()
+
+            // then
+            result.expectStatus().isBadRequest
+        }
+    }
+
+    @Nested
+    inner class GetType {
+
+        @Test
+        fun `added type - success`() {
+            // when
+            val result = webClient.get().uri("/type-00000000-0000-0000-0001-000000000001").exchange()
+
+            // then
+            result.expectStatus()
+                .isOk
+                .expectBody<Type.Response>()
+                .consumeWith {
+                    softly.assertThat(it.responseBody?.id).isEqualToUuid("00000000-0000-0000-0001-000000000001")
+                    softly.assertThat(it.responseBody?.name).isEqualTo("Thing 1 v1")
+                    softly.assertThat(it.responseBody?.description).isEqualTo("Thing 1 description")
+                }
+        }
+
+        @Test
+        fun `get type - fail not found`() {
+            // when
+            val result = webClient.get().uri("/type-00000000-0000-0000-0000-000000000000").exchange()
+
+            // then
+            result.expectStatus().isNotFound
+        }
+
+        @ParameterizedTest
+        @CsvSource(
+            value = [
+                "zzzzzzzz-zzzz-zzzz-zzzz-zzzzzzzzzzzz",
+                "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz",
+                "00000000000000000000000000000000",
+                "0",
+            ],
+        )
+        fun `get type - fail bad request`(uuid: String) {
+            // when
+            val result = webClient.get().uri("/type-$uuid").exchange()
+
+            // then
+            result.expectStatus().isBadRequest
+        }
+    }
+
+    @Nested
+    inner class UpdateType {
+
+        @ParameterizedTest
+        @CsvSource(
+            value = [
+                "Thing 4 v1,Thing 4 description update",
+                "Thing 4 v1 update,Thing 4 description update",
+                "Thing 4 v1,Thing 4 description",
+            ],
+        )
+        fun `update type - success`(name: String, description: String) {
+            // given
+            val request = Type.Request(
+                name = name,
+                description = description,
+            )
+
+            // when
+            val result = webClient.put()
+                .uri("/type-00000000-0000-0000-0001-000000000004")
+                .contentType(APPLICATION_JSON)
+                .bodyValue(request)
+                .exchange()
+
+            // then
+            result.expectStatus()
+                .isOk
+                .expectBody<Type.Response>()
+                .consumeWith {
+                    softly.assertThat(it.responseBody?.id).isEqualToUuid("00000000-0000-0000-0001-000000000004")
+                    softly.assertThat(it.responseBody?.name).isEqualTo(name)
+                    softly.assertThat(it.responseBody?.description).isEqualTo(description)
+                }
+        }
+
+        @Test
+        fun `update type - success no change`() {
+            // given
+            val request = Type.Request(
+                name = "Thing 1 v1",
+                description = "Thing 1 description",
+            )
+
+            // when
+            val result = webClient.put()
+                .uri("/type-00000000-0000-0000-0001-000000000001")
+                .contentType(APPLICATION_JSON)
+                .bodyValue(request)
+                .exchange()
+
+            // then
+            result.expectStatus().isEqualTo(ACCEPTED)
+        }
+
+        @Test
+        fun `update type - fail invalid id`() {
+            // given
+            val request = Type.Request(
+                name = "Thing 0 v1",
+                description = "Thing 0 description",
+            )
+
+            // when
+            val result = webClient.put()
+                .uri("/type-00000000-0000-0000-0001-000000000000")
+                .contentType(APPLICATION_JSON)
+                .bodyValue(request)
+                .exchange()
+
+            // then
+            result.expectStatus().isNotFound
+        }
+
+        @Test
+        fun `update type - fail name take`() {
+            // given
+            val request = Type.Request(
+                name = "Thing 2 v1",
+                description = "Thing 2 description",
+            )
+
+            // when
+            val result = webClient.put()
+                .uri("/type-00000000-0000-0000-0001-000000000001")
+                .contentType(APPLICATION_JSON)
+                .bodyValue(request)
+                .exchange()
+
+            // then
+            result.expectStatus().isEqualTo(CONFLICT)
+        }
+
+        @ParameterizedTest
+        @CsvSource(
+            value = [
+                "{}",
+                "{'name': 'Thing 0 v1'}",
+                "{'description': 'Thing 0 description'}",
+            ],
+        )
+        fun `update type - fail bad data request`(jsonRequest: String) {
+            // when
+            val result = webClient.put()
+                .uri("/type-00000000-0000-0000-0001-000000000001")
+                .contentType(APPLICATION_JSON)
+                .bodyValue(jsonRequest)
+                .exchange()
+
+            // then
+            result.expectStatus().isBadRequest
+        }
+
+        @ParameterizedTest
+        @CsvSource(
+            value = [
+                "zzzzzzzz-zzzz-zzzz-zzzz-zzzzzzzzzzzz",
+                "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz",
+                "00000000000000000000000000000000",
+                "0",
+            ],
+        )
+        fun `update type - fail bad id request`(uuid: String) {
+            // given
+            val request = Type.Request(
+                name = "Thing 0 v1",
+                description = "Thing 0 description",
+            )
+
+            // when
+            val result = webClient.put()
+                .uri("/type-$uuid")
+                .contentType(APPLICATION_JSON)
+                .bodyValue(request)
+                .exchange()
+
+            // then
+            result.expectStatus().isBadRequest
+        }
+    }
+}

src/integration-test/kotlin/ltd/hlaeja/controller/TypesEndpoint.kt

@@ -0,0 +1,210 @@
+package ltd.hlaeja.controller
+
+import ltd.hlaeja.library.deviceRegistry.Types
+import ltd.hlaeja.test.container.PostgresContainer
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.CsvSource
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT
+import org.springframework.boot.test.web.server.LocalServerPort
+import org.springframework.test.web.reactive.server.WebTestClient
+import org.springframework.test.web.reactive.server.expectBody
+
+@PostgresContainer
+@SpringBootTest(webEnvironment = RANDOM_PORT)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class TypesEndpoint {
+
+    @LocalServerPort
+    var port: Int = 0
+
+    lateinit var webClient: WebTestClient
+
+    @BeforeEach
+    fun setup() {
+        webClient = WebTestClient.bindToServer().baseUrl("http://localhost:$port").build()
+    }
+
+    @Test
+    fun `get types default - success`() {
+        // when
+        val result = webClient.get().uri("/types").exchange()
+
+        // then
+        result.expectStatus().isOk()
+            .expectBody<List<Types.Response>>()
+            .consumeWith {
+                assertThat(it.responseBody?.size).isEqualTo(4)
+            }
+    }
+
+    @ParameterizedTest
+    @CsvSource(
+        value = [
+            "1,4",
+            "2,0",
+        ],
+    )
+    fun `get types by page - success`(page: Int, expected: Int) {
+        // when
+        val result = webClient.get().uri("/types/page-$page").exchange()
+
+        // then
+        result.expectStatus().isOk()
+            .expectBody<List<Types.Response>>()
+            .consumeWith {
+                assertThat(it.responseBody?.size).isEqualTo(expected)
+            }
+    }
+
+    @Test
+    fun `get types by pages - fail`() {
+        // when
+        val result = webClient.get().uri("/types/page-0").exchange()
+
+        // then
+        result.expectStatus().isBadRequest
+    }
+
+    @ParameterizedTest
+    @CsvSource(
+        value = [
+            "1,2,2",
+            "2,2,2",
+            "3,2,0",
+        ],
+    )
+    fun `get types by page and show - success`(page: Int, show: Int, expected: Int) {
+        // when
+        val result = webClient.get().uri("/types/page-$page/show-$show").exchange()
+
+        // then
+        result.expectStatus().isOk()
+            .expectBody<List<Types.Response>>()
+            .consumeWith {
+                assertThat(it.responseBody?.size).isEqualTo(expected)
+            }
+    }
+
+    @ParameterizedTest
+    @CsvSource(
+        value = [
+            "0,1",
+            "1,0",
+        ],
+    )
+    fun `get types by page and show - fail`(page: Int, show: Int) {
+        // when
+        val result = webClient.get().uri("/types/page-$page/show-$show").exchange()
+
+        // then
+        result.expectStatus().isBadRequest
+    }
+
+    @ParameterizedTest
+    @CsvSource(
+        value = [
+            "'',4",
+            "v1,3",
+            "v2,1",
+            "v3,0",
+        ],
+    )
+    fun `get types filter - success`(filter: String, expected: Int) {
+        // when
+        val result = webClient.get().uri("/types/filter-$filter").exchange()
+
+        // then
+        result.expectStatus().isOk()
+            .expectBody<List<Types.Response>>()
+            .consumeWith {
+                assertThat(it.responseBody?.size).isEqualTo(expected)
+            }
+    }
+
+    @ParameterizedTest
+    @CsvSource(
+        value = [
+            "'',1,4",
+            "'',2,0",
+            "v1,1,3",
+            "v1,2,0",
+            "v2,1,1",
+            "v2,2,0",
+            "v3,1,0",
+        ],
+    )
+    fun `get types by filter and page - success`(filter: String, page: Int, expected: Int) {
+        // when
+        val result = webClient.get().uri("/types/filter-$filter/page-$page").exchange()
+
+        // then
+        result.expectStatus().isOk()
+            .expectBody<List<Types.Response>>()
+            .consumeWith {
+                assertThat(it.responseBody?.size).isEqualTo(expected)
+            }
+    }
+
+    @ParameterizedTest
+    @CsvSource(
+        value = [
+            "'',0",
+            "v1,0",
+        ],
+    )
+    fun `get types by filter and page - fail`(filter: String, page: Int) {
+        // when
+        val result = webClient.get().uri("/types/filter-$filter/page-$page").exchange()
+
+        // then
+        result.expectStatus().isBadRequest
+    }
+
+    @ParameterizedTest
+    @CsvSource(
+        value = [
+            "'',1,2,2",
+            "'',2,2,2",
+            "'',3,2,0",
+            "v1,1,2,2",
+            "v1,2,2,1",
+            "v1,3,2,0",
+            "v2,1,2,1",
+            "v2,2,2,0",
+            "v3,1,2,0",
+        ],
+    )
+    fun `get types by filter, page and show - success`(filter: String, page: Int, show: Int, expected: Int) {
+        // when
+        val result = webClient.get().uri("/types/filter-$filter/page-$page/show-$show").exchange()
+
+        // then
+        result.expectStatus().isOk()
+            .expectBody<List<Types.Response>>()
+            .consumeWith {
+                assertThat(it.responseBody?.size).isEqualTo(expected)
+            }
+    }
+
+    @ParameterizedTest
+    @CsvSource(
+        value = [
+            "'',1,0",
+            "'',0,1",
+            "v1,1,0",
+            "v1,0,1",
+        ],
+    )
+    fun `get types by filter, page and show - fail`(filter: String, page: Int, show: Int) {
+        // when
+        val result = webClient.get().uri("/types/filter-$filter/page-$page/show-$show").exchange()
+
+        // then
+        result.expectStatus().isBadRequest
+    }
+}

src/integration-test/resources/application.yml

@@ -0,0 +1,15 @@
+jwt:
+  private-key: cert/valid-private-key.pem
+
+spring:
+  r2dbc:
+    url: r2dbc:postgresql://placeholder
+    username: placeholder
+    password: placeholder
+
+container:
+  postgres:
+    version: postgres:17
+    init: postgres/schema.sql
+    before: postgres/data.sql
+    after: postgres/reset.sql

src/integration-test/resources/identity/first-device.data

@@ -0,0 +1 @@
+eyJhbGciOiJSUzI1NiJ9.eyJkZXZpY2UiOiIwMDAwMDAwMC0wMDAwLTAwMDAtMDAwMi0wMDAwMDAwMDAwMDEifQ.JND8PsYw1fd_MfyMrxrufWfMrJka7cD5DVaLeNKuwXlmSWjYUm6NXj70ULTr2eOTiNSmDf-S2n_llfQx3ZkbEck9brpASzMgz-C7jUjxLB1jxEncqqjFbbM84ynt0btkLy4ZLvCDvQqrgNs1MHdz2DNg1OPrZx0kMp_RIeYvX3opM0PKPv5H0w_n-5iYuHx5SDcc0a_S_qHtU2zZSETNrdqe_i-6aCwFP6JO8OZvKVS2P_w7cF0uQUTpaCXF18VhfKeD1DB2OSG4L0HSS1aynXpZprmuKjFyFJIpFuD6zZKo1MNGBgIFufuWRc8iwsHrebWkyua5eACe36qL_vCVlg

src/integration-test/resources/postgres/data.sql

@@ -0,0 +1,23 @@
+-- Test data
+INSERT INTO public.types (id, timestamp, name)
+VALUES ('00000000-0000-0000-0001-000000000001'::uuid, '2000-01-01 00:00:00.000001 +00:00', 'Thing 1 v1'),
+       ('00000000-0000-0000-0001-000000000002'::uuid, '2000-01-01 00:00:00.000001 +00:00', 'Thing 2 v1'),
+       ('00000000-0000-0000-0001-000000000003'::uuid, '2000-01-01 00:00:00.000001 +00:00', 'Thing 3 v2'),
+       ('00000000-0000-0000-0001-000000000004'::uuid, '2000-01-01 00:00:00.000001 +00:00', 'Thing 4 v1');
+
+INSERT INTO public.type_descriptions (type_id, description)
+VALUES ('00000000-0000-0000-0001-000000000001'::uuid, 'Thing 1 description'),
+       ('00000000-0000-0000-0001-000000000002'::uuid, 'Thing 2 description'),
+       ('00000000-0000-0000-0001-000000000003'::uuid, 'Thing 3 description'),
+       ('00000000-0000-0000-0001-000000000004'::uuid, 'Thing 4 description');
+
+INSERT INTO public.devices (id, timestamp, type)
+VALUES ('00000000-0000-0000-0002-000000000001'::uuid, '2000-01-01 00:00:00.000001 +00:00', '00000000-0000-0000-0001-000000000001'::uuid),
+       ('00000000-0000-0000-0002-000000000002'::uuid, '2000-01-01 00:00:00.000001 +00:00', '00000000-0000-0000-0001-000000000001'::uuid),
+       ('00000000-0000-0000-0002-000000000003'::uuid, '2000-01-01 00:00:00.000001 +00:00', '00000000-0000-0000-0001-000000000002'::uuid),
+       ('00000000-0000-0000-0002-000000000004'::uuid, '2000-01-01 00:00:00.000001 +00:00', '00000000-0000-0000-0001-000000000003'::uuid);
+
+INSERT INTO public.nodes (id, timestamp, client, device, name)
+VALUES ('00000000-0000-0000-0003-000000000001'::uuid, '2000-01-01 00:00:00.000001 +00:00', '00000000-0000-0000-0000-000000000000'::uuid, '00000000-0000-0000-0002-000000000002'::uuid, 'Node 1'),
+       ('00000000-0000-0000-0003-000000000002'::uuid, '2000-01-01 00:00:00.000001 +00:00', '00000000-0000-0000-0000-000000000000'::uuid, '00000000-0000-0000-0002-000000000003'::uuid, 'Node 2'),
+       ('00000000-0000-0000-0003-000000000003'::uuid, '2000-01-01 00:00:00.000001 +00:00', '00000000-0000-0000-0000-000000000000'::uuid, '00000000-0000-0000-0002-000000000004'::uuid, 'Node 3');

src/integration-test/resources/postgres/reset.sql

@@ -0,0 +1,9 @@
+-- Disable triggers on the tables
+
+-- Truncate tables
+TRUNCATE TABLE nodes CASCADE;
+TRUNCATE TABLE devices CASCADE;
+TRUNCATE TABLE type_descriptions CASCADE;
+TRUNCATE TABLE types CASCADE;
+
+-- Enable triggers on the account table

src/integration-test/resources/postgres/schema.sql

@@ -0,0 +1,78 @@
+-- FUNCTION: public.gen_uuid_v7(timestamp with time zone)
+CREATE OR REPLACE FUNCTION public.gen_uuid_v7(p_timestamp timestamp with time zone)
+  RETURNS uuid
+  LANGUAGE 'sql'
+  COST 100
+  VOLATILE PARALLEL UNSAFE
+AS
+$BODY$
+-- Replace the first 48 bits of a uuid v4 with the provided timestamp (in milliseconds) since 1970-01-01 UTC, and set the version to 7
+SELECT encode(set_bit(set_bit(overlay(uuid_send(gen_random_uuid()) PLACING substring(int8send((extract(EPOCH FROM p_timestamp) * 1000):: BIGINT) FROM 3) FROM 1 FOR 6), 52, 1), 53, 1), 'hex') ::uuid;
+$BODY$;
+
+-- FUNCTION: public.gen_uuid_v7()
+CREATE OR REPLACE FUNCTION public.gen_uuid_v7()
+  RETURNS uuid
+  LANGUAGE 'sql'
+  COST 100
+  VOLATILE PARALLEL UNSAFE
+AS
+$BODY$
+SELECT gen_uuid_v7(clock_timestamp());
+$BODY$;
+
+-- Table: public.types
+
+CREATE TABLE IF NOT EXISTS public.types
+(
+  id         UUID                              DEFAULT gen_uuid_v7(),
+  timestamp timestamp with time zone NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  name      VARCHAR(50) UNIQUE       NOT NULL,
+  CONSTRAINT pk_contact_types PRIMARY KEY (id)
+);
+
+CREATE UNIQUE INDEX IF NOT EXISTS  types_name_key
+  ON types (name ASC);
+
+CREATE TABLE IF NOT EXISTS public.type_descriptions
+(
+  type_id     uuid                                                 NOT NULL,
+  description character varying(1000) COLLATE pg_catalog."default" NOT NULL DEFAULT ''::character varying,
+  CONSTRAINT pk_type_descriptions PRIMARY KEY (type_id),
+  CONSTRAINT fk_type_descriptions_types FOREIGN KEY (type_id)
+    REFERENCES public.types (id) MATCH SIMPLE
+    ON UPDATE NO ACTION
+    ON DELETE CASCADE
+);
+
+-- Table: public.devices
+
+CREATE TABLE IF NOT EXISTS public.devices
+(
+  id        UUID                 DEFAULT gen_uuid_v7(),
+  timestamp TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  type      UUID        NOT NULL,
+  CONSTRAINT pk_devices PRIMARY KEY (id),
+  CONSTRAINT fk_devices_type FOREIGN KEY (type) REFERENCES public.types (id) ON DELETE NO ACTION ON UPDATE NO ACTION
+);
+
+-- Index: public.i_devices_type
+
+CREATE INDEX IF NOT EXISTS i_devices_type ON public.devices (type);
+
+-- Table: public.nodes
+
+CREATE TABLE IF NOT EXISTS public.nodes
+(
+  id        UUID                 DEFAULT gen_uuid_v7(),
+  timestamp TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  client    UUID        NOT NULL,
+  device    UUID        NOT NULL,
+  name      VARCHAR(50) NOT NULL,
+  CONSTRAINT pk_nodes PRIMARY KEY (id),
+  CONSTRAINT fk_nodes_type FOREIGN KEY (device) REFERENCES public.devices (id) ON DELETE NO ACTION ON UPDATE NO ACTION
+);
+
+-- Index: public.i_nodes_type
+
+CREATE UNIQUE INDEX IF NOT EXISTS i_nodes_device ON public.nodes (device);

src/main/kotlin/ltd/hlaeja/controller/DeviceController.kt

@@ -1,24 +1,31 @@
 package ltd.hlaeja.controller
 
+import java.util.UUID
+import ltd.hlaeja.jwt.service.PrivateJwtService
 import ltd.hlaeja.library.deviceRegistry.Device
 import ltd.hlaeja.service.DeviceService
-import ltd.hlaeja.service.JwtService
+import ltd.hlaeja.util.toDeviceResponse
-import org.springframework.http.HttpStatus.EXPECTATION_FAILED
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RestController
-import org.springframework.web.server.ResponseStatusException
 
 @RestController
 class DeviceController(
     private val deviceService: DeviceService,
-    private val jwtService: JwtService,
+    private val privateJwtService: PrivateJwtService,
 ) {
 
     @PostMapping("/device")
     suspend fun addDevice(
         @RequestBody request: Device.Request,
-    ): Device.Identity = deviceService.addDevice(request.type)
+    ): Device.Response = deviceService.addDevice(request.type)
-        .let { jwtService.makeIdentity(it.id ?: throw ResponseStatusException(EXPECTATION_FAILED)) }
+        .toDeviceResponse(privateJwtService)
-        .let { Device.Identity(it) }
+
+    @GetMapping("/device-{device}")
+    suspend fun getDevice(
+        @PathVariable device: UUID,
+    ): Device.Response = deviceService.getDevice(device)
+        .toDeviceResponse(privateJwtService)
 }

src/main/kotlin/ltd/hlaeja/controller/NodeController.kt

@@ -4,8 +4,10 @@ import ltd.hlaeja.library.deviceRegistry.Node
 import ltd.hlaeja.service.NodeService
 import ltd.hlaeja.util.toEntity
 import ltd.hlaeja.util.toNodeResponse
+import org.springframework.http.HttpStatus.CREATED
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.ResponseStatus
 import org.springframework.web.bind.annotation.RestController
 
 @RestController
@@ -14,6 +16,7 @@ class NodeController(
 ) {
 
     @PostMapping("/node")
+    @ResponseStatus(CREATED)
     suspend fun addNode(
         @RequestBody request: Node.Request,
     ): Node.Response = nodeService.addNode(request.toEntity()).toNodeResponse()

src/main/kotlin/ltd/hlaeja/controller/TypeController.kt

@@ -1,14 +1,16 @@
 package ltd.hlaeja.controller
 
-import kotlinx.coroutines.flow.Flow
+import java.util.UUID
-import kotlinx.coroutines.flow.map
 import ltd.hlaeja.library.deviceRegistry.Type
 import ltd.hlaeja.service.TypeService
-import ltd.hlaeja.util.toTypeEntity
 import ltd.hlaeja.util.toTypeResponse
+import org.springframework.http.HttpStatus.CREATED
 import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.PutMapping
 import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.ResponseStatus
 import org.springframework.web.bind.annotation.RestController
 
 @RestController
@@ -16,11 +18,20 @@ class TypeController(
     private val service: TypeService,
 ) {
 
-    @GetMapping("/types")
-    fun getTypes(): Flow<Type.Response> = service.getTypes().map { it.toTypeResponse() }
-
     @PostMapping("/type")
+    @ResponseStatus(CREATED)
     suspend fun addType(
-        @RequestBody register: Type.Request,
+        @RequestBody request: Type.Request,
-    ): Type.Response = service.addType(register.toTypeEntity()).toTypeResponse()
+    ): Type.Response = service.addType(request.name, request.description).toTypeResponse()
+
+    @GetMapping("/type-{type}")
+    suspend fun getType(
+        @PathVariable type: UUID,
+    ): Type.Response = service.getType(type).toTypeResponse()
+
+    @PutMapping("/type-{type}")
+    suspend fun updateType(
+        @PathVariable type: UUID,
+        @RequestBody request: Type.Request,
+    ): Type.Response = service.updateType(type, request.name, request.description).toTypeResponse()
 }

src/main/kotlin/ltd/hlaeja/controller/TypesController.kt

@@ -0,0 +1,36 @@
+package ltd.hlaeja.controller
+
+import jakarta.validation.constraints.Min
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import ltd.hlaeja.library.deviceRegistry.Types
+import ltd.hlaeja.service.TypeService
+import ltd.hlaeja.util.toTypesResponse
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+class TypesController(
+    private val service: TypeService,
+) {
+    companion object {
+        const val DEFAULT_PAGE: Int = 1
+        const val DEFAULT_SIZE: Int = 25
+    }
+
+    @GetMapping(
+        "/types",
+        "/types/page-{page}",
+        "/types/page-{page}/show-{show}",
+        "/types/filter-{filter}",
+        "/types/filter-{filter}/page-{page}",
+        "/types/filter-{filter}/page-{page}/show-{show}",
+    )
+    fun getTypes(
+        @PathVariable(required = false) @Min(1) page: Int = DEFAULT_PAGE,
+        @PathVariable(required = false) @Min(1) show: Int = DEFAULT_SIZE,
+        @PathVariable(required = false) filter: String? = null,
+    ): Flow<Types.Response> = service.getTypes((page - 1) * show, show, filter)
+        .map { it.toTypesResponse() }
+}

src/main/kotlin/ltd/hlaeja/dto/TypeWithDescription.kt

@@ -0,0 +1,11 @@
+package ltd.hlaeja.dto
+
+import java.time.ZonedDateTime
+import java.util.UUID
+
+data class TypeWithDescription(
+    val id: UUID,
+    val timestamp: ZonedDateTime,
+    val name: String,
+    val description: String?,
+)

src/main/kotlin/ltd/hlaeja/entity/TypeDescriptionEntity.kt

@@ -0,0 +1,12 @@
+package ltd.hlaeja.entity
+
+import java.util.UUID
+import org.springframework.data.annotation.Id
+import org.springframework.data.relational.core.mapping.Table
+
+@Table("type_descriptions")
+data class TypeDescriptionEntity(
+    @Id
+    val typeId: UUID,
+    val description: String,
+)

src/main/kotlin/ltd/hlaeja/repository/TypeDescriptionRepository.kt

@@ -0,0 +1,24 @@
+package ltd.hlaeja.repository
+
+import java.util.UUID
+import ltd.hlaeja.entity.TypeDescriptionEntity
+import org.springframework.data.r2dbc.repository.Query
+import org.springframework.data.repository.kotlin.CoroutineCrudRepository
+import org.springframework.data.repository.query.Param
+import org.springframework.stereotype.Repository
+
+@Repository
+interface TypeDescriptionRepository : CoroutineCrudRepository<TypeDescriptionEntity, UUID> {
+    @Query(
+        """
+            INSERT INTO type_descriptions (type_id, description) VALUES (:type_id, :description)
+            ON CONFLICT (type_id)
+            DO UPDATE SET description = :description
+            RETURNING *
+        """,
+    )
+    suspend fun upsert(
+        @Param("type_id") typeId: UUID,
+        @Param("description") description: String,
+    ): TypeDescriptionEntity
+}

src/main/kotlin/ltd/hlaeja/repository/TypeRepository.kt

@@ -1,9 +1,39 @@
 package ltd.hlaeja.repository
 
 import java.util.UUID
+import kotlinx.coroutines.flow.Flow
+import ltd.hlaeja.dto.TypeWithDescription
 import ltd.hlaeja.entity.TypeEntity
+import org.springframework.data.r2dbc.repository.Query
 import org.springframework.data.repository.kotlin.CoroutineCrudRepository
+import org.springframework.data.repository.query.Param
 import org.springframework.stereotype.Repository
 
 @Repository
-interface TypeRepository : CoroutineCrudRepository<TypeEntity, UUID>
+interface TypeRepository : CoroutineCrudRepository<TypeEntity, UUID> {
+
+    @Query("SELECT * FROM types ORDER BY name LIMIT :limit OFFSET :offset")
+    fun findAll(
+        @Param("offset") offset: Int,
+        @Param("limit") limit: Int,
+    ): Flow<TypeEntity>
+
+    @Query("SELECT * FROM types WHERE name ILIKE :filter ORDER BY name LIMIT :limit OFFSET :offset")
+    fun findAllContaining(
+        @Param("filter") filter: String,
+        @Param("offset") offset: Int,
+        @Param("limit") limit: Int,
+    ): Flow<TypeEntity>
+
+    @Query(
+        """
+            SELECT t.id, t.timestamp, t.name, td.description
+            FROM types t
+            LEFT JOIN type_descriptions td ON t.id = td.type_id
+            WHERE t.id = :id
+        """,
+    )
+    suspend fun findTypeWithDescription(
+        @Param("id") id: UUID,
+    ): TypeWithDescription?
+}

src/main/kotlin/ltd/hlaeja/service/DeviceService.kt

@@ -1,11 +1,15 @@
 package ltd.hlaeja.service
 
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.time.ZonedDateTime
 import java.util.UUID
 import ltd.hlaeja.entity.DeviceEntity
 import ltd.hlaeja.repository.DeviceRepository
-import mu.KotlinLogging
+import org.springframework.dao.DataIntegrityViolationException
+import org.springframework.http.HttpStatus.BAD_REQUEST
+import org.springframework.http.HttpStatus.NOT_FOUND
 import org.springframework.stereotype.Service
+import org.springframework.web.server.ResponseStatusException
 
 private val log = KotlinLogging.logger {}
 
@@ -16,6 +20,15 @@ class DeviceService(
 
     suspend fun addDevice(
         type: UUID,
-    ): DeviceEntity = deviceRepository.save(DeviceEntity(null, ZonedDateTime.now(), type))
+    ): DeviceEntity = try {
-        .also { log.debug { "Added device ${it.id}" } }
+        deviceRepository.save(DeviceEntity(null, ZonedDateTime.now(), type))
+            .also { log.debug { "Added device ${it.id}" } }
+    } catch (e: DataIntegrityViolationException) {
+        log.warn { e.localizedMessage }
+        throw ResponseStatusException(BAD_REQUEST)
+    }
+
+    suspend fun getDevice(device: UUID): DeviceEntity = deviceRepository.findById(device)
+        ?.also { log.debug { "Get device ${it.id}" } }
+        ?: throw ResponseStatusException(NOT_FOUND)
 }

src/main/kotlin/ltd/hlaeja/service/JwtService.kt

@@ -1,25 +0,0 @@
-package ltd.hlaeja.service
-
-import io.jsonwebtoken.Jwts
-import java.security.interfaces.RSAPrivateKey
-import java.util.UUID
-import ltd.hlaeja.property.JwtProperty
-import ltd.hlaeja.util.PrivateKeyProvider
-import org.springframework.stereotype.Service
-
-@Service
-class JwtService(
-    jwtProperty: JwtProperty,
-) {
-
-    private var privateKey: RSAPrivateKey = PrivateKeyProvider.load(jwtProperty.privateKey)
-
-    suspend fun makeIdentity(device: UUID): String {
-        return Jwts.builder()
-            .claims()
-            .add("device", device)
-            .and()
-            .signWith(privateKey)
-            .compact()
-    }
-}

src/main/kotlin/ltd/hlaeja/service/NodeService.kt

@@ -1,9 +1,11 @@
 package ltd.hlaeja.service
 
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.util.UUID
 import ltd.hlaeja.entity.NodeEntity
 import ltd.hlaeja.repository.NodeRepository
-import mu.KotlinLogging
+import org.springframework.dao.DataIntegrityViolationException
+import org.springframework.http.HttpStatus.BAD_REQUEST
 import org.springframework.http.HttpStatus.NOT_FOUND
 import org.springframework.stereotype.Service
 import org.springframework.web.server.ResponseStatusException
@@ -17,8 +19,11 @@ class NodeService(
 
     suspend fun addNode(
         node: NodeEntity,
-    ): NodeEntity = nodeRepository.save(node)
+    ): NodeEntity = try {
-        .also { log.debug { "Added node ${it.id}" } }
+        nodeRepository.save(node).also { log.debug { "Added node ${it.id}" } }
+    } catch (exception: DataIntegrityViolationException) {
+        throw ResponseStatusException(BAD_REQUEST, null, exception)
+    }
 
     suspend fun getNodeFromDevice(
         device: UUID,

src/main/kotlin/ltd/hlaeja/service/TypeService.kt

@@ -1,12 +1,21 @@
 package ltd.hlaeja.service
 
+import io.github.oshai.kotlinlogging.KotlinLogging
+import java.time.ZonedDateTime
+import java.util.UUID
 import kotlinx.coroutines.flow.Flow
+import ltd.hlaeja.dto.TypeWithDescription
+import ltd.hlaeja.entity.TypeDescriptionEntity
 import ltd.hlaeja.entity.TypeEntity
+import ltd.hlaeja.repository.TypeDescriptionRepository
 import ltd.hlaeja.repository.TypeRepository
-import mu.KotlinLogging
+import org.springframework.dao.DataIntegrityViolationException
-import org.springframework.dao.DuplicateKeyException
+import org.springframework.http.HttpStatus.ACCEPTED
-import org.springframework.http.HttpStatus
+import org.springframework.http.HttpStatus.CONFLICT
+import org.springframework.http.HttpStatus.EXPECTATION_FAILED
+import org.springframework.http.HttpStatus.NOT_FOUND
 import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
 import org.springframework.web.server.ResponseStatusException
 
 private val log = KotlinLogging.logger {}
@@ -14,17 +23,99 @@ private val log = KotlinLogging.logger {}
 @Service
 class TypeService(
     private val typeRepository: TypeRepository,
+    private val typeDescriptionRepository: TypeDescriptionRepository,
 ) {
 
-    fun getTypes(): Flow<TypeEntity> = typeRepository.findAll()
+    fun getTypes(
+        page: Int,
+        show: Int,
+        filter: String?,
+    ): Flow<TypeEntity> = when {
+        !filter.isNullOrEmpty() -> typeRepository.findAllContaining("%$filter%", page, show)
+        else -> typeRepository.findAll(page, show)
+    }
 
+    @Transactional
     suspend fun addType(
-        entity: TypeEntity,
+        name: String,
-    ): TypeEntity = try {
+        description: String,
-        typeRepository.save(entity)
+    ): TypeWithDescription = try {
-            .also { log.debug("Added new type: {}", it.id) }
+        val savedType = typeRepository.save(
-    } catch (e: DuplicateKeyException) {
+            TypeEntity(timestamp = ZonedDateTime.now(), name = name),
-        log.warn(e.localizedMessage)
+        ).also { log.debug { "Added new type: ${it.id}" } }
-        throw ResponseStatusException(HttpStatus.CONFLICT)
+        val savedDescription = typeDescriptionRepository.upsert(
+            savedType.id ?: throw ResponseStatusException(EXPECTATION_FAILED),
+            description,
+        ).also { log.debug { "Added description for type: ${it.typeId}" } }
+        TypeWithDescription(
+            id = savedType.id,
+            timestamp = savedType.timestamp,
+            name = savedType.name,
+            description = savedDescription.description,
+        )
+    } catch (e: DataIntegrityViolationException) {
+        log.warn { "Failed to add type with name '$name': ${e.localizedMessage}" }
+        throw ResponseStatusException(CONFLICT, "Type with name '$name' already exists")
+    }
+
+    suspend fun getType(
+        id: UUID,
+    ): TypeWithDescription = typeRepository.findTypeWithDescription(id)
+        ?.also { log.debug { "Retrieved type with description: ${it.id}" } }
+        ?: throw ResponseStatusException(NOT_FOUND, "Type with id '$id' not found")
+
+    @Transactional
+    suspend fun updateType(
+        id: UUID,
+        name: String,
+        description: String,
+    ): TypeWithDescription {
+        var hasChanges = false
+        val updatedType = updateType(id, name) { hasChanges = true }
+        val updatedTypeDescription = updateTypeDescription(id, description) { hasChanges = true }
+        if (!hasChanges) {
+            throw ResponseStatusException(ACCEPTED, "No changes for type with id '$id'")
+        }
+        return TypeWithDescription(
+            id = updatedType.id!!,
+            timestamp = updatedType.timestamp,
+            name = updatedType.name,
+            description = updatedTypeDescription.description,
+        )
+    }
+
+    private suspend fun updateTypeDescription(
+        id: UUID,
+        description: String,
+        onChange: () -> Unit,
+    ): TypeDescriptionEntity {
+        val existingDescription = typeDescriptionRepository.findById(id)
+            ?: throw ResponseStatusException(NOT_FOUND, "Type description with id '$id' not found")
+        return if (existingDescription.description == description) {
+            existingDescription
+        } else {
+            onChange()
+            typeDescriptionRepository.save(existingDescription.copy(description = description))
+        }
+    }
+
+    private suspend fun updateType(
+        id: UUID,
+        name: String,
+        onChange: () -> Unit,
+    ): TypeEntity {
+        val existingType = typeRepository.findById(id)
+            ?: throw ResponseStatusException(NOT_FOUND, "Type with id '$id' not found")
+        return if (existingType.name == name) {
+            existingType
+        } else {
+            onChange()
+            try {
+                typeRepository.save(existingType.copy(name = name))
+            } catch (e: DataIntegrityViolationException) {
+                log.warn { "Failed to update type with name '$name': ${e.localizedMessage}" }
+                throw ResponseStatusException(CONFLICT, "Type with name '$name' already exists")
+            }
+        }
     }
 }

src/main/kotlin/ltd/hlaeja/util/Mapping.kt

@@ -1,19 +1,43 @@
 package ltd.hlaeja.util
 
 import java.time.ZonedDateTime
+import java.util.UUID
+import ltd.hlaeja.entity.DeviceEntity
 import ltd.hlaeja.entity.NodeEntity
 import ltd.hlaeja.entity.TypeEntity
+import ltd.hlaeja.dto.TypeWithDescription
+import ltd.hlaeja.entity.TypeDescriptionEntity
+import ltd.hlaeja.jwt.service.PrivateJwtService
+import ltd.hlaeja.library.deviceRegistry.Device
 import ltd.hlaeja.library.deviceRegistry.Identity
 import ltd.hlaeja.library.deviceRegistry.Node
 import ltd.hlaeja.library.deviceRegistry.Type
+import ltd.hlaeja.library.deviceRegistry.Types
 import org.springframework.http.HttpStatus.EXPECTATION_FAILED
 import org.springframework.web.server.ResponseStatusException
 
-fun Type.Request.toTypeEntity(): TypeEntity = TypeEntity(null, ZonedDateTime.now(), name)
+fun Type.Request.toTypeEntity(id: UUID): TypeEntity = TypeEntity(
+    id = id,
+    timestamp = ZonedDateTime.now(),
+    name = name,
+)
 
-fun TypeEntity.toTypeResponse(): Type.Response = Type.Response(
+fun Type.Request.toTypeDescriptionEntity(id: UUID): TypeDescriptionEntity = TypeDescriptionEntity(
-    id ?: throw ResponseStatusException(EXPECTATION_FAILED),
+    typeId = id,
-    name,
+    description = description,
+)
+
+fun TypeWithDescription.toTypeResponse(): Type.Response = Type.Response(
+    id = id,
+    timestamp = timestamp,
+    name = name,
+    description = description ?: "",
+)
+
+fun TypeEntity.toTypesResponse(): Types.Response = Types.Response(
+    id = id!!,
+    name = name,
+    timestamp = timestamp,
 )
 
 fun Node.Request.toEntity(): NodeEntity = NodeEntity(
@@ -36,3 +60,11 @@ fun NodeEntity.toIdentityResponse(): Identity.Response = Identity.Response(
     id ?: throw ResponseStatusException(EXPECTATION_FAILED),
     device,
 )
+
+fun DeviceEntity.toDeviceResponse(
+    jwtService: PrivateJwtService,
+): Device.Response = Device.Response(
+    id ?: throw ResponseStatusException(EXPECTATION_FAILED),
+    type,
+    jwtService.sign("device" to id),
+)

src/main/kotlin/ltd/hlaeja/util/PrivateKeyProvider.kt

@@ -1,35 +0,0 @@
-package ltd.hlaeja.util
-
-import java.security.KeyFactory
-import java.security.interfaces.RSAPrivateKey
-import java.security.spec.PKCS8EncodedKeySpec
-import java.util.Base64.getDecoder
-import ltd.hlaeja.exception.KeyProviderException
-
-object PrivateKeyProvider {
-
-    fun load(
-        pemFile: String,
-    ): RSAPrivateKey = readPrivatePemFile(pemFile)
-        .let(::makePrivateKey)
-
-    private fun makePrivateKey(
-        privateKeyBytes: ByteArray,
-    ): RSAPrivateKey = KeyFactory.getInstance("RSA")
-        .generatePrivate(PKCS8EncodedKeySpec(privateKeyBytes)) as RSAPrivateKey
-
-    private fun readPrivatePemFile(
-        privateKey: String,
-    ): ByteArray = javaClass.classLoader
-        .getResource(privateKey)
-        ?.readText()
-        ?.let(::getPrivateKeyByteArray)
-        ?: throw KeyProviderException("Could not load private key")
-
-    private fun getPrivateKeyByteArray(
-        keyText: String,
-    ): ByteArray = keyText.replace(Regex("[\r\n]+"), "")
-        .removePrefix("-----BEGIN PRIVATE KEY-----")
-        .removeSuffix("-----END PRIVATE KEY-----")
-        .let { getDecoder().decode(it) }
-}

src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -19,11 +19,6 @@
       "name": "spring.application.build.os.version",
       "type": "java.lang.String",
       "description": "Application build os version."
-    },
-    {
-      "name": "jwt.private-key",
-      "type": "java.lang.String",
-      "description": "Jwt private key file."
     }
   ]
 }

src/main/resources/application.yml

@@ -11,7 +11,7 @@ spring:
         version: "%APP_BUILD_OS_VERSION%"
 
 jwt:
-  private-key: keys/private_key.pem
+  private-key: cert/private_key.pem
 
 ---
 ###############################

src/test/kotlin/ltd/hlaeja/ApplicationTests.kt

@@ -1,13 +0,0 @@
-package ltd.hlaeja
-
-import org.junit.jupiter.api.Test
-import org.springframework.boot.test.context.SpringBootTest
-
-@SpringBootTest
-class ApplicationTests {
-
-    @Test
-    fun contextLoads() {
-        // place holder
-    }
-}

src/test/kotlin/ltd/hlaeja/assertj/UUIDAssert.kt

@@ -1,15 +0,0 @@
-package ltd.hlaeja.assertj
-
-import java.util.UUID
-import org.assertj.core.api.AbstractAssert
-
-class UUIDAssert(actual: UUID) : AbstractAssert<UUIDAssert, UUID>(actual, UUIDAssert::class.java) {
-    fun isUUID(expected: String): UUIDAssert {
-        objects.assertEqual(this.info, this.actual, UUID.fromString(expected))
-        return this.myself
-    }
-}
-
-fun assertThat(actual: UUID): UUIDAssert {
-    return UUIDAssert(actual)
-}

src/test/kotlin/ltd/hlaeja/controller/DeviceControllerTest.kt

@@ -9,11 +9,12 @@ import java.time.ZonedDateTime
 import java.util.UUID
 import kotlinx.coroutines.test.runTest
 import ltd.hlaeja.entity.DeviceEntity
+import ltd.hlaeja.jwt.service.PrivateJwtService
 import ltd.hlaeja.library.deviceRegistry.Device
 import ltd.hlaeja.service.DeviceService
-import ltd.hlaeja.service.JwtService
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import org.springframework.web.server.ResponseStatusException
@@ -27,44 +28,68 @@ class DeviceControllerTest {
     }
 
     val deviceService: DeviceService = mockk()
-    val jwtService: JwtService = mockk()
+    val privateJwtService: PrivateJwtService = mockk()
 
     lateinit var controller: DeviceController
 
     @BeforeEach
     fun setUp() {
-        controller = DeviceController(deviceService, jwtService)
+        controller = DeviceController(deviceService, privateJwtService)
     }
 
-    @Test
+    @Nested
-    fun `add device - success`() = runTest {
+    inner class AddDeviceTest {
-        // given
-        val request = Device.Request(uuid)
-        coEvery { deviceService.addDevice(any()) } returns DeviceEntity(uuid, timestamp, uuid)
-        coEvery { jwtService.makeIdentity(any()) } returns PAYLOAD
 
-        // when
+        @Test
-        val response = controller.addDevice(request)
+        fun `add device - success`() = runTest {
+            // given
+            val request = Device.Request(uuid)
+            coEvery { deviceService.addDevice(any()) } returns DeviceEntity(uuid, timestamp, uuid)
+            coEvery { privateJwtService.sign(any()) } returns PAYLOAD
 
-        // then
+            // when
-        coVerify(exactly = 1) { deviceService.addDevice(any()) }
+            val response = controller.addDevice(request)
-        coVerify(exactly = 1) { jwtService.makeIdentity(any()) }
 
-        assertThat(response.identity).isEqualTo(PAYLOAD)
+            // then
-    }
+            coVerify(exactly = 1) { deviceService.addDevice(any()) }
+            coVerify(exactly = 1) { privateJwtService.sign(any()) }
 
-    @Test
+            assertThat(response.identity).isEqualTo(PAYLOAD)
-    fun `add device - device service fail`() = runTest {
-        // given
-        val request = Device.Request(uuid)
-        coEvery { deviceService.addDevice(any()) } returns DeviceEntity(null, timestamp, uuid)
-
-        // when exception
-        val exception = assertThrows<ResponseStatusException> {
-            controller.addDevice(request)
         }
 
-        // then
+        @Test
-        assertThat(exception.message).isEqualTo("417 EXPECTATION_FAILED")
+        fun `add device - device service fail`() = runTest {
+            // given
+            val request = Device.Request(uuid)
+            coEvery { deviceService.addDevice(any()) } returns DeviceEntity(null, timestamp, uuid)
+
+            // when exception
+            val exception = assertThrows<ResponseStatusException> {
+                controller.addDevice(request)
+            }
+
+            // then
+            assertThat(exception.message).isEqualTo("417 EXPECTATION_FAILED")
+        }
+    }
+
+    @Nested
+    inner class GetDeviceTest {
+
+        @Test
+        fun `get device - success`() = runTest {
+            // given
+            coEvery { deviceService.getDevice(any()) } returns DeviceEntity(uuid, timestamp, uuid)
+            coEvery { privateJwtService.sign(any()) } returns PAYLOAD
+
+            // when
+            val response = controller.getDevice(uuid)
+
+            // then
+            coVerify(exactly = 1) { deviceService.getDevice(any()) }
+            coVerify(exactly = 1) { privateJwtService.sign(any()) }
+
+            assertThat(response.identity).isEqualTo(PAYLOAD)
+        }
     }
 }

src/test/kotlin/ltd/hlaeja/controller/IdentityControllerTest.kt

@@ -8,9 +8,10 @@ import java.time.ZoneId
 import java.time.ZonedDateTime
 import java.util.UUID
 import kotlinx.coroutines.test.runTest
-import ltd.hlaeja.assertj.assertThat
 import ltd.hlaeja.entity.NodeEntity
 import ltd.hlaeja.service.NodeService
+import ltd.hlaeja.test.isEqualToUuid
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
@@ -48,8 +49,8 @@ class IdentityControllerTest {
         // then
         coVerify(exactly = 1) { service.getNodeFromDevice(any()) }
 
-        assertThat(response.node).isUUID("00000000-0000-0000-0000-000000000001")
+        assertThat(response.node).isEqualToUuid("00000000-0000-0000-0000-000000000001")
-        assertThat(response.client).isUUID("00000000-0000-0000-0000-000000000002")
+        assertThat(response.client).isEqualToUuid("00000000-0000-0000-0000-000000000002")
-        assertThat(response.device).isUUID("00000000-0000-0000-0000-000000000003")
+        assertThat(response.device).isEqualToUuid("00000000-0000-0000-0000-000000000003")
     }
 }

src/test/kotlin/ltd/hlaeja/controller/NodeControllerTest.kt

@@ -5,10 +5,10 @@ import io.mockk.coVerify
 import io.mockk.mockk
 import java.util.UUID
 import kotlinx.coroutines.test.runTest
-import ltd.hlaeja.assertj.assertThat
 import ltd.hlaeja.entity.NodeEntity
 import ltd.hlaeja.library.deviceRegistry.Node
 import ltd.hlaeja.service.NodeService
+import ltd.hlaeja.test.isEqualToUuid
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
@@ -42,9 +42,9 @@ class NodeControllerTest {
         // then
         coVerify(exactly = 1) { service.addNode(any()) }
 
-        assertThat(response.id).isUUID("00000000-0000-0000-0000-000000000003")
+        assertThat(response.id).isEqualToUuid("00000000-0000-0000-0000-000000000003")
-        assertThat(response.client).isUUID("00000000-0000-0000-0000-000000000001")
+        assertThat(response.client).isEqualToUuid("00000000-0000-0000-0000-000000000001")
-        assertThat(response.device).isUUID("00000000-0000-0000-0000-000000000002")
+        assertThat(response.device).isEqualToUuid("00000000-0000-0000-0000-000000000002")
         assertThat(response.name).isEqualTo("test")
     }
 }

src/test/kotlin/ltd/hlaeja/controller/TypeControllerTest.kt

@@ -2,20 +2,16 @@ package ltd.hlaeja.controller
 
 import io.mockk.coEvery
 import io.mockk.coVerify
-import io.mockk.every
 import io.mockk.mockk
-import io.mockk.verify
 import java.time.LocalDateTime
 import java.time.ZoneId
 import java.time.ZonedDateTime
 import java.util.UUID
-import kotlinx.coroutines.flow.flowOf
-import kotlinx.coroutines.flow.single
 import kotlinx.coroutines.test.runTest
-import ltd.hlaeja.entity.TypeEntity
+import ltd.hlaeja.dto.TypeWithDescription
 import ltd.hlaeja.library.deviceRegistry.Type
 import ltd.hlaeja.service.TypeService
-import ltd.hlaeja.assertj.assertThat
+import ltd.hlaeja.test.isEqualToUuid
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
@@ -36,33 +32,61 @@ class TypeControllerTest {
     }
 
     @Test
-    fun `get all types`() = runTest {
+    fun `add type`() = runTest {
         // given
-        every { service.getTypes() } returns flowOf(TypeEntity(id, timestamp, "name"))
+        val request = Type.Request("name", "description")
-
+        coEvery { service.addType(any(), any()) } returns TypeWithDescription(id, timestamp, "name", "description")
-        // when
-        val response = controller.getTypes().single()
-
-        // then
-        verify(exactly = 1) { service.getTypes() }
-
-        assertThat(response.id).isUUID("00000000-0000-0000-0000-000000000000")
-        assertThat(response.name).isEqualTo("name")
-    }
-
-    @Test
-    fun `add types`() = runTest {
-        // given
-        val request = Type.Request("name")
-        coEvery { service.addType(any()) } returns TypeEntity(id, timestamp, "name")
 
         // when
         val response = controller.addType(request)
 
         // then
-        coVerify(exactly = 1) { service.addType(any()) }
+        coVerify(exactly = 1) { service.addType(any(), any()) }
 
-        assertThat(response.id).isUUID("00000000-0000-0000-0000-000000000000")
+        assertThat(response.id).isEqualToUuid("00000000-0000-0000-0000-000000000000")
         assertThat(response.name).isEqualTo("name")
+        assertThat(response.description).isEqualTo("description")
+    }
+
+    @Test
+    fun `get type`() = runTest {
+        // given
+        coEvery { service.getType(any()) } returns TypeWithDescription(id, timestamp, "name", "description")
+
+        // when
+        val response = controller.getType(id)
+
+        // then
+        coVerify(exactly = 1) { service.getType(any()) }
+
+        assertThat(response.id).isEqualToUuid("00000000-0000-0000-0000-000000000000")
+        assertThat(response.name).isEqualTo("name")
+        assertThat(response.description).isEqualTo("description")
+    }
+
+    @Test
+    fun `update type`() = runTest {
+        // given
+        val request = Type.Request("name", "description")
+
+        coEvery { service.updateType(any(), any(), any()) } answers { call ->
+            TypeWithDescription(
+                id = call.invocation.args[0] as UUID,
+                timestamp = timestamp,
+                name = call.invocation.args[1] as String,
+                description = call.invocation.args[2] as String,
+            )
+        }
+
+        // when
+        val response = controller.updateType(id, request)
+
+        // then
+        coVerify(exactly = 1) { service.updateType(any(), any(), any()) }
+
+        assertThat(response.id).isEqualToUuid("00000000-0000-0000-0000-000000000000")
+        assertThat(response.timestamp).isEqualTo(timestamp)
+        assertThat(response.name).isEqualTo("name")
+        assertThat(response.description).isEqualTo("description")
     }
 }

src/test/kotlin/ltd/hlaeja/controller/TypesControllerTest.kt

@@ -0,0 +1,54 @@
+package ltd.hlaeja.controller
+
+import io.mockk.every
+import io.mockk.mockk
+import io.mockk.verify
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.ZonedDateTime
+import java.util.UUID
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.single
+import kotlinx.coroutines.test.runTest
+import ltd.hlaeja.entity.TypeEntity
+import ltd.hlaeja.service.TypeService
+import ltd.hlaeja.test.isEqualToUuid
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+
+class TypesControllerTest {
+    companion object {
+        const val NAME: String = "name"
+        const val NIL_UUID: String = "00000000-0000-0000-0000-000000000000"
+        val id: UUID = UUID.fromString(NIL_UUID)
+        val timestamp: ZonedDateTime = ZonedDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0, 0, 1), ZoneId.of("UTC"))
+    }
+
+    val service: TypeService = mockk()
+
+    lateinit var controller: TypesController
+
+    @BeforeEach
+    fun setUp() {
+        controller = TypesController(service)
+    }
+
+    @Test
+    fun `get all types`() = runTest {
+        // given
+        every {
+            service.getTypes(any(), any(), any())
+        } returns flowOf(TypeEntity(id, timestamp, NAME))
+
+        // when
+        val response = controller.getTypes().single()
+
+        // then
+        verify(exactly = 1) { service.getTypes(0, 25, null) }
+
+        assertThat(response.id).isEqualToUuid(NIL_UUID)
+        assertThat(response.name).isEqualTo(NAME)
+        assertThat(response.timestamp).isEqualTo(timestamp)
+    }
+}

src/test/kotlin/ltd/hlaeja/service/DeviceServiceTest.kt

@@ -17,6 +17,8 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertThrows
+import org.springframework.web.server.ResponseStatusException
 
 class DeviceServiceTest {
     companion object {
@@ -42,7 +44,7 @@ class DeviceServiceTest {
     }
 
     @Test
-    fun `add new type success`() = runTest {
+    fun `add new device success`() = runTest {
         // given
         coEvery { repository.save(any()) } answers { call ->
             (call.invocation.args[0] as DeviceEntity).copy(id = device)
@@ -58,4 +60,37 @@ class DeviceServiceTest {
         assertThat(result.timestamp.toString()).isEqualTo("2000-01-01T00:00:00.001Z[UTC]")
         assertThat(result.type).isEqualTo(type)
     }
+
+    @Test
+    fun `get device - success`() = runTest {
+        // given
+        val device = UUID.fromString("00000000-0000-0000-0000-000000000000")
+        val entity: DeviceEntity = mockk()
+
+        coEvery { repository.findById(any()) } returns entity
+        coEvery { entity.id } returns device
+
+        // when
+        val result = service.getDevice(type)
+
+        // then
+        coVerify(exactly = 1) { repository.findById(any()) }
+        assertThat(result.id).isEqualTo(device)
+    }
+
+    @Test
+    fun `get device - fail not found`() = runTest {
+        // given
+        val device = UUID.fromString("00000000-0000-0000-0000-000000000000")
+
+        coEvery { repository.findById(any()) } returns null
+
+        // when
+        val exception = assertThrows<ResponseStatusException> {
+            service.getDevice(device)
+        }
+
+        // then
+        assertThat(exception.message).isEqualTo("404 NOT_FOUND")
+    }
 }

src/test/kotlin/ltd/hlaeja/service/JwtServiceTest.kt

@@ -1,31 +0,0 @@
-package ltd.hlaeja.service
-
-import java.util.UUID
-import kotlinx.coroutines.test.runTest
-import ltd.hlaeja.property.JwtProperty
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-
-class JwtServiceTest {
-
-    val property: JwtProperty = JwtProperty("keys/valid-private-key.pem")
-    lateinit var service: JwtService
-
-    @BeforeEach
-    fun setUp() {
-        service = JwtService(property)
-    }
-
-    @Test
-    fun `should generate a JWT successfully with a valid private key`() = runTest {
-        // given
-        val deviceId = UUID.fromString("00000000-0000-0000-0000-000000000000")
-
-        // when
-        val jwt = service.makeIdentity(deviceId)
-
-        // then
-        assertThat(jwt).contains("eyJkZXZpY2UiOiIwMDAwMDAwMC0wMDAwLTAwMDAtMDAwMC0wMDAwMDAwMDAwMDAifQ")
-    }
-}

src/test/kotlin/ltd/hlaeja/service/TypeServiceTest.kt

@@ -4,76 +4,321 @@ import io.mockk.coEvery
 import io.mockk.coVerify
 import io.mockk.every
 import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.unmockkStatic
 import io.mockk.verify
-import java.time.Instant
+import java.time.LocalDateTime
 import java.time.ZoneId
 import java.time.ZonedDateTime
 import java.util.UUID
 import kotlin.test.assertFailsWith
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.runTest
+import ltd.hlaeja.dto.TypeWithDescription
+import ltd.hlaeja.entity.TypeDescriptionEntity
 import ltd.hlaeja.entity.TypeEntity
+import ltd.hlaeja.repository.TypeDescriptionRepository
 import ltd.hlaeja.repository.TypeRepository
+import ltd.hlaeja.test.isEqualToUuid
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.springframework.dao.DuplicateKeyException
+import org.springframework.http.HttpStatus.ACCEPTED
+import org.springframework.http.HttpStatus.CONFLICT
+import org.springframework.http.HttpStatus.EXPECTATION_FAILED
+import org.springframework.http.HttpStatus.NOT_FOUND
 import org.springframework.web.server.ResponseStatusException
 
 class TypeServiceTest {
+
     companion object {
-        val timestamp = ZonedDateTime.ofInstant(Instant.parse("2000-01-01T00:00:00.001Z"), ZoneId.of("UTC"))
+        val timestamp: ZonedDateTime = ZonedDateTime.of(LocalDateTime.of(2000, 1, 1, 0, 0, 0, 1), ZoneId.of("UTC"))
         val uuid = UUID.fromString("00000000-0000-0000-0000-000000000000")
     }
 
-    val repository: TypeRepository = mockk()
+    val typeRepository: TypeRepository = mockk()
+    val typeDescriptionRepository: TypeDescriptionRepository = mockk()
 
     lateinit var service: TypeService
 
     @BeforeEach
     fun setUp() {
-        service = TypeService(repository)
+        service = TypeService(typeRepository, typeDescriptionRepository)
+
+        mockkStatic(ZonedDateTime::class)
+        every { ZonedDateTime.now() } returns timestamp
+    }
+
+    @AfterEach
+    fun tearDown() {
+        unmockkStatic(ZonedDateTime::class)
     }
 
     @Test
     fun `get all types`() {
         // given
-        every { repository.findAll() } returns flowOf(mockk<TypeEntity>())
+        every { typeRepository.findAll(any(), any()) } returns flowOf(mockk<TypeEntity>())
 
         // when
-        service.getTypes()
+        service.getTypes(1, 10, null)
 
         // then
-        verify(exactly = 1) { repository.findAll() }
+        verify(exactly = 1) { typeRepository.findAll(1, 10) }
+        verify(exactly = 0) { typeRepository.findAllContaining(any(), any(), any()) }
+    }
+
+    @Test
+    fun `get all types with filter`() {
+        // given
+        every { typeRepository.findAllContaining(any(), any(), any()) } returns flowOf(mockk<TypeEntity>())
+
+        // when
+        service.getTypes(1, 10, "abc")
+
+        // then
+        verify(exactly = 1) { typeRepository.findAllContaining("%abc%", 1, 10) }
+        verify(exactly = 0) { typeRepository.findAll(any(), any()) }
     }
 
     @Test
     fun `add new type success`() = runTest {
         // given
-        val entity = TypeEntity(
+        coEvery { typeRepository.save(any()) } answers { call ->
-            null,
+            (call.invocation.args[0] as TypeEntity).copy(id = uuid)
-            timestamp,
+        }
-            "name",
+        coEvery { typeDescriptionRepository.upsert(any(), any()) } answers { call ->
-        )
+            TypeDescriptionEntity(
-
+                typeId = call.invocation.args[0] as UUID,
-        coEvery { repository.save(any()) } answers { call -> (call.invocation.args[0] as TypeEntity).copy(id = uuid) }
+                description = call.invocation.args[1] as String,
+            )
+        }
 
         // when
-        service.addType(entity)
+        val result = service.addType("name", "description")
 
         // then
-        coVerify(exactly = 1) { repository.save(any()) }
+        coVerify(exactly = 1) { typeRepository.save(any()) }
+        coVerify(exactly = 1) { typeDescriptionRepository.upsert(any(), any()) }
+
+        assertThat(result.id).isEqualToUuid("00000000-0000-0000-0000-000000000000")
+        assertThat(result.timestamp).isEqualTo(timestamp)
+        assertThat(result.name).isEqualTo("name")
+        assertThat(result.description).isEqualTo("description")
     }
 
     @Test
-    fun `add new type exception`() = runTest {
+    fun `add new type - fail this should never happen save not updating id`() = runTest {
         // given
-        val entity: TypeEntity = mockk()
+        coEvery { typeRepository.save(any()) } answers { call -> call.invocation.args[0] as TypeEntity }
 
-        coEvery { repository.save(any()) } throws DuplicateKeyException("duplicate key")
+        // when exception
-
+        val response: ResponseStatusException = assertFailsWith<ResponseStatusException> {
-        // then exception
+            service.addType("name", "description")
-        assertFailsWith<ResponseStatusException> {
-            service.addType(entity)
         }
+
+        // then
+        coVerify(exactly = 1) { typeRepository.save(any()) }
+        coVerify(exactly = 0) { typeDescriptionRepository.upsert(any(), any()) }
+
+        assertThat(response.statusCode).isEqualTo(EXPECTATION_FAILED)
+    }
+
+    @Test
+    fun `add new type - fail duplicate key`() = runTest {
+        // given
+        coEvery { typeRepository.save(any()) } throws DuplicateKeyException("duplicate key")
+
+        // when exception
+        val response: ResponseStatusException = assertFailsWith<ResponseStatusException> {
+            service.addType("name", "description")
+        }
+
+        // then
+        coVerify(exactly = 1) { typeRepository.save(any()) }
+        coVerify(exactly = 0) { typeDescriptionRepository.upsert(any(), any()) }
+
+        assertThat(response.statusCode).isEqualTo(CONFLICT)
+    }
+
+    @Test
+    fun `get type - success`() = runTest {
+        // given
+        coEvery { typeRepository.findTypeWithDescription(any()) } answers { call ->
+            TypeWithDescription(
+                id = call.invocation.args[0] as UUID,
+                timestamp = timestamp,
+                name = "name",
+                description = "description",
+            )
+        }
+
+        // when
+        val result = service.getType(uuid)
+
+        // then
+        coVerify(exactly = 1) { typeRepository.findTypeWithDescription(any()) }
+
+        assertThat(result.id).isEqualToUuid("00000000-0000-0000-0000-000000000000")
+        assertThat(result.timestamp).isEqualTo(timestamp)
+        assertThat(result.name).isEqualTo("name")
+        assertThat(result.description).isEqualTo("description")
+    }
+
+    @Test
+    fun `get type - fail`() = runTest {
+        // given
+        coEvery { typeRepository.findTypeWithDescription(any()) } returns null
+
+        // when exception
+        val response: ResponseStatusException = assertFailsWith<ResponseStatusException> {
+            service.getType(uuid)
+        }
+
+        // then
+        coVerify(exactly = 1) { typeRepository.findTypeWithDescription(any()) }
+
+        assertThat(response.statusCode).isEqualTo(NOT_FOUND)
+    }
+
+    @Test
+    fun `update type - success`() = runTest {
+        // given
+        coEvery { typeRepository.findById(any()) } answers { call ->
+            TypeEntity(
+                id = call.invocation.args[0] as UUID,
+                timestamp = timestamp,
+                name = "name",
+            )
+        }
+        coEvery { typeRepository.save(any()) } answers { call ->
+            call.invocation.args[0] as TypeEntity
+        }
+        coEvery { typeDescriptionRepository.findById(any()) } answers { call ->
+            TypeDescriptionEntity(
+                typeId = call.invocation.args[0] as UUID,
+                description = "description",
+            )
+        }
+        coEvery { typeDescriptionRepository.save(any()) } answers { call ->
+            call.invocation.args[0] as TypeDescriptionEntity
+        }
+
+        // when
+        val result = service.updateType(uuid, "new-name", "new-description")
+
+        // then
+        coVerify(exactly = 1) { typeRepository.findById(any()) }
+        coVerify(exactly = 1) { typeRepository.save(any()) }
+        coVerify(exactly = 1) { typeDescriptionRepository.findById(any()) }
+        coVerify(exactly = 1) { typeDescriptionRepository.save(any()) }
+
+        assertThat(result.id).isEqualToUuid("00000000-0000-0000-0000-000000000000")
+        assertThat(result.timestamp).isEqualTo(timestamp)
+        assertThat(result.name).isEqualTo("new-name")
+        assertThat(result.description).isEqualTo("new-description")
+    }
+
+    @Test
+    fun `update type - success no change`() = runTest {
+        // given
+        coEvery { typeRepository.findById(any()) } answers { call ->
+            TypeEntity(
+                id = call.invocation.args[0] as UUID,
+                timestamp = timestamp,
+                name = "name",
+            )
+        }
+        coEvery { typeDescriptionRepository.findById(any()) } answers { call ->
+            TypeDescriptionEntity(
+                typeId = call.invocation.args[0] as UUID,
+                description = "description",
+            )
+        }
+
+        // when exception
+        val response: ResponseStatusException = assertFailsWith<ResponseStatusException> {
+            service.updateType(uuid, "name", "description")
+        }
+
+        // then
+        coVerify(exactly = 1) { typeRepository.findById(any()) }
+        coVerify(exactly = 0) { typeRepository.save(any()) }
+        coVerify(exactly = 1) { typeDescriptionRepository.findById(any()) }
+        coVerify(exactly = 0) { typeDescriptionRepository.save(any()) }
+
+        assertThat(response.statusCode).isEqualTo(ACCEPTED)
+    }
+
+    @Test
+    fun `update type - fail type dont exist`() = runTest {
+        // given
+        coEvery { typeRepository.findById(any()) } returns null
+
+        // when exception
+        val response: ResponseStatusException = assertFailsWith<ResponseStatusException> {
+            service.updateType(uuid, "name", "description")
+        }
+
+        // then
+        coVerify(exactly = 1) { typeRepository.findById(any()) }
+        coVerify(exactly = 0) { typeRepository.save(any()) }
+        coVerify(exactly = 0) { typeDescriptionRepository.findById(any()) }
+        coVerify(exactly = 0) { typeDescriptionRepository.save(any()) }
+
+        assertThat(response.statusCode).isEqualTo(NOT_FOUND)
+    }
+
+    @Test
+    fun `update type - fail type description dont exist`() = runTest {
+        // given
+        coEvery { typeRepository.findById(any()) } answers { call ->
+            TypeEntity(
+                id = call.invocation.args[0] as UUID,
+                timestamp = timestamp,
+                name = "name",
+            )
+        }
+        coEvery { typeDescriptionRepository.findById(any()) } returns null
+
+        // when exception
+        val response: ResponseStatusException = assertFailsWith<ResponseStatusException> {
+            service.updateType(uuid, "name", "description")
+        }
+
+        // then
+        coVerify(exactly = 1) { typeRepository.findById(any()) }
+        coVerify(exactly = 0) { typeRepository.save(any()) }
+        coVerify(exactly = 1) { typeDescriptionRepository.findById(any()) }
+        coVerify(exactly = 0) { typeDescriptionRepository.save(any()) }
+
+        assertThat(response.statusCode).isEqualTo(NOT_FOUND)
+    }
+
+    @Test
+    fun `update type - fail name already exists`() = runTest {
+        // given
+        coEvery { typeRepository.findById(any()) } answers { call ->
+            TypeEntity(
+                id = call.invocation.args[0] as UUID,
+                timestamp = timestamp,
+                name = "name",
+            )
+        }
+        coEvery { typeRepository.save(any()) } throws DuplicateKeyException("duplicate key")
+
+        // when exception
+        val response: ResponseStatusException = assertFailsWith<ResponseStatusException> {
+            service.updateType(uuid, "taken-name", "description")
+        }
+
+        // then
+        coVerify(exactly = 1) { typeRepository.findById(any()) }
+        coVerify(exactly = 1) { typeRepository.save(any()) }
+        coVerify(exactly = 0) { typeDescriptionRepository.findById(any()) }
+        coVerify(exactly = 0) { typeDescriptionRepository.save(any()) }
+
+        assertThat(response.statusCode).isEqualTo(CONFLICT)
     }
 }

src/test/kotlin/ltd/hlaeja/util/MappingKtTest.kt

@@ -1,6 +1,7 @@
 package ltd.hlaeja.util
 
 import io.mockk.every
+import io.mockk.mockk
 import io.mockk.mockkStatic
 import io.mockk.unmockkStatic
 import java.time.LocalDateTime
@@ -8,11 +9,14 @@ import java.time.ZoneId
 import java.time.ZonedDateTime
 import java.util.UUID
 import kotlin.test.Test
-import ltd.hlaeja.assertj.assertThat
+import ltd.hlaeja.dto.TypeWithDescription
+import ltd.hlaeja.entity.DeviceEntity
 import ltd.hlaeja.entity.NodeEntity
 import ltd.hlaeja.entity.TypeEntity
-import ltd.hlaeja.library.deviceRegistry.Type
+import ltd.hlaeja.jwt.service.PrivateJwtService
 import ltd.hlaeja.library.deviceRegistry.Node
+import ltd.hlaeja.library.deviceRegistry.Type
+import ltd.hlaeja.test.isEqualToUuid
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Assertions.assertThrows
@@ -40,23 +44,82 @@ class MappingKtTest {
     inner class TypeMapping {
 
         @Test
-        fun `request to entity successful`() {
+        fun `request to type entity successful`() {
             // given
+            val id = UUID.fromString("00000000-0000-0000-0000-000000000001")
             val request = Type.Request(
-                "test",
+                "name",
+                "description",
             )
 
             // when
-            val result = request.toTypeEntity()
+            val entity = request.toTypeEntity(id)
 
             // then
-            assertThat(result.id).isNull()
+            assertThat(entity.id).isEqualToUuid("00000000-0000-0000-0000-000000000001")
-            assertThat(result.timestamp.toString()).isEqualTo("2000-01-01T00:00:00.000000001Z[UTC]")
+            assertThat(entity.timestamp).isEqualTo(timestamp)
-            assertThat(result.name).isEqualTo("test")
+            assertThat(entity.name).isEqualTo("name")
         }
 
         @Test
-        fun `entity to response successful`() {
+        fun `request to type description entity successful`() {
+            // given
+            val id = UUID.fromString("00000000-0000-0000-0000-000000000001")
+            val request = Type.Request(
+                "name",
+                "description",
+            )
+
+            // when
+            val entity = request.toTypeDescriptionEntity(id)
+
+            // then
+            assertThat(entity.typeId).isEqualToUuid("00000000-0000-0000-0000-000000000001")
+            assertThat(entity.description).isEqualTo("description")
+        }
+
+        @Test
+        fun `type with description to response successful`() {
+            // given
+            val typeWithDescription = TypeWithDescription(
+                UUID.fromString("00000000-0000-0000-0000-000000000001"),
+                timestamp,
+                "name",
+                "description",
+            )
+
+            // when
+            val response = typeWithDescription.toTypeResponse()
+
+            // then
+            assertThat(response.id).isEqualToUuid("00000000-0000-0000-0000-000000000001")
+            assertThat(response.timestamp).isEqualTo(timestamp)
+            assertThat(response.name).isEqualTo("name")
+            assertThat(response.description).isEqualTo("description")
+        }
+
+        @Test
+        fun `type with description to response, description null successful`() {
+            // given
+            val typeWithDescription = TypeWithDescription(
+                UUID.fromString("00000000-0000-0000-0000-000000000001"),
+                timestamp,
+                "name",
+                null,
+            )
+
+            // when
+            val response = typeWithDescription.toTypeResponse()
+
+            // then
+            assertThat(response.id).isEqualToUuid("00000000-0000-0000-0000-000000000001")
+            assertThat(response.timestamp).isEqualTo(timestamp)
+            assertThat(response.name).isEqualTo("name")
+            assertThat(response.description).isEmpty()
+        }
+
+        @Test
+        fun `type entity to response successful`() {
             // given
             val entity = TypeEntity(
                 UUID.fromString("00000000-0000-0000-0000-000000000000"),
@@ -65,20 +128,13 @@ class MappingKtTest {
             )
 
             // when
-            val response = entity.toTypeResponse()
+            val response = entity.toTypesResponse()
 
             // then
-            assertThat(response.id).isUUID("00000000-0000-0000-0000-000000000000")
+            assertThat(response.id).isEqualToUuid("00000000-0000-0000-0000-000000000000")
+            assertThat(response.timestamp).isEqualTo(timestamp)
             assertThat(response.name).isEqualTo("name")
         }
-
-        @Test
-        fun `entity to response exception`() {
-            // then exception
-            assertThrows(ResponseStatusException::class.java) {
-                TypeEntity(null, timestamp, "name").toTypeResponse()
-            }
-        }
     }
 
     @Nested
@@ -98,7 +154,7 @@ class MappingKtTest {
 
             // then
             assertThat(result.id).isNull()
-            assertThat(result.timestamp.toString()).isEqualTo("2000-01-01T00:00:00.000000001Z[UTC]")
+            assertThat(result.timestamp).isEqualTo(timestamp)
             assertThat(result.client.toString()).isEqualTo("00000000-0000-0000-0000-000000000001")
             assertThat(result.device.toString()).isEqualTo("00000000-0000-0000-0000-000000000002")
             assertThat(result.name).isEqualTo("test")
@@ -119,9 +175,9 @@ class MappingKtTest {
             val result = entity.toNodeResponse()
 
             // then
-            assertThat(result.id).isUUID("00000000-0000-0000-0000-000000000001")
+            assertThat(result.id).isEqualToUuid("00000000-0000-0000-0000-000000000001")
-            assertThat(result.client).isUUID("00000000-0000-0000-0000-000000000002")
+            assertThat(result.client).isEqualToUuid("00000000-0000-0000-0000-000000000002")
-            assertThat(result.device).isUUID("00000000-0000-0000-0000-000000000003")
+            assertThat(result.device).isEqualToUuid("00000000-0000-0000-0000-000000000003")
             assertThat(result.name).isEqualTo("test")
         }
 
@@ -164,9 +220,9 @@ class MappingKtTest {
             val result = entity.toIdentityResponse()
 
             // then
-            assertThat(result.node).isUUID("00000000-0000-0000-0000-000000000001")
+            assertThat(result.node).isEqualToUuid("00000000-0000-0000-0000-000000000001")
-            assertThat(result.client).isUUID("00000000-0000-0000-0000-000000000002")
+            assertThat(result.client).isEqualToUuid("00000000-0000-0000-0000-000000000002")
-            assertThat(result.device).isUUID("00000000-0000-0000-0000-000000000003")
+            assertThat(result.device).isEqualToUuid("00000000-0000-0000-0000-000000000003")
         }
 
         @Test
@@ -189,4 +245,48 @@ class MappingKtTest {
             assertThat(exception.message).isEqualTo("417 EXPECTATION_FAILED")
         }
     }
+
+    @Nested
+    inner class DeviceMapping {
+
+        val jwtService: PrivateJwtService = mockk()
+
+        @Test
+        fun `entity to identity response successful`() {
+            // given
+            val entity = DeviceEntity(
+                UUID.fromString("00000000-0000-0000-0000-000000000001"),
+                timestamp,
+                UUID.fromString("00000000-0000-0000-0000-000000000002"),
+            )
+
+            every { jwtService.sign(any()) } returns "header.payload.signature"
+
+            // when
+            val result = entity.toDeviceResponse(jwtService)
+
+            // then
+            assertThat(result.id).isEqualToUuid("00000000-0000-0000-0000-000000000001")
+            assertThat(result.type).isEqualToUuid("00000000-0000-0000-0000-000000000002")
+            assertThat(result.identity).isEqualTo("header.payload.signature")
+        }
+
+        @Test
+        fun `entity to identity response exception`() {
+            // given
+            val entity = DeviceEntity(
+                null,
+                timestamp,
+                UUID.fromString("00000000-0000-0000-0000-000000000002"),
+            )
+
+            // then exception
+            val exception = assertThrows(ResponseStatusException::class.java) {
+                entity.toDeviceResponse(jwtService)
+            }
+
+            // then
+            assertThat(exception.message).isEqualTo("417 EXPECTATION_FAILED")
+        }
+    }
 }

src/test/kotlin/ltd/hlaeja/util/PrivateKeyProviderTest.kt

@@ -1,51 +0,0 @@
-package ltd.hlaeja.util
-
-import java.security.interfaces.RSAPrivateKey
-import ltd.hlaeja.exception.KeyProviderException
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.assertThrows
-
-class PrivateKeyProviderTest {
-
-    @Test
-    fun `load private key - success`() {
-        // given
-        val pemFilePath = "keys/valid-private-key.pem"
-
-        // when
-        val privateKey: RSAPrivateKey = PrivateKeyProvider.load(pemFilePath)
-
-        // then
-        assertThat(privateKey).isNotNull
-        assertThat(privateKey.algorithm).isEqualTo("RSA")
-    }
-
-    @Test
-    fun `load private key - file does not exist`() {
-        // given
-        val nonExistentPemFilePath = "keys/non-existent.pem"
-
-        // when exception
-        val exception = assertThrows<KeyProviderException> {
-            PrivateKeyProvider.load(nonExistentPemFilePath)
-        }
-
-        // then
-        assertThat(exception.message).isEqualTo("Could not load private key")
-    }
-
-    @Test
-    fun `load private key - file is invalid`() {
-        // given
-        val invalidPemFilePath = "keys/invalid-private-key.pem"
-
-        // when exception
-        val exception = assertThrows<IllegalArgumentException> {
-            PrivateKeyProvider.load(invalidPemFilePath)
-        }
-
-        // then
-        assertThat(exception.message).contains("Input byte array has wrong 4-byte ending unit")
-    }
-}

src/test/resources/application.yml

@@ -1,8 +0,0 @@
-jwt:
-  private-key: keys/valid-private-key.pem
-
-spring:
-  r2dbc:
-    url: r2dbc:postgresql://placeholder
-    username: placeholder
-    password: placeholder

src/test/resources/keys/invalid-private-key.pem

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-VEhJUyBJUyBKVU5LIFRISVMgSVMgSlVOSyBUSElTIElTIEpVTksgVEhJUyBJUyBK
-VU5LIFRISVMgSVMgSlVOSyBUSElTIElTIEpVTksgVEhJUyBJUyBKVU5LIFRISVMg
-SVMgSlVOSyBUSElTIElTIEpVTksgVEhJUyBJUyBKVU5LIFRISVMgSVMgSlVOSyBU
-SElTIElTIEpVTksgVEhJUyBJUyBKVU5LIFRISVMgSVMgSlVOSyBUSElTIElTIEpV
-TksgVEhJUyBJUyBKVU5LIFRISVMgSVMgSlVOSyBUSElTIElTIEpVTksgVEhJUyBJ
-UyBKVU5LIFRISVMgSVMgSlVOSyBUSElTIElTIEpVTksgVEhJUyBJUyBKVU5LIFRI
-SVMgSVMgSlVOSyBUSElTIElTIEpVTksgVEhJUyBJUyBKVU5LIFRISVMgSVMgSlVO
-SyBUSElTIElTIEpVTksgVEhJUyBJUyBKVU5LIFRISVMgSVMgSlVOSyBUSElTIElT
-IEpVTksgVEhJUyBJUyBKVU5LIFRISVMgSVMgSlVOSyBUSElTIElTIEpVTksgVEhJ
-UyBJUyBKVU5LIFRISVMgSVMgSlVOSyBUSElTIElTIEpVTksgVEhJUyBJUyBKVU5L
-IFRISVMgSVMgSlVOSyBUSElTIElTIEpVTksgVEhJUyBJUyBKVU5LIFRISVMgSVMg
-SlVOSyBUSElTIElTIEpVTksgVEhJUyBJUyBKVU5LIFRISVMgSVMgSlVOSyBUSElT
-IElTIEpVTksgVEhJUyBJUyBKVU5LIFRISVMgSVMgSlVOSyBUSElTIElTIEpVTksg
-VEhJUyBJUyBKVU5LIFRISVMgSVMgSlVOSyBUSElTIElTIEpVTksgVEhJUyBJUyBK
-VU5LIFRISVMgSVMgSlVOSyBUSElTIElTIEpVTksgVEhJUyBJUyBKVU5LIFRISVMg
-SVMgSlVOSyBUSElTIElTIEpVTksgVEhJUyBJUyBKVU5LIFRISVMgSVMgSlVOSyBU
-SElTIElTIEpVTksgVEhJUyBJUyBKVU5LIFRISVMgSVMgSlVOSyBUSElTIElTIEpV
-TksgVEhJUyBJUyBKVU5LIFRISVMgSVMgSlVOSyBUSElTIElTIEpVTksgVEhJUyBJ
-UyBKVU5LIFRISVMgSVMgSlVOSyBUSElTIElTIEpVTksgVEhJUyBJUyBKVU5LIFRI
-SVMgSVMgSlVOSyBUSElTIElTIEpVTksgVEhJUyBJUyBKVU5LIFRISVMgSVMgSlVO
-SyBUSElTIElTIEpVTksgVEhJUyBJUyBKVU5LIFRISVMgSVMgSlVOSyBUSElTIElT
-IEpVTksgVEhJUyBJUyBKVU5LIFRISVMgSVMgSlVOSyBUSElTIElTIEpVTksgVEhJ
-UyBJUyBKVU5LIFRISVMgSVMgSlVOSyBUSElTIElTIEpVTksgVEhJUyBJUyBKVU5L
-IFRISVMgSVMgSlVOSyBUSElTIElTIEpVTksgVEhJUyBJUyBKVU5LIFRISVMgSVMg
-SlVOSyBUSElTIElTIEpVTksgVEhJUyBJUyBKVU5LIFRISVMgSVMgSlVOSyBUSElT
-IElTIEpVTksg==
------END PRIVATE KEY-----