transaction fix

src/main/java/com/sasiedzi/event/domain/Event.java

@@ -1,11 +1,13 @@
 package com.sasiedzi.event.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.*;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -92,6 +94,77 @@ public class Event implements Serializable {
         this.date = date;
     }
 
+    //    @Transient
+    //    private Boolean editable;
+
+    @JsonProperty("editable")
+    public Boolean getEditable() {
+        if (date == null) return false;
+        LocalDate currentDate = LocalDate.now();
+        long daysBetween = ChronoUnit.DAYS.between(this.date, currentDate);
+        return daysBetween <= 7;
+    }
+
+    @Transient
+    private Long chargeTransactionId;
+
+    @JsonProperty("chargeTransactionId")
+    public Long getChargeTransactionId() {
+        return chargeTransactionId;
+    }
+
+    public void setChargeTransactionId(Long chargeTransactionId) {
+        this.chargeTransactionId = chargeTransactionId;
+    }
+
+    //    public void setEditable(Boolean editable) {
+    //        this.editable = editable;
+    //    }
+
+    @Transient
+    private Boolean charged;
+
+    @JsonProperty("charged")
+    public Boolean getCharged() {
+        return charged;
+    }
+
+    public void setCharged(Boolean charged) {
+        this.charged = charged;
+    }
+
+    @Transient
+    private Boolean current;
+
+    @JsonProperty("current")
+    public Boolean getCurrent() {
+        return current;
+    }
+
+    public void setCurrent(Boolean current) {
+        this.current = current;
+    }
+
+    @JsonProperty("active")
+    public Boolean getActive() {
+        if (date == null) return false;
+        LocalDate currentDate = LocalDate.now();
+        long daysBetween = ChronoUnit.DAYS.between(this.date, currentDate);
+        return daysBetween <= 0;
+    }
+
+    //    @Transient
+    //    private Boolean deletable;
+
+    @JsonProperty("deletable")
+    public Boolean getDeletable() {
+        return getEditable();
+    }
+
+    //    public void setDeletable(Boolean deletable) {
+    //        this.deletable = deletable;
+    //    }
+
     public Integer getPlayersLimit() {
         return this.playersLimit;
     }

src/main/java/com/sasiedzi/event/domain/Transaction.java

@@ -6,6 +6,7 @@ import com.sasiedzi.event.domain.enumeration.TransactionType;
 import jakarta.persistence.*;
 import java.io.Serializable;
 import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -80,6 +81,33 @@ public class Transaction implements Serializable {
         return this;
     }
 
+    //    @Transient
+    //    private Boolean editable;
+
+    @JsonProperty("editable")
+    public Boolean getEditable() {
+        if (date == null) return false;
+        LocalDate currentDate = LocalDate.now();
+        long daysBetween = ChronoUnit.DAYS.between(this.date, currentDate);
+        return daysBetween <= 7;
+    }
+
+    //    public void setEditable(Boolean editable) {
+    //        this.editable = editable;
+    //    }
+
+    //    @Transient
+    //    private Boolean deletable;
+
+    @JsonProperty("deletable")
+    public Boolean getDeletable() {
+        return getEditable();
+    }
+
+    //    public void setDeletable(Boolean deletable) {
+    //        this.deletable = deletable;
+    //    }
+
     public void setType(TransactionType type) {
         this.type = type;
     }

src/main/java/com/sasiedzi/event/repository/EventRepository.java

@@ -1,7 +1,10 @@
 package com.sasiedzi.event.repository;
 
+import com.sasiedzi.event.domain.Charge;
 import com.sasiedzi.event.domain.Event;
+import java.util.List;
 import org.springframework.data.jpa.repository.*;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -9,4 +12,7 @@ import org.springframework.stereotype.Repository;
  */
 @SuppressWarnings("unused")
 @Repository
-public interface EventRepository extends JpaRepository<Event, Long> {}
+public interface EventRepository extends JpaRepository<Event, Long> {
+    @Query("select event from Event event left join fetch event.transactions where event.id =:id")
+    Event findByIdWithTransactions(@Param("id") Long id);
+}

src/main/java/com/sasiedzi/event/service/EventService.java

@@ -126,6 +126,24 @@ public class EventService {
         return eventRepository.findById(id);
     }
 
+    @Transactional(readOnly = true)
+    public Event getEventForRegistration(Long id) {
+        LOG.debug("Request to get Event : {}", id);
+        Event event = eventRepository.findByIdWithTransactions(id);
+        event.setCurrent(id.equals(getCurrentEventId()));
+        event.setCharged(event.getTransactions().stream().anyMatch(t -> TransactionType.FIELDPAYMENT.equals(t.getType())));
+        event.setChargeTransactionId(
+            event
+                .getTransactions()
+                .stream()
+                .filter(t -> TransactionType.MATCH.equals(t.getType()))
+                .map(Transaction::getId)
+                .findFirst()
+                .orElse(null)
+        );
+        return event;
+    }
+
     /**
      * Delete the event by id.
      *

src/main/java/com/sasiedzi/event/service/TransactionService.java

@@ -116,6 +116,7 @@ public class TransactionService {
         setBeneficiary(newTransaction);
         newTransaction.setEvent(existing.getEvent());
         calculateBalances(existing.getTransactionItems().stream().map(TransactionItem::getUserAccount).toList());
+        Set<Long> processedAccounts = new HashSet<>();
         for (TransactionItem item : existing.getTransactionItems()) {
             BigDecimal accountBalance = item.getUserAccount().getBalance();
             if (accountBalance == null) {
@@ -125,7 +126,8 @@ public class TransactionService {
                 accountBalance.compareTo(BigDecimal.ZERO) < 0 &&
                 !Account.Skarbiec.toString().equals(item.getUserAccount().getName()) &&
                 !Account.Boisko.toString().equals(item.getUserAccount().getName()) &&
-                !Account.Counter.toString().equals(item.getUserAccount().getName())
+                !Account.Counter.toString().equals(item.getUserAccount().getName()) &&
+                !processedAccounts.contains(item.getUserAccount().getId())
             ) {
                 TransactionItem newItem = new TransactionItem();
                 newItem.setAmount(accountBalance.negate());
@@ -135,6 +137,7 @@ public class TransactionService {
                 newItem.setRegistration(item.getRegistration());
                 newItem.setComment(item.getComment());
                 newTransaction.getTransactionItems().add(newItem);
+                processedAccounts.add(item.getUserAccount().getId());
             }
         }
         return newTransaction;

src/main/java/com/sasiedzi/event/web/rest/EventResource.java

@@ -160,10 +160,9 @@ public class EventResource {
      * @return the {@link ResponseEntity} with status {@code 200 (OK)} and with body the event, or with status {@code 404 (Not Found)}.
      */
     @GetMapping("/{id}")
-    public ResponseEntity<Event> getEvent(@PathVariable("id") Long id) {
+    public Event getEvent(@PathVariable("id") Long id) {
         LOG.debug("REST request to get Event : {}", id);
-        Optional<Event> event = eventService.findOne(id);
-        return ResponseUtil.wrapOrNotFound(event);
+        return eventService.getEventForRegistration(id);
     }
 
     /**