Skip to content

Commit

Permalink
hotfix for weeklysummary data model update
Browse files Browse the repository at this point in the history
  • Loading branch information
@voynow
voynow committed Nov 5, 2024
1 parent ed1c462 commit 998bf66
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 74 deletions.
6 changes: 3 additions & 3 deletions mobile/mobile/Models.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@ struct WeekSummary: Codable {

var parsedWeekStartDate: Date? {
let formatter = DateFormatter()
formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
return formatter.date(from: weekStartDate)
formatter.dateFormat = "yyyy-MM-dd"
return formatter.date(from: weekStartDate.prefix(10).description)
}
}

Expand All @@ -182,4 +182,4 @@ enum AppStateStatus {
struct GenericResponse: Codable {
let success: Bool
let message: String?
}
}
2 changes: 1 addition & 1 deletion mobile/mobile/TrainingWeek.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ struct MultiWeekProgressView: View {
let numberOfWeeks: Int

private var displayedSummaries: [WeekSummary] {
Array(weeklySummaries.prefix(numberOfWeeks).reversed())
Array(weeklySummaries.prefix(numberOfWeeks))
}

private var maxMileage: Double {
Expand Down
93 changes: 23 additions & 70 deletions test.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,23 @@
"metadata": {},
"outputs": [],
"source": [
"# import requests\n",
"# import os\n",
"import requests\n",
"import os\n",
"\n",
"# url = \"https://lwg77yq7dd.execute-api.us-east-1.amazonaws.com/prod/signup\"\n",
"url = \"https://lwg77yq7dd.execute-api.us-east-1.amazonaws.com/prod/signup\"\n",
"\n",
"# response = requests.post(url, json={\n",
"# \"trigger_test_key\": os.environ[\"TRIGGER_TEST_KEY\"]\n",
"# })\n",
"response = requests.post(url, json={\n",
" \"trigger_test_key\": os.environ[\"TRIGGER_TEST_KEY\"]\n",
"})\n",
"\n",
"# response.json()"
"response.json()"
]
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": 3,
"metadata": {},
"outputs": [
{
"name": "stderr",
"output_type": "stream",
"text": [
"No rates present in response headers\n"
]
}
],
"outputs": [],
"source": [
"import os\n",
"from src.auth_manager import get_strava_client\n",
Expand All @@ -61,71 +53,32 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": 4,
"metadata": {},
"outputs": [
{
"data": {
"text/plain": [
"[ActivitySummary(date='Monday, September 16, 2024', distance_in_miles=0.0, elevation_gain_in_feet=0.0, pace_minutes_per_mile=None),\n",
" ActivitySummary(date='Tuesday, September 17, 2024', distance_in_miles=0.0, elevation_gain_in_feet=0.0, pace_minutes_per_mile=None),\n",
" ActivitySummary(date='Wednesday, September 18, 2024', distance_in_miles=0.0, elevation_gain_in_feet=0.0, pace_minutes_per_mile=None),\n",
" ActivitySummary(date='Thursday, September 19, 2024', distance_in_miles=0.0, elevation_gain_in_feet=0.0, pace_minutes_per_mile=None),\n",
" ActivitySummary(date='Friday, September 20, 2024', distance_in_miles=0.0, elevation_gain_in_feet=0.0, pace_minutes_per_mile=None),\n",
" ActivitySummary(date='Saturday, September 21, 2024', distance_in_miles=0.0, elevation_gain_in_feet=0.0, pace_minutes_per_mile=None),\n",
" ActivitySummary(date='Sunday, September 22, 2024', distance_in_miles=0.0, elevation_gain_in_feet=0.0, pace_minutes_per_mile=None),\n",
" ActivitySummary(date='Monday, September 23, 2024', distance_in_miles=0.0, elevation_gain_in_feet=0.0, pace_minutes_per_mile=None),\n",
" ActivitySummary(date='Tuesday, September 24, 2024', distance_in_miles=1.0, elevation_gain_in_feet=26.25, pace_minutes_per_mile=10.32),\n",
" ActivitySummary(date='Wednesday, September 25, 2024', distance_in_miles=4.56, elevation_gain_in_feet=29.53, pace_minutes_per_mile=9.69),\n",
" ActivitySummary(date='Thursday, September 26, 2024', distance_in_miles=0.0, elevation_gain_in_feet=0.0, pace_minutes_per_mile=None),\n",
" ActivitySummary(date='Friday, September 27, 2024', distance_in_miles=5.8, elevation_gain_in_feet=196.85, pace_minutes_per_mile=9.66),\n",
" ActivitySummary(date='Saturday, September 28, 2024', distance_in_miles=9.01, elevation_gain_in_feet=164.04, pace_minutes_per_mile=9.48),\n",
" ActivitySummary(date='Sunday, September 29, 2024', distance_in_miles=0.0, elevation_gain_in_feet=0.0, pace_minutes_per_mile=None),\n",
" ActivitySummary(date='Monday, September 30, 2024', distance_in_miles=0.0, elevation_gain_in_feet=0.0, pace_minutes_per_mile=None),\n",
" ActivitySummary(date='Tuesday, October 01, 2024', distance_in_miles=9.04, elevation_gain_in_feet=410.11, pace_minutes_per_mile=9.64),\n",
" ActivitySummary(date='Wednesday, October 02, 2024', distance_in_miles=11.74, elevation_gain_in_feet=259.19, pace_minutes_per_mile=8.98),\n",
" ActivitySummary(date='Thursday, October 03, 2024', distance_in_miles=4.24, elevation_gain_in_feet=49.21, pace_minutes_per_mile=9.85),\n",
" ActivitySummary(date='Friday, October 04, 2024', distance_in_miles=0.0, elevation_gain_in_feet=0.0, pace_minutes_per_mile=None),\n",
" ActivitySummary(date='Saturday, October 05, 2024', distance_in_miles=18.01, elevation_gain_in_feet=551.18, pace_minutes_per_mile=9.68),\n",
" ActivitySummary(date='Sunday, October 06, 2024', distance_in_miles=2.02, elevation_gain_in_feet=0.0, pace_minutes_per_mile=9.55),\n",
" ActivitySummary(date='Monday, October 07, 2024', distance_in_miles=8.01, elevation_gain_in_feet=331.36, pace_minutes_per_mile=9.0),\n",
" ActivitySummary(date='Tuesday, October 08, 2024', distance_in_miles=6.03, elevation_gain_in_feet=88.58, pace_minutes_per_mile=10.03),\n",
" ActivitySummary(date='Wednesday, October 09, 2024', distance_in_miles=8.5, elevation_gain_in_feet=311.68, pace_minutes_per_mile=8.69),\n",
" ActivitySummary(date='Thursday, October 10, 2024', distance_in_miles=0.0, elevation_gain_in_feet=0.0, pace_minutes_per_mile=None),\n",
" ActivitySummary(date='Friday, October 11, 2024', distance_in_miles=7.51, elevation_gain_in_feet=364.17, pace_minutes_per_mile=9.36),\n",
" ActivitySummary(date='Saturday, October 12, 2024', distance_in_miles=0.0, elevation_gain_in_feet=0.0, pace_minutes_per_mile=None),\n",
" ActivitySummary(date='Sunday, October 13, 2024', distance_in_miles=20.03, elevation_gain_in_feet=574.15, pace_minutes_per_mile=9.11),\n",
" ActivitySummary(date='Monday, October 14, 2024', distance_in_miles=4.03, elevation_gain_in_feet=167.32, pace_minutes_per_mile=10.2),\n",
" ActivitySummary(date='Tuesday, October 15, 2024', distance_in_miles=7.02, elevation_gain_in_feet=308.4, pace_minutes_per_mile=9.59),\n",
" ActivitySummary(date='Wednesday, October 16, 2024', distance_in_miles=11.57, elevation_gain_in_feet=367.45, pace_minutes_per_mile=9.15),\n",
" ActivitySummary(date='Thursday, October 17, 2024', distance_in_miles=0.0, elevation_gain_in_feet=0.0, pace_minutes_per_mile=None),\n",
" ActivitySummary(date='Friday, October 18, 2024', distance_in_miles=2.02, elevation_gain_in_feet=91.86, pace_minutes_per_mile=10.26),\n",
" ActivitySummary(date='Saturday, October 19, 2024', distance_in_miles=0.0, elevation_gain_in_feet=0.0, pace_minutes_per_mile=None),\n",
" ActivitySummary(date='Sunday, October 20, 2024', distance_in_miles=20.02, elevation_gain_in_feet=1013.78, pace_minutes_per_mile=9.26),\n",
" ActivitySummary(date='Monday, October 21, 2024', distance_in_miles=3.06, elevation_gain_in_feet=137.8, pace_minutes_per_mile=11.12),\n",
" ActivitySummary(date='Tuesday, October 22, 2024', distance_in_miles=7.53, elevation_gain_in_feet=367.45, pace_minutes_per_mile=9.82),\n",
" ActivitySummary(date='Wednesday, October 23, 2024', distance_in_miles=10.77, elevation_gain_in_feet=531.5, pace_minutes_per_mile=9.05),\n",
" ActivitySummary(date='Thursday, October 24, 2024', distance_in_miles=0.0, elevation_gain_in_feet=0.0, pace_minutes_per_mile=None),\n",
" ActivitySummary(date='Friday, October 25, 2024', distance_in_miles=0.0, elevation_gain_in_feet=0.0, pace_minutes_per_mile=None),\n",
" ActivitySummary(date='Saturday, October 26, 2024', distance_in_miles=20.02, elevation_gain_in_feet=708.66, pace_minutes_per_mile=8.72),\n",
" ActivitySummary(date='Sunday, October 27, 2024', distance_in_miles=0.0, elevation_gain_in_feet=0.0, pace_minutes_per_mile=None),\n",
" ActivitySummary(date='Monday, October 28, 2024', distance_in_miles=0.0, elevation_gain_in_feet=0.0, pace_minutes_per_mile=None),\n",
" ActivitySummary(date='Tuesday, October 29, 2024', distance_in_miles=8.03, elevation_gain_in_feet=360.89, pace_minutes_per_mile=10.0),\n",
" ActivitySummary(date='Wednesday, October 30, 2024', distance_in_miles=12.21, elevation_gain_in_feet=229.66, pace_minutes_per_mile=8.71),\n",
" ActivitySummary(date='Thursday, October 31, 2024', distance_in_miles=4.03, elevation_gain_in_feet=180.45, pace_minutes_per_mile=9.96),\n",
" ActivitySummary(date='Friday, November 01, 2024', distance_in_miles=0.0, elevation_gain_in_feet=0.0, pace_minutes_per_mile=None),\n",
" ActivitySummary(date='Saturday, November 02, 2024', distance_in_miles=15.81, elevation_gain_in_feet=564.3, pace_minutes_per_mile=8.84),\n",
" ActivitySummary(date='Sunday, November 03, 2024', distance_in_miles=0.0, elevation_gain_in_feet=0.0, pace_minutes_per_mile=None),\n",
" ActivitySummary(date='Monday, November 04, 2024', distance_in_miles=8.37, elevation_gain_in_feet=173.88, pace_minutes_per_mile=9.66)]"
"{'success': True,\n",
" 'weekly_summaries': ['{\"year\": 2024, \"week_of_year\": 38, \"week_start_date\": \"2024-09-16\", \"longest_run\": 0.0, \"total_distance\": 0.0}',\n",
" '{\"year\": 2024, \"week_of_year\": 39, \"week_start_date\": \"2024-09-23\", \"longest_run\": 9.01, \"total_distance\": 20.38}',\n",
" '{\"year\": 2024, \"week_of_year\": 40, \"week_start_date\": \"2024-09-30\", \"longest_run\": 18.01, \"total_distance\": 45.05}',\n",
" '{\"year\": 2024, \"week_of_year\": 41, \"week_start_date\": \"2024-10-07\", \"longest_run\": 20.03, \"total_distance\": 50.1}',\n",
" '{\"year\": 2024, \"week_of_year\": 42, \"week_start_date\": \"2024-10-14\", \"longest_run\": 20.02, \"total_distance\": 44.66}',\n",
" '{\"year\": 2024, \"week_of_year\": 43, \"week_start_date\": \"2024-10-21\", \"longest_run\": 20.02, \"total_distance\": 41.38}',\n",
" '{\"year\": 2024, \"week_of_year\": 44, \"week_start_date\": \"2024-10-28\", \"longest_run\": 15.81, \"total_distance\": 40.08}',\n",
" '{\"year\": 2024, \"week_of_year\": 45, \"week_start_date\": \"2024-11-04\", \"longest_run\": 8.37, \"total_distance\": 8.37}']}"
]
},
"execution_count": 2,
"execution_count": 4,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"summaries"
"from src.frontend_router import get_weekly_summaries_handler\n",
"\n",
"get_weekly_summaries_handler(user.athlete_id, {})"
]
},
{
Expand Down

0 comments on commit 998bf66

Please sign in to comment.