Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skin Surveys #596

Merged
merged 7 commits into from
Feb 12, 2025
Merged

Skin Surveys #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
325a085
Add skin surveys
cassidysymons Dec 7, 2024
d7df3a3
Block skin surveys from Qiita
cassidysymons Jan 9, 2025
fa3f56f
Mv 0143.sql 0144.sql
cassidysymons Jan 10, 2025
1020327
Merge pull request #595 from biocore/master
cassidysymons Jan 10, 2025
16d80e6
Lint and unit tests
cassidysymons Jan 10, 2025
4963bad
Mv 0144.sql 0145.sql
cassidysymons Feb 12, 2025
12df590
Merge branch 'master' into csymons_skin_surveys
cassidysymons Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion microsetta_private_api/api/_survey.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 5 additions & 3 deletions microsetta_private_api/api/tests/test_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down Expand Up @@ -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):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Curious: why were these surveys deleted?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The surveys were removed from the actual user flow during the relaunch process, but not from this integration test. The fact that the test wasn't failing, even though we retired the surveys, is something that I'll need to investigate and I've created a GitHub issue reflecting that. Good catch.

SurveyTemplateRepo.SKIN_ID,
SurveyTemplateRepo.SKIN_HEALTH_DIAGNOSIS_ID,
SurveyTemplateRepo.OTHER_ID):
continue

resp = self.client.get(
Expand Down
Loading