chore: when client is deleted respective identifier is deleted as well (

#1941) Refs: XRDDEV-2561
nordic-institute · Jan 26, 2024 · c2ee1c1 · c2ee1c1
1 parent 9490033
commit c2ee1c1
Show file tree

Hide file tree

Showing 4 changed files with 186 additions and 99 deletions.
diff --git a/doc/DataModels/dm-ss_x-road_security_server_configuration_data_model.md b/doc/DataModels/dm-ss_x-road_security_server_configuration_data_model.md
@@ -1,6 +1,6 @@
 # X-Road: Security Server Configuration Data Model
 
-Version: 1.9  
+Version: 1.10  
 Doc. ID: DM-SS
 
 ## Version history
@@ -20,6 +20,7 @@ Doc. ID: DM-SS
 | 26.09.2022 | 1.7     | Remove Ubuntu 18.04 support                                         | Andres Rosenthal                |
 | 10.05.2023 | 1.8     | Security Categories removed.                                        | Justas Samuolis                 |
 | 08.12.2023 | 1.9     | Added "Disabled" and related "in progress" client states            | Madis Loitmaa                   |
+| 26.01.2024 | 1.10    | When client is deleted, respective identifier is deleted as well    | Eneli Reimets                   |
 
 ## Table of Contents
 <!-- vim-markdown-toc GFM -->
@@ -299,7 +300,7 @@ Operations (insertions, updates and deletions of records) on the tables of this
 
 ### 2.10 IDENTIFIER
 
-Identifier that can be used to identify various objects on X-Road. An identifier record is only created together with records of other entities and only one record of each identifier is ever created. For example, if a security server client record is created and its identifier is not found among identifier records, new one is created. The record is never modified or deleted.
+Identifier that can be used to identify various objects on X-Road. An identifier record is only created together with records of other entities and only one record of each identifier is ever created. For example, if a security server client record is created and its identifier is not found among identifier records, new one is created. The record is never modified or deleted. An exception, when an entity of client is deleted, respective identifier is deleted as well.
 
 #### 2.10.1 Attributes
 

diff --git a/.../src/main/java/org/niis/xroad/securityserver/restapi/repository/IdentifierRepository.java b/.../src/main/java/org/niis/xroad/securityserver/restapi/repository/IdentifierRepository.java
@@ -87,6 +87,10 @@ public void saveOrUpdate(Collection<XRoadId.Conf> identifiers) {
         }
     }
 
+    public void remove(XRoadId.Conf identifier) {
+        persistenceUtils.getCurrentSession().remove(identifier);
+    }
+
     /**
      * return all identifiers
      */

diff --git a/...pplication/src/main/java/org/niis/xroad/securityserver/restapi/service/ClientService.java b/...pplication/src/main/java/org/niis/xroad/securityserver/restapi/service/ClientService.java
@@ -825,11 +825,15 @@ public void deleteLocalClient(ClientId clientId) throws ActionNotPossibleExcepti
         if (!allowedStatuses.contains(clientType.getClientStatus())) {
             throw new ActionNotPossibleException("cannot delete client with status " + clientType.getClientStatus());
         }
+        removeLocalClient(clientType);
+    }
 
+    private void removeLocalClient(ClientType clientType) {
         ServerConfType serverConfType = serverConfService.getServerConf();
         if (!serverConfType.getClient().remove(clientType)) {
-            throw new RuntimeException("client to be deleted was somehow missing from serverconf");
+            throw new RuntimeException("client to be deleted was somehow missing from server conf");
         }
+        identifierRepository.remove(clientType.getIdentifier());
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up @@
             }
         }
+        public void remove(XRoadId.Conf identifier) {
+            persistenceUtils.getCurrentSession().remove(identifier);
+        }
         /**
          * return all identifiers
          */
@@ Expand Down @@