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/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)
     {
@@ -160,10 +165,13 @@ class SurveyService
     /**
      * Returns information if survey with given ID exists
      *
-     * @param int  $surveyId       ID of survey to verify
+     * @param int $surveyId ID of survey to verify
      * @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)
     {
@@ -221,14 +229,17 @@ class SurveyService
     /**
      * Returns participants of given survey
      *
-     * @param int  $surveyId      ID of survey
+     * @param int $surveyId ID of survey
      * @param bool $onlyCompleted (optional) If is set to true, participants who completed survey are returned only.
      *                            Otherwise - all (default behaviour).
      * @return Collection
      *
      * @throws CannotProcessDataException
+     * @throws MissingSurveySummaryException
+     * @throws UnknownInstanceOfResultItem
+     * @throws UnknownMethodException
      */
-    public function getSurveyParticipants($surveyId, $onlyCompleted = false, array $criteria = [])
+    public function getSurveyParticipants($surveyId, $onlyCompleted = false)
     {
         $hasSurvey = $this
             ->allParticipants
@@ -244,8 +255,6 @@ class SurveyService
                 $offset,
                 $limit,
                 $includeUnused,
-                $attributes = false,
-                $criteria
             ];
 
             try {
@@ -277,11 +286,14 @@ class SurveyService
     /**
      * Adds participant with given data to survey with given ID
      *
-     * @param int    $surveyId  ID of survey
+     * @param int $surveyId ID of survey
      * @param string $firstName First name of the participant to add
-     * @param string $lastName  Last ame of the participant to add
+     * @param string $lastName Last ame of the participant to add
-     * @param string $email     E-mail address 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)
     {
@@ -290,6 +302,7 @@ class SurveyService
                 'firstname' => $firstName,
                 'lastname'  => $lastName,
                 'email'     => $email,
+                'validfrom' => date('Y-m-d H:i:s'),
             ],
         ];
 
@@ -320,9 +333,13 @@ class SurveyService
     /**
      * Returns short data of one participant with given e-mail (participant of given survey)
      *
-     * @param int    $surveyId ID of survey
+     * @param int $surveyId ID of survey
-     * @param string $email    E-mail address of the participant
+     * @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)
     {
@@ -345,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)
     {
@@ -376,6 +396,9 @@ class SurveyService
      *
      * @param int $surveyId ID of survey
      * @return SurveySummary|null
+     * @throws CannotProcessDataException
+     * @throws UnknownInstanceOfResultItem
+     * @throws UnknownMethodException
      */
     private function getSurveySummary($surveyId)
     {
@@ -397,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;
+    }
 }