chore: merged if condition

- cleardb removed in update period
icon-community · Nov 6, 2023 · 659b0c7 · 659b0c7
1 parent d3857f8
commit 659b0c7
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/CPSCore/src/main/java/community/icon/cps/score/cpscore/CPSCore.java b/CPSCore/src/main/java/community/icon/cps/score/cpscore/CPSCore.java
@@ -1249,8 +1249,8 @@ private void updateMilestoneDB(String milestonePrefix,String progressPrefix, int
             prepVote.set(VOTE,0);
         }
         clearArrayDb(MilestoneDb.votersList.at(milestonePrefix));
-        removeArrayItem(milestoneSubmitted.at(progressPrefix),milestoneId);
-        clearArrayDb(ProgressReportDataDb.votersReasons.at(progressPrefix));// TODO: removing milestone submitted and voteReason
+//        removeArrayItem(milestoneSubmitted.at(progressPrefix),milestoneId);
+//        clearArrayDb(ProgressReportDataDb.votersReasons.at(progressPrefix));// TODO: removing milestone submitted and voteReason
     }
 
     /***
@@ -2188,19 +2188,12 @@ private void updateApplicationResult() {
             period.periodName.set(APPLICATION_PERIOD);
             PeriodUpdate("Period Updated back to Application Period due to less Registered P-Reps Count");
 
-        } else if (getProposalsKeysByStatus(PENDING).size() == 0 && status.progressReportStatus.get(WAITING).size() == 0 && activeProposals.size() + status.paused.size() == 0) {
+        } else if (getProposalsKeysByStatus(PENDING).size() == 0 && status.progressReportStatus.get(WAITING).size() == 0 && activeProposals.size() + status.paused.size() >= 0) {
             createActiveProposalDb();
             checkProgressReportSubmission();
             period.periodName.set(APPLICATION_PERIOD);
             PeriodUpdate("Period Updated back to Application Period due not enough " +
                     "Voting Proposals or Progress Reports.");
-        } else if (status.pending.size() == 0 && status.waitingProgressReports.size() == 0 && activeProposals.size() + status.paused.size() > 0) {
-            createActiveProposalDb();
-            checkProgressReportSubmission();
-            period.periodName.set(APPLICATION_PERIOD);
-            PeriodUpdate("Period Updated back to Application Period due not enough " +
-                    "Voting Proposals or Progress Reports.");
-
         } else {
             createActiveProposalDb();
             PeriodUpdate("Period Updated to Voting Period");