Skip to content

Commit 939bf63

Browse files
committed
fix: remove sub-push error fields
Exceptions caught at that level are highly unlikely and will now just be caught as an exception for the mutation as a whole
1 parent 0d0beec commit 939bf63

File tree

2 files changed

+8
-24
lines changed

2 files changed

+8
-24
lines changed

terraso_backend/apps/graphql/schema/schema.graphql

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2439,9 +2439,7 @@ Partial updates are possible, if failure happens at the level of a sub-mutation,
24392439
type SiteDataPushPayload {
24402440
errors: GenericScalar
24412441
soilDataResults: [SoilDataPushEntry!]
2442-
soilDataError: String
24432442
soilMetadataResults: [SoilMetadataPushEntry!]
2444-
soilMetadataError: String
24452443
clientMutationId: String
24462444
}
24472445

terraso_backend/apps/soil_id/graphql/site_data/push_mutation.py

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,9 @@ class SiteDataPush(BaseWriteMutation):
4545
soil_data_results = graphene.Field(
4646
graphene.List(graphene.NonNull(SoilDataPushEntry)), required=False
4747
)
48-
soil_data_error = graphene.String()
4948
soil_metadata_results = graphene.Field(
5049
graphene.List(graphene.NonNull(SoilMetadataPushEntry)), required=False
5150
)
52-
soil_metadata_error = graphene.String()
5351

5452
class Input:
5553
soil_data_entries = graphene.Field(graphene.List(graphene.NonNull(SoilDataPushInputEntry)))
@@ -68,33 +66,21 @@ def mutate_and_get_payload(cls, root, info, **kwargs):
6866
)
6967

7068
soil_data_results = None
71-
soil_data_error = None
7269
soil_metadata_results = None
73-
soil_metadata_error = None
7470

7571
if soil_data_entries:
76-
try:
77-
result = SoilDataPush.mutate_and_get_payload(
78-
root, info, soil_data_entries=soil_data_entries
79-
)
80-
soil_data_results = result.results
81-
except Exception as e:
82-
logger.exception("Unexpected error pushing soil data entries")
83-
soil_data_error = str(e)
72+
result = SoilDataPush.mutate_and_get_payload(
73+
root, info, soil_data_entries=soil_data_entries
74+
)
75+
soil_data_results = result.results
8476

8577
if soil_metadata_entries:
86-
try:
87-
result = SoilMetadataPush.mutate_and_get_payload(
88-
root, info, soil_metadata_entries=soil_metadata_entries
89-
)
90-
soil_metadata_results = result.results
91-
except Exception as e:
92-
logger.exception("Unexpected error pushing soil metadata entries")
93-
soil_metadata_error = str(e)
78+
result = SoilMetadataPush.mutate_and_get_payload(
79+
root, info, soil_metadata_entries=soil_metadata_entries
80+
)
81+
soil_metadata_results = result.results
9482

9583
return cls(
9684
soil_data_results=soil_data_results,
97-
soil_data_error=soil_data_error,
9885
soil_metadata_results=soil_metadata_results,
99-
soil_metadata_error=soil_metadata_error,
10086
)

0 commit comments

Comments
 (0)