Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
venv
__pycache__
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ CMD [ "run", "-h", "0.0.0.0"]
# TODO: in docker 25 and later, we should use --start-interval and
# --start-period to perform more frequent checks on startup to speed
# up tests
HEALTHCHECK --interval=10s CMD curl --fail http://localhost:5000 || exit 1
HEALTHCHECK --interval=600s --timeout=30s --start-period=60s --start-interval=5s --retries=3 CMD curl --fail http://localhost:5000 || exit 1
2 changes: 1 addition & 1 deletion application.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def get_people():
transformed_data = {}
for persondata in data:
transformed_data[persondata["name"]] = {
"interests": [skill["controlledName"] for skill in persondata["skills"]]
"interests": [skill["name"] for skill in persondata["skills"]]
}
return transformed_data

Expand Down
27 changes: 6 additions & 21 deletions capxmock/capxmock.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,12 @@
"response": {
"body":
[{"name": "Person A",
"skills": [{"controlledName": "Skill 1",
"hasValidWikiLink": 2,
"name": "Skill 1",
"rareness": 2,
"rarenessCount": 7,
"skillTagId": 1,
"tasksNeedingThisSkill": null},
{"controlledName": "Skill 2",
"hasValidWikiLink": 2,
"name": "Skill 2",
"rareness": 2,
"rarenessCount": 7,
"skillTagId": 1,
"tasksNeedingThisSkill": null}]},
"skills": [{"name": "Skill 1",
"skillTagId": 1},
{"name": "Skill 2",
"skillTagId": 1}]},
{"name": "Person B",
"skills": [{"controlledName": "Skill 3",
"hasValidWikiLink": 2,
"name": "Skill 3",
"rareness": 2,
"rarenessCount": 7,
"skillTagId": 1,
"tasksNeedingThisSkill": null}]}]
"skills": [{"name": "Skill 3",
"skillTagId": 1}]}]
}
}