New Update

1. Fix #309
megoRU · Jan 27, 2024 · c467d40 · c467d40
1 parent b343abf
commit c467d40
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/src/main/java/main/giveaway/Giveaway.java b/src/main/java/main/giveaway/Giveaway.java
@@ -58,15 +58,21 @@ public class Giveaway {
     private final ConcurrentLinkedQueue<Participants> participantsList;
 
     //REPO
+    @Getter(AccessLevel.NONE)
     private final ActiveGiveawayRepository activeGiveawayRepository;
+    @Getter(AccessLevel.NONE)
     private final ParticipantsRepository participantsRepository;
+    @Getter(AccessLevel.NONE)
     private final ListUsersRepository listUsersRepository;
 
     //Service
+    @Getter(AccessLevel.NONE)
     private final GiveawayMessageHandler giveawayMessageHandler;
+    @Getter(AccessLevel.NONE)
     private final GiveawaySaving giveawaySaving;
+    @Getter(AccessLevel.NONE)
     private final GiveawayEnd giveawayEnd;
-
+    @Getter(AccessLevel.NONE)
     private final GiveawayTimeHandler giveawayTimeHandler;
 
     @Autowired
@@ -169,6 +175,10 @@ public void addParticipantToList(Participants participants) {
         participantsList.add(participants);
     }
 
+    public void clearParticipant() {
+        participantsList.clear();
+    }
+
     public int getListUsersSize() {
         return listUsersHash.size();
     }

diff --git a/src/main/java/main/giveaway/GiveawayEnd.java b/src/main/java/main/giveaway/GiveawayEnd.java
@@ -62,6 +62,7 @@ public void stop(Giveaway giveaway, int countWinner) {
                 notEnoughUsers.setColor(Color.GREEN);
                 notEnoughUsers.setTitle(giftNotEnoughUsers);
                 notEnoughUsers.setDescription(giftGiveawayDeleted);
+                giveaway.clearParticipant();
                 //Отправляет сообщение
                 giveawayMessageHandler.editMessage(notEnoughUsers, guildId, textChannelId);
 
@@ -170,6 +171,7 @@ public void stop(Giveaway giveaway, int countWinner) {
             giveawayMessageHandler.editMessage(embedBuilder, guildId, textChannelId);
         }
 
+        giveaway.clearParticipant();
         //Удаляет данные из коллекций
         GiveawayRegistry instance = GiveawayRegistry.getInstance();
         instance.removeGiveaway(guildId);

diff --git a/src/main/java/main/giveaway/GiveawayRegistry.java b/src/main/java/main/giveaway/GiveawayRegistry.java
@@ -43,7 +43,7 @@ public void putGift(long guildId, Giveaway giveaway) {
         giveawayMap.put(guildId, giveaway);
     }
 
-    public void removeGiveaway(long guildId) {
+    public void removeGiveaway(Long guildId) {
         giveawayMap.remove(guildId);
     }
 }
diff --git a/src/main/java/main/giveaway/GiveawaySaving.java b/src/main/java/main/giveaway/GiveawaySaving.java
@@ -99,8 +99,8 @@ public void addUser(Giveaway giveaway, final User user) {
 
     public void saveParticipants(long guildId, ConcurrentLinkedQueue<Participants> participantsList) {
         GiveawayRegistry giveawayRegistry = GiveawayRegistry.getInstance();
-        boolean hasGiveaway = giveawayRegistry.hasGiveaway(guildId);
-        if (!hasGiveaway) return;
+        Giveaway giveaway = giveawayRegistry.getGiveaway(guildId);
+        if (giveaway == null) return;
 
         if (!participantsList.isEmpty()) {
             List<Participants> arrayList = new ArrayList<>(150);
@@ -111,10 +111,7 @@ public void saveParticipants(long guildId, ConcurrentLinkedQueue<Participants> p
                 }
             }
             try {
-                hasGiveaway = giveawayRegistry.hasGiveaway(guildId);
-                if (hasGiveaway) {
-                    participantsRepository.saveAll(arrayList);
-                }
+                participantsRepository.saveAll(arrayList);
             } catch (Exception e) {
                 LOGGER.log(Level.WARNING, e.getMessage(), e);
             }