fix: 500 error if paginated_stats are empty #422
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #422 +/- ##
=======================================
Coverage 96.14% 96.15%
=======================================
Files 58 58
Lines 4562 4573 +11
=======================================
+ Hits 4386 4397 +11
Misses 176 176 ☔ View full report in Codecov by Sentry. |
muhammadadeeltajamul
force-pushed
the
inf-1067
branch
from
f94ffaa to
ceb9dc1
Compare
muhammadadeeltajamul
requested review from
asadazam93,
AhtishamShahid and
saadyousafarbi
AhtishamShahid
approved these changes
Nov 23, 2023
api/users.rb
Outdated
Comment on lines
74
to
85
| if paginated_stats["pagination"].empty? | ||
| data = [] | ||
| num_pages = 0 | ||
| page = 0 | ||
| total_count = 0 | ||
| else | ||
| total_count = paginated_stats["pagination"][0]["total_count"] | ||
| num_pages = [1, (total_count / per_page.to_f).ceil].max | ||
| data = paginated_stats["data"].map do |user_stats| | ||
| { | ||
| :username => user_stats["username"] | ||
| }.merge(user_stats["course_stats"].except(*exclude_from_stats)) | ||
| end |
There was a problem hiding this comment.
Suggested change
| if paginated_stats["pagination"].empty? | |
| data = [] | |
| num_pages = 0 | |
| page = 0 | |
| total_count = 0 | |
| else | |
| total_count = paginated_stats["pagination"][0]["total_count"] | |
| num_pages = [1, (total_count / per_page.to_f).ceil].max | |
| data = paginated_stats["data"].map do |user_stats| | |
| { | |
| :username => user_stats["username"] | |
| }.merge(user_stats["course_stats"].except(*exclude_from_stats)) | |
| end | |
| data = [] | |
| num_pages = 0 | |
| page = 0 | |
| total_count = 0 | |
| if not paginated_stats["pagination"].empty? | |
| total_count = paginated_stats["pagination"][0]["total_count"] | |
| num_pages = [1, (total_count / per_page.to_f).ceil].max | |
| data = paginated_stats["data"].map do |user_stats| | |
| { | |
| :username => user_stats["username"] | |
| }.merge(user_stats["course_stats"].except(*exclude_from_stats)) | |
| end |
There was a problem hiding this comment.
updated
saadyousafarbi
approved these changes
Nov 23, 2023
|
Just a nit, LGTM! |
spec/api/user_spec.rb
Outdated
| @@ -521,6 +521,14 @@ def build_structure_and_response(course_id, authors, build_initial_stats = true, | |||
| expect(res["user_stats"]).to eq expected_result | |||
| end | |||
|
|
|||
| it "API doesn't fail if user has no activity" do | |||
There was a problem hiding this comment.
Rename test to something like "handle stats for user with no activity"
There was a problem hiding this comment.
updated
muhammadadeeltajamul
force-pushed
the
inf-1067
branch
from
ceb9dc1 to
cae4f29
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
API was returning 500 when there were no stats in a course.
Ticket Link: INF-1067