Merge pull request #2 from vaniii1/balActivity

vaniii1 · web-flow · commit ed1c0e4a61f9 · 2025-05-10T13:10:47.000+02:00
added BalanceActivity model and corresponding methods
diff --git a/src/main/java/ivan/solscanbot/dto/external/BalanceActivitiesResponseDto.java b/src/main/java/ivan/solscanbot/dto/external/BalanceActivitiesResponseDto.java
@@ -0,0 +1,11 @@
+package ivan.solscanbot.dto.external;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Set;
+import lombok.Data;
+
+@Data
+public class BalanceActivitiesResponseDto {
+    @JsonProperty("data")
+    private Set<SingleBalanceActivityResponseDto> activities;
+}
diff --git a/src/main/java/ivan/solscanbot/dto/external/SingleBalanceActivityResponseDto.java b/src/main/java/ivan/solscanbot/dto/external/SingleBalanceActivityResponseDto.java
@@ -0,0 +1,19 @@
+package ivan.solscanbot.dto.external;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+@Data
+public class SingleBalanceActivityResponseDto {
+    private String address;
+    @JsonProperty("token_address")
+    private String tokenAddress;
+    @JsonProperty("activity_type")
+    private String activityType;
+    private BigDecimal amount;
+    @JsonProperty("pre_balance")
+    private BigDecimal preBalance;
+    private Date time;
+}
diff --git a/src/main/java/ivan/solscanbot/dto/external/SingleTokenNameResponseDto.java b/src/main/java/ivan/solscanbot/dto/external/SingleTokenNameResponseDto.java
diff --git a/src/main/java/ivan/solscanbot/dto/external/SingleTokenPortfolioResponseDto.java b/src/main/java/ivan/solscanbot/dto/external/SingleTokenPortfolioResponseDto.java
@@ -0,0 +1,17 @@
+package ivan.solscanbot.dto.external;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.math.BigDecimal;
+import lombok.Data;
+
+@Data
+public class SingleTokenPortfolioResponseDto {
+    @JsonProperty("token_name")
+    private String tokenName;
+    @JsonProperty("token_address")
+    private String tokenAddress;
+    @JsonProperty("token_balance")
+    private String tokenBalance;
+    @JsonProperty("value")
+    private BigDecimal tokenValue;
+}
diff --git a/src/main/java/ivan/solscanbot/dto/external/TokenMetaResponseDto.java b/src/main/java/ivan/solscanbot/dto/external/TokenMetaResponseDto.java
@@ -0,0 +1,9 @@
+package ivan.solscanbot.dto.external;
+
+import lombok.Data;
+
+@Data
+public class TokenMetaResponseDto {
+    private String name;
+    private String symbol;
+}
diff --git a/src/main/java/ivan/solscanbot/dto/external/TokenNamesResponseDto.java b/src/main/java/ivan/solscanbot/dto/external/TokenNamesResponseDto.java
diff --git a/src/main/java/ivan/solscanbot/dto/external/TokenPortfoliosResponseDto.java b/src/main/java/ivan/solscanbot/dto/external/TokenPortfoliosResponseDto.java
@@ -0,0 +1,9 @@
+package ivan.solscanbot.dto.external;
+
+import java.util.Set;
+import lombok.Data;
+
+@Data
+public class TokenPortfoliosResponseDto {
+    private Set<SingleTokenPortfolioResponseDto> tokens;
+}
diff --git a/src/main/java/ivan/solscanbot/dto/internal/BalanceActivity.java b/src/main/java/ivan/solscanbot/dto/internal/BalanceActivity.java
@@ -0,0 +1,40 @@
+package ivan.solscanbot.dto.internal;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.SQLRestriction;
+
+@Data
+@Entity
+@NoArgsConstructor
+@Accessors(chain = true)
+@SQLDelete(sql = "UPDATE roles SET is_deleted = true WHERE id = ?")
+@SQLRestriction("is_deleted = false")
+public class BalanceActivity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    @Column(nullable = false)
+    private String address;
+    @Column(nullable = false, name = "token_address")
+    private String tokenAddress;
+    @Column(nullable = false, name = "token_name")
+    private String tokenName;
+    @Column(nullable = false, name = "token_symbol")
+    private String tokenSymbol;
+    @Column(nullable = false)
+    private BigDecimal amount;
+    @Column(nullable = false)
+    private Date time;
+    @Column(nullable = false, name = "is_deleted")
+    private boolean isDeleted = false;
+}
diff --git a/src/main/java/ivan/solscanbot/dto/internal/MonitoredAddress.java b/src/main/java/ivan/solscanbot/dto/internal/MonitoredAddress.java
@@ -15,13 +15,13 @@
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 import org.hibernate.annotations.SQLDelete;
-import org.hibernate.annotations.Where;
+import org.hibernate.annotations.SQLRestriction;
 
 @Entity
 @Data
 @NoArgsConstructor
 @SQLDelete(sql = "UPDATE roles SET is_deleted = true WHERE id = ?")
