#69 Fixing an error when updating organizations

Also added error handling, when an Org-Admin tries to create a new organization.

Author: Chris Wiechmann

modules/apim-adapter/src/main/java/com/axway/apim/adapter/apis/APIManagerOrganizationAdapter.java

@@ -122,12 +122,15 @@ public Organization createOrUpdateOrganization(Organization desiredOrg, Organiza
 		try {
 			URI uri;
 			if(actualOrg==null) {
+				if(!APIManagerAdapter.hasAdminAccount()) {
+					throw new AppException("Admin account is required to create a new organization", ErrorCode.NO_ADMIN_ROLE_USER);
+				}
 				uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(RestAPICall.API_VERSION+"/organizations").build();
 			} else {
 				uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(RestAPICall.API_VERSION+"/organizations/"+actualOrg.getId()).build();
 			}
 			FilterProvider filter = new SimpleFilterProvider().setDefaultFilter(
-					SimpleBeanPropertyFilter.serializeAllExcept(new String[] {"image"}));
+					SimpleBeanPropertyFilter.serializeAllExcept(new String[] {"image", "createdOn"}));
 			mapper.setFilterProvider(filter);
 			mapper.setSerializationInclusion(Include.NON_NULL);
 			try {
@@ -137,6 +140,7 @@ public Organization createOrUpdateOrganization(Organization desiredOrg, Organiza
 					HttpEntity entity = new StringEntity(json);
 					request = new POSTRequest(entity, uri, true);
 				} else {
+					desiredOrg.setId(actualOrg.getId());
 					String json = mapper.writeValueAsString(desiredOrg);
 					HttpEntity entity = new StringEntity(json);
 					request = new PUTRequest(entity, uri, true);

modules/organizations/src/test/java/com/axway/apim/organization/orgImport/ImportSimpleOrganizationTestIT.java

@@ -33,6 +33,10 @@ public void run(@Optional @CitrusResource TestContext context) throws IOExceptio
 
 		variable("orgNumber", RandomNumberFunction.getRandomNumber(4, true));
 		variable("orgName", "My-Org-${orgNumber}");
+		variable("orgDescription", "A description for my org");
+		// This test must be executed with an Admin-Account as we need to create a new organization
+		variable("oadminUsername1", "apiadmin"); 
+		variable("oadminPassword1", "changeme");
 
 		echo("####### Import organization: '${orgName}' #######");		
 		createVariable(OrganizationImportTestAction.CONFIG,  PACKAGE + "SingleOrganization.json");
@@ -50,6 +54,11 @@ public void run(@Optional @CitrusResource TestContext context) throws IOExceptio
 		createVariable("expectedReturnCode", "10");
 		orgImport.doExecute(context);
 
+		echo("####### Change the description and import it again #######");
+		variable("orgDescription", "My changed org description");
+		createVariable("expectedReturnCode", "0");
+		orgImport.doExecute(context);
+		
 		echo("####### Export the organization #######");
 		ErrorState.deleteInstance();
 		variable("targetFolder", "citrus:systemProperty('java.io.tmpdir')");

modules/organizations/src/test/resources/com/axway/apim/organization/orgImport/SingleOrganization.json

@@ -1,6 +1,6 @@
 {
   "name" : "${orgName}",
-  "description" : "Test Org 6425",
+  "description" : "${orgDescription}",
   "restricted" : false,
   "enabled" : true,
   "development" : true,