FIXED MIFOSX-24: General Issues with Groups so far

mifosng-db/patches/patch-0006_add_unique_to_group_name.sql

@@ -0,0 +1 @@
+ALTER TABLE portfolio_group ADD UNIQUE (name);

mifosng-provider/src/main/java/org/mifosng/platform/api/GroupsApiResource.java

@@ -19,6 +19,7 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 
 import org.mifosng.platform.api.commands.GroupCommand;
+import org.mifosng.platform.api.data.ClientMemberData;
 import org.mifosng.platform.api.data.EntityIdentifier;
 import org.mifosng.platform.api.data.GroupData;
 import org.mifosng.platform.api.infrastructure.ApiDataConversionService;
@@ -49,7 +50,7 @@ public class GroupsApiResource {
     public String retrieveAllGroups(@Context final UriInfo uriInfo){
         
         Set<String> typicalResponseParameters = new HashSet<String>(
-                Arrays.asList("id", "name", "externalId")
+                Arrays.asList("id", "name", "externalId", "clientMembers")
         );
         
         Set<String> responseParameters = ApiParameterHelper.extractFieldsForResponseIfProvided(uriInfo.getQueryParameters());
@@ -61,6 +62,10 @@ public class GroupsApiResource {
         
         Collection<GroupData> groups = this.groupReadPlatformService.retrieveAllGroups();
         
+        for (GroupData group : groups){
+            group.setClientMembers(this.groupReadPlatformService.retrieveClientMembers(group.getId()));
+        }
+        
         return this.apiDataConversionService.convertGroupDataToJson(prettyPrint, responseParameters, groups.toArray(new GroupData[groups.size()]));
     }
     
@@ -82,6 +87,9 @@ public class GroupsApiResource {
 
         GroupData group = this.groupReadPlatformService.retrieveGroup(groupId);
 
+        Collection<ClientMemberData> clientMembers = this.groupReadPlatformService.retrieveClientMembers(groupId);
+        group.setClientMembers(clientMembers);
+        
         return this.apiDataConversionService.convertGroupDataToJson(prettyPrint, responseParameters, group);
     }
 

mifosng-provider/src/main/java/org/mifosng/platform/api/data/ClientMemberData.java

@@ -0,0 +1,31 @@
+package org.mifosng.platform.api.data;
+
+import org.apache.commons.lang.StringUtils;
+
+public class ClientMemberData {
+
+    private final Long id;
+    private final String displayName;
+
+    public ClientMemberData(final Long id, final String firstname, final String lastname) {
+        this.id = id;
+        
+        StringBuilder displayNameBuilder = new StringBuilder(firstname);
+        if (StringUtils.isNotBlank(displayNameBuilder.toString())) {
+            displayNameBuilder.append(' ');
+        }
+        displayNameBuilder.append(lastname);
+
+        this.displayName = displayNameBuilder.toString();
+        
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getDisplayName() {
+        return displayName;
+    }
+
+}

mifosng-provider/src/main/java/org/mifosng/platform/api/data/GroupData.java

@@ -1,11 +1,16 @@
 package org.mifosng.platform.api.data;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 public class GroupData {
     
     private final Long id;
     private final String name;
     private final String externalId;
     
+    private Collection<ClientMemberData> clientMembers = new ArrayList<ClientMemberData>();
+    
     public GroupData(Long id, String name, String externalId) {
         super();
         this.id = id;
@@ -25,4 +30,12 @@ public class GroupData {
         return externalId;
     }
 
+    public Collection<ClientMemberData> getClientMembers() {
+        return clientMembers;
+    }
+
+    public void setClientMembers(Collection<ClientMemberData> clientMembers) {
+        this.clientMembers = clientMembers;
+    }
+
 }

mifosng-provider/src/main/java/org/mifosng/platform/api/infrastructure/ApiDataConversionServiceImpl.java

@@ -380,7 +380,7 @@ public class ApiDataConversionServiceImpl implements ApiDataConversionService {
 	@Override
     public String convertGroupDataToJson(boolean prettyPrint, Set<String> responseParameters, GroupData... groups) {
         final Set<String> supportedParameters = new HashSet<String>(
-                Arrays.asList("id", "name", "externalId")
+                Arrays.asList("id", "name", "externalId", "clientMembers")
         );
         
         final Set<String> parameterNamesToSkip = new HashSet<String>();

mifosng-provider/src/main/java/org/mifosng/platform/group/domain/Group.java

@@ -20,7 +20,7 @@ import org.mifosng.platform.user.domain.AppUser;
 @Table(name = "portfolio_group")
 public class Group extends AbstractAuditableCustom<AppUser, Long> {
 
-    @Column(name = "name", length = 100)
+    @Column(name = "name", length = 100, unique = true)
     private String name;
 
     @Column(name = "external_id", length = 100, unique = true)
@@ -34,7 +34,7 @@ public class Group extends AbstractAuditableCustom<AppUser, Long> {
                joinColumns = @JoinColumn(name = "group_id"),
                inverseJoinColumns = @JoinColumn(name = "client_id"))
     private Set<Client> clientMembers;
-    
+
     public Group() {
         this.name = null;
         this.externalId = null;
@@ -61,7 +61,7 @@ public class Group extends AbstractAuditableCustom<AppUser, Long> {
         }
     }
     
-    public void update(GroupCommand command) {
+    public void update(final GroupCommand command, final Set<Client> clientMembers) {
         if (command.isExternalIdChanged()) {
             this.externalId = command.getExternalId();
         }
@@ -69,6 +69,10 @@ public class Group extends AbstractAuditableCustom<AppUser, Long> {
         if (command.isNameChanged()) {
             this.name = command.getName();
         }
+        
+        if (clientMembers != null && command.isClientMembersChanged()){
+            this.clientMembers = clientMembers;
+        }
     }
     
     public void addClientMember(final Client member){
@@ -83,6 +87,7 @@ public class Group extends AbstractAuditableCustom<AppUser, Long> {
     public void delete() {
         this.deleted = true;
         this.externalId = this.getId() + "_" + this.externalId;
+        this.name = this.getId() + "_" + this.name;
     }
 
     public boolean isDeleted() {

mifosng-provider/src/main/java/org/mifosng/platform/group/service/GroupCommandValidator.java

@@ -42,6 +42,8 @@ public class GroupCommandValidator {
         baseDataValidator.reset().parameter("name").value(command.getName()).ignoreIfNull().notBlank();
         baseDataValidator.reset().parameter("externalId").value(command.getExternalId()).ignoreIfNull().notExceedingLengthOf(100);
         
+        baseDataValidator.reset().parameter("clientMembers").value(command.getClientMembers()).ignoreIfNull();
+        
         if (!dataValidationErrors.isEmpty()) {
             throw new PlatformApiDataValidationException("validation.msg.validation.errors.exist", "Validation errors exist.", dataValidationErrors);
         }

mifosng-provider/src/main/java/org/mifosng/platform/group/service/GroupReadPlatformService.java

@@ -2,6 +2,7 @@ package org.mifosng.platform.group.service;
 
 import java.util.Collection;
 
+import org.mifosng.platform.api.data.ClientMemberData;
 import org.mifosng.platform.api.data.GroupData;
 
 public interface GroupReadPlatformService {
@@ -9,5 +10,6 @@ public interface GroupReadPlatformService {
     Collection<GroupData> retrieveAllGroups();
     
     GroupData retrieveGroup(Long groupId);
-
+    
+    Collection<ClientMemberData> retrieveClientMembers(Long groupId);
 }

mifosng-provider/src/main/java/org/mifosng/platform/group/service/GroupReadPlatformServiceImpl.java

@@ -4,6 +4,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Collection;
 
+import org.apache.commons.lang.StringUtils;
+import org.mifosng.platform.api.data.ClientMemberData;
 import org.mifosng.platform.api.data.GroupData;
 import org.mifosng.platform.exceptions.GroupNotFoundException;
 import org.mifosng.platform.infrastructure.TenantAwareRoutingDataSource;
@@ -73,4 +75,35 @@ public class GroupReadPlatformServiceImpl implements GroupReadPlatformService {
 
     }
 
+    @Override
+    public Collection<ClientMemberData> retrieveClientMembers(Long groupId){
+        
+        this.context.authenticatedUser();
+        
+        ClientMemberSummaryDataMapper rm = new ClientMemberSummaryDataMapper();
+        
+        String sql = "select " + rm.clientMemberSummarySchema() + " where cm.is_deleted = 0 and pgc.group_id = ?";
+        
+        return this.jdbcTemplate.query(sql, rm, new Object[] {groupId});
+    }
+    
+    private static final class ClientMemberSummaryDataMapper implements RowMapper<ClientMemberData> {
+
+        public String clientMemberSummarySchema() {
+            return "cm.id, cm.firstname, cm.lastname from portfolio_client cm INNER JOIN portfolio_group_client pgc ON pgc.client_id = cm.id";
+        }
+
+        @Override
+        public ClientMemberData mapRow(ResultSet rs, int rowNum) throws SQLException {
+            Long id = rs.getLong("id");
+            String firstname = rs.getString("firstname");
+            String lastname = rs.getString("lastname");
+            if (StringUtils.isBlank(firstname)) {
+                firstname = "";
+            }
+            return new ClientMemberData(id, firstname, lastname);
+        }
+
+    }
+    
 }

mifosng-provider/src/main/java/org/mifosng/platform/group/service/GroupWritePlatformServiceJpaRepositoryImpl.java

@@ -65,7 +65,10 @@ public class GroupWritePlatformServiceJpaRepositoryImpl implements GroupWritePla
         if (groupForUpdate == null || groupForUpdate.isDeleted()) {
             throw new GroupNotFoundException(command.getId());
         }
-        groupForUpdate.update(command);
+
+        final Set<Client> clientMembers = assembleSetOfClients(command);
+
+        groupForUpdate.update(command, clientMembers);
 
         groupRepository.save(groupForUpdate);