WIP

aservo · Nov 7, 2023 · d74c681 · d74c681
1 parent 272f667
commit d74c681
Show file tree

Hide file tree

Showing 8 changed files with 333 additions and 26 deletions.
diff --git a/index.adoc b/index.adoc
@@ -3402,6 +3402,18 @@ endif::internal-generation[]
 | 
 |  
 
+| groups 
+|  
+| List  of <<GroupBean>> 
+| 
+|  
+
+| users 
+|  
+| List  of <<UserBean>> 
+| 
+|  
+
 | schema 
 |  
 | DirectoryLdapSchema  
@@ -4205,6 +4217,18 @@ endif::internal-generation[]
 | 
 |  
 
+| groups 
+|  
+| List  of <<GroupBean>> 
+| 
+|  
+
+| users 
+|  
+| List  of <<UserBean>> 
+| 
+|  
+
 |===
 
 
@@ -4515,6 +4539,37 @@ endif::internal-generation[]
 |===
 
 
+[#GroupBean]
+=== _GroupBean_ 
+
+
+
+[.fields-GroupBean]
+[cols="2,1,2,4,1"]
+|===         
+| Field Name| Required| Type| Description| Format
+
+| name 
+|  
+| String  
+| 
+|  
+
+| description 
+|  
+| String  
+| 
+|  
+
+| active 
+|  
+| Boolean  
+| 
+|  
+
+|===
+
+
 [#LicenseBean]
 === _LicenseBean_ 
 
@@ -4813,6 +4868,18 @@ endif::internal-generation[]
 | 
 |  
 
+| firstName 
+|  
+| String  
+| 
+|  
+
+| lastName 
+|  
+| String  
+| 
+|  
+
 | fullName 
 |  
 | String  
@@ -4831,6 +4898,12 @@ endif::internal-generation[]
 | 
 |  
 
+| groups 
+|  
+| List  of <<GroupBean>> 
+| 
+|  
+
 |===
 
 
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>confapi-crowd-plugin</artifactId>
-    <version>0.2.2-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
     <packaging>atlassian-plugin</packaging>
 
     <name>ConfAPI for Crowd</name>
@@ -66,7 +66,7 @@
         <amps.version>8.0.2</amps.version>
         <atlassian.plugin.key>${project.groupId}.${project.artifactId}</atlassian.plugin.key>
         <atlassian.spring.scanner.version>2.1.5</atlassian.spring.scanner.version>
-        <confapi-commons.version>0.1.1</confapi-commons.version>
+        <confapi-commons.version>0.2.0-SNAPSHOT</confapi-commons.version>
         <plugin.testrunner.version>2.0.1</plugin.testrunner.version>
         <!-- Compiler must be 8 so that the plugin can run on Crowd instances using Java 8 -->
         <maven.compiler.source>8</maven.compiler.source>

diff --git a/src/main/java/de/aservo/confapi/crowd/exception/NotFoundExceptionForDirectory.java b/src/main/java/de/aservo/confapi/crowd/exception/NotFoundExceptionForDirectory.java
@@ -0,0 +1,26 @@
+package de.aservo.confapi.crowd.exception;
+
+import de.aservo.confapi.commons.exception.NotFoundException;
+import de.aservo.confapi.commons.model.AbstractDirectoryBean;
+
+public class NotFoundExceptionForDirectory extends NotFoundException {
+
+    public NotFoundExceptionForDirectory(
+            final AbstractDirectoryBean directoryBean) {
+
+        this(directoryBean.getName());
+    }
+
+    public NotFoundExceptionForDirectory(
+            final String name) {
+
+        super(String.format("Directory with name '%s' could not be found", name));
+    }
+
+    public NotFoundExceptionForDirectory(
+            final long id) {
+
+        super(String.format("Directory with id '%s' could not be found", id));
+    }
+
+}
diff --git a/src/main/java/de/aservo/confapi/crowd/exception/NotFoundExceptionForUser.java b/src/main/java/de/aservo/confapi/crowd/exception/NotFoundExceptionForUser.java
@@ -0,0 +1,20 @@
+package de.aservo.confapi.crowd.exception;
+
+import de.aservo.confapi.commons.exception.NotFoundException;
+import de.aservo.confapi.commons.model.UserBean;
+
+public class NotFoundExceptionForUser extends NotFoundException {
+
+    public NotFoundExceptionForUser(
+            final UserBean userBean) {
+
+        this(userBean.getUsername());
+    }
+
+    public NotFoundExceptionForUser(
+            final String name) {
+
+        super(String.format("User with name '%s' could not be found", name));
+    }
+
+}
diff --git a/src/main/java/de/aservo/confapi/crowd/service/DirectoriesServiceImpl.java b/src/main/java/de/aservo/confapi/crowd/service/DirectoriesServiceImpl.java
@@ -16,7 +16,9 @@
 import de.aservo.confapi.commons.exception.ServiceUnavailableException;
 import de.aservo.confapi.commons.model.AbstractDirectoryBean;
 import de.aservo.confapi.commons.model.DirectoriesBean;
+import de.aservo.confapi.commons.model.DirectoryInternalBean;
 import de.aservo.confapi.commons.service.api.DirectoriesService;
+import de.aservo.confapi.commons.service.api.UsersService;
 import de.aservo.confapi.crowd.model.util.DirectoryBeanUtil;
 import org.springframework.stereotype.Component;
 
@@ -40,11 +42,16 @@ public class DirectoriesServiceImpl implements DirectoriesService {
     @ComponentImport
     private final DirectoryManager directoryManager;
 
+    @ComponentImport
+    private final UsersService usersService;
+
     @Inject
     public DirectoriesServiceImpl(
-            final DirectoryManager directoryManager) {
+            final DirectoryManager directoryManager,
+            final UsersService usersService) {
 
         this.directoryManager = directoryManager;
+        this.usersService = usersService;
     }
 
     @Override
@@ -89,11 +96,12 @@ public AbstractDirectoryBean setDirectory(
             final boolean testConnection) {
 
         final Directory existingDirectory = findDirectory(id);
+        final AbstractDirectoryBean resultDirectoryBean;
 
         try {
             final Directory mergedDirectory = DirectoryBeanUtil.toDirectory(directoryBean, existingDirectory);
             final Directory updatedDirectory = directoryManager.updateDirectory(mergedDirectory);
-            return DirectoryBeanUtil.toDirectoryInternalBean(updatedDirectory);
+            resultDirectoryBean = DirectoryBeanUtil.toDirectoryBean(updatedDirectory);
         } catch (DirectoryBeanUtil.UnsupportedDirectoryBeanException e) {
             throw new BadRequestException(String.format(
                     "Setting directory type '%s' is not supported (yet)", e.getMessage()));
@@ -102,23 +110,43 @@ public AbstractDirectoryBean setDirectory(
             throw new InternalServerErrorException(String.format(
                     "When trying to update directory '%s', it could not be found anymore", existingDirectory.getName()));
         }
+
+        if (DirectoryInternalBean.class.equals(directoryBean.getClass()) && directoryBean.getClass().equals(resultDirectoryBean.getClass())) {
+            final DirectoryInternalBean directoryInternalBean = (DirectoryInternalBean) directoryBean;
+            final DirectoryInternalBean resultDirectoryInternalBean = (DirectoryInternalBean) resultDirectoryBean;
+
+            resultDirectoryInternalBean.setUsers(usersService.setUsers(directoryInternalBean.getId(), directoryInternalBean.getUsers()));
+        }
+
+        return resultDirectoryBean;
     }
 
     @Override
     public AbstractDirectoryBean addDirectory(
             final @NotNull AbstractDirectoryBean directoryBean,
             final boolean testConnection) {
 
+        final AbstractDirectoryBean resultDirectoryBean;
+
         try {
             final Directory directory = DirectoryBeanUtil.toDirectory(directoryBean);
             final Directory addedDirectory = directoryManager.addDirectory(directory);
-            return DirectoryBeanUtil.toDirectoryBean(addedDirectory);
+            resultDirectoryBean = DirectoryBeanUtil.toDirectoryBean(addedDirectory);
         } catch (DirectoryBeanUtil.UnsupportedDirectoryBeanException e) {
             throw new BadRequestException(String.format(
                     "Adding directory type '%s' is not supported (yet)", e.getMessage()));
         } catch (DirectoryInstantiationException e) {
             throw new InternalServerErrorException(String.format("Could not create directory '%s'", directoryBean.getName()));
         }
+
+        if (DirectoryInternalBean.class.equals(directoryBean.getClass()) && directoryBean.getClass().equals(resultDirectoryBean.getClass())) {
+            final DirectoryInternalBean directoryInternalBean = (DirectoryInternalBean) directoryBean;
+            final DirectoryInternalBean resultDirectoryInternalBean = (DirectoryInternalBean) resultDirectoryBean;
+
+            resultDirectoryInternalBean.setUsers(usersService.setUsers(directoryInternalBean.getId(), directoryInternalBean.getUsers()));
+        }
+
+        return resultDirectoryBean;
     }
 
     @Override