Merge pull request #596 from biocore/csymons_skin_surveys

Skin Surveys

Author: cassidysymons

microsetta_private_api/api/_survey.py

@@ -54,13 +54,14 @@ def read_survey_templates(account_id, source_id, language_tag, token_info):
                 SurveyTemplateRepo.ALLERGIES_ID,
                 SurveyTemplateRepo.DIET_ID,
                 SurveyTemplateRepo.DETAILED_DIET_ID,
+                SurveyTemplateRepo.SKIN_ID,
+                SurveyTemplateRepo.SKIN_HEALTH_DIAGNOSIS_ID,
                 SurveyTemplateRepo.OTHER_ID
             ]
             if template_repo.check_display_skin_scoring_app(
                 account_id, source_id
             ):
                 template_ids.append(SurveyTemplateRepo.SKIN_SCORING_APP_ID)
-
         elif source.source_type == Source.SOURCE_TYPE_ANIMAL:
             template_ids = [2]
         else:

microsetta_private_api/api/tests/test_integration.py

@@ -419,6 +419,8 @@ def test_surveys(self):
                               SurveyTemplateRepo.ALLERGIES_ID,
                               SurveyTemplateRepo.DIET_ID,
                               SurveyTemplateRepo.DETAILED_DIET_ID,
+                              SurveyTemplateRepo.SKIN_ID,
+                              SurveyTemplateRepo.SKIN_HEALTH_DIAGNOSIS_ID,
                               SurveyTemplateRepo.OTHER_ID])
         self.assertListEqual([x["survey_template_id"] for x in doggy_surveys],
                              [2])
@@ -702,9 +704,9 @@ def test_bobo_takes_all_local_surveys(self):
                                  SurveyTemplateRepo.ALLERGIES_ID,
                                  SurveyTemplateRepo.DIET_ID,
                                  SurveyTemplateRepo.DETAILED_DIET_ID,
-                                 SurveyTemplateRepo.MIGRAINE_ID,
-                                 SurveyTemplateRepo.SURFERS_ID,
-                                 SurveyTemplateRepo.COVID19_ID):
+                                 SurveyTemplateRepo.SKIN_ID,
+                                 SurveyTemplateRepo.SKIN_HEALTH_DIAGNOSIS_ID,
+                                 SurveyTemplateRepo.OTHER_ID):
                 continue
 
             resp = self.client.get(