fixed invalid url old timerseries #494
Closed
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
aptiko
requested changes
May 22, 2023
There was a problem hiding this comment.
- The commit message needs proper capitalization and spelling, and should also be in the imperative. It should also have
(fixes #493)in the end. (See also "Git and GitHub" [section "Commit and commit messages"] in Confluence.) - I found out that this problem also occurs in the new URLs after all, not only in the deprecated; for example, under
/api/stations/2012/timeseriesgroups/584/timeseries/{hello}/data/. This means the commit message should not mention the "old" URL. It could be, for example,Fix crash in invalid timeseries URL (fixes #493).
Comment on lines
+22
to
+23
| .DS_STORE | ||
| .idea/ |
There was a problem hiding this comment.
- Please don't make irrelevant changes in the commit (see also "Git and GitHub" (section "Committing and commit messages") in Confluence)
- Please don't store in
.gitignorethings related to your personal development environment. You can use your personal.gitignorefile for that (it's probably~/.gitignore.
| @@ -237,7 +238,7 @@ def data(self, request, pk=None, *, station_id, timeseries_group_id=None): | |||
|
|
|||
| @action(detail=True, methods=["get"]) | |||
| def bottom(self, request, pk=None, *, station_id, timeseries_group_id=None): | |||
| ts = get_object_or_404(models.Timeseries, pk=pk) | |||
| ts = get_object_or_404(models.Timeseries, pk=int(pk)) | |||
There was a problem hiding this comment.
Was this working before? If yes, why is this change needed? (And how on earth was it working?)
There was a problem hiding this comment.
Yes @aptiko it was working fine, just make it consistent for the views
| @@ -246,7 +247,7 @@ def bottom(self, request, pk=None, *, station_id, timeseries_group_id=None): | |||
|
|
|||
| @action(detail=True, methods=["get"]) | |||
| def chart(self, request, pk=None, *, station_id, timeseries_group_id=None): | |||
| timeseries = get_object_or_404(models.Timeseries, pk=pk) | |||
| timeseries = get_object_or_404(models.Timeseries, pk=int(pk)) | |||
| @@ -167,6 +167,7 @@ class TimeseriesViewSet(ModelViewSet): | |||
| CHART_MAX_INTERVALS = 200 | |||
| queryset = models.Timeseries.objects.all() | |||
| serializer_class = serializers.TimeseriesSerializer | |||
| lookup_value_regex = '\d+' | |||
There was a problem hiding this comment.
If this line is added, then I can't reproduce the problem any more. If that is the case, why do we have the try...except in _get_data()?
There was a problem hiding this comment.
@aptiko added try catch at _get_data() here bcz it's not the direct part of view, can be called anywhere from the code
|
Closed in favor of #495 (renamed the branch) |
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.
Checklist: