This repository was archived by the owner on Aug 28, 2023. It is now read-only.
query risk data#367
Merged
flibbertigibbet merged 10 commits intoazavea:developfrom Dec 22, 2017
flibbertigibbet:feature/kak/implement-va-functionality#322
Merged
query risk data#367flibbertigibbet merged 10 commits intoazavea:developfrom flibbertigibbet:feature/kak/implement-va-functionality#322
flibbertigibbet merged 10 commits intoazavea:developfrom
flibbertigibbet:feature/kak/implement-va-functionality#322
Conversation
maurizi
reviewed
Dec 21, 2017
|
|
||
| class Meta: | ||
| model = WeatherEvent | ||
| fields = ('name', 'coastalOnly', 'concern', 'indicators', 'displayClass') |
Contributor
There was a problem hiding this comment.
To avoid making pointless API calls when using WeatherEventSerializer as a part of OrganizationRiskSerializer, consider splitting it into two classes like so:
class WeatherEventSerializer(serializers.ModelSerializer):
coastalOnly = serializers.BooleanField(source='coastal_only')
# Other fields
class Meta:
model = WeatherEvent
fields = ('name', 'coastalOnly', 'indicators', 'displayClass')
class WeatherEventWithConcernSerializer(WeatherEventSerializer):
concern = ConcernSerializer()
class Meta:
fields = ('name', 'coastalOnly', 'concern', 'indicators', 'displayClass')Then you can continue to use WeatherEventSerializer in OrganizationRiskSerializer and use WeatherEventWithConcernSerializer in the WeatherEventRankSerializer
Contributor
Author
There was a problem hiding this comment.
Are you saying we should exclude concerns from the weather events serialized with the organization risks?
maurizi
reviewed
Dec 21, 2017
|
|
||
| constructor(private apiHttp: PlanItApiHttp) {} | ||
|
|
||
| risks(): Observable<Risk[]> { |
Contributor
There was a problem hiding this comment.
Since we're going to follow-up to this with delete/create/update methods as well, consider naming this list() so we can have a consistent naming scheme
To directly serialize all weather events in the system.
Serialze community systems in DRF API.
Serialize related community systems and weather events on risks DRF API endpoint, instead of just the object ID.
Also add risk service (not yet used).
maurizi
approved these changes
Dec 22, 2017
Contributor
maurizi
left a comment
maurizi
left a comment
There was a problem hiding this comment.
🎉 Looks good - just make sure to fix the typo I noted and this is good to merge.
| impactMagnitude?: string; | ||
| impactDescription?: string; | ||
| adaptiveCapacity?: string; | ||
| relativeAdaptiveValues?: string[]; |
Contributor
There was a problem hiding this comment.
Typo: This should be relatedAdaptiveValues
| def get_serializer_class(self): | ||
| if self.action == 'update' or self.action == 'create' or self.action == 'partial_update': | ||
| return OrganizationRiskCreateSerializer | ||
| return OrganizationRiskSerializer |
Use actual risk endpoint response instead of dummy data.
For use in autocomplete controls.
Use related object IDs on create, but serialize full objects.
For ranked weather events, continue to serialize full related concern.
Use "list" for consistency.
flibbertigibbet
deleted the
feature/kak/implement-va-functionality#322
branch
5 tasks
CloudNiner
pushed a commit
that referenced
this pull request
Dec 22, 2017
CloudNiner
pushed a commit
that referenced
this pull request
Dec 22, 2017
CloudNiner
pushed a commit
that referenced
this pull request
Dec 22, 2017
CloudNiner
pushed a commit
that referenced
this pull request
Dec 22, 2017
CloudNiner
pushed a commit
that referenced
this pull request
Dec 22, 2017
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
Overview
Modifies API risk endpoint to serialize related models. Query for actual risk data in UI and use it in vulnerability assessment page.
Also adds endpoints for community systems and all (not just organization) weather events.
Demo
Notes
Breaks adaptive need boxes, as they expect numeric input, but API returns strings.
Connects #322