[smarcet]

* updates on election purge process

Author: smarcet

elections/code/cron_tasks/RevocationNotificationSenderTask.php

@@ -35,13 +35,17 @@ function run(){
 
 		try{
 
-			$batch_size         = 100;
+			$batch_size         = 1000;
             $max_past_elections = 2 ;
 
 			if(isset($_GET['batch_size'])){
 				$batch_size = intval(trim(Convert::raw2sql($_GET['batch_size'])));
 			}
 
+            if(isset($_GET['max_past_elections'])){
+                $max_past_elections = intval(trim(Convert::raw2sql($_GET['max_past_elections'])));
+            }
+
 			$count = $this->manager->sendOutNotifications
             (
                 $max_past_elections,

elections/code/model/ElectionManager.php

@@ -105,10 +105,6 @@ public function ingestVotersForElection($filename, $election_id){
 				throw new NotFoundEntityException('Election');
 			}
 
-			if($election->VoterFileID > 0){
-			    throw new EntityValidationException("Election already processed a voter file!");
-            }
-
 			$reader        = new CSVReader($filename);
 			$line          = false;
 			$header        = $reader->getLine();
@@ -161,6 +157,17 @@ public function ingestVotersForElection($filename, $election_id){
                         continue;
                     }
 
+                    if(ElectionVote::get()->filter([
+                        'VoterID' => $member_2_process->ID,
+                        'ElectionID' => $election->ID,
+
+                        ])->count() > 0 )
+                    {
+                        $output .= sprintf("member id %s - first_name %s - last_name %s already voted as member id %s", $member_id, $first_name, $last_name, $member_2_process->ID).PHP_EOL;
+                        $not_processed[] = ['id' => $member_id, 'first_name' => $first_name, 'last_name' => $last_name];
+                        continue;
+                    }
+
                     $output .= sprintf("processed member id %s - first_name %s - last_name %s OK", $member_id, $first_name, $last_name).PHP_EOL;
                     $vote = $this->vote_factory->buildVote($election, $member_2_process);
                     $vote->write();

elections/code/model/FoundationMembershipRevocationSpecification.php

@@ -67,10 +67,11 @@ public function sql($latest_elections_qty, $necessary_votes, IElectionRepository
 		foreach($elections as $election)
 			array_push($elections_id, $election->getIdentifier());
 
-		$elections_id = implode(',',$elections_id);
+		$elections_id       = implode(',',$elections_id);
         $election_time_zone = $latest_election->getEntityTimeZone();
         $cut_date           = new DateTime('2014-01-13', $election_time_zone);
         $election_open_date = new DateTime($latest_election->getElectionsOpen(), $election_time_zone);
+
 		if($election_open_date <= $cut_date) { // until January 2014
 			$sql = <<<SQL
 					-- members that did not vote on any latest election