Merge pull request #7 from wiosna-dev/feature/WZUW-1498-Lime_misinterpretation_of_time

[WZUW-1498] [prod] Using 24-hour format to set validfrom date_time

composer.json

@@ -12,7 +12,7 @@
     "require": {
         "php": ">=5.6",
         "fguillot/json-rpc": "^1.2",
-        "wiosna-dev/common-library": "^0.1.0"
+        "wiosna-dev/common-library": "^0.2.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.6",

src/Base/Result/BaseParticipant.php

@@ -39,6 +39,13 @@ abstract class BaseParticipant extends BaseItem
      */
     protected $email;
 
+    /**
+     * Token of the participant
+     *
+     * @var string
+     */
+    protected $token;
+
     /**
      * Returns ID of the participant
      *
@@ -78,4 +85,14 @@ abstract class BaseParticipant extends BaseItem
     {
         return $this->email;
     }
+
+    /**
+     * Returns token of the participant
+     *
+     * @return string
+     */
+    public function getToken()
+    {
+        return $this->token;
+    }
 }

src/Result/Item/Participant.php

@@ -42,13 +42,6 @@ class Participant extends BaseParticipant
      */
     private $emailStatus;
 
-    /**
-     * Token of the participant
-     *
-     * @var string
-     */
-    private $token;
-
     /**
      * Language of the participant
      *
@@ -232,16 +225,6 @@ class Participant extends BaseParticipant
         return $this->emailStatus;
     }
 
-    /**
-     * Returns token of the participant
-     *
-     * @return string
-     */
-    public function getToken()
-    {
-        return $this->token;
-    }
-
     /**
      * Returns language of the participant
      *

src/Result/Item/ParticipantShort.php

@@ -28,6 +28,10 @@ class ParticipantShort extends BaseParticipant
                 $this->id = (int)$value;
                 break;
 
+            case 'token':
+                $this->token = trim($value);
+                break;
+
             case 'participant_info':
                 $this->firstName = trim($value['firstname']);
                 $this->lastName = trim($value['lastname']);
@@ -52,6 +56,7 @@ class ParticipantShort extends BaseParticipant
 
         $data = [
             'tid'              => $participant->getId(),
+            'token'            => $participant->getToken(),
             'participant_info' => $info,
         ];
 

src/Service/SurveyService.php

@@ -12,6 +12,8 @@ use Meritoo\Common\Collection\Collection;
 use Meritoo\LimeSurvey\ApiClient\Client\Client;
 use Meritoo\LimeSurvey\ApiClient\Exception\CannotProcessDataException;
 use Meritoo\LimeSurvey\ApiClient\Exception\MissingSurveySummaryException;
+use Meritoo\LimeSurvey\ApiClient\Exception\UnknownInstanceOfResultItem;
+use Meritoo\LimeSurvey\ApiClient\Exception\UnknownMethodException;
 use Meritoo\LimeSurvey\ApiClient\Result\Collection\Participants;
 use Meritoo\LimeSurvey\ApiClient\Result\Collection\Surveys;
 use Meritoo\LimeSurvey\ApiClient\Result\Collection\SurveysSummaries;
@@ -21,6 +23,7 @@ use Meritoo\LimeSurvey\ApiClient\Result\Item\Survey;
 use Meritoo\LimeSurvey\ApiClient\Result\Item\SurveySummary;
 use Meritoo\LimeSurvey\ApiClient\Type\MethodType;
 use Meritoo\LimeSurvey\ApiClient\Type\ReasonType;
+use Meritoo\Common\Utilities\Date;
 
 /**
  * Service that serves surveys and participants of surveys
@@ -126,6 +129,8 @@ class SurveyService
      * @return Surveys
      *
      * @throws CannotProcessDataException
+     * @throws UnknownInstanceOfResultItem
+     * @throws UnknownMethodException
      */
     public function getAllSurveys($onlyActive = false)
     {
@@ -164,6 +169,9 @@ class SurveyService
      * @param bool $shouldBeActive (optional) If is set to true, survey should be active. If it's not, it shouldn't
      *                             be returned, even if exists. Otherwise - it doesn't matter (default behaviour).
      * @return bool
+     * @throws CannotProcessDataException
+     * @throws UnknownInstanceOfResultItem
+     * @throws UnknownMethodException
      */
     public function isExistingSurvey($surveyId, $shouldBeActive = false)
     {
@@ -227,6 +235,9 @@ class SurveyService
      * @return Collection
      *
      * @throws CannotProcessDataException
+     * @throws MissingSurveySummaryException
+     * @throws UnknownInstanceOfResultItem
+     * @throws UnknownMethodException
      */
     public function getSurveyParticipants($surveyId, $onlyCompleted = false)
     {
@@ -280,6 +291,9 @@ class SurveyService
      * @param string $lastName Last ame of the participant to add
      * @param string $email E-mail address of the participant to add
      * @return Participant
+     * @throws CannotProcessDataException
+     * @throws UnknownInstanceOfResultItem
+     * @throws UnknownMethodException
      */
     public function addParticipant($surveyId, $firstName, $lastName, $email)
     {
@@ -288,6 +302,7 @@ class SurveyService
                 'firstname' => $firstName,
                 'lastname'  => $lastName,
                 'email'     => $email,
+                'validfrom' => date('Y-m-d H:i:s'),
             ],
         ];
 
@@ -321,6 +336,10 @@ class SurveyService
      * @param int $surveyId ID of survey
      * @param string $email E-mail address of the participant
      * @return ParticipantShort|null
+     * @throws CannotProcessDataException
+     * @throws MissingSurveySummaryException
+     * @throws UnknownInstanceOfResultItem
+     * @throws UnknownMethodException
      */
     public function getParticipant($surveyId, $email)
     {
@@ -343,7 +362,10 @@ class SurveyService
      * @param int $surveyId ID of survey
      * @return int
      *
+     * @throws CannotProcessDataException
      * @throws MissingSurveySummaryException
+     * @throws UnknownInstanceOfResultItem
+     * @throws UnknownMethodException
      */
     public function getSurveyTokenCount($surveyId)
     {
@@ -374,6 +396,9 @@ class SurveyService
      *
      * @param int $surveyId ID of survey
      * @return SurveySummary|null
+     * @throws CannotProcessDataException
+     * @throws UnknownInstanceOfResultItem
+     * @throws UnknownMethodException
      */
     private function getSurveySummary($surveyId)
     {
@@ -395,4 +420,44 @@ class SurveyService
 
         return $surveySummary;
     }
+
+    /**
+     * @param $surveyId
+     * @param $email
+     * @return bool
+     * @throws CannotProcessDataException
+     * @throws UnknownInstanceOfResultItem
+     * @throws UnknownMethodException
+     */
+    public function hasSurveyBeenCompletedByEmail($surveyId, $email)
+    {
+        $arguments = [
+            $surveyId,
+            $offset = 0,
+            $limit = 10,
+            $includeUnused = false,
+            ['completed'],
+            ['email' => $email]
+        ];
+
+        try {
+            /** @var Collection $participants */
+            $participants = $this
+                ->client
+                ->run(MethodType::LIST_PARTICIPANTS, $arguments)
+                ->getData(true);
+
+            foreach ($participants as $participant) {
+                if ('N' !== $participant['completed']) {
+                    return true;
+                }
+            }
+        } catch (CannotProcessDataException $exception) {
+            if (ReasonType::NO_PARTICIPANTS_FOUND !== $exception->getReason()) {
+                throw $exception;
+            }
+        }
+
+        return false;
+    }
 }