RESTWS-755: Create user with email property

api/pom.xml

@@ -28,33 +28,34 @@
 
 	<dependencies>
 		<!-- Begin OpenMRS core -->
-		
+
 		<dependency>
 			<groupId>org.openmrs.api</groupId>
 			<artifactId>openmrs-api</artifactId>
+			<version>2.2.0-alpha</version>
 			<type>jar</type>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.openmrs.web</groupId>
 			<artifactId>openmrs-web</artifactId>
 			<type>jar</type>
 		</dependency>
-				
+
 		<dependency>
 			<groupId>org.openmrs.api</groupId>
 			<artifactId>openmrs-api</artifactId>
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.openmrs.web</groupId>
 			<artifactId>openmrs-web</artifactId>
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.openmrs.test</groupId>
 			<artifactId>openmrs-test</artifactId>
@@ -73,9 +74,9 @@
             <groupId>org.openmrs.module</groupId>
             <artifactId>uiframework-api</artifactId>
         </dependency>
-		
+
 	</dependencies>
-	
+
 	<build>
 		<resources>
 			<resource>

api/src/main/java/org/openmrs/module/adminui/account/Account.java

@@ -34,15 +34,15 @@
 import org.openmrs.PersonAttribute;
 
 public class Account {
-	
+
 	private Person person;
-	
+
 	private List<User> userAccounts;
-	
+
 	private List<Provider> providerAccounts;
-	
+
 	private Map<User, String> userPasswordMap = new HashMap<User, String>();
-	
+
 	public Account(Person person) {
 		this.person = person;
 		if (getPerson().getPersonId() != null) {
@@ -56,28 +56,28 @@ public Account(Person person) {
 			}
 		}
 	}
-	
+
 	public Person getPerson() {
 		if (person == null) {
 			person = new Person();
 		}
 		return person;
 	}
-	
+
 	public List<User> getUserAccounts() {
 		if (userAccounts == null) {
 			userAccounts = new ArrayList<User>();
 		}
 		return userAccounts;
 	}
-	
+
 	public List<Provider> getProviderAccounts() {
 		if (providerAccounts == null) {
 			providerAccounts = new ArrayList<Provider>();
 		}
 		return providerAccounts;
 	}
-	
+
 	public void addUserAccount(User user) {
 		if (user.getPerson() == null) {
 			user.setPerson(getPerson());
@@ -88,7 +88,7 @@ public void addUserAccount(User user) {
 		}
 		getUserAccounts().add(user);
 	}
-	
+
 	public void addProviderAccount(Provider provider) {
 		if (provider.getPerson() == null) {
 			provider.setPerson(getPerson());
@@ -99,35 +99,35 @@ public void addProviderAccount(Provider provider) {
 		}
 		getProviderAccounts().add(provider);
 	}
-	
+
 	private void initializePersonNameIfNecessary() {
 		if (getPerson().getPersonName() == null) {
 			getPerson().addName(new PersonName());
 		}
 	}
-	
+
 	public void setGivenName(String givenName) {
 		initializePersonNameIfNecessary();
 		getPerson().getPersonName().setGivenName(givenName);
 	}
-	
+
 	public String getGivenName() {
 		return getPerson().getGivenName();
 	}
-	
+
 	public void setFamilyName(String familyName) {
 		initializePersonNameIfNecessary();
 		getPerson().getPersonName().setFamilyName(familyName);
 	}
-	
+
 	public String getFamilyName() {
 		return getPerson().getFamilyName();
 	}
-	
+
 	public void setGender(String gender) {
 		getPerson().setGender(gender);
 	}
-	
+
 	public String getGender() {
 		return getPerson().getGender();
 	}
@@ -156,7 +156,7 @@ public Role getPrivilegeLevel(User user) {
 		}
 		return null;
 	}
-	
+
 	public Set<Role> getCapabilities(User user) {
 		Set<Role> capabilities = new HashSet<Role>();
 		if (user != null && user.getRoles() != null) {
@@ -168,30 +168,30 @@ public Set<Role> getCapabilities(User user) {
 		}
 		return capabilities;
 	}
-	
+
 	public User getCreator() {
 		return getPerson().getCreator();
 	}
-	
+
 	public Date getDateCreated() {
 		return getPerson().getDateCreated();
 	}
-	
+
 	/**
 	 * Gets changedBy value for the most recently edited entity of the account i.e the person,
 	 * providers and user accounts
-	 * 
+	 *
 	 * @return the most recent changedBy value
 	 * @should return the most recent changedBy value
 	 */
 	public User getChangedBy() {
 		if (getSortedAuditables().isEmpty()) {
 			return null;
 		}
-		
+
 		return getSortedAuditables().get(0).getChangedBy();
 	}
-	
+
 	/**
 	 * Get dateChanged value for the most recently edited entity of the account i.e the person,
 	 * providers and user accounts
@@ -203,23 +203,23 @@ public Date getDateChanged() {
 		if (getSortedAuditables().isEmpty()) {
 			return null;
 		}
-		
+
 		return getSortedAuditables().get(0).getDateChanged();
-		
+
 	}
-	
+
 	public boolean isSupposedToChangePassword(User user) {
 		return new UserProperties(user.getUserProperties()).isSupposedToChangePassword();
 	}
-	
+
 	public String getPassword(User user) {
 		return userPasswordMap.get(user);
 	}
-	
+
 	public String setPassword(User user, String password) {
 		return userPasswordMap.put(user, password);
 	}
-	
+
 	private List<Auditable> getSortedAuditables() {
 		List<Auditable> auditables = new ArrayList<Auditable>();
 		auditables.add(getPerson());
@@ -231,17 +231,17 @@ private List<Auditable> getSortedAuditables() {
 		auditables.addAll(getUserAccounts());
 		auditables.addAll(getProviderAccounts());
 		Collections.sort(auditables, Collections.reverseOrder(new Comparator<Auditable>() {
-			
+
 			@Override
 			public int compare(Auditable a1, Auditable a2) {
 				Date date1 = (a1 != null) ? a1.getDateChanged() : null;
 				Date date2 = (a2 != null) ? a2.getDateChanged() : null;
 				return OpenmrsUtil.compareWithNullAsEarliest(date1, date2);
 			}
 		}));
-		
+
 		return auditables;
-		
+
 	}
-	
+
 }

api/src/main/java/org/openmrs/module/adminui/account/AccountServiceImpl.java

@@ -31,43 +31,43 @@
 
 @Transactional
 public class AccountServiceImpl extends BaseOpenmrsService implements AccountService {
-	
+
 	private UserService userService;
-	
+
 	private PersonService personService;
-	
+
 	private ProviderService providerService;
-	
+
 	private AdministrationService adminService;
-	
+
 	/**
 	 * @param userService the userService to set
 	 */
 	public void setUserService(UserService userService) {
 		this.userService = userService;
 	}
-	
+
 	/**
 	 * @param providerService
 	 */
 	public void setProviderService(ProviderService providerService) {
 		this.providerService = providerService;
 	}
-	
+
 	/**
 	 * @param personService the personService to set
 	 */
 	public void setPersonService(PersonService personService) {
 		this.personService = personService;
 	}
-	
+
 	/**
 	 * @param adminService the adminService to set
 	 */
 	public void setAdminService(AdministrationService adminService) {
 		this.adminService = adminService;
 	}
-	
+
 	/**
 	 * @see AccountService#saveAccount(Account)
 	 */
@@ -84,7 +84,7 @@ public void saveAccount(Account account) {
 			}
 			else {
 				try {
-					userService.saveUser(user, null);
+					userService.saveUser(user);
 				}
 				catch (NoSuchMethodError ex) {
 					try {
@@ -99,19 +99,19 @@ public void saveAccount(Account account) {
 			}
 		}
 	}
-	
+
 	@Override
 	@Transactional(readOnly = true)
 	public List<Account> getAllAccounts() {
-		
+
 		Map<Person, Account> personAccountMap = new LinkedHashMap<Person, Account>();
-		
+
 		for (User user : userService.getAllUsers()) {
 			//exclude daemon user
 			if (AdminUiConstants.DAEMON_USER_UUID.equals(user.getUuid())) {
 				continue;
 			}
-			
+
 			Person person = user.getPerson();
 			Account account = personAccountMap.get(person);
 			if (account == null) {
@@ -122,7 +122,7 @@ public List<Account> getAllAccounts() {
 				account.addUserAccount(user);
 			}
 		}
-		
+
 		List<Provider> unknownProviders = new ArrayList<Provider>();
 		String unknownProviderUuid = adminService.getGlobalProperty("emr.unknownProvider");
 		if (StringUtils.isNotBlank(unknownProviderUuid)) {
@@ -137,7 +137,7 @@ public List<Account> getAllAccounts() {
 			if (unknownProviders.contains(provider)) {
 				continue;
 			}
-			
+
 			Person person = provider.getPerson();
 			if (person == null) {
 				person = new Person();
@@ -154,13 +154,13 @@ public List<Account> getAllAccounts() {
 				account.getProviderAccounts().add(provider);
 			}
 		}
-		
+
 		List<Account> accounts = new ArrayList<Account>();
 		accounts.addAll(personAccountMap.values());
-		
+
 		return accounts;
 	}
-	
+
 	/**
 	 * @see org.openmrs.module.adminui.account.AccountService#getAllCapabilities()
 	 */
@@ -174,7 +174,7 @@ public List<Role> getAllCapabilities() {
 		}
 		return capabilities;
 	}
-	
+
 	/**
 	 * @see org.openmrs.module.adminui.account.AccountService#getAllPrivilegeLevels()
 	 */
@@ -188,5 +188,5 @@ public List<Role> getAllPrivilegeLevels() {
 		}
 		return privilegeLevels;
 	}
-	
+
 }