CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 55 Packages Projects Releases Wiki Activity

clean up for close client

Browse Source
This commit is contained in:
Vishwas Babu A J
2013-08-29 22:13:22 +05:30
parent 22fc47a938
commit f218bce80f
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/domain/Client.java
+18 -16
View File
@@ -15,6 +15,7 @@ import java.util.Set;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
@@ -29,6 +30,7 @@ import javax.persistence.UniqueConstraint;
import org.apache.commons.lang.StringUtils;
import org.joda.time.LocalDate;
import org.joda.time.format.DateTimeFormatter;
import org.mifosplatform.infrastructure.codes.domain.CodeValue;
import org.mifosplatform.infrastructure.core.api.JsonCommand;
import org.mifosplatform.infrastructure.core.data.ApiParameterError;
import org.mifosplatform.infrastructure.core.data.DataValidatorBuilder;
@@ -95,10 +97,11 @@ public final class Client extends AbstractPersistable<Long> {
@Transient
private boolean accountNumberRequiresAutoGeneration = false;
@Column(name = "closure_reason_cv_id", nullable = true)
private Long closureReasonId;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "closure_reason_cv_id", nullable = true)
private CodeValue closureReason;
@Column(name = "closedon_date", nullable = true)
@Temporal(TemporalType.DATE)
private Date closureDate;
@@ -252,8 +255,8 @@ public final class Client extends AbstractPersistable<Long> {
public boolean isActive() {
return ClientStatus.fromInt(this.status).isActive();
}
public boolean isTransferInProgress () {
public boolean isTransferInProgress() {
return ClientStatus.fromInt(this.status).isTransferInProgress();
}
@@ -429,11 +432,11 @@ public final class Client extends AbstractPersistable<Long> {
public void setDisplayName(final String displayName) {
this.displayName = displayName;
}
public Office getOffice() {
return this.office;
}
public void updateOffice(final Office office) {
this.office = office;
}
@@ -461,22 +464,21 @@ public final class Client extends AbstractPersistable<Long> {
public void assignStaff(final Staff staff) {
this.staff = staff;
}
public Set<Group> getGroups(){
public Set<Group> getGroups() {
return this.groups;
}
public void close(final Long closureReasonId, final Date closureDate) {
this.closureReasonId = closureReasonId;
public void close(final CodeValue closureReason, final Date closureDate) {
this.closureReason = closureReason;
this.closureDate = closureDate;
this.status = ClientStatus.CLOSED.getValue();
}
public Integer getStatus() {
return this.status;
}
public void setStatus(Integer status) {
this.status = status;
}
@@ -484,7 +486,7 @@ public final class Client extends AbstractPersistable<Long> {
public boolean isActivatedAfter(final LocalDate submittedOn) {
return getActivationLocalDate().isAfter(submittedOn);
}
public boolean isChildOfGroup(final Long groupId) {
if (groupId != null && this.groups != null && !this.groups.isEmpty()) {
for (Group group : this.groups) {
mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java
+4 -2
View File
@@ -13,6 +13,7 @@ import java.util.Map;
import org.joda.time.LocalDate;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
import org.mifosplatform.infrastructure.codes.domain.CodeValue;
import org.mifosplatform.infrastructure.codes.domain.CodeValueRepositoryWrapper;
import org.mifosplatform.infrastructure.core.api.JsonCommand;
import org.mifosplatform.infrastructure.core.data.CommandProcessingResult;
@@ -337,7 +338,8 @@ public class ClientWritePlatformServiceJpaRepositoryImpl implements ClientWriteP
final LocalDate closureDate = command.localDateValueOfParameterNamed(ClientApiConstants.closureDateParamName);
final Long closureReasonId = command.longValueOfParameterNamed(ClientApiConstants.closureReasonIdParamName);
this.codeValueRepository.findOneByCodeNameAndIdWithNotFoundDetection(ClientApiConstants.CLIENT_CLOSURE_REASON, closureReasonId);
CodeValue closureReason = this.codeValueRepository.findOneByCodeNameAndIdWithNotFoundDetection(
ClientApiConstants.CLIENT_CLOSURE_REASON, closureReasonId);
if (ClientStatus.fromInt(client.getStatus()).isClosed()) {
final String errorMessage = "Client is alread closed.";
@@ -384,7 +386,7 @@ public class ClientWritePlatformServiceJpaRepositoryImpl implements ClientWriteP
}
}
client.close(closureReasonId, closureDate.toDate());
client.close(closureReason, closureDate.toDate());
this.clientRepository.saveAndFlush(client);
return new CommandProcessingResultBuilder() //