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

Merge pull request #1561 from dtsuran/MIFOSX-2385

Browse Source 
MIFOSX-2385: When request data of floating rate, server side send JSON data with locale specific format of date
This commit is contained in:
pramod
2015-12-16 08:47:52 +05:30
parent c50a45b2c8 be252fb91c
commit 15c204e4db
4 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/floatingrates/data/FloatingRateData.java
+7 -7
View File
@@ -5,12 +5,12 @@
*/ */
package org.mifosplatform.portfolio.floatingrates.data; package org.mifosplatform.portfolio.floatingrates.data;
import java.util.Date;
import java.util.List; import java.util.List;
import org.apache.commons.lang.builder.CompareToBuilder; import org.apache.commons.lang.builder.CompareToBuilder;
import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.HashCodeBuilder;
import org.joda.time.LocalDate;
import org.mifosplatform.infrastructure.core.data.EnumOptionData; import org.mifosplatform.infrastructure.core.data.EnumOptionData;
public class FloatingRateData implements Comparable<FloatingRateData> { public class FloatingRateData implements Comparable<FloatingRateData> {
@@ -20,16 +20,16 @@ public class FloatingRateData implements Comparable<FloatingRateData> {
private final boolean isBaseLendingRate; private final boolean isBaseLendingRate;
private final boolean isActive; private final boolean isActive;
private final String createdBy; private final String createdBy;
private final Date createdOn; private final LocalDate createdOn;
private final String modifiedBy; private final String modifiedBy;
private final Date modifiedOn; private final LocalDate modifiedOn;
private final List<FloatingRatePeriodData> ratePeriods; private final List<FloatingRatePeriodData> ratePeriods;
@SuppressWarnings("unused") @SuppressWarnings("unused")
private final List<EnumOptionData> interestRateFrequencyTypeOptions; private final List<EnumOptionData> interestRateFrequencyTypeOptions;
public FloatingRateData(Long id, String name, boolean isBaseLendingRate, public FloatingRateData(Long id, String name, boolean isBaseLendingRate,
boolean isActive, String createdBy, Date createdOn, boolean isActive, String createdBy, LocalDate createdOn,
String modifiedBy, Date modifiedOn, String modifiedBy, LocalDate modifiedOn,
List<FloatingRatePeriodData> ratePeriods, List<FloatingRatePeriodData> ratePeriods,
List<EnumOptionData> interestRateFrequencyTypeOptions) { List<EnumOptionData> interestRateFrequencyTypeOptions) {
this.id = id; this.id = id;
@@ -64,7 +64,7 @@ public class FloatingRateData implements Comparable<FloatingRateData> {
return this.createdBy; return this.createdBy;
} }
public Date getCreatedOn() { public LocalDate getCreatedOn() {
return this.createdOn; return this.createdOn;
} }
@@ -72,7 +72,7 @@ public class FloatingRateData implements Comparable<FloatingRateData> {
return this.modifiedBy; return this.modifiedBy;
} }
public Date getModifiedOn() { public LocalDate getModifiedOn() {
return this.modifiedOn; return this.modifiedOn;
} }
mifosng-provider/src/main/java/org/mifosplatform/portfolio/floatingrates/data/FloatingRatePeriodData.java
+9 -10
View File
@@ -6,7 +6,6 @@
package org.mifosplatform.portfolio.floatingrates.data; package org.mifosplatform.portfolio.floatingrates.data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
import org.apache.commons.lang.builder.CompareToBuilder; import org.apache.commons.lang.builder.CompareToBuilder;
import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.EqualsBuilder;
@@ -17,19 +16,19 @@ public class FloatingRatePeriodData implements
Comparable<FloatingRatePeriodData> { Comparable<FloatingRatePeriodData> {
private Long id; private Long id;
private Date fromDate; private LocalDate fromDate;
private BigDecimal interestRate; private BigDecimal interestRate;
private boolean isDifferentialToBaseLendingRate; private boolean isDifferentialToBaseLendingRate;
private boolean isActive; private boolean isActive;
private String createdBy; private String createdBy;
private Date createdOn; private LocalDate createdOn;
private String modifiedBy; private String modifiedBy;
private Date modifiedOn; private LocalDate modifiedOn;
public FloatingRatePeriodData(Long id, Date fromDate, public FloatingRatePeriodData(Long id, LocalDate fromDate,
BigDecimal interestRate, boolean isDifferentialToBaseLendingRate, BigDecimal interestRate, boolean isDifferentialToBaseLendingRate,
boolean isActive, String createdBy, Date createdOn, boolean isActive, String createdBy, LocalDate createdOn,
String modifiedBy, Date modifiedOn) { String modifiedBy, LocalDate modifiedOn) {
this.id = id; this.id = id;
this.fromDate = fromDate; this.fromDate = fromDate;
this.interestRate = interestRate; this.interestRate = interestRate;
@@ -45,7 +44,7 @@ public class FloatingRatePeriodData implements
return this.id; return this.id;
} }
public Date getFromDate() { public LocalDate getFromDate() {
return this.fromDate; return this.fromDate;
} }
@@ -69,7 +68,7 @@ public class FloatingRatePeriodData implements
return this.createdBy; return this.createdBy;
} }
public Date getCreatedOn() { public LocalDate getCreatedOn() {
return this.createdOn; return this.createdOn;
} }
@@ -77,7 +76,7 @@ public class FloatingRatePeriodData implements
return this.modifiedBy; return this.modifiedBy;
} }
public Date getModifiedOn() { public LocalDate getModifiedOn() {
return this.modifiedOn; return this.modifiedOn;
} }
mifosng-provider/src/main/java/org/mifosplatform/portfolio/floatingrates/domain/FloatingRatePeriod.java
+8 -3
View File
@@ -15,6 +15,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table; import javax.persistence.Table;
import org.joda.time.LocalDate; import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
import org.mifosplatform.portfolio.floatingrates.data.FloatingRateDTO; import org.mifosplatform.portfolio.floatingrates.data.FloatingRateDTO;
import org.mifosplatform.portfolio.floatingrates.data.FloatingRatePeriodData; import org.mifosplatform.portfolio.floatingrates.data.FloatingRatePeriodData;
import org.mifosplatform.useradministration.domain.AppUser; import org.mifosplatform.useradministration.domain.AppUser;
@@ -137,10 +138,14 @@ public class FloatingRatePeriod extends AbstractPersistable<Long> {
.fetchBaseRate(fetchFromDate())); .fetchBaseRate(fetchFromDate()));
} }
return new FloatingRatePeriodData(getId(), getFromDate(), interest, final LocalDate fromDate = new LocalDateTime(getFromDate()).toLocalDate();
final LocalDate createdOn = new LocalDateTime(getCreatedOn()).toLocalDate();
final LocalDate modidiedOn = new LocalDateTime(getModifiedOn()).toLocalDate();
return new FloatingRatePeriodData(getId(), fromDate, interest,
isDifferentialToBaseLendingRate(), isActive(), getCreatedBy() isDifferentialToBaseLendingRate(), isActive(), getCreatedBy()
.getUsername(), getCreatedOn(), getModifiedBy() .getUsername(), createdOn, getModifiedBy()
.getUsername(), getModifiedOn()); .getUsername(), modidiedOn);
} }
} }
mifosng-provider/src/main/java/org/mifosplatform/portfolio/floatingrates/service/FloatingRatesReadPlatformServiceImpl.java
+7 -5
View File
@@ -11,6 +11,8 @@ import java.sql.SQLException;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import org.joda.time.LocalDate;
import org.mifosplatform.infrastructure.core.domain.JdbcSupport;
import org.mifosplatform.infrastructure.core.service.RoutingDataSource; import org.mifosplatform.infrastructure.core.service.RoutingDataSource;
import org.mifosplatform.portfolio.floatingrates.data.FloatingRateData; import org.mifosplatform.portfolio.floatingrates.data.FloatingRateData;
import org.mifosplatform.portfolio.floatingrates.data.FloatingRatePeriodData; import org.mifosplatform.portfolio.floatingrates.data.FloatingRatePeriodData;
@@ -128,9 +130,9 @@ public class FloatingRatesReadPlatformServiceImpl implements
.getBoolean("isBaseLendingRate"); .getBoolean("isBaseLendingRate");
final boolean isActive = rs.getBoolean("isActive"); final boolean isActive = rs.getBoolean("isActive");
final String createdBy = rs.getString("createdBy"); final String createdBy = rs.getString("createdBy");
final Date createdOn = rs.getDate("createdOn"); final LocalDate createdOn = JdbcSupport.getLocalDate(rs, "createdOn");
final String modifiedBy = rs.getString("modifiedBy"); final String modifiedBy = rs.getString("modifiedBy");
final Date modifiedOn = rs.getDate("modifiedOn"); final LocalDate modifiedOn = JdbcSupport.getLocalDate(rs, "modifiedOn");
List<FloatingRatePeriodData> ratePeriods = null; List<FloatingRatePeriodData> ratePeriods = null;
if (addRatePeriods) { if (addRatePeriods) {
FloatingRatePeriodRowMapper ratePeriodMapper = new FloatingRatePeriodRowMapper(); FloatingRatePeriodRowMapper ratePeriodMapper = new FloatingRatePeriodRowMapper();
@@ -173,15 +175,15 @@ public class FloatingRatesReadPlatformServiceImpl implements
@SuppressWarnings("unused") final int rowNum) @SuppressWarnings("unused") final int rowNum)
throws SQLException { throws SQLException {
final Long id = rs.getLong("id"); final Long id = rs.getLong("id");
final Date fromDate = rs.getDate("fromDate"); final LocalDate fromDate = JdbcSupport.getLocalDate(rs, "fromDate");
final BigDecimal interestRate = rs.getBigDecimal("interestRate"); final BigDecimal interestRate = rs.getBigDecimal("interestRate");
final boolean isDifferentialToBaseLendingRate = rs final boolean isDifferentialToBaseLendingRate = rs
.getBoolean("isDifferentialToBaseLendingRate"); .getBoolean("isDifferentialToBaseLendingRate");
final boolean isActive = rs.getBoolean("isActive"); final boolean isActive = rs.getBoolean("isActive");
final String createdBy = rs.getString("createdBy"); final String createdBy = rs.getString("createdBy");
final Date createdOn = rs.getDate("createdOn"); final LocalDate createdOn = JdbcSupport.getLocalDate(rs, "createdOn");
final String modifiedBy = rs.getString("modifiedBy"); final String modifiedBy = rs.getString("modifiedBy");
final Date modifiedOn = rs.getDate("modifiedOn"); final LocalDate modifiedOn = JdbcSupport.getLocalDate(rs, "modifiedOn");
return new FloatingRatePeriodData(id, fromDate, interestRate, return new FloatingRatePeriodData(id, fromDate, interestRate,
isDifferentialToBaseLendingRate, isActive, createdBy, isDifferentialToBaseLendingRate, isActive, createdBy,
createdOn, modifiedBy, modifiedOn); createdOn, modifiedBy, modifiedOn);