Skip to content
Permalink
Browse files
Merge pull request #1 from ebenezergraham/FINCN-2
Fixed Failing Import
  • Loading branch information
Izakey committed Aug 25, 2019
2 parents 9c23639 + 200d992 commit 119b9b2cb92b157ab9e3de96076061b923cc03e2
Showing 5 changed files with 99 additions and 106 deletions.
@@ -99,8 +99,8 @@ public void testAccountFromARealCase() throws IOException, InterruptedException
ledger1100.setName("Income from Loans");
ledger1100.setParentLedgerIdentifier("1000");
ledger1100.setShowAccountsInChart(true);

testSubject.createLedger(ledger1100);
testSubject.addSubLedger(ledger1100.getParentLedgerIdentifier(),ledger1100);
Assert.assertTrue(eventRecorder.wait(EventConstants.POST_LEDGER, ledger1100.getIdentifier()));


@@ -19,16 +19,8 @@
package org.apache.fineract.cn.accounting.service.internal.repository;

import java.time.LocalDateTime;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import javax.persistence.*;

import org.apache.fineract.cn.postgresql.util.LocalDateTimeConverter;

@SuppressWarnings({"unused"})
@@ -29,89 +29,90 @@
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;

import org.apache.fineract.cn.postgresql.util.LocalDateTimeConverter;

@SuppressWarnings({"unused"})
@Entity
@Table(name = "thoth_account_entries")
public class AccountEntryEntity {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
private Long id;
@ManyToOne(fetch = FetchType.LAZY, optional = false)
@JoinColumn(name = "account_id")
private AccountEntity account;
@Column(name = "a_type")
private String type;
@Column(name = "transaction_date")
@Convert(converter = LocalDateTimeConverter.class)
private LocalDateTime transactionDate;
@Column(name = "message")
private String message;
@Column(name = "amount")
private Double amount;
@Column(name = "balance")
private Double balance;

public AccountEntryEntity() {
super();
}

public Long getId() {
return this.id;
}

public void setId(final Long id) {
this.id = id;
}

public AccountEntity getAccount() {
return this.account;
}

public void setAccount(final AccountEntity account) {
this.account = account;
}

public String getType() {
return this.type;
}

public void setType(final String type) {
this.type = type;
}

public LocalDateTime getTransactionDate() {
return this.transactionDate;
}

public void setTransactionDate(final LocalDateTime transactionDate) {
this.transactionDate = transactionDate;
}

public String getMessage() {
return this.message;
}

public void setMessage(final String message) {
this.message = message;
}

public Double getAmount() {
return this.amount;
}

public void setAmount(final Double amount) {
this.amount = amount;
}

public Double getBalance() {
return this.balance;
}

public void setBalance(final Double balance) {
this.balance = balance;
}
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
private Long id;
@ManyToOne(fetch = FetchType.LAZY, optional = false)
@JoinColumn(name = "account_id")
private AccountEntity account;
@Column(name = "a_type")
private String type;
@Column(name = "transaction_date")
@Convert(converter = LocalDateTimeConverter.class)
private LocalDateTime transactionDate;
@Column(name = "message")
private String message;
@Column(name = "amount")
private Double amount;
@Column(name = "balance")
private Double balance;
public AccountEntryEntity() {
super();
}
public Long getId() {
return this.id;
}
public void setId(final Long id) {
this.id = id;
}
public AccountEntity getAccount() {
return this.account;
}
public void setAccount(final AccountEntity account) {
this.account = account;
}
public String getType() {
return this.type;
}
public void setType(final String type) {
this.type = type;
}
public LocalDateTime getTransactionDate() {
return this.transactionDate;
}
public void setTransactionDate(final LocalDateTime transactionDate) {
this.transactionDate = transactionDate;
}
public String getMessage() {
return this.message;
}
public void setMessage(final String message) {
this.message = message;
}
public Double getAmount() {
return this.amount;
}
public void setAmount(final Double amount) {
this.amount = amount;
}
public Double getBalance() {
return this.balance;
}
public void setBalance(final Double balance) {
this.balance = balance;
}
}
@@ -18,7 +18,7 @@
--

CREATE TABLE thoth_ledgers (
id BIGSERIAL NOT NULL,
id BIGSERIAL,
a_type VARCHAR(32) NOT NULL,
identifier VARCHAR(32) NOT NULL,
a_name VARCHAR(256) NOT NULL,
@@ -34,7 +34,7 @@ CREATE TABLE thoth_ledgers (
);

CREATE TABLE thoth_accounts (
id BIGSERIAL NOT NULL,
id BIGSERIAL,
a_type VARCHAR(32) NOT NULL,
identifier VARCHAR(32) NOT NULL,
a_name VARCHAR(256) NOT NULL,
@@ -55,7 +55,7 @@ CREATE TABLE thoth_accounts (
);

CREATE TABLE thoth_account_entries (
id BIGSERIAL NOT NULL,
id BIGSERIAL,
account_id BIGINT NULL,
a_type VARCHAR(32) NOT NULL,
transaction_date TIMESTAMP(3) NOT NULL,
@@ -76,4 +76,4 @@ CREATE TABLE thoth_commands (
CONSTRAINT thoth_commands_pk PRIMARY KEY (id),
CONSTRAINT thoth_commands_accounts_fk FOREIGN KEY (account_id) REFERENCES thoth_accounts (id)
ON UPDATE RESTRICT
);
);
@@ -19,17 +19,17 @@ group 'org.apache.fineract.cn.accounting'
version '0.1.0-BUILD-SNAPSHOT'

ext.versions = [
frameworkanubis : '0.1.0-BUILD-SNAPSHOT',
frameworkapi : '0.1.0-BUILD-SNAPSHOT',
frameworklang : '0.1.0-BUILD-SNAPSHOT',
frameworkpostgresql : '0.1.0-BUILD-SNAPSHOT',
frameworkcassandra : '0.1.0-BUILD-SNAPSHOT',
frameworkcommand : '0.1.0-BUILD-SNAPSHOT',
frameworktest : '0.1.0-BUILD-SNAPSHOT',
frameworkasync : '0.1.0-BUILD-SNAPSHOT',
frameworkcustomer : '0.1.0-BUILD-SNAPSHOT',
apachecsvreader : '1.4',
validator : '5.3.0.Final'
frameworkanubis : '0.1.0-BUILD-SNAPSHOT',
frameworkapi : '0.1.0-BUILD-SNAPSHOT',
frameworklang : '0.1.0-BUILD-SNAPSHOT',
frameworkpostgresql: '0.1.0-BUILD-SNAPSHOT',
frameworkcassandra : '0.1.0-BUILD-SNAPSHOT',
frameworkcommand : '0.1.0-BUILD-SNAPSHOT',
frameworktest : '0.1.0-BUILD-SNAPSHOT',
frameworkasync : '0.1.0-BUILD-SNAPSHOT',
frameworkcustomer : '0.1.0-BUILD-SNAPSHOT',
apachecsvreader : '1.4',
validator : '5.3.0.Final',
]

apply plugin: 'java'

0 comments on commit 119b9b2

Please sign in to comment.