Merge pull request #221 from BaranekD/fix_aup

fix: Fixed AUP

Author: Dominik František Bučík

lib/Auth/Process/ForceAup.php

@@ -157,7 +157,13 @@ public function process(&$request)
             $perunAups = $this->getPerunAups();
             $voAups = $this->getVoAups($voShortNames);
 
-            $aupsToBeApproved = $this->getAupsToBeApproved($perunAups, $voAups, $requestedAups, $userAups);
+            $aupsToBeApproved = $this->getAupsToBeApproved(
+                $perunAups,
+                $voAups,
+                $voShortNames,
+                $requestedAups,
+                $userAups
+            );
         } catch (\Exception $ex) {
             Logger::warning('perun:ForceAup - ' . $ex->getMessage());
             $aupsToBeApproved = [];
@@ -240,7 +246,7 @@ private function getPerunAups()
         return $perunAups;
     }
 
-    private function getAupsToBeApproved($perunAups, $voAups, $requestedAups, $userAups)
+    private function getAupsToBeApproved($perunAups, $voAups, $voShortNames, $requestedAups, $userAups)
     {
         $perunAupsToBeApproved = [];
         if (!empty($perunAups)) {
@@ -249,7 +255,7 @@ private function getAupsToBeApproved($perunAups, $voAups, $requestedAups, $userA
 
         $voAupsToBeApproved = [];
         if (!empty($voAups)) {
-            $voAupsToBeApproved = $this->fillAupsToBeApproved($requestedAups, $voAups, $userAups);
+            $voAupsToBeApproved = $this->fillAupsToBeApproved($voShortNames, $voAups, $userAups);
         }
 
         return $this->mergeAupsToBeApproved($perunAupsToBeApproved, $voAupsToBeApproved);
@@ -294,9 +300,9 @@ private function mergeAupsToBeApproved(array $perunAupsToBeApproved, array $voAu
                 $voLatestDate = self::parseDateTime($voAup->date);
                 $perunLatestDate = self::parseDateTime($perunAupsToBeApproved[$aupKey]->date);
                 if ($voLatestDate >= $perunLatestDate) {
-                    $resultAups[$aupKey] = $voLatestDate;
+                    $resultAups[$aupKey] = $voAup;
                 } else {
-                    $resultAups[$aupKey] = $perunLatestDate;
+                    $resultAups[$aupKey] = $perunAupsToBeApproved[$aupKey];
                 }
             } else {
                 $resultAups[$aupKey] = $voAup;