Skip to content

Commit 137b967

Browse files
committed
Fix issue on deprecare reason overview (#2351)
1 parent 3982877 commit 137b967

File tree

1 file changed

+5
-16
lines changed

1 file changed

+5
-16
lines changed

local_units/views.py

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,6 @@ def get_validate(self, request, pk=None, version=None):
125125
if not change_request_instance:
126126
return bad_request("No change request found to validate")
127127

128-
previous_data = PrivateLocalUnitDetailSerializer(local_unit, context={"request": request}).data
129-
130128
# Checking the validator type
131129
validator = LocalUnitChangeRequest.Validator.LOCAL
132130
if request.user.is_superuser or request.user.has_perm("local_units.local_unit_global_validator"):
@@ -143,11 +141,10 @@ def get_validate(self, request, pk=None, version=None):
143141
validator = LocalUnitChangeRequest.Validator.REGIONAL
144142

145143
change_request_instance.current_validator = validator
146-
change_request_instance.previous_data = previous_data
147144
change_request_instance.status = LocalUnitChangeRequest.Status.APPROVED
148145
change_request_instance.updated_by = request.user
149146
change_request_instance.updated_at = timezone.now()
150-
change_request_instance.save(update_fields=["status", "updated_by", "updated_at", "current_validator", "previous_data"])
147+
change_request_instance.save(update_fields=["status", "updated_by", "updated_at", "current_validator"])
151148

152149
# Validate the local unit
153150
local_unit.validated = True
@@ -199,21 +196,13 @@ def get_revert(self, request, pk=None, version=None):
199196
total_change_request_count == 1
200197
), f"There should be one change request and it is the first one {total_change_request_count}"
201198
local_unit.is_deprecated = True
202-
local_unit.deprecated_reason = reason
199+
local_unit.deprecated_reason = LocalUnit.DeprecateReason.OTHER
200+
local_unit.deprecated_reason_overview = reason
203201
local_unit.save(
204-
update_fields=["is_deprecated", "deprecated_reason"],
202+
update_fields=["is_deprecated", "deprecated_reason", "deprecated_reason_overview"],
205203
)
206204
return response.Response(PrivateLocalUnitDetailSerializer(local_unit, context={"request": request}).data)
207205

208-
# Reverting the last approved change request related to this local unit
209-
last_approved_change_request = LocalUnitChangeRequest.objects.filter(
210-
local_unit=local_unit,
211-
status=LocalUnitChangeRequest.Status.APPROVED,
212-
).last()
213-
214-
if not last_approved_change_request:
215-
return bad_request("No change request found to revert")
216-
217206
# NOTE: Unlocking the reverted local unit
218207
local_unit.is_locked = False
219208
local_unit.validated = True
@@ -222,7 +211,7 @@ def get_revert(self, request, pk=None, version=None):
222211
# reverting the previous data of change request to local unit by passing through serializer
223212
serializer = PrivateLocalUnitDetailSerializer(
224213
local_unit,
225-
data=last_approved_change_request.previous_data,
214+
data=change_request_instance.previous_data,
226215
context={"request": request},
227216
partial=True,
228217
)

0 commit comments

Comments
 (0)