zet/sasiedzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a

Browse Source
This commit is contained in:
Sławek Zatorski
2024-11-13 17:19:29 +01:00
parent 7ae7cc1d36
commit e51b15a114
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/sasiedzi/event/domain/UserAccount.java
+1 -1
View File
@@ -25,7 +25,7 @@ public class UserAccount implements Serializable {
@Column(name = "name") @Column(name = "name")
private String name; private String name;
@ManyToMany(fetch = FetchType.EAGER) @ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
@JoinTable( @JoinTable(
name = "rel_user_account__user", name = "rel_user_account__user",
joinColumns = @JoinColumn(name = "user_account_id"), joinColumns = @JoinColumn(name = "user_account_id"),
src/main/java/com/sasiedzi/event/service/EventService.java
+3 -2
View File
@@ -185,9 +185,10 @@ public class EventService {
.forEach(registration -> { .forEach(registration -> {
String login = registration.getUser().getLogin(); String login = registration.getUser().getLogin();
UserAccount userAccount = accountsByLogin.get(login); UserAccount userAccount = accountsByLogin.get(login);
if (userAccount != null) { if (userAccount == null) {
userAccount = new UserAccount(); userAccount = new UserAccount();
userAccount.setName(registration.getUser().getName()); userAccount.setName(registration.getUser().getName());
userAccount.getUsers().add(registration.getUser());
userAccount = userAccountRepository.save(userAccount); userAccount = userAccountRepository.save(userAccount);
} }
accountsToCharge.add(userAccount); accountsToCharge.add(userAccount);
@@ -202,7 +203,7 @@ public class EventService {
TransactionItem playerCharge = new TransactionItem(); TransactionItem playerCharge = new TransactionItem();
playerCharge.setEvent(event); playerCharge.setEvent(event);
playerCharge.setAmount(event.getCost().divide(BigDecimal.valueOf(-accountsToCharge.size()), 2, RoundingMode.HALF_UP)); playerCharge.setAmount(event.getCost().divide(BigDecimal.valueOf(-accountsToCharge.size()), 2, RoundingMode.HALF_UP));
playerCharge.setUserAccount(accountsByAccountName.get(fieldServiceAccountName)); playerCharge.setUserAccount(userAccount);
playerCharge.setTransaction(transaction); playerCharge.setTransaction(transaction);
transaction.getTransactionItems().add(playerCharge); transaction.getTransactionItems().add(playerCharge);
}); });