MIFOSX-175: Fix issue with one-to-one mapping for arrears on loan.
This commit is contained in:
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+2
-1
@@ -21,6 +21,7 @@ import javax.persistence.CascadeType;
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Embedded;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.FetchType;
|
||||
import javax.persistence.JoinColumn;
|
||||
import javax.persistence.ManyToOne;
|
||||
import javax.persistence.OneToMany;
|
||||
@@ -243,7 +244,7 @@ public class Loan extends AbstractPersistable<Long> {
|
||||
@Embedded
|
||||
private LoanSummary summary;
|
||||
|
||||
@OneToOne(mappedBy = "loan", cascade = CascadeType.ALL, optional = true, orphanRemoval = true)
|
||||
@OneToOne(mappedBy = "loan", cascade = CascadeType.ALL, optional = true, orphanRemoval = true, fetch = FetchType.LAZY)
|
||||
private LoanSummaryArrearsAging summaryArrearsAging;
|
||||
|
||||
@Transient
|
||||
|
||||
+7
-7
@@ -14,8 +14,6 @@ import javax.persistence.Table;
|
||||
import javax.persistence.Temporal;
|
||||
import javax.persistence.TemporalType;
|
||||
|
||||
import org.hibernate.annotations.GenericGenerator;
|
||||
import org.hibernate.annotations.Parameter;
|
||||
import org.joda.time.LocalDate;
|
||||
import org.mifosplatform.infrastructure.core.service.DateUtils;
|
||||
import org.mifosplatform.organisation.monetary.domain.MonetaryCurrency;
|
||||
@@ -35,13 +33,15 @@ import org.springframework.data.domain.Persistable;
|
||||
*/
|
||||
@Entity
|
||||
@Table(name = "m_loan_arrears_aging")
|
||||
@org.hibernate.annotations.GenericGenerator(name = "loan-primarykey", strategy = "foreign", parameters = { //
|
||||
@org.hibernate.annotations.Parameter(name = "property", value = "loan") //
|
||||
})
|
||||
public final class LoanSummaryArrearsAging implements Persistable<Long> {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(generator = "SharedPrimaryKeyGenerator")
|
||||
@GenericGenerator(name = "SharedPrimaryKeyGenerator", strategy = "foreign", parameters = @Parameter(name = "property", value = "loan"))
|
||||
@GeneratedValue(generator = "loan-primarykey")
|
||||
@Column(name = "loan_id", unique = true, nullable = false)
|
||||
private Long id;
|
||||
private Long loanId;
|
||||
|
||||
@Column(name = "principal_overdue_derived", scale = 6, precision = 19)
|
||||
private BigDecimal totalPrincipalOverdue;
|
||||
@@ -64,7 +64,7 @@ public final class LoanSummaryArrearsAging implements Persistable<Long> {
|
||||
private Date overdueSinceDate;
|
||||
|
||||
@SuppressWarnings("unused")
|
||||
@OneToOne
|
||||
@OneToOne(optional = false)
|
||||
@PrimaryKeyJoinColumn
|
||||
private Loan loan;
|
||||
|
||||
@@ -79,7 +79,7 @@ public final class LoanSummaryArrearsAging implements Persistable<Long> {
|
||||
|
||||
@Override
|
||||
public Long getId() {
|
||||
return this.id;
|
||||
return this.loanId;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user