Additional checks in generate_unique_survey_link

Author: Baguage

CHANGELOG.txt

@@ -1,7 +1,7 @@
 0.5.0
   * More tests
 
-0.4.1 4/18/2016
+0.4.1 4/20/2016
   [+] createDistribution function (for generating unique survey links)
   [+] generate_unique_survey_link function
   [*] fixed bug #17 preserve order of responses in getLegacyResponseData

pyqualtrics/__init__.py

@@ -531,11 +531,23 @@ def generate_unique_survey_link(self, SurveyID, LibraryID, PanelID, Distribution
         :return:
         """
         assert isinstance(EmbeddedData, (dict, type(None)))
+        assert isinstance(SurveyID, (str, unicode))
+        assert isinstance(DistributionID, (str, unicode))
+
         if EmbeddedData is None:
             EmbeddedData = {}
         recipient_id = self.addRecipient(LibraryID, PanelID, FirstName=FirstName, LastName=LastName, Email=Email, ExternalDataRef=ExternalDataRef, Language=Language, ED=EmbeddedData)
         if recipient_id is None:
+            # last_error_message is set by addRecipient function
+            return None
+        if "_" not in SurveyID:
+            self.last_error_message = "Invalid SurveyID format (must be SV_xxxxxxxxxx)"
             return None
+
+        if "_" not in DistributionID:
+            self.last_error_message = "Invalid DistributionID format (must be EMD_xxxxxxxxxx)"
+            return None
+
         link = DistributionID.split("_")[1] + "_" + SurveyID.split("_")[1] + "_" + recipient_id
 
         link = "http://new.qualtrics.com/SE?Q_DL=%s" % link

pyqualtrics/tests.py

@@ -454,6 +454,32 @@ def test_generate_unique_survey_link(self):
         self.assertNotEquals(link2, link3)
         self.assertIsNone(self.qualtrics.last_error_message)
 
+        link4 = self.qualtrics.generate_unique_survey_link(
+            SurveyID="",
+            LibraryID=self.library_id,
+            PanelID=panel_id,
+            DistributionID=distribution_id,
+            FirstName="Py",
+            LastName="Qualtrics",
+            Email="[email protected]",
+        )
+        self.assertIsNone(link4)
+        self.assertIsNotNone(self.qualtrics.last_error_message)
+        print self.qualtrics.last_error_message
+
+        link5 = self.qualtrics.generate_unique_survey_link(
+            SurveyID=self.survey_id,
+            LibraryID="",
+            PanelID=panel_id,
+            DistributionID=distribution_id,
+            FirstName="Py",
+            LastName="Qualtrics",
+            Email="[email protected]",
+        )
+        self.assertIsNone(link4)
+        self.assertIsNotNone(self.qualtrics.last_error_message)
+        print self.qualtrics.last_error_message
+
         self.qualtrics.deletePanel(self.library_id, panel_id)
         self.assertIsNone(self.qualtrics.last_error_message)