Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[614] hotfix: get observation id in writer #430

Merged
merged 2 commits into from
Dec 6, 2023
Merged

[614] hotfix: get observation id in writer #430

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cde50a
hotfix: get observation id in writer
saanobhaai Dec 6, 2023
eda6000
fix writer observation_data for quadrat_collection
saanobhaai Dec 6, 2023
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
22 changes: 11 additions & 11 deletions src/api/submission/writer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def create_obsbeltfish(self, belt_fish_id):
observations_data = get_obsbeltfish_data(self.collect_record, belt_fish_id)

for observation_data in observations_data:
observation_data["id"] = observation_data["id"] or uuid.uuid4()
observation_data["id"] = observation_data.get("id") or uuid.uuid4()
serializer = self.validate_data(ObsBeltFishSerializer, observation_data)
observation_beltfishes.append(serializer.save())

Expand Down Expand Up @@ -205,7 +205,7 @@ def create_obsbenthicpit(self, benthic_pit_id):
)

for observation_data in observations_data:
observation_data["id"] = observation_data["id"] or uuid.uuid4()
observation_data["id"] = observation_data.get("id") or uuid.uuid4()
serializer = ObsBenthicPITSerializer(
data=observation_data, context=self.context
)
Expand Down Expand Up @@ -251,7 +251,7 @@ def create_obsbenthiclit(self, benthic_lit_id):
)

for observation_data in observations_data:
observation_data["id"] = observation_data["id"] or uuid.uuid4()
observation_data["id"] = observation_data.get("id") or uuid.uuid4()
serializer = ObsBenthicLITSerializer(
data=observation_data, context=self.context
)
Expand Down Expand Up @@ -304,7 +304,7 @@ def create_obshabitatcomplexity(self, habitatcomplexity_id):
)

for observation_data in observations_data:
observation_data["id"] = observation_data["id"] or uuid.uuid4()
observation_data["id"] = observation_data.get("id") or uuid.uuid4()
serializer = ObsHabitatComplexitySerializer(
data=observation_data, context=self.context
)
Expand All @@ -328,16 +328,16 @@ def write(self):

class BleachingQuadratCollectionProtocolWriter(ProtocolWriter):
def get_or_create_quadrat_collection(self, sample_event_id):
quadrat_collection_data = get_quadrat_collection_data(
observation_data = get_quadrat_collection_data(
self.collect_record, sample_event_id
)
try:
return QuadratCollection.objects.get(**quadrat_collection_data)
return QuadratCollection.objects.get(**observation_data)

except (QuadratCollection.DoesNotExist, ValidationError):
observation_data["id"] = observation_data["id"] or uuid.uuid4()
observation_data["id"] = observation_data.get("id") or uuid.uuid4()
serializer = QuadratCollectionSerializer(
data=quadrat_collection_data, context=self.context
data=observation_data, context=self.context
)
if serializer.is_valid() is False:
raise ValidationError(serializer.errors) from _
Expand Down Expand Up @@ -367,7 +367,7 @@ def create_obs_quadrat_benthic_percent(self, bleaching_quadrat_collection_id):
return observation_benthic_percent_covered_data

for observation_data in observations_data:
observation_data["id"] = observation_data["id"] or uuid.uuid4()
observation_data["id"] = observation_data.get("id") or uuid.uuid4()
serializer = ObsQuadratBenthicPercentSerializer(
data=observation_data, context=self.context
)
Expand All @@ -393,7 +393,7 @@ def create_obs_colonies_bleached(self, bleaching_quadrat_collection_id):
)

for observation_data in observations_data:
observation_data["id"] = observation_data["id"] or uuid.uuid4()
observation_data["id"] = observation_data.get("id") or uuid.uuid4()
serializer = ObsColoniesBleachedSerializer(
data=observation_data, context=self.context
)
Expand Down Expand Up @@ -463,7 +463,7 @@ def create_obs_benthic_photo_quadrat(self, benthic_photo_quadrat_transect_id):
)

for observation_data in observations_data:
observation_data["id"] = observation_data["id"] or uuid.uuid4()
observation_data["id"] = observation_data.get("id") or uuid.uuid4()
serializer = ObsBenthicPhotoQuadratSerializer(
data=observation_data, context=self.context
)
Expand Down