Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add report showing monthly BTC paid to BurningMen. #6599

Merged
merged 1 commit into from Mar 11, 2023
Merged

Add report showing monthly BTC paid to BurningMen. #6599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions core/src/main/java/bisq/core/dao/burningman/accounting/BurningManAccountingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,14 @@ private Stream<ReceivedBtcBalanceEntry> getReceivedBtcBalanceEntryStreamExcludin
.flatMap(balanceModel -> balanceModel.getReceivedBtcBalanceEntries().stream());
}

public Stream<ReceivedBtcBalanceEntry> getDistributedBtcBalanceByMonth(Date month) {
return balanceModelByBurningManName.entrySet().stream()
.filter(e -> !e.getKey().equals(BurningManPresentationService.LEGACY_BURNING_MAN_DPT_NAME) &&
!e.getKey().equals(BurningManPresentationService.LEGACY_BURNING_MAN_BTC_FEES_NAME))
.map(Map.Entry::getValue)
.flatMap(balanceModel -> balanceModel.getReceivedBtcBalanceEntriesByMonth(month).stream());
}


///////////////////////////////////////////////////////////////////////////////////////////
// Delegates
Expand Down
9 changes: 9 additions & 0 deletions core/src/main/java/bisq/core/dao/burningman/accounting/balance/BalanceModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import bisq.common.util.DateUtil;

import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.HashMap;
Expand Down Expand Up @@ -61,6 +62,14 @@ public Set<ReceivedBtcBalanceEntry> getReceivedBtcBalanceEntries() {
return receivedBtcBalanceEntries;
}

public Set<ReceivedBtcBalanceEntry> getReceivedBtcBalanceEntriesByMonth(Date month) {
return receivedBtcBalanceEntriesByMonth.entrySet().stream()
.filter(e -> e.getKey().equals(month))
.map(Map.Entry::getValue)
.flatMap(Collection::stream)
.collect(Collectors.toSet());
}

public Stream<BurnedBsqBalanceEntry> getBurnedBsqBalanceEntries(Set<BurnOutputModel> burnOutputModels) {
return burnOutputModels.stream()
.map(burnOutputModel -> new BurnedBsqBalanceEntry(burnOutputModel.getTxId(),
Expand Down
51 changes: 49 additions & 2 deletions desktop/src/main/java/bisq/desktop/main/dao/burnbsq/burningman/BurningManView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import bisq.desktop.common.view.ActivatableView;
import bisq.desktop.common.view.FxmlView;
import bisq.desktop.components.AutoTooltipButton;
import bisq.desktop.components.AutoTooltipLabel;
import bisq.desktop.components.AutoTooltipRadioButton;
import bisq.desktop.components.AutoTooltipSlideToggleButton;
Expand Down Expand Up @@ -55,6 +56,7 @@
import bisq.core.util.coin.CoinFormatter;

import bisq.common.app.DevEnv;
import bisq.common.util.DateUtil;
import bisq.common.util.Tuple2;
import bisq.common.util.Tuple3;

Expand Down Expand Up @@ -101,9 +103,13 @@
import javafx.util.Callback;
import javafx.util.StringConverter;

import java.text.SimpleDateFormat;

import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.function.Predicate;
Expand Down Expand Up @@ -315,14 +321,24 @@ public BurningManListItem fromString(String string) {
// DAO balance
addTitledGroupBg(gridPane, ++gridRow, 4,
Res.get("dao.burningman.daoBalance"), Layout.COMPACT_GROUP_DISTANCE);
daoBalanceTotalBurnedField = addCompactTopLabelTextField(gridPane, ++gridRow,
Tuple3<Label, TextField, VBox> daoBalanceTotalBurnedTuple = addCompactTopLabelTextField(gridPane, ++gridRow,
Res.get("dao.burningman.daoBalanceTotalBurned"), "",
Layout.COMPACT_GROUP_DISTANCE + Layout.FLOATING_LABEL_DISTANCE).second;
Layout.COMPACT_GROUP_DISTANCE + Layout.FLOATING_LABEL_DISTANCE);
daoBalanceTotalBurnedField =daoBalanceTotalBurnedTuple.second;
Tuple3<Label, TextField, VBox> daoBalanceTotalDistributedTuple = addCompactTopLabelTextField(gridPane, gridRow,
Res.get("dao.burningman.daoBalanceTotalDistributed"), "",
Layout.COMPACT_GROUP_DISTANCE + Layout.FLOATING_LABEL_DISTANCE);
daoBalanceTotalDistributedField = daoBalanceTotalDistributedTuple.second;
VBox daoBalanceTotalDistributedBox = daoBalanceTotalDistributedTuple.third;
daoBalanceTotalDistributedBox.getChildren().remove(daoBalanceTotalDistributedField);
Button reportButton = new AutoTooltipButton(Res.get("support.reportButton.label"));
reportButton.setStyle("-fx-pref-width: 66; -fx-pref-height: 26; -fx-padding: 3 3 3 3;");
reportButton.setOnAction(e -> writeReport());
HBox hBox1 = new HBox();
hBox1.getChildren().addAll(daoBalanceTotalDistributedField, reportButton);
HBox.setHgrow(daoBalanceTotalDistributedField, Priority.ALWAYS);
HBox.setMargin(reportButton, new Insets(0, 0, 0, 5.0));
daoBalanceTotalDistributedBox.getChildren().add(hBox1);
GridPane.setColumnSpan(daoBalanceTotalDistributedBox, 2);
GridPane.setColumnIndex(daoBalanceTotalDistributedBox, 1);

Expand Down Expand Up @@ -437,6 +453,37 @@ public BurningManListItem fromString(String string) {
reimbursementsTableView.setItems(reimbursementSortedList);
}

private void writeReport() {
List<String> reportList = new ArrayList<>();
String separator = "~";
String tableColumns = "Month~Fees~DPT~Total";
CSVEntryConverter<String> headerConverter = item -> tableColumns.split(separator);
CSVEntryConverter<String> contentConverter = item -> item.split(separator);
int year = 2022;
int month = 11;
while(true) {
Date date = DateUtil.getStartOfMonth(year, month);
long feeAmount = burningManAccountingService.getDistributedBtcBalanceByMonth(date)
.filter(ee -> ee.getType() == BalanceEntry.Type.BTC_TRADE_FEE_TX).mapToLong(BaseBalanceEntry::getAmount).sum();
long dptAmount = burningManAccountingService.getDistributedBtcBalanceByMonth(date)
.filter(ee -> ee.getType() == BalanceEntry.Type.DPT_TX).mapToLong(BaseBalanceEntry::getAmount).sum();
String reportLine = new SimpleDateFormat("MMM yyyy", Locale.ENGLISH).format(date)
+ separator + Coin.valueOf(feeAmount).toPlainString()
+ separator + Coin.valueOf(dptAmount).toPlainString()
+ separator + Coin.valueOf(feeAmount + dptAmount).toPlainString();
reportList.add(reportLine);
if (++month > 11) {
month = 0;
++year;
}
if (date.after(new Date())) {
break;
}
}
GUIUtil.exportCSV("DAOreport.csv", headerConverter, contentConverter, "", reportList,
(Stage) root.getScene().getWindow());
}

private RadioButton getRadioButton(String title, @Nullable BalanceEntry.Type type) {
AutoTooltipRadioButton radioButton = new AutoTooltipRadioButton(title);
radioButton.setToggleGroup(balanceEntryToggleGroup);
Expand Down