-@Where(clause = "is_deleted = false")
+@SQLRestriction("is_deleted = false")
 public class MonitoredAddress {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/ivan/solscanbot/dto/internal/Token.java b/src/main/java/ivan/solscanbot/dto/internal/Token.java
@@ -5,22 +5,29 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import java.math.BigDecimal;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
-import org.hibernate.annotations.Where;
+import org.hibernate.annotations.SQLRestriction;
 
 @Data
 @Entity
 @NoArgsConstructor
 @SQLDelete(sql = "UPDATE roles SET is_deleted = true WHERE id = ?")
-@Where(clause = "is_deleted = false")
+@SQLRestriction("is_deleted = false")
 public class Token {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     @Column(unique = true, nullable = false, name = "token_name")
     private String tokenName;
+    @Column(unique = true, nullable = false, name = "token_address")
+    private String tokenAddress;
+    @Column(unique = true, nullable = false, name = "token_balance")
+    private String tokenBalance;
+    @Column(unique = true, nullable = false, name = "token_value")
+    private BigDecimal tokenValue;
     @Column(name = "is_deleted")
     private boolean isDeleted = false;
 }
diff --git a/src/main/java/ivan/solscanbot/mapper/ActivityMapper.java b/src/main/java/ivan/solscanbot/mapper/ActivityMapper.java
@@ -0,0 +1,11 @@
+package ivan.solscanbot.mapper;
+
+import ivan.solscanbot.config.MapperConfig;
+import ivan.solscanbot.dto.external.SingleBalanceActivityResponseDto;
+import ivan.solscanbot.dto.internal.BalanceActivity;
+import org.mapstruct.Mapper;
+
+@Mapper(config = MapperConfig.class)
+public interface ActivityMapper {
+    BalanceActivity toModel(SingleBalanceActivityResponseDto activityDto);
+}
diff --git a/src/main/java/ivan/solscanbot/mapper/TokenMapper.java b/src/main/java/ivan/solscanbot/mapper/TokenMapper.java
@@ -1,11 +1,11 @@
 package ivan.solscanbot.mapper;
 
 import ivan.solscanbot.config.MapperConfig;
-import ivan.solscanbot.dto.external.SingleTokenNameResponseDto;
+import ivan.solscanbot.dto.external.SingleTokenPortfolioResponseDto;
 import ivan.solscanbot.dto.internal.Token;
 import org.mapstruct.Mapper;
 
 @Mapper(config = MapperConfig.class)
 public interface TokenMapper {
-    Token toModel(SingleTokenNameResponseDto dto);
+    Token toModel(SingleTokenPortfolioResponseDto dto);
 }
diff --git a/src/main/java/ivan/solscanbot/repository/ActivityRepository.java b/src/main/java/ivan/solscanbot/repository/ActivityRepository.java
@@ -0,0 +1,7 @@
+package ivan.solscanbot.repository;
+
+import ivan.solscanbot.dto.internal.BalanceActivity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ActivityRepository extends JpaRepository<BalanceActivity, Long> {
+}
diff --git a/src/main/java/ivan/solscanbot/service/MonitoringService.java b/src/main/java/ivan/solscanbot/service/MonitoringService.java
@@ -1,32 +1,59 @@
 package ivan.solscanbot.service;
 
+import ivan.solscanbot.dto.external.TokenMetaResponseDto;
+import ivan.solscanbot.dto.internal.BalanceActivity;
 import ivan.solscanbot.dto.internal.MonitoredAddress;
+import ivan.solscanbot.mapper.ActivityMapper;
+import ivan.solscanbot.repository.ActivityRepository;
 import ivan.solscanbot.repository.MonitoredAddressRepository;
+import java.math.BigDecimal;
+import java.util.Set;
+import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;
 import org.jvnet.hk2.annotations.Service;
 import org.springframework.scheduling.annotation.Scheduled;
 
 @Service
+@RequiredArgsConstructor
 public class MonitoringService {
     private final MonitoredAddressRepository addressRepository;
     private final DeFiMonitorBot deFiMonitorBot;
     private final SolScanServiceImpl solScanService;
-
-    public MonitoringService(
-            MonitoredAddressRepository addressRepository,
-            DeFiMonitorBot deFiMonitorBot,
-            SolScanServiceImpl solScanService) {
-        this.addressRepository = addressRepository;
-        this.deFiMonitorBot = deFiMonitorBot;
-        this.solScanService = solScanService;
-    }
+    private final ActivityRepository activityRepository;
+    private final ActivityMapper activityMapper;
 
     @Scheduled(fixedRate = 15000)
     public void sendTokenList() {
         for (MonitoredAddress address : addressRepository.findAll()) {
             try {
-                String notification = "Tokens for address: " + address.getAddress()
-                        + solScanService.getTokensByAddress(address.getAddress());
-                deFiMonitorBot.sendNotification(address.getId(), notification);
+                Set<BalanceActivity> activities =
+                        solScanService.getNewBalanceActivities(address.getAddress())
+                                .stream()
+                                .filter(a -> BigDecimal.ZERO.equals(a.getPreBalance()))
+                                .map(activityMapper::toModel)
+                                .collect(Collectors.toSet());
+                if (!activities.isEmpty()) {
+                    StringBuilder notification = new StringBuilder();
+                    notification.append("New activity for Solana address\n")
+                            .append(address.getAddress())
+                            .append("was found");
+                    int count = 1;
+                    for (BalanceActivity activity : activities) {
+                        TokenMetaResponseDto meta =
+                                solScanService.getTokenMetaFromAddress(address.getAddress());
+                        activity.setTokenName(meta.getName())
+                                .setTokenSymbol(meta.getSymbol());
+                        notification.append("\n").append(count++)
+                                .append(". token address: ").append(activity.getTokenAddress())
+                                .append("\n")
+                                .append(". token address: ").append(activity.getTokenAddress())
+                                .append("\n")
+                                .append("token amount: ").append(activity.getAmount()).append("\n")
+                                .append("time: ").append(activity.getTime()).append("\n");
+                    }
+                    activityRepository.saveAll(activities);
+                    deFiMonitorBot.sendNotification(address.getChatId(), notification.toString());
+                }
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
diff --git a/src/main/java/ivan/solscanbot/service/SolScanService.java b/src/main/java/ivan/solscanbot/service/SolScanService.java
@@ -1,8 +1,14 @@
 package ivan.solscanbot.service;
 
-import ivan.solscanbot.dto.external.SingleTokenNameResponseDto;
+import ivan.solscanbot.dto.external.SingleBalanceActivityResponseDto;
+import ivan.solscanbot.dto.external.SingleTokenPortfolioResponseDto;
+import ivan.solscanbot.dto.external.TokenMetaResponseDto;
 import java.util.Set;
 
 public interface SolScanService {
-    Set<SingleTokenNameResponseDto> getTokensByAddress(String address);
+    Set<SingleTokenPortfolioResponseDto> getTokensByAddress(String address);
+
+    Set<SingleBalanceActivityResponseDto> getNewBalanceActivities(String address);
+
+    TokenMetaResponseDto getTokenMetaFromAddress(String address);
 }
diff --git a/src/main/java/ivan/solscanbot/service/SolScanServiceImpl.java b/src/main/java/ivan/solscanbot/service/SolScanServiceImpl.java
