Skip to content
This repository has been archived by the owner on Nov 3, 2020. It is now read-only.

Commit

Permalink
put balance in user export
Browse files Browse the repository at this point in the history
  • Loading branch information
gaetancollaud committed Nov 14, 2015
1 parent 6849f33 commit 12d9317
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import javax.persistence.Table;
import lombok.Getter;
import lombok.ToString;
import net.collaud.fablab.manager.export.CsvToString;

/**
*
Expand All @@ -19,7 +20,7 @@
@Table(name = "v_user_balance_grouped")
@Getter
@ToString
public class UserBalanceEO implements Serializable {
public class UserBalanceEO implements Serializable, CsvToString {

private static final long serialVersionUID = 1L;

Expand All @@ -31,4 +32,9 @@ public class UserBalanceEO implements Serializable {

@Column(name = "balance", nullable = false)
private double value;

@Override
public String CsvToString() {
return String.valueOf(value);
}
}
1 change: 1 addition & 0 deletions src/main/java/net/collaud/fablab/manager/data/UserEO.java
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ public class UserEO extends AbstractDataEO<Integer> implements Serializable {
@ManyToOne(optional = false, fetch = FetchType.LAZY)
private MembershipTypeEO membershipType;

@CsvField(headerName="Balance")
@OneToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "user_id", referencedColumnName = "user_id")
private UserBalanceEO balance;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ protected String getFieldValue(T obj, Field f) {
try {
f.setAccessible(true);
return Optional.ofNullable(f.get(obj))
.map(v -> v.toString())
.map(v -> (v instanceof CsvToString) ? ((CsvToString)v).CsvToString() : v.toString())
.map(v-> v.replace(FIELD_SEPARATOR, FIELD_SEPARATOR_REPLACE))
.map(v -> v.replace("\r\n", "\t"))
.map(v -> v.replace("\n", "\t"))
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package net.collaud.fablab.manager.export;

/**
*
* @author Gaetan Collaud
*/
public interface CsvToString {
String CsvToString();
}

0 comments on commit 12d9317

Please sign in to comment.