From 2e4bf94126552ef03c3a3f6ba415f0e238a46cb2 Mon Sep 17 00:00:00 2001 From: nspadaccino Date: Tue, 3 Dec 2024 15:43:06 -0500 Subject: [PATCH] fix 422 errors for updating records in private zones from zone view --- .../scala/vinyldns/api/domain/record/RecordSetService.scala | 5 ++--- .../vinyldns/api/domain/record/RecordSetValidations.scala | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/api/src/main/scala/vinyldns/api/domain/record/RecordSetService.scala b/modules/api/src/main/scala/vinyldns/api/domain/record/RecordSetService.scala index b35414b02..3c4b9809f 100644 --- a/modules/api/src/main/scala/vinyldns/api/domain/record/RecordSetService.scala +++ b/modules/api/src/main/scala/vinyldns/api/domain/record/RecordSetService.scala @@ -161,9 +161,8 @@ class RecordSetService( && !auth.isSuper) { recordSetOwnerShipApproveStatus(recordSet).toResult } else ().toResult - _ = logger.debug(s"updated recordsetgroupchange: ${recordSet.recordSetGroupChange}") - _ = logger.debug(s"existing recordsetgroupchange: ${existing.recordSetGroupChange}") -// recordSet <- if(zone.shared) updateRecordSetGroupChangeStatus(recordSet, existing, zone) + _ = logger.info(s"updated recordsetgroupchange: ${recordSet.recordSetGroupChange}") + _ = logger.info(s"existing recordsetgroupchange: ${existing.recordSetGroupChange}") recordSet <- updateRecordSetGroupChangeStatus(recordSet, existing, zone) change <- RecordSetChangeGenerator.forUpdate(existing, recordSet, zone, Some(auth)).toResult // because changes happen to the RS in forUpdate itself, converting 1st and validating on that diff --git a/modules/api/src/main/scala/vinyldns/api/domain/record/RecordSetValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/record/RecordSetValidations.scala index 81b7c484e..e3b80a4d3 100644 --- a/modules/api/src/main/scala/vinyldns/api/domain/record/RecordSetValidations.scala +++ b/modules/api/src/main/scala/vinyldns/api/domain/record/RecordSetValidations.scala @@ -495,7 +495,7 @@ object RecordSetValidations { existing: RecordSet ): Either[Throwable, Unit] = Either.cond( - updates.recordSetGroupChange == existing.recordSetGroupChange, + updates.recordSetGroupChange == existing.recordSetGroupChange || existing.recordSetGroupChange.isEmpty, (), InvalidRequest("Cannot update RecordSet OwnerShip Status when zone is not shared.") )