From 1cafbf5bf8a0b339b90faf379d92c13bb23a8acc Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Wed, 27 Apr 2022 12:00:48 +0530
Subject: [PATCH 001/147] Make navbars fixed

---
 modules/portal/app/views/header.scala.html |  2 +-
 modules/portal/app/views/main.scala.html   |  2 +-
 modules/portal/public/css/vinyldns.css     | 11 +++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/portal/app/views/header.scala.html b/modules/portal/app/views/header.scala.html
index 54e79900b..dc458dc64 100644
--- a/modules/portal/app/views/header.scala.html
+++ b/modules/portal/app/views/header.scala.html
@@ -1,6 +1,6 @@
 @(rootAccountName: String)(implicit request: play.api.mvc.Request[Any])
 
-<div class="top_nav">
+<div class="top_nav" id="fixed-top-nav">
   <div class="nav_menu">
     <nav>
       <div class="nav toggle">
diff --git a/modules/portal/app/views/main.scala.html b/modules/portal/app/views/main.scala.html
index 64c088544..99f81d859 100644
--- a/modules/portal/app/views/main.scala.html
+++ b/modules/portal/app/views/main.scala.html
@@ -35,7 +35,7 @@
             <div class="main_container" ng-cloak ng-controller="@controller">
 
             <!-- START PAGE SIDEBAR -->
-                <div class="col-md-3 left_col">
+                <div class="col-md-3 left_col" id="fixed-side-menu">
                     <div class="left_col scroll-view">
                         <div class="navbar nav_title vinyldns-nav-title">
                             <a href="/index"><span><img src="/assets/images/vinyldns-portal.png" class="vinyldns-logo"/></span></a>
diff --git a/modules/portal/public/css/vinyldns.css b/modules/portal/public/css/vinyldns.css
index 6d30d5e0f..72d71a491 100644
--- a/modules/portal/public/css/vinyldns.css
+++ b/modules/portal/public/css/vinyldns.css
@@ -486,3 +486,14 @@ input[type="file"] {
 .modal-backdrop.show {
   opacity: 0.75;
 }
+
+#fixed-side-menu {
+    position: fixed;
+    top: 0;
+}
+
+#fixed-top-nav {
+    position: sticky;
+    top: 0;
+    z-index: 1000;
+}

From 7f65dc658234e1c0c4a70d0075dde3bda1ddb915 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 2 May 2022 13:42:43 +0530
Subject: [PATCH 002/147] Validate group fields

---
 .../api/domain/membership/MembershipProtocol.scala   |  2 ++
 .../api/domain/membership/MembershipService.scala    | 12 ++++++++++++
 .../scala/vinyldns/api/route/MembershipRouting.scala |  1 +
 .../core/src/main/scala/vinyldns/core/Messages.scala |  2 ++
 4 files changed, 17 insertions(+)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipProtocol.scala b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipProtocol.scala
index 6db87bb29..1b39e1b50 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipProtocol.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipProtocol.scala
@@ -153,6 +153,8 @@ final case class GroupNotFoundError(msg: String) extends Throwable(msg)
 
 final case class GroupAlreadyExistsError(msg: String) extends Throwable(msg)
 
+final case class GroupValidationError(msg: String) extends Throwable(msg)
+
 final case class UserNotFoundError(msg: String) extends Throwable(msg)
 
 final case class InvalidGroupError(msg: String) extends Throwable(msg)
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
index 5d24297e6..92dbbf3e0 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
@@ -57,6 +57,7 @@ class MembershipService(
     val adminMembers = inputGroup.adminUserIds
     val nonAdminMembers = inputGroup.memberIds.diff(adminMembers)
     for {
+      _ <- groupValidation(newGroup)
       _ <- hasMembersAndAdmins(newGroup).toResult
       _ <- groupWithSameNameDoesNotExist(newGroup.name)
       _ <- usersExist(newGroup.memberIds)
@@ -76,6 +77,7 @@ class MembershipService(
     for {
       existingGroup <- getExistingGroup(groupId)
       newGroup = existingGroup.withUpdates(name, email, description, memberIds, adminUserIds)
+      _ <- groupValidation(newGroup)
       _ <- canEditGroup(existingGroup, authPrincipal).toResult
       addedAdmins = newGroup.adminUserIds.diff(existingGroup.adminUserIds)
       // new non-admin members ++ admins converted to non-admins
@@ -263,6 +265,16 @@ class MembershipService(
       .orFail(GroupNotFoundError(s"Group with ID $groupId was not found"))
       .toResult[Group]
 
+  // Validate group details. Group name and email cannot be empty
+  def groupValidation(group: Group): Result[Unit] = {
+    Option(group) match {
+      case Some(value) if value.name.isEmpty || value.email.isEmpty =>
+        GroupValidationError(GroupValidationErrorMsg).asLeft
+      case _ =>
+        ().asRight
+    }
+  }.toResult
+
   def groupWithSameNameDoesNotExist(name: String): Result[Unit] =
     groupRepo
       .getGroupByName(name)
diff --git a/modules/api/src/main/scala/vinyldns/api/route/MembershipRouting.scala b/modules/api/src/main/scala/vinyldns/api/route/MembershipRouting.scala
index 6611a7346..5704c12a5 100644
--- a/modules/api/src/main/scala/vinyldns/api/route/MembershipRouting.scala
+++ b/modules/api/src/main/scala/vinyldns/api/route/MembershipRouting.scala
@@ -45,6 +45,7 @@ class MembershipRoute(
     case GroupNotFoundError(msg) => complete(StatusCodes.NotFound, msg)
     case NotAuthorizedError(msg) => complete(StatusCodes.Forbidden, msg)
     case GroupAlreadyExistsError(msg) => complete(StatusCodes.Conflict, msg)
+    case GroupValidationError(msg) => complete(StatusCodes.BadRequest, msg)
     case InvalidGroupError(msg) => complete(StatusCodes.BadRequest, msg)
     case UserNotFoundError(msg) => complete(StatusCodes.NotFound, msg)
     case InvalidGroupRequestError(msg) => complete(StatusCodes.BadRequest, msg)
diff --git a/modules/core/src/main/scala/vinyldns/core/Messages.scala b/modules/core/src/main/scala/vinyldns/core/Messages.scala
index fcaff7c2b..771488300 100644
--- a/modules/core/src/main/scala/vinyldns/core/Messages.scala
+++ b/modules/core/src/main/scala/vinyldns/core/Messages.scala
@@ -79,4 +79,6 @@ object Messages {
   val NotAuthorizedErrorMsg =
     "User \"%s\" is not authorized. Contact %s owner group: %s at %s to make DNS changes."
 
+  // Error displayed when group name or email is empty
+  val GroupValidationErrorMsg = "Group name and email cannot be empty."
 }

From d9a4d7828d9deaa2a7f75fe73051aa8d4b3f7ab5 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 2 May 2022 15:32:12 +0530
Subject: [PATCH 003/147] Add tests

---
 .../membership/MembershipServiceSpec.scala    | 47 ++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
index d1e8fd3fa..ac13446d0 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
@@ -114,6 +114,7 @@ class MembershipServiceSpec
     "create a new group" should {
       "save the group and add the members when the group is valid" in {
         doReturn(IO.pure(Some(okUser))).when(mockUserRepo).getUser("ok")
+        doReturn(().toResult).when(underTest).groupValidation(groupInfo)
         doReturn(().toResult).when(underTest).groupWithSameNameDoesNotExist(groupInfo.name)
         doReturn(().toResult).when(underTest).usersExist(groupInfo.memberIds)
         doReturn(IO.pure(okGroup)).when(mockGroupRepo).save(any[DB], any[Group])
@@ -141,6 +142,7 @@ class MembershipServiceSpec
 
       "save the groupChange in the groupChangeRepo" in {
         doReturn(IO.pure(Some(okUser))).when(mockUserRepo).getUser("ok")
+        doReturn(().toResult).when(underTest).groupValidation(groupInfo)
         doReturn(().toResult).when(underTest).groupWithSameNameDoesNotExist(groupInfo.name)
         doReturn(().toResult).when(underTest).usersExist(groupInfo.memberIds)
         doReturn(IO.pure(okGroup)).when(mockGroupRepo).save(any[DB], any[Group])
@@ -168,7 +170,7 @@ class MembershipServiceSpec
           adminUserIds = Set(okUserInfo.id, dummyUserInfo.id)
         )
         val expectedMembersAdded = Set(okUserInfo.id, dummyUserInfo.id)
-
+        doReturn(().toResult).when(underTest).groupValidation(info)
         doReturn(().toResult).when(underTest).groupWithSameNameDoesNotExist(info.name)
         doReturn(().toResult).when(underTest).usersExist(any[Set[String]])
         doReturn(IO.pure(okGroup)).when(mockGroupRepo).save(any[DB], any[Group])
@@ -196,6 +198,7 @@ class MembershipServiceSpec
       "set the current user as a member" in {
         val info = groupInfo.copy(memberIds = Set.empty, adminUserIds = Set.empty)
         doReturn(IO.pure(Some(okUser))).when(mockUserRepo).getUser("ok")
+        doReturn(().toResult).when(underTest).groupValidation(info)
         doReturn(().toResult).when(underTest).groupWithSameNameDoesNotExist(info.name)
         doReturn(().toResult).when(underTest).usersExist(Set(okAuth.userId))
         doReturn(IO.pure(okGroup)).when(mockGroupRepo).save(any[DB], any[Group])
@@ -224,6 +227,7 @@ class MembershipServiceSpec
 
       "return an error if users do not exist" in {
         doReturn(IO.pure(Some(okUser))).when(mockUserRepo).getUser("ok")
+        doReturn(().toResult).when(underTest).groupValidation(groupInfo)
         doReturn(().toResult).when(underTest).groupWithSameNameDoesNotExist(groupInfo.name)
         doReturn(result(UserNotFoundError("fail")))
           .when(underTest)
@@ -239,6 +243,7 @@ class MembershipServiceSpec
 
       "return an error if fail while saving the group" in {
         doReturn(IO.pure(Some(okUser))).when(mockUserRepo).getUser("ok")
+        doReturn(().toResult).when(underTest).groupValidation(groupInfo)
         doReturn(().toResult).when(underTest).groupWithSameNameDoesNotExist(groupInfo.name)
         doReturn(().toResult).when(underTest).usersExist(groupInfo.memberIds)
         doReturn(IO.raiseError(new RuntimeException("fail"))).when(mockGroupRepo).save(any[DB], any[Group])
@@ -253,6 +258,7 @@ class MembershipServiceSpec
 
       "return an error if fail while adding the members" in {
         doReturn(IO.pure(Some(okUser))).when(mockUserRepo).getUser("ok")
+        doReturn(().toResult).when(underTest).groupValidation(groupInfo)
         doReturn(().toResult).when(underTest).groupWithSameNameDoesNotExist(groupInfo.name)
         doReturn(().toResult).when(underTest).usersExist(groupInfo.memberIds)
         doReturn(IO.pure(okGroup)).when(mockGroupRepo).save(any[DB], any[Group])
@@ -264,6 +270,20 @@ class MembershipServiceSpec
         val error = leftResultOf(underTest.createGroup(groupInfo, okAuth).value)
         error shouldBe a[RuntimeException]
       }
+
+      "return an error if group name and/or email is empty" in {
+        doReturn(IO.pure(Some(okUser))).when(mockUserRepo).getUser("ok")
+        doReturn(result(GroupValidationError("fail")))
+          .when(underTest)
+          .groupValidation(groupInfo.copy(name = "", email = ""))
+
+        val error = leftResultOf(underTest.createGroup(groupInfo.copy(name = "", email = ""), okAuth).value)
+        error shouldBe a[GroupValidationError]
+
+        verify(mockGroupRepo, never()).save(any[DB], any[Group])
+        verify(mockMembershipRepo, never())
+          .saveMembers(any[DB], anyString, any[Set[String]], isAdmin = anyBoolean)
+      }
     }
 
     "update an existing group" should {
@@ -388,6 +408,31 @@ class MembershipServiceSpec
         error shouldBe a[GroupAlreadyExistsError]
       }
 
+      "return an error if group name and/or email is empty" in {
+        doReturn(IO.pure(Some(existingGroup)))
+          .when(mockGroupRepo)
+          .getGroup(existingGroup.id)
+        doReturn(().toResult).when(underTest).usersExist(any[Set[String]])
+        doReturn(result(GroupValidationError("fail")))
+          .when(underTest)
+          .groupValidation(existingGroup.copy(name = "", email = ""))
+
+        val error = leftResultOf(
+          underTest
+            .updateGroup(
+              updatedInfo.id,
+              name = "",
+              email = "",
+              updatedInfo.description,
+              updatedInfo.memberIds,
+              updatedInfo.adminUserIds,
+              okAuth
+            )
+            .value
+        )
+        error shouldBe a[GroupValidationError]
+      }
+
       "return an error if the group is not found" in {
         doReturn(IO.pure(None)).when(mockGroupRepo).getGroup(existingGroup.id)
 

From 085b1235e61d892cc6c7a4a3755a2e4cd226b9b5 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Thu, 12 May 2022 12:39:29 +0530
Subject: [PATCH 004/147] Search/filter zone by admin group

---
 .../api/domain/zone/ZoneService.scala         | 72 +++++++++++-----
 .../api/domain/zone/ZoneServiceAlgebra.scala  |  1 +
 .../vinyldns/api/route/ZoneRouting.scala      |  4 +-
 .../functional/tests/zones/list_zones_test.py | 18 ++++
 .../src/test/functional/vinyldns_python.py    |  5 +-
 .../api/domain/zone/ZoneServiceSpec.scala     | 39 +++++++++
 .../api/repository/EmptyRepositories.scala    |  8 ++
 .../vinyldns/api/route/ZoneRoutingSpec.scala  | 15 ++++
 .../core/domain/zone/ZoneRepository.scala     |  8 ++
 .../MySqlZoneRepositoryIntegrationSpec.scala  | 85 ++++++++++++++++++-
 .../repository/MySqlZoneRepository.scala      | 55 ++++++++++++
 .../portal/app/views/zones/zones.scala.html   | 15 +++-
 .../lib/controllers/controller.zones.js       | 12 +--
 .../lib/controllers/controller.zones.spec.js  |  8 +-
 .../lib/services/zones/service.zones.js       |  3 +-
 .../lib/services/zones/service.zones.spec.js  |  4 +-
 16 files changed, 315 insertions(+), 37 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/zone/ZoneService.scala b/modules/api/src/main/scala/vinyldns/api/domain/zone/ZoneService.scala
index 74d7b3c4a..db96a7b86 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/zone/ZoneService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/zone/ZoneService.scala
@@ -16,6 +16,7 @@
 
 package vinyldns.api.domain.zone
 
+import cats.effect.IO
 import cats.implicits._
 import vinyldns.api.domain.access.AccessValidationsAlgebra
 import vinyldns.api.Interfaces
@@ -142,33 +143,59 @@ class ZoneService(
       accessLevel = getZoneAccess(auth, zone)
     } yield ZoneInfo(zone, aclInfo, groupName, accessLevel)
 
+  // List zones. Uses zone name as default while using search to list zones or by admin group name if selected.
   def listZones(
       authPrincipal: AuthPrincipal,
       nameFilter: Option[String] = None,
       startFrom: Option[String] = None,
       maxItems: Int = 100,
+      searchByAdminGroup: Boolean = false,
       ignoreAccess: Boolean = false
   ): Result[ListZonesResponse] = {
-    for {
-      listZonesResult <- zoneRepository.listZones(
-        authPrincipal,
-        nameFilter,
-        startFrom,
-        maxItems,
-        ignoreAccess
+    if(!searchByAdminGroup || nameFilter.isEmpty){
+      for {
+        listZonesResult <- zoneRepository.listZones(
+          authPrincipal,
+          nameFilter,
+          startFrom,
+          maxItems,
+          ignoreAccess
+        )
+        zones = listZonesResult.zones
+        groupIds = zones.map(_.adminGroupId).toSet
+        groups <- groupRepository.getGroups(groupIds)
+        zoneSummaryInfos = zoneSummaryInfoMapping(zones, authPrincipal, groups)
+      } yield ListZonesResponse(
+        zoneSummaryInfos,
+        listZonesResult.zonesFilter,
+        listZonesResult.startFrom,
+        listZonesResult.nextId,
+        listZonesResult.maxItems,
+        listZonesResult.ignoreAccess
       )
-      zones = listZonesResult.zones
-      groupIds = zones.map(_.adminGroupId).toSet
-      groups <- groupRepository.getGroups(groupIds)
-      zoneSummaryInfos = zoneSummaryInfoMapping(zones, authPrincipal, groups)
-    } yield ListZonesResponse(
-      zoneSummaryInfos,
-      listZonesResult.zonesFilter,
-      listZonesResult.startFrom,
-      listZonesResult.nextId,
-      listZonesResult.maxItems,
-      listZonesResult.ignoreAccess
-    )
+    }
+    else {
+      for {
+        groupId <- getGroupIdByName(nameFilter.get)
+        listZonesResult <- zoneRepository.listZonesByAdminGroupId(
+          authPrincipal,
+          startFrom,
+          maxItems,
+          groupId,
+          ignoreAccess
+        )
+        zones = listZonesResult.zones
+        group <- groupRepository.getGroup(groupId)
+        zoneSummaryInfos = zoneSummaryInfoMapping(zones, authPrincipal, group.toSet)
+      } yield ListZonesResponse(
+        zoneSummaryInfos,
+        nameFilter,
+        listZonesResult.startFrom,
+        listZonesResult.nextId,
+        listZonesResult.maxItems,
+        listZonesResult.ignoreAccess
+      )
+    }
   }.toResult
 
   def zoneSummaryInfoMapping(
@@ -274,6 +301,13 @@ class ZoneService(
     }
   }.toResult
 
+  def getGroupIdByName(groupName: String): IO[String] = {
+    groupRepository.getGroupByName(groupName).map {
+      case Some(group) => group.id
+      case None => "Cannot find group"
+    }
+  }
+
   def getZoneOrFail(zoneId: String): Result[Zone] =
     zoneRepository
       .getZone(zoneId)
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/zone/ZoneServiceAlgebra.scala b/modules/api/src/main/scala/vinyldns/api/domain/zone/ZoneServiceAlgebra.scala
index 01457a64b..cbcec8f92 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/zone/ZoneServiceAlgebra.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/zone/ZoneServiceAlgebra.scala
@@ -42,6 +42,7 @@ trait ZoneServiceAlgebra {
       nameFilter: Option[String],
       startFrom: Option[String],
       maxItems: Int,
+      searchByAdminGroup: Boolean,
       ignoreAccess: Boolean
   ): Result[ListZonesResponse]
 
diff --git a/modules/api/src/main/scala/vinyldns/api/route/ZoneRouting.scala b/modules/api/src/main/scala/vinyldns/api/route/ZoneRouting.scala
index fe9365839..440f346c3 100644
--- a/modules/api/src/main/scala/vinyldns/api/route/ZoneRouting.scala
+++ b/modules/api/src/main/scala/vinyldns/api/route/ZoneRouting.scala
@@ -78,12 +78,14 @@ class ZoneRoute(
           "nameFilter".?,
           "startFrom".as[String].?,
           "maxItems".as[Int].?(DEFAULT_MAX_ITEMS),
+          "searchByAdminGroup".as[Boolean].?(false),
           "ignoreAccess".as[Boolean].?(false)
         ) {
           (
               nameFilter: Option[String],
               startFrom: Option[String],
               maxItems: Int,
+              searchByAdminGroup: Boolean,
               ignoreAccess: Boolean
           ) =>
             {
@@ -94,7 +96,7 @@ class ZoneRoute(
                 ) {
                   authenticateAndExecute(
                     zoneService
-                      .listZones(_, nameFilter, startFrom, maxItems, ignoreAccess)
+                      .listZones(_, nameFilter, startFrom, maxItems, searchByAdminGroup, ignoreAccess)
                   ) { result =>
                     complete(StatusCodes.OK, result)
                   }
diff --git a/modules/api/src/test/functional/tests/zones/list_zones_test.py b/modules/api/src/test/functional/tests/zones/list_zones_test.py
index 1279f5b2f..ed2bf6329 100644
--- a/modules/api/src/test/functional/tests/zones/list_zones_test.py
+++ b/modules/api/src/test/functional/tests/zones/list_zones_test.py
@@ -22,6 +22,24 @@ def test_list_zones_success(list_zone_context, shared_zone_test_context):
 
     assert_that(result["nameFilter"], is_(f"*{shared_zone_test_context.partition_id}"))
 
+def test_list_zones_by_admin_group_name(list_zone_context, shared_zone_test_context):
+    """
+    Test that we can retrieve list of zones by searching with admin group name
+    """
+    result = shared_zone_test_context.list_zones_client.list_zones(name_filter=f"list-zones-group{shared_zone_test_context.partition_id}", search_by_admin_group=True, status=200)
+    retrieved = result["zones"]
+
+    assert_that(retrieved, has_length(5))
+    assert_that(retrieved, has_item(has_entry("name", list_zone_context.search_zone1["name"])))
+    assert_that(retrieved, has_item(has_entry("name", list_zone_context.search_zone2["name"])))
+    assert_that(retrieved, has_item(has_entry("name", list_zone_context.search_zone3["name"])))
+    assert_that(retrieved, has_item(has_entry("name", list_zone_context.non_search_zone1["name"])))
+    assert_that(retrieved, has_item(has_entry("name", list_zone_context.non_search_zone2["name"])))
+    assert_that(retrieved, has_item(has_entry("adminGroupName", list_zone_context.list_zones_group["name"])))
+    assert_that(retrieved, has_item(has_entry("backendId", "func-test-backend")))
+
+    assert_that(result["nameFilter"], is_(f"list-zones-group{shared_zone_test_context.partition_id}"))
+
 
 def test_list_zones_max_items_100(shared_zone_test_context):
     """
diff --git a/modules/api/src/test/functional/vinyldns_python.py b/modules/api/src/test/functional/vinyldns_python.py
index 63df14233..c6e29e135 100644
--- a/modules/api/src/test/functional/vinyldns_python.py
+++ b/modules/api/src/test/functional/vinyldns_python.py
@@ -445,7 +445,7 @@ class VinylDNSClient(object):
         response, data = self.make_request(url, "GET", self.headers, not_found_ok=True, **kwargs)
         return data
 
-    def list_zones(self, name_filter=None, start_from=None, max_items=None, ignore_access=False, **kwargs):
+    def list_zones(self, name_filter=None, start_from=None, max_items=None, search_by_admin_group=False, ignore_access=False, **kwargs):
         """
         Gets a list of zones that currently exist
         :return: a list of zones
@@ -462,6 +462,9 @@ class VinylDNSClient(object):
         if max_items:
             query.append("maxItems=" + str(max_items))
 
+        if search_by_admin_group:
+            query.append("searchByAdminGroup=" + str(search_by_admin_group))
+
         if ignore_access:
             query.append("ignoreAccess=" + str(ignore_access))
 
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/zone/ZoneServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/zone/ZoneServiceSpec.scala
index c6ab3e935..0463ea907 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/zone/ZoneServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/zone/ZoneServiceSpec.scala
@@ -562,6 +562,45 @@ class ZoneServiceSpec
       result.ignoreAccess shouldBe true
     }
 
+    "name filter must be used to return zones by admin group name, when search by admin group option is true" in {
+      doReturn(IO.pure(Some(abcGroup)))
+        .when(mockGroupRepo)
+        .getGroupByName(any[String])
+      doReturn(IO.pure(ListZonesResults(List(abcZone), ignoreAccess = true, zonesFilter = Some("abcGroup"))))
+        .when(mockZoneRepo)
+        .listZonesByAdminGroupId(abcAuth, None, 100, abcGroup.id, ignoreAccess = true)
+      doReturn(IO.pure(Some(abcGroup))).when(mockGroupRepo).getGroup(any[String])
+
+      // When searchByAdminGroup is true, zones are filtered by admin group name given in nameFilter
+      val result: ListZonesResponse =
+        rightResultOf(underTest.listZones(abcAuth, Some("abcGroup"), None, 100, searchByAdminGroup = true, ignoreAccess = true).value)
+      result.zones shouldBe List(abcZoneSummary)
+      result.maxItems shouldBe 100
+      result.startFrom shouldBe None
+      result.nameFilter shouldBe Some("abcGroup")
+      result.nextId shouldBe None
+      result.ignoreAccess shouldBe true
+    }
+
+    "name filter must be used to return zone by zone name, when search by admin group option is false" in {
+      doReturn(IO.pure(Set(abcGroup)))
+        .when(mockGroupRepo)
+        .getGroups(any[Set[String]])
+      doReturn(IO.pure(ListZonesResults(List(abcZone), ignoreAccess = true, zonesFilter = Some("abcZone"))))
+        .when(mockZoneRepo)
+        .listZones(abcAuth, Some("abcZone"), None, 100, true)
+
+      // When searchByAdminGroup is false, zone name given in nameFilter is returned
+      val result: ListZonesResponse =
+        rightResultOf(underTest.listZones(abcAuth, Some("abcZone"), None, 100, searchByAdminGroup = false, ignoreAccess = true).value)
+      result.zones shouldBe List(abcZoneSummary)
+      result.maxItems shouldBe 100
+      result.startFrom shouldBe None
+      result.nameFilter shouldBe Some("abcZone")
+      result.nextId shouldBe None
+      result.ignoreAccess shouldBe true
+    }
+
     "return Unknown group name if zone admin group cannot be found" in {
       doReturn(IO.pure(ListZonesResults(List(abcZone, xyzZone))))
         .when(mockZoneRepo)
diff --git a/modules/api/src/test/scala/vinyldns/api/repository/EmptyRepositories.scala b/modules/api/src/test/scala/vinyldns/api/repository/EmptyRepositories.scala
index cc418ac29..d0a971dc3 100644
--- a/modules/api/src/test/scala/vinyldns/api/repository/EmptyRepositories.scala
+++ b/modules/api/src/test/scala/vinyldns/api/repository/EmptyRepositories.scala
@@ -69,6 +69,14 @@ trait EmptyZoneRepo extends ZoneRepository {
 
   def getZoneByName(zoneName: String): IO[Option[Zone]] = IO.pure(None)
 
+  def listZonesByAdminGroupId(
+     authPrincipal: AuthPrincipal,
+     startFrom: Option[String] = None,
+     maxItems: Int = 100,
+     adminGroupId: String,
+     ignoreAccess: Boolean = false
+   ): IO[ListZonesResults] = IO.pure(ListZonesResults())
+
   def listZones(
       authPrincipal: AuthPrincipal,
       zoneNameFilter: Option[String] = None,
diff --git a/modules/api/src/test/scala/vinyldns/api/route/ZoneRoutingSpec.scala b/modules/api/src/test/scala/vinyldns/api/route/ZoneRoutingSpec.scala
index 38927d2d8..1ffc6f537 100644
--- a/modules/api/src/test/scala/vinyldns/api/route/ZoneRoutingSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/route/ZoneRoutingSpec.scala
@@ -252,6 +252,7 @@ class ZoneRoutingSpec
         nameFilter: Option[String],
         startFrom: Option[String],
         maxItems: Int,
+        searchByAdminGroup: Boolean = false,
         ignoreAccess: Boolean = false
     ): Result[ListZonesResponse] = {
 
@@ -920,6 +921,20 @@ class ZoneRoutingSpec
       }
     }
 
+    "return zones by admin group name when searchByAdminGroup is true" in {
+      Get(s"/zones?nameFilter=ok&startFrom=zone4.&maxItems=4&searchByAdminGroup=true") ~> zoneRoute ~> check {
+        val resp = responseAs[ListZonesResponse]
+        val zones = resp.zones
+        (zones.map(_.id) should contain)
+          .only(zone1.id, zone2.id, zone3.id)
+        resp.nextId shouldBe None
+        resp.maxItems shouldBe 4
+        resp.startFrom shouldBe Some("zone4.")
+        resp.nameFilter shouldBe Some("ok")
+        resp.ignoreAccess shouldBe false
+      }
+    }
+
     "return all zones when list all is true" in {
       Get(s"/zones?maxItems=5&ignoreAccess=true") ~> zoneRoute ~> check {
         val resp = responseAs[ListZonesResponse]
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/zone/ZoneRepository.scala b/modules/core/src/main/scala/vinyldns/core/domain/zone/ZoneRepository.scala
index 86a2f289c..9c146e7ed 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/zone/ZoneRepository.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/zone/ZoneRepository.scala
@@ -35,6 +35,14 @@ trait ZoneRepository extends Repository {
 
   def getZonesByFilters(zoneNames: Set[String]): IO[Set[Zone]]
 
+  def listZonesByAdminGroupId(
+       authPrincipal: AuthPrincipal,
+       startFrom: Option[String] = None,
+       maxItems: Int = 100,
+       adminGroupId: String,
+       ignoreAccess: Boolean = false
+     ): IO[ListZonesResults]
+
   def listZones(
       authPrincipal: AuthPrincipal,
       zoneNameFilter: Option[String] = None,
diff --git a/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlZoneRepositoryIntegrationSpec.scala b/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlZoneRepositoryIntegrationSpec.scala
index 314209155..10b6b7f89 100644
--- a/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlZoneRepositoryIntegrationSpec.scala
+++ b/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlZoneRepositoryIntegrationSpec.scala
@@ -29,14 +29,16 @@ import vinyldns.core.domain.zone._
 import vinyldns.core.TestZoneData.okZone
 import vinyldns.core.TestMembershipData._
 import vinyldns.core.domain.zone.ZoneRepository.DuplicateZoneError
-import vinyldns.mysql.TestMySqlInstance
+import vinyldns.mysql.{TestMySqlInstance, TransactionProvider}
+import vinyldns.mysql.TestMySqlInstance.groupRepository
 
 class MySqlZoneRepositoryIntegrationSpec
     extends AnyWordSpec
     with BeforeAndAfterAll
     with BeforeAndAfterEach
     with Matchers
-    with Inspectors {
+    with Inspectors
+    with TransactionProvider {
 
   private var repo: ZoneRepository = _
 
@@ -221,6 +223,32 @@ class MySqlZoneRepositoryIntegrationSpec
       (repo.listZones(dummyAuth).unsafeRunSync().zones should contain).only(testZones.head)
     }
 
+    "get authorized zone by admin group name" in {
+
+      executeWithinTransaction { db: DB =>
+        groupRepository.save(db, okGroup.copy(id = testZoneAdminGroupId))
+      }.unsafeRunSync()
+
+      // store all of the zones
+
+      val f = saveZones(testZones)
+
+      // query for all zones for the ok user, he should have access to all of the zones
+      val okUserAuth = AuthPrincipal(
+        signedInUser = okUser,
+        memberGroupIds = groups.map(_.id)
+      )
+
+      f.unsafeRunSync()
+      repo.listZonesByAdminGroupId(okUserAuth, None, 100, testZoneAdminGroupId).unsafeRunSync().zones should contain theSameElementsAs testZones
+
+      // dummy user only has access to one zone
+      (repo.listZonesByAdminGroupId(dummyAuth, None, 100, testZoneAdminGroupId).unsafeRunSync().zones should contain).only(testZones.head)
+
+      // delete the group created to test
+      groupRepository.delete(okGroup).unsafeRunSync()
+    }
+
     "get all zones" in {
       // store all of the zones
       val privateZone = okZone.copy(
@@ -259,6 +287,59 @@ class MySqlZoneRepositoryIntegrationSpec
         .zones should contain theSameElementsAs testZones
     }
 
+    "get all zones by admin group name" in {
+
+      executeWithinTransaction { db: DB =>
+        groupRepository.save(db, okGroup)
+      }.unsafeRunSync()
+
+      val group = groupRepository.getGroupByName(okGroup.name).unsafeRunSync()
+      val groupId = group.get.id
+
+      // store all of the zones
+      val privateZone = okZone.copy(
+        name = "private-zone.",
+        id = UUID.randomUUID().toString,
+        acl = ZoneACL(),
+        adminGroupId = groupId
+      )
+
+      val sharedZone = okZone.copy(
+        name = "shared-zone.",
+        id = UUID.randomUUID().toString,
+        acl = ZoneACL(),
+        shared = true,
+        adminGroupId = groupId
+      )
+
+      val testZones = Seq(privateZone, sharedZone)
+
+      val f = saveZones(testZones)
+
+      // query for all zones for the ok user, should have all of the zones returned
+      val okUserAuth = AuthPrincipal(
+        signedInUser = okUser,
+        memberGroupIds = groups.map(_.id)
+      )
+
+      f.unsafeRunSync()
+
+      repo
+        .listZonesByAdminGroupId(okUserAuth, None, 100, groupId, ignoreAccess = true)
+        .unsafeRunSync()
+        .zones should contain theSameElementsAs testZones
+
+      // dummy user only have all of the zones returned
+      repo
+        .listZonesByAdminGroupId(dummyAuth, None, 100, groupId, ignoreAccess = true)
+        .unsafeRunSync()
+        .zones should contain theSameElementsAs testZones
+
+
+      // delete the group created to test
+      groupRepository.delete(okGroup).unsafeRunSync()
+    }
+
     "get zones that are accessible by everyone" in {
 
       //user and group id being set to None implies EVERYONE access
diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala
index e80402632..b4c69b62f 100644
--- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala
+++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala
@@ -229,6 +229,61 @@ class MySqlZoneRepository extends ZoneRepository with ProtobufConversions with M
       }
     }
 
+  /**
+    * This is somewhat complicated due to how we need to build the SQL.
+    *
+    * - Dynamically build the accessor list combining the user id and group ids
+    * - Dynamically build the LIMIT clause.  We cannot specify an offset if this is the first page (offset == 0)
+    *
+    * @return a ListZonesResults
+    */
+  def listZonesByAdminGroupId(
+       authPrincipal: AuthPrincipal,
+       startFrom: Option[String] = None,
+       maxItems: Int = 100,
+       adminGroupId: String,
+       ignoreAccess: Boolean = false
+  ): IO[ListZonesResults] =
+    monitor("repo.ZoneJDBC.listZonesByAdminGroupId") {
+      IO {
+        DB.readOnly { implicit s =>
+          val (withAccessorCheck, accessors) =
+            withAccessors(authPrincipal.signedInUser, authPrincipal.memberGroupIds, ignoreAccess)
+          val sb = new StringBuilder
+          sb.append(withAccessorCheck)
+
+          sb.append(s" WHERE admin_group_id='$adminGroupId' ")
+
+          sb.append(s" GROUP BY z.name ")
+          sb.append(s" LIMIT ${maxItems + 1}")
+
+          val query = sb.toString
+          println("Query: ", query)
+
+          val results: List[Zone] = SQL(query)
+            .bind(accessors: _*)
+            .map(extractZone(1))
+            .list()
+            .apply()
+
+          val (newResults, nextId) =
+            if (results.size > maxItems)
+              (results.dropRight(1), results.dropRight(1).lastOption.map(_.name))
+            else (results, None)
+
+
+          ListZonesResults(
+            zones = newResults,
+            nextId = nextId,
+            startFrom = startFrom,
+            maxItems = maxItems,
+            zonesFilter = None,
+            ignoreAccess = ignoreAccess,
+          )
+        }
+      }
+    }
+
   /**
     * This is somewhat complicated due to how we need to build the SQL.
     *
diff --git a/modules/portal/app/views/zones/zones.scala.html b/modules/portal/app/views/zones/zones.scala.html
index 52ab8b759..4f0c6a0e9 100644
--- a/modules/portal/app/views/zones/zones.scala.html
+++ b/modules/portal/app/views/zones/zones.scala.html
@@ -59,7 +59,12 @@
                                                         <span class="fa fa-search"></span>
                                                     </button>
                                                 </span>
-                                                <input id="zone-search-text" ng-model="query" type="text" class="form-control"  placeholder="Zone Name"/>
+                                                <input id="zone-search-text" ng-model="query" type="text" class="form-control"  placeholder="{{!searchByAdminGroup ? 'Zone Name' : 'Admin Group Name'}}"/>
+                                            </div>
+                                            <div class="checkbox pull-right">
+                                                <label>
+                                                    <input type="checkbox" ng-model="searchByAdminGroup" ng-change="refreshZones()"> Search by admin group
+                                                </label>
                                             </div>
                                         </form>
                                     </div>
@@ -165,8 +170,14 @@
                                                         <span class="fa fa-search"></span>
                                                     </button>
                                                 </span>
-                                                <input id="all-zones-search-text" ng-model="query" type="text" class="form-control"  placeholder="Zone Name"/>
+                                                <input id="all-zones-search-text" ng-model="query" type="text" class="form-control" placeholder="{{!searchByAdminGroup ? 'Zone Name' : 'Admin Group Name'}}"/>
                                             </div>
+
+                                                <div class="checkbox pull-right">
+                                                    <label>
+                                                        <input type="checkbox" ng-model="searchByAdminGroup" ng-change="refreshZones()"> Search by admin group
+                                                    </label>
+                                                </div>
                                         </form>
                                     </div>
                                     <!-- END SEARCH BOX -->
diff --git a/modules/portal/public/lib/controllers/controller.zones.js b/modules/portal/public/lib/controllers/controller.zones.js
index 8159be547..d62ad5f3d 100644
--- a/modules/portal/public/lib/controllers/controller.zones.js
+++ b/modules/portal/public/lib/controllers/controller.zones.js
@@ -84,7 +84,7 @@ angular.module('controller.zones', [])
         allZonesPaging = pagingService.resetPaging(allZonesPaging);
 
         zonesService
-            .getZones(zonesPaging.maxItems, undefined, $scope.query)
+            .getZones(zonesPaging.maxItems, undefined, $scope.query, $scope.searchByAdminGroup)
             .then(function (response) {
                 $log.log('zonesService::getZones-success (' + response.data.zones.length + ' zones)');
                 zonesPaging.next = response.data.nextId;
@@ -98,7 +98,7 @@ angular.module('controller.zones', [])
             });
 
         zonesService
-            .getZones(zonesPaging.maxItems, undefined, $scope.query, true)
+            .getZones(zonesPaging.maxItems, undefined, $scope.query, $scope.searchByAdminGroup, true)
             .then(function (response) {
                 $log.log('zonesService::getZones-success (' + response.data.zones.length + ' zones)');
                 allZonesPaging.next = response.data.nextId;
@@ -204,7 +204,7 @@ angular.module('controller.zones', [])
     $scope.prevPageMyZones = function() {
         var startFrom = pagingService.getPrevStartFrom(zonesPaging);
         return zonesService
-            .getZones(zonesPaging.maxItems, startFrom, $scope.query, false)
+            .getZones(zonesPaging.maxItems, startFrom, $scope.query, $scope.searchByAdminGroup, false)
             .then(function(response) {
                 zonesPaging = pagingService.prevPageUpdate(response.data.nextId, zonesPaging);
                 updateZoneDisplay(response.data.zones);
@@ -217,7 +217,7 @@ angular.module('controller.zones', [])
     $scope.prevPageAllZones = function() {
         var startFrom = pagingService.getPrevStartFrom(allZonesPaging);
         return zonesService
-            .getZones(allZonesPaging.maxItems, startFrom, $scope.query, true)
+            .getZones(allZonesPaging.maxItems, startFrom, $scope.query, $scope.searchByAdminGroup, true)
             .then(function(response) {
                 allZonesPaging = pagingService.prevPageUpdate(response.data.nextId, allZonesPaging);
                 updateAllZonesDisplay(response.data.zones);
@@ -229,7 +229,7 @@ angular.module('controller.zones', [])
 
     $scope.nextPageMyZones = function () {
         return zonesService
-            .getZones(zonesPaging.maxItems, zonesPaging.next, $scope.query, false)
+            .getZones(zonesPaging.maxItems, zonesPaging.next, $scope.query, $scope.searchByAdminGroup, false)
             .then(function(response) {
                 var zoneSets = response.data.zones;
                 zonesPaging = pagingService.nextPageUpdate(zoneSets, response.data.nextId, zonesPaging);
@@ -245,7 +245,7 @@ angular.module('controller.zones', [])
 
     $scope.nextPageAllZones = function () {
         return zonesService
-            .getZones(allZonesPaging.maxItems, allZonesPaging.next, $scope.query, true)
+            .getZones(allZonesPaging.maxItems, allZonesPaging.next, $scope.query, $scope.searchByAdminGroup, true)
             .then(function(response) {
                 var zoneSets = response.data.zones;
                 allZonesPaging = pagingService.nextPageUpdate(zoneSets, response.data.nextId, allZonesPaging);
diff --git a/modules/portal/public/lib/controllers/controller.zones.spec.js b/modules/portal/public/lib/controllers/controller.zones.spec.js
index bf4ceabe2..169ca1526 100644
--- a/modules/portal/public/lib/controllers/controller.zones.spec.js
+++ b/modules/portal/public/lib/controllers/controller.zones.spec.js
@@ -74,13 +74,14 @@ describe('Controller: ZonesController', function () {
         var expectedMaxItems = 100;
         var expectedStartFrom = undefined;
         var expectedQuery = this.scope.query;
+        var expectedSearchByAdminGroup = this.scope.searchByAdminGroup;
         var expectedignoreAccess = false;
 
         this.scope.nextPageMyZones();
 
         expect(getZoneSets.calls.count()).toBe(1);
         expect(getZoneSets.calls.mostRecent().args).toEqual(
-          [expectedMaxItems, expectedStartFrom, expectedQuery, expectedignoreAccess]);
+          [expectedMaxItems, expectedStartFrom, expectedQuery, expectedSearchByAdminGroup, expectedignoreAccess]);
     });
 
     it('prevPageMyZones should call getZones with the correct parameters', function () {
@@ -91,19 +92,20 @@ describe('Controller: ZonesController', function () {
         var expectedMaxItems = 100;
         var expectedStartFrom = undefined;
         var expectedQuery = this.scope.query;
+        var expectedSearchByAdminGroup = this.scope.searchByAdminGroup;
         var expectedignoreAccess = false;
 
         this.scope.prevPageMyZones();
 
         expect(getZoneSets.calls.count()).toBe(1);
         expect(getZoneSets.calls.mostRecent().args).toEqual(
-            [expectedMaxItems, expectedStartFrom, expectedQuery, expectedignoreAccess]);
+            [expectedMaxItems, expectedStartFrom, expectedQuery, expectedSearchByAdminGroup, expectedignoreAccess]);
 
         this.scope.nextPageMyZones();
         this.scope.prevPageMyZones();
 
         expect(getZoneSets.calls.count()).toBe(3);
         expect(getZoneSets.calls.mostRecent().args).toEqual(
-            [expectedMaxItems, expectedStartFrom, expectedQuery, expectedignoreAccess]);
+            [expectedMaxItems, expectedStartFrom, expectedQuery, expectedSearchByAdminGroup, expectedignoreAccess]);
     });
 });
diff --git a/modules/portal/public/lib/services/zones/service.zones.js b/modules/portal/public/lib/services/zones/service.zones.js
index 4ac031860..16e187f59 100644
--- a/modules/portal/public/lib/services/zones/service.zones.js
+++ b/modules/portal/public/lib/services/zones/service.zones.js
@@ -19,7 +19,7 @@
 angular.module('service.zones', [])
     .service('zonesService', function ($http, groupsService, $log, utilityService) {
 
-        this.getZones = function (limit, startFrom, query, ignoreAccess) {
+        this.getZones = function (limit, startFrom, query, searchByAdminGroup, ignoreAccess) {
             if (query == "") {
                 query = null;
             }
@@ -27,6 +27,7 @@ angular.module('service.zones', [])
                 "maxItems": limit,
                 "startFrom": startFrom,
                 "nameFilter": query,
+                "searchByAdminGroup": searchByAdminGroup,
                 "ignoreAccess": ignoreAccess
             };
             var url = groupsService.urlBuilder("/api/zones", params);
diff --git a/modules/portal/public/lib/services/zones/service.zones.spec.js b/modules/portal/public/lib/services/zones/service.zones.spec.js
index 5149008a8..c20e717ef 100644
--- a/modules/portal/public/lib/services/zones/service.zones.spec.js
+++ b/modules/portal/public/lib/services/zones/service.zones.spec.js
@@ -27,8 +27,8 @@ describe('Service: zoneService', function () {
     }));
 
     it('http backend gets called properly when getting zones', function () {
-        this.$httpBackend.expectGET('/api/zones?maxItems=100&startFrom=start&nameFilter=someQuery&ignoreAccess=false').respond('zone returned');
-        this.zonesService.getZones('100', 'start', 'someQuery', false)
+        this.$httpBackend.expectGET('/api/zones?maxItems=100&startFrom=start&nameFilter=someQuery&searchByAdminGroup=false&ignoreAccess=false').respond('zone returned');
+        this.zonesService.getZones('100', 'start', 'someQuery', false, false)
             .then(function(response) {
                 expect(response.data).toBe('zone returned');
             });

From ad0a37236a48fafd02d35cce9a7cba8ab66cc640 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Mon, 23 May 2022 13:12:33 +0530
Subject: [PATCH 005/147] Added forward slash validation for forward and
 reverse zone

---
 .../api/domain/DomainValidations.scala        | 34 +++++++++++++++++--
 .../domain/batch/BatchChangeValidations.scala | 18 +++++++---
 .../batch/BatchChangeValidationsSpec.scala    | 17 ++++++++++
 3 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
index 459285267..73fa6cfac 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
@@ -27,8 +27,10 @@ import scala.util.matching.Regex
   Object to house common domain validations
  */
 object DomainValidations {
+  val validReverseFQDNRegex: Regex =
+    """^(?:([0-9a-zA-Z\-\/_]{1,63}|[0-9a-zA-Z\-\/_]{1}[0-9a-zA-Z\-\/_]{0,61}[0-9a-zA-Z\-\/_]{1}|[*.]{2}[0-9a-zA-Z\-\/_]{0,60}[0-9a-zA-Z\-\/_]{1})\.)*$""".r
   val validFQDNRegex: Regex =
-    """^(?:([0-9a-zA-Z_]{1,63}|[0-9a-zA-Z_]{1}[0-9a-zA-Z\-\/_]{0,61}[0-9a-zA-Z_]{1}|[*.]{2}[0-9a-zA-Z\-\/_]{0,60}[0-9a-zA-Z_]{1})\.)*$""".r
+    """^(?:([0-9a-zA-Z_]{1,63}|[0-9a-zA-Z_]{1}[0-9a-zA-Z\-_]{0,61}[0-9a-zA-Z_]{1}|[*.]{2}[0-9a-zA-Z\-_]{0,60}[0-9a-zA-Z_]{1})\.)*$""".r
   val validIpv4Regex: Regex =
     """^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$""".r
   val validIpv6Regex: Regex =
@@ -60,7 +62,35 @@ object DomainValidations {
   def validateHostName(name: Fqdn): ValidatedNel[DomainValidationError, Fqdn] =
     validateHostName(name.fqdn).map(_ => name)
 
+  def validateReverseHostName(name: Fqdn): ValidatedNel[DomainValidationError, Fqdn] =
+    validateReverseHostName(name.fqdn).map(_ => name)
+
   def validateHostName(name: String): ValidatedNel[DomainValidationError, String] = {
+    /*
+      Label rules are as follows (from RFC 952; detailed in RFC 1034):
+        - Starts with a letter, or digit, or underscore or asterisk (as of RFC 1123)
+        - Interior contains letter, digit or hyphen, or underscore
+        - Ends with a letter or digit, or underscore
+      All possible labels permutations:
+        - A single letter/digit: [0-9a-zA-Z]{1}
+        - A combination of 1-63 letters/digits: [0-9a-zA-Z]{1,63}
+        - A single letter/digit followed by up to 61 letters, digits, hyphens or slashes
+        and ending with a letter/digit:[0-9a-zA-Z]{1}[0-9a-zA-Z\-]{0,61}[0-9a-zA-Z]{1}
+        - A wildcard and dot character (*.) followed by up to 60 letters, digits, hyphens
+        and ending with a letter/digit:[*.]{2}[0-9a-zA-Z\-_]{0,60}[0-9a-zA-Z_]{1}
+      A valid domain name is a series of one or more <label>s,
+      joined by dots and terminating on a zero-length <label> (ie. dot)
+     */
+    val checkRegex = validFQDNRegex
+      .findFirstIn(name)
+      .map(_.validNel)
+      .getOrElse(InvalidDomainName(name).invalidNel)
+    val checkLength = validateStringLength(name, Some(HOST_MIN_LENGTH), HOST_MAX_LENGTH)
+
+    checkRegex.combine(checkLength).map(_ => name)
+  }
+
+  def validateReverseHostName(name: String): ValidatedNel[DomainValidationError, String] = {
     /*
       Label rules are as follows (from RFC 952; detailed in RFC 1034):
         - Starts with a letter, or digit, or underscore or asterisk (as of RFC 1123)
@@ -76,7 +106,7 @@ object DomainValidations {
       A valid domain name is a series of one or more <label>s,
       joined by dots/slashes and terminating on a zero-length <label> (ie. dot)
      */
-    val checkRegex = validFQDNRegex
+    val checkRegex = validReverseFQDNRegex
       .findFirstIn(name)
       .map(_.validNel)
       .getOrElse(InvalidDomainName(name).invalidNel)
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
index efa72e443..402d2e10a 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
@@ -211,7 +211,7 @@ class BatchChangeValidations(
       isApproved: Boolean
   ): SingleValidation[Unit] = {
     val validTTL = addChangeInput.ttl.map(validateTTL(_).asUnit).getOrElse(().valid)
-    val validRecord = validateRecordData(addChangeInput.record)
+    val validRecord = validateRecordData(addChangeInput.record, addChangeInput)
     val validInput = validateInputName(addChangeInput, isApproved)
 
     validTTL |+| validRecord |+| validInput
@@ -222,7 +222,7 @@ class BatchChangeValidations(
       isApproved: Boolean
   ): SingleValidation[Unit] = {
     val validRecord = deleteRRSetChangeInput.record match {
-      case Some(recordData) => validateRecordData(recordData)
+      case Some(recordData) => validateRecordData(recordData, deleteRRSetChangeInput)
       case None => ().validNel
     }
     val validInput = validateInputName(deleteRRSetChangeInput, isApproved)
@@ -230,11 +230,21 @@ class BatchChangeValidations(
     validRecord |+| validInput
   }
 
-  def validateRecordData(record: RecordData): SingleValidation[Unit] =
+  def validateRecordData(record: RecordData,change: ChangeInput): SingleValidation[Unit] =
     record match {
       case a: AData => validateIpv4Address(a.address).asUnit
       case aaaa: AAAAData => validateIpv6Address(aaaa.address).asUnit
-      case cname: CNAMEData => validateHostName(cname.cname).asUnit
+      case cname: CNAMEData =>
+        /*
+        To validate the zone is reverse
+         */
+        val isIPv4: Boolean = change.inputName.toLowerCase.endsWith("in-addr.arpa.")
+        val isIPv6: Boolean = change.inputName.toLowerCase.endsWith("ip6.arpa.")
+        val isReverse: Boolean = isIPv4 || isIPv6
+        isReverse match {
+          case true => validateReverseHostName(cname.cname).asUnit
+          case false => validateHostName(cname.cname).asUnit
+        }
       case ptr: PTRData => validateHostName(ptr.ptrdname).asUnit
       case txt: TXTData => validateTxtTextLength(txt.text).asUnit
       case mx: MXData =>
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
index f322b2523..3e60e4cba 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
@@ -2666,4 +2666,21 @@ class BatchChangeValidationsSpec
     result(3) shouldBe valid
     result(4) shouldBe valid
   }
+
+  property("validateAddChangeInput:  should fail for a CNAME addChangeInput with forward slash for forward zone") {
+    val cnameWithForwardSlash = AddChangeInput("cname.ok.", RecordType.CNAME, ttl, CNAMEData(Fqdn("cname/")))
+    val result = validateAddChangeInput(cnameWithForwardSlash, false)
+    result should haveInvalid[DomainValidationError](InvalidDomainName("cname/."))
+  }
+  property("validateAddChangeInput: should succeed for a valid CNAME addChangeInput without forward slash for forward zone") {
+    val cname = AddChangeInput("cname.ok.", RecordType.CNAME, ttl, CNAMEData(Fqdn("cname")))
+    val result = validateAddChangeInput(cname, false)
+    result shouldBe valid
+  }
+  property("validateAddChangeInput: should succeed for a valid CNAME addChangeInput with forward slash for reverse zone") {
+    val cnameWithForwardSlash = AddChangeInput("2.0.192.in-addr.arpa.", RecordType.CNAME, ttl, CNAMEData(Fqdn("cname/")))
+    val result = validateAddChangeInput(cnameWithForwardSlash, false)
+    result shouldBe valid
+  }
+
 }

From 7b17e7aca0f567370f2f2189b4b347df39d00422 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Mon, 23 May 2022 13:57:53 +0530
Subject: [PATCH 006/147] update test

---
 .../src/main/scala/vinyldns/api/domain/DomainValidations.scala  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
index 73fa6cfac..eb945af87 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
@@ -30,7 +30,7 @@ object DomainValidations {
   val validReverseFQDNRegex: Regex =
     """^(?:([0-9a-zA-Z\-\/_]{1,63}|[0-9a-zA-Z\-\/_]{1}[0-9a-zA-Z\-\/_]{0,61}[0-9a-zA-Z\-\/_]{1}|[*.]{2}[0-9a-zA-Z\-\/_]{0,60}[0-9a-zA-Z\-\/_]{1})\.)*$""".r
   val validFQDNRegex: Regex =
-    """^(?:([0-9a-zA-Z_]{1,63}|[0-9a-zA-Z_]{1}[0-9a-zA-Z\-_]{0,61}[0-9a-zA-Z_]{1}|[*.]{2}[0-9a-zA-Z\-_]{0,60}[0-9a-zA-Z_]{1})\.)*$""".r
+    """^(?:([0-9a-zA-Z_]{1,63}|[0-9a-zA-Z_]{1}[0-9a-zA-Z\-\/_]{0,61}[0-9a-zA-Z_]{1}|[*.]{2}[0-9a-zA-Z\-\/_]{0,60}[0-9a-zA-Z_]{1})\.)*$""".r
   val validIpv4Regex: Regex =
     """^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$""".r
   val validIpv6Regex: Regex =

From 0080ffa9dd766d7af932dc092a340f0ac7a05300 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Tue, 24 May 2022 14:34:27 +0530
Subject: [PATCH 007/147] update

---
 .../api/domain/DomainValidations.scala        | 58 ++++++++++---------
 .../domain/batch/BatchChangeValidations.scala |  4 +-
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
index eb945af87..e102af06d 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
@@ -27,8 +27,10 @@ import scala.util.matching.Regex
   Object to house common domain validations
  */
 object DomainValidations {
-  val validReverseFQDNRegex: Regex =
+  val validReverseZoneFQDNRegex: Regex =
     """^(?:([0-9a-zA-Z\-\/_]{1,63}|[0-9a-zA-Z\-\/_]{1}[0-9a-zA-Z\-\/_]{0,61}[0-9a-zA-Z\-\/_]{1}|[*.]{2}[0-9a-zA-Z\-\/_]{0,60}[0-9a-zA-Z\-\/_]{1})\.)*$""".r
+  val validForwardZoneFQDNRegex: Regex =
+    """^(?:([0-9a-zA-Z_]{1,63}|[0-9a-zA-Z_]{1}[0-9a-zA-Z\-_]{0,61}[0-9a-zA-Z_]{1}|[*.]{2}[0-9a-zA-Z\-_]{0,60}[0-9a-zA-Z_]{1})\.)*$""".r
   val validFQDNRegex: Regex =
     """^(?:([0-9a-zA-Z_]{1,63}|[0-9a-zA-Z_]{1}[0-9a-zA-Z\-\/_]{0,61}[0-9a-zA-Z_]{1}|[*.]{2}[0-9a-zA-Z\-\/_]{0,60}[0-9a-zA-Z_]{1})\.)*$""".r
   val validIpv4Regex: Regex =
@@ -62,35 +64,35 @@ object DomainValidations {
   def validateHostName(name: Fqdn): ValidatedNel[DomainValidationError, Fqdn] =
     validateHostName(name.fqdn).map(_ => name)
 
-  def validateReverseHostName(name: Fqdn): ValidatedNel[DomainValidationError, Fqdn] =
-    validateReverseHostName(name.fqdn).map(_ => name)
+  def validateCname(name: Fqdn, isReverse: Boolean): ValidatedNel[DomainValidationError, Fqdn] =
+    isReverse match {
+      case true => validateCname(name.fqdn, isReverse).map(_ => name)
+      case false => validateCname(name.fqdn, isReverse).map(_ => name)
+    }
 
-  def validateHostName(name: String): ValidatedNel[DomainValidationError, String] = {
-    /*
-      Label rules are as follows (from RFC 952; detailed in RFC 1034):
-        - Starts with a letter, or digit, or underscore or asterisk (as of RFC 1123)
-        - Interior contains letter, digit or hyphen, or underscore
-        - Ends with a letter or digit, or underscore
-      All possible labels permutations:
-        - A single letter/digit: [0-9a-zA-Z]{1}
-        - A combination of 1-63 letters/digits: [0-9a-zA-Z]{1,63}
-        - A single letter/digit followed by up to 61 letters, digits, hyphens or slashes
-        and ending with a letter/digit:[0-9a-zA-Z]{1}[0-9a-zA-Z\-]{0,61}[0-9a-zA-Z]{1}
-        - A wildcard and dot character (*.) followed by up to 60 letters, digits, hyphens
-        and ending with a letter/digit:[*.]{2}[0-9a-zA-Z\-_]{0,60}[0-9a-zA-Z_]{1}
-      A valid domain name is a series of one or more <label>s,
-      joined by dots and terminating on a zero-length <label> (ie. dot)
-     */
-    val checkRegex = validFQDNRegex
-      .findFirstIn(name)
-      .map(_.validNel)
-      .getOrElse(InvalidDomainName(name).invalidNel)
-    val checkLength = validateStringLength(name, Some(HOST_MIN_LENGTH), HOST_MAX_LENGTH)
+  def validateCname(name: String, isReverse: Boolean): ValidatedNel[DomainValidationError, String] = {
 
-    checkRegex.combine(checkLength).map(_ => name)
+    isReverse match {
+      case true =>
+        val checkRegex = validReverseZoneFQDNRegex
+          .findFirstIn(name)
+          .map(_.validNel)
+          .getOrElse(InvalidDomainName(name).invalidNel)
+        val checkLength = validateStringLength(name, Some(HOST_MIN_LENGTH), HOST_MAX_LENGTH)
+
+        checkRegex.combine(checkLength).map(_ => name)
+      case false =>
+        val checkRegex = validForwardZoneFQDNRegex
+          .findFirstIn(name)
+          .map(_.validNel)
+          .getOrElse(InvalidDomainName(name).invalidNel)
+        val checkLength = validateStringLength(name, Some(HOST_MIN_LENGTH), HOST_MAX_LENGTH)
+
+        checkRegex.combine(checkLength).map(_ => name)
+    }
   }
 
-  def validateReverseHostName(name: String): ValidatedNel[DomainValidationError, String] = {
+  def validateHostName(name: String): ValidatedNel[DomainValidationError, String] = {
     /*
       Label rules are as follows (from RFC 952; detailed in RFC 1034):
         - Starts with a letter, or digit, or underscore or asterisk (as of RFC 1123)
@@ -106,7 +108,7 @@ object DomainValidations {
       A valid domain name is a series of one or more <label>s,
       joined by dots/slashes and terminating on a zero-length <label> (ie. dot)
      */
-    val checkRegex = validReverseFQDNRegex
+    val checkRegex = validFQDNRegex
       .findFirstIn(name)
       .map(_.validNel)
       .getOrElse(InvalidDomainName(name).invalidNel)
@@ -115,6 +117,8 @@ object DomainValidations {
     checkRegex.combine(checkLength).map(_ => name)
   }
 
+
+
   def validateIpv4Address(address: String): ValidatedNel[DomainValidationError, String] =
     validIpv4Regex
       .findFirstIn(address)
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
index 402d2e10a..e62492b3d 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
@@ -242,8 +242,8 @@ class BatchChangeValidations(
         val isIPv6: Boolean = change.inputName.toLowerCase.endsWith("ip6.arpa.")
         val isReverse: Boolean = isIPv4 || isIPv6
         isReverse match {
-          case true => validateReverseHostName(cname.cname).asUnit
-          case false => validateHostName(cname.cname).asUnit
+          case true => validateCname(cname.cname,isReverse).asUnit
+          case false => validateCname(cname.cname,isReverse).asUnit
         }
       case ptr: PTRData => validateHostName(ptr.ptrdname).asUnit
       case txt: TXTData => validateTxtTextLength(txt.text).asUnit

From 8e8d1e5aa8d2435974f271c859f514475b80b4b3 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Tue, 24 May 2022 18:02:04 +0530
Subject: [PATCH 008/147] update

---
 .../main/scala/vinyldns/api/domain/DomainValidations.scala  | 6 +-----
 .../vinyldns/api/domain/batch/BatchChangeValidations.scala  | 5 +----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
index e102af06d..655a3243d 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
@@ -65,13 +65,9 @@ object DomainValidations {
     validateHostName(name.fqdn).map(_ => name)
 
   def validateCname(name: Fqdn, isReverse: Boolean): ValidatedNel[DomainValidationError, Fqdn] =
-    isReverse match {
-      case true => validateCname(name.fqdn, isReverse).map(_ => name)
-      case false => validateCname(name.fqdn, isReverse).map(_ => name)
-    }
+      validateCname(name.fqdn, isReverse).map(_ => name)
 
   def validateCname(name: String, isReverse: Boolean): ValidatedNel[DomainValidationError, String] = {
-
     isReverse match {
       case true =>
         val checkRegex = validReverseZoneFQDNRegex
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
index e62492b3d..4825be88b 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
@@ -241,10 +241,7 @@ class BatchChangeValidations(
         val isIPv4: Boolean = change.inputName.toLowerCase.endsWith("in-addr.arpa.")
         val isIPv6: Boolean = change.inputName.toLowerCase.endsWith("ip6.arpa.")
         val isReverse: Boolean = isIPv4 || isIPv6
-        isReverse match {
-          case true => validateCname(cname.cname,isReverse).asUnit
-          case false => validateCname(cname.cname,isReverse).asUnit
-        }
+        validateCname(cname.cname,isReverse).asUnit
       case ptr: PTRData => validateHostName(ptr.ptrdname).asUnit
       case txt: TXTData => validateTxtTextLength(txt.text).asUnit
       case mx: MXData =>

From 4896f4e823f91a88ab9260547cbb473860bb3b82 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Wed, 25 May 2022 12:55:01 +0530
Subject: [PATCH 009/147] Added tests in domainvalidationspec.scala

---
 .../api/domain/DomainValidations.scala        |  4 +-
 .../api/domain/DomainValidationsSpec.scala    | 51 ++++++++++++++++++-
 .../core/domain/DomainValidationErrors.scala  | 12 +++++
 .../core/domain/SingleChangeError.scala       |  4 +-
 4 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
index 655a3243d..b0992dbe2 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
@@ -73,7 +73,7 @@ object DomainValidations {
         val checkRegex = validReverseZoneFQDNRegex
           .findFirstIn(name)
           .map(_.validNel)
-          .getOrElse(InvalidDomainName(name).invalidNel)
+          .getOrElse(InvalidReverseZoneCame(name).invalidNel)
         val checkLength = validateStringLength(name, Some(HOST_MIN_LENGTH), HOST_MAX_LENGTH)
 
         checkRegex.combine(checkLength).map(_ => name)
@@ -81,7 +81,7 @@ object DomainValidations {
         val checkRegex = validForwardZoneFQDNRegex
           .findFirstIn(name)
           .map(_.validNel)
-          .getOrElse(InvalidDomainName(name).invalidNel)
+          .getOrElse(InvalidForwardZoneCame(name).invalidNel)
         val checkLength = validateStringLength(name, Some(HOST_MIN_LENGTH), HOST_MAX_LENGTH)
 
         checkRegex.combine(checkLength).map(_ => name)
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/DomainValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/DomainValidationsSpec.scala
index b547dec43..36bc5f462 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/DomainValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/DomainValidationsSpec.scala
@@ -19,11 +19,10 @@ package vinyldns.api.domain
 import cats.scalatest.ValidatedMatchers
 import org.scalacheck._
 import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
-import org.scalatest._
 import org.scalatest.propspec.AnyPropSpec
 import org.scalatest.matchers.should.Matchers
 import vinyldns.api.ValidationTestImprovements._
-import vinyldns.core.domain.{InvalidDomainName, InvalidLength}
+import vinyldns.core.domain.{InvalidDomainName, InvalidForwardZoneCame, InvalidLength}
 
 class DomainValidationsSpec
     extends AnyPropSpec
@@ -111,4 +110,52 @@ class DomainValidationsSpec
     val invalidDesc = "a" * 256
     validateStringLength(Some(invalidDesc), None, 255).failWith[InvalidLength]
   }
+
+  property("Shortest cname should be valid") {
+    validateCname("a.",true) shouldBe valid
+    validateCname("a.",false) shouldBe valid
+
+  }
+
+  property("Longest cname should be valid") {
+    val name = ("a" * 50 + ".") * 5
+    validateCname(name,true) shouldBe valid
+    validateCname(name,false) shouldBe valid
+
+  }
+
+  property("Cnames with underscores should pass property-based testing") {
+    validateCname("_underscore.domain.name.",true).isValid
+    validateCname("under_score.domain.name.",true).isValid
+    validateCname("underscore._domain.name.",true).isValid
+    validateCname("_underscore.domain.name.",false).isValid
+    validateCname("under_score.domain.name.",false).isValid
+    validateCname("underscore._domain.name.",false).isValid
+  }
+
+  // For wildcard records. '*' can only be in the beginning followed by '.' and domain name
+  property("Cnames beginning with asterisk should pass property-based testing") {
+    validateCname("*.domain.name.",true) shouldBe valid
+    validateCname("aste*risk.domain.name.",true) shouldBe invalid
+    validateCname("*asterisk.domain.name.",true) shouldBe invalid
+    validateCname("asterisk*.domain.name.",true) shouldBe invalid
+    validateCname("asterisk.*domain.name.",true) shouldBe invalid
+    validateCname("asterisk.domain*.name.",true) shouldBe invalid
+    validateCname("*.domain.name.",false) shouldBe valid
+    validateCname("aste*risk.domain.name.",false) shouldBe invalid
+    validateCname("*asterisk.domain.name.",false) shouldBe invalid
+    validateCname("asterisk*.domain.name.",false) shouldBe invalid
+    validateCname("asterisk.*domain.name.",false) shouldBe invalid
+    validateCname("asterisk.domain*.name.",false) shouldBe invalid
+  }
+  property("Cname names with forward slash should pass with reverse zone") {
+    validateCname("/slash.cname.name.",true).isValid
+    validateCname("slash./cname.name.",true).isValid
+    validateCname("slash.cname./name.",true).isValid
+  }
+  property("Cname names with forward slash should fail with forward zone") {
+    validateCname("/slash.cname.name.",false).failWith[InvalidForwardZoneCame]
+    validateCname("slash./cname.name.",false).failWith[InvalidForwardZoneCame]
+    validateCname("slash.cname./name.",false).failWith[InvalidForwardZoneCame]
+  }
 }
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
index 91486ce79..9f0babbfb 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
@@ -52,6 +52,18 @@ final case class InvalidDomainName(param: String) extends DomainValidationError
       "joined by dots, and terminated with a dot."
 }
 
+final case class InvalidReverseZoneCame(param: String) extends DomainValidationError {
+  def message: String =
+    s"""Invalid Cname: "$param", valid cnames must be letters, numbers, slashes, underscores, and hyphens, """ +
+      "joined by dots, and terminated with a dot."
+}
+
+final case class InvalidForwardZoneCame(param: String) extends DomainValidationError {
+  def message: String =
+    s"""Invalid Cname: "$param", valid cnames must be letters, numbers, underscores, and hyphens, """ +
+      "joined by dots, and terminated with a dot."
+}
+
 final case class InvalidLength(param: String, minLengthInclusive: Int, maxLengthInclusive: Int)
     extends DomainValidationError {
   def message: String =
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala b/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala
index a7ed47b4e..4e6bf7f98 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala
@@ -30,7 +30,7 @@ object DomainValidationErrorType extends Enumeration {
   type DomainValidationErrorType = Value
   // NOTE: once defined, an error code type cannot be changed!
   val ChangeLimitExceeded, BatchChangeIsEmpty, GroupDoesNotExist, NotAMemberOfOwnerGroup,
-  InvalidDomainName, InvalidLength, InvalidEmail, InvalidRecordType, InvalidPortNumber,
+  InvalidDomainName, InvalidReverseZoneCame, InvalidForwardZoneCame, InvalidLength, InvalidEmail, InvalidRecordType, InvalidPortNumber,
   InvalidIpv4Address, InvalidIpv6Address, InvalidIPAddress, InvalidTTL, InvalidMxPreference,
   InvalidBatchRecordType, ZoneDiscoveryError, RecordAlreadyExists, RecordDoesNotExist,
   CnameIsNotUniqueError, UserIsNotAuthorized, UserIsNotAuthorizedError, RecordNameNotUniqueInBatch,
@@ -46,6 +46,8 @@ object DomainValidationErrorType extends Enumeration {
       case _: GroupDoesNotExist => GroupDoesNotExist
       case _: NotAMemberOfOwnerGroup => NotAMemberOfOwnerGroup
       case _: InvalidDomainName => InvalidDomainName
+      case _: InvalidReverseZoneCame => InvalidReverseZoneCame
+      case _: InvalidForwardZoneCame => InvalidForwardZoneCame
       case _: InvalidLength => InvalidLength
       case _: InvalidEmail => InvalidEmail
       case _: InvalidRecordType => InvalidRecordType

From 3adb04b8e682338c5891fbb37bbef4b76e014491 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Wed, 25 May 2022 13:45:17 +0530
Subject: [PATCH 010/147] update tests

---
 .../api/domain/DomainValidations.scala         |  4 ++--
 .../api/domain/DomainValidationsSpec.scala     |  8 ++++----
 .../batch/BatchChangeValidationsSpec.scala     |  4 ++--
 .../core/domain/DomainValidationErrors.scala   | 18 +++++++++---------
 .../core/domain/SingleChangeError.scala        |  5 ++---
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
index b0992dbe2..5a12eb74b 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/DomainValidations.scala
@@ -73,7 +73,7 @@ object DomainValidations {
         val checkRegex = validReverseZoneFQDNRegex
           .findFirstIn(name)
           .map(_.validNel)
-          .getOrElse(InvalidReverseZoneCame(name).invalidNel)
+          .getOrElse(InvalidCname(name,isReverse).invalidNel)
         val checkLength = validateStringLength(name, Some(HOST_MIN_LENGTH), HOST_MAX_LENGTH)
 
         checkRegex.combine(checkLength).map(_ => name)
@@ -81,7 +81,7 @@ object DomainValidations {
         val checkRegex = validForwardZoneFQDNRegex
           .findFirstIn(name)
           .map(_.validNel)
-          .getOrElse(InvalidForwardZoneCame(name).invalidNel)
+          .getOrElse(InvalidCname(name,isReverse).invalidNel)
         val checkLength = validateStringLength(name, Some(HOST_MIN_LENGTH), HOST_MAX_LENGTH)
 
         checkRegex.combine(checkLength).map(_ => name)
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/DomainValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/DomainValidationsSpec.scala
index 36bc5f462..3101f9571 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/DomainValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/DomainValidationsSpec.scala
@@ -22,7 +22,7 @@ import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
 import org.scalatest.propspec.AnyPropSpec
 import org.scalatest.matchers.should.Matchers
 import vinyldns.api.ValidationTestImprovements._
-import vinyldns.core.domain.{InvalidDomainName, InvalidForwardZoneCame, InvalidLength}
+import vinyldns.core.domain.{InvalidDomainName, InvalidCname, InvalidLength}
 
 class DomainValidationsSpec
     extends AnyPropSpec
@@ -154,8 +154,8 @@ class DomainValidationsSpec
     validateCname("slash.cname./name.",true).isValid
   }
   property("Cname names with forward slash should fail with forward zone") {
-    validateCname("/slash.cname.name.",false).failWith[InvalidForwardZoneCame]
-    validateCname("slash./cname.name.",false).failWith[InvalidForwardZoneCame]
-    validateCname("slash.cname./name.",false).failWith[InvalidForwardZoneCame]
+    validateCname("/slash.cname.name.",false).failWith[InvalidCname]
+    validateCname("slash./cname.name.",false).failWith[InvalidCname]
+    validateCname("slash.cname./name.",false).failWith[InvalidCname]
   }
 }
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
index 3e60e4cba..76b621c89 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
@@ -712,7 +712,7 @@ class BatchChangeValidationsSpec
       )
     val result = validateAddChangeInput(change, false)
 
-    result should haveInvalid[DomainValidationError](InvalidDomainName(s"$invalidCNAMERecordData."))
+    result should haveInvalid[DomainValidationError](InvalidCname(s"$invalidCNAMERecordData.",false))
   }
 
   property("""validateAddChangeInput: should fail with InvalidLength
@@ -2670,7 +2670,7 @@ class BatchChangeValidationsSpec
   property("validateAddChangeInput:  should fail for a CNAME addChangeInput with forward slash for forward zone") {
     val cnameWithForwardSlash = AddChangeInput("cname.ok.", RecordType.CNAME, ttl, CNAMEData(Fqdn("cname/")))
     val result = validateAddChangeInput(cnameWithForwardSlash, false)
-    result should haveInvalid[DomainValidationError](InvalidDomainName("cname/."))
+    result should haveInvalid[DomainValidationError](InvalidCname("cname/.",false))
   }
   property("validateAddChangeInput: should succeed for a valid CNAME addChangeInput without forward slash for forward zone") {
     val cname = AddChangeInput("cname.ok.", RecordType.CNAME, ttl, CNAMEData(Fqdn("cname")))
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
index 9f0babbfb..c258ad975 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
@@ -52,16 +52,16 @@ final case class InvalidDomainName(param: String) extends DomainValidationError
       "joined by dots, and terminated with a dot."
 }
 
-final case class InvalidReverseZoneCame(param: String) extends DomainValidationError {
+final case class InvalidCname(param: String, isReverseZone: Boolean) extends DomainValidationError {
   def message: String =
-    s"""Invalid Cname: "$param", valid cnames must be letters, numbers, slashes, underscores, and hyphens, """ +
-      "joined by dots, and terminated with a dot."
-}
-
-final case class InvalidForwardZoneCame(param: String) extends DomainValidationError {
-  def message: String =
-    s"""Invalid Cname: "$param", valid cnames must be letters, numbers, underscores, and hyphens, """ +
-      "joined by dots, and terminated with a dot."
+    isReverseZone match {
+      case true =>
+        s"""Invalid Cname: "$param", valid cnames must be letters, numbers, slashes, underscores, and hyphens, """ +
+          "joined by dots, and terminated with a dot."
+      case false =>
+        s"""Invalid Cname: "$param", valid cnames must be letters, numbers, underscores, and hyphens, """ +
+          "joined by dots, and terminated with a dot."
+    }
 }
 
 final case class InvalidLength(param: String, minLengthInclusive: Int, maxLengthInclusive: Int)
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala b/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala
index 4e6bf7f98..c7805e74c 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala
@@ -30,7 +30,7 @@ object DomainValidationErrorType extends Enumeration {
   type DomainValidationErrorType = Value
   // NOTE: once defined, an error code type cannot be changed!
   val ChangeLimitExceeded, BatchChangeIsEmpty, GroupDoesNotExist, NotAMemberOfOwnerGroup,
-  InvalidDomainName, InvalidReverseZoneCame, InvalidForwardZoneCame, InvalidLength, InvalidEmail, InvalidRecordType, InvalidPortNumber,
+  InvalidDomainName, InvalidCname, InvalidLength, InvalidEmail, InvalidRecordType, InvalidPortNumber,
   InvalidIpv4Address, InvalidIpv6Address, InvalidIPAddress, InvalidTTL, InvalidMxPreference,
   InvalidBatchRecordType, ZoneDiscoveryError, RecordAlreadyExists, RecordDoesNotExist,
   CnameIsNotUniqueError, UserIsNotAuthorized, UserIsNotAuthorizedError, RecordNameNotUniqueInBatch,
@@ -46,8 +46,7 @@ object DomainValidationErrorType extends Enumeration {
       case _: GroupDoesNotExist => GroupDoesNotExist
       case _: NotAMemberOfOwnerGroup => NotAMemberOfOwnerGroup
       case _: InvalidDomainName => InvalidDomainName
-      case _: InvalidReverseZoneCame => InvalidReverseZoneCame
-      case _: InvalidForwardZoneCame => InvalidForwardZoneCame
+      case _: InvalidCname => InvalidCname
       case _: InvalidLength => InvalidLength
       case _: InvalidEmail => InvalidEmail
       case _: InvalidRecordType => InvalidRecordType

From b21c5339418af4f1ea3599db6572b0cce681c8b0 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Wed, 25 May 2022 13:52:22 +0530
Subject: [PATCH 011/147] update

---
 .../vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
index 76b621c89..77d195c12 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
@@ -2679,7 +2679,7 @@ class BatchChangeValidationsSpec
   }
   property("validateAddChangeInput: should succeed for a valid CNAME addChangeInput with forward slash for reverse zone") {
     val cnameWithForwardSlash = AddChangeInput("2.0.192.in-addr.arpa.", RecordType.CNAME, ttl, CNAMEData(Fqdn("cname/")))
-    val result = validateAddChangeInput(cnameWithForwardSlash, false)
+    val result = validateAddChangeInput(cnameWithForwardSlash, true)
     result shouldBe valid
   }
 

From 98ab80ecd82e9b819f30e6f4c35d079265deb7c0 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Wed, 25 May 2022 17:09:01 +0530
Subject: [PATCH 012/147] update

---
 .../test/functional/tests/batch/create_batch_change_test.py   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/api/src/test/functional/tests/batch/create_batch_change_test.py b/modules/api/src/test/functional/tests/batch/create_batch_change_test.py
index 3a56caf63..5f602ca7e 100644
--- a/modules/api/src/test/functional/tests/batch/create_batch_change_test.py
+++ b/modules/api/src/test/functional/tests/batch/create_batch_change_test.py
@@ -1974,7 +1974,7 @@ def test_cname_recordtype_add_checks(shared_zone_test_context):
                                                error_messages=['Invalid TTL: "29", must be a number between 30 and 2147483647.',
                                                                f'Invalid domain name: "bad-ttl-and-invalid-name$.{parent_zone_name}", '
                                                                "valid domain names must be letters, numbers, underscores, and hyphens, joined by dots, and terminated with a dot.",
-                                                               'Invalid domain name: "also$bad.name.", valid domain names must be letters, numbers, underscores, and hyphens, '
+                                                               'Invalid Cname: "also$bad.name.", valid cnames must be letters, numbers, underscores, and hyphens, '
                                                                "joined by dots, and terminated with a dot."])
         # zone discovery failure
         assert_failed_change_in_error_response(response[7], input_name="no.zone.com.", record_type="CNAME",
@@ -2134,7 +2134,7 @@ def test_cname_recordtype_update_delete_checks(shared_zone_test_context):
                                                error_messages=['Invalid TTL: "20", must be a number between 30 and 2147483647.',
                                                                'Invalid domain name: "$another.invalid.host.name.", valid domain names must be letters, numbers, '
                                                                'underscores, and hyphens, joined by dots, and terminated with a dot.',
-                                                               'Invalid domain name: "$another.invalid.cname.", valid domain names must be letters, numbers, '
+                                                               'Invalid Cname: "$another.invalid.cname.", valid cnames must be letters, numbers, '
                                                                'underscores, and hyphens, joined by dots, and terminated with a dot.'])
 
         # zone discovery failure

From 01df5bb6270bf2fa77085ad9c8492ce5ad6ebd77 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Thu, 26 May 2022 10:57:36 +0530
Subject: [PATCH 013/147] Handle whitespace and null value

---
 .../vinyldns/api/domain/membership/MembershipService.scala      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
index 92dbbf3e0..dbfbca419 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
@@ -268,7 +268,7 @@ class MembershipService(
   // Validate group details. Group name and email cannot be empty
   def groupValidation(group: Group): Result[Unit] = {
     Option(group) match {
-      case Some(value) if value.name.isEmpty || value.email.isEmpty =>
+      case Some(value) if Option(value.name).forall(_.trim.isEmpty) || Option(value.email).forall(_.trim.isEmpty) =>
         GroupValidationError(GroupValidationErrorMsg).asLeft
       case _ =>
         ().asRight

From 27d24478aea0e8bf7c04df87a8969e1ec1972204 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Wed, 1 Jun 2022 15:01:01 +0530
Subject: [PATCH 014/147] Add pagination in group view

---
 modules/api/src/main/resources/reference.conf |   4 +-
 .../api/route/MembershipRouting.scala         |   2 +-
 .../tests/membership/list_my_groups_test.py   |  43 ++--
 .../src/test/functional/vinyldns_python.py    |   2 +-
 .../portal/app/views/groups/groups.scala.html | 135 ++++++++++++-
 .../portal/app/views/zones/zones.scala.html   |  16 +-
 modules/portal/public/css/vinyldns.css        |   4 +-
 .../lib/controllers/controller.groups.js      | 184 ++++++++++++++----
 .../lib/controllers/controller.groups.spec.js |  70 ++++++-
 .../lib/controllers/controller.zones.js       |   2 +-
 .../lib/controllers/controller.zones.spec.js  |   2 +-
 .../lib/services/groups/service.groups.js     |   9 +-
 12 files changed, 377 insertions(+), 96 deletions(-)

diff --git a/modules/api/src/main/resources/reference.conf b/modules/api/src/main/resources/reference.conf
index b82cb74d6..aff3f95cc 100644
--- a/modules/api/src/main/resources/reference.conf
+++ b/modules/api/src/main/resources/reference.conf
@@ -110,8 +110,8 @@ vinyldns {
     limits {
       batchchange-routing-max-items-limit = 100
       membership-routing-default-max-items = 100
-      membership-routing-max-items-limit = 1000
-      membership-routing-max-groups-list-limit = 1500
+      membership-routing-max-items-limit = 100
+      membership-routing-max-groups-list-limit = 100
       recordset-routing-default-max-items= 100
       zone-routing-default-max-items = 100
       zone-routing-max-items-limit = 100
diff --git a/modules/api/src/main/scala/vinyldns/api/route/MembershipRouting.scala b/modules/api/src/main/scala/vinyldns/api/route/MembershipRouting.scala
index 620c6d79f..1869e0d83 100644
--- a/modules/api/src/main/scala/vinyldns/api/route/MembershipRouting.scala
+++ b/modules/api/src/main/scala/vinyldns/api/route/MembershipRouting.scala
@@ -79,7 +79,7 @@ class MembershipRoute(
       } ~
         (get & monitor("Endpoint.listMyGroups")) {
           parameters(
-            "startFrom".?,
+            "startFrom".as[String].?,
             "maxItems".as[Int].?(DEFAULT_MAX_ITEMS),
             "groupNameFilter".?,
             "ignoreAccess".as[Boolean].?(false),
diff --git a/modules/api/src/test/functional/tests/membership/list_my_groups_test.py b/modules/api/src/test/functional/tests/membership/list_my_groups_test.py
index cfcf557e8..516cdc76a 100644
--- a/modules/api/src/test/functional/tests/membership/list_my_groups_test.py
+++ b/modules/api/src/test/functional/tests/membership/list_my_groups_test.py
@@ -13,20 +13,11 @@ def test_list_my_groups_no_parameters(list_my_groups_context):
     Test that we can get all the groups where a user is a member
     """
     results = list_my_groups_context.client.list_my_groups(status=200)
-    assert_that(results, has_length(3))  # 3 fields
-
-    # Only count the groups with the group prefix
-    groups = [x for x in results["groups"] if x["name"].startswith(list_my_groups_context.group_prefix)]
-    assert_that(groups, has_length(50))
+    assert_that(results, has_length(4))  # 4 fields
     assert_that(results, is_not(has_key("groupNameFilter")))
     assert_that(results, is_not(has_key("startFrom")))
-    assert_that(results, is_not(has_key("nextId")))
-    assert_that(results["maxItems"], is_(200))
-
-    results["groups"] = sorted(groups, key=lambda x: x["name"])
-
-    for i in range(0, 50):
-        assert_that(results["groups"][i]["name"], is_("{0}-{1:0>3}".format(list_my_groups_context.group_prefix, i)))
+    assert_that(results, is_(has_key("nextId")))
+    assert_that(results["maxItems"], is_(100))
 
 
 def test_get_my_groups_using_old_account_auth(list_my_groups_context):
@@ -34,11 +25,11 @@ def test_get_my_groups_using_old_account_auth(list_my_groups_context):
     Test passing in an account will return an empty set
     """
     results = list_my_groups_context.client.list_my_groups(status=200)
-    assert_that(results, has_length(3))
+    assert_that(results, has_length(4))
     assert_that(results, is_not(has_key("groupNameFilter")))
     assert_that(results, is_not(has_key("startFrom")))
-    assert_that(results, is_not(has_key("nextId")))
-    assert_that(results["maxItems"], is_(200))
+    assert_that(results, is_(has_key("nextId")))
+    assert_that(results["maxItems"], is_(100))
 
 
 def test_list_my_groups_max_items(list_my_groups_context):
@@ -102,7 +93,7 @@ def test_list_my_groups_filter_matches(list_my_groups_context):
     assert_that(results["groupNameFilter"], is_(f"{list_my_groups_context.group_prefix}-01"))
     assert_that(results, is_not(has_key("startFrom")))
     assert_that(results, is_not(has_key("nextId")))
-    assert_that(results["maxItems"], is_(200))
+    assert_that(results["maxItems"], is_(100))
 
     results["groups"] = sorted(results["groups"], key=lambda x: x["name"])
 
@@ -133,28 +124,20 @@ def test_list_my_groups_with_ignore_access_true(list_my_groups_context):
     Test that we can get all the groups whether a user is a member or not
     """
     results = list_my_groups_context.client.list_my_groups(ignore_access=True, status=200)
-
-    # Only count the groups with the group prefix
+    assert_that(results, has_length(4))  # 4 fields
     assert_that(len(results["groups"]), greater_than(50))
-    assert_that(results["maxItems"], is_(200))
+    assert_that(results["maxItems"], is_(100))
     assert_that(results["ignoreAccess"], is_(True))
 
-    my_results = list_my_groups_context.client.list_my_groups(status=200)
-    my_groups = [x for x in my_results["groups"] if x["name"].startswith(list_my_groups_context.group_prefix)]
-    sorted_groups = sorted(my_groups, key=lambda x: x["name"])
-
-    for i in range(0, 50):
-        assert_that(sorted_groups[i]["name"], is_("{0}-{1:0>3}".format(list_my_groups_context.group_prefix, i)))
-
 
 def test_list_my_groups_as_support_user(list_my_groups_context):
     """
     Test that we can get all the groups as a support user, even without ignore_access
     """
     results = list_my_groups_context.support_user_client.list_my_groups(status=200)
-
+    assert_that(results, has_length(4))  # 4 fields
     assert_that(len(results["groups"]), greater_than(50))
-    assert_that(results["maxItems"], is_(200))
+    assert_that(results["maxItems"], is_(100))
     assert_that(results["ignoreAccess"], is_(False))
 
 
@@ -163,7 +146,7 @@ def test_list_my_groups_as_support_user_with_ignore_access_true(list_my_groups_c
     Test that we can get all the groups as a support user
     """
     results = list_my_groups_context.support_user_client.list_my_groups(ignore_access=True, status=200)
-
+    assert_that(results, has_length(4))  # 4 fields
     assert_that(len(results["groups"]), greater_than(50))
-    assert_that(results["maxItems"], is_(200))
+    assert_that(results["maxItems"], is_(100))
     assert_that(results["ignoreAccess"], is_(True))
diff --git a/modules/api/src/test/functional/vinyldns_python.py b/modules/api/src/test/functional/vinyldns_python.py
index 63df14233..2fcfbddf3 100644
--- a/modules/api/src/test/functional/vinyldns_python.py
+++ b/modules/api/src/test/functional/vinyldns_python.py
@@ -220,7 +220,7 @@ class VinylDNSClient(object):
 
         return data
 
-    def list_my_groups(self, group_name_filter=None, start_from=None, max_items=200, ignore_access=False, **kwargs):
+    def list_my_groups(self, group_name_filter=None, start_from=None, max_items=100, ignore_access=False, **kwargs):
         """
         Retrieves my groups
         :param start_from: the start key of the page
diff --git a/modules/portal/app/views/groups/groups.scala.html b/modules/portal/app/views/groups/groups.scala.html
index 5e4ba60da..c1b4ea7fb 100644
--- a/modules/portal/app/views/groups/groups.scala.html
+++ b/modules/portal/app/views/groups/groups.scala.html
@@ -26,12 +26,12 @@
         <!-- START VERTICAL TABS -->
         <div class="panel panel-default panel-tabs">
             <ul class="nav nav-tabs bar_tabs">
-                <li class="active"><a data-toggle="tab" ng-click="myGroups()">My Groups</a></li>
-                <li><a data-toggle="tab" ng-click="allGroups()">All Groups</a></li>
+                <li class="active"><a href="#myGroups" data-toggle="tab">My Groups</a></li>
+                <li><a id="tab2-button" href="#allGroups" data-toggle="tab">All Groups</a></li>
             </ul>
 
             <div class="panel-body tab-content">
-                <div class="tab-pane active" id="groups">
+                <div class="tab-pane active" id="myGroups">
                     <div class="row">
                         <div class="col-md-12">
 
@@ -66,7 +66,22 @@
                                 <div id="group-list" class="panel-body">
                                     <p ng-if="!groupsLoaded">Loading groups...</p>
                                     <p ng-if="haveNoGroups(groups.items.length)">You don't have any groups yet.</p>
-                                    <p ng-if="searchCriteria(groups.items.length)">No groups match the search criteria.</p>
+                                    <p ng-if="$scope.groupsLoaded && searchCriteria(groups.items.length)">No groups match the search criteria.</p>
+
+                                    <!-- PAGINATION -->
+                                    <div class="dataTables_paginate vinyldns_paginate">
+                                        <span class="vinyldns_page_number">{{ getGroupsPageNumber("myGroups") }}</span>
+                                        <ul class="pagination">
+                                            <li class="paginate_button previous">
+                                                <a ng-if="prevPageEnabled('myGroups')" ng-click="prevPageMyGroups()">Previous</a>
+                                            </li>
+                                            <li class="paginate_button next">
+                                                <a ng-if="nextPageEnabled('myGroups')" ng-click="nextPageMyGroups()">Next</a>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                    <!-- END PAGINATION -->
+
                                     <table class="table datatable_simple" ng-if="groups.items.length">
                                         <thead>
                                         <tr>
@@ -96,6 +111,118 @@
                                         </tr>
                                         </tbody>
                                     </table>
+                                    <!-- PAGINATION -->
+                                    <div class="dataTables_paginate vinyldns_paginate">
+                                        <span class="vinyldns_page_number">{{ getGroupsPageNumber("myGroups") }}</span>
+                                        <ul class="pagination">
+                                            <li class="paginate_button previous">
+                                                <a ng-if="prevPageEnabled('myGroups')" ng-click="prevPageMyGroups()">Previous</a>
+                                            </li>
+                                            <li class="paginate_button next">
+                                                <a ng-if="nextPageEnabled('myGroups')" ng-click="nextPageMyGroups()">Next</a>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                    <!-- END PAGINATION -->
+                                </div>
+                            </div>
+                            <!-- END SIMPLE DATATABLE -->
+
+                        </div>
+                    </div>
+                </div>
+                <div class="tab-pane" id="allGroups">
+                    <div class="row">
+                        <div class="col-md-12">
+
+                            <!-- SIMPLE DATATABLE -->
+                            <div class="panel panel-default">
+                                <div class="panel-heading">
+                                    <div class="btn-group">
+                                        <button id="open-group-modal-button" class="btn btn-default" ng-click="openModal($event);">
+                                            <span class="fa fa-plus"></span> New Group
+                                        </button>
+                                        <button id="refresh-group-button" class="btn btn-default" ng-click="refresh();">
+                                            <span class="fa fa-refresh"></span> Refresh
+                                        </button>
+                                    </div>
+
+                                    <!-- SEARCH BOX -->
+                                    <div class="pull-right">
+                                        <form class="input-group" ng-submit="refresh()">
+                                            <div class="input-group">
+                                                <span class="input-group-btn">
+                                                    <button id="group-search-button" type="submit" class="btn btn-primary btn-left-round">
+                                                        <span class="fa fa-search"></span>
+                                                    </button>
+                                                </span>
+                                                <input id="group-search-text" ng-model="query" type="text" class="form-control"  placeholder="Group Name"/>
+                                            </div>
+                                        </form>
+                                    </div>
+                                    <!-- END SEARCH BOX -->
+
+                                </div>
+                                <div id="group-list" class="panel-body">
+                                    <p ng-if="!allGroupsLoaded">Loading groups...</p>
+                                    <p ng-if="$scope.allGroupsLoaded && searchCriteria(allGroups.items.length)">No groups match the search criteria.</p>
+
+                                    <!-- PAGINATION -->
+                                    <div class="dataTables_paginate vinyldns_paginate">
+                                        <span class="vinyldns_page_number">{{ getGroupsPageNumber("allGroups") }}</span>
+                                        <ul class="pagination">
+                                            <li class="paginate_button previous">
+                                                <a ng-if="prevPageEnabled('allGroups')" ng-click="prevPageAllGroups()">Previous</a>
+                                            </li>
+                                            <li class="paginate_button next">
+                                                <a ng-if="nextPageEnabled('allGroups')" ng-click="nextPageAllGroups()">Next</a>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                    <!-- END PAGINATION -->
+
+                                    <table class="table datatable_simple" ng-if="allGroup.items.length">
+                                        <thead>
+                                        <tr>
+                                            <th>Group Name</th>
+                                            <th>Email</th>
+                                            <th>Description</th>
+                                            <th>Actions</th>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        <tr ng-repeat="group in allGroup.items | orderBy:'+name'">
+                                            <td class="wrap-long-text">
+                                                <a ng-href="/groups/{{group.id}}">{{group.name}}</a>
+                                            </td>
+                                            <td class="wrap-long-text">{{group.email}}</td>
+                                            <td class="wrap-long-text">{{group.description}}</td>
+                                            <td>
+                                                <div class="table-form-group">
+                                                    <a class="btn btn-info btn-rounded" ng-href="/groups/{{group.id}}">
+                                                        View</a>
+                                                    <a ng-if="groupAdmin(group)" class="btn btn-warning btn-rounded" ng-click="editGroup(group);">
+                                                        Edit</a>
+                                                    <button ng-if="groupAdmin(group)" id="delete-group-{{group.name}}" class="btn btn-danger btn-rounded" ng-click="confirmDeleteGroup(group);">
+                                                        Delete</button>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                    <!-- PAGINATION -->
+                                    <div class="dataTables_paginate vinyldns_paginate">
+                                        <span class="vinyldns_page_number">{{ getGroupsPageNumber("allGroups") }}</span>
+                                        <ul class="pagination">
+                                            <li class="paginate_button previous">
+                                                <a ng-if="prevPageEnabled('allGroups')" ng-click="prevPageAllGroups()">Previous</a>
+                                            </li>
+                                            <li class="paginate_button next">
+                                                <a ng-if="nextPageEnabled('allGroups')" ng-click="nextPageAllGroups()">Next</a>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                    <!-- END PAGINATION -->
                                 </div>
                             </div>
                             <!-- END SIMPLE DATATABLE -->
diff --git a/modules/portal/app/views/zones/zones.scala.html b/modules/portal/app/views/zones/zones.scala.html
index 52ab8b759..aefdad5d7 100644
--- a/modules/portal/app/views/zones/zones.scala.html
+++ b/modules/portal/app/views/zones/zones.scala.html
@@ -72,8 +72,8 @@
                                     <p ng-if="hasZones && zonesLoaded && !zones.length">No zones match the search criteria.</p>
 
                                     <!-- PAGINATION -->
-                                    <div class="dataTables_paginate vinyldns_zones_paginate">
-                                        <span class="vinyldns_zones_page_number">{{ getZonesPageNumber("myZones") }}</span>
+                                    <div class="dataTables_paginate vinyldns_paginate">
+                                        <span class="vinyldns_page_number">{{ getZonesPageNumber("myZones") }}</span>
                                         <ul class="pagination">
                                             <li class="paginate_button previous">
                                                 <a ng-if="prevPageEnabled('myZones')" ng-click="prevPageMyZones()">Previous</a>
@@ -123,8 +123,8 @@
                                     </table>
 
                                     <!-- PAGINATION -->
-                                    <div class="dataTables_paginate vinyldns_zones_paginate">
-                                        <span class="vinyldns_zones_page_number">{{ getZonesPageNumber("myZones") }}</span>
+                                    <div class="dataTables_paginate vinyldns_paginate">
+                                        <span class="vinyldns_page_number">{{ getZonesPageNumber("myZones") }}</span>
                                         <ul class="pagination">
                                             <li class="paginate_button previous">
                                                 <a ng-if="prevPageEnabled('myZones')" ng-click="prevPageMyZones()">Previous</a>
@@ -177,8 +177,8 @@
                                     <p ng-if="allZonesLoaded && !allZones.length">No zones match the search criteria.</p>
 
                                     <!-- PAGINATION -->
-                                    <div class="dataTables_paginate vinyldns_zones_paginate">
-                                        <span class="vinyldns_zones_page_number">{{ getZonesPageNumber("allZones") }}</span>
+                                    <div class="dataTables_paginate vinyldns_paginate">
+                                        <span class="vinyldns_page_number">{{ getZonesPageNumber("allZones") }}</span>
                                         <ul class="pagination">
                                             <li class="paginate_button previous">
                                                 <a ng-if="prevPageEnabled('allZones')" ng-click="prevPageAllZones()">Previous</a>
@@ -231,8 +231,8 @@
                                     </table>
 
                                     <!-- PAGINATION -->
-                                    <div class="dataTables_paginate vinyldns_zones_paginate">
-                                        <span class="vinyldns_zones_page_number">{{ getZonesPageNumber("allZones") }}</span>
+                                    <div class="dataTables_paginate vinyldns_paginate">
+                                        <span class="vinyldns_page_number">{{ getZonesPageNumber("allZones") }}</span>
                                         <ul class="pagination">
                                             <li class="paginate_button previous">
                                                 <a ng-if="prevPageEnabled('allZones')" ng-click="prevPageAllZones()">Previous</a>
diff --git a/modules/portal/public/css/vinyldns.css b/modules/portal/public/css/vinyldns.css
index b59f8174a..d7a5f7c93 100644
--- a/modules/portal/public/css/vinyldns.css
+++ b/modules/portal/public/css/vinyldns.css
@@ -434,12 +434,12 @@ input[type="file"] {
     vertical-align: top;
 }
 
-.vinyldns_zones_paginate {
+.vinyldns_paginate {
     display: flex;
     align-items: center;
 }
 
-.vinyldns_zones_page_number {
+.vinyldns_page_number {
     margin-right: 10px;
 }
 
diff --git a/modules/portal/public/lib/controllers/controller.groups.js b/modules/portal/public/lib/controllers/controller.groups.js
index 998ce1b60..22bff01f3 100644
--- a/modules/portal/public/lib/controllers/controller.groups.js
+++ b/modules/portal/public/lib/controllers/controller.groups.js
@@ -14,19 +14,25 @@
  * limitations under the License.
  */
 
-angular.module('controller.groups', []).controller('GroupsController', function ($scope, $log, $location, groupsService, profileService, utilityService) {
+angular.module('controller.groups', []).controller('GroupsController', function ($scope, $log, $location, groupsService, profileService, utilityService, pagingService, $timeout) {
     //registering bootstrap modal close event to refresh data after create group action
     angular.element('#modal_new_group').one('hide.bs.modal', function () {
         $scope.closeModal();
     });
 
     $scope.groups = {items: []};
+    $scope.allGroup = {items: []};
     $scope.groupsLoaded = false;
+    $scope.allGroupsLoaded = false;
     $scope.alerts = [];
     $scope.ignoreAccess = false;
-    $scope.hasGroups = false; // Re-assigned each time groups are fetched without a query
+    $scope.hasGroups = false;
     $scope.query = "";
 
+    // Paging status for group sets
+    var groupsPaging = pagingService.getNewPagingParams(100);
+    var allGroupsPaging = pagingService.getNewPagingParams(100);
+
     function handleError(error, type) {
         var alert = utilityService.failure(error, type);
         $scope.alerts.push(alert);
@@ -104,30 +110,33 @@ angular.module('controller.groups', []).controller('GroupsController', function
             });
     };
 
-    $scope.allGroups = function () {
-        $scope.ignoreAccess = true;
-        $scope.refresh();
-    }
-
-    $scope.myGroups = function () {
-        $scope.ignoreAccess = false;
-        $scope.refresh();
-    }
-
     $scope.refresh = function () {
-        function success(result) {
-            $log.log('getGroups:refresh-success', result);
-            //update groups
-            $scope.groups.items = result.groups;
-            $scope.groupsLoaded = true;
-            if (!$scope.query.length) {
-                $scope.hasGroups = $scope.groups.items.length > 0;
-            }
-            return result;
-        }
+        groupsPaging = pagingService.resetPaging(groupsPaging);
+        allGroupsPaging = pagingService.resetPaging(allGroupsPaging);
 
-        getGroupsAbridged($scope.ignoreAccess)
-            .then(success)
+        groupsService
+            .getGroupsAbridged(groupsPaging.maxItems, undefined, false, $scope.query)
+            .then(function (result) {
+                  $log.log('getGroups:refresh-success', result);
+                  //update groups
+                  groupsPaging.next = result.data.nextId;
+                  updateGroupDisplay(result.data.groups);
+                  if (!$scope.query.length) {
+                      $scope.hasGroups = $scope.groups.items.length > 0;
+                  }
+            })
+            .catch(function (error) {
+                handleError(error, 'getGroups::refresh-failure');
+            });
+
+        groupsService
+            .getGroupsAbridged(allGroupsPaging.maxItems, undefined, true, $scope.query)
+            .then(function (result) {
+                $log.log('getGroups:refresh-success', result);
+                //update groups
+                allGroupsPaging.next = result.data.nextId;
+                updateAllGroupDisplay(result.data.groups);
+            })
             .catch(function (error) {
                 handleError(error, 'getGroups::refresh-failure');
             });
@@ -161,20 +170,6 @@ angular.module('controller.groups', []).controller('GroupsController', function
             });
     }
 
-    function getGroupsAbridged() {
-        function success(response) {
-            $log.log('groupsService::getGroups-success');
-            return response.data;
-        }
-
-        return groupsService
-            .getGroupsAbridged($scope.ignoreAccess, $scope.query)
-            .then(success)
-            .catch(function (error) {
-                handleError(error, 'groupsService::getGroups-failure');
-            });
-    }
-
     // Return true if there are no groups created by the user
     $scope.haveNoGroups = function (groupLength) {
         if (!$scope.hasGroups && !groupLength && $scope.groupsLoaded && $scope.query.length == "") {
@@ -186,7 +181,7 @@ angular.module('controller.groups', []).controller('GroupsController', function
 
     // Return true if no groups are found related to the search query
     $scope.searchCriteria = function (groupLength) {
-        if ($scope.groupsLoaded && !groupLength && $scope.query.length != "") {
+        if (!groupLength && $scope.query.length != "") {
             return true
         } else {
             return false
@@ -298,4 +293,115 @@ angular.module('controller.groups', []).controller('GroupsController', function
         .then(profileSuccess, profileFailure)
         .catch(profileFailure);
 
+    function updateGroupDisplay (groups) {
+        $scope.groups.items = groups;
+        $scope.groupsLoaded = true;
+        $log.log("Displaying my groups: ", $scope.groups.items);
+        if($scope.groups.items.length > 0) {
+            $("td.dataTables_empty").hide();
+        } else {
+            $("td.dataTables_empty").show();
+        }
+    }
+
+    function updateAllGroupDisplay (groups) {
+        $scope.allGroup.items = groups;
+        $scope.allGroupsLoaded = true;
+        $log.log("Displaying all groups: ", $scope.allGroup.items);
+        if($scope.allGroup.items.length > 0) {
+            $("td.dataTables_empty").hide();
+        } else {
+            $("td.dataTables_empty").show();
+        }
+    }
+
+    /*
+     * Group set paging
+     */
+     $scope.getGroupsPageNumber = function(tab) {
+         switch(tab) {
+             case 'myGroups':
+                 return pagingService.getPanelTitle(groupsPaging);
+             case 'allGroups':
+                 return pagingService.getPanelTitle(allGroupsPaging);
+         }
+     };
+
+     $scope.prevPageEnabled = function(tab) {
+        switch(tab) {
+            case 'myGroups':
+                return pagingService.prevPageEnabled(groupsPaging);
+            case 'allGroups':
+                return pagingService.prevPageEnabled(allGroupsPaging);
+        }
+    };
+
+    $scope.nextPageEnabled = function(tab) {
+        switch(tab) {
+            case 'myGroups':
+                return pagingService.nextPageEnabled(groupsPaging);
+            case 'allGroups':
+                return pagingService.nextPageEnabled(allGroupsPaging);
+        }
+    };
+
+    $scope.prevPageMyGroups = function() {
+        var startFrom = pagingService.getPrevStartFrom(groupsPaging);
+        return groupsService
+                    .getGroupsAbridged(groupsPaging.maxItems, startFrom, false, $scope.query)
+                    .then(function(response) {
+                        groupsPaging = pagingService.prevPageUpdate(response.data.nextId, groupsPaging);
+                        updateGroupDisplay(response.data.groups);
+                    })
+                    .catch(function (error) {
+                        handleError(error,'groupsService::prevPageMyGroups-failure');
+                    });
+    }
+
+    $scope.prevPageAllGroups = function() {
+        var startFrom = pagingService.getPrevStartFrom(allGroupsPaging);
+        return groupsService
+                    .getGroupsAbridged(allGroupsPaging.maxItems, startFrom, true, $scope.query)
+                    .then(function(response) {
+                        allGroupsPaging = pagingService.prevPageUpdate(response.data.nextId, allGroupsPaging);
+                        updateAllGroupDisplay(response.data.groups);
+                    })
+                    .catch(function (error) {
+                        handleError(error,'groupsService::prevPageAllGroups-failure');
+                    });
+    }
+
+    $scope.nextPageMyGroups = function () {
+        return groupsService
+                    .getGroupsAbridged(groupsPaging.maxItems, groupsPaging.next, false, $scope.query)
+                    .then(function(response) {
+                        var groupSets = response.data.groups;
+                        groupsPaging = pagingService.nextPageUpdate(groupSets, response.data.nextId, groupsPaging);
+
+                        if (groupSets.length > 0) {
+                            updateGroupDisplay(response.data.groups);
+                        }
+                    })
+                    .catch(function (error) {
+                       handleError(error,'groupsService::nextPageMyGroups-failure')
+                    });
+    };
+
+    $scope.nextPageAllGroups = function () {
+        return groupsService
+                    .getGroupsAbridged(allGroupsPaging.maxItems, allGroupsPaging.next, true, $scope.query)
+                    .then(function(response) {
+                        var groupSets = response.data.groups;
+                        allGroupsPaging = pagingService.nextPageUpdate(groupSets, response.data.nextId, allGroupsPaging);
+
+                        if (groupSets.length > 0) {
+                            updateAllGroupDisplay(response.data.groups);
+                        }
+                    })
+                    .catch(function (error) {
+                       handleError(error,'groupsService::nextPageAllGroups-failure')
+                    });
+    };
+
+    $timeout($scope.refresh, 0);
 });
diff --git a/modules/portal/public/lib/controllers/controller.groups.spec.js b/modules/portal/public/lib/controllers/controller.groups.spec.js
index 953a58c68..85f5b012f 100644
--- a/modules/portal/public/lib/controllers/controller.groups.spec.js
+++ b/modules/portal/public/lib/controllers/controller.groups.spec.js
@@ -19,14 +19,16 @@ describe('Controller: GroupsController', function () {
         module('ngMock'),
         module('service.groups'),
         module('service.profile'),
-        module('service.utility')
+        module('service.utility'),
+        module('service.paging'),
         module('controller.groups')
     });
-    beforeEach(inject(function ($rootScope, $controller, $q, groupsService, profileService, utilityService) {
+    beforeEach(inject(function ($rootScope, $controller, $q, groupsService, profileService, utilityService, pagingService) {
         this.scope = $rootScope.$new();
         this.groupsService = groupsService;
         this.utilityService = utilityService;
         this.q = $q;
+        this.pagingService = pagingService;
 
         profileService.getAuthenticatedUserData = function() {
             return $q.when('data')
@@ -38,6 +40,15 @@ describe('Controller: GroupsController', function () {
                 }
             })
         };
+
+        groupsService.getGroupsAbridged = function () {
+            return $q.when({
+                data: {
+                    groups: ["all my groups"]
+                }
+            });
+        };
+
         this.controller = $controller('GroupsController', {'$scope': this.scope});
 
         this.mockSuccessAlert = 'success';
@@ -64,7 +75,7 @@ describe('Controller: GroupsController', function () {
         this.scope.refresh();
         this.scope.$digest();
 
-        expect(getGroups.calls.count()).toBe(1);
+        expect(getGroups.calls.count()).toBe(2);
         expect(this.scope.groups.items).toBe("all my groups");
     });
 
@@ -111,4 +122,57 @@ describe('Controller: GroupsController', function () {
         expect(this.utilityFailure.calls.count()).toBe(1);
         expect(this.scope.alerts).toEqual([this.mockFailureAlert]);
    });
+
+    it('nextPageMyGroups should call getGroupsAbridged with the correct parameters', function () {
+
+        var response = {
+            data: {
+                groups: "all my groups"
+            }
+        };
+        var getGroupSets = spyOn(this.groupsService, 'getGroupsAbridged')
+            .and.stub()
+            .and.returnValue(this.q.when(response));
+
+        var expectedMaxItems = 100;
+        var expectedStartFrom = undefined;
+        var expectedQuery = this.scope.query;
+        var expectedIgnoreAccess = false;
+
+        this.scope.nextPageMyGroups();
+
+        expect(getGroupSets.calls.count()).toBe(1);
+        expect(getGroupSets.calls.mostRecent().args).toEqual(
+          [expectedMaxItems, expectedStartFrom, expectedIgnoreAccess, expectedQuery]);
+    });
+
+    it('prevPageMyGroups should call getGroupsAbridged with the correct parameters', function () {
+
+        var response = {
+            data: {
+                groups: "all my groups"
+            }
+        };
+        var getGroupSets = spyOn(this.groupsService, 'getGroupsAbridged')
+            .and.stub()
+            .and.returnValue(this.q.when(response));
+
+        var expectedMaxItems = 100;
+        var expectedStartFrom = undefined;
+        var expectedQuery = this.scope.query;
+        var expectedIgnoreAccess = false;
+
+        this.scope.prevPageMyGroups();
+
+        expect(getGroupSets.calls.count()).toBe(1);
+        expect(getGroupSets.calls.mostRecent().args).toEqual(
+            [expectedMaxItems, expectedStartFrom, expectedIgnoreAccess, expectedQuery]);
+
+        this.scope.nextPageMyGroups();
+        this.scope.prevPageMyGroups();
+
+        expect(getGroupSets.calls.count()).toBe(3);
+        expect(getGroupSets.calls.mostRecent().args).toEqual(
+            [expectedMaxItems, expectedStartFrom, expectedIgnoreAccess, expectedQuery]);
+    });
 });
diff --git a/modules/portal/public/lib/controllers/controller.zones.js b/modules/portal/public/lib/controllers/controller.zones.js
index d4057fcfd..a3078b7df 100644
--- a/modules/portal/public/lib/controllers/controller.zones.js
+++ b/modules/portal/public/lib/controllers/controller.zones.js
@@ -53,7 +53,7 @@ angular.module('controller.zones', [])
         $scope.currentZone.transferConnection = {};
     };
 
-    groupsService.getGroupsAbridged(true, "").then(function (results) {
+    groupsService.getGroups(true, "").then(function (results) {
         if (results.data) {
             // Get all groups where the group members include the current user
             $scope.myGroups = results.data.groups.filter(grp => grp.members.findIndex(mem => mem.id === $scope.profile.id) >= 0);
diff --git a/modules/portal/public/lib/controllers/controller.zones.spec.js b/modules/portal/public/lib/controllers/controller.zones.spec.js
index 47197e078..035972a93 100644
--- a/modules/portal/public/lib/controllers/controller.zones.spec.js
+++ b/modules/portal/public/lib/controllers/controller.zones.spec.js
@@ -39,7 +39,7 @@ describe('Controller: ZonesController', function () {
         profileService.getAuthenticatedUserData = function() {
             return $q.when({data: {id: "userId"}});
         };
-        groupsService.getGroupsAbridged = function () {
+        groupsService.getGroups = function () {
             return $q.when({
                 data: {
                     groups: [{id: "all my groups", members: [{id: "userId"}]}]
diff --git a/modules/portal/public/lib/services/groups/service.groups.js b/modules/portal/public/lib/services/groups/service.groups.js
index 583cf1684..87cbc5dc9 100644
--- a/modules/portal/public/lib/services/groups/service.groups.js
+++ b/modules/portal/public/lib/services/groups/service.groups.js
@@ -56,7 +56,7 @@ angular.module('service.groups', [])
 
         this.getGroupMemberList = function (uuid) {
             var url = '/api/groups/' + uuid + '/members';
-            url = this.urlBuilder(url, { maxItems: 1000 });
+            url = this.urlBuilder(url, { maxItems: 100 });
             return $http.get(url);
         };
 
@@ -75,7 +75,7 @@ angular.module('service.groups', [])
                 query = null;
             }
             var params = {
-                "maxItems": 1500,
+                "maxItems": 100,
                 "groupNameFilter": query,
                 "ignoreAccess": ignoreAccess
             };
@@ -84,12 +84,13 @@ angular.module('service.groups', [])
             return $http.get(url);
         };
 
-        this.getGroupsAbridged = function (ignoreAccess, query) {
+        this.getGroupsAbridged = function (limit, startFrom, ignoreAccess, query) {
             if (query == "") {
                 query = null;
             }
             var params = {
-                "maxItems": 1500,
+                "maxItems": limit,
+                "startFrom": startFrom,
                 "groupNameFilter": query,
                 "ignoreAccess": ignoreAccess,
                 "abridged": true

From 747753458024309d03db8a6d27eae80d6b0baaf9 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Wed, 1 Jun 2022 15:40:46 +0530
Subject: [PATCH 015/147] Add portal test

---
 .../lib/controllers/controller.groups.spec.js | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/modules/portal/public/lib/controllers/controller.groups.spec.js b/modules/portal/public/lib/controllers/controller.groups.spec.js
index 85f5b012f..2d1d1b740 100644
--- a/modules/portal/public/lib/controllers/controller.groups.spec.js
+++ b/modules/portal/public/lib/controllers/controller.groups.spec.js
@@ -175,4 +175,57 @@ describe('Controller: GroupsController', function () {
         expect(getGroupSets.calls.mostRecent().args).toEqual(
             [expectedMaxItems, expectedStartFrom, expectedIgnoreAccess, expectedQuery]);
     });
+
+    it('nextPageAllGroups should call getGroupsAbridged with the correct parameters', function () {
+
+        var response = {
+            data: {
+                groups: "all groups"
+            }
+        };
+        var getGroupSets = spyOn(this.groupsService, 'getGroupsAbridged')
+            .and.stub()
+            .and.returnValue(this.q.when(response));
+
+        var expectedMaxItems = 100;
+        var expectedStartFrom = undefined;
+        var expectedQuery = this.scope.query;
+        var expectedIgnoreAccess = true;
+
+        this.scope.nextPageAllGroups();
+
+        expect(getGroupSets.calls.count()).toBe(1);
+        expect(getGroupSets.calls.mostRecent().args).toEqual(
+          [expectedMaxItems, expectedStartFrom, expectedIgnoreAccess, expectedQuery]);
+    });
+
+    it('prevPageAllGroups should call getGroupsAbridged with the correct parameters', function () {
+
+        var response = {
+            data: {
+                groups: "all groups"
+            }
+        };
+        var getGroupSets = spyOn(this.groupsService, 'getGroupsAbridged')
+            .and.stub()
+            .and.returnValue(this.q.when(response));
+
+        var expectedMaxItems = 100;
+        var expectedStartFrom = undefined;
+        var expectedQuery = this.scope.query;
+        var expectedIgnoreAccess = true;
+
+        this.scope.prevPageAllGroups();
+
+        expect(getGroupSets.calls.count()).toBe(1);
+        expect(getGroupSets.calls.mostRecent().args).toEqual(
+            [expectedMaxItems, expectedStartFrom, expectedIgnoreAccess, expectedQuery]);
+
+        this.scope.nextPageAllGroups();
+        this.scope.prevPageAllGroups();
+
+        expect(getGroupSets.calls.count()).toBe(3);
+        expect(getGroupSets.calls.mostRecent().args).toEqual(
+            [expectedMaxItems, expectedStartFrom, expectedIgnoreAccess, expectedQuery]);
+    });
 });

From ca334fc54d58b1b75555862b36c3ff2f45ed5481 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Fri, 10 Jun 2022 12:51:11 +0530
Subject: [PATCH 016/147] Allow add for already exists DNS records.

---
 .../domain/batch/BatchChangeValidations.scala    |  6 +++---
 .../api/engine/RecordSetChangeHandler.scala      | 15 +++++++++++++--
 .../core/domain/batch/SingleChange.scala         | 16 ++++++++++++++++
 .../core/domain/record/RecordSetChange.scala     | 12 +++++++++++-
 4 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
index efa72e443..b5066c3b2 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
@@ -428,15 +428,15 @@ class BatchChangeValidations(
 
     val validations =
       typedValidations |+|
-        noIncompatibleRecordExists(change, groupedChanges) |+|
+        //noIncompatibleRecordExists(change, groupedChanges) |+|
         userCanAddRecordSet(change, auth) |+|
-        recordDoesNotExist(
+        /*recordDoesNotExist(
           change.zone.id,
           change.recordName,
           change.inputChange.inputName,
           change.inputChange.typ,
           groupedChanges
-        ) |+|
+        ) |+|*/
         ownerGroupProvidedIfNeeded(change, None, ownerGroupId) |+|
         zoneDoesNotRequireManualReview(change, isApproved)
 
diff --git a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
index 94344689c..8d5f5b44f 100644
--- a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
+++ b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
@@ -107,6 +107,8 @@ object RecordSetChangeHandler extends TransactionProvider {
     recordSetChange.status match {
       case RecordSetChangeStatus.Complete =>
         singleChanges.map(_.complete(recordSetChange.id, recordSetChange.recordSet.id))
+      case RecordSetChangeStatus.AlreadyExists =>
+        singleChanges.map(_.alreadyExists(recordSetChange.systemMessage,recordSetChange.id, recordSetChange.recordSet.id))
       case RecordSetChangeStatus.Failed =>
         singleChanges.map(_.withProcessingError(recordSetChange.systemMessage, recordSetChange.id))
       case _ => singleChanges
@@ -138,6 +140,8 @@ object RecordSetChangeHandler extends TransactionProvider {
   // Change has already been applied. Abort processing and return successful response to user.
   final case class AlreadyApplied(change: RecordSetChange) extends ProcessingStatus
 
+  final case class AlreadyExists(change: RecordSetChange, message: String) extends ProcessingStatus
+
   // Change can proceed to the next state of processing. In the Verified ProcessorState,
   // ReadyToApply will attempt to retry until max retries limit is reached,
   // at which point the response will be returned.
@@ -167,7 +171,9 @@ object RecordSetChangeHandler extends TransactionProvider {
           if (existingRecords.isEmpty) ReadyToApply(change)
           else if (isDnsMatch(existingRecords, change.recordSet, change.zone.name))
             AlreadyApplied(change)
-          else Failure(change, "Incompatible record already exists in DNS.")
+          else if (existingRecords.nonEmpty)
+            AlreadyExists(change,"Record already exists in DNS.")
+          else Failure(change, "Incompatible record in DNS.")
 
         case RecordSetChangeType.Update =>
           if (isDnsMatch(existingRecords, change.recordSet, change.zone.name))
@@ -187,7 +193,8 @@ object RecordSetChangeHandler extends TransactionProvider {
           }
 
         case RecordSetChangeType.Delete =>
-          if (existingRecords.nonEmpty) ReadyToApply(change) // we have a record set, move forward
+          if (existingRecords.nonEmpty) {ReadyToApply(change)
+          } // we have a record set, move forward
           else AlreadyApplied(change) // we did not find the record set, so already applied
       }
     }
@@ -386,6 +393,10 @@ object RecordSetChangeHandler extends TransactionProvider {
       recordSetCacheRepository
     ).map {
       case AlreadyApplied(_) => Completed(change.successful)
+      case AlreadyExists(_,message) => Completed(change.alreadyExists(
+        s"ℹ️ DNS for change ${change.id}:${change.recordSet.name}: $message"
+      )
+      )
       case ReadyToApply(_) => Validated(change)
       case Failure(_, message) =>
         Completed(
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala b/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
index 48d494485..2f296c500 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
@@ -77,6 +77,22 @@ sealed trait SingleChange {
         recordSetId = Some(recordSetId)
       )
   }
+  def alreadyExists(message: Option[String],completeRecordChangeId: String, recordSetId: String): SingleChange = this match {
+    case add: SingleAddChange =>
+      add.copy(
+        status = SingleChangeStatus.Complete,
+        systemMessage = message,
+        recordChangeId = Some(completeRecordChangeId),
+        recordSetId = Some(recordSetId)
+      )
+    case delete: SingleDeleteRRSetChange =>
+      delete.copy(
+        status = SingleChangeStatus.Complete,
+        systemMessage = message,
+        recordChangeId = Some(completeRecordChangeId),
+        recordSetId = Some(recordSetId)
+      )
+  }
 
   def reject: SingleChange = this match {
     case sad: SingleAddChange => sad.copy(status = SingleChangeStatus.Rejected)
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala b/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala
index adf148c6d..813824076 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala
@@ -23,7 +23,7 @@ import vinyldns.core.domain.zone.{Zone, ZoneCommand, ZoneCommandResult}
 
 object RecordSetChangeStatus extends Enumeration {
   type RecordSetChangeStatus = Value
-  val Pending, Complete, Failed, Synced = Value
+  val Pending, Complete, Failed, Synced, AlreadyExists = Value
 
   def isDone(status: RecordSetChangeStatus): Boolean = status == Complete || status == Failed
 }
@@ -59,6 +59,16 @@ case class RecordSetChange(
         .copy(status = RecordSetStatus.Active, updated = Some(DateTime.now))
     )
 
+  def alreadyExists(message: Option[String] = None): RecordSetChange =
+    copy(
+      status = RecordSetChangeStatus.AlreadyExists,
+      systemMessage = message,
+      recordSet = recordSet
+        .copy(status = RecordSetStatus.Active, updated = Some(DateTime.now))
+    )
+
+  def alreadyExists(message: String): RecordSetChange = alreadyExists(Some(message))
+
   def failed(message: String): RecordSetChange = failed(Some(message))
 
   def failed(message: Option[String] = None): RecordSetChange =

From 208a82331bbc701ca4c470e2622b1405bc312d12 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 13 Jun 2022 16:27:53 +0530
Subject: [PATCH 017/147] Complete delete for record that doesn't exists

---
 .../domain/batch/BatchChangeConverter.scala   |  45 ++--
 .../domain/batch/BatchChangeValidations.scala |   4 +-
 .../tests/batch/create_batch_change_test.py   | 197 ++++++++----------
 .../batch/BatchChangeConverterSpec.scala      |  48 +++++
 .../batch/BatchChangeValidationsSpec.scala    |  23 +-
 .../core/domain/batch/SingleChange.scala      |   7 +
 6 files changed, 179 insertions(+), 145 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
index 84b134ca5..b640375fe 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
@@ -27,12 +27,15 @@ import vinyldns.api.domain.record.RecordSetChangeGenerator
 import vinyldns.core.domain.record._
 import vinyldns.core.domain.zone.Zone
 import vinyldns.core.domain.batch._
-import vinyldns.core.domain.record.RecordType.RecordType
+import vinyldns.core.domain.record.RecordType.{RecordType, UNKNOWN}
 import vinyldns.core.queue.MessageQueue
 
 class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue: MessageQueue)
     extends BatchChangeConverterAlgebra {
 
+  private val completedMessage: String = "ℹ️ This record does not exist." +
+    "No further action is required."
+  private val failedMessage: String = "Error queueing RecordSetChange for processing"
   private val logger = LoggerFactory.getLogger(classOf[BatchChangeConverter])
 
   def sendBatchForProcessing(
@@ -67,13 +70,21 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
       recordSetChanges: List[RecordSetChange]
   ): BatchResult[Unit] = {
     val convertedIds = recordSetChanges.flatMap(_.singleBatchChangeIds).toSet
-
-    singleChanges.find(ch => !convertedIds.contains(ch.id)) match {
-      case Some(change) => BatchConversionError(change).toLeftBatchResult
-      case None =>
-        logger.info(s"Successfully converted SingleChanges [${singleChanges
-          .map(_.id)}] to RecordSetChanges [${recordSetChanges.map(_.id)}]")
-        ().toRightBatchResult
+    // Each single change has a corresponding recordset id
+    // If they're not equal, then there's a delete request for a record that doesn't exist. So we allow this to process
+    if(singleChanges.map(_.id).length != recordSetChanges.map(_.id).length && !singleChanges.map(_.typ).contains(UNKNOWN)) {
+      logger.info(s"Successfully converted SingleChanges [${singleChanges
+        .map(_.id)}] to RecordSetChanges [${recordSetChanges.map(_.id)}]")
+      ().toRightBatchResult
+    }
+    else {
+      singleChanges.find(ch => !convertedIds.contains(ch.id)) match {
+        case Some(change) => BatchConversionError(change).toLeftBatchResult
+        case None =>
+          logger.info(s"Successfully converted SingleChanges [${singleChanges
+              .map(_.id)}] to RecordSetChanges [${recordSetChanges.map(_.id)}]")
+          ().toRightBatchResult
+      }
     }
   }
 
@@ -113,8 +124,15 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
           change
         }
         .getOrElse {
-          // failure here means there was a message queue issue for this change
-          change.withFailureMessage("Error queueing RecordSetChange for processing")
+          // Match and check if it's a delete change for a record that doesn't exists.
+          change match {
+            case _: SingleDeleteRRSetChange if change.recordSetId.isEmpty =>
+              // Mark as Complete since we don't want to throw it as an error
+              change.withDoesNotExistMessage(completedMessage)
+            case _ =>
+              // Failure here means there was a message queue issue for this change
+              change.withFailureMessage(failedMessage)
+          }
         }
     }
 
@@ -122,10 +140,11 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
   }
 
   def storeQueuingFailures(batchChange: BatchChange): BatchResult[Unit] = {
-    val failedChanges = batchChange.changes.collect {
-      case change if change.status == SingleChangeStatus.Failed => change
+    // Update if Single change is Failed or if a record that does not exist is deleted
+    val failedAndNotExistsChanges = batchChange.changes.collect {
+      case change if change.status == SingleChangeStatus.Failed || change.systemMessage.getOrElse("") == completedMessage => change
     }
-    batchChangeRepo.updateSingleChanges(failedChanges).as(())
+    batchChangeRepo.updateSingleChanges(failedAndNotExistsChanges).as(())
   }.toBatchResult
 
   def createRecordSetChangesForBatch(
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
index efa72e443..e6a91bcf5 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
@@ -347,7 +347,7 @@ class BatchChangeValidations(
           userCanDeleteRecordSet(change, auth, rs.ownerGroupId, rs.records) |+|
             zoneDoesNotRequireManualReview(change, isApproved) |+|
             ensureRecordExists(change, groupedChanges)
-        case None => RecordDoesNotExist(change.inputChange.inputName).invalidNel
+        case None => RecordDoesNotExist(change.inputChange.inputName).validNel
       }
     validations.map(_ => change)
   }
@@ -401,7 +401,7 @@ class BatchChangeValidations(
             zoneDoesNotRequireManualReview(change, isApproved) |+|
             ensureRecordExists(change, groupedChanges)
         case None =>
-          RecordDoesNotExist(change.inputChange.inputName).invalidNel
+          RecordDoesNotExist(change.inputChange.inputName).validNel
       }
 
     validations.map(_ => change)
diff --git a/modules/api/src/test/functional/tests/batch/create_batch_change_test.py b/modules/api/src/test/functional/tests/batch/create_batch_change_test.py
index 3a56caf63..8105c3017 100644
--- a/modules/api/src/test/functional/tests/batch/create_batch_change_test.py
+++ b/modules/api/src/test/functional/tests/batch/create_batch_change_test.py
@@ -1542,6 +1542,7 @@ def test_a_recordtype_update_delete_checks(shared_zone_test_context):
             get_change_A_AAAA_json(rs_delete_fqdn, change_type="DeleteRecordSet"),
             get_change_A_AAAA_json(rs_update_fqdn, change_type="DeleteRecordSet"),
             get_change_A_AAAA_json(rs_update_fqdn, ttl=300),
+            get_change_A_AAAA_json(f"non-existent.{ok_zone_name}", change_type="DeleteRecordSet"),
 
             # input validations failures
             get_change_A_AAAA_json("$invalid.host.name.", change_type="DeleteRecordSet"),
@@ -1555,7 +1556,6 @@ def test_a_recordtype_update_delete_checks(shared_zone_test_context):
             get_change_A_AAAA_json("zone.discovery.error.", change_type="DeleteRecordSet"),
 
             # context validation failures: record does not exist, not authorized
-            get_change_A_AAAA_json(f"non-existent.{ok_zone_name}", change_type="DeleteRecordSet"),
             get_change_A_AAAA_json(rs_delete_dummy_fqdn, change_type="DeleteRecordSet"),
             get_change_A_AAAA_json(rs_update_dummy_fqdn, change_type="DeleteRecordSet"),
             get_change_A_AAAA_json(rs_update_dummy_fqdn, ttl=300),
@@ -1592,43 +1592,40 @@ def test_a_recordtype_update_delete_checks(shared_zone_test_context):
         assert_successful_change_in_error_response(response[0], input_name=rs_delete_fqdn, change_type="DeleteRecordSet")
         assert_successful_change_in_error_response(response[1], input_name=rs_update_fqdn, change_type="DeleteRecordSet")
         assert_successful_change_in_error_response(response[2], input_name=rs_update_fqdn, ttl=300)
+        assert_successful_change_in_error_response(response[3], input_name=f"non-existent.{ok_zone_name}", change_type="DeleteRecordSet")
 
         # input validations failures
-        assert_failed_change_in_error_response(response[3], input_name="$invalid.host.name.",
+        assert_failed_change_in_error_response(response[4], input_name="$invalid.host.name.",
                                                change_type="DeleteRecordSet",
                                                error_messages=['Invalid domain name: "$invalid.host.name.", valid domain names must be letters, '
                                                                'numbers, underscores, and hyphens, joined by dots, and terminated with a dot.'])
-        assert_failed_change_in_error_response(response[4], input_name="reverse.zone.in-addr.arpa.",
+        assert_failed_change_in_error_response(response[5], input_name="reverse.zone.in-addr.arpa.",
                                                change_type="DeleteRecordSet",
                                                error_messages=['Invalid Record Type In Reverse Zone: record with name "reverse.zone.in-addr.arpa." and type "A" '
                                                                'is not allowed in a reverse zone.'])
-        assert_failed_change_in_error_response(response[5], input_name="$another.invalid.host.name.", ttl=300,
+        assert_failed_change_in_error_response(response[6], input_name="$another.invalid.host.name.", ttl=300,
                                                error_messages=['Invalid domain name: "$another.invalid.host.name.", valid domain names must be letters, '
                                                                'numbers, underscores, and hyphens, joined by dots, and terminated with a dot.'])
-        assert_failed_change_in_error_response(response[6], input_name="$another.invalid.host.name.",
+        assert_failed_change_in_error_response(response[7], input_name="$another.invalid.host.name.",
                                                change_type="DeleteRecordSet",
                                                error_messages=['Invalid domain name: "$another.invalid.host.name.", valid domain names must be letters, '
                                                                'numbers, underscores, and hyphens, joined by dots, and terminated with a dot.'])
-        assert_failed_change_in_error_response(response[7], input_name="another.reverse.zone.in-addr.arpa.", ttl=10,
+        assert_failed_change_in_error_response(response[8], input_name="another.reverse.zone.in-addr.arpa.", ttl=10,
                                                error_messages=['Invalid Record Type In Reverse Zone: record with name "another.reverse.zone.in-addr.arpa." '
                                                                'and type "A" is not allowed in a reverse zone.',
                                                                'Invalid TTL: "10", must be a number between 30 and 2147483647.'])
-        assert_failed_change_in_error_response(response[8], input_name="another.reverse.zone.in-addr.arpa.",
+        assert_failed_change_in_error_response(response[9], input_name="another.reverse.zone.in-addr.arpa.",
                                                change_type="DeleteRecordSet",
                                                error_messages=['Invalid Record Type In Reverse Zone: record with name "another.reverse.zone.in-addr.arpa." '
                                                                'and type "A" is not allowed in a reverse zone.'])
 
         # zone discovery failure
-        assert_failed_change_in_error_response(response[9], input_name="zone.discovery.error.",
+        assert_failed_change_in_error_response(response[10], input_name="zone.discovery.error.",
                                                change_type="DeleteRecordSet",
                                                error_messages=['Zone Discovery Failed: zone for "zone.discovery.error." does not exist in VinylDNS. '
                                                                'If zone exists, then it must be connected to in VinylDNS.'])
 
         # context validation failures: record does not exist, not authorized
-        assert_failed_change_in_error_response(response[10], input_name=f"non-existent.{ok_zone_name}",
-                                               change_type="DeleteRecordSet",
-                                               error_messages=[
-                                                   f'Record "non-existent.{ok_zone_name}" Does Not Exist: cannot delete a record that does not exist.'])
         assert_failed_change_in_error_response(response[11], input_name=rs_delete_dummy_fqdn,
                                                change_type="DeleteRecordSet",
                                                error_messages=[f'User \"ok\" is not authorized. Contact zone owner group: {dummy_group_name} at test@test.com to make DNS changes.'])
@@ -1781,6 +1778,8 @@ def test_aaaa_recordtype_update_delete_checks(shared_zone_test_context):
             get_change_A_AAAA_json(rs_delete_fqdn, record_type="AAAA", change_type="DeleteRecordSet", address="1:0::4:5:6:7:8"),
             get_change_A_AAAA_json(rs_update_fqdn, record_type="AAAA", ttl=300, address="1:2:3:4:5:6:7:8"),
             get_change_A_AAAA_json(rs_update_fqdn, record_type="AAAA", change_type="DeleteRecordSet"),
+            get_change_A_AAAA_json(f"delete-nonexistent.{ok_zone_name}", record_type="AAAA", change_type="DeleteRecordSet"),
+            get_change_A_AAAA_json(f"update-nonexistent.{ok_zone_name}", record_type="AAAA", change_type="DeleteRecordSet"),
 
             # input validations failures
             get_change_A_AAAA_json(f"invalid-name$.{ok_zone_name}", record_type="AAAA", change_type="DeleteRecordSet"),
@@ -1792,8 +1791,6 @@ def test_aaaa_recordtype_update_delete_checks(shared_zone_test_context):
             get_change_A_AAAA_json("no.zone.at.all.", record_type="AAAA", change_type="DeleteRecordSet"),
 
             # context validation failures
-            get_change_A_AAAA_json(f"delete-nonexistent.{ok_zone_name}", record_type="AAAA", change_type="DeleteRecordSet"),
-            get_change_A_AAAA_json(f"update-nonexistent.{ok_zone_name}", record_type="AAAA", change_type="DeleteRecordSet"),
             get_change_A_AAAA_json(f"update-nonexistent.{ok_zone_name}", record_type="AAAA", address="1::1"),
             get_change_A_AAAA_json(rs_delete_dummy_fqdn, record_type="AAAA", change_type="DeleteRecordSet"),
             get_change_A_AAAA_json(rs_update_dummy_fqdn, record_type="AAAA", address="1::1"),
@@ -1826,39 +1823,37 @@ def test_aaaa_recordtype_update_delete_checks(shared_zone_test_context):
                                                    record_data="1:2:3:4:5:6:7:8")
         assert_successful_change_in_error_response(response[2], input_name=rs_update_fqdn, record_type="AAAA",
                                                    record_data=None, change_type="DeleteRecordSet")
+        assert_successful_change_in_error_response(response[3], input_name=f"delete-nonexistent.{ok_zone_name}", record_type="AAAA",
+                                                   record_data=None, change_type="DeleteRecordSet")
+        assert_successful_change_in_error_response(response[4], input_name=f"update-nonexistent.{ok_zone_name}", record_type="AAAA",
+                                                   record_data=None, change_type="DeleteRecordSet")
 
         # input validations failures: invalid input name, reverse zone error, invalid ttl
-        assert_failed_change_in_error_response(response[3], input_name=f"invalid-name$.{ok_zone_name}", record_type="AAAA",
+        assert_failed_change_in_error_response(response[5], input_name=f"invalid-name$.{ok_zone_name}", record_type="AAAA",
                                                record_data=None, change_type="DeleteRecordSet",
                                                error_messages=[f'Invalid domain name: "invalid-name$.{ok_zone_name}", '
                                                                f'valid domain names must be letters, numbers, underscores, and hyphens, joined by dots, and terminated with a dot.'])
-        assert_failed_change_in_error_response(response[4], input_name="reverse.zone.in-addr.arpa.", record_type="AAAA",
+        assert_failed_change_in_error_response(response[6], input_name="reverse.zone.in-addr.arpa.", record_type="AAAA",
                                                record_data=None, change_type="DeleteRecordSet",
                                                error_messages=["Invalid Record Type In Reverse Zone: record with name \"reverse.zone.in-addr.arpa.\" and "
                                                                "type \"AAAA\" is not allowed in a reverse zone."])
-        assert_failed_change_in_error_response(response[5], input_name=f"bad-ttl-and-invalid-name$-update.{ok_zone_name}",
+        assert_failed_change_in_error_response(response[7], input_name=f"bad-ttl-and-invalid-name$-update.{ok_zone_name}",
                                                record_type="AAAA", record_data=None, change_type="DeleteRecordSet",
                                                error_messages=[f'Invalid domain name: "bad-ttl-and-invalid-name$-update.{ok_zone_name}", '
                                                                f'valid domain names must be letters, numbers, underscores, and hyphens, joined by dots, and terminated with a dot.'])
-        assert_failed_change_in_error_response(response[6], input_name=f"bad-ttl-and-invalid-name$-update.{ok_zone_name}", ttl=29,
+        assert_failed_change_in_error_response(response[8], input_name=f"bad-ttl-and-invalid-name$-update.{ok_zone_name}", ttl=29,
                                                record_type="AAAA", record_data="1:2:3:4:5:6:7:8",
                                                error_messages=['Invalid TTL: "29", must be a number between 30 and 2147483647.',
                                                                f'Invalid domain name: "bad-ttl-and-invalid-name$-update.{ok_zone_name}", '
                                                                f'valid domain names must be letters, numbers, underscores, and hyphens, joined by dots, and terminated with a dot.'])
 
         # zone discovery failure
-        assert_failed_change_in_error_response(response[7], input_name="no.zone.at.all.", record_type="AAAA",
+        assert_failed_change_in_error_response(response[9], input_name="no.zone.at.all.", record_type="AAAA",
                                                record_data=None, change_type="DeleteRecordSet",
                                                error_messages=["Zone Discovery Failed: zone for \"no.zone.at.all.\" does not exist in VinylDNS. "
                                                                "If zone exists, then it must be connected to in VinylDNS."])
 
         # context validation failures: record does not exist, not authorized
-        assert_failed_change_in_error_response(response[8], input_name=f"delete-nonexistent.{ok_zone_name}", record_type="AAAA",
-                                               record_data=None, change_type="DeleteRecordSet",
-                                               error_messages=[f"Record \"delete-nonexistent.{ok_zone_name}\" Does Not Exist: cannot delete a record that does not exist."])
-        assert_failed_change_in_error_response(response[9], input_name=f"update-nonexistent.{ok_zone_name}", record_type="AAAA",
-                                               record_data=None, change_type="DeleteRecordSet",
-                                               error_messages=[f"Record \"update-nonexistent.{ok_zone_name}\" Does Not Exist: cannot delete a record that does not exist."])
         assert_successful_change_in_error_response(response[10], input_name=f"update-nonexistent.{ok_zone_name}", record_type="AAAA", record_data="1::1")
         assert_failed_change_in_error_response(response[11], input_name=rs_delete_dummy_fqdn,
                                                record_type="AAAA", record_data=None, change_type="DeleteRecordSet",
@@ -2058,6 +2053,8 @@ def test_cname_recordtype_update_delete_checks(shared_zone_test_context):
             get_change_CNAME_json(f"delete3.{ok_zone_name}", change_type="DeleteRecordSet"),
             get_change_CNAME_json(f"update3.{ok_zone_name}", change_type="DeleteRecordSet"),
             get_change_CNAME_json(f"update3.{ok_zone_name}", ttl=300),
+            get_change_CNAME_json(f"non-existent-delete.{ok_zone_name}", change_type="DeleteRecordSet"),
+            get_change_CNAME_json(f"non-existent-update.{ok_zone_name}", change_type="DeleteRecordSet"),
 
             # valid changes - reverse zone
             get_change_CNAME_json(f"200.{ip4_zone_name}", change_type="DeleteRecordSet"),
@@ -2073,8 +2070,6 @@ def test_cname_recordtype_update_delete_checks(shared_zone_test_context):
             get_change_CNAME_json("zone.discovery.error.", change_type="DeleteRecordSet"),
 
             # context validation failures: record does not exist, not authorized, failure on update with multiple adds
-            get_change_CNAME_json(f"non-existent-delete.{ok_zone_name}", change_type="DeleteRecordSet"),
-            get_change_CNAME_json(f"non-existent-update.{ok_zone_name}", change_type="DeleteRecordSet"),
             get_change_CNAME_json(f"non-existent-update.{ok_zone_name}"),
             get_change_CNAME_json(f"delete-unauthorized3.{dummy_zone_name}", change_type="DeleteRecordSet"),
             get_change_CNAME_json(f"update-unauthorized3.{dummy_zone_name}", change_type="DeleteRecordSet"),
@@ -2111,25 +2106,29 @@ def test_cname_recordtype_update_delete_checks(shared_zone_test_context):
                                                    change_type="DeleteRecordSet")
         assert_successful_change_in_error_response(response[2], input_name=f"update3.{ok_zone_name}", record_type="CNAME", ttl=300,
                                                    record_data="test.com.")
+        assert_successful_change_in_error_response(response[3], input_name=f"non-existent-delete.{ok_zone_name}", record_type="CNAME",
+                                                   change_type="DeleteRecordSet")
+        assert_successful_change_in_error_response(response[4], input_name=f"non-existent-update.{ok_zone_name}", record_type="CNAME",
+                                                   change_type="DeleteRecordSet")
 
         # valid changes - reverse zone
-        assert_successful_change_in_error_response(response[3], input_name=f"200.{ip4_zone_name}",
+        assert_successful_change_in_error_response(response[5], input_name=f"200.{ip4_zone_name}",
                                                    record_type="CNAME", change_type="DeleteRecordSet")
-        assert_successful_change_in_error_response(response[4], input_name=f"201.{ip4_zone_name}",
+        assert_successful_change_in_error_response(response[6], input_name=f"201.{ip4_zone_name}",
                                                    record_type="CNAME", change_type="DeleteRecordSet")
-        assert_successful_change_in_error_response(response[5], input_name=f"201.{ip4_zone_name}",
+        assert_successful_change_in_error_response(response[7], input_name=f"201.{ip4_zone_name}",
                                                    record_type="CNAME", ttl=300, record_data="test.com.")
 
         # ttl, domain name, data
-        assert_failed_change_in_error_response(response[6], input_name="$invalid.host.name.", record_type="CNAME",
+        assert_failed_change_in_error_response(response[8], input_name="$invalid.host.name.", record_type="CNAME",
                                                change_type="DeleteRecordSet",
                                                error_messages=['Invalid domain name: "$invalid.host.name.", valid domain names must be letters, numbers, '
                                                                'underscores, and hyphens, joined by dots, and terminated with a dot.'])
-        assert_failed_change_in_error_response(response[7], input_name="$another.invalid.host.name.",
+        assert_failed_change_in_error_response(response[9], input_name="$another.invalid.host.name.",
                                                record_type="CNAME", change_type="DeleteRecordSet",
                                                error_messages=['Invalid domain name: "$another.invalid.host.name.", valid domain names must be letters, numbers, '
                                                                'underscores, and hyphens, joined by dots, and terminated with a dot.'])
-        assert_failed_change_in_error_response(response[8], input_name="$another.invalid.host.name.", ttl=20,
+        assert_failed_change_in_error_response(response[10], input_name="$another.invalid.host.name.", ttl=20,
                                                record_type="CNAME", record_data="$another.invalid.cname.",
                                                error_messages=['Invalid TTL: "20", must be a number between 30 and 2147483647.',
                                                                'Invalid domain name: "$another.invalid.host.name.", valid domain names must be letters, numbers, '
@@ -2138,20 +2137,12 @@ def test_cname_recordtype_update_delete_checks(shared_zone_test_context):
                                                                'underscores, and hyphens, joined by dots, and terminated with a dot.'])
 
         # zone discovery failure
-        assert_failed_change_in_error_response(response[9], input_name="zone.discovery.error.", record_type="CNAME",
+        assert_failed_change_in_error_response(response[11], input_name="zone.discovery.error.", record_type="CNAME",
                                                change_type="DeleteRecordSet",
                                                error_messages=[
                                                    'Zone Discovery Failed: zone for "zone.discovery.error." does not exist in VinylDNS. If zone exists, then it must be connected to in VinylDNS.'])
 
         # context validation failures: record does not exist, not authorized
-        assert_failed_change_in_error_response(response[10], input_name=f"non-existent-delete.{ok_zone_name}", record_type="CNAME",
-                                               change_type="DeleteRecordSet",
-                                               error_messages=[
-                                                   f'Record "non-existent-delete.{ok_zone_name}" Does Not Exist: cannot delete a record that does not exist.'])
-        assert_failed_change_in_error_response(response[11], input_name=f"non-existent-update.{ok_zone_name}", record_type="CNAME",
-                                               change_type="DeleteRecordSet",
-                                               error_messages=[
-                                                   f'Record "non-existent-update.{ok_zone_name}" Does Not Exist: cannot delete a record that does not exist.'])
         assert_successful_change_in_error_response(response[12], input_name=f"non-existent-update.{ok_zone_name}",
                                                    record_type="CNAME", record_data="test.com.")
         assert_failed_change_in_error_response(response[13], input_name=f"delete-unauthorized3.{dummy_zone_name}",
@@ -2384,6 +2375,8 @@ def test_ipv4_ptr_recordtype_update_delete_checks(shared_zone_test_context):
             get_change_PTR_json(f"{ip4_prefix}.25", change_type="DeleteRecordSet"),
             get_change_PTR_json(f"{ip4_prefix}.193", ttl=300, ptrdname="has-updated.ptr."),
             get_change_PTR_json(f"{ip4_prefix}.193", change_type="DeleteRecordSet"),
+            get_change_PTR_json(f"{ip4_prefix}.199", change_type="DeleteRecordSet"),
+            get_change_PTR_json(f"{ip4_prefix}.200", change_type="DeleteRecordSet"),
 
             # valid changes: delete and add of same record name but different type
             get_change_CNAME_json(f"21.{ip4_zone_name}", change_type="DeleteRecordSet"),
@@ -2400,9 +2393,7 @@ def test_ipv4_ptr_recordtype_update_delete_checks(shared_zone_test_context):
             get_change_PTR_json("192.1.1.25", change_type="DeleteRecordSet"),
 
             # context validation failures
-            get_change_PTR_json(f"{ip4_prefix}.199", change_type="DeleteRecordSet"),
             get_change_PTR_json(f"{ip4_prefix}.200", ttl=300, ptrdname="has-updated.ptr."),
-            get_change_PTR_json(f"{ip4_prefix}.200", change_type="DeleteRecordSet"),
         ]
     }
 
@@ -2423,25 +2414,29 @@ def test_ipv4_ptr_recordtype_update_delete_checks(shared_zone_test_context):
                                                    record_data="has-updated.ptr.")
         assert_successful_change_in_error_response(response[2], input_name=f"{ip4_prefix}.193", record_type="PTR",
                                                    record_data=None, change_type="DeleteRecordSet")
+        assert_successful_change_in_error_response(response[3], input_name=f"{ip4_prefix}.199", record_type="PTR",
+                                                   record_data=None, change_type="DeleteRecordSet")
+        assert_successful_change_in_error_response(response[4], input_name=f"{ip4_prefix}.200", record_type="PTR",
+                                                   record_data=None, change_type="DeleteRecordSet")
 
         # successful changes: add and delete of same record name but different type
-        assert_successful_change_in_error_response(response[3], input_name=f"21.{ip4_zone_name}",
+        assert_successful_change_in_error_response(response[5], input_name=f"21.{ip4_zone_name}",
                                                    record_type="CNAME", record_data=None, change_type="DeleteRecordSet")
-        assert_successful_change_in_error_response(response[4], input_name=f"{ip4_prefix}.21", record_type="PTR",
+        assert_successful_change_in_error_response(response[6], input_name=f"{ip4_prefix}.21", record_type="PTR",
                                                    record_data="replace-cname.ptr.")
-        assert_successful_change_in_error_response(response[5], input_name=f"17.{ip4_zone_name}",
+        assert_successful_change_in_error_response(response[7], input_name=f"17.{ip4_zone_name}",
                                                    record_type="CNAME", record_data="replace-ptr.cname.")
-        assert_successful_change_in_error_response(response[6], input_name=f"{ip4_prefix}.17", record_type="PTR",
+        assert_successful_change_in_error_response(response[8], input_name=f"{ip4_prefix}.17", record_type="PTR",
                                                    record_data=None, change_type="DeleteRecordSet")
 
         # input validations failures: invalid IP, ttl, and record data
-        assert_failed_change_in_error_response(response[7], input_name="1.1.1", record_type="PTR", record_data=None,
+        assert_failed_change_in_error_response(response[9], input_name="1.1.1", record_type="PTR", record_data=None,
                                                change_type="DeleteRecordSet",
                                                error_messages=['Invalid IP address: "1.1.1".'])
-        assert_failed_change_in_error_response(response[8], input_name="192.0.2.", record_type="PTR", record_data=None,
+        assert_failed_change_in_error_response(response[10], input_name="192.0.2.", record_type="PTR", record_data=None,
                                                change_type="DeleteRecordSet",
                                                error_messages=['Invalid IP address: "192.0.2.".'])
-        assert_failed_change_in_error_response(response[9], ttl=29, input_name="192.0.2.", record_type="PTR",
+        assert_failed_change_in_error_response(response[11], ttl=29, input_name="192.0.2.", record_type="PTR",
                                                record_data="failed-update$.ptr.",
                                                error_messages=['Invalid TTL: "29", must be a number between 30 and 2147483647.',
                                                                'Invalid IP address: "192.0.2.".',
@@ -2449,19 +2444,13 @@ def test_ipv4_ptr_recordtype_update_delete_checks(shared_zone_test_context):
                                                                'joined by dots, and terminated with a dot.'])
 
         # zone discovery failure
-        assert_failed_change_in_error_response(response[10], input_name="192.1.1.25", record_type="PTR",
+        assert_failed_change_in_error_response(response[12], input_name="192.1.1.25", record_type="PTR",
                                                record_data=None, change_type="DeleteRecordSet",
                                                error_messages=["Zone Discovery Failed: zone for \"192.1.1.25\" does not exist in VinylDNS. If zone exists, "
                                                                "then it must be connected to in VinylDNS."])
 
         # context validation failures: record does not exist
-        assert_failed_change_in_error_response(response[11], input_name=f"{ip4_prefix}.199", record_type="PTR",
-                                               record_data=None, change_type="DeleteRecordSet",
-                                               error_messages=[f"Record \"{ip4_prefix}.199\" Does Not Exist: cannot delete a record that does not exist."])
-        assert_successful_change_in_error_response(response[12], ttl=300, input_name=f"{ip4_prefix}.200", record_type="PTR", record_data="has-updated.ptr.")
-        assert_failed_change_in_error_response(response[13], input_name=f"{ip4_prefix}.200", record_type="PTR",
-                                               record_data=None, change_type="DeleteRecordSet",
-                                               error_messages=[f"Record \"{ip4_prefix}.200\" Does Not Exist: cannot delete a record that does not exist."])
+        assert_successful_change_in_error_response(response[13], ttl=300, input_name=f"{ip4_prefix}.200", record_type="PTR", record_data="has-updated.ptr.")
     finally:
         clear_recordset_list(to_delete, ok_client)
 
@@ -2556,6 +2545,8 @@ def test_ipv6_ptr_recordtype_update_delete_checks(shared_zone_test_context):
             get_change_PTR_json(f"{ip6_prefix}:1000::aaaa", change_type="DeleteRecordSet"),
             get_change_PTR_json(f"{ip6_prefix}:1000::62", ttl=300, ptrdname="has-updated.ptr."),
             get_change_PTR_json(f"{ip6_prefix}:1000::62", change_type="DeleteRecordSet"),
+            get_change_PTR_json(f"{ip6_prefix}:1000::60", change_type="DeleteRecordSet"),
+            get_change_PTR_json(f"{ip6_prefix}:1000::65", change_type="DeleteRecordSet"),
 
             # input validations failures
             get_change_PTR_json("fd69:27cc:fe91de::ab", change_type="DeleteRecordSet"),
@@ -2566,9 +2557,7 @@ def test_ipv6_ptr_recordtype_update_delete_checks(shared_zone_test_context):
             get_change_PTR_json("fedc:ba98:7654::abc", change_type="DeleteRecordSet"),
 
             # context validation failures
-            get_change_PTR_json(f"{ip6_prefix}:1000::60", change_type="DeleteRecordSet"),
             get_change_PTR_json(f"{ip6_prefix}:1000::65", ttl=300, ptrdname="has-updated.ptr."),
-            get_change_PTR_json(f"{ip6_prefix}:1000::65", change_type="DeleteRecordSet")
         ]
     }
 
@@ -2589,15 +2578,19 @@ def test_ipv6_ptr_recordtype_update_delete_checks(shared_zone_test_context):
                                                    record_type="PTR", record_data="has-updated.ptr.")
         assert_successful_change_in_error_response(response[2], input_name=f"{ip6_prefix}:1000::62", record_type="PTR",
                                                    record_data=None, change_type="DeleteRecordSet")
+        assert_successful_change_in_error_response(response[3], input_name=f"{ip6_prefix}:1000::60", record_type="PTR",
+                                                   record_data=None, change_type="DeleteRecordSet")
+        assert_successful_change_in_error_response(response[4], input_name=f"{ip6_prefix}:1000::65", record_type="PTR",
+                                                   record_data=None, change_type="DeleteRecordSet")
 
         # input validations failures: invalid IP, ttl, and record data
-        assert_failed_change_in_error_response(response[3], input_name="fd69:27cc:fe91de::ab", record_type="PTR",
+        assert_failed_change_in_error_response(response[5], input_name="fd69:27cc:fe91de::ab", record_type="PTR",
                                                record_data=None, change_type="DeleteRecordSet",
                                                error_messages=['Invalid IP address: "fd69:27cc:fe91de::ab".'])
-        assert_failed_change_in_error_response(response[4], input_name="fd69:27cc:fe91de::ba", record_type="PTR",
+        assert_failed_change_in_error_response(response[6], input_name="fd69:27cc:fe91de::ba", record_type="PTR",
                                                record_data=None, change_type="DeleteRecordSet",
                                                error_messages=['Invalid IP address: "fd69:27cc:fe91de::ba".'])
-        assert_failed_change_in_error_response(response[5], ttl=29, input_name="fd69:27cc:fe91de::ba",
+        assert_failed_change_in_error_response(response[7], ttl=29, input_name="fd69:27cc:fe91de::ba",
                                                record_type="PTR", record_data="failed-update$.ptr.",
                                                error_messages=['Invalid TTL: "29", must be a number between 30 and 2147483647.',
                                                                'Invalid IP address: "fd69:27cc:fe91de::ba".',
@@ -2605,20 +2598,14 @@ def test_ipv6_ptr_recordtype_update_delete_checks(shared_zone_test_context):
                                                                'and hyphens, joined by dots, and terminated with a dot.'])
 
         # zone discovery failure
-        assert_failed_change_in_error_response(response[6], input_name="fedc:ba98:7654::abc", record_type="PTR",
+        assert_failed_change_in_error_response(response[8], input_name="fedc:ba98:7654::abc", record_type="PTR",
                                                record_data=None, change_type="DeleteRecordSet",
                                                error_messages=["Zone Discovery Failed: zone for \"fedc:ba98:7654::abc\" does not exist in VinylDNS. "
                                                                "If zone exists, then it must be connected to in VinylDNS."])
 
         # context validation failures: record does not exist, failure on update with double add
-        assert_failed_change_in_error_response(response[7], input_name=f"{ip6_prefix}:1000::60", record_type="PTR",
-                                               record_data=None, change_type="DeleteRecordSet",
-                                               error_messages=[f"Record \"{ip6_prefix}:1000::60\" Does Not Exist: cannot delete a record that does not exist."])
-        assert_successful_change_in_error_response(response[8], ttl=300, input_name=f"{ip6_prefix}:1000::65",
+        assert_successful_change_in_error_response(response[9], ttl=300, input_name=f"{ip6_prefix}:1000::65",
                                                    record_type="PTR", record_data="has-updated.ptr.")
-        assert_failed_change_in_error_response(response[9], input_name=f"{ip6_prefix}:1000::65", record_type="PTR",
-                                               record_data=None, change_type="DeleteRecordSet",
-                                               error_messages=[f"Record \"{ip6_prefix}:1000::65\" Does Not Exist: cannot delete a record that does not exist."])
 
     finally:
         clear_recordset_list(to_delete, ok_client)
@@ -2747,6 +2734,8 @@ def test_txt_recordtype_update_delete_checks(shared_zone_test_context):
             get_change_TXT_json(rs_delete_fqdn, change_type="DeleteRecordSet"),
             get_change_TXT_json(rs_update_fqdn, change_type="DeleteRecordSet"),
             get_change_TXT_json(rs_update_fqdn, ttl=300),
+            get_change_TXT_json(f"delete-nonexistent.{ok_zone_name}", change_type="DeleteRecordSet"),
+            get_change_TXT_json(f"update-nonexistent.{ok_zone_name}", change_type="DeleteRecordSet"),
 
             # input validations failures
             get_change_TXT_json(f"invalid-name$.{ok_zone_name}", change_type="DeleteRecordSet"),
@@ -2756,8 +2745,6 @@ def test_txt_recordtype_update_delete_checks(shared_zone_test_context):
             get_change_TXT_json("no.zone.at.all.", change_type="DeleteRecordSet"),
 
             # context validation failures
-            get_change_TXT_json(f"delete-nonexistent.{ok_zone_name}", change_type="DeleteRecordSet"),
-            get_change_TXT_json(f"update-nonexistent.{ok_zone_name}", change_type="DeleteRecordSet"),
             get_change_TXT_json(f"update-nonexistent.{ok_zone_name}", text="test"),
             get_change_TXT_json(rs_delete_dummy_fqdn, change_type="DeleteRecordSet"),
             get_change_TXT_json(rs_update_dummy_fqdn, text="test"),
@@ -2787,25 +2774,23 @@ def test_txt_recordtype_update_delete_checks(shared_zone_test_context):
         assert_successful_change_in_error_response(response[0], input_name=rs_delete_fqdn, record_type="TXT", record_data=None, change_type="DeleteRecordSet")
         assert_successful_change_in_error_response(response[1], input_name=rs_update_fqdn, record_type="TXT", record_data=None, change_type="DeleteRecordSet")
         assert_successful_change_in_error_response(response[2], ttl=300, input_name=rs_update_fqdn, record_type="TXT", record_data="test")
+        assert_successful_change_in_error_response(response[3], input_name=f"delete-nonexistent.{ok_zone_name}", record_type="TXT", record_data=None, change_type="DeleteRecordSet")
+        assert_successful_change_in_error_response(response[4], input_name=f"update-nonexistent.{ok_zone_name}", record_type="TXT", record_data=None, change_type="DeleteRecordSet")
 
         # input validations failures: invalid input name, reverse zone error, invalid ttl
-        assert_failed_change_in_error_response(response[3], input_name=f"invalid-name$.{ok_zone_name}", record_type="TXT", record_data="test", change_type="DeleteRecordSet",
+        assert_failed_change_in_error_response(response[5], input_name=f"invalid-name$.{ok_zone_name}", record_type="TXT", record_data="test", change_type="DeleteRecordSet",
                                                error_messages=[f'Invalid domain name: "invalid-name$.{ok_zone_name}", valid domain names must be '
                                                                f'letters, numbers, underscores, and hyphens, joined by dots, and terminated with a dot.'])
-        assert_failed_change_in_error_response(response[4], input_name=f"invalid-ttl.{ok_zone_name}", ttl=29, record_type="TXT", record_data="bad-ttl",
+        assert_failed_change_in_error_response(response[6], input_name=f"invalid-ttl.{ok_zone_name}", ttl=29, record_type="TXT", record_data="bad-ttl",
                                                error_messages=['Invalid TTL: "29", must be a number between 30 and 2147483647.'])
 
         # zone discovery failure
-        assert_failed_change_in_error_response(response[5], input_name="no.zone.at.all.", record_type="TXT", record_data=None, change_type="DeleteRecordSet",
+        assert_failed_change_in_error_response(response[7], input_name="no.zone.at.all.", record_type="TXT", record_data=None, change_type="DeleteRecordSet",
                                                error_messages=[
                                                    "Zone Discovery Failed: zone for \"no.zone.at.all.\" does not exist in VinylDNS. "
                                                    "If zone exists, then it must be connected to in VinylDNS."])
 
         # context validation failures: record does not exist, not authorized
-        assert_failed_change_in_error_response(response[6], input_name=f"delete-nonexistent.{ok_zone_name}", record_type="TXT", record_data=None, change_type="DeleteRecordSet",
-                                               error_messages=[f"Record \"delete-nonexistent.{ok_zone_name}\" Does Not Exist: cannot delete a record that does not exist."])
-        assert_failed_change_in_error_response(response[7], input_name=f"update-nonexistent.{ok_zone_name}", record_type="TXT", record_data=None, change_type="DeleteRecordSet",
-                                               error_messages=[f"Record \"update-nonexistent.{ok_zone_name}\" Does Not Exist: cannot delete a record that does not exist."])
         assert_successful_change_in_error_response(response[8], input_name=f"update-nonexistent.{ok_zone_name}", record_type="TXT", record_data="test")
         assert_failed_change_in_error_response(response[9], input_name=rs_delete_dummy_fqdn, record_type="TXT", record_data=None, change_type="DeleteRecordSet",
                                                error_messages=[f"User \"ok\" is not authorized. Contact zone owner group: {dummy_group_name} at test@test.com to make DNS changes."])
@@ -2958,6 +2943,8 @@ def test_mx_recordtype_update_delete_checks(shared_zone_test_context):
             get_change_MX_json(rs_delete_fqdn, change_type="DeleteRecordSet"),
             get_change_MX_json(rs_update_fqdn, change_type="DeleteRecordSet"),
             get_change_MX_json(rs_update_fqdn, ttl=300),
+            get_change_MX_json(f"delete-nonexistent.{ok_zone_name}", change_type="DeleteRecordSet"),
+            get_change_MX_json(f"update-nonexistent.{ok_zone_name}", change_type="DeleteRecordSet"),
 
             # input validations failures
             get_change_MX_json(f"invalid-name$.{ok_zone_name}", change_type="DeleteRecordSet"),
@@ -2969,8 +2956,6 @@ def test_mx_recordtype_update_delete_checks(shared_zone_test_context):
             get_change_MX_json("no.zone.at.all.", change_type="DeleteRecordSet"),
 
             # context validation failures
-            get_change_MX_json(f"delete-nonexistent.{ok_zone_name}", change_type="DeleteRecordSet"),
-            get_change_MX_json(f"update-nonexistent.{ok_zone_name}", change_type="DeleteRecordSet"),
             get_change_MX_json(f"update-nonexistent.{ok_zone_name}", preference=1000, exchange="foo.bar."),
             get_change_MX_json(rs_delete_dummy_fqdn, change_type="DeleteRecordSet"),
             get_change_MX_json(rs_update_dummy_fqdn, preference=1000, exchange="foo.bar."),
@@ -3000,37 +2985,35 @@ def test_mx_recordtype_update_delete_checks(shared_zone_test_context):
         assert_successful_change_in_error_response(response[0], input_name=rs_delete_fqdn, record_type="MX", record_data=None, change_type="DeleteRecordSet")
         assert_successful_change_in_error_response(response[1], input_name=rs_update_fqdn, record_type="MX", record_data=None, change_type="DeleteRecordSet")
         assert_successful_change_in_error_response(response[2], ttl=300, input_name=rs_update_fqdn, record_type="MX", record_data={"preference": 1, "exchange": "foo.bar."})
+        assert_successful_change_in_error_response(response[3], input_name=f"delete-nonexistent.{ok_zone_name}", record_type="MX",
+                                                   record_data=None, change_type="DeleteRecordSet")
+        assert_successful_change_in_error_response(response[4], input_name=f"update-nonexistent.{ok_zone_name}", record_type="MX",
+                                                   record_data=None, change_type="DeleteRecordSet")
 
         # input validations failures: invalid input name, reverse zone error, invalid ttl
-        assert_failed_change_in_error_response(response[3], input_name=f"invalid-name$.{ok_zone_name}", record_type="MX", record_data={"preference": 1, "exchange": "foo.bar."},
+        assert_failed_change_in_error_response(response[5], input_name=f"invalid-name$.{ok_zone_name}", record_type="MX", record_data={"preference": 1, "exchange": "foo.bar."},
                                                change_type="DeleteRecordSet",
                                                error_messages=[f'Invalid domain name: "invalid-name$.{ok_zone_name}", valid domain names must be letters, '
                                                                f'numbers, underscores, and hyphens, joined by dots, and terminated with a dot.'])
-        assert_failed_change_in_error_response(response[4], input_name=f"delete.{ok_zone_name}", ttl=29, record_type="MX",
+        assert_failed_change_in_error_response(response[6], input_name=f"delete.{ok_zone_name}", ttl=29, record_type="MX",
                                                record_data={"preference": 1, "exchange": "foo.bar."},
                                                error_messages=['Invalid TTL: "29", must be a number between 30 and 2147483647.'])
-        assert_failed_change_in_error_response(response[5], input_name=f"bad-exchange.{ok_zone_name}", record_type="MX",
+        assert_failed_change_in_error_response(response[7], input_name=f"bad-exchange.{ok_zone_name}", record_type="MX",
                                                record_data={"preference": 1, "exchange": "foo$.bar."},
                                                error_messages=['Invalid domain name: "foo$.bar.", valid domain names must be letters, numbers, '
                                                                'underscores, and hyphens, joined by dots, and terminated with a dot.'])
-        assert_failed_change_in_error_response(response[6], input_name=f"mx.{ip4_zone_name}", record_type="MX",
+        assert_failed_change_in_error_response(response[8], input_name=f"mx.{ip4_zone_name}", record_type="MX",
                                                record_data={"preference": 1, "exchange": "foo.bar."},
                                                error_messages=[f'Invalid Record Type In Reverse Zone: record with name "mx.{ip4_zone_name}" '
                                                                f'and type "MX" is not allowed in a reverse zone.'])
 
         # zone discovery failure
-        assert_failed_change_in_error_response(response[7], input_name="no.zone.at.all.", record_type="MX",
+        assert_failed_change_in_error_response(response[9], input_name="no.zone.at.all.", record_type="MX",
                                                record_data=None, change_type="DeleteRecordSet",
                                                error_messages=["Zone Discovery Failed: zone for \"no.zone.at.all.\" does not exist in VinylDNS. "
                                                                "If zone exists, then it must be connected to in VinylDNS."])
 
         # context validation failures: record does not exist, not authorized
-        assert_failed_change_in_error_response(response[8], input_name=f"delete-nonexistent.{ok_zone_name}", record_type="MX",
-                                               record_data=None, change_type="DeleteRecordSet",
-                                               error_messages=[f"Record \"delete-nonexistent.{ok_zone_name}\" Does Not Exist: cannot delete a record that does not exist."])
-        assert_failed_change_in_error_response(response[9], input_name=f"update-nonexistent.{ok_zone_name}", record_type="MX",
-                                               record_data=None, change_type="DeleteRecordSet",
-                                               error_messages=[f"Record \"update-nonexistent.{ok_zone_name}\" Does Not Exist: cannot delete a record that does not exist."])
         assert_successful_change_in_error_response(response[10], input_name=f"update-nonexistent.{ok_zone_name}", record_type="MX",
                                                    record_data={"preference": 1000, "exchange": "foo.bar."})
         assert_failed_change_in_error_response(response[11], input_name=rs_delete_dummy_fqdn, record_type="MX",
@@ -3739,39 +3722,27 @@ def test_create_batch_with_zone_name_requiring_manual_review(shared_zone_test_co
             rejecter.reject_batch_change(response["id"], status=200)
 
 
-def test_create_batch_delete_record_for_invalid_record_data_fails(shared_zone_test_context):
+def test_create_batch_delete_record_that_does_not_exists_completes(shared_zone_test_context):
     """
     Test delete record set fails for non-existent record and non-existent record data
     """
     client = shared_zone_test_context.ok_vinyldns_client
     ok_zone_name = shared_zone_test_context.ok_zone["name"]
 
-    a_delete_name = generate_record_name()
-    a_delete_fqdn = a_delete_name + f".{ok_zone_name}"
-    a_delete = create_recordset(shared_zone_test_context.ok_zone, a_delete_fqdn, "A", [{"address": "1.1.1.1"}])
-
     batch_change_input = {
         "comments": "test delete record failures",
         "changes": [
-            get_change_A_AAAA_json(f"delete-non-existent-record.{ok_zone_name}", change_type="DeleteRecordSet"),
-            get_change_A_AAAA_json(a_delete_fqdn, address="4.5.6.7", change_type="DeleteRecordSet")
+            get_change_A_AAAA_json(f"delete-non-existent-record.{ok_zone_name}", change_type="DeleteRecordSet")
         ]
     }
 
-    to_delete = []
+    response = client.create_batch_change(batch_change_input, status=202)
+    get_batch = client.get_batch_change(response["id"])
 
-    try:
-        create_rs = client.create_recordset(a_delete, status=202)
-        to_delete.append(client.wait_until_recordset_change_status(create_rs, "Complete"))
+    assert_that(get_batch["changes"][0]["systemMessage"], is_("ℹ️ This record does not exist." +
+                                                              "No further action is required."))
 
-        errors = client.create_batch_change(batch_change_input, status=400)
-
-        assert_failed_change_in_error_response(errors[0], input_name=f"delete-non-existent-record.{ok_zone_name}", record_data="1.1.1.1", change_type="DeleteRecordSet",
-                                               error_messages=[f'Record "delete-non-existent-record.{ok_zone_name}" Does Not Exist: cannot delete a record that does not exist.'])
-        assert_failed_change_in_error_response(errors[1], input_name=a_delete_fqdn, record_data="4.5.6.7", change_type="DeleteRecordSet",
-                                               error_messages=["Record data 4.5.6.7 does not exist for \"" + a_delete_fqdn + "\"."])
-    finally:
-        clear_recordset_list(to_delete, client)
+    assert_successful_change_in_error_response(response["changes"][0], input_name=f"delete-non-existent-record.{ok_zone_name}", record_data="1.1.1.1", change_type="DeleteRecordSet")
 
 
 @pytest.mark.serial
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala
index 1e4990b39..c5a8d5e18 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala
@@ -37,6 +37,8 @@ import vinyldns.core.domain.record._
 import vinyldns.core.domain.zone.Zone
 
 class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelpers {
+  private val completedMessage: String = "ℹ️ This record does not exist." +
+    "No further action is required."
 
   private def makeSingleAddChange(
       name: String,
@@ -160,6 +162,14 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
     makeAddChangeForValidation("mxToUpdate", MXData(1, Fqdn("update.com.")), MX)
   )
 
+  private val singleChangesOneDelete = List(
+    makeSingleDeleteRRSetChange("DoesNotExistToDelete", A)
+  )
+
+  private val changeForValidationOneDelete = List(
+    makeDeleteRRSetChangeForValidation("DoesNotExistToDelete", A)
+  )
+
   private val singleChangesOneBad = List(
     makeSingleAddChange("one", AData("1.1.1.1")),
     makeSingleAddChange("two", AData("1.1.1.2")),
@@ -535,6 +545,44 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
       savedBatch shouldBe Some(returnedBatch)
     }
 
+    "set status to complete when deleting a record that does not exists" in {
+      val batchWithBadChange =
+        BatchChange(
+          okUser.id,
+          okUser.userName,
+          None,
+          DateTime.now,
+          singleChangesOneDelete,
+          approvalStatus = BatchChangeApprovalStatus.AutoApproved
+        )
+      val result = rightResultOf(
+        underTest
+          .sendBatchForProcessing(
+            batchWithBadChange,
+            existingZones,
+            ChangeForValidationMap(changeForValidationOneDelete.map(_.validNel), existingRecordSets),
+            None
+          )
+          .value
+      )
+
+      val returnedBatch = result.batchChange
+
+      // validate failed status update returned
+      val receivedChange = returnedBatch.changes(0)
+      receivedChange.status shouldBe SingleChangeStatus.Complete
+      receivedChange.recordChangeId shouldBe None
+      receivedChange.systemMessage shouldBe Some(completedMessage)
+
+      // validate other changes have no update
+      returnedBatch.changes(0) shouldBe singleChangesOneDelete(0).copy(systemMessage = Some(completedMessage), status = SingleChangeStatus.Complete)
+
+      // check the update has been made in the DB
+      val savedBatch: Option[BatchChange] =
+        await(batchChangeRepo.getBatchChange(batchWithBadChange.id))
+      savedBatch shouldBe Some(returnedBatch)
+    }
+
     "return error if an unsupported record is received" in {
       val batchChangeUnsupported =
         BatchChange(
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
index f322b2523..c05acb3fc 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
@@ -1004,7 +1004,7 @@ class BatchChangeValidationsSpec
     )
   }
 
-  property("validateChangesWithContext: should fail for update if record does not exist") {
+  property("validateChangesWithContext: should complete for update if record does not exist") {
     val deleteRRSet = makeDeleteUpdateDeleteRRSet("deleteRRSet")
     val deleteRecord = makeDeleteUpdateDeleteRRSet("deleteRecord", Some(AData("1.1.1.1")))
     val deleteNonExistentEntry = makeDeleteUpdateDeleteRRSet("ok", Some(AData("1.1.1.1")))
@@ -1026,15 +1026,8 @@ class BatchChangeValidationsSpec
     )
 
     result(0) shouldBe valid
-    result(1) should haveInvalid[DomainValidationError](
-      RecordDoesNotExist(deleteRRSet.inputChange.inputName)
-    )
-    result(3) should haveInvalid[DomainValidationError](
-      RecordDoesNotExist(deleteRecord.inputChange.inputName)
-    )
-    result(3) should haveInvalid[DomainValidationError](
-      RecordDoesNotExist(deleteRecord.inputChange.inputName)
-    )
+    result(1) shouldBe valid
+    result(3) shouldBe valid
     result(4) shouldBe valid
     deleteNonExistentEntry.inputChange.record.foreach { record =>
       result(5) should haveInvalid[DomainValidationError](
@@ -1589,7 +1582,7 @@ class BatchChangeValidationsSpec
   }
 
   property(
-    """validateChangesWithContext: should fail DeleteChangeForValidation with RecordDoesNotExist
+    """validateChangesWithContext: should complete DeleteChangeForValidation
       |if record does not exist""".stripMargin
   ) {
     val deleteRRSet = makeDeleteUpdateDeleteRRSet("record-does-not-exist")
@@ -1606,12 +1599,8 @@ class BatchChangeValidationsSpec
         None
       )
 
-    result(0) should haveInvalid[DomainValidationError](
-      RecordDoesNotExist(deleteRRSet.inputChange.inputName)
-    )
-    result(1) should haveInvalid[DomainValidationError](
-      RecordDoesNotExist(deleteRecord.inputChange.inputName)
-    )
+    result(0) shouldBe valid
+    result(1) shouldBe valid
   }
 
   property("""validateChangesWithContext: should succeed for DeleteChangeForValidation
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala b/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
index 48d494485..32a7b73cc 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
@@ -47,6 +47,13 @@ sealed trait SingleChange {
       delete.copy(status = SingleChangeStatus.Failed, systemMessage = Some(error))
   }
 
+  def withDoesNotExistMessage(error: String): SingleChange = this match {
+    case add: SingleAddChange =>
+      add.copy(status = SingleChangeStatus.Failed, systemMessage = Some("Error queueing RecordSetChange for processing"))
+    case delete: SingleDeleteRRSetChange =>
+      delete.copy(status = SingleChangeStatus.Complete, systemMessage = Some(error))
+  }
+
   def withProcessingError(message: Option[String], failedRecordChangeId: String): SingleChange =
     this match {
       case add: SingleAddChange =>

From fca4741721f39de4aabd62927b41c5e70d865eed Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 13 Jun 2022 16:46:14 +0530
Subject: [PATCH 018/147] remove directly hardcoded message

---
 .../main/scala/vinyldns/core/domain/batch/SingleChange.scala    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala b/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
index 32a7b73cc..8053d2520 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
@@ -49,7 +49,7 @@ sealed trait SingleChange {
 
   def withDoesNotExistMessage(error: String): SingleChange = this match {
     case add: SingleAddChange =>
-      add.copy(status = SingleChangeStatus.Failed, systemMessage = Some("Error queueing RecordSetChange for processing"))
+      add.copy(status = SingleChangeStatus.Failed, systemMessage = Some(error))
     case delete: SingleDeleteRRSetChange =>
       delete.copy(status = SingleChangeStatus.Complete, systemMessage = Some(error))
   }

From dd1477f3bc1f73f346ee520db07d81dff1114ed7 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Wed, 15 Jun 2022 12:27:42 +0530
Subject: [PATCH 019/147] update

---
 .../domain/batch/BatchChangeValidations.scala | 49 +++++++++++--------
 .../domain/batch/BatchTransformations.scala   |  9 +++-
 .../api/engine/RecordSetChangeHandler.scala   | 24 ++++-----
 .../core/domain/DomainValidationErrors.scala  | 18 +++++--
 .../core/domain/batch/SingleChange.scala      | 22 +++------
 .../core/domain/record/RecordSetChange.scala  |  4 +-
 6 files changed, 70 insertions(+), 56 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
index b5066c3b2..f565fbbcf 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
@@ -17,15 +17,9 @@
 package vinyldns.api.domain.batch
 
 import java.net.InetAddress
-
 import cats.data._
 import cats.implicits._
-import vinyldns.api.config.{
-  BatchChangeConfig,
-  HighValueDomainConfig,
-  ManualReviewConfig,
-  ScheduledChangesConfig
-}
+import vinyldns.api.config.{BatchChangeConfig, HighValueDomainConfig, ManualReviewConfig, ScheduledChangesConfig}
 import vinyldns.api.domain.DomainValidations._
 import vinyldns.api.domain.access.AccessValidationsAlgebra
 import vinyldns.core.domain.auth.AuthPrincipal
@@ -34,7 +28,7 @@ import vinyldns.api.domain.batch.BatchTransformations._
 import vinyldns.api.domain.zone.ZoneRecordValidations
 import vinyldns.core.domain.record._
 import vinyldns.core.domain._
-import vinyldns.core.domain.batch.{BatchChange, BatchChangeApprovalStatus, OwnerType, RecordKey}
+import vinyldns.core.domain.batch.{BatchChange, BatchChangeApprovalStatus, OwnerType, RecordKey, RecordKeyData}
 import vinyldns.core.domain.membership.Group
 
 trait BatchChangeValidationsAlgebra {
@@ -146,10 +140,11 @@ class BatchChangeValidations(
       batchChange: BatchChange,
       authPrincipal: AuthPrincipal,
       isTestChange: Boolean
-  ): Either[BatchChangeErrorResponse, Unit] =
+  ): Either[BatchChangeErrorResponse, Unit] = {
     validateAuthorizedReviewer(authPrincipal, batchChange, isTestChange) |+| validateBatchChangePendingReview(
       batchChange
     ) |+| validateScheduledApproval(batchChange)
+  }
 
   def validateBatchChangeCancellation(
       batchChange: BatchChange,
@@ -276,7 +271,7 @@ class BatchChangeValidations(
       auth: AuthPrincipal,
       isApproved: Boolean,
       batchOwnerGroupId: Option[String]
-  ): ValidatedBatch[ChangeForValidation] =
+  ): ValidatedBatch[ChangeForValidation] = {
     // Updates are a combination of an add and delete for a record with the same name and type in a zone.
     groupedChanges.changes.mapValid {
       case add: AddChangeForValidation
@@ -297,6 +292,7 @@ class BatchChangeValidations(
       case deleteUpdate =>
         validateDeleteUpdateWithContext(deleteUpdate, groupedChanges, auth, isApproved)
     }
+  }
 
   def newRecordSetIsNotDotted(change: AddChangeForValidation): SingleValidation[Unit] =
     if (change.recordName != change.zone.name && change.recordName.contains("."))
@@ -426,20 +422,22 @@ class BatchChangeValidations(
         InvalidBatchRecordType(other.toString, SupportedBatchChangeRecordTypes.get).invalidNel
     }
 
-    val validations =
+    val validations = {
       typedValidations |+|
-        //noIncompatibleRecordExists(change, groupedChanges) |+|
+        noIncompatibleRecordExists(change, groupedChanges) |+|
         userCanAddRecordSet(change, auth) |+|
-        /*recordDoesNotExist(
+        recordDoesNotExist(
           change.zone.id,
           change.recordName,
           change.inputChange.inputName,
           change.inputChange.typ,
-          groupedChanges
-        ) |+|*/
+          change.inputChange.record,
+          groupedChanges,
+          isApproved
+        ) |+|
         ownerGroupProvidedIfNeeded(change, None, ownerGroupId) |+|
         zoneDoesNotRequireManualReview(change, isApproved)
-
+    }
     validations.map(_ => change)
   }
 
@@ -477,12 +475,21 @@ class BatchChangeValidations(
       recordName: String,
       inputName: String,
       typ: RecordType,
-      groupedChanges: ChangeForValidationMap
-  ): SingleValidation[Unit] =
-    groupedChanges.getExistingRecordSet(RecordKey(zoneId, recordName, typ)) match {
-      case Some(_) => RecordAlreadyExists(inputName).invalidNel
-      case None => ().validNel
+      recordData: RecordData,
+      groupedChanges: ChangeForValidationMap,
+      isApproved: Boolean
+  ): SingleValidation[Unit] = {
+    if(isApproved==false) {
+      groupedChanges.getExistingRecordSet(RecordKey(zoneId, recordName, typ)) match {
+        case Some(_) => RecordAlreadyExists(inputName, isApproved, recordData).invalidNel
+        case None => ().validNel
+      }
+    }else{
+      val record = groupedChanges.getExistingRecordSetData(RecordKeyData(zoneId, recordName, typ, recordData))
+      if (record.get.records.contains(recordData)){ ().validNel }
+      else{ RecordAlreadyExists(inputName, isApproved, recordData).invalidNel }
     }
+  }
 
   def noIncompatibleRecordExists(
       change: AddChangeForValidation,
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchTransformations.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchTransformations.scala
index a0345954a..9fa6ef2aa 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchTransformations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchTransformations.scala
@@ -59,8 +59,9 @@ object BatchTransformations {
   }
 
   final case class ExistingRecordSets(recordSets: List[RecordSet]) {
-    val recordSetMap: Map[(String, String), List[RecordSet]] =
+    val recordSetMap: Map[(String, String), List[RecordSet]] = {
       recordSets.groupBy(rs => (rs.zoneId, rs.name.toLowerCase))
+    }
 
     def get(zoneId: String, name: String, recordType: RecordType): Option[RecordSet] =
       recordSetMap.getOrElse((zoneId, name.toLowerCase), List()).find(_.typ == recordType)
@@ -68,6 +69,9 @@ object BatchTransformations {
     def get(recordKey: RecordKey): Option[RecordSet] =
       get(recordKey.zoneId, recordKey.recordName, recordKey.recordType)
 
+    def get(recordKeyData: RecordKeyData): Option[RecordSet] =
+      get(recordKeyData.zoneId, recordKeyData.recordName, recordKeyData.recordType)
+
     def getRecordSetMatch(zoneId: String, name: String): List[RecordSet] =
       recordSetMap.getOrElse((zoneId, name.toLowerCase), List())
   }
@@ -171,6 +175,9 @@ object BatchTransformations {
     def getExistingRecordSet(recordKey: RecordKey): Option[RecordSet] =
       existingRecordSets.get(recordKey)
 
+    def getExistingRecordSetData(recordKeyData: RecordKeyData): Option[RecordSet] =
+      existingRecordSets.get(recordKeyData)
+
     def getProposedAdds(recordKey: RecordKey): Set[RecordData] =
       innerMap.get(recordKey).map(_.proposedAdds).toSet.flatten
 
diff --git a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
index 8d5f5b44f..1b958c9c9 100644
--- a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
+++ b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
@@ -107,8 +107,6 @@ object RecordSetChangeHandler extends TransactionProvider {
     recordSetChange.status match {
       case RecordSetChangeStatus.Complete =>
         singleChanges.map(_.complete(recordSetChange.id, recordSetChange.recordSet.id))
-      case RecordSetChangeStatus.AlreadyExists =>
-        singleChanges.map(_.alreadyExists(recordSetChange.systemMessage,recordSetChange.id, recordSetChange.recordSet.id))
       case RecordSetChangeStatus.Failed =>
         singleChanges.map(_.withProcessingError(recordSetChange.systemMessage, recordSetChange.id))
       case _ => singleChanges
@@ -158,8 +156,9 @@ object RecordSetChangeHandler extends TransactionProvider {
                                                 recordSetCacheRepository: RecordSetCacheRepository,
                                                 performSync: Boolean = false
   ): IO[ProcessingStatus] = {
-    def isDnsMatch(dnsResult: List[RecordSet], recordSet: RecordSet, zoneName: String): Boolean =
+    def isDnsMatch(dnsResult: List[RecordSet], recordSet: RecordSet, zoneName: String): Boolean = {
       dnsResult.exists(matches(_, recordSet, zoneName))
+    }
 
     // Determine processing status by comparing request against disposition of DNS backend
     def getProcessingStatus(
@@ -168,16 +167,15 @@ object RecordSetChangeHandler extends TransactionProvider {
     ): IO[ProcessingStatus] = IO {
       change.changeType match {
         case RecordSetChangeType.Create =>
-          if (existingRecords.isEmpty) ReadyToApply(change)
-          else if (isDnsMatch(existingRecords, change.recordSet, change.zone.name))
-            AlreadyApplied(change)
-          else if (existingRecords.nonEmpty)
-            AlreadyExists(change,"Record already exists in DNS.")
+          if (existingRecords.isEmpty) { ReadyToApply(change)}
+          else if (isDnsMatch(existingRecords, change.recordSet, change.zone.name)) {
+            AlreadyApplied(change) }
+          else if (existingRecords.nonEmpty) { AlreadyExists(change, "Record updated in DNS") }//Record exists in DNS
           else Failure(change, "Incompatible record in DNS.")
 
         case RecordSetChangeType.Update =>
           if (isDnsMatch(existingRecords, change.recordSet, change.zone.name))
-            AlreadyApplied(change)
+          AlreadyApplied(change)
           else {
             // record must not exist in the DNS backend, or be synced if it exists
             val canApply = existingRecords.isEmpty ||
@@ -193,8 +191,7 @@ object RecordSetChangeHandler extends TransactionProvider {
           }
 
         case RecordSetChangeType.Delete =>
-          if (existingRecords.nonEmpty) {ReadyToApply(change)
-          } // we have a record set, move forward
+          if (existingRecords.nonEmpty) ReadyToApply(change) // we have a record set, move forward
           else AlreadyApplied(change) // we did not find the record set, so already applied
       }
     }
@@ -394,7 +391,7 @@ object RecordSetChangeHandler extends TransactionProvider {
     ).map {
       case AlreadyApplied(_) => Completed(change.successful)
       case AlreadyExists(_,message) => Completed(change.alreadyExists(
-        s"ℹ️ DNS for change ${change.id}:${change.recordSet.name}: $message"
+        s"ℹ️ DNS for change ${change.id}: ${change.recordSet.name}: $message"
       )
       )
       case ReadyToApply(_) => Validated(change)
@@ -438,6 +435,9 @@ object RecordSetChangeHandler extends TransactionProvider {
       recordSetCacheRepository
     ).map {
       case AlreadyApplied(_) => Completed(change.successful)
+      case AlreadyExists(_,message) => Completed(change.alreadyExists(
+        s"ℹ️ DNS for change ${change.id}: ${change.recordSet.name}: $message"
+      ))
       case Failure(_, message) =>
         Completed(
           change.failed(
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
index 91486ce79..1673baa84 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
@@ -109,10 +109,20 @@ final case class ZoneDiscoveryError(name: String, fatal: Boolean = false)
       "If zone exists, then it must be connected to in VinylDNS."
 }
 
-final case class RecordAlreadyExists(name: String) extends DomainValidationError {
-  def message: String =
-    s"""Record "$name" Already Exists: cannot add an existing record; to update it, """ +
-      "issue a DeleteRecordSet then an Add."
+final case class RecordAlreadyExists(name: String, isApproved:Boolean, recordData: RecordData,
+                                     fatal: Boolean = false) extends DomainValidationError(fatal) {
+  def message: String = {
+    if (isApproved == false) {
+      s"""Record Name $name already exists. Your request will be manually reviewed.
+        | If you intended to update this record, you can avoid manual review by adding a
+        | DeleteRecordSet entry followed by an Add..""".stripMargin
+    }
+    else {
+      s"""ℹ️ Record data $recordData in DNS is not exists.
+         |Complete the request in backend and give approve.
+         |""".stripMargin
+    }
+  }
 }
 
 final case class RecordDoesNotExist(name: String) extends DomainValidationError {
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala b/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
index 2f296c500..fe45e9181 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
@@ -77,22 +77,6 @@ sealed trait SingleChange {
         recordSetId = Some(recordSetId)
       )
   }
-  def alreadyExists(message: Option[String],completeRecordChangeId: String, recordSetId: String): SingleChange = this match {
-    case add: SingleAddChange =>
-      add.copy(
-        status = SingleChangeStatus.Complete,
-        systemMessage = message,
-        recordChangeId = Some(completeRecordChangeId),
-        recordSetId = Some(recordSetId)
-      )
-    case delete: SingleDeleteRRSetChange =>
-      delete.copy(
-        status = SingleChangeStatus.Complete,
-        systemMessage = message,
-        recordChangeId = Some(completeRecordChangeId),
-        recordSetId = Some(recordSetId)
-      )
-  }
 
   def reject: SingleChange = this match {
     case sad: SingleAddChange => sad.copy(status = SingleChangeStatus.Rejected)
@@ -156,12 +140,18 @@ object SingleChangeStatus extends Enumeration {
 }
 
 case class RecordKey(zoneId: String, recordName: String, recordType: RecordType)
+case class RecordKeyData(zoneId: String, recordName: String, recordType: RecordType, recordData: RecordData)
 
 object RecordKey {
   def apply(zoneId: String, recordName: String, recordType: RecordType): RecordKey =
     new RecordKey(zoneId, recordName.toLowerCase, recordType)
 }
 
+object RecordKeyData {
+  def apply(zoneId: String, recordName: String, recordType: RecordType, recordData: RecordData): RecordKeyData =
+    new RecordKeyData(zoneId, recordName.toLowerCase, recordType, recordData)
+}
+
 object OwnerType extends Enumeration {
   type OwnerType = Value
   val Record, Zone = Value
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala b/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala
index 813824076..68d3a10e0 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala
@@ -23,7 +23,7 @@ import vinyldns.core.domain.zone.{Zone, ZoneCommand, ZoneCommandResult}
 
 object RecordSetChangeStatus extends Enumeration {
   type RecordSetChangeStatus = Value
-  val Pending, Complete, Failed, Synced, AlreadyExists = Value
+  val Pending, Complete, Failed, Synced = Value
 
   def isDone(status: RecordSetChangeStatus): Boolean = status == Complete || status == Failed
 }
@@ -61,7 +61,7 @@ case class RecordSetChange(
 
   def alreadyExists(message: Option[String] = None): RecordSetChange =
     copy(
-      status = RecordSetChangeStatus.AlreadyExists,
+      status = RecordSetChangeStatus.Complete,
       systemMessage = message,
       recordSet = recordSet
         .copy(status = RecordSetStatus.Active, updated = Some(DateTime.now))

From 71f6dfd7c477f76039a035c6d99a9776d3a31587 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Wed, 15 Jun 2022 15:04:54 +0530
Subject: [PATCH 020/147] update

---
 .../domain/batch/BatchChangeValidations.scala | 20 +++++++++----------
 .../api/engine/RecordSetChangeHandler.scala   |  8 ++++----
 .../core/domain/DomainValidationErrors.scala  | 11 +++++-----
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
index f565fbbcf..05560cf40 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
@@ -479,17 +479,17 @@ class BatchChangeValidations(
       groupedChanges: ChangeForValidationMap,
       isApproved: Boolean
   ): SingleValidation[Unit] = {
-    if(isApproved==false) {
-      groupedChanges.getExistingRecordSet(RecordKey(zoneId, recordName, typ)) match {
-        case Some(_) => RecordAlreadyExists(inputName, isApproved, recordData).invalidNel
-        case None => ().validNel
-      }
-    }else{
-      val record = groupedChanges.getExistingRecordSetData(RecordKeyData(zoneId, recordName, typ, recordData))
-      if (record.get.records.contains(recordData)){ ().validNel }
-      else{ RecordAlreadyExists(inputName, isApproved, recordData).invalidNel }
+    isApproved match {
+      case false =>
+        groupedChanges.getExistingRecordSet(RecordKey(zoneId, recordName, typ)) match {
+          case Some(_) => RecordAlreadyExists(inputName, isApproved, recordData).invalidNel
+          case None => ().validNel}
+      case true =>
+        val record = groupedChanges.getExistingRecordSetData(RecordKeyData(zoneId, recordName, typ, recordData))
+            if (record.get.records.contains(recordData)){ ().validNel }
+            else { RecordAlreadyExists(inputName, isApproved, recordData).invalidNel }
+        }
     }
-  }
 
   def noIncompatibleRecordExists(
       change: AddChangeForValidation,
diff --git a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
index 1b958c9c9..6add45c38 100644
--- a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
+++ b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
@@ -391,14 +391,14 @@ object RecordSetChangeHandler extends TransactionProvider {
     ).map {
       case AlreadyApplied(_) => Completed(change.successful)
       case AlreadyExists(_,message) => Completed(change.alreadyExists(
-        s"ℹ️ DNS for change ${change.id}: ${change.recordSet.name}: $message"
+        s"""ℹ️ DNS for change "${change.id}": "${change.recordSet.name}": $message"""
       )
       )
       case ReadyToApply(_) => Validated(change)
       case Failure(_, message) =>
         Completed(
           change.failed(
-            s"Failed validating update to DNS for change ${change.id}:${change.recordSet.name}: " + message
+            s"""Failed validating update to DNS for change "${change.id}": "${change.recordSet.name}": """ + message
           )
         )
       case Retry(_) => Retrying(change)
@@ -436,12 +436,12 @@ object RecordSetChangeHandler extends TransactionProvider {
     ).map {
       case AlreadyApplied(_) => Completed(change.successful)
       case AlreadyExists(_,message) => Completed(change.alreadyExists(
-        s"ℹ️ DNS for change ${change.id}: ${change.recordSet.name}: $message"
+        s"""ℹ️ DNS for change "${change.id}": "${change.recordSet.name}": $message"""
       ))
       case Failure(_, message) =>
         Completed(
           change.failed(
-            s"Failed verifying update to DNS for change ${change.id}:${change.recordSet.name}: $message"
+            s"""Failed verifying update to DNS for change "${change.id}":"${change.recordSet.name}": $message"""
           )
         )
       case _ => Retrying(change)
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
index 1673baa84..35bcda61f 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
@@ -113,14 +113,13 @@ final case class RecordAlreadyExists(name: String, isApproved:Boolean, recordDat
                                      fatal: Boolean = false) extends DomainValidationError(fatal) {
   def message: String = {
     if (isApproved == false) {
-      s"""Record Name $name already exists. Your request will be manually reviewed.
-        | If you intended to update this record, you can avoid manual review by adding a
-        | DeleteRecordSet entry followed by an Add..""".stripMargin
+      s"""RecordName "$name" already exists. Your request will be manually reviewed. """ +
+         "If you intended to update this record, you can avoid manual review by adding " +
+        " a DeleteRecordSet entry followed by an Add."
     }
     else {
-      s"""ℹ️ Record data $recordData in DNS is not exists.
-         |Complete the request in backend and give approve.
-         |""".stripMargin
+      s"""ℹ️ Record data "$recordData" in DNS is does not exists.
+         Complete the request in DNS and give approve. """
     }
   }
 }

From 62a79b62a2a13214251971d03391f644acb25174 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Wed, 15 Jun 2022 18:23:00 +0530
Subject: [PATCH 021/147] update comment

---
 .../vinyldns/api/domain/batch/BatchChangeConverterSpec.scala  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala
index c5a8d5e18..931c8fc14 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala
@@ -568,13 +568,11 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
 
       val returnedBatch = result.batchChange
 
-      // validate failed status update returned
+      // validate completed status returned
       val receivedChange = returnedBatch.changes(0)
       receivedChange.status shouldBe SingleChangeStatus.Complete
       receivedChange.recordChangeId shouldBe None
       receivedChange.systemMessage shouldBe Some(completedMessage)
-
-      // validate other changes have no update
       returnedBatch.changes(0) shouldBe singleChangesOneDelete(0).copy(systemMessage = Some(completedMessage), status = SingleChangeStatus.Complete)
 
       // check the update has been made in the DB

From ccae59fe7ababeed13dddb1ed9a369f3a84927ac Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Thu, 16 Jun 2022 11:52:45 +0530
Subject: [PATCH 022/147] update in tests

---
 .../api/domain/batch/BatchChangeServiceSpec.scala        | 9 +++++----
 .../api/domain/batch/BatchChangeValidationsSpec.scala    | 8 ++++----
 .../vinyldns/api/engine/RecordSetChangeHandlerSpec.scala | 2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeServiceSpec.scala
index fb27338c1..b1852c95f 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeServiceSpec.scala
@@ -66,8 +66,8 @@ class BatchChangeServiceSpec
 
   private implicit val contextShift: ContextShift[IO] = IO.contextShift(ExecutionContext.global)
 
-  private val nonFatalError = ZoneDiscoveryError("test")
-  private val fatalError = RecordAlreadyExists("test")
+    private val nonFatalError = ZoneDiscoveryError("test")
+  private val nonFatalErrorRecordAlreadyExists = RecordAlreadyExists("test", true, AData("1.1.1.1"))
 
   private val validations = new BatchChangeValidations(
     new AccessValidations(
@@ -747,7 +747,7 @@ class BatchChangeServiceSpec
     "succeed if the batchChange is PendingReview and reviewer is authorized" in {
       batchChangeRepo.save(batchChangeNeedsApproval)
 
-      val result =
+      val result = {
         rightResultOf(
           underTestManualEnabled
             .approveBatchChange(
@@ -757,6 +757,7 @@ class BatchChangeServiceSpec
             )
             .value
         )
+      }
 
       result.userId shouldBe batchChangeNeedsApproval.userId
       result.userName shouldBe batchChangeNeedsApproval.userName
@@ -2007,7 +2008,7 @@ class BatchChangeServiceSpec
               asAdds.head,
               7200L
             ).validNel,
-            fatalError.invalidNel
+            nonFatalErrorRecordAlreadyExists.invalidNel
           ),
           reviewInfo
         )
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
index f322b2523..3911677ad 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
@@ -824,10 +824,10 @@ class BatchChangeValidationsSpec
 
     result(0) shouldBe valid
     result(1) should haveInvalid[DomainValidationError](
-      RecordAlreadyExists(existingA.inputChange.inputName)
+      RecordAlreadyExists(existingA.inputChange.inputName,false, existingA.inputChange.record)
     )
     result(2) should haveInvalid[DomainValidationError](
-      RecordAlreadyExists(existingCname.inputChange.inputName)
+      RecordAlreadyExists(existingCname.inputChange.inputName,false ,existingCname.inputChange.record)
     ).and(
       haveInvalid[DomainValidationError](
         CnameIsNotUniqueError(existingCname.inputChange.inputName, existingCname.inputChange.typ)
@@ -1189,7 +1189,7 @@ class BatchChangeValidationsSpec
       )
 
       result(0) should haveInvalid[DomainValidationError](
-        RecordAlreadyExists(input.inputChange.inputName)
+        RecordAlreadyExists(input.inputChange.inputName,false,input.inputChange.record)
       )
     }
   }
@@ -2185,7 +2185,7 @@ class BatchChangeValidationsSpec
         false,
         None
       )
-    result(0) should haveInvalid[DomainValidationError](RecordAlreadyExists("name-conflict."))
+    result(0) should haveInvalid[DomainValidationError](RecordAlreadyExists("name-conflict.", false, addMX.inputChange.record))
   }
 
   property("validateChangesWithContext: should succeed if duplicate MX records in batch") {
diff --git a/modules/api/src/test/scala/vinyldns/api/engine/RecordSetChangeHandlerSpec.scala b/modules/api/src/test/scala/vinyldns/api/engine/RecordSetChangeHandlerSpec.scala
index d31ddafd2..c7971a769 100644
--- a/modules/api/src/test/scala/vinyldns/api/engine/RecordSetChangeHandlerSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/engine/RecordSetChangeHandlerSpec.scala
@@ -643,7 +643,7 @@ class RecordSetChangeHandlerSpec
       changeSet.status shouldBe RecordSetChangeStatus.Failed
       changeSet.recordSet.status shouldBe RecordSetStatus.Inactive
       changeSet.systemMessage shouldBe Some(
-        s"Failed validating update to DNS for change ${changeSet.id}:${changeSet.recordSet.name}: " +
+        s"""Failed validating update to DNS for change "${changeSet.id}": "${changeSet.recordSet.name}": """ +
           s"This record set is out of sync with the DNS backend; sync this zone before attempting to " +
           "update this record set."
       )

From b2f0693c769eddc895ad261e3f6deb8b6898c1d1 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Fri, 17 Jun 2022 12:39:54 +0530
Subject: [PATCH 023/147] update

---
 .../domain/batch/BatchChangeValidations.scala | 16 +++-----
 .../api/engine/RecordSetChangeHandler.scala   | 18 ++++++---
 .../domain/batch/BatchChangeServiceSpec.scala | 38 +++++++++----------
 .../batch/BatchChangeValidationsSpec.scala    |  9 +++--
 .../engine/RecordSetChangeHandlerSpec.scala   |  4 +-
 .../core/domain/DomainValidationErrors.scala  |  4 +-
 .../core/domain/record/RecordSetChange.scala  |  8 ++--
 7 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
index 05560cf40..4f96ebca7 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
@@ -479,16 +479,12 @@ class BatchChangeValidations(
       groupedChanges: ChangeForValidationMap,
       isApproved: Boolean
   ): SingleValidation[Unit] = {
-    isApproved match {
-      case false =>
-        groupedChanges.getExistingRecordSet(RecordKey(zoneId, recordName, typ)) match {
-          case Some(_) => RecordAlreadyExists(inputName, isApproved, recordData).invalidNel
-          case None => ().validNel}
-      case true =>
-        val record = groupedChanges.getExistingRecordSetData(RecordKeyData(zoneId, recordName, typ, recordData))
-            if (record.get.records.contains(recordData)){ ().validNel }
-            else { RecordAlreadyExists(inputName, isApproved, recordData).invalidNel }
-        }
+    val record = groupedChanges.getExistingRecordSetData(RecordKeyData(zoneId, recordName, typ, recordData))
+    if(record.isDefined) {
+      record.get.records.contains(recordData) match {
+        case true => ().validNel
+        case false => RecordAlreadyExists(inputName, recordData, isApproved).invalidNel}
+    } else ().validNel
     }
 
   def noIncompatibleRecordExists(
diff --git a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
index 6add45c38..28ca676bc 100644
--- a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
+++ b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
@@ -160,6 +160,15 @@ object RecordSetChangeHandler extends TransactionProvider {
       dnsResult.exists(matches(_, recordSet, zoneName))
     }
 
+    def recordExist(existingRecords: List[RecordSet], change: RecordSetChange): Boolean = {
+      var isExists : Boolean = false
+      existingRecords.foreach(recordData=>
+        for (record<-change.recordSet.records)
+          if (recordData.records.contains(record)) isExists= true
+          else  isExists= false )
+      isExists
+    }
+
     // Determine processing status by comparing request against disposition of DNS backend
     def getProcessingStatus(
         change: RecordSetChange,
@@ -167,10 +176,9 @@ object RecordSetChangeHandler extends TransactionProvider {
     ): IO[ProcessingStatus] = IO {
       change.changeType match {
         case RecordSetChangeType.Create =>
-          if (existingRecords.isEmpty) { ReadyToApply(change)}
-          else if (isDnsMatch(existingRecords, change.recordSet, change.zone.name)) {
-            AlreadyApplied(change) }
-          else if (existingRecords.nonEmpty) { AlreadyExists(change, "Record updated in DNS") }//Record exists in DNS
+          if (existingRecords.isEmpty) ReadyToApply(change)
+          else if (isDnsMatch(existingRecords, change.recordSet, change.zone.name) || recordExist(existingRecords,change))
+            AlreadyExists(change, "Record updated in DNS") //Record exists in DNS
           else Failure(change, "Incompatible record in DNS.")
 
         case RecordSetChangeType.Update =>
@@ -435,7 +443,7 @@ object RecordSetChangeHandler extends TransactionProvider {
       recordSetCacheRepository
     ).map {
       case AlreadyApplied(_) => Completed(change.successful)
-      case AlreadyExists(_,message) => Completed(change.alreadyExists(
+      case AlreadyExists(_ ,message) => Completed(change.alreadyExists(
         s"""ℹ️ DNS for change "${change.id}": "${change.recordSet.name}": $message"""
       ))
       case Failure(_, message) =>
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeServiceSpec.scala
index b1852c95f..d56e65c06 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeServiceSpec.scala
@@ -66,8 +66,8 @@ class BatchChangeServiceSpec
 
   private implicit val contextShift: ContextShift[IO] = IO.contextShift(ExecutionContext.global)
 
-    private val nonFatalError = ZoneDiscoveryError("test")
-  private val nonFatalErrorRecordAlreadyExists = RecordAlreadyExists("test", true, AData("1.1.1.1"))
+  private val nonFatalErrorZoneDiscoveryError = ZoneDiscoveryError("test")
+  private val nonFatalErrorRecordAlreadyExists = RecordAlreadyExists("test", AData("1.1.1.1"), true)
 
   private val validations = new BatchChangeValidations(
     new AccessValidations(
@@ -1709,8 +1709,8 @@ class BatchChangeServiceSpec
           BatchChangeInput(None, List(apexAddA, onlyBaseAddAAAA, delete), Some("owner-group-ID")),
           List(
             AddChangeForValidation(apexZone, "apex.test.com.", apexAddA, 7200L).validNel,
-            nonFatalError.invalidNel,
-            nonFatalError.invalidNel
+            nonFatalErrorZoneDiscoveryError.invalidNel,
+            nonFatalErrorZoneDiscoveryError.invalidNel
           ),
           okAuth,
           true
@@ -1746,7 +1746,7 @@ class BatchChangeServiceSpec
         None,
         None,
         None,
-        List(SingleChangeError(nonFatalError)),
+        List(SingleChangeError(nonFatalErrorZoneDiscoveryError)),
         result.changes(1).id
       )
       result.changes(2) shouldBe SingleDeleteRRSetChange(
@@ -1760,7 +1760,7 @@ class BatchChangeServiceSpec
         None,
         None,
         None,
-        List(SingleChangeError(nonFatalError)),
+        List(SingleChangeError(nonFatalErrorZoneDiscoveryError)),
         result.changes(2).id
       )
     }
@@ -1776,8 +1776,8 @@ class BatchChangeServiceSpec
           ),
           List(
             AddChangeForValidation(apexZone, "apex.test.com.", apexAddA, 7200L).validNel,
-            nonFatalError.invalidNel,
-            nonFatalError.invalidNel
+            nonFatalErrorZoneDiscoveryError.invalidNel,
+            nonFatalErrorZoneDiscoveryError.invalidNel
           ),
           okAuth,
           allowManualReview = true
@@ -1810,7 +1810,7 @@ class BatchChangeServiceSpec
           List(
             ZoneDiscoveryError("no.zone.match.").invalidNel,
             AddChangeForValidation(baseZone, "non-apex", nonApexAddA, 7200L).validNel,
-            nonFatalError.invalidNel
+            nonFatalErrorZoneDiscoveryError.invalidNel
           ),
           okAuth,
           true
@@ -1826,7 +1826,7 @@ class BatchChangeServiceSpec
       ibcr.changeRequestResponses(1) shouldBe Valid(
         AddChangeForValidation(baseZone, "non-apex", nonApexAddA, 7200L)
       )
-      ibcr.changeRequestResponses(2) should haveInvalid[DomainValidationError](nonFatalError)
+      ibcr.changeRequestResponses(2) should haveInvalid[DomainValidationError](nonFatalErrorZoneDiscoveryError)
     }
 
     "return a BatchChangeErrorList if all data inputs are valid/soft failures and manual review is disabled" in {
@@ -1836,8 +1836,8 @@ class BatchChangeServiceSpec
           BatchChangeInput(None, List(apexAddA, onlyBaseAddAAAA, delete)),
           List(
             AddChangeForValidation(apexZone, "apex.test.com.", apexAddA, 7200L).validNel,
-            nonFatalError.invalidNel,
-            nonFatalError.invalidNel
+            nonFatalErrorZoneDiscoveryError.invalidNel,
+            nonFatalErrorZoneDiscoveryError.invalidNel
           ),
           okAuth,
           true
@@ -1861,8 +1861,8 @@ class BatchChangeServiceSpec
           ),
           List(
             AddChangeForValidation(apexZone, "apex.test.com.", apexAddA, 7200L).validNel,
-            nonFatalError.invalidNel,
-            nonFatalError.invalidNel
+            nonFatalErrorZoneDiscoveryError.invalidNel,
+            nonFatalErrorZoneDiscoveryError.invalidNel
           ),
           okAuth,
           true
@@ -1903,8 +1903,8 @@ class BatchChangeServiceSpec
           BatchChangeInput(None, List(apexAddA, onlyBaseAddAAAA, delete)),
           List(
             AddChangeForValidation(apexZone, "apex.test.com.", apexAddA, 7200L).validNel,
-            nonFatalError.invalidNel,
-            nonFatalError.invalidNel
+            nonFatalErrorZoneDiscoveryError.invalidNel,
+            nonFatalErrorZoneDiscoveryError.invalidNel
           ),
           okAuth,
           false
@@ -1927,8 +1927,8 @@ class BatchChangeServiceSpec
           ),
           List(
             AddChangeForValidation(apexZone, "apex.test.com.", apexAddA, 7200L).validNel,
-            nonFatalError.invalidNel,
-            nonFatalError.invalidNel
+            nonFatalErrorZoneDiscoveryError.invalidNel,
+            nonFatalErrorZoneDiscoveryError.invalidNel
           ),
           okAuth,
           allowManualReview = false
@@ -1946,7 +1946,7 @@ class BatchChangeServiceSpec
           BatchChangeInput(None, List(apexAddA, onlyBaseAddAAAA), None),
           List(
             AddChangeForValidation(apexZone, "apex.test.com.", apexAddA, 7200L).validNel,
-            nonFatalError.invalidNel
+            nonFatalErrorZoneDiscoveryError.invalidNel
           ),
           okAuth,
           true
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
index 3911677ad..b3e42a585 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
@@ -824,10 +824,10 @@ class BatchChangeValidationsSpec
 
     result(0) shouldBe valid
     result(1) should haveInvalid[DomainValidationError](
-      RecordAlreadyExists(existingA.inputChange.inputName,false, existingA.inputChange.record)
+      RecordAlreadyExists(existingA.inputChange.inputName, existingA.inputChange.record, false)
     )
     result(2) should haveInvalid[DomainValidationError](
-      RecordAlreadyExists(existingCname.inputChange.inputName,false ,existingCname.inputChange.record)
+      RecordAlreadyExists(existingCname.inputChange.inputName, existingCname.inputChange.record, false)
     ).and(
       haveInvalid[DomainValidationError](
         CnameIsNotUniqueError(existingCname.inputChange.inputName, existingCname.inputChange.typ)
@@ -1189,7 +1189,7 @@ class BatchChangeValidationsSpec
       )
 
       result(0) should haveInvalid[DomainValidationError](
-        RecordAlreadyExists(input.inputChange.inputName,false,input.inputChange.record)
+        RecordAlreadyExists(input.inputChange.inputName, input.inputChange.record, false)
       )
     }
   }
@@ -2185,7 +2185,8 @@ class BatchChangeValidationsSpec
         false,
         None
       )
-    result(0) should haveInvalid[DomainValidationError](RecordAlreadyExists("name-conflict.", false, addMX.inputChange.record))
+    // result(0) should haveInvalid[DomainValidationError](RecordAlreadyExists("name-conflict.", addMX.inputChange.record, false))
+    result(0) shouldBe valid
   }
 
   property("validateChangesWithContext: should succeed if duplicate MX records in batch") {
diff --git a/modules/api/src/test/scala/vinyldns/api/engine/RecordSetChangeHandlerSpec.scala b/modules/api/src/test/scala/vinyldns/api/engine/RecordSetChangeHandlerSpec.scala
index c7971a769..de29100a1 100644
--- a/modules/api/src/test/scala/vinyldns/api/engine/RecordSetChangeHandlerSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/engine/RecordSetChangeHandlerSpec.scala
@@ -26,7 +26,7 @@ import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 import org.scalatest.{BeforeAndAfterEach, EitherValues}
 import vinyldns.api.backend.dns.DnsProtocol.{NotAuthorized, TryAgain}
-import vinyldns.api.engine.RecordSetChangeHandler.{AlreadyApplied, ReadyToApply, Requeue}
+import vinyldns.api.engine.RecordSetChangeHandler.{AlreadyApplied, AlreadyExists, ReadyToApply, Requeue}
 import vinyldns.api.repository.InMemoryBatchChangeRepository
 import vinyldns.api.CatsHelpers
 import vinyldns.core.domain.batch.{BatchChange, BatchChangeApprovalStatus, SingleAddChange, SingleChangeStatus}
@@ -692,7 +692,7 @@ class RecordSetChangeHandlerSpec
             true
           )
           .unsafeRunSync()
-      processorStatus shouldBe an[AlreadyApplied]
+      processorStatus shouldBe an[AlreadyExists]
     }
 
     "remove record from database for Add if record does not exist in DNS backend" in {
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
index 35bcda61f..b8cebe172 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
@@ -109,12 +109,12 @@ final case class ZoneDiscoveryError(name: String, fatal: Boolean = false)
       "If zone exists, then it must be connected to in VinylDNS."
 }
 
-final case class RecordAlreadyExists(name: String, isApproved:Boolean, recordData: RecordData,
+final case class RecordAlreadyExists(name: String, recordData: RecordData, isApproved:Boolean,
                                      fatal: Boolean = false) extends DomainValidationError(fatal) {
   def message: String = {
     if (isApproved == false) {
       s"""RecordName "$name" already exists. Your request will be manually reviewed. """ +
-         "If you intended to update this record, you can avoid manual review by adding " +
+        "If you intended to update this record, you can avoid manual review by adding " +
         " a DeleteRecordSet entry followed by an Add."
     }
     else {
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala b/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala
index 68d3a10e0..21aa6646e 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala
@@ -17,7 +17,6 @@
 package vinyldns.core.domain.record
 
 import java.util.UUID
-
 import org.joda.time.DateTime
 import vinyldns.core.domain.zone.{Zone, ZoneCommand, ZoneCommandResult}
 
@@ -59,13 +58,14 @@ case class RecordSetChange(
         .copy(status = RecordSetStatus.Active, updated = Some(DateTime.now))
     )
 
-  def alreadyExists(message: Option[String] = None): RecordSetChange =
-    copy(
+  def alreadyExists(message: Option[String] = None): RecordSetChange = {
+      copy(
       status = RecordSetChangeStatus.Complete,
-      systemMessage = message,
+        systemMessage = message,
       recordSet = recordSet
         .copy(status = RecordSetStatus.Active, updated = Some(DateTime.now))
     )
+  }
 
   def alreadyExists(message: String): RecordSetChange = alreadyExists(Some(message))
 

From 6e22452f49c164101110ad2ea845b922e69e22ab Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Mon, 20 Jun 2022 11:47:07 +0530
Subject: [PATCH 024/147] update in validating record already exist

---
 .../domain/batch/BatchChangeConverter.scala   | 48 +++++++++++--------
 .../api/engine/RecordSetChangeHandler.scala   |  2 +-
 .../core/domain/batch/SingleChange.scala      |  8 +++-
 3 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
index 84b134ca5..6a606d2dd 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
@@ -34,6 +34,8 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
     extends BatchChangeConverterAlgebra {
 
   private val logger = LoggerFactory.getLogger(classOf[BatchChangeConverter])
+  private val recordAlreadyExistsMessage : String =
+    "ℹ️ This record already exists. No further action is required."
 
   def sendBatchForProcessing(
       batchChange: BatchChange,
@@ -62,20 +64,27 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
     } yield BatchConversionOutput(changeToStore, recordSetChanges)
   }
 
+  def recordExist(recordSetChanges: List[RecordSetChange], batchChange: BatchChange): Boolean = {
+    var isExists : Boolean = false
+    for (record <- recordSetChanges.flatMap(_.recordSet.records))
+    if (batchChange.changes.toString.split(",").toList.contains(record.toString)) isExists= true
+    else isExists= false
+    isExists
+  }
+
   def allChangesWereConverted(
       singleChanges: List[SingleChange],
       recordSetChanges: List[RecordSetChange]
   ): BatchResult[Unit] = {
     val convertedIds = recordSetChanges.flatMap(_.singleBatchChangeIds).toSet
-
     singleChanges.find(ch => !convertedIds.contains(ch.id)) match {
       case Some(change) => BatchConversionError(change).toLeftBatchResult
       case None =>
-        logger.info(s"Successfully converted SingleChanges [${singleChanges
-          .map(_.id)}] to RecordSetChanges [${recordSetChanges.map(_.id)}]")
-        ().toRightBatchResult
+          logger.info(s"Successfully converted SingleChanges [${singleChanges
+            .map(_.id)}] to RecordSetChanges [${recordSetChanges.map(_.id)}]")
+          ().toRightBatchResult
+        }
     }
-  }
 
   def putChangesOnQueue(
       recordSetChanges: List[RecordSetChange],
@@ -104,27 +113,26 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
     val idsMap = recordSetChanges.flatMap { rsChange =>
       rsChange.singleBatchChangeIds.map(batchId => (batchId, rsChange.id))
     }.toMap
-
     val withStatus = batchChange.changes.map { change =>
-      idsMap
-        .get(change.id)
-        .map { _ =>
-          // a recordsetchange was successfully queued for this change
-          change
-        }
-        .getOrElse {
-          // failure here means there was a message queue issue for this change
-          change.withFailureMessage("Error queueing RecordSetChange for processing")
-        }
-    }
-
+        idsMap
+          .get(change.id)
+          .map { _ =>
+       if (recordExist(recordSetChanges, batchChange) && batchChange.approvalStatus.toString == "AutoApproved") {
+         change.withAlreadyExists(recordAlreadyExistsMessage) //a recordset already exists
+       } else change } // a recordsetchange was successfully queued for this change
+          .getOrElse {
+            // failure here means there was a message queue issue for this change
+            change.withFailureMessage("Error queueing RecordSetChange for processing")
+          }
+      }
     batchChange.copy(changes = withStatus)
   }
 
   def storeQueuingFailures(batchChange: BatchChange): BatchResult[Unit] = {
     val failedChanges = batchChange.changes.collect {
-      case change if change.status == SingleChangeStatus.Failed => change
-    }
+      case change
+        if change.status == SingleChangeStatus.Failed ||
+          change.systemMessage.getOrElse("") == recordAlreadyExistsMessage => change }
     batchChangeRepo.updateSingleChanges(failedChanges).as(())
   }.toBatchResult
 
diff --git a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
index 28ca676bc..eac6cbc03 100644
--- a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
+++ b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
@@ -178,7 +178,7 @@ object RecordSetChangeHandler extends TransactionProvider {
         case RecordSetChangeType.Create =>
           if (existingRecords.isEmpty) ReadyToApply(change)
           else if (isDnsMatch(existingRecords, change.recordSet, change.zone.name) || recordExist(existingRecords,change))
-            AlreadyExists(change, "Record updated in DNS") //Record exists in DNS
+            AlreadyExists(change, "Record exists/updated in DNS") //Record exists in DNS
           else Failure(change, "Incompatible record in DNS.")
 
         case RecordSetChangeType.Update =>
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala b/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
index fe45e9181..0cc2dbba5 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
@@ -17,7 +17,6 @@
 package vinyldns.core.domain.batch
 
 import java.util.UUID
-
 import vinyldns.core.domain.SingleChangeError
 import vinyldns.core.domain.batch.SingleChangeStatus.SingleChangeStatus
 import vinyldns.core.domain.record.RecordData
@@ -47,6 +46,13 @@ sealed trait SingleChange {
       delete.copy(status = SingleChangeStatus.Failed, systemMessage = Some(error))
   }
 
+  def withAlreadyExists(message: String): SingleChange = this match {
+    case add: SingleAddChange =>
+      add.copy(status = SingleChangeStatus.Complete, systemMessage = Some(message))
+    case delete: SingleDeleteRRSetChange =>
+      delete.copy(status = SingleChangeStatus.Complete, systemMessage = Some(message))
+  }
+
   def withProcessingError(message: Option[String], failedRecordChangeId: String): SingleChange =
     this match {
       case add: SingleAddChange =>

From 6ad28b46d4c7ffe90d2f45f0dbb2e225f6c29c2e Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 20 Jun 2022 13:19:52 +0530
Subject: [PATCH 025/147] Refactor

---
 .../vinyldns/api/domain/batch/BatchChangeConverter.scala    | 6 +++---
 .../api/domain/batch/BatchChangeConverterSpec.scala         | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
index b640375fe..e597fe168 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
@@ -33,7 +33,7 @@ import vinyldns.core.queue.MessageQueue
 class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue: MessageQueue)
     extends BatchChangeConverterAlgebra {
 
-  private val completedMessage: String = "ℹ️ This record does not exist." +
+  private val notExistCompletedMessage: String = "ℹ️ This record does not exist." +
     "No further action is required."
   private val failedMessage: String = "Error queueing RecordSetChange for processing"
   private val logger = LoggerFactory.getLogger(classOf[BatchChangeConverter])
@@ -128,7 +128,7 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
           change match {
             case _: SingleDeleteRRSetChange if change.recordSetId.isEmpty =>
               // Mark as Complete since we don't want to throw it as an error
-              change.withDoesNotExistMessage(completedMessage)
+              change.withDoesNotExistMessage(notExistCompletedMessage)
             case _ =>
               // Failure here means there was a message queue issue for this change
               change.withFailureMessage(failedMessage)
@@ -142,7 +142,7 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
   def storeQueuingFailures(batchChange: BatchChange): BatchResult[Unit] = {
     // Update if Single change is Failed or if a record that does not exist is deleted
     val failedAndNotExistsChanges = batchChange.changes.collect {
-      case change if change.status == SingleChangeStatus.Failed || change.systemMessage.getOrElse("") == completedMessage => change
+      case change if change.status == SingleChangeStatus.Failed || change.systemMessage.contains(notExistCompletedMessage) => change
     }
     batchChangeRepo.updateSingleChanges(failedAndNotExistsChanges).as(())
   }.toBatchResult
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala
index 931c8fc14..424811f70 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala
@@ -37,7 +37,7 @@ import vinyldns.core.domain.record._
 import vinyldns.core.domain.zone.Zone
 
 class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelpers {
-  private val completedMessage: String = "ℹ️ This record does not exist." +
+  private val notExistCompletedMessage: String = "ℹ️ This record does not exist." +
     "No further action is required."
 
   private def makeSingleAddChange(
@@ -572,8 +572,8 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
       val receivedChange = returnedBatch.changes(0)
       receivedChange.status shouldBe SingleChangeStatus.Complete
       receivedChange.recordChangeId shouldBe None
-      receivedChange.systemMessage shouldBe Some(completedMessage)
-      returnedBatch.changes(0) shouldBe singleChangesOneDelete(0).copy(systemMessage = Some(completedMessage), status = SingleChangeStatus.Complete)
+      receivedChange.systemMessage shouldBe Some(notExistCompletedMessage)
+      returnedBatch.changes(0) shouldBe singleChangesOneDelete(0).copy(systemMessage = Some(notExistCompletedMessage), status = SingleChangeStatus.Complete)
 
       // check the update has been made in the DB
       val savedBatch: Option[BatchChange] =

From 79c922e80523878400fc857f6519425a81f62973 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Mon, 20 Jun 2022 17:56:18 +0530
Subject: [PATCH 026/147] update in integration tests

---
 .../domain/batch/BatchChangeConverter.scala   |   5 +-
 .../batch/BatchChangeConverterSpec.scala      | 105 ++++++++++++------
 .../core/domain/batch/SingleChange.scala      |   6 +-
 3 files changed, 77 insertions(+), 39 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
index 6a606d2dd..165adaf27 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
@@ -34,8 +34,9 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
     extends BatchChangeConverterAlgebra {
 
   private val logger = LoggerFactory.getLogger(classOf[BatchChangeConverter])
-  private val recordAlreadyExistsMessage : String =
-    "ℹ️ This record already exists. No further action is required."
+
+  private val recordAlreadyExistsMessage : Option[String] =
+    Some(s"""This record already exists. No further action is required.""")
 
   def sendBatchForProcessing(
       batchChange: BatchChange,
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala
index 1e4990b39..91886d987 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala
@@ -38,12 +38,15 @@ import vinyldns.core.domain.zone.Zone
 
 class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelpers {
 
+  private val makeRecordAlreadyExistsMessage : Option[String] =
+    Some(s"""This record already exists. No further action is required.""")
+
   private def makeSingleAddChange(
-      name: String,
-      recordData: RecordData,
-      typ: RecordType = A,
-      zone: Zone = okZone
-  ) = {
+                                   name: String,
+                                   recordData: RecordData,
+                                   typ: RecordType = A,
+                                   zone: Zone = okZone
+                                 ) = {
     val fqdn = s"$name.${zone.name}"
     SingleAddChange(
       Some(zone.id),
@@ -60,6 +63,28 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
     )
   }
 
+  private def makeRecordAlreadyExistsSingleAddChange(
+                                                      name: String,
+                                                      recordData: RecordData,
+                                                      typ: RecordType = A,
+                                                      zone: Zone = okZone
+                                                    ) = {
+    val fqdn = s"$name.${zone.name}"
+    SingleAddChange(
+      Some(zone.id),
+      Some(zone.name),
+      Some(name),
+      fqdn,
+      typ,
+      123,
+      recordData,
+      SingleChangeStatus.Complete,
+      makeRecordAlreadyExistsMessage,
+      None,
+      None
+    )
+  }
+
   private def makeSingleDeleteRRSetChange(name: String, typ: RecordType, zone: Zone = okZone) = {
     val fqdn = s"$name.${zone.name}"
     SingleDeleteRRSetChange(
@@ -69,18 +94,18 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
       fqdn,
       typ,
       None,
-      SingleChangeStatus.Pending,
-      None,
+      SingleChangeStatus.Complete,
+      makeRecordAlreadyExistsMessage,
       None,
       None
     )
   }
 
   private def makeAddChangeForValidation(
-      recordName: String,
-      recordData: RecordData,
-      typ: RecordType = RecordType.A
-  ): AddChangeForValidation =
+                                          recordName: String,
+                                          recordData: RecordData,
+                                          typ: RecordType = RecordType.A
+                                        ): AddChangeForValidation =
     AddChangeForValidation(
       okZone,
       s"$recordName",
@@ -89,9 +114,9 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
     )
 
   private def makeDeleteRRSetChangeForValidation(
-      recordName: String,
-      typ: RecordType = RecordType.A
-  ): DeleteRRSetChangeForValidation =
+                                                  recordName: String,
+                                                  typ: RecordType = RecordType.A
+                                                ): DeleteRRSetChangeForValidation =
     DeleteRRSetChangeForValidation(
       okZone,
       s"$recordName",
@@ -110,6 +135,18 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
     makeSingleAddChange("mxRecord", MXData(1, Fqdn("foo.bar.")), MX)
   )
 
+  private val addSingleChangesWithRecordAlreadyExists = List(
+    makeRecordAlreadyExistsSingleAddChange("one", AData("1.1.1.1")),
+    makeRecordAlreadyExistsSingleAddChange("two", AData("1.1.1.2")),
+    makeRecordAlreadyExistsSingleAddChange("repeat", AData("1.1.1.3")),
+    makeRecordAlreadyExistsSingleAddChange("repeat", AData("1.1.1.4")),
+    makeRecordAlreadyExistsSingleAddChange("aaaaRecord", AAAAData("1::1"), AAAA),
+    makeRecordAlreadyExistsSingleAddChange("cnameRecord", CNAMEData(Fqdn("cname.com.")), CNAME),
+    makeRecordAlreadyExistsSingleAddChange("10.1.1.1", PTRData(Fqdn("ptrData")), PTR),
+    makeRecordAlreadyExistsSingleAddChange("txtRecord", TXTData("text"), TXT),
+    makeRecordAlreadyExistsSingleAddChange("mxRecord", MXData(1, Fqdn("foo.bar.")), MX)
+  )
+
   private val addChangeForValidationGood = List(
     makeAddChangeForValidation("one", AData("1.1.1.1")),
     makeAddChangeForValidation("two", AData("1.1.1.2")),
@@ -140,13 +177,13 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
 
   private val updateSingleChangesGood = List(
     makeSingleDeleteRRSetChange("aToUpdate", A),
-    makeSingleAddChange("aToUpdate", AData("1.1.1.1")),
+    makeRecordAlreadyExistsSingleAddChange("aToUpdate", AData("1.1.1.1")),
     makeSingleDeleteRRSetChange("cnameToUpdate", CNAME),
-    makeSingleAddChange("cnameToUpdate", CNAMEData(Fqdn("newcname.com.")), CNAME),
+    makeRecordAlreadyExistsSingleAddChange("cnameToUpdate", CNAMEData(Fqdn("newcname.com.")), CNAME),
     makeSingleDeleteRRSetChange("txtToUpdate", TXT),
-    makeSingleAddChange("txtToUpdate", TXTData("update"), TXT),
+    makeRecordAlreadyExistsSingleAddChange("txtToUpdate", TXTData("update"), TXT),
     makeSingleDeleteRRSetChange("mxToUpdate", MX),
-    makeSingleAddChange("mxToUpdate", MXData(1, Fqdn("update.com.")), MX)
+    makeRecordAlreadyExistsSingleAddChange("mxToUpdate", MXData(1, Fqdn("update.com.")), MX)
   )
 
   private val updateChangeForValidationGood = List(
@@ -161,9 +198,9 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
   )
 
   private val singleChangesOneBad = List(
-    makeSingleAddChange("one", AData("1.1.1.1")),
-    makeSingleAddChange("two", AData("1.1.1.2")),
-    makeSingleAddChange("bad", AData("1.1.1.1"))
+    makeRecordAlreadyExistsSingleAddChange("one", AData("1.1.1.1")),
+    makeRecordAlreadyExistsSingleAddChange("two", AData("1.1.1.2")),
+    makeRecordAlreadyExistsSingleAddChange("bad", AData("1.1.1.1"))
   )
 
   private val changeForValidationOneBad = List(
@@ -291,7 +328,7 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
           okUser.userName,
           None,
           DateTime.now,
-          addSingleChangesGood,
+          addSingleChangesWithRecordAlreadyExists,
           approvalStatus = BatchChangeApprovalStatus.AutoApproved
         )
       val result = rightResultOf(
@@ -412,7 +449,7 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
     }
 
     "successfully handle a combination of adds, updates, and deletes" in {
-      val changes = addSingleChangesGood ++ deleteSingleChangesGood ++ updateSingleChangesGood
+      val changes = addSingleChangesWithRecordAlreadyExists ++ deleteSingleChangesGood ++ updateSingleChangesGood
       val changeForValidation = addChangeForValidationGood ++ deleteRRSetChangeForValidationGood ++
         updateChangeForValidationGood
       val batchChange =
@@ -489,7 +526,7 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
       result.batchChange shouldBe batchChange
     }
 
-    "set status to failure for changes with queueing issues" in {
+    "set status for record already exists to complete for changes with queueing issues" in {
       val batchWithBadChange =
         BatchChange(
           okUser.id,
@@ -677,11 +714,11 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
   }
 
   private def validateRecordSetChange(
-      name: String,
-      recordSetChanges: List[RecordSetChange],
-      batchChange: BatchChange,
-      typ: RecordSetChangeType
-  ) = {
+                                       name: String,
+                                       recordSetChanges: List[RecordSetChange],
+                                       batchChange: BatchChange,
+                                       typ: RecordSetChangeType
+                                     ) = {
     val singleChangesOut = batchChange.changes.filter { change =>
       change.recordName match {
         case Some(rn) if rn == name => true
@@ -708,10 +745,10 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
   }
 
   private def validateRecordDataCombination(
-      name: String,
-      recordSetChanges: List[RecordSetChange],
-      batchChange: BatchChange
-  ) = {
+                                             name: String,
+                                             recordSetChanges: List[RecordSetChange],
+                                             batchChange: BatchChange
+                                           ) = {
     val singleChangesOut = batchChange.changes.filter { change =>
       change.recordName match {
         case Some(rn) if rn == name => true
@@ -728,4 +765,4 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
 
     recordChangeOut.recordSet.records should contain theSameElementsAs expectedRecords
   }
-}
+}
\ No newline at end of file
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala b/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
index 0cc2dbba5..345e30eb7 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
@@ -46,11 +46,11 @@ sealed trait SingleChange {
       delete.copy(status = SingleChangeStatus.Failed, systemMessage = Some(error))
   }
 
-  def withAlreadyExists(message: String): SingleChange = this match {
+  def withAlreadyExists(error: Option[String]): SingleChange = this match {
     case add: SingleAddChange =>
-      add.copy(status = SingleChangeStatus.Complete, systemMessage = Some(message))
+      add.copy(status = SingleChangeStatus.Complete, systemMessage = error)
     case delete: SingleDeleteRRSetChange =>
-      delete.copy(status = SingleChangeStatus.Complete, systemMessage = Some(message))
+      delete.copy(status = SingleChangeStatus.Complete, systemMessage = error)
   }
 
   def withProcessingError(message: Option[String], failedRecordChangeId: String): SingleChange =

From d1ab9a7a4a3315683867e47b2edf1c42c46beeb2 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Tue, 21 Jun 2022 15:13:08 +0530
Subject: [PATCH 027/147] update

---
 .../domain/batch/BatchChangeConverter.scala   |  8 +++----
 .../api/engine/RecordSetChangeHandler.scala   |  6 +++--
 .../core/domain/DomainValidationErrors.scala  |  3 ++-
 .../core/domain/batch/SingleChange.scala      | 23 +++++++++++++++----
 .../core/domain/record/RecordSetChange.scala  |  4 ++--
 .../dnsChanges/dnsChangeDetail.scala.html     |  9 ++++----
 .../zones/zoneTabs/changeHistory.scala.html   |  3 ++-
 .../zones/zoneTabs/manageRecords.scala.html   |  3 ++-
 8 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
index 165adaf27..43d0cf3a3 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
@@ -36,7 +36,7 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
   private val logger = LoggerFactory.getLogger(classOf[BatchChangeConverter])
 
   private val recordAlreadyExistsMessage : Option[String] =
-    Some(s"""This record already exists. No further action is required.""")
+    Some(s"""ℹ️ This record already exists. No further action is required.""")
 
   def sendBatchForProcessing(
       batchChange: BatchChange,
@@ -118,9 +118,9 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
         idsMap
           .get(change.id)
           .map { _ =>
-       if (recordExist(recordSetChanges, batchChange) && batchChange.approvalStatus.toString == "AutoApproved") {
+       if (recordExist(recordSetChanges, batchChange) && batchChange.approvalStatus.toString == "AutoApproved")
          change.withAlreadyExists(recordAlreadyExistsMessage) //a recordset already exists
-       } else change } // a recordsetchange was successfully queued for this change
+       else change } // a recordsetchange was successfully queued for this change
           .getOrElse {
             // failure here means there was a message queue issue for this change
             change.withFailureMessage("Error queueing RecordSetChange for processing")
@@ -133,7 +133,7 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
     val failedChanges = batchChange.changes.collect {
       case change
         if change.status == SingleChangeStatus.Failed ||
-          change.systemMessage.getOrElse("") == recordAlreadyExistsMessage => change }
+          change.status == SingleChangeStatus.AlreadyExists => change }
     batchChangeRepo.updateSingleChanges(failedChanges).as(())
   }.toBatchResult
 
diff --git a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
index eac6cbc03..e079ef513 100644
--- a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
+++ b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
@@ -107,6 +107,8 @@ object RecordSetChangeHandler extends TransactionProvider {
     recordSetChange.status match {
       case RecordSetChangeStatus.Complete =>
         singleChanges.map(_.complete(recordSetChange.id, recordSetChange.recordSet.id))
+      case RecordSetChangeStatus.AlreadyExists =>
+        singleChanges.map(_.alreadyExists(recordSetChange.id, recordSetChange.recordSet.id))
       case RecordSetChangeStatus.Failed =>
         singleChanges.map(_.withProcessingError(recordSetChange.systemMessage, recordSetChange.id))
       case _ => singleChanges
@@ -399,7 +401,7 @@ object RecordSetChangeHandler extends TransactionProvider {
     ).map {
       case AlreadyApplied(_) => Completed(change.successful)
       case AlreadyExists(_,message) => Completed(change.alreadyExists(
-        s"""ℹ️ DNS for change "${change.id}": "${change.recordSet.name}": $message"""
+        s"""ℹ️ DNS change for "${change.id}": "${change.recordSet.name}": $message"""
       )
       )
       case ReadyToApply(_) => Validated(change)
@@ -444,7 +446,7 @@ object RecordSetChangeHandler extends TransactionProvider {
     ).map {
       case AlreadyApplied(_) => Completed(change.successful)
       case AlreadyExists(_ ,message) => Completed(change.alreadyExists(
-        s"""ℹ️ DNS for change "${change.id}": "${change.recordSet.name}": $message"""
+        s"""ℹ️ DNS change for "${change.id}": "${change.recordSet.name}": $message"""
       ))
       case Failure(_, message) =>
         Completed(
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
index b8cebe172..e05c7f8d4 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
@@ -118,8 +118,9 @@ final case class RecordAlreadyExists(name: String, recordData: RecordData, isApp
         " a DeleteRecordSet entry followed by an Add."
     }
     else {
-      s"""ℹ️ Record data "$recordData" in DNS is does not exists.
+      s"""ℹ️ Record data "$recordData" is does not exists.
          Complete the request in DNS and give approve. """
+
     }
   }
 }
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala b/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
index 345e30eb7..4a0fd7b55 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
@@ -46,11 +46,11 @@ sealed trait SingleChange {
       delete.copy(status = SingleChangeStatus.Failed, systemMessage = Some(error))
   }
 
-  def withAlreadyExists(error: Option[String]): SingleChange = this match {
+  def withAlreadyExists(messages: Option[String]): SingleChange = this match {
     case add: SingleAddChange =>
-      add.copy(status = SingleChangeStatus.Complete, systemMessage = error)
+      add.copy(status = SingleChangeStatus.AlreadyExists, systemMessage = messages)
     case delete: SingleDeleteRRSetChange =>
-      delete.copy(status = SingleChangeStatus.Complete, systemMessage = error)
+      delete.copy(status = SingleChangeStatus.AlreadyExists, systemMessage = messages)
   }
 
   def withProcessingError(message: Option[String], failedRecordChangeId: String): SingleChange =
@@ -84,6 +84,21 @@ sealed trait SingleChange {
       )
   }
 
+  def alreadyExists(completeRecordChangeId: String, recordSetId: String): SingleChange = this match {
+    case add: SingleAddChange =>
+      add.copy(
+        status = SingleChangeStatus.AlreadyExists,
+        recordChangeId = Some(completeRecordChangeId),
+        recordSetId = Some(recordSetId)
+      )
+    case delete: SingleDeleteRRSetChange =>
+      delete.copy(
+        status = SingleChangeStatus.AlreadyExists,
+        recordChangeId = Some(completeRecordChangeId),
+        recordSetId = Some(recordSetId)
+      )
+  }
+
   def reject: SingleChange = this match {
     case sad: SingleAddChange => sad.copy(status = SingleChangeStatus.Rejected)
     case sdc: SingleDeleteRRSetChange => sdc.copy(status = SingleChangeStatus.Rejected)
@@ -142,7 +157,7 @@ final case class SingleDeleteRRSetChange(
  */
 object SingleChangeStatus extends Enumeration {
   type SingleChangeStatus = Value
-  val Pending, Complete, Failed, NeedsReview, Rejected, Cancelled = Value
+  val Pending, Complete, Failed, NeedsReview, Rejected, Cancelled, AlreadyExists = Value
 }
 
 case class RecordKey(zoneId: String, recordName: String, recordType: RecordType)
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala b/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala
index 21aa6646e..d0f8af1c2 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala
@@ -22,7 +22,7 @@ import vinyldns.core.domain.zone.{Zone, ZoneCommand, ZoneCommandResult}
 
 object RecordSetChangeStatus extends Enumeration {
   type RecordSetChangeStatus = Value
-  val Pending, Complete, Failed, Synced = Value
+  val Pending, Complete, Failed, Synced, AlreadyExists = Value
 
   def isDone(status: RecordSetChangeStatus): Boolean = status == Complete || status == Failed
 }
@@ -60,7 +60,7 @@ case class RecordSetChange(
 
   def alreadyExists(message: Option[String] = None): RecordSetChange = {
       copy(
-      status = RecordSetChangeStatus.Complete,
+      status = RecordSetChangeStatus.AlreadyExists,
         systemMessage = message,
       recordSet = recordSet
         .copy(status = RecordSetStatus.Active, updated = Some(DateTime.now))
diff --git a/modules/portal/app/views/dnsChanges/dnsChangeDetail.scala.html b/modules/portal/app/views/dnsChanges/dnsChangeDetail.scala.html
index b62690a12..0eeef5c7c 100644
--- a/modules/portal/app/views/dnsChanges/dnsChangeDetail.scala.html
+++ b/modules/portal/app/views/dnsChanges/dnsChangeDetail.scala.html
@@ -151,6 +151,7 @@
                                 <td>{{change.ttl}}</td>
                                 <td>
                                     <span ng-if="change.status =='Complete'" class="label label-success">{{change.status}}</span>
+                                    <span ng-if="change.status =='AlreadyExists'" class="label label-success">Complete</span>
                                     <span ng-if="change.status =='Pending'" class="label label-info">{{change.status}}</span>
                                     <span ng-if="change.status =='NeedsReview'" class="label label-warning">Needs Review</span>
                                     <span ng-if="change.status =='Failed'" class="label label-danger">{{change.status}}</span>
@@ -158,10 +159,10 @@
                                     <span ng-if="change.status == 'Cancelled'" class="label label-default">{{batch.status}}</span>
                                 </td>
                                 <td class="wrap-long-text">
-                                    <p ng-repeat="error in change.validationErrors">
-                                        {{error.message ? error.message : error}}
-                                    </p>
-                                    {{change.systemMessage}}
+                                    <div ng-if="batch.approvalStatus !='AutoApproved' && change.status !='AlreadyExists'">
+                                        <p ng-repeat="error in change.validationErrors">
+                                        {{error.message ? error.message : error}} </p>{{change.systemMessage}}</div>
+                                    <div ng-if="batch.approvalStatus == 'AutoApproved' && change.status =='AlreadyExists'">ℹ️ This record already exists. No further action is required.</div>
                                 </td>
                             </tr>
                             </tbody>
diff --git a/modules/portal/app/views/zones/zoneTabs/changeHistory.scala.html b/modules/portal/app/views/zones/zoneTabs/changeHistory.scala.html
index bffdeab7e..04edb5bcf 100644
--- a/modules/portal/app/views/zones/zoneTabs/changeHistory.scala.html
+++ b/modules/portal/app/views/zones/zoneTabs/changeHistory.scala.html
@@ -43,7 +43,8 @@
                     <td>{{change.changeType}}</td>
                     <td>{{change.userName}}</td>
                     <td>
-                        <span class="label label-{{ getRecordChangeStatusLabel(change.status) }}">{{ change.status }}</span>
+                        <span ng-if="change.status !='AlreadyExists'" class="label label-{{ getRecordChangeStatusLabel(change.status) }}">{{ change.status }}</span>
+                        <span ng-if="change.status =='AlreadyExists'" class="label label-success">Complete</span>
                     </td>
                     <td class="col-md-3 wrap-long-text">
                         {{change.systemMessage}}
diff --git a/modules/portal/app/views/zones/zoneTabs/manageRecords.scala.html b/modules/portal/app/views/zones/zoneTabs/manageRecords.scala.html
index 850bd8a81..70aef53c8 100644
--- a/modules/portal/app/views/zones/zoneTabs/manageRecords.scala.html
+++ b/modules/portal/app/views/zones/zoneTabs/manageRecords.scala.html
@@ -34,7 +34,8 @@
                     <td>{{change.changeType}}</td>
                     <td>{{change.userName}}</td>
                     <td>
-                        <span class="label label-{{ getRecordChangeStatusLabel(change.status) }}">{{ change.status }}</span>
+                        <span ng-if="change.status !='AlreadyExists'" class="label label-{{ getRecordChangeStatusLabel(change.status) }}">{{ change.status }}</span>
+                        <span ng-if="change.status =='AlreadyExists'" class="label label-success">Complete</span>
                     </td>
                     <td class="col-md-3 wrap-long-text">
                         {{change.systemMessage}}

From 3ee689081cc88e45b164601080f42d9517bd2976 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Tue, 21 Jun 2022 17:24:31 +0530
Subject: [PATCH 028/147] update in integration tests

---
 .../api/engine/RecordSetChangeHandler.scala   |  8 +++++---
 .../batch/BatchChangeConverterSpec.scala      |  6 +++---
 .../engine/RecordSetChangeHandlerSpec.scala   | 20 +++++++++----------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
index e079ef513..135b40de0 100644
--- a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
+++ b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
@@ -126,7 +126,7 @@ object RecordSetChangeHandler extends TransactionProvider {
 
   private final case class Verified(change: RecordSetChange) extends ProcessorState
 
-  private final case class Completed(change: RecordSetChange) extends ProcessorState
+  private final case class  Completed(change: RecordSetChange) extends ProcessorState
 
   private final case class Retrying(change: RecordSetChange) extends ProcessorState
 
@@ -179,8 +179,10 @@ object RecordSetChangeHandler extends TransactionProvider {
       change.changeType match {
         case RecordSetChangeType.Create =>
           if (existingRecords.isEmpty) ReadyToApply(change)
-          else if (isDnsMatch(existingRecords, change.recordSet, change.zone.name) || recordExist(existingRecords,change))
-            AlreadyExists(change, "Record exists/updated in DNS") //Record exists in DNS
+          else if (isDnsMatch(existingRecords, change.recordSet, change.zone.name))
+            AlreadyApplied(change) //Record exists in DNS
+          else if (recordExist(existingRecords,change))
+            AlreadyExists(change, "Record exists/updated in DNS")
           else Failure(change, "Incompatible record in DNS.")
 
         case RecordSetChangeType.Update =>
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala
index 91886d987..4755f8df8 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala
@@ -39,7 +39,7 @@ import vinyldns.core.domain.zone.Zone
 class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelpers {
 
   private val makeRecordAlreadyExistsMessage : Option[String] =
-    Some(s"""This record already exists. No further action is required.""")
+    Some(s"""ℹ️ This record already exists. No further action is required.""")
 
   private def makeSingleAddChange(
                                    name: String,
@@ -78,7 +78,7 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
       typ,
       123,
       recordData,
-      SingleChangeStatus.Complete,
+      SingleChangeStatus.AlreadyExists,
       makeRecordAlreadyExistsMessage,
       None,
       None
@@ -94,7 +94,7 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
       fqdn,
       typ,
       None,
-      SingleChangeStatus.Complete,
+      SingleChangeStatus.AlreadyExists,
       makeRecordAlreadyExistsMessage,
       None,
       None
diff --git a/modules/api/src/test/scala/vinyldns/api/engine/RecordSetChangeHandlerSpec.scala b/modules/api/src/test/scala/vinyldns/api/engine/RecordSetChangeHandlerSpec.scala
index de29100a1..2cf798a30 100644
--- a/modules/api/src/test/scala/vinyldns/api/engine/RecordSetChangeHandlerSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/engine/RecordSetChangeHandlerSpec.scala
@@ -142,18 +142,18 @@ class RecordSetChangeHandlerSpec
       verify(mockChangeRepo).save(any[DB], changeRepoCaptor.capture())
 
       val appliedCs = rsRepoCaptor.getValue
-      appliedCs.status shouldBe ChangeSetStatus.Complete
-      appliedCs.changes.head.status shouldBe RecordSetChangeStatus.Complete
+      appliedCs.status shouldBe ChangeSetStatus.Pending
+      appliedCs.changes.head.status shouldBe RecordSetChangeStatus.AlreadyExists
       appliedCs.changes.head.recordSet.status shouldBe RecordSetStatus.Active
 
       val savedCs = changeRepoCaptor.getValue
-      savedCs.status shouldBe ChangeSetStatus.Complete
-      savedCs.changes.head.status shouldBe RecordSetChangeStatus.Complete
+      savedCs.status shouldBe ChangeSetStatus.Pending
+      savedCs.changes.head.status shouldBe RecordSetChangeStatus.AlreadyExists
 
       val batchChangeUpdates = await(batchRepo.getBatchChange(batchChange.id))
       val updatedSingleChanges = completeCreateAAAASingleChanges.map { ch =>
         ch.copy(
-          status = SingleChangeStatus.Complete,
+          status = SingleChangeStatus.AlreadyExists,
           recordChangeId = Some(rsChange.id),
           recordSetId = Some(rsChange.recordSet.id)
         )
@@ -183,13 +183,13 @@ class RecordSetChangeHandlerSpec
       verify(mockChangeRepo).save(any[DB], changeRepoCaptor.capture())
 
       val appliedCs = rsRepoCaptor.getValue
-      appliedCs.status shouldBe ChangeSetStatus.Complete
-      appliedCs.changes.head.status shouldBe RecordSetChangeStatus.Complete
+      appliedCs.status shouldBe ChangeSetStatus.Pending
+      appliedCs.changes.head.status shouldBe RecordSetChangeStatus.AlreadyExists
       appliedCs.changes.head.recordSet.status shouldBe RecordSetStatus.Active
 
       val savedCs = changeRepoCaptor.getValue
-      savedCs.status shouldBe ChangeSetStatus.Complete
-      savedCs.changes.head.status shouldBe RecordSetChangeStatus.Complete
+      savedCs.status shouldBe ChangeSetStatus.Pending
+      savedCs.changes.head.status shouldBe RecordSetChangeStatus.AlreadyExists
 
       // make sure the record was applied and then verified
       verify(mockBackend).applyChange(rsChange)
@@ -198,7 +198,7 @@ class RecordSetChangeHandlerSpec
       val batchChangeUpdates = await(batchRepo.getBatchChange(batchChange.id))
       val updatedSingleChanges = completeCreateAAAASingleChanges.map { ch =>
         ch.copy(
-          status = SingleChangeStatus.Complete,
+          status = SingleChangeStatus.AlreadyExists,
           recordChangeId = Some(rsChange.id),
           recordSetId = Some(rsChange.recordSet.id)
         )

From 37fde02bfc8db0d400ec9607b0e54f263ac8c225 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Tue, 21 Jun 2022 17:42:03 +0530
Subject: [PATCH 029/147] update

---
 .../scala/vinyldns/api/engine/RecordSetChangeHandler.scala  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
index 135b40de0..47d4cb513 100644
--- a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
+++ b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
@@ -179,10 +179,8 @@ object RecordSetChangeHandler extends TransactionProvider {
       change.changeType match {
         case RecordSetChangeType.Create =>
           if (existingRecords.isEmpty) ReadyToApply(change)
-          else if (isDnsMatch(existingRecords, change.recordSet, change.zone.name))
-            AlreadyApplied(change) //Record exists in DNS
-          else if (recordExist(existingRecords,change))
-            AlreadyExists(change, "Record exists/updated in DNS")
+          else if (isDnsMatch(existingRecords, change.recordSet, change.zone.name) || recordExist(existingRecords,change))
+            AlreadyExists(change, "Record exists/updated in DNS") //Record exists in DNS
           else Failure(change, "Incompatible record in DNS.")
 
         case RecordSetChangeType.Update =>

From 36e3587fadcdbff469e670b1e7e6fd62fde62215 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Wed, 22 Jun 2022 13:27:44 +0530
Subject: [PATCH 030/147] update

---
 .../domain/batch/BatchChangeConverter.scala   | 19 +-----
 .../api/engine/RecordSetChangeHandler.scala   | 23 +++----
 .../batch/BatchChangeConverterSpec.scala      | 61 ++++---------------
 .../engine/RecordSetChangeHandlerSpec.scala   | 27 ++++----
 .../core/domain/batch/SingleChange.scala      | 18 +++---
 .../core/domain/record/RecordSetChange.scala  |  4 +-
 ...BatchChangeRepositoryIntegrationSpec.scala | 10 +--
 .../dnsChanges/dnsChangeDetail.scala.html     |  8 ++-
 .../zones/zoneTabs/changeHistory.scala.html   |  3 +-
 .../zones/zoneTabs/manageRecords.scala.html   |  3 +-
 10 files changed, 62 insertions(+), 114 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
index 43d0cf3a3..cfc115696 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
@@ -35,9 +35,6 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
 
   private val logger = LoggerFactory.getLogger(classOf[BatchChangeConverter])
 
-  private val recordAlreadyExistsMessage : Option[String] =
-    Some(s"""ℹ️ This record already exists. No further action is required.""")
-
   def sendBatchForProcessing(
       batchChange: BatchChange,
       existingZones: ExistingZones,
@@ -65,14 +62,6 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
     } yield BatchConversionOutput(changeToStore, recordSetChanges)
   }
 
-  def recordExist(recordSetChanges: List[RecordSetChange], batchChange: BatchChange): Boolean = {
-    var isExists : Boolean = false
-    for (record <- recordSetChanges.flatMap(_.recordSet.records))
-    if (batchChange.changes.toString.split(",").toList.contains(record.toString)) isExists= true
-    else isExists= false
-    isExists
-  }
-
   def allChangesWereConverted(
       singleChanges: List[SingleChange],
       recordSetChanges: List[RecordSetChange]
@@ -117,10 +106,7 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
     val withStatus = batchChange.changes.map { change =>
         idsMap
           .get(change.id)
-          .map { _ =>
-       if (recordExist(recordSetChanges, batchChange) && batchChange.approvalStatus.toString == "AutoApproved")
-         change.withAlreadyExists(recordAlreadyExistsMessage) //a recordset already exists
-       else change } // a recordsetchange was successfully queued for this change
+          .map { _ => change } // a recordsetchange was successfully queued for this change
           .getOrElse {
             // failure here means there was a message queue issue for this change
             change.withFailureMessage("Error queueing RecordSetChange for processing")
@@ -132,8 +118,7 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
   def storeQueuingFailures(batchChange: BatchChange): BatchResult[Unit] = {
     val failedChanges = batchChange.changes.collect {
       case change
-        if change.status == SingleChangeStatus.Failed ||
-          change.status == SingleChangeStatus.AlreadyExists => change }
+        if change.status == SingleChangeStatus.Failed => change }
     batchChangeRepo.updateSingleChanges(failedChanges).as(())
   }.toBatchResult
 
diff --git a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
index 47d4cb513..3481edb8f 100644
--- a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
+++ b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
@@ -106,9 +106,7 @@ object RecordSetChangeHandler extends TransactionProvider {
   ): List[SingleChange] =
     recordSetChange.status match {
       case RecordSetChangeStatus.Complete =>
-        singleChanges.map(_.complete(recordSetChange.id, recordSetChange.recordSet.id))
-      case RecordSetChangeStatus.AlreadyExists =>
-        singleChanges.map(_.alreadyExists(recordSetChange.id, recordSetChange.recordSet.id))
+        singleChanges.map(_.complete(recordSetChange.systemMessage, recordSetChange.id, recordSetChange.recordSet.id))
       case RecordSetChangeStatus.Failed =>
         singleChanges.map(_.withProcessingError(recordSetChange.systemMessage, recordSetChange.id))
       case _ => singleChanges
@@ -138,9 +136,7 @@ object RecordSetChangeHandler extends TransactionProvider {
   final case class Failure(change: RecordSetChange, message: String) extends ProcessingStatus
 
   // Change has already been applied. Abort processing and return successful response to user.
-  final case class AlreadyApplied(change: RecordSetChange) extends ProcessingStatus
-
-  final case class AlreadyExists(change: RecordSetChange, message: String) extends ProcessingStatus
+  final case class AlreadyApplied(change: RecordSetChange,  message: String) extends ProcessingStatus
 
   // Change can proceed to the next state of processing. In the Verified ProcessorState,
   // ReadyToApply will attempt to retry until max retries limit is reached,
@@ -180,12 +176,12 @@ object RecordSetChangeHandler extends TransactionProvider {
         case RecordSetChangeType.Create =>
           if (existingRecords.isEmpty) ReadyToApply(change)
           else if (isDnsMatch(existingRecords, change.recordSet, change.zone.name) || recordExist(existingRecords,change))
-            AlreadyExists(change, "Record exists/updated in DNS") //Record exists in DNS
+            AlreadyApplied(change, "Record exists / updated in DNS") //Record exists in DNS
           else Failure(change, "Incompatible record in DNS.")
 
         case RecordSetChangeType.Update =>
           if (isDnsMatch(existingRecords, change.recordSet, change.zone.name))
-          AlreadyApplied(change)
+          AlreadyApplied(change,"Record updated in DNS")
           else {
             // record must not exist in the DNS backend, or be synced if it exists
             val canApply = existingRecords.isEmpty ||
@@ -202,7 +198,7 @@ object RecordSetChangeHandler extends TransactionProvider {
 
         case RecordSetChangeType.Delete =>
           if (existingRecords.nonEmpty) ReadyToApply(change) // we have a record set, move forward
-          else AlreadyApplied(change) // we did not find the record set, so already applied
+          else AlreadyApplied(change,"Record deleted in DNS") // we did not find the record set, so already applied
       }
     }
 
@@ -399,11 +395,9 @@ object RecordSetChangeHandler extends TransactionProvider {
       recordChangeRepository,
       recordSetCacheRepository
     ).map {
-      case AlreadyApplied(_) => Completed(change.successful)
-      case AlreadyExists(_,message) => Completed(change.alreadyExists(
+      case AlreadyApplied(_,message) => Completed(change.alreadyExists(
         s"""ℹ️ DNS change for "${change.id}": "${change.recordSet.name}": $message"""
-      )
-      )
+      ))
       case ReadyToApply(_) => Validated(change)
       case Failure(_, message) =>
         Completed(
@@ -444,8 +438,7 @@ object RecordSetChangeHandler extends TransactionProvider {
       recordChangeRepository,
       recordSetCacheRepository
     ).map {
-      case AlreadyApplied(_) => Completed(change.successful)
-      case AlreadyExists(_ ,message) => Completed(change.alreadyExists(
+      case AlreadyApplied(_ ,message) => Completed(change.alreadyExists(
         s"""ℹ️ DNS change for "${change.id}": "${change.recordSet.name}": $message"""
       ))
       case Failure(_, message) =>
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala
index 4755f8df8..0baefd576 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala
@@ -38,9 +38,6 @@ import vinyldns.core.domain.zone.Zone
 
 class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelpers {
 
-  private val makeRecordAlreadyExistsMessage : Option[String] =
-    Some(s"""ℹ️ This record already exists. No further action is required.""")
-
   private def makeSingleAddChange(
                                    name: String,
                                    recordData: RecordData,
@@ -63,28 +60,6 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
     )
   }
 
-  private def makeRecordAlreadyExistsSingleAddChange(
-                                                      name: String,
-                                                      recordData: RecordData,
-                                                      typ: RecordType = A,
-                                                      zone: Zone = okZone
-                                                    ) = {
-    val fqdn = s"$name.${zone.name}"
-    SingleAddChange(
-      Some(zone.id),
-      Some(zone.name),
-      Some(name),
-      fqdn,
-      typ,
-      123,
-      recordData,
-      SingleChangeStatus.AlreadyExists,
-      makeRecordAlreadyExistsMessage,
-      None,
-      None
-    )
-  }
-
   private def makeSingleDeleteRRSetChange(name: String, typ: RecordType, zone: Zone = okZone) = {
     val fqdn = s"$name.${zone.name}"
     SingleDeleteRRSetChange(
@@ -94,8 +69,8 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
       fqdn,
       typ,
       None,
-      SingleChangeStatus.AlreadyExists,
-      makeRecordAlreadyExistsMessage,
+      SingleChangeStatus.Pending,
+      None,
       None,
       None
     )
@@ -135,18 +110,6 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
     makeSingleAddChange("mxRecord", MXData(1, Fqdn("foo.bar.")), MX)
   )
 
-  private val addSingleChangesWithRecordAlreadyExists = List(
-    makeRecordAlreadyExistsSingleAddChange("one", AData("1.1.1.1")),
-    makeRecordAlreadyExistsSingleAddChange("two", AData("1.1.1.2")),
-    makeRecordAlreadyExistsSingleAddChange("repeat", AData("1.1.1.3")),
-    makeRecordAlreadyExistsSingleAddChange("repeat", AData("1.1.1.4")),
-    makeRecordAlreadyExistsSingleAddChange("aaaaRecord", AAAAData("1::1"), AAAA),
-    makeRecordAlreadyExistsSingleAddChange("cnameRecord", CNAMEData(Fqdn("cname.com.")), CNAME),
-    makeRecordAlreadyExistsSingleAddChange("10.1.1.1", PTRData(Fqdn("ptrData")), PTR),
-    makeRecordAlreadyExistsSingleAddChange("txtRecord", TXTData("text"), TXT),
-    makeRecordAlreadyExistsSingleAddChange("mxRecord", MXData(1, Fqdn("foo.bar.")), MX)
-  )
-
   private val addChangeForValidationGood = List(
     makeAddChangeForValidation("one", AData("1.1.1.1")),
     makeAddChangeForValidation("two", AData("1.1.1.2")),
@@ -177,13 +140,13 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
 
   private val updateSingleChangesGood = List(
     makeSingleDeleteRRSetChange("aToUpdate", A),
-    makeRecordAlreadyExistsSingleAddChange("aToUpdate", AData("1.1.1.1")),
+    makeSingleAddChange("aToUpdate", AData("1.1.1.1")),
     makeSingleDeleteRRSetChange("cnameToUpdate", CNAME),
-    makeRecordAlreadyExistsSingleAddChange("cnameToUpdate", CNAMEData(Fqdn("newcname.com.")), CNAME),
+    makeSingleAddChange("cnameToUpdate", CNAMEData(Fqdn("newcname.com.")), CNAME),
     makeSingleDeleteRRSetChange("txtToUpdate", TXT),
-    makeRecordAlreadyExistsSingleAddChange("txtToUpdate", TXTData("update"), TXT),
+    makeSingleAddChange("txtToUpdate", TXTData("update"), TXT),
     makeSingleDeleteRRSetChange("mxToUpdate", MX),
-    makeRecordAlreadyExistsSingleAddChange("mxToUpdate", MXData(1, Fqdn("update.com.")), MX)
+    makeSingleAddChange("mxToUpdate", MXData(1, Fqdn("update.com.")), MX)
   )
 
   private val updateChangeForValidationGood = List(
@@ -198,9 +161,9 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
   )
 
   private val singleChangesOneBad = List(
-    makeRecordAlreadyExistsSingleAddChange("one", AData("1.1.1.1")),
-    makeRecordAlreadyExistsSingleAddChange("two", AData("1.1.1.2")),
-    makeRecordAlreadyExistsSingleAddChange("bad", AData("1.1.1.1"))
+    makeSingleAddChange("one", AData("1.1.1.1")),
+    makeSingleAddChange("two", AData("1.1.1.2")),
+    makeSingleAddChange("bad", AData("1.1.1.1"))
   )
 
   private val changeForValidationOneBad = List(
@@ -328,7 +291,7 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
           okUser.userName,
           None,
           DateTime.now,
-          addSingleChangesWithRecordAlreadyExists,
+          addSingleChangesGood,
           approvalStatus = BatchChangeApprovalStatus.AutoApproved
         )
       val result = rightResultOf(
@@ -449,7 +412,7 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
     }
 
     "successfully handle a combination of adds, updates, and deletes" in {
-      val changes = addSingleChangesWithRecordAlreadyExists ++ deleteSingleChangesGood ++ updateSingleChangesGood
+      val changes = addSingleChangesGood ++ deleteSingleChangesGood ++ updateSingleChangesGood
       val changeForValidation = addChangeForValidationGood ++ deleteRRSetChangeForValidationGood ++
         updateChangeForValidationGood
       val batchChange =
@@ -526,7 +489,7 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
       result.batchChange shouldBe batchChange
     }
 
-    "set status for record already exists to complete for changes with queueing issues" in {
+    "set status to failure for changes with queueing issues" in {
       val batchWithBadChange =
         BatchChange(
           okUser.id,
diff --git a/modules/api/src/test/scala/vinyldns/api/engine/RecordSetChangeHandlerSpec.scala b/modules/api/src/test/scala/vinyldns/api/engine/RecordSetChangeHandlerSpec.scala
index 2cf798a30..72cfabd4e 100644
--- a/modules/api/src/test/scala/vinyldns/api/engine/RecordSetChangeHandlerSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/engine/RecordSetChangeHandlerSpec.scala
@@ -26,7 +26,7 @@ import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 import org.scalatest.{BeforeAndAfterEach, EitherValues}
 import vinyldns.api.backend.dns.DnsProtocol.{NotAuthorized, TryAgain}
-import vinyldns.api.engine.RecordSetChangeHandler.{AlreadyApplied, AlreadyExists, ReadyToApply, Requeue}
+import vinyldns.api.engine.RecordSetChangeHandler.{AlreadyApplied, ReadyToApply, Requeue}
 import vinyldns.api.repository.InMemoryBatchChangeRepository
 import vinyldns.api.CatsHelpers
 import vinyldns.core.domain.batch.{BatchChange, BatchChangeApprovalStatus, SingleAddChange, SingleChangeStatus}
@@ -142,18 +142,19 @@ class RecordSetChangeHandlerSpec
       verify(mockChangeRepo).save(any[DB], changeRepoCaptor.capture())
 
       val appliedCs = rsRepoCaptor.getValue
-      appliedCs.status shouldBe ChangeSetStatus.Pending
-      appliedCs.changes.head.status shouldBe RecordSetChangeStatus.AlreadyExists
+      appliedCs.status shouldBe ChangeSetStatus.Complete
+      appliedCs.changes.head.status shouldBe RecordSetChangeStatus.Complete
       appliedCs.changes.head.recordSet.status shouldBe RecordSetStatus.Active
 
       val savedCs = changeRepoCaptor.getValue
-      savedCs.status shouldBe ChangeSetStatus.Pending
-      savedCs.changes.head.status shouldBe RecordSetChangeStatus.AlreadyExists
+      savedCs.status shouldBe ChangeSetStatus.Complete
+      savedCs.changes.head.status shouldBe RecordSetChangeStatus.Complete
 
       val batchChangeUpdates = await(batchRepo.getBatchChange(batchChange.id))
       val updatedSingleChanges = completeCreateAAAASingleChanges.map { ch =>
         ch.copy(
-          status = SingleChangeStatus.AlreadyExists,
+          systemMessage= Some(s"""ℹ️ DNS change for "${rsChange.id}": "${"aaaa"}": Record exists / updated in DNS"""),
+         status = SingleChangeStatus.Complete,
           recordChangeId = Some(rsChange.id),
           recordSetId = Some(rsChange.recordSet.id)
         )
@@ -183,13 +184,13 @@ class RecordSetChangeHandlerSpec
       verify(mockChangeRepo).save(any[DB], changeRepoCaptor.capture())
 
       val appliedCs = rsRepoCaptor.getValue
-      appliedCs.status shouldBe ChangeSetStatus.Pending
-      appliedCs.changes.head.status shouldBe RecordSetChangeStatus.AlreadyExists
+      appliedCs.status shouldBe ChangeSetStatus.Complete
+      appliedCs.changes.head.status shouldBe RecordSetChangeStatus.Complete
       appliedCs.changes.head.recordSet.status shouldBe RecordSetStatus.Active
 
       val savedCs = changeRepoCaptor.getValue
-      savedCs.status shouldBe ChangeSetStatus.Pending
-      savedCs.changes.head.status shouldBe RecordSetChangeStatus.AlreadyExists
+      savedCs.status shouldBe ChangeSetStatus.Complete
+      savedCs.changes.head.status shouldBe RecordSetChangeStatus.Complete
 
       // make sure the record was applied and then verified
       verify(mockBackend).applyChange(rsChange)
@@ -198,7 +199,8 @@ class RecordSetChangeHandlerSpec
       val batchChangeUpdates = await(batchRepo.getBatchChange(batchChange.id))
       val updatedSingleChanges = completeCreateAAAASingleChanges.map { ch =>
         ch.copy(
-          status = SingleChangeStatus.AlreadyExists,
+          systemMessage= Some(s"""ℹ️ DNS change for "${rsChange.id}": "${"aaaa"}": Record exists / updated in DNS"""),
+          status = SingleChangeStatus.Complete,
           recordChangeId = Some(rsChange.id),
           recordSetId = Some(rsChange.recordSet.id)
         )
@@ -602,6 +604,7 @@ class RecordSetChangeHandlerSpec
       val batchChangeUpdates = await(batchRepo.getBatchChange(batchChange.id))
       val updatedSingleChanges = completeCreateAAAASingleChanges.map { ch =>
         ch.copy(
+          systemMessage= Some(s"""ℹ️ DNS change for "${rsChange.id}": "${"aaaa"}": Record updated in DNS"""),
           status = SingleChangeStatus.Complete,
           recordChangeId = Some(rsChange.id),
           recordSetId = Some(rsChange.recordSet.id)
@@ -692,7 +695,7 @@ class RecordSetChangeHandlerSpec
             true
           )
           .unsafeRunSync()
-      processorStatus shouldBe an[AlreadyExists]
+      processorStatus shouldBe an[AlreadyApplied]
     }
 
     "remove record from database for Add if record does not exist in DNS backend" in {
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala b/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
index 4a0fd7b55..0e9d17123 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
@@ -48,9 +48,9 @@ sealed trait SingleChange {
 
   def withAlreadyExists(messages: Option[String]): SingleChange = this match {
     case add: SingleAddChange =>
-      add.copy(status = SingleChangeStatus.AlreadyExists, systemMessage = messages)
+      add.copy(status = SingleChangeStatus.Complete, systemMessage = messages)
     case delete: SingleDeleteRRSetChange =>
-      delete.copy(status = SingleChangeStatus.AlreadyExists, systemMessage = messages)
+      delete.copy(status = SingleChangeStatus.Complete, systemMessage = messages)
   }
 
   def withProcessingError(message: Option[String], failedRecordChangeId: String): SingleChange =
@@ -69,31 +69,35 @@ sealed trait SingleChange {
         )
     }
 
-  def complete(completeRecordChangeId: String, recordSetId: String): SingleChange = this match {
+  def complete(message: Option[String], completeRecordChangeId: String, recordSetId: String): SingleChange = this match {
     case add: SingleAddChange =>
       add.copy(
         status = SingleChangeStatus.Complete,
+        systemMessage = message,
         recordChangeId = Some(completeRecordChangeId),
         recordSetId = Some(recordSetId)
       )
     case delete: SingleDeleteRRSetChange =>
       delete.copy(
         status = SingleChangeStatus.Complete,
+        systemMessage = message,
         recordChangeId = Some(completeRecordChangeId),
         recordSetId = Some(recordSetId)
       )
   }
 
-  def alreadyExists(completeRecordChangeId: String, recordSetId: String): SingleChange = this match {
+  def alreadyExists(message: Option[String], completeRecordChangeId: String, recordSetId: String): SingleChange = this match {
     case add: SingleAddChange =>
       add.copy(
-        status = SingleChangeStatus.AlreadyExists,
+        status = SingleChangeStatus.Complete,
+        systemMessage = message,
         recordChangeId = Some(completeRecordChangeId),
         recordSetId = Some(recordSetId)
       )
     case delete: SingleDeleteRRSetChange =>
       delete.copy(
-        status = SingleChangeStatus.AlreadyExists,
+        status = SingleChangeStatus.Complete,
+        systemMessage = message,
         recordChangeId = Some(completeRecordChangeId),
         recordSetId = Some(recordSetId)
       )
@@ -157,7 +161,7 @@ final case class SingleDeleteRRSetChange(
  */
 object SingleChangeStatus extends Enumeration {
   type SingleChangeStatus = Value
-  val Pending, Complete, Failed, NeedsReview, Rejected, Cancelled, AlreadyExists = Value
+  val Pending, Complete, Failed, NeedsReview, Rejected, Cancelled = Value
 }
 
 case class RecordKey(zoneId: String, recordName: String, recordType: RecordType)
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala b/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala
index d0f8af1c2..21aa6646e 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala
@@ -22,7 +22,7 @@ import vinyldns.core.domain.zone.{Zone, ZoneCommand, ZoneCommandResult}
 
 object RecordSetChangeStatus extends Enumeration {
   type RecordSetChangeStatus = Value
-  val Pending, Complete, Failed, Synced, AlreadyExists = Value
+  val Pending, Complete, Failed, Synced = Value
 
   def isDone(status: RecordSetChangeStatus): Boolean = status == Complete || status == Failed
 }
@@ -60,7 +60,7 @@ case class RecordSetChange(
 
   def alreadyExists(message: Option[String] = None): RecordSetChange = {
       copy(
-      status = RecordSetChangeStatus.AlreadyExists,
+      status = RecordSetChangeStatus.Complete,
         systemMessage = message,
       recordSet = recordSet
         .copy(status = RecordSetStatus.Active, updated = Some(DateTime.now))
diff --git a/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlBatchChangeRepositoryIntegrationSpec.scala b/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlBatchChangeRepositoryIntegrationSpec.scala
index 4ff2c349f..38482e45a 100644
--- a/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlBatchChangeRepositoryIntegrationSpec.scala
+++ b/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlBatchChangeRepositoryIntegrationSpec.scala
@@ -115,7 +115,7 @@ class MySqlBatchChangeRepositoryIntegrationSpec
     val pendingBatchChange: BatchChange = randomBatchChange().copy(createdTimestamp = DateTime.now)
 
     val completeBatchChange: BatchChange = randomBatchChangeWithList(
-      randomBatchChange().changes.map(_.complete("recordChangeId", "recordSetId"))
+      randomBatchChange().changes.map(_.complete(Some("Complete"),"recordChangeId", "recordSetId"))
     ).copy(createdTimestamp = DateTime.now.plusMillis(1000))
 
     val failedBatchChange: BatchChange =
@@ -123,7 +123,7 @@ class MySqlBatchChangeRepositoryIntegrationSpec
         .copy(createdTimestamp = DateTime.now.plusMillis(100000))
 
     val partialFailureBatchChange: BatchChange = randomBatchChangeWithList(
-      randomBatchChange().changes.take(2).map(_.complete("recordChangeId", "recordSetId"))
+      randomBatchChange().changes.take(2).map(_.complete(Some("Complete"),"recordChangeId", "recordSetId"))
         ++ randomBatchChange().changes.drop(2).map(_.withFailureMessage("failed"))
     ).copy(createdTimestamp = DateTime.now.plusMillis(1000000))
 
@@ -410,7 +410,7 @@ class MySqlBatchChangeRepositoryIntegrationSpec
 
     "update single changes" in {
       val batchChange = randomBatchChange()
-      val completed = batchChange.changes.map(_.complete("aaa", "bbb"))
+      val completed = batchChange.changes.map(_.complete(Some("Complete"),"aaa", "bbb"))
       val f =
         for {
           _ <- repo.save(batchChange)
@@ -429,7 +429,7 @@ class MySqlBatchChangeRepositoryIntegrationSpec
 
     "update some changes in a batch" in {
       val batchChange = randomBatchChange()
-      val completed = batchChange.changes.take(2).map(_.complete("recordChangeId", "recordSetId"))
+      val completed = batchChange.changes.take(2).map(_.complete(Some("Complete"),"recordChangeId", "recordSetId"))
       val incomplete = batchChange.changes.drop(2)
       val f =
         for {
@@ -443,7 +443,7 @@ class MySqlBatchChangeRepositoryIntegrationSpec
 
     "return the batch when updating single changes" in {
       val batchChange = randomBatchChange()
-      val completed = batchChange.changes.take(2).map(_.complete("recordChangeId", "recordSetId"))
+      val completed = batchChange.changes.take(2).map(_.complete(Some("Complete"),"recordChangeId", "recordSetId"))
       val f =
         for {
           _ <- repo.save(batchChange)
diff --git a/modules/portal/app/views/dnsChanges/dnsChangeDetail.scala.html b/modules/portal/app/views/dnsChanges/dnsChangeDetail.scala.html
index 0eeef5c7c..fbfff3a4e 100644
--- a/modules/portal/app/views/dnsChanges/dnsChangeDetail.scala.html
+++ b/modules/portal/app/views/dnsChanges/dnsChangeDetail.scala.html
@@ -151,7 +151,6 @@
                                 <td>{{change.ttl}}</td>
                                 <td>
                                     <span ng-if="change.status =='Complete'" class="label label-success">{{change.status}}</span>
-                                    <span ng-if="change.status =='AlreadyExists'" class="label label-success">Complete</span>
                                     <span ng-if="change.status =='Pending'" class="label label-info">{{change.status}}</span>
                                     <span ng-if="change.status =='NeedsReview'" class="label label-warning">Needs Review</span>
                                     <span ng-if="change.status =='Failed'" class="label label-danger">{{change.status}}</span>
@@ -159,10 +158,13 @@
                                     <span ng-if="change.status == 'Cancelled'" class="label label-default">{{batch.status}}</span>
                                 </td>
                                 <td class="wrap-long-text">
-                                    <div ng-if="batch.approvalStatus !='AutoApproved' && change.status !='AlreadyExists'">
+                                    <div ng-if="batch.approvalStatus !='AutoApproved' && change.status !='Complete'">
                                         <p ng-repeat="error in change.validationErrors">
                                         {{error.message ? error.message : error}} </p>{{change.systemMessage}}</div>
-                                    <div ng-if="batch.approvalStatus == 'AutoApproved' && change.status =='AlreadyExists'">ℹ️ This record already exists. No further action is required.</div>
+                                    <div ng-if="batch.approvalStatus == 'AutoApproved'
+                                             && change.systemMessage.includes('exists')
+                                             && change.status =='Complete'">
+                                        ℹ️ This record already exists. <br> No further action is required.</div>
                                 </td>
                             </tr>
                             </tbody>
diff --git a/modules/portal/app/views/zones/zoneTabs/changeHistory.scala.html b/modules/portal/app/views/zones/zoneTabs/changeHistory.scala.html
index 04edb5bcf..bffdeab7e 100644
--- a/modules/portal/app/views/zones/zoneTabs/changeHistory.scala.html
+++ b/modules/portal/app/views/zones/zoneTabs/changeHistory.scala.html
@@ -43,8 +43,7 @@
                     <td>{{change.changeType}}</td>
                     <td>{{change.userName}}</td>
                     <td>
-                        <span ng-if="change.status !='AlreadyExists'" class="label label-{{ getRecordChangeStatusLabel(change.status) }}">{{ change.status }}</span>
-                        <span ng-if="change.status =='AlreadyExists'" class="label label-success">Complete</span>
+                        <span class="label label-{{ getRecordChangeStatusLabel(change.status) }}">{{ change.status }}</span>
                     </td>
                     <td class="col-md-3 wrap-long-text">
                         {{change.systemMessage}}
diff --git a/modules/portal/app/views/zones/zoneTabs/manageRecords.scala.html b/modules/portal/app/views/zones/zoneTabs/manageRecords.scala.html
index 70aef53c8..850bd8a81 100644
--- a/modules/portal/app/views/zones/zoneTabs/manageRecords.scala.html
+++ b/modules/portal/app/views/zones/zoneTabs/manageRecords.scala.html
@@ -34,8 +34,7 @@
                     <td>{{change.changeType}}</td>
                     <td>{{change.userName}}</td>
                     <td>
-                        <span ng-if="change.status !='AlreadyExists'" class="label label-{{ getRecordChangeStatusLabel(change.status) }}">{{ change.status }}</span>
-                        <span ng-if="change.status =='AlreadyExists'" class="label label-success">Complete</span>
+                        <span class="label label-{{ getRecordChangeStatusLabel(change.status) }}">{{ change.status }}</span>
                     </td>
                     <td class="col-md-3 wrap-long-text">
                         {{change.systemMessage}}

From 2410a24fc80a2cd5e74427d63213964c834f4722 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Wed, 22 Jun 2022 16:31:59 +0530
Subject: [PATCH 031/147] update in functional tests

---
 .../tests/batch/create_batch_change_test.py   | 59 +++++++++----------
 .../tests/recordsets/update_recordset_test.py |  2 +-
 .../core/domain/DomainValidationErrors.scala  | 11 +---
 3 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/modules/api/src/test/functional/tests/batch/create_batch_change_test.py b/modules/api/src/test/functional/tests/batch/create_batch_change_test.py
index 3a56caf63..e9b1adf68 100644
--- a/modules/api/src/test/functional/tests/batch/create_batch_change_test.py
+++ b/modules/api/src/test/functional/tests/batch/create_batch_change_test.py
@@ -1481,8 +1481,8 @@ def test_a_recordtype_add_checks(shared_zone_test_context):
 
         # context validations: conflicting recordsets, unauthorized error
         assert_failed_change_in_error_response(response[7], input_name=existing_a_fqdn, record_data="1.2.3.4",
-                                               error_messages=[f"Record \"{existing_a_fqdn}\" Already Exists: "
-                                                               f"cannot add an existing record; to update it, issue a DeleteRecordSet then an Add."])
+                                               error_messages=[f"RecordName \"{existing_a_fqdn}\" already exists. Your request will be manually reviewed. "
+                                                               f"If you intended to update this record, you can avoid manual review by adding  a DeleteRecordSet entry followed by an Add."])
         assert_failed_change_in_error_response(response[8], input_name=existing_cname_fqdn,
                                                record_data="1.2.3.4",
                                                error_messages=[f'CNAME Conflict: CNAME record names must be unique. '
@@ -1730,11 +1730,9 @@ def test_aaaa_recordtype_add_checks(shared_zone_test_context):
                                                error_messages=[f"Record Name \"cname-duplicate.{parent_zone_name}\" Not Unique In Batch Change: "
                                                                f"cannot have multiple \"CNAME\" records with the same name."])
         assert_successful_change_in_error_response(response[6], input_name=f"cname-duplicate.{parent_zone_name}",
-                                                   record_type="AAAA", record_data="1::1")
-        assert_failed_change_in_error_response(response[7], input_name=existing_aaaa_fqdn, record_type="AAAA",
-                                               record_data="1::1",
-                                               error_messages=[f"Record \"{existing_aaaa_fqdn}\" Already Exists: cannot add an existing record; "
-                                                               f"to update it, issue a DeleteRecordSet then an Add."])
+                                               record_type="AAAA", record_data="1::1")
+        assert_successful_change_in_error_response(response[7], input_name=existing_aaaa_fqdn, record_type="AAAA",
+                                               record_data="1::1")
         assert_failed_change_in_error_response(response[8], input_name=existing_cname_fqdn, record_type="AAAA",
                                                record_data="1::1",
                                                error_messages=[f"CNAME Conflict: CNAME record names must be unique. Existing record with name \"{existing_cname_fqdn}\" "
@@ -2010,8 +2008,8 @@ def test_cname_recordtype_add_checks(shared_zone_test_context):
                                                                f"Existing record with name \"{existing_forward_fqdn}\" and type \"A\" conflicts with this record."])
         assert_failed_change_in_error_response(response[14], input_name=existing_cname_fqdn,
                                                record_type="CNAME", record_data="test.com.",
-                                               error_messages=[f"Record \"{existing_cname_fqdn}\" Already Exists: cannot add an existing record; to update it, "
-                                                               f"issue a DeleteRecordSet then an Add.",
+                                               error_messages=[f"RecordName \"{existing_cname_fqdn}\" already exists. Your request will be manually reviewed. "
+                                                               f"If you intended to update this record, you can avoid manual review by adding  a DeleteRecordSet entry followed by an Add.",
                                                                f"CNAME Conflict: CNAME record names must be unique. "
                                                                f"Existing record with name \"{existing_cname_fqdn}\" and type \"CNAME\" conflicts with this record."])
         assert_failed_change_in_error_response(response[15], input_name=existing_reverse_fqdn, record_type="CNAME",
@@ -2317,7 +2315,8 @@ def test_ipv4_ptr_recordtype_add_checks(shared_zone_test_context):
 
         # context validations: existing cname recordset
         assert_failed_change_in_error_response(response[11], input_name=f"{ip4_prefix}.193", record_type="PTR", record_data="existing-ptr.",
-                                               error_messages=[f'Record "{ip4_prefix}.193" Already Exists: cannot add an existing record; to update it, issue a DeleteRecordSet then an Add.'])
+                                               error_messages=[f'RecordName "{ip4_prefix}.193" already exists. Your request will be manually reviewed. '
+                                                               f'If you intended to update this record, you can avoid manual review by adding  a DeleteRecordSet entry followed by an Add.'])
         assert_failed_change_in_error_response(response[12], input_name=f"{ip4_prefix}.199", record_type="PTR", record_data="existing-cname.",
                                                error_messages=[
                                                    f'CNAME Conflict: CNAME record names must be unique. Existing record with name "{ip4_prefix}.199" and type "CNAME" conflicts with this record.'])
@@ -2528,8 +2527,8 @@ def test_ipv6_ptr_recordtype_add_checks(shared_zone_test_context):
         # context validations: existing record sets pre-request
         assert_failed_change_in_error_response(response[5], input_name=f"{ip6_prefix}:1000::bbbb", record_type="PTR",
                                                record_data="existing.ptr.",
-                                               error_messages=[f"Record \"{ip6_prefix}:1000::bbbb\" Already Exists: cannot add an existing record; "
-                                                               "to update it, issue a DeleteRecordSet then an Add."])
+                                               error_messages=[f"RecordName \"{ip6_prefix}:1000::bbbb\" already exists. Your request will be manually reviewed. "
+                                                               f"If you intended to update this record, you can avoid manual review by adding  a DeleteRecordSet entry followed by an Add."])
     finally:
         clear_recordset_list(to_delete, client)
 
@@ -2697,10 +2696,8 @@ def test_txt_recordtype_add_checks(shared_zone_test_context):
                                                                f"cannot have multiple \"CNAME\" records with the same name."])
 
         # context validations: conflicting recordsets, unauthorized error
-        assert_failed_change_in_error_response(response[5], input_name=existing_txt_fqdn, record_type="TXT",
-                                               record_data="test",
-                                               error_messages=[f"Record \"{existing_txt_fqdn}\" Already Exists: "
-                                                               f"cannot add an existing record; to update it, issue a DeleteRecordSet then an Add."])
+        assert_successful_change_in_error_response(response[5], input_name=existing_txt_fqdn, record_type="TXT",
+                                               record_data="test")
         assert_failed_change_in_error_response(response[6], input_name=existing_cname_fqdn, record_type="TXT",
                                                record_data="test",
                                                error_messages=[f"CNAME Conflict: CNAME record names must be unique. "
@@ -2906,10 +2903,8 @@ def test_mx_recordtype_add_checks(shared_zone_test_context):
                                                                f"cannot have multiple \"CNAME\" records with the same name."])
 
         # context validations: conflicting recordsets, unauthorized error
-        assert_failed_change_in_error_response(response[8], input_name=existing_mx_fqdn, record_type="MX",
-                                               record_data={"preference": 1, "exchange": "foo.bar."},
-                                               error_messages=[f"Record \"{existing_mx_fqdn}\" Already Exists: cannot add an existing record; to update it, "
-                                                               f"issue a DeleteRecordSet then an Add."])
+        assert_successful_change_in_error_response(response[8], input_name=existing_mx_fqdn, record_type="MX",
+                                               record_data={"preference": 1, "exchange": "foo.bar."})
         assert_failed_change_in_error_response(response[9], input_name=existing_cname_fqdn, record_type="MX",
                                                record_data={"preference": 1, "exchange": "foo.bar."},
                                                error_messages=["CNAME Conflict: CNAME record names must be unique. "
@@ -4169,23 +4164,23 @@ def test_create_batch_change_with_multi_record_adds_with_multi_record_support(sh
             get_change_MX_json(f"multi-mx.{ok_zone_name}", preference=0),
             get_change_MX_json(f"multi-mx.{ok_zone_name}", preference=1000, exchange="bar.foo."),
             get_change_A_AAAA_json(rs_fqdn, address="1.1.1.1")
-        ]
+        ],
+        "ownerGroupId": shared_zone_test_context.ok_group["id"]
     }
 
     try:
         create_rs = client.create_recordset(rs_to_create, status=202)
         to_delete.append(client.wait_until_recordset_change_status(create_rs, "Complete"))
-        response = client.create_batch_change(batch_change_input, status=400)
+        response = client.create_batch_change(batch_change_input, status=202)
 
-        assert_successful_change_in_error_response(response[0], input_name=f"multi.{ok_zone_name}", record_data="1.2.3.4")
-        assert_successful_change_in_error_response(response[1], input_name=f"multi.{ok_zone_name}", record_data="4.5.6.7")
-        assert_successful_change_in_error_response(response[2], input_name=f"{ip4_prefix}.44", record_type="PTR", record_data="multi.test.")
-        assert_successful_change_in_error_response(response[3], input_name=f"{ip4_prefix}.44", record_type="PTR", record_data="multi2.test.")
-        assert_successful_change_in_error_response(response[4], input_name=f"multi-txt.{ok_zone_name}", record_type="TXT", record_data="some-multi-text")
-        assert_successful_change_in_error_response(response[5], input_name=f"multi-txt.{ok_zone_name}", record_type="TXT", record_data="more-multi-text")
-        assert_successful_change_in_error_response(response[6], input_name=f"multi-mx.{ok_zone_name}", record_type="MX", record_data={"preference": 0, "exchange": "foo.bar."})
-        assert_successful_change_in_error_response(response[7], input_name=f"multi-mx.{ok_zone_name}", record_type="MX", record_data={"preference": 1000, "exchange": "bar.foo."})
-        assert_failed_change_in_error_response(response[8], input_name=rs_fqdn, record_data="1.1.1.1",
-                                               error_messages=["Record \"" + rs_fqdn + "\" Already Exists: cannot add an existing record; to update it, issue a DeleteRecordSet then an Add."])
+        assert_successful_change_in_error_response(response["changes"][0], input_name=f"multi.{ok_zone_name}", record_data="1.2.3.4")
+        assert_successful_change_in_error_response(response["changes"][1], input_name=f"multi.{ok_zone_name}", record_data="4.5.6.7")
+        assert_successful_change_in_error_response(response["changes"][2], input_name=f"{ip4_prefix}.44", record_type="PTR", record_data="multi.test.")
+        assert_successful_change_in_error_response(response["changes"][3], input_name=f"{ip4_prefix}.44", record_type="PTR", record_data="multi2.test.")
+        assert_successful_change_in_error_response(response["changes"][4], input_name=f"multi-txt.{ok_zone_name}", record_type="TXT", record_data="some-multi-text")
+        assert_successful_change_in_error_response(response["changes"][5], input_name=f"multi-txt.{ok_zone_name}", record_type="TXT", record_data="more-multi-text")
+        assert_successful_change_in_error_response(response["changes"][6], input_name=f"multi-mx.{ok_zone_name}", record_type="MX", record_data={"preference": 0, "exchange": "foo.bar."})
+        assert_successful_change_in_error_response(response["changes"][7], input_name=f"multi-mx.{ok_zone_name}", record_type="MX", record_data={"preference": 1000, "exchange": "bar.foo."})
+        assert_successful_change_in_error_response(response["changes"][8], input_name=rs_fqdn, record_data="1.1.1.1")
     finally:
         clear_recordset_list(to_delete, client)
diff --git a/modules/api/src/test/functional/tests/recordsets/update_recordset_test.py b/modules/api/src/test/functional/tests/recordsets/update_recordset_test.py
index 62d653bdf..cefbea85a 100644
--- a/modules/api/src/test/functional/tests/recordsets/update_recordset_test.py
+++ b/modules/api/src/test/functional/tests/recordsets/update_recordset_test.py
@@ -1593,7 +1593,7 @@ def test_update_fails_for_unapplied_unsynced_record_change(shared_zone_test_cont
         ]
         update_response = client.update_recordset(update_rs, status=202)
         response = client.wait_until_recordset_change_status(update_response, "Failed")
-        assert_that(response["systemMessage"], is_(f"Failed validating update to DNS for change {response['id']}:{a_rs['name']}: "
+        assert_that(response["systemMessage"], is_(f"Failed validating update to DNS for change \"{response['id']}\": \"{a_rs['name']}\": "
                                                    f"This record set is out of sync with the DNS backend; sync this zone before attempting to update this record set."))
     finally:
         try:
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
index e05c7f8d4..2abe87124 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
@@ -112,17 +112,12 @@ final case class ZoneDiscoveryError(name: String, fatal: Boolean = false)
 final case class RecordAlreadyExists(name: String, recordData: RecordData, isApproved:Boolean,
                                      fatal: Boolean = false) extends DomainValidationError(fatal) {
   def message: String = {
-    if (isApproved == false) {
+    if (isApproved == false)
       s"""RecordName "$name" already exists. Your request will be manually reviewed. """ +
         "If you intended to update this record, you can avoid manual review by adding " +
         " a DeleteRecordSet entry followed by an Add."
-    }
-    else {
-      s"""ℹ️ Record data "$recordData" is does not exists.
-         Complete the request in DNS and give approve. """
-
-    }
-  }
+    else s"""ℹ️ Record data "$recordData" is does not exists.
+         Complete the request in DNS and give approve. """ }
 }
 
 final case class RecordDoesNotExist(name: String) extends DomainValidationError {

From 6fc0eee7dbb781b4f4b241153e3cfaea02b00c73 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Wed, 22 Jun 2022 17:01:18 +0530
Subject: [PATCH 032/147] update

---
 .../vinyldns/api/domain/batch/BatchChangeConverter.scala    | 3 +--
 .../vinyldns/api/domain/batch/BatchChangeValidations.scala  | 6 ++----
 .../vinyldns/api/domain/batch/BatchTransformations.scala    | 3 +--
 .../scala/vinyldns/api/engine/RecordSetChangeHandler.scala  | 3 +--
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
index cfc115696..8efa109fb 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
@@ -117,8 +117,7 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
 
   def storeQueuingFailures(batchChange: BatchChange): BatchResult[Unit] = {
     val failedChanges = batchChange.changes.collect {
-      case change
-        if change.status == SingleChangeStatus.Failed => change }
+      case change if change.status == SingleChangeStatus.Failed => change }
     batchChangeRepo.updateSingleChanges(failedChanges).as(())
   }.toBatchResult
 
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
index 4f96ebca7..e459618fc 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
@@ -271,7 +271,7 @@ class BatchChangeValidations(
       auth: AuthPrincipal,
       isApproved: Boolean,
       batchOwnerGroupId: Option[String]
-  ): ValidatedBatch[ChangeForValidation] = {
+  ): ValidatedBatch[ChangeForValidation] =
     // Updates are a combination of an add and delete for a record with the same name and type in a zone.
     groupedChanges.changes.mapValid {
       case add: AddChangeForValidation
@@ -292,7 +292,6 @@ class BatchChangeValidations(
       case deleteUpdate =>
         validateDeleteUpdateWithContext(deleteUpdate, groupedChanges, auth, isApproved)
     }
-  }
 
   def newRecordSetIsNotDotted(change: AddChangeForValidation): SingleValidation[Unit] =
     if (change.recordName != change.zone.name && change.recordName.contains("."))
@@ -422,7 +421,7 @@ class BatchChangeValidations(
         InvalidBatchRecordType(other.toString, SupportedBatchChangeRecordTypes.get).invalidNel
     }
 
-    val validations = {
+    val validations =
       typedValidations |+|
         noIncompatibleRecordExists(change, groupedChanges) |+|
         userCanAddRecordSet(change, auth) |+|
@@ -437,7 +436,6 @@ class BatchChangeValidations(
         ) |+|
         ownerGroupProvidedIfNeeded(change, None, ownerGroupId) |+|
         zoneDoesNotRequireManualReview(change, isApproved)
-    }
     validations.map(_ => change)
   }
 
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchTransformations.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchTransformations.scala
index 9fa6ef2aa..5afa5da02 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchTransformations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchTransformations.scala
@@ -59,9 +59,8 @@ object BatchTransformations {
   }
 
   final case class ExistingRecordSets(recordSets: List[RecordSet]) {
-    val recordSetMap: Map[(String, String), List[RecordSet]] = {
+    val recordSetMap: Map[(String, String), List[RecordSet]] =
       recordSets.groupBy(rs => (rs.zoneId, rs.name.toLowerCase))
-    }
 
     def get(zoneId: String, name: String, recordType: RecordType): Option[RecordSet] =
       recordSetMap.getOrElse((zoneId, name.toLowerCase), List()).find(_.typ == recordType)
diff --git a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
index 3481edb8f..816f11b2e 100644
--- a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
+++ b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
@@ -154,9 +154,8 @@ object RecordSetChangeHandler extends TransactionProvider {
                                                 recordSetCacheRepository: RecordSetCacheRepository,
                                                 performSync: Boolean = false
   ): IO[ProcessingStatus] = {
-    def isDnsMatch(dnsResult: List[RecordSet], recordSet: RecordSet, zoneName: String): Boolean = {
+    def isDnsMatch(dnsResult: List[RecordSet], recordSet: RecordSet, zoneName: String): Boolean =
       dnsResult.exists(matches(_, recordSet, zoneName))
-    }
 
     def recordExist(existingRecords: List[RecordSet], change: RecordSetChange): Boolean = {
       var isExists : Boolean = false

From 6d311d9e6b02db7de3ed7fd60f2b0015dd63b7d2 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Thu, 23 Jun 2022 15:26:02 +0530
Subject: [PATCH 033/147] Adding it tests

---
 .../domain/batch/BatchChangeValidations.scala |  3 +--
 .../api/engine/RecordSetChangeHandler.scala   |  6 ++---
 .../domain/record/RecordSetChangeSpec.scala   | 11 +++++++++
 .../core/domain/batch/SingleChange.scala      | 24 -------------------
 .../dnsChanges/dnsChangeDetail.scala.html     |  9 +++++--
 5 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
index e459618fc..35628f51a 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
@@ -140,11 +140,10 @@ class BatchChangeValidations(
       batchChange: BatchChange,
       authPrincipal: AuthPrincipal,
       isTestChange: Boolean
-  ): Either[BatchChangeErrorResponse, Unit] = {
+  ): Either[BatchChangeErrorResponse, Unit] =
     validateAuthorizedReviewer(authPrincipal, batchChange, isTestChange) |+| validateBatchChangePendingReview(
       batchChange
     ) |+| validateScheduledApproval(batchChange)
-  }
 
   def validateBatchChangeCancellation(
       batchChange: BatchChange,
diff --git a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
index 816f11b2e..1b0127e17 100644
--- a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
+++ b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
@@ -124,7 +124,7 @@ object RecordSetChangeHandler extends TransactionProvider {
 
   private final case class Verified(change: RecordSetChange) extends ProcessorState
 
-  private final case class  Completed(change: RecordSetChange) extends ProcessorState
+  private final case class Completed(change: RecordSetChange) extends ProcessorState
 
   private final case class Retrying(change: RecordSetChange) extends ProcessorState
 
@@ -157,7 +157,7 @@ object RecordSetChangeHandler extends TransactionProvider {
     def isDnsMatch(dnsResult: List[RecordSet], recordSet: RecordSet, zoneName: String): Boolean =
       dnsResult.exists(matches(_, recordSet, zoneName))
 
-    def recordExist(existingRecords: List[RecordSet], change: RecordSetChange): Boolean = {
+    def isRecordExist(existingRecords: List[RecordSet], change: RecordSetChange): Boolean = {
       var isExists : Boolean = false
       existingRecords.foreach(recordData=>
         for (record<-change.recordSet.records)
@@ -174,7 +174,7 @@ object RecordSetChangeHandler extends TransactionProvider {
       change.changeType match {
         case RecordSetChangeType.Create =>
           if (existingRecords.isEmpty) ReadyToApply(change)
-          else if (isDnsMatch(existingRecords, change.recordSet, change.zone.name) || recordExist(existingRecords,change))
+          else if (isDnsMatch(existingRecords, change.recordSet, change.zone.name) || isRecordExist(existingRecords,change))
             AlreadyApplied(change, "Record exists / updated in DNS") //Record exists in DNS
           else Failure(change, "Incompatible record in DNS.")
 
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetChangeSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetChangeSpec.scala
index a964cc154..15ad68943 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetChangeSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetChangeSpec.scala
@@ -103,4 +103,15 @@ class RecordSetChangeSpec extends AnyWordSpec with Matchers {
       result.systemMessage shouldBe None
     }
   }
+
+  "for Already exists" should {
+      "set the system message when provided" in {
+        val result = pendingCreateAAAA.alreadyExists("Already Exists")
+        result.systemMessage shouldBe Some("Already Exists")
+      }
+      "set the system message to none when not provided" in {
+        val result = pendingCreateAAAA.alreadyExists()
+        result.systemMessage shouldBe None
+      }
+  }
 }
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala b/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
index 0e9d17123..b0c0c95f5 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/batch/SingleChange.scala
@@ -46,13 +46,6 @@ sealed trait SingleChange {
       delete.copy(status = SingleChangeStatus.Failed, systemMessage = Some(error))
   }
 
-  def withAlreadyExists(messages: Option[String]): SingleChange = this match {
-    case add: SingleAddChange =>
-      add.copy(status = SingleChangeStatus.Complete, systemMessage = messages)
-    case delete: SingleDeleteRRSetChange =>
-      delete.copy(status = SingleChangeStatus.Complete, systemMessage = messages)
-  }
-
   def withProcessingError(message: Option[String], failedRecordChangeId: String): SingleChange =
     this match {
       case add: SingleAddChange =>
@@ -86,23 +79,6 @@ sealed trait SingleChange {
       )
   }
 
-  def alreadyExists(message: Option[String], completeRecordChangeId: String, recordSetId: String): SingleChange = this match {
-    case add: SingleAddChange =>
-      add.copy(
-        status = SingleChangeStatus.Complete,
-        systemMessage = message,
-        recordChangeId = Some(completeRecordChangeId),
-        recordSetId = Some(recordSetId)
-      )
-    case delete: SingleDeleteRRSetChange =>
-      delete.copy(
-        status = SingleChangeStatus.Complete,
-        systemMessage = message,
-        recordChangeId = Some(completeRecordChangeId),
-        recordSetId = Some(recordSetId)
-      )
-  }
-
   def reject: SingleChange = this match {
     case sad: SingleAddChange => sad.copy(status = SingleChangeStatus.Rejected)
     case sdc: SingleDeleteRRSetChange => sdc.copy(status = SingleChangeStatus.Rejected)
diff --git a/modules/portal/app/views/dnsChanges/dnsChangeDetail.scala.html b/modules/portal/app/views/dnsChanges/dnsChangeDetail.scala.html
index fbfff3a4e..d884faa2b 100644
--- a/modules/portal/app/views/dnsChanges/dnsChangeDetail.scala.html
+++ b/modules/portal/app/views/dnsChanges/dnsChangeDetail.scala.html
@@ -158,11 +158,16 @@
                                     <span ng-if="change.status == 'Cancelled'" class="label label-default">{{batch.status}}</span>
                                 </td>
                                 <td class="wrap-long-text">
-                                    <div ng-if="batch.approvalStatus !='AutoApproved' && change.status !='Complete'">
+                                    <div ng-if="batch.approvalStatus != 'AutoApproved'
+                                             && change.systemMessage.includes('Record exists / updated in DNS') != -1
+                                             && change.status != 'Rejected'
+                                             && change.status != 'Cancelled'">
                                         <p ng-repeat="error in change.validationErrors">
                                         {{error.message ? error.message : error}} </p>{{change.systemMessage}}</div>
+                                    <div ng-if="batch.approvalStatus =='ManuallyRejected' || batch.approvalStatus =='Cancelled'">
+                                    </div>
                                     <div ng-if="batch.approvalStatus == 'AutoApproved'
-                                             && change.systemMessage.includes('exists')
+                                             && change.systemMessage.includes('Record exists / updated in DNS')
                                              && change.status =='Complete'">
                                         ℹ️ This record already exists. <br> No further action is required.</div>
                                 </td>

From 44b88f31f621b227f0b82c7856432508b9189ff9 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Fri, 24 Jun 2022 12:44:31 +0530
Subject: [PATCH 034/147] update

---
 .../vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
index b3e42a585..d00ed34f7 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
@@ -2164,7 +2164,7 @@ class BatchChangeValidationsSpec
     result should haveInvalid[DomainValidationError](InvalidIpv4Address(invalidIp))
   }
 
-  property("validateChangesWithContext: should fail if MX record in batch already exists") {
+  property("validateChangesWithContext: should Success if MX record in batch already exists") {
     val existingMX = rsOk.copy(
       zoneId = okZone.id,
       name = "name-conflict",
@@ -2185,7 +2185,6 @@ class BatchChangeValidationsSpec
         false,
         None
       )
-    // result(0) should haveInvalid[DomainValidationError](RecordAlreadyExists("name-conflict.", addMX.inputChange.record, false))
     result(0) shouldBe valid
   }
 

From a92713d11d03770deaab365092f7b22c79ddb5ad Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Thu, 30 Jun 2022 14:51:02 +0530
Subject: [PATCH 035/147] Auto complete feature in Global recordset search

---
 modules/portal/Gruntfile.js                   |  2 ++
 modules/portal/app/views/main.scala.html      |  2 ++
 modules/portal/karma.conf.js                  |  1 +
 modules/portal/package.json                   |  1 +
 .../lib/recordset/recordsets.controller.js    | 32 +++++++++++++++++++
 5 files changed, 38 insertions(+)

diff --git a/modules/portal/Gruntfile.js b/modules/portal/Gruntfile.js
index 4c4b5c008..7a3123934 100644
--- a/modules/portal/Gruntfile.js
+++ b/modules/portal/Gruntfile.js
@@ -34,9 +34,11 @@ module.exports = function(grunt) {
           {expand: true, flatten: true, src: ['node_modules/bootstrap/dist/js/bootstrap.min.js'], dest: 'public/js'},
           {expand: true, flatten: true, src: ['node_modules/jquery/dist/jquery.min.js'], dest: 'public/js'},
           {expand: true, flatten: true, src: ['node_modules/moment/min/moment.min.js'], dest: 'public/js'},
+          {expand: true, flatten: true, src: ['node_modules/jquery-ui-dist/jquery-ui.js'], dest: 'public/js'},
 
           {expand: true, flatten: true, src: ['node_modules/bootstrap/dist/css/bootstrap.min.css'], dest: 'public/css'},
           {expand: true, flatten: true, src: ['node_modules/font-awesome/css/font-awesome.min.css'], dest: 'public/css'},
+          {expand: true, flatten: true, src: ['node_modules/jquery-ui-dist/jquery-ui.css'], dest: 'public/css'},
 
           // We're picking just the resources we need from the gentelella UI framework and temporarily storing them in mapped/ui/
           {expand: true, flatten: true, cwd: 'node_modules/gentelella', dest: 'mapped/ui', src: '**/jquery.{smartWizard,dataTables.min,mousewheel.min}.js'},
diff --git a/modules/portal/app/views/main.scala.html b/modules/portal/app/views/main.scala.html
index 64c088544..90132f3ba 100644
--- a/modules/portal/app/views/main.scala.html
+++ b/modules/portal/app/views/main.scala.html
@@ -16,6 +16,7 @@
 
         <!-- CSS INCLUDE -->
         <link rel="stylesheet" type="text/css" id="theme" href="/public/css/bootstrap.min.css"/>
+        <link rel="stylesheet" type="text/css" href="/public/css/jquery-ui.css">
         <link rel="stylesheet" type="text/css" href="/public/css/font-awesome.min.css">
         <link rel="stylesheet" type="text/css" href="/public/css/ui.css" />
         <link rel="stylesheet" type="text/css" id="custom" href="/public/css/theme-overrides.css"/>
@@ -149,6 +150,7 @@
 
         <script src="/public/js/moment.min.js"></script>
         <script src="/public/js/jquery.min.js"></script>
+        <script src="/public/js/jquery-ui.js"></script>
         <script src="/public/js/bootstrap.min.js"></script>
         <script src="/public/js/angular.min.js"></script>
         <script src="/public/js/ui.js"></script>
diff --git a/modules/portal/karma.conf.js b/modules/portal/karma.conf.js
index 6f18b11c1..181d74040 100644
--- a/modules/portal/karma.conf.js
+++ b/modules/portal/karma.conf.js
@@ -15,6 +15,7 @@ module.exports = function(config) {
     // list of files / patterns to load in the browser
     files: [
       'js/jquery.min.js',
+      'js/jquery-ui-dist.js',
       'js/bootstrap.min.js',
       'js/angular.min.js',
       'js/moment.min.js',
diff --git a/modules/portal/package.json b/modules/portal/package.json
index bf980efe2..0a0c4f319 100644
--- a/modules/portal/package.json
+++ b/modules/portal/package.json
@@ -24,6 +24,7 @@
     "jasmine-core": "^2.99.1",
     "jasmine-jquery": "2.1.1",
     "jquery": "^3.6.0",
+    "jquery-ui-dist": "^1.13.1",
     "karma": "^6.3.17",
     "karma-chrome-launcher": "^2.2.0",
     "karma-jasmine": "^1.0.2",
diff --git a/modules/portal/public/lib/recordset/recordsets.controller.js b/modules/portal/public/lib/recordset/recordsets.controller.js
index 10ffa646f..d34466aeb 100644
--- a/modules/portal/public/lib/recordset/recordsets.controller.js
+++ b/modules/portal/public/lib/recordset/recordsets.controller.js
@@ -79,6 +79,38 @@
                 }
             };
 
+            $( "#record-search-text" ).autocomplete({
+              source: function( request, response ) {
+                $.ajax({
+                  url: "/api/recordsets?maxItems=100",
+                  dataType: "json",
+                  data: "recordNameFilter="+request.term+"%25",
+                  success: function( data ) {
+                      const search =  JSON.parse(JSON.stringify(data));
+                      response($.map(search.recordSets, function(item) {
+                      return {value: item.fqdn, label: 'name: ' + item.fqdn + ' | type: ' + item.type}}))}
+                });
+              },
+              minLength: 2,
+              limit: 8,
+              scroll: true,
+              select: function (event, ui) {
+                  $("#record-search-text").val(ui.item.value);
+                  return false;
+                },
+              open: function() {
+                $( this ).removeClass( "ui-corner-all" ).addClass( "ui-corner-top" );
+              },
+              close: function() {
+                $( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" );
+              }
+            }).data("ui-autocomplete")._renderItem = function( ul, item ) {
+                    let txt = String(item.label).replace(new RegExp(this.term, "gi"),"<b>$&</b>");
+                    return $("<li></li>")
+                          .data("ui-autocomplete-item", item.value)
+                          .append("<a>" + txt + "</a>")
+                          .appendTo(ul); };
+
             function updateRecordDisplay(records) {
                 var newRecords = [];
                 angular.forEach(records, function(record) {

From e51c2aad5d9728f9b3f138adf8d04c33b49d2f16 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Thu, 30 Jun 2022 17:58:16 +0530
Subject: [PATCH 036/147] add autocomplete for groups search

---
 modules/portal/Gruntfile.js                   |  2 ++
 modules/portal/app/views/main.scala.html      |  2 ++
 modules/portal/karma.conf.js                  |  1 +
 modules/portal/package.json                   |  3 +-
 modules/portal/public/css/vinyldns.css        |  8 +++++
 .../lib/controllers/controller.groups.js      | 33 +++++++++++++++++++
 6 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/modules/portal/Gruntfile.js b/modules/portal/Gruntfile.js
index 4c4b5c008..7a3123934 100644
--- a/modules/portal/Gruntfile.js
+++ b/modules/portal/Gruntfile.js
@@ -34,9 +34,11 @@ module.exports = function(grunt) {
           {expand: true, flatten: true, src: ['node_modules/bootstrap/dist/js/bootstrap.min.js'], dest: 'public/js'},
           {expand: true, flatten: true, src: ['node_modules/jquery/dist/jquery.min.js'], dest: 'public/js'},
           {expand: true, flatten: true, src: ['node_modules/moment/min/moment.min.js'], dest: 'public/js'},
+          {expand: true, flatten: true, src: ['node_modules/jquery-ui-dist/jquery-ui.js'], dest: 'public/js'},
 
           {expand: true, flatten: true, src: ['node_modules/bootstrap/dist/css/bootstrap.min.css'], dest: 'public/css'},
           {expand: true, flatten: true, src: ['node_modules/font-awesome/css/font-awesome.min.css'], dest: 'public/css'},
+          {expand: true, flatten: true, src: ['node_modules/jquery-ui-dist/jquery-ui.css'], dest: 'public/css'},
 
           // We're picking just the resources we need from the gentelella UI framework and temporarily storing them in mapped/ui/
           {expand: true, flatten: true, cwd: 'node_modules/gentelella', dest: 'mapped/ui', src: '**/jquery.{smartWizard,dataTables.min,mousewheel.min}.js'},
diff --git a/modules/portal/app/views/main.scala.html b/modules/portal/app/views/main.scala.html
index 64c088544..fea30edcf 100644
--- a/modules/portal/app/views/main.scala.html
+++ b/modules/portal/app/views/main.scala.html
@@ -20,6 +20,7 @@
         <link rel="stylesheet" type="text/css" href="/public/css/ui.css" />
         <link rel="stylesheet" type="text/css" id="custom" href="/public/css/theme-overrides.css"/>
         <link rel="stylesheet" type="text/css" id="custom" href="/public/css/vinyldns.css"/>
+        <link rel="stylesheet" type="text/css" href="/public/css/jquery-ui.css">
         <!-- EOF CSS INCLUDE -->
     </head>
 
@@ -149,6 +150,7 @@
 
         <script src="/public/js/moment.min.js"></script>
         <script src="/public/js/jquery.min.js"></script>
+        <script src="/public/js/jquery-ui.js"></script>
         <script src="/public/js/bootstrap.min.js"></script>
         <script src="/public/js/angular.min.js"></script>
         <script src="/public/js/ui.js"></script>
diff --git a/modules/portal/karma.conf.js b/modules/portal/karma.conf.js
index 6f18b11c1..181d74040 100644
--- a/modules/portal/karma.conf.js
+++ b/modules/portal/karma.conf.js
@@ -15,6 +15,7 @@ module.exports = function(config) {
     // list of files / patterns to load in the browser
     files: [
       'js/jquery.min.js',
+      'js/jquery-ui-dist.js',
       'js/bootstrap.min.js',
       'js/angular.min.js',
       'js/moment.min.js',
diff --git a/modules/portal/package.json b/modules/portal/package.json
index bf980efe2..830092893 100644
--- a/modules/portal/package.json
+++ b/modules/portal/package.json
@@ -15,7 +15,8 @@
     "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-concat": "^2.0.0",
     "moment": "^2.24.0",
-    "puppeteer": "^3.0.0"
+    "puppeteer": "^3.0.0",
+    "jquery-ui-dist": "^1.13.1"
   },
   "devDependencies": {
     "angular-mocks": "1.6.1",
diff --git a/modules/portal/public/css/vinyldns.css b/modules/portal/public/css/vinyldns.css
index b59f8174a..0bf46a1fd 100644
--- a/modules/portal/public/css/vinyldns.css
+++ b/modules/portal/public/css/vinyldns.css
@@ -491,3 +491,11 @@ input[type="file"] {
 .modal-backdrop.show {
   opacity: 0.75;
 }
+
+.ui-menu .ui-menu-item a {
+    background: white;
+    width: 100%;
+    font-size: 14px;
+    color: black;
+    border: none;
+}
diff --git a/modules/portal/public/lib/controllers/controller.groups.js b/modules/portal/public/lib/controllers/controller.groups.js
index 998ce1b60..49ea1c7e0 100644
--- a/modules/portal/public/lib/controllers/controller.groups.js
+++ b/modules/portal/public/lib/controllers/controller.groups.js
@@ -64,6 +64,39 @@ angular.module('controller.groups', []).controller('GroupsController', function
         return true;
     };
 
+    // Autocomplete for group search
+    $("#group-search-text").autocomplete({
+      source: function( request, response ) {
+        $.ajax({
+          url: "/api/groups?maxItems=1500&abridged=true",
+          dataType: "json",
+          data: {groupNameFilter: request.term, ignoreAccess: $scope.ignoreAccess},
+          success: function(data) {
+              const search =  JSON.parse(JSON.stringify(data));
+              response($.map(search.groups, function(group) {
+              return {value: group.name, label: group.name}}))}
+        });
+      },
+      minLength: 0,
+      limit: 5,
+      scroll: true,
+      select: function (event, ui) {
+          $("#group-search-text").val(ui.item.value);
+          return false;
+        },
+      open: function() {
+        $(this).removeClass( "ui-corner-all").addClass("ui-corner-top");
+      },
+      close: function() {
+        $(this).removeClass("ui-corner-top").addClass("ui-corner-all");
+      }
+    }).data("ui-autocomplete")._renderItem = function(ul, item) {
+            let txt = String(item.label).replace(new RegExp(this.term, "gi"),"<b>$&</b>");
+            return $("<li></li>")
+                  .data("ui-autocomplete-item", item.value)
+                  .append("<a>" + txt + "</a>")
+                  .appendTo(ul); };
+
     $scope.createGroup = function (name, email, description) {
         //prevent user executing service call multiple times
         //if true prevent, if false allow for execution of rest of code

From 8030cbf7789bdadb7e32f0771d4ac9925fceec32 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 4 Jul 2022 12:52:48 +0530
Subject: [PATCH 037/147] Add css

---
 modules/portal/public/css/vinyldns.css            | 15 +++++++++++++++
 .../public/lib/controllers/controller.groups.js   |  4 +---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/modules/portal/public/css/vinyldns.css b/modules/portal/public/css/vinyldns.css
index 0bf46a1fd..fe607ccdd 100644
--- a/modules/portal/public/css/vinyldns.css
+++ b/modules/portal/public/css/vinyldns.css
@@ -498,4 +498,19 @@ input[type="file"] {
     font-size: 14px;
     color: black;
     border: none;
+    border-left: 1px;
 }
+
+.ui-menu .ui-menu-item a:hover {
+    background: #f5f5f5;
+}
+
+.ui-menu-item-wrapper {
+    display: block;
+}
+
+.ui-autocomplete {
+    max-height: 200px;
+    overflow-y: auto;
+    overflow-x: hidden;
+}
\ No newline at end of file
diff --git a/modules/portal/public/lib/controllers/controller.groups.js b/modules/portal/public/lib/controllers/controller.groups.js
index 49ea1c7e0..09106faf8 100644
--- a/modules/portal/public/lib/controllers/controller.groups.js
+++ b/modules/portal/public/lib/controllers/controller.groups.js
@@ -77,9 +77,7 @@ angular.module('controller.groups', []).controller('GroupsController', function
               return {value: group.name, label: group.name}}))}
         });
       },
-      minLength: 0,
-      limit: 5,
-      scroll: true,
+      minLength: 1,
       select: function (event, ui) {
           $("#group-search-text").val(ui.item.value);
           return false;

From a1b3cb32deb596a8ee07f4ada6bcddbbd6046604 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 4 Jul 2022 13:15:04 +0530
Subject: [PATCH 038/147] Add newline at EOF

---
 modules/portal/public/css/vinyldns.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/portal/public/css/vinyldns.css b/modules/portal/public/css/vinyldns.css
index fe607ccdd..27e3b2185 100644
--- a/modules/portal/public/css/vinyldns.css
+++ b/modules/portal/public/css/vinyldns.css
@@ -513,4 +513,4 @@ input[type="file"] {
     max-height: 200px;
     overflow-y: auto;
     overflow-x: hidden;
-}
\ No newline at end of file
+}

From 59f800883cc1d9c9fbb8e03d55e19dbcb93ae805 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Mon, 4 Jul 2022 15:10:18 +0530
Subject: [PATCH 039/147] update in recordset search

---
 .../lib/recordset/recordsets.controller.js    | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/modules/portal/public/lib/recordset/recordsets.controller.js b/modules/portal/public/lib/recordset/recordsets.controller.js
index d34466aeb..1674e5e18 100644
--- a/modules/portal/public/lib/recordset/recordsets.controller.js
+++ b/modules/portal/public/lib/recordset/recordsets.controller.js
@@ -31,15 +31,24 @@
 
             // paging status for recordsets
             var recordsPaging = pagingService.getNewPagingParams(100);
+            var recordType = [];
+            var recordName = [];
 
             $scope.refreshRecords = function() {
-                recordsPaging = pagingService.resetPaging(recordsPaging);
+            if($scope.query.includes("|")) {
+                const queryRecord = $scope.query.split('|');
+                recordName = queryRecord[0].trim();
+                recordType = queryRecord[1].trim(); }
+            else { recordName = $scope.query;
+                   recordType = $scope.selectedRecordTypes.toString(); }
+
+              recordsPaging = pagingService.resetPaging(recordsPaging);
                 function success(response) {
                     recordsPaging.next = response.data.nextId;
                     updateRecordDisplay(response.data['recordSets']);
                 }
                 return recordsService
-                    .listRecordSetData(recordsPaging.maxItems, undefined, $scope.query, $scope.selectedRecordTypes.toString(), $scope.nameSort, $scope.ownerGroupFilter)
+                    .listRecordSetData(recordsPaging.maxItems, undefined, recordName, recordType, $scope.nameSort, $scope.ownerGroupFilter)
                     .then(success)
                     .catch(function (error) {
                         handleError(error, 'dnsChangesService::getRecordSet-failure');
@@ -86,14 +95,12 @@
                   dataType: "json",
                   data: "recordNameFilter="+request.term+"%25",
                   success: function( data ) {
-                      const search =  JSON.parse(JSON.stringify(data));
-                      response($.map(search.recordSets, function(item) {
-                      return {value: item.fqdn, label: 'name: ' + item.fqdn + ' | type: ' + item.type}}))}
+                      const recordSearch =  JSON.parse(JSON.stringify(data));
+                      response($.map(recordSearch.recordSets, function(item) {
+                      return {value: item.fqdn +" | "+ item.type , label: 'name: ' + item.fqdn + ' | type: ' + item.type }}))}
                 });
               },
-              minLength: 2,
-              limit: 8,
-              scroll: true,
+              minLength: 1,
               select: function (event, ui) {
                   $("#record-search-text").val(ui.item.value);
                   return false;
@@ -105,10 +112,10 @@
                 $( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" );
               }
             }).data("ui-autocomplete")._renderItem = function( ul, item ) {
-                    let txt = String(item.label).replace(new RegExp(this.term, "gi"),"<b>$&</b>");
+                    let recordSet = String(item.label).replace(new RegExp(this.term, "gi"),"<b>$&</b>");
                     return $("<li></li>")
                           .data("ui-autocomplete-item", item.value)
-                          .append("<a>" + txt + "</a>")
+                          .append("<a>" + recordSet + "</a>")
                           .appendTo(ul); };
 
             function updateRecordDisplay(records) {

From 80616865d822bd6be911c266bf4fc41fa807dba2 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Mon, 4 Jul 2022 15:54:25 +0530
Subject: [PATCH 040/147] update in css

---
 modules/portal/public/css/vinyldns.css        | 24 +++++++++++++++++++
 .../lib/recordset/recordsets.controller.js    |  6 ++---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/modules/portal/public/css/vinyldns.css b/modules/portal/public/css/vinyldns.css
index b59f8174a..86031a404 100644
--- a/modules/portal/public/css/vinyldns.css
+++ b/modules/portal/public/css/vinyldns.css
@@ -491,3 +491,27 @@ input[type="file"] {
 .modal-backdrop.show {
   opacity: 0.75;
 }
+
+.ui-menu .ui-menu-item a {
+    background: white;
+    width: 100%;
+    font-size: 14px;
+    color: black;
+    border: none;
+    border-left: 1px;
+}
+
+.ui-menu .ui-menu-item a:hover {
+    background: #f5f5f5;
+}
+
+.ui-menu-item-wrapper {
+    display: block;
+}
+
+.ui-autocomplete {
+    max-height: 200px;
+    width:150px;
+    overflow-y: auto;
+    overflow-x: hidden;
+}
\ No newline at end of file
diff --git a/modules/portal/public/lib/recordset/recordsets.controller.js b/modules/portal/public/lib/recordset/recordsets.controller.js
index 1674e5e18..8264de72b 100644
--- a/modules/portal/public/lib/recordset/recordsets.controller.js
+++ b/modules/portal/public/lib/recordset/recordsets.controller.js
@@ -93,14 +93,14 @@
                 $.ajax({
                   url: "/api/recordsets?maxItems=100",
                   dataType: "json",
-                  data: "recordNameFilter="+request.term+"%25",
+                  data: "recordNameFilter="+request.term+"%25&nameSort=asc",
                   success: function( data ) {
                       const recordSearch =  JSON.parse(JSON.stringify(data));
                       response($.map(recordSearch.recordSets, function(item) {
-                      return {value: item.fqdn +" | "+ item.type , label: 'name: ' + item.fqdn + ' | type: ' + item.type }}))}
+                      return {value: item.fqdn +' | '+ item.type , label: 'name: ' + item.fqdn + ' | type: ' + item.type }}))}
                 });
               },
-              minLength: 1,
+              minLength: 2,
               select: function (event, ui) {
                   $("#record-search-text").val(ui.item.value);
                   return false;

From 8ccd1cc8c0d616c790ce34e3ffbf2b3e864666a6 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 4 Jul 2022 17:39:27 +0530
Subject: [PATCH 041/147] Resolve tests failure

---
 modules/portal/karma.conf.js                           |  2 +-
 modules/portal/public/css/vinyldns.css                 |  8 ++------
 .../portal/public/lib/controllers/controller.groups.js | 10 ++++++----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/modules/portal/karma.conf.js b/modules/portal/karma.conf.js
index 181d74040..ed959b13c 100644
--- a/modules/portal/karma.conf.js
+++ b/modules/portal/karma.conf.js
@@ -15,7 +15,7 @@ module.exports = function(config) {
     // list of files / patterns to load in the browser
     files: [
       'js/jquery.min.js',
-      'js/jquery-ui-dist.js',
+      'js/jquery-ui.js',
       'js/bootstrap.min.js',
       'js/angular.min.js',
       'js/moment.min.js',
diff --git a/modules/portal/public/css/vinyldns.css b/modules/portal/public/css/vinyldns.css
index 27e3b2185..22dc40b66 100644
--- a/modules/portal/public/css/vinyldns.css
+++ b/modules/portal/public/css/vinyldns.css
@@ -492,7 +492,7 @@ input[type="file"] {
   opacity: 0.75;
 }
 
-.ui-menu .ui-menu-item a {
+.ui-menu .ui-menu-item div {
     background: white;
     width: 100%;
     font-size: 14px;
@@ -501,14 +501,10 @@ input[type="file"] {
     border-left: 1px;
 }
 
-.ui-menu .ui-menu-item a:hover {
+.ui-menu .ui-menu-item div:hover {
     background: #f5f5f5;
 }
 
-.ui-menu-item-wrapper {
-    display: block;
-}
-
 .ui-autocomplete {
     max-height: 200px;
     overflow-y: auto;
diff --git a/modules/portal/public/lib/controllers/controller.groups.js b/modules/portal/public/lib/controllers/controller.groups.js
index 09106faf8..a1c1aabf2 100644
--- a/modules/portal/public/lib/controllers/controller.groups.js
+++ b/modules/portal/public/lib/controllers/controller.groups.js
@@ -74,7 +74,8 @@ angular.module('controller.groups', []).controller('GroupsController', function
           success: function(data) {
               const search =  JSON.parse(JSON.stringify(data));
               response($.map(search.groups, function(group) {
-              return {value: group.name, label: group.name}}))}
+              return {value: group.name, label: group.name}}))
+          }
         });
       },
       minLength: 1,
@@ -83,17 +84,18 @@ angular.module('controller.groups', []).controller('GroupsController', function
           return false;
         },
       open: function() {
-        $(this).removeClass( "ui-corner-all").addClass("ui-corner-top");
+        $(this).removeClass("ui-corner-all").addClass("ui-corner-top");
       },
       close: function() {
         $(this).removeClass("ui-corner-top").addClass("ui-corner-all");
       }
-    }).data("ui-autocomplete")._renderItem = function(ul, item) {
+    }).__renderItem = function(ul, item) {
             let txt = String(item.label).replace(new RegExp(this.term, "gi"),"<b>$&</b>");
             return $("<li></li>")
                   .data("ui-autocomplete-item", item.value)
                   .append("<a>" + txt + "</a>")
-                  .appendTo(ul); };
+                  .appendTo(ul);
+    };
 
     $scope.createGroup = function (name, email, description) {
         //prevent user executing service call multiple times

From db0d8011f7a45b6555c189666f4aead0879931ef Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 4 Jul 2022 18:52:27 +0530
Subject: [PATCH 042/147] Add text-highlight

---
 .../portal/public/lib/controllers/controller.groups.js   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/portal/public/lib/controllers/controller.groups.js b/modules/portal/public/lib/controllers/controller.groups.js
index a1c1aabf2..0dc257dd1 100644
--- a/modules/portal/public/lib/controllers/controller.groups.js
+++ b/modules/portal/public/lib/controllers/controller.groups.js
@@ -74,7 +74,8 @@ angular.module('controller.groups', []).controller('GroupsController', function
           success: function(data) {
               const search =  JSON.parse(JSON.stringify(data));
               response($.map(search.groups, function(group) {
-              return {value: group.name, label: group.name}}))
+              return {value: group.name, label: group.name}
+              }))
           }
         });
       },
@@ -89,11 +90,13 @@ angular.module('controller.groups', []).controller('GroupsController', function
       close: function() {
         $(this).removeClass("ui-corner-top").addClass("ui-corner-all");
       }
-    }).__renderItem = function(ul, item) {
+    });
+
+    $.ui.autocomplete.prototype._renderItem = function(ul, item) {
             let txt = String(item.label).replace(new RegExp(this.term, "gi"),"<b>$&</b>");
             return $("<li></li>")
                   .data("ui-autocomplete-item", item.value)
-                  .append("<a>" + txt + "</a>")
+                  .append("<div>" + txt + "</div>")
                   .appendTo(ul);
     };
 

From 54949ede490893cb9bf593ccd7fbad33eade5ff5 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Mon, 4 Jul 2022 19:24:47 +0530
Subject: [PATCH 043/147] update in css

---
 modules/portal/public/css/vinyldns.css                      | 2 +-
 .../portal/public/lib/recordset/recordsets.controller.js    | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/portal/public/css/vinyldns.css b/modules/portal/public/css/vinyldns.css
index 86031a404..cde299962 100644
--- a/modules/portal/public/css/vinyldns.css
+++ b/modules/portal/public/css/vinyldns.css
@@ -492,7 +492,7 @@ input[type="file"] {
   opacity: 0.75;
 }
 
-.ui-menu .ui-menu-item a {
+.ui-menu .ui-menu-item div {
     background: white;
     width: 100%;
     font-size: 14px;
diff --git a/modules/portal/public/lib/recordset/recordsets.controller.js b/modules/portal/public/lib/recordset/recordsets.controller.js
index 8264de72b..c35e4b865 100644
--- a/modules/portal/public/lib/recordset/recordsets.controller.js
+++ b/modules/portal/public/lib/recordset/recordsets.controller.js
@@ -111,11 +111,13 @@
               close: function() {
                 $( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" );
               }
-            }).data("ui-autocomplete")._renderItem = function( ul, item ) {
+            });
+
+            $.ui.autocomplete.prototype._renderItem = function( ul, item ) {
                     let recordSet = String(item.label).replace(new RegExp(this.term, "gi"),"<b>$&</b>");
                     return $("<li></li>")
                           .data("ui-autocomplete-item", item.value)
-                          .append("<a>" + recordSet + "</a>")
+                          .append("<div>" + recordSet + "</div>")
                           .appendTo(ul); };
 
             function updateRecordDisplay(records) {

From fa93930ae2d0add718c47047cc24177d3c4c47a4 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Tue, 5 Jul 2022 10:45:14 +0530
Subject: [PATCH 044/147] Add comment

---
 modules/portal/public/lib/controllers/controller.groups.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/portal/public/lib/controllers/controller.groups.js b/modules/portal/public/lib/controllers/controller.groups.js
index 0dc257dd1..f2e8ac4e4 100644
--- a/modules/portal/public/lib/controllers/controller.groups.js
+++ b/modules/portal/public/lib/controllers/controller.groups.js
@@ -92,6 +92,7 @@ angular.module('controller.groups', []).controller('GroupsController', function
       }
     });
 
+    // Autocomplete text-highlight
     $.ui.autocomplete.prototype._renderItem = function(ul, item) {
             let txt = String(item.label).replace(new RegExp(this.term, "gi"),"<b>$&</b>");
             return $("<li></li>")

From d1b8782311fb17d61deba6c3f858f106af95a31e Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Tue, 5 Jul 2022 11:38:09 +0530
Subject: [PATCH 045/147] Move lib to devDependencies

---
 modules/portal/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/portal/package.json b/modules/portal/package.json
index 830092893..0a0c4f319 100644
--- a/modules/portal/package.json
+++ b/modules/portal/package.json
@@ -15,8 +15,7 @@
     "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-concat": "^2.0.0",
     "moment": "^2.24.0",
-    "puppeteer": "^3.0.0",
-    "jquery-ui-dist": "^1.13.1"
+    "puppeteer": "^3.0.0"
   },
   "devDependencies": {
     "angular-mocks": "1.6.1",
@@ -25,6 +24,7 @@
     "jasmine-core": "^2.99.1",
     "jasmine-jquery": "2.1.1",
     "jquery": "^3.6.0",
+    "jquery-ui-dist": "^1.13.1",
     "karma": "^6.3.17",
     "karma-chrome-launcher": "^2.2.0",
     "karma-jasmine": "^1.0.2",

From 0eddd7e0aa9353c1de765f34452eca13a4131370 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Tue, 5 Jul 2022 17:30:41 +0530
Subject: [PATCH 046/147] update in css

---
 modules/portal/public/css/vinyldns.css | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/portal/public/css/vinyldns.css b/modules/portal/public/css/vinyldns.css
index cde299962..a8f33d0f7 100644
--- a/modules/portal/public/css/vinyldns.css
+++ b/modules/portal/public/css/vinyldns.css
@@ -501,14 +501,10 @@ input[type="file"] {
     border-left: 1px;
 }
 
-.ui-menu .ui-menu-item a:hover {
+.ui-menu .ui-menu-item div:hover {
     background: #f5f5f5;
 }
 
-.ui-menu-item-wrapper {
-    display: block;
-}
-
 .ui-autocomplete {
     max-height: 200px;
     width:150px;

From eb17c957f70f9f945129a7b4ff2b576641976a6f Mon Sep 17 00:00:00 2001
From: Nicholas Spadaccino <nicholas_spadaccino@comcast.com>
Date: Tue, 5 Jul 2022 16:02:53 -0400
Subject: [PATCH 047/147] Add case insensitivity to listZones api, update
 integration tests

---
 .../MySqlZoneRepositoryIntegrationSpec.scala  | 21 +++++++++++++++++++
 .../repository/MySqlZoneRepository.scala      |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlZoneRepositoryIntegrationSpec.scala b/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlZoneRepositoryIntegrationSpec.scala
index 314209155..369c35443 100644
--- a/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlZoneRepositoryIntegrationSpec.scala
+++ b/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlZoneRepositoryIntegrationSpec.scala
@@ -468,6 +468,27 @@ class MySqlZoneRepositoryIntegrationSpec
       (f.unsafeRunSync().zones should contain).theSameElementsInOrderAs(expectedZones)
     }
 
+    "support case insensitivity in the zone filter" in {
+
+      val testZones = Seq(
+        testZone("system-test.", adminGroupId = "foo"),
+        testZone("system-temp.", adminGroupId = "foo"),
+        testZone("system-nomatch.", adminGroupId = "bar")
+      )
+
+      val expectedZones = Seq(testZones(0), testZones(1)).sortBy(_.name)
+
+      val auth = AuthPrincipal(dummyUser, Seq("foo"))
+
+      val f =
+        for {
+          _ <- saveZones(testZones)
+          retrieved <- repo.listZones(auth, zoneNameFilter = Some("SyStEm*"))
+        } yield retrieved
+
+      (f.unsafeRunSync().zones should contain).theSameElementsInOrderAs(expectedZones)
+    }
+
     "support starts with wildcard" in {
 
       val testZones = Seq(
diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala
index e80402632..df24ce3da 100644
--- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala
+++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala
@@ -254,7 +254,7 @@ class MySqlZoneRepository extends ZoneRepository with ProtobufConversions with M
           sb.append(withAccessorCheck)
 
           val filters = List(
-            zoneNameFilter.map(flt => s"z.name LIKE '${ensureTrailingDot(flt.replace('*', '%'))}'"),
+            zoneNameFilter.map(flt => s"LOWER ( z.name ) LIKE '${ensureTrailingDot(flt.replace('*', '%').toLowerCase())}'"),
             startFrom.map(os => s"z.name > '$os'")
           ).flatten
 

From 95bbbe43c9cd6af8058ce080f391c69b575efe06 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Wed, 6 Jul 2022 11:36:54 +0530
Subject: [PATCH 048/147] Address requested changes

---
 .../domain/batch/BatchChangeConverter.scala   | 29 +++++++++----------
 .../tests/batch/create_batch_change_test.py   |  4 +--
 .../batch/BatchChangeConverterSpec.scala      |  4 +--
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
index e597fe168..43be44465 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
@@ -33,7 +33,7 @@ import vinyldns.core.queue.MessageQueue
 class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue: MessageQueue)
     extends BatchChangeConverterAlgebra {
 
-  private val notExistCompletedMessage: String = "ℹ️ This record does not exist." +
+  private val notExistCompletedMessage: String = "This record does not exist." +
     "No further action is required."
   private val failedMessage: String = "Error queueing RecordSetChange for processing"
   private val logger = LoggerFactory.getLogger(classOf[BatchChangeConverter])
@@ -70,21 +70,18 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
       recordSetChanges: List[RecordSetChange]
   ): BatchResult[Unit] = {
     val convertedIds = recordSetChanges.flatMap(_.singleBatchChangeIds).toSet
-    // Each single change has a corresponding recordset id
-    // If they're not equal, then there's a delete request for a record that doesn't exist. So we allow this to process
-    if(singleChanges.map(_.id).length != recordSetChanges.map(_.id).length && !singleChanges.map(_.typ).contains(UNKNOWN)) {
-      logger.info(s"Successfully converted SingleChanges [${singleChanges
-        .map(_.id)}] to RecordSetChanges [${recordSetChanges.map(_.id)}]")
-      ().toRightBatchResult
-    }
-    else {
-      singleChanges.find(ch => !convertedIds.contains(ch.id)) match {
-        case Some(change) => BatchConversionError(change).toLeftBatchResult
-        case None =>
-          logger.info(s"Successfully converted SingleChanges [${singleChanges
-              .map(_.id)}] to RecordSetChanges [${recordSetChanges.map(_.id)}]")
-          ().toRightBatchResult
-      }
+    singleChanges.find(ch => !convertedIds.contains(ch.id)) match {
+      // Each single change has a corresponding recordset id
+      // If they're not equal, then there's a delete request for a record that doesn't exist. So we allow this to process
+      case Some(_) if singleChanges.map(_.id).length != recordSetChanges.map(_.id).length && !singleChanges.map(_.typ).contains(UNKNOWN) =>
+        logger.info(s"Successfully converted SingleChanges [${singleChanges
+          .map(_.id)}] to RecordSetChanges [${recordSetChanges.map(_.id)}]")
+        ().toRightBatchResult
+      case Some(change) => BatchConversionError(change).toLeftBatchResult
+      case None =>
+        logger.info(s"Successfully converted SingleChanges [${singleChanges
+            .map(_.id)}] to RecordSetChanges [${recordSetChanges.map(_.id)}]")
+        ().toRightBatchResult
     }
   }
 
diff --git a/modules/api/src/test/functional/tests/batch/create_batch_change_test.py b/modules/api/src/test/functional/tests/batch/create_batch_change_test.py
index 8105c3017..a88f52750 100644
--- a/modules/api/src/test/functional/tests/batch/create_batch_change_test.py
+++ b/modules/api/src/test/functional/tests/batch/create_batch_change_test.py
@@ -3724,7 +3724,7 @@ def test_create_batch_with_zone_name_requiring_manual_review(shared_zone_test_co
 
 def test_create_batch_delete_record_that_does_not_exists_completes(shared_zone_test_context):
     """
-    Test delete record set fails for non-existent record and non-existent record data
+    Test delete record set completes for non-existent record
     """
     client = shared_zone_test_context.ok_vinyldns_client
     ok_zone_name = shared_zone_test_context.ok_zone["name"]
@@ -3739,7 +3739,7 @@ def test_create_batch_delete_record_that_does_not_exists_completes(shared_zone_t
     response = client.create_batch_change(batch_change_input, status=202)
     get_batch = client.get_batch_change(response["id"])
 
-    assert_that(get_batch["changes"][0]["systemMessage"], is_("ℹ️ This record does not exist." +
+    assert_that(get_batch["changes"][0]["systemMessage"], is_("This record does not exist." +
                                                               "No further action is required."))
 
     assert_successful_change_in_error_response(response["changes"][0], input_name=f"delete-non-existent-record.{ok_zone_name}", record_data="1.1.1.1", change_type="DeleteRecordSet")
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala
index 424811f70..e916c59e6 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeConverterSpec.scala
@@ -37,7 +37,7 @@ import vinyldns.core.domain.record._
 import vinyldns.core.domain.zone.Zone
 
 class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelpers {
-  private val notExistCompletedMessage: String = "ℹ️ This record does not exist." +
+  private val notExistCompletedMessage: String = "This record does not exist." +
     "No further action is required."
 
   private def makeSingleAddChange(
@@ -545,7 +545,7 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers with CatsHelper
       savedBatch shouldBe Some(returnedBatch)
     }
 
-    "set status to complete when deleting a record that does not exists" in {
+    "set status to complete when deleting a record that does not exist" in {
       val batchWithBadChange =
         BatchChange(
           okUser.id,

From 638a44fcad0ccfe09ceb6d7bf783fed8fbe0e343 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Wed, 6 Jul 2022 11:40:08 +0530
Subject: [PATCH 049/147] Minor change

---
 .../scala/vinyldns/api/domain/batch/BatchChangeConverter.scala | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
index 43be44465..523465b7a 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeConverter.scala
@@ -70,6 +70,7 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
       recordSetChanges: List[RecordSetChange]
   ): BatchResult[Unit] = {
     val convertedIds = recordSetChanges.flatMap(_.singleBatchChangeIds).toSet
+
     singleChanges.find(ch => !convertedIds.contains(ch.id)) match {
       // Each single change has a corresponding recordset id
       // If they're not equal, then there's a delete request for a record that doesn't exist. So we allow this to process
@@ -80,7 +81,7 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
       case Some(change) => BatchConversionError(change).toLeftBatchResult
       case None =>
         logger.info(s"Successfully converted SingleChanges [${singleChanges
-            .map(_.id)}] to RecordSetChanges [${recordSetChanges.map(_.id)}]")
+          .map(_.id)}] to RecordSetChanges [${recordSetChanges.map(_.id)}]")
         ().toRightBatchResult
     }
   }

From a61cf559f1c0e8dac023bedb107de987feddce5c Mon Sep 17 00:00:00 2001
From: Nicholas Spadaccino <nicholas_spadaccino@comcast.com>
Date: Thu, 7 Jul 2022 11:51:05 -0400
Subject: [PATCH 050/147] Revert listzones sql query change

---
 .../scala/vinyldns/mysql/repository/MySqlZoneRepository.scala   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala
index df24ce3da..e80402632 100644
--- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala
+++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala
@@ -254,7 +254,7 @@ class MySqlZoneRepository extends ZoneRepository with ProtobufConversions with M
           sb.append(withAccessorCheck)
 
           val filters = List(
-            zoneNameFilter.map(flt => s"LOWER ( z.name ) LIKE '${ensureTrailingDot(flt.replace('*', '%').toLowerCase())}'"),
+            zoneNameFilter.map(flt => s"z.name LIKE '${ensureTrailingDot(flt.replace('*', '%'))}'"),
             startFrom.map(os => s"z.name > '$os'")
           ).flatten
 

From 2427616f3bc5473aa561ef4b2bb51d7a43c4a848 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Fri, 8 Jul 2022 19:33:46 +0530
Subject: [PATCH 051/147] update in messages

---
 .../api/engine/RecordSetChangeHandler.scala      | 16 ++++++----------
 .../core/domain/record/RecordSetChange.scala     | 11 -----------
 .../views/dnsChanges/dnsChangeDetail.scala.html  |  4 +---
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
index 1b0127e17..553e7a06d 100644
--- a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
+++ b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
@@ -136,7 +136,7 @@ object RecordSetChangeHandler extends TransactionProvider {
   final case class Failure(change: RecordSetChange, message: String) extends ProcessingStatus
 
   // Change has already been applied. Abort processing and return successful response to user.
-  final case class AlreadyApplied(change: RecordSetChange,  message: String) extends ProcessingStatus
+  final case class AlreadyApplied(change: RecordSetChange) extends ProcessingStatus
 
   // Change can proceed to the next state of processing. In the Verified ProcessorState,
   // ReadyToApply will attempt to retry until max retries limit is reached,
@@ -175,12 +175,12 @@ object RecordSetChangeHandler extends TransactionProvider {
         case RecordSetChangeType.Create =>
           if (existingRecords.isEmpty) ReadyToApply(change)
           else if (isDnsMatch(existingRecords, change.recordSet, change.zone.name) || isRecordExist(existingRecords,change))
-            AlreadyApplied(change, "Record exists / updated in DNS") //Record exists in DNS
+            AlreadyApplied(change) //Record exists in DNS
           else Failure(change, "Incompatible record in DNS.")
 
         case RecordSetChangeType.Update =>
           if (isDnsMatch(existingRecords, change.recordSet, change.zone.name))
-          AlreadyApplied(change,"Record updated in DNS")
+          AlreadyApplied(change)
           else {
             // record must not exist in the DNS backend, or be synced if it exists
             val canApply = existingRecords.isEmpty ||
@@ -197,7 +197,7 @@ object RecordSetChangeHandler extends TransactionProvider {
 
         case RecordSetChangeType.Delete =>
           if (existingRecords.nonEmpty) ReadyToApply(change) // we have a record set, move forward
-          else AlreadyApplied(change,"Record deleted in DNS") // we did not find the record set, so already applied
+          else AlreadyApplied(change) // we did not find the record set, so already applied
       }
     }
 
@@ -394,9 +394,7 @@ object RecordSetChangeHandler extends TransactionProvider {
       recordChangeRepository,
       recordSetCacheRepository
     ).map {
-      case AlreadyApplied(_,message) => Completed(change.alreadyExists(
-        s"""ℹ️ DNS change for "${change.id}": "${change.recordSet.name}": $message"""
-      ))
+      case AlreadyApplied(_) => Completed(change.successful)
       case ReadyToApply(_) => Validated(change)
       case Failure(_, message) =>
         Completed(
@@ -437,9 +435,7 @@ object RecordSetChangeHandler extends TransactionProvider {
       recordChangeRepository,
       recordSetCacheRepository
     ).map {
-      case AlreadyApplied(_ ,message) => Completed(change.alreadyExists(
-        s"""ℹ️ DNS change for "${change.id}": "${change.recordSet.name}": $message"""
-      ))
+      case AlreadyApplied(_) => Completed(change.successful)
       case Failure(_, message) =>
         Completed(
           change.failed(
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala b/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala
index 21aa6646e..1c0350b93 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/record/RecordSetChange.scala
@@ -58,17 +58,6 @@ case class RecordSetChange(
         .copy(status = RecordSetStatus.Active, updated = Some(DateTime.now))
     )
 
-  def alreadyExists(message: Option[String] = None): RecordSetChange = {
-      copy(
-      status = RecordSetChangeStatus.Complete,
-        systemMessage = message,
-      recordSet = recordSet
-        .copy(status = RecordSetStatus.Active, updated = Some(DateTime.now))
-    )
-  }
-
-  def alreadyExists(message: String): RecordSetChange = alreadyExists(Some(message))
-
   def failed(message: String): RecordSetChange = failed(Some(message))
 
   def failed(message: Option[String] = None): RecordSetChange =
diff --git a/modules/portal/app/views/dnsChanges/dnsChangeDetail.scala.html b/modules/portal/app/views/dnsChanges/dnsChangeDetail.scala.html
index d884faa2b..1d05c1613 100644
--- a/modules/portal/app/views/dnsChanges/dnsChangeDetail.scala.html
+++ b/modules/portal/app/views/dnsChanges/dnsChangeDetail.scala.html
@@ -159,7 +159,6 @@
                                 </td>
                                 <td class="wrap-long-text">
                                     <div ng-if="batch.approvalStatus != 'AutoApproved'
-                                             && change.systemMessage.includes('Record exists / updated in DNS') != -1
                                              && change.status != 'Rejected'
                                              && change.status != 'Cancelled'">
                                         <p ng-repeat="error in change.validationErrors">
@@ -167,9 +166,8 @@
                                     <div ng-if="batch.approvalStatus =='ManuallyRejected' || batch.approvalStatus =='Cancelled'">
                                     </div>
                                     <div ng-if="batch.approvalStatus == 'AutoApproved'
-                                             && change.systemMessage.includes('Record exists / updated in DNS')
                                              && change.status =='Complete'">
-                                        ℹ️ This record already exists. <br> No further action is required.</div>
+                                        ℹ️ No further action is required.</div>
                                 </td>
                             </tr>
                             </tbody>

From cfcd47abaf3827f30e16242b7c30b2ae1fba3c25 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Mon, 11 Jul 2022 09:54:52 +0530
Subject: [PATCH 052/147] update in tests

---
 .../vinyldns/api/domain/record/RecordSetChangeSpec.scala    | 6 +++---
 .../vinyldns/api/engine/RecordSetChangeHandlerSpec.scala    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetChangeSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetChangeSpec.scala
index 15ad68943..2fdbb4ae9 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetChangeSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetChangeSpec.scala
@@ -106,11 +106,11 @@ class RecordSetChangeSpec extends AnyWordSpec with Matchers {
 
   "for Already exists" should {
       "set the system message when provided" in {
-        val result = pendingCreateAAAA.alreadyExists("Already Exists")
-        result.systemMessage shouldBe Some("Already Exists")
+        val result = pendingCreateAAAA.successful
+        result.systemMessage shouldBe None
       }
       "set the system message to none when not provided" in {
-        val result = pendingCreateAAAA.alreadyExists()
+        val result = pendingCreateAAAA.successful
         result.systemMessage shouldBe None
       }
   }
diff --git a/modules/api/src/test/scala/vinyldns/api/engine/RecordSetChangeHandlerSpec.scala b/modules/api/src/test/scala/vinyldns/api/engine/RecordSetChangeHandlerSpec.scala
index 72cfabd4e..6a5e1c2f0 100644
--- a/modules/api/src/test/scala/vinyldns/api/engine/RecordSetChangeHandlerSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/engine/RecordSetChangeHandlerSpec.scala
@@ -153,7 +153,7 @@ class RecordSetChangeHandlerSpec
       val batchChangeUpdates = await(batchRepo.getBatchChange(batchChange.id))
       val updatedSingleChanges = completeCreateAAAASingleChanges.map { ch =>
         ch.copy(
-          systemMessage= Some(s"""ℹ️ DNS change for "${rsChange.id}": "${"aaaa"}": Record exists / updated in DNS"""),
+          systemMessage= None,
          status = SingleChangeStatus.Complete,
           recordChangeId = Some(rsChange.id),
           recordSetId = Some(rsChange.recordSet.id)
@@ -199,7 +199,7 @@ class RecordSetChangeHandlerSpec
       val batchChangeUpdates = await(batchRepo.getBatchChange(batchChange.id))
       val updatedSingleChanges = completeCreateAAAASingleChanges.map { ch =>
         ch.copy(
-          systemMessage= Some(s"""ℹ️ DNS change for "${rsChange.id}": "${"aaaa"}": Record exists / updated in DNS"""),
+          systemMessage= None,
           status = SingleChangeStatus.Complete,
           recordChangeId = Some(rsChange.id),
           recordSetId = Some(rsChange.recordSet.id)
@@ -604,7 +604,7 @@ class RecordSetChangeHandlerSpec
       val batchChangeUpdates = await(batchRepo.getBatchChange(batchChange.id))
       val updatedSingleChanges = completeCreateAAAASingleChanges.map { ch =>
         ch.copy(
-          systemMessage= Some(s"""ℹ️ DNS change for "${rsChange.id}": "${"aaaa"}": Record updated in DNS"""),
+          systemMessage= None,
           status = SingleChangeStatus.Complete,
           recordChangeId = Some(rsChange.id),
           recordSetId = Some(rsChange.recordSet.id)

From 2232f9dccfefe66cd7e1a9b59307e9c9302dea4e Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Wed, 13 Jul 2022 14:09:02 +0530
Subject: [PATCH 053/147] Allow wildcard search

---
 .../api/domain/zone/ZoneService.scala         | 21 +++++++---------
 .../api/domain/zone/ZoneServiceSpec.scala     |  6 ++---
 .../api/repository/EmptyRepositories.scala    |  6 +++--
 .../domain/membership/GroupRepository.scala   |  2 ++
 .../core/domain/zone/ZoneRepository.scala     |  4 ++--
 .../MySqlZoneRepositoryIntegrationSpec.scala  | 12 +++++-----
 .../repository/MySqlGroupRepository.scala     | 24 +++++++++++++++++++
 .../repository/MySqlZoneRepository.scala      | 10 ++++----
 8 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/zone/ZoneService.scala b/modules/api/src/main/scala/vinyldns/api/domain/zone/ZoneService.scala
index db96a7b86..3b8d66a36 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/zone/ZoneService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/zone/ZoneService.scala
@@ -176,17 +176,17 @@ class ZoneService(
     }
     else {
       for {
-        groupId <- getGroupIdByName(nameFilter.get)
-        listZonesResult <- zoneRepository.listZonesByAdminGroupId(
+        groupIds <- getGroupsIdsByName(nameFilter.get)
+        listZonesResult <- zoneRepository.listZonesByAdminGroupIds(
           authPrincipal,
           startFrom,
           maxItems,
-          groupId,
+          groupIds,
           ignoreAccess
         )
         zones = listZonesResult.zones
-        group <- groupRepository.getGroup(groupId)
-        zoneSummaryInfos = zoneSummaryInfoMapping(zones, authPrincipal, group.toSet)
+        groups <- groupRepository.getGroups(groupIds)
+        zoneSummaryInfos = zoneSummaryInfoMapping(zones, authPrincipal, groups)
       } yield ListZonesResponse(
         zoneSummaryInfos,
         nameFilter,
@@ -269,6 +269,10 @@ class ZoneService(
     } yield zoneChange
   }
 
+  def getGroupsIdsByName(groupName: String): IO[Set[String]] = {
+    groupRepository.getGroupsByName(groupName).map(x => x.map(_.id))
+  }
+
   def getBackendIds(): Result[List[String]] =
     backendResolver.ids.toList.toResult
 
@@ -301,13 +305,6 @@ class ZoneService(
     }
   }.toResult
 
-  def getGroupIdByName(groupName: String): IO[String] = {
-    groupRepository.getGroupByName(groupName).map {
-      case Some(group) => group.id
-      case None => "Cannot find group"
-    }
-  }
-
   def getZoneOrFail(zoneId: String): Result[Zone] =
     zoneRepository
       .getZone(zoneId)
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/zone/ZoneServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/zone/ZoneServiceSpec.scala
index 0463ea907..c781d80b8 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/zone/ZoneServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/zone/ZoneServiceSpec.scala
@@ -565,11 +565,11 @@ class ZoneServiceSpec
     "name filter must be used to return zones by admin group name, when search by admin group option is true" in {
       doReturn(IO.pure(Some(abcGroup)))
         .when(mockGroupRepo)
-        .getGroupByName(any[String])
+        .getGroupsByName(any[String])
       doReturn(IO.pure(ListZonesResults(List(abcZone), ignoreAccess = true, zonesFilter = Some("abcGroup"))))
         .when(mockZoneRepo)
-        .listZonesByAdminGroupId(abcAuth, None, 100, abcGroup.id, ignoreAccess = true)
-      doReturn(IO.pure(Some(abcGroup))).when(mockGroupRepo).getGroup(any[String])
+        .listZonesByAdminGroupIds(abcAuth, None, 100, Set(abcGroup.id), ignoreAccess = true)
+      doReturn(IO.pure(Some(abcGroup))).when(mockGroupRepo).getGroups(any[Set[String]])
 
       // When searchByAdminGroup is true, zones are filtered by admin group name given in nameFilter
       val result: ListZonesResponse =
diff --git a/modules/api/src/test/scala/vinyldns/api/repository/EmptyRepositories.scala b/modules/api/src/test/scala/vinyldns/api/repository/EmptyRepositories.scala
index ed6674ae1..ad3d79310 100644
--- a/modules/api/src/test/scala/vinyldns/api/repository/EmptyRepositories.scala
+++ b/modules/api/src/test/scala/vinyldns/api/repository/EmptyRepositories.scala
@@ -84,11 +84,11 @@ trait EmptyZoneRepo extends ZoneRepository {
 
   def getZoneByName(zoneName: String): IO[Option[Zone]] = IO.pure(None)
 
-  def listZonesByAdminGroupId(
+  def listZonesByAdminGroupIds(
      authPrincipal: AuthPrincipal,
      startFrom: Option[String] = None,
      maxItems: Int = 100,
-     adminGroupId: String,
+     adminGroupIds: Set[String],
      ignoreAccess: Boolean = false
    ): IO[ListZonesResults] = IO.pure(ListZonesResults())
 
@@ -121,6 +121,8 @@ trait EmptyGroupRepo extends GroupRepository {
 
   def getGroupByName(groupName: String): IO[Option[Group]] = IO.pure(None)
 
+  def getGroupsByName(groupName: String): IO[Set[Group]] = IO.pure(Set())
+
   def getAllGroups(): IO[Set[Group]] = IO.pure(Set())
 }
 
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/membership/GroupRepository.scala b/modules/core/src/main/scala/vinyldns/core/domain/membership/GroupRepository.scala
index 233a2f6b5..128792a8c 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/membership/GroupRepository.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/membership/GroupRepository.scala
@@ -33,6 +33,8 @@ trait GroupRepository extends Repository {
 
   def getGroupByName(groupName: String): IO[Option[Group]]
 
+  def getGroupsByName(groupName: String): IO[Set[Group]]
+
   def getAllGroups(): IO[Set[Group]]
 
 }
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/zone/ZoneRepository.scala b/modules/core/src/main/scala/vinyldns/core/domain/zone/ZoneRepository.scala
index 9c146e7ed..ec8e82af9 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/zone/ZoneRepository.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/zone/ZoneRepository.scala
@@ -35,11 +35,11 @@ trait ZoneRepository extends Repository {
 
   def getZonesByFilters(zoneNames: Set[String]): IO[Set[Zone]]
 
-  def listZonesByAdminGroupId(
+  def listZonesByAdminGroupIds(
        authPrincipal: AuthPrincipal,
        startFrom: Option[String] = None,
        maxItems: Int = 100,
-       adminGroupId: String,
+       adminGroupIds: Set[String],
        ignoreAccess: Boolean = false
      ): IO[ListZonesResults]
 
diff --git a/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlZoneRepositoryIntegrationSpec.scala b/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlZoneRepositoryIntegrationSpec.scala
index 10b6b7f89..f536d4a42 100644
--- a/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlZoneRepositoryIntegrationSpec.scala
+++ b/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlZoneRepositoryIntegrationSpec.scala
@@ -240,10 +240,10 @@ class MySqlZoneRepositoryIntegrationSpec
       )
 
       f.unsafeRunSync()
-      repo.listZonesByAdminGroupId(okUserAuth, None, 100, testZoneAdminGroupId).unsafeRunSync().zones should contain theSameElementsAs testZones
+      repo.listZonesByAdminGroupIds(okUserAuth, None, 100, Set(testZoneAdminGroupId)).unsafeRunSync().zones should contain theSameElementsAs testZones
 
       // dummy user only has access to one zone
-      (repo.listZonesByAdminGroupId(dummyAuth, None, 100, testZoneAdminGroupId).unsafeRunSync().zones should contain).only(testZones.head)
+      (repo.listZonesByAdminGroupIds(dummyAuth, None, 100, Set(testZoneAdminGroupId)).unsafeRunSync().zones should contain).only(testZones.head)
 
       // delete the group created to test
       groupRepository.delete(okGroup).unsafeRunSync()
@@ -293,8 +293,8 @@ class MySqlZoneRepositoryIntegrationSpec
         groupRepository.save(db, okGroup)
       }.unsafeRunSync()
 
-      val group = groupRepository.getGroupByName(okGroup.name).unsafeRunSync()
-      val groupId = group.get.id
+      val group = groupRepository.getGroupsByName(okGroup.name).unsafeRunSync()
+      val groupId = group.head.id
 
       // store all of the zones
       val privateZone = okZone.copy(
@@ -325,13 +325,13 @@ class MySqlZoneRepositoryIntegrationSpec
       f.unsafeRunSync()
 
       repo
-        .listZonesByAdminGroupId(okUserAuth, None, 100, groupId, ignoreAccess = true)
+        .listZonesByAdminGroupIds(okUserAuth, None, 100, Set(groupId), ignoreAccess = true)
         .unsafeRunSync()
         .zones should contain theSameElementsAs testZones
 
       // dummy user only have all of the zones returned
       repo
-        .listZonesByAdminGroupId(dummyAuth, None, 100, groupId, ignoreAccess = true)
+        .listZonesByAdminGroupIds(dummyAuth, None, 100, Set(groupId), ignoreAccess = true)
         .unsafeRunSync()
         .zones should contain theSameElementsAs testZones
 
diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlGroupRepository.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlGroupRepository.scala
index 83ead82f7..ae61e201c 100644
--- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlGroupRepository.scala
+++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlGroupRepository.scala
@@ -155,6 +155,30 @@ class MySqlGroupRepository extends GroupRepository with GroupProtobufConversions
       }
     }
 
+  def getGroupsByName(nameFilter: String): IO[Set[Group]] =
+    monitor("repo.Group.getGroupByName") {
+      IO {
+        logger.debug(s"Getting groups with name: $nameFilter")
+        val initialQuery = "SELECT data FROM groups WHERE name"
+        val sb = new StringBuilder
+        sb.append(initialQuery)
+        val groupsLike = if (nameFilter.contains('*')) {
+          s" LIKE '${nameFilter.replace('*', '%')}'"
+        } else {
+          s" LIKE '$nameFilter%'"
+        }
+        sb.append(groupsLike)
+        val query = sb.toString()
+
+        DB.readOnly { implicit s =>
+          SQL(query)
+            .map(toGroup(1))
+            .list()
+            .apply()
+        }.toSet
+      }
+    }
+
   def getAllGroups(): IO[Set[Group]] =
     monitor("repo.Group.getAllGroups") {
       IO {
diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala
index b4c69b62f..f40b73bdd 100644
--- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala
+++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala
@@ -237,14 +237,14 @@ class MySqlZoneRepository extends ZoneRepository with ProtobufConversions with M
     *
     * @return a ListZonesResults
     */
-  def listZonesByAdminGroupId(
+  def listZonesByAdminGroupIds(
        authPrincipal: AuthPrincipal,
        startFrom: Option[String] = None,
        maxItems: Int = 100,
-       adminGroupId: String,
+       adminGroupIds: Set[String],
        ignoreAccess: Boolean = false
   ): IO[ListZonesResults] =
-    monitor("repo.ZoneJDBC.listZonesByAdminGroupId") {
+    monitor("repo.ZoneJDBC.listZonesByAdminGroupIds") {
       IO {
         DB.readOnly { implicit s =>
           val (withAccessorCheck, accessors) =
@@ -252,13 +252,13 @@ class MySqlZoneRepository extends ZoneRepository with ProtobufConversions with M
           val sb = new StringBuilder
           sb.append(withAccessorCheck)
 
-          sb.append(s" WHERE admin_group_id='$adminGroupId' ")
+          val groupIds = adminGroupIds.map(x => "'" + x + "'").mkString(",")
+          sb.append(s" WHERE admin_group_id IN ($groupIds) ")
 
           sb.append(s" GROUP BY z.name ")
           sb.append(s" LIMIT ${maxItems + 1}")
 
           val query = sb.toString
-          println("Query: ", query)
 
           val results: List[Zone] = SQL(query)
             .bind(accessors: _*)

From 86619943971137da4989c1e6fe2b6e95d4cf3860 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Wed, 13 Jul 2022 15:20:41 +0530
Subject: [PATCH 054/147] Resolve test

---
 .../test/scala/vinyldns/api/domain/zone/ZoneServiceSpec.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/api/src/test/scala/vinyldns/api/domain/zone/ZoneServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/zone/ZoneServiceSpec.scala
index c781d80b8..69faad71a 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/zone/ZoneServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/zone/ZoneServiceSpec.scala
@@ -563,13 +563,13 @@ class ZoneServiceSpec
     }
 
     "name filter must be used to return zones by admin group name, when search by admin group option is true" in {
-      doReturn(IO.pure(Some(abcGroup)))
+      doReturn(IO.pure(Set(abcGroup)))
         .when(mockGroupRepo)
         .getGroupsByName(any[String])
       doReturn(IO.pure(ListZonesResults(List(abcZone), ignoreAccess = true, zonesFilter = Some("abcGroup"))))
         .when(mockZoneRepo)
         .listZonesByAdminGroupIds(abcAuth, None, 100, Set(abcGroup.id), ignoreAccess = true)
-      doReturn(IO.pure(Some(abcGroup))).when(mockGroupRepo).getGroups(any[Set[String]])
+      doReturn(IO.pure(Set(abcGroup))).when(mockGroupRepo).getGroups(any[Set[String]])
 
       // When searchByAdminGroup is true, zones are filtered by admin group name given in nameFilter
       val result: ListZonesResponse =

From 8493edf5e068649789b4b67774d0ed4a7f28e111 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Wed, 13 Jul 2022 15:48:44 +0530
Subject: [PATCH 055/147] Add test for wildcard search

---
 .../functional/tests/zones/list_zones_test.py | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/modules/api/src/test/functional/tests/zones/list_zones_test.py b/modules/api/src/test/functional/tests/zones/list_zones_test.py
index ed2bf6329..1caf96e31 100644
--- a/modules/api/src/test/functional/tests/zones/list_zones_test.py
+++ b/modules/api/src/test/functional/tests/zones/list_zones_test.py
@@ -22,6 +22,7 @@ def test_list_zones_success(list_zone_context, shared_zone_test_context):
 
     assert_that(result["nameFilter"], is_(f"*{shared_zone_test_context.partition_id}"))
 
+
 def test_list_zones_by_admin_group_name(list_zone_context, shared_zone_test_context):
     """
     Test that we can retrieve list of zones by searching with admin group name
@@ -41,6 +42,25 @@ def test_list_zones_by_admin_group_name(list_zone_context, shared_zone_test_cont
     assert_that(result["nameFilter"], is_(f"list-zones-group{shared_zone_test_context.partition_id}"))
 
 
+def test_list_zones_by_admin_group_name_with_wildcard(list_zone_context, shared_zone_test_context):
+    """
+    Test that we can retrieve list of zones by searching with admin group name with wildcard character
+    """
+    result = shared_zone_test_context.list_zones_client.list_zones(name_filter=f"*group{shared_zone_test_context.partition_id}", search_by_admin_group=True, status=200)
+    retrieved = result["zones"]
+
+    assert_that(retrieved, has_length(5))
+    assert_that(retrieved, has_item(has_entry("name", list_zone_context.search_zone1["name"])))
+    assert_that(retrieved, has_item(has_entry("name", list_zone_context.search_zone2["name"])))
+    assert_that(retrieved, has_item(has_entry("name", list_zone_context.search_zone3["name"])))
+    assert_that(retrieved, has_item(has_entry("name", list_zone_context.non_search_zone1["name"])))
+    assert_that(retrieved, has_item(has_entry("name", list_zone_context.non_search_zone2["name"])))
+    assert_that(retrieved, has_item(has_entry("adminGroupName", list_zone_context.list_zones_group["name"])))
+    assert_that(retrieved, has_item(has_entry("backendId", "func-test-backend")))
+
+    assert_that(result["nameFilter"], is_(f"*group{shared_zone_test_context.partition_id}"))
+
+
 def test_list_zones_max_items_100(shared_zone_test_context):
     """
     Test that the default max items for a list zones request is 100

From a44cafeaf8dbb9e542253602903c3775be88ce84 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Wed, 13 Jul 2022 18:05:35 +0530
Subject: [PATCH 056/147] Add test

---
 .../MySqlGroupRepositoryIntegrationSpec.scala      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlGroupRepositoryIntegrationSpec.scala b/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlGroupRepositoryIntegrationSpec.scala
index b658c741a..76b3469b4 100644
--- a/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlGroupRepositoryIntegrationSpec.scala
+++ b/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlGroupRepositoryIntegrationSpec.scala
@@ -103,6 +103,20 @@ class MySqlGroupRepositoryIntegrationSpec
     }
   }
 
+  "MySqlGroupRepository.getGroupsByName" should {
+    "retrieve a group" in {
+      repo.getGroupsByName(groups.head.name).unsafeRunSync() shouldBe Set(groups.head)
+    }
+
+    "retrieve groups with wildcard character" in {
+      repo.getGroupsByName("*-group-*").unsafeRunSync() shouldBe groups.toSet
+    }
+
+    "returns empty set when group does not exist" in {
+      repo.getGroupsByName("no-existo").unsafeRunSync() shouldBe Set()
+    }
+  }
+
   "MySqlGroupRepository.getAllGroups" should {
     "retrieve all groups" in {
       repo.getAllGroups().unsafeRunSync() should contain theSameElementsAs groups.toSet

From d13b601f6916be44109c15649fe139f810578725 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 15 Jul 2022 10:41:56 +0530
Subject: [PATCH 057/147] Resolve error

---
 .../vinyldns/mysql/repository/MySqlZoneRepository.scala   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala
index f40b73bdd..d08b90309 100644
--- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala
+++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlZoneRepository.scala
@@ -252,8 +252,12 @@ class MySqlZoneRepository extends ZoneRepository with ProtobufConversions with M
           val sb = new StringBuilder
           sb.append(withAccessorCheck)
 
-          val groupIds = adminGroupIds.map(x => "'" + x + "'").mkString(",")
-          sb.append(s" WHERE admin_group_id IN ($groupIds) ")
+          if(adminGroupIds.nonEmpty) {
+            val groupIds = adminGroupIds.map(x => "'" + x + "'").mkString(",")
+            sb.append(s" WHERE admin_group_id IN ($groupIds) ")
+          } else {
+            sb.append(s" WHERE admin_group_id IN ('') ")
+          }
 
           sb.append(s" GROUP BY z.name ")
           sb.append(s" LIMIT ${maxItems + 1}")

From f839c72d0502ffa8078554ee887287ee0650e64f Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 15 Jul 2022 11:12:16 +0530
Subject: [PATCH 058/147] Add test

---
 .../MySqlZoneRepositoryIntegrationSpec.scala  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlZoneRepositoryIntegrationSpec.scala b/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlZoneRepositoryIntegrationSpec.scala
index f536d4a42..05433c372 100644
--- a/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlZoneRepositoryIntegrationSpec.scala
+++ b/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlZoneRepositoryIntegrationSpec.scala
@@ -340,6 +340,29 @@ class MySqlZoneRepositoryIntegrationSpec
       groupRepository.delete(okGroup).unsafeRunSync()
     }
 
+    "get empty list when no matching admin group name is found while filtering zones by group name" in {
+
+      executeWithinTransaction { db: DB =>
+        groupRepository.save(db, okGroup.copy(id = testZoneAdminGroupId))
+      }.unsafeRunSync()
+
+      // store all of the zones
+
+      val f = saveZones(testZones)
+
+      // query for all zones for the ok user, he should have access to all of the zones
+      val okUserAuth = AuthPrincipal(
+        signedInUser = okUser,
+        memberGroupIds = groups.map(_.id)
+      )
+
+      f.unsafeRunSync()
+      repo.listZonesByAdminGroupIds(okUserAuth, None, 100, Set()).unsafeRunSync().zones shouldBe empty
+
+      // delete the group created to test
+      groupRepository.delete(okGroup).unsafeRunSync()
+    }
+
     "get zones that are accessible by everyone" in {
 
       //user and group id being set to None implies EVERYONE access

From 1ad803533f2ab606a20778ba2b4da1e470b59529 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Tue, 19 Jul 2022 14:01:19 +0530
Subject: [PATCH 059/147] Add group change history

---
 .../membership/MembershipProtocol.scala       |   6 +-
 .../domain/membership/MembershipService.scala |   5 +-
 .../api/route/MembershipJsonProtocol.scala    |   5 +-
 .../core/domain/membership/GroupChange.scala  |   3 +-
 modules/portal/app/controllers/VinylDNS.scala |  19 +
 .../app/views/groups/groupDetail.scala.html   | 347 +++++++++++++-----
 modules/portal/conf/routes                    |   1 +
 .../lib/controllers/controller.membership.js  | 125 ++++++-
 .../lib/services/groups/service.groups.js     |   6 +
 9 files changed, 421 insertions(+), 96 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipProtocol.scala b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipProtocol.scala
index 8853c7d96..a76244474 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipProtocol.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipProtocol.scala
@@ -59,7 +59,8 @@ final case class GroupChangeInfo(
     userId: String,
     oldGroup: Option[GroupInfo] = None,
     id: String = UUID.randomUUID().toString,
-    created: String = DateTime.now.getMillis.toString
+    created: DateTime = DateTime.now,
+    userName: String
 )
 
 object GroupChangeInfo {
@@ -69,7 +70,8 @@ object GroupChangeInfo {
     userId = groupChange.userId,
     oldGroup = groupChange.oldGroup.map(GroupInfo.apply),
     id = groupChange.id,
-    created = groupChange.created.getMillis.toString
+    created = groupChange.created,
+    userName = groupChange.userName.getOrElse("unknown user")
   )
 }
 
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
index 50226337d..8d2f2e02f 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
@@ -238,8 +238,11 @@ class MembershipService(
       result <- groupChangeRepo
         .getGroupChanges(groupId, startFrom, maxItems)
         .toResult[ListGroupChangesResults]
+      userIds = result.changes.map(_.userId).toSet
+      users <- userRepo.getUsers(userIds, None, None).map(_.users).toResult[Seq[User]]
+      userMap = users.map(u => (u.id, u.userName)).toMap
     } yield ListGroupChangesResponse(
-      result.changes.map(GroupChangeInfo.apply),
+      result.changes.map(change => GroupChangeInfo.apply(change.copy(userName = userMap.get(change.userId)))),
       startFrom,
       result.lastEvaluatedTimeStamp,
       maxItems
diff --git a/modules/api/src/main/scala/vinyldns/api/route/MembershipJsonProtocol.scala b/modules/api/src/main/scala/vinyldns/api/route/MembershipJsonProtocol.scala
index 4c3084c29..cab7cc3b5 100644
--- a/modules/api/src/main/scala/vinyldns/api/route/MembershipJsonProtocol.scala
+++ b/modules/api/src/main/scala/vinyldns/api/route/MembershipJsonProtocol.scala
@@ -120,7 +120,8 @@ trait MembershipJsonProtocol extends JsonValidation {
         (js \ "userId").required[String]("Missing userId"),
         (js \ "oldGroup").optional[GroupInfo],
         (js \ "id").default[String](UUID.randomUUID().toString),
-        (js \ "created").default[String](DateTime.now.getMillis.toString)
-      ).mapN(GroupChangeInfo.apply)
+        (js \ "created").default[DateTime](DateTime.now),
+        (js \ "userName").required[String]("Missing userName"),
+        ).mapN(GroupChangeInfo.apply)
   }
 }
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/membership/GroupChange.scala b/modules/core/src/main/scala/vinyldns/core/domain/membership/GroupChange.scala
index b48ad6cc0..7e892023e 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/membership/GroupChange.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/membership/GroupChange.scala
@@ -34,7 +34,8 @@ case class GroupChange(
     userId: String,
     oldGroup: Option[Group] = None,
     id: String = UUID.randomUUID().toString,
-    created: DateTime = DateTime.now
+    created: DateTime = DateTime.now,
+    userName: Option[String] = None
 )
 
 object GroupChange {
diff --git a/modules/portal/app/controllers/VinylDNS.scala b/modules/portal/app/controllers/VinylDNS.scala
index 8e8908252..376b8da46 100644
--- a/modules/portal/app/controllers/VinylDNS.scala
+++ b/modules/portal/app/controllers/VinylDNS.scala
@@ -214,6 +214,25 @@ class VinylDNS @Inject() (
     })
   }
 
+  def listGroupChanges(id: String): Action[AnyContent] = userAction.async { implicit request =>
+    // $COVERAGE-OFF$
+    val queryParameters = new HashMap[String, java.util.List[String]]()
+    for {
+      (name, values) <- request.queryString
+    } queryParameters.put(name, values.asJava)
+    val vinyldnsRequest = new VinylDNSRequest(
+      "GET",
+      s"$vinyldnsServiceBackend",
+      s"groups/$id/activity",
+      parameters = queryParameters
+    )
+    executeRequest(vinyldnsRequest, request.user).map(response => {
+      Status(response.status)(response.body)
+        .withHeaders(cacheHeaders: _*)
+    })
+    // $COVERAGE-ON$
+  }
+
   def getUser(id: String): Action[AnyContent] = userAction.async { implicit request =>
     val vinyldnsRequest = VinylDNSRequest("GET", s"$vinyldnsServiceBackend", s"users/$id")
     executeRequest(vinyldnsRequest, request.user).map(response => {
diff --git a/modules/portal/app/views/groups/groupDetail.scala.html b/modules/portal/app/views/groups/groupDetail.scala.html
index e7c3862d8..bed494780 100644
--- a/modules/portal/app/views/groups/groupDetail.scala.html
+++ b/modules/portal/app/views/groups/groupDetail.scala.html
@@ -2,110 +2,279 @@
 
 @content = {
 
-    <!-- PAGE CONTENT -->
-    <div class="right_col" role="main" >
+<!-- PAGE CONTENT -->
+<div class="right_col" role="main" >
 
-<div>
-        <!-- START BREADCRUMB -->
-        <ul class="breadcrumb">
-            <li><a href="/">Home</a></li>
-            <li><a href="/groups">Groups</a></li>
-            <li class="active">{{membership.group.name}}</li>
-        </ul>
-        <!-- END BREADCRUMB -->
+    <div>
+            <!-- START BREADCRUMB -->
+            <ul class="breadcrumb">
+                <li><a href="/">Home</a></li>
+                <li><a href="/groups">Groups</a></li>
+                <li class="active">{{membership.group.name}}</li>
+            </ul>
+            <!-- END BREADCRUMB -->
 
-        <!-- PAGE TITLE -->
-        <div class="page-title">
-            <h3><span class="fa fa-group"></span> Group {{membership.group.name}}</h3>
-        </div>
-        <!-- END PAGE TITLE -->
-
-        <!-- PAGE CONTENT WRAPPER -->
-        <div class="page-content-wrap">
-
-            <div class="alert-wrapper">
-                <div ng-repeat="alert in alerts">
-                    <notification ng-model="alert"></notification>
-                </div>
+            <!-- PAGE TITLE -->
+            <div class="page-title">
+                <h3><span class="fa fa-group"></span> Group {{membership.group.name}}</h3>
             </div>
+            <!-- END PAGE TITLE -->
 
-            <div class="row">
-                <div class="col-md-12">
-                    <p ng-if="membership.group.description"><strong>Description:</strong> {{membership.group.description}}</p>
-                    <p><strong>Group Email:</strong> {{membership.group.email}}</p>
-                    <!-- START SIMPLE DATATABLE -->
-                    <div class="panel panel-default">
-                        <div class="panel-heading">
-                            <div ng-if="isGroupAdmin">
-                                <form class="form-inline" role="form" name="addMemberForm" ng-submit="addMemberForm.$valid && addMember();">
-                                    <div class="col-md-8">
-                                        <div class="form-group">
-                                            <div class="input-group">
-                                                <input type="text" ng-model="newMemberData.login" name="newMemberLogin" class="form-control" placeholder="User Name" required/>
+            <!-- PAGE CONTENT WRAPPER -->
+            <div class="page-content-wrap">
+
+                <div class="alert-wrapper">
+                    <div ng-repeat="alert in alerts">
+                        <notification ng-model="alert"></notification>
+                    </div>
+                </div>
+
+                <!-- START VERTICAL TABS -->
+                <div class="panel panel-default panel-tabs">
+                    <ul class="nav nav-tabs bar_tabs">
+                        <li class="active"><a href="#tab1" data-toggle="tab">Manage Groups</a></li>
+                        <li><a href="#tab2" data-toggle="tab">Change History</a></li>
+                    </ul>
+                    <div class="panel-body tab-content">
+
+                        <div class="tab-pane active" id="tab1">
+                            <div class="row">
+                                <div class="col-md-12">
+                                    <p ng-if="membership.group.description"><strong>Description:</strong> {{membership.group.description}}</p>
+                                    <p><strong>Group Email:</strong> {{membership.group.email}}</p>
+                                    <!-- START SIMPLE DATATABLE -->
+                                    <div class="panel panel-default">
+                                        <div class="panel-heading">
+                                            <div ng-if="isGroupAdmin">
+                                                <form class="form-inline" role="form" name="addMemberForm" ng-submit="addMemberForm.$valid && addMember();">
+                                                    <div class="col-md-8">
+                                                        <div class="form-group">
+                                                            <div class="input-group">
+                                                                <input type="text" ng-model="newMemberData.login" name="newMemberLogin" class="form-control" placeholder="User Name" required/>
+                                                            </div>
+                                                        </div>
+                                                        <div class="form-group" style="padding-left: 10px;">
+                                                            <label class="check">
+                                                                <input type="checkbox"
+                                                                       ng-model="newMemberData.isAdmin" name="newMemberAdmin"
+                                                                       class="icheckbox_minimal-grey"/>
+                                                                Is Group Manager?</label>
+                                                        </div>
+                                                        <div class="form-group" style="padding-left: 10px;">
+                                                            <div class="input-group">
+                                                                <button type="submit" class="btn btn-sm vinyldns-btn-dark">Add Group Member</button>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </form>
                                             </div>
                                         </div>
-                                        <div class="form-group" style="padding-left: 10px;">
-                                            <label class="check">
-                                                <input type="checkbox"
-                                                    ng-model="newMemberData.isAdmin" name="newMemberAdmin"
-                                                    class="icheckbox_minimal-grey"/>
-                                                Is Group Manager?</label>
-                                        </div>
-                                        <div class="form-group" style="padding-left: 10px;">
-                                            <div class="input-group">
-                                            <button type="submit" class="btn btn-sm vinyldns-btn-dark">Add Group Member</button>
-                                            </div>
+                                        <div class="panel-body">
+                                            <p id="no-group-list" ng-if="!membershipLoaded">Loading members...</p>
+                                            <p id="no-group-list" ng-if="!membership.members.length && membershipLoaded">You don't have any members yet.</p>
+                                            <table class="table datatable_simple group-members" ng-if="membership.members.length">
+                                                <thead>
+                                                <tr>
+                                                    <th>User Name</th>
+                                                    <th>Name</th>
+                                                    <th>Email</th>
+                                                    <th>Group Manager</th>
+                                                    <th>Status</th>
+                                                    <th ng-if="isGroupAdmin">Actions</th>
+                                                </tr>
+                                                </thead>
+                                                <tbody>
+                                                <tr ng-repeat="member in membership.members | orderBy:'+userName'">
+                                                    <td>{{member.userName}}</td>
+                                                    <td>{{([member.lastName, member.firstName] | filter: "" ).join(", ")}}</td>
+                                                    <td>{{member.email}}</td>
+                                                    <td>
+                                                        <label class="switch col-md-1">
+                                                            <input class="switch-checkbox" type="checkbox" ng-model="member.isAdmin" ng-disabled="!isGroupAdmin" ng-change="toggleAdmin(member);"/>
+                                                            <span class="slider"></span>
+                                                        </label>
+                                                    </td>
+                                                    <td>{{member.lockStatus}}</td>
+                                                    <td ng-if="isGroupAdmin">
+                                                        <button class="btn btn-danger btn-rounded" ng-click="removeMember(member.id);">
+                                                            Delete
+                                                        </button>
+                                                    </td>
+                                                </tr>
+                                                </tbody>
+                                            </table>
                                         </div>
                                     </div>
-                                </form>
+                                    <!-- END SIMPLE DATATABLE -->
+
+                                </div>
                             </div>
                         </div>
-                        <div class="panel-body">
-                            <p id="no-group-list" ng-if="!membershipLoaded">Loading members...</p>
-                            <p id="no-group-list" ng-if="!membership.members.length && membershipLoaded">You don't have any members yet.</p>
-                            <table class="table datatable_simple group-members" ng-if="membership.members.length">
-                                <thead>
-                                    <tr>
-                                        <th>User Name</th>
-                                        <th>Name</th>
-                                        <th>Email</th>
-                                        <th>Group Manager</th>
-                                        <th>Status</th>
-                                        <th ng-if="isGroupAdmin">Actions</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr ng-repeat="member in membership.members | orderBy:'+userName'">
-                                        <td>{{member.userName}}</td>
-                                        <td>{{([member.lastName, member.firstName] | filter: "" ).join(", ")}}</td>
-                                        <td>{{member.email}}</td>
-                                        <td>
-                                            <label class="switch col-md-1">
-                                                <input class="switch-checkbox" type="checkbox" ng-model="member.isAdmin" ng-disabled="!isGroupAdmin" ng-change="toggleAdmin(member);"/>
-                                                <span class="slider"></span>
-                                            </label>
-                                        </td>
-                                        <td>{{member.lockStatus}}</td>
-                                        <td ng-if="isGroupAdmin">
-                                            <button class="btn btn-danger btn-rounded" ng-click="removeMember(member.id);">
-                                                Delete
-                                            </button>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
+                        <div class="tab-pane" id="tab2">
+                            <!-- START SIMPLE DATATABLE -->
+                            <div class="panel panel-default">
+                                <div class="panel-heading">
+                                    <h3 class="panel-title">All Group Changes {{ getChangePageTitle() }}</h3>
+                                </div>
+                                <div class="panel-body">
+                                    <div class="btn-group">
+                                        <button class="btn btn-default" ng-click="refreshGroupChanges()"><span class="fa fa-refresh"></span> Refresh</button>
+                                    </div>
+
+                                    <!-- PAGINATION -->
+                                    <div class="dataTables_paginate">
+                                        <ul class="pagination">
+                                            <li class="paginate_button previous">
+                                                <a ng-if="changePrevPageEnabled()" ng-click="changePrevPage()" class="paginate_button">Previous</a>
+                                            </li>
+                                            <li class="paginate_button next">
+                                                <a ng-if="changeNextPageEnabled()" ng-click="changeNextPage()" class="paginate_button">Next</a>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                    <!-- END PAGINATION -->
+
+                                    <table id="changeDataTable" class="table table-hover table-striped">
+                                        <thead>
+                                        <tr>
+                                            <th>Time</th>
+                                            <th>Group Change ID</th>
+                                            <th>Change Type</th>
+                                            <th>Change Info</th>
+                                            <th>User</th>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        <tr ng-repeat="change in groupChanges track by $index">
+                                            <td>{{change.created}}</td>
+                                            <td>{{change.id}}</td>
+                                            <td>{{change.changeType}}</td>
+                                            <td class="col-md-3 wrap-long-text">
+                                                <a ng-if="change.changeType =='Create'" ng-click="viewGroupInfo(change.newGroup)" class="force-cursor">View created group</a>
+
+                                                <div><a ng-if="change.changeType =='Update'" ng-click="viewGroupInfo(change.newGroup)" class="force-cursor">View new group</a></div>
+                                                <div><a ng-if="change.changeType =='Update'" ng-click="viewGroupInfo(change.oldGroup)" class="force-cursor">View old group</a></div>
+                                            </td>
+                                            <td>{{change.userName}}</td>
+                                        </tr>
+                                        </tbody>
+
+                                    </table>
+
+                                    <!-- PAGINATION -->
+                                    <div class="dataTables_paginate">
+                                        <ul class="pagination">
+                                            <li class="paginate_button previous">
+                                                <a ng-if="changePrevPageEnabled()" ng-click="changePrevPage()" class="paginate_button">Previous</a>
+                                            </li>
+                                            <li class="paginate_button next">
+                                                <a ng-if="changeNextPageEnabled()" ng-click="changeNextPage()" class="paginate_button">Next</a>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                    <!-- END PAGINATION -->
+
+                                </div>
+                                <div class="panel-footer"></div>
+                            </div>
+                            <!-- END SIMPLE DATATABLE -->
                         </div>
                     </div>
-                    <!-- END SIMPLE DATATABLE -->
-
                 </div>
-            </div>
+                <!-- END VERTICAL TABS -->
 
-        </div>
-        <!-- PAGE CONTENT WRAPPER -->
-</div>
+            </div>
+            <!-- PAGE CONTENT WRAPPER -->
     </div>
-    <!-- END PAGE CONTENT -->
+
+    <form name="viewGroupForm" role="form" class="form-horizontal" novalidate>
+        <modal modal-id="group_modal" modal-title="{{ groupModal.title }}">
+            <modal-body>
+                <modal-element label="Group Name">
+                    <input id="create-group-id-text" type="text" name="groupID" class="form-control"
+                           ng-model="currentGroup.id"
+                           ng-class="groupModal.details.class"
+                           ng-readonly="groupModal.details.readOnly"/>
+                </modal-element>
+
+                <modal-element label="Group Name">
+                    <input id="create-group-name-text" type="text" name="groupName" class="form-control"
+                           ng-model="currentGroup.name"
+                           ng-class="groupModal.details.class"
+                           ng-readonly="groupModal.details.readOnly"/>
+                </modal-element>
+
+                <modal-element label="Group Description">
+                    <input id="create-group-description-text" type="text" name="groupDescription" class="form-control"
+                           ng-model="currentGroup.description"
+                           ng-class="groupModal.details.class"
+                           ng-readonly="groupModal.details.readOnly"/>
+                </modal-element>
+
+                <modal-element label="Email">
+                    <input id="create-group-email-text" type="text"
+                           name="groupEmail"
+                           class="form-control"
+                           ng-model="currentGroup.email"
+                           ng-class="groupModal.details.class"
+                           ng-readonly="groupModal.details.readOnly"/>
+                </modal-element>
+
+                <modal-element label="Group Created">
+                    <input id="create-group-created-text" type="text"
+                           name="groupCreated"
+                           class="form-control"
+                           ng-model="currentGroup.created"
+                           ng-class="groupModal.details.class"
+                           ng-readonly="groupModal.details.readOnly"/>
+                </modal-element>
+
+                <modal-element label="Group Status">
+                    <input id="create-group-status-text" type="text"
+                           name="groupStatus"
+                           class="form-control"
+                           ng-model="currentGroup.status"
+                           ng-class="groupModal.details.class"
+                           ng-readonly="groupModal.details.readOnly"/>
+                </modal-element>
+
+                <modal-element label="Group Members IDs (one per line)">
+                <textarea id="create-group-members-ids-text"
+                          name="groupMembers"
+                          ng-model="currentGroup.memberIds"
+                          rows="5"
+                          class="form-control"
+                          ng-list="&#10;"
+                          ng-trim="false"
+                          ng-class="groupModal.details.class"
+                          ng-readonly="groupModal.details.readOnly">
+                </textarea>
+                </modal-element>
+
+                <modal-element label="Group Admins IDs (one per line)">
+                <textarea id="create-group-admins-ids-text"
+                          name="groupAdmins"
+                          ng-model="currentGroup.adminIds"
+                          rows="5"
+                          class="form-control"
+                          ng-list="&#10;"
+                          ng-trim="false"
+                          ng-class="groupModal.details.class"
+                          ng-readonly="groupModal.details.readOnly">
+                </textarea>
+                </modal-element>
+
+            </modal-body>
+            <modal-footer>
+                <span ng-if="groupModal.action == groupModalState.VIEW_DETAILS">
+                    <button type="button" class="btn btn-default" data-dismiss="modal" ng-click="closeGroupModal()">Close</button>
+                </span>
+            </modal-footer>
+        </modal>
+    </form>
+
+</div>
+<!-- END PAGE CONTENT -->
 }
 
 @plugins = {
diff --git a/modules/portal/conf/routes b/modules/portal/conf/routes
index 643c49919..bf6b6941f 100644
--- a/modules/portal/conf/routes
+++ b/modules/portal/conf/routes
@@ -44,6 +44,7 @@ GET           /api/zones/:id/recordsetchanges    @controllers.VinylDNS.listRecor
 
 GET           /api/groups                        @controllers.VinylDNS.getGroups
 GET           /api/groups/:gid                   @controllers.VinylDNS.getGroup(gid: String)
+GET           /api/groups/:gid/groupchanges           @controllers.VinylDNS.listGroupChanges(gid: String)
 POST          /api/groups                        @controllers.VinylDNS.newGroup
 PUT           /api/groups/:gid                   @controllers.VinylDNS.updateGroup(gid: String)
 DELETE        /api/groups/:gid                   @controllers.VinylDNS.deleteGroup(gid: String)
diff --git a/modules/portal/public/lib/controllers/controller.membership.js b/modules/portal/public/lib/controllers/controller.membership.js
index e827a037e..98e4fbdae 100644
--- a/modules/portal/public/lib/controllers/controller.membership.js
+++ b/modules/portal/public/lib/controllers/controller.membership.js
@@ -14,13 +14,31 @@
  * limitations under the License.
  */
 
-angular.module('controller.membership', []).controller('MembershipController', function ($scope, $log, $location, $timeout,
+angular.module('controller.membership', []).controller('MembershipController', function ($scope, $log, $location, $timeout, pagingService,
                                                                                          groupsService, profileService, utilityService) {
 
     $scope.membership = { members: [], group: {} };
     $scope.membershipLoaded = false;
     $scope.alerts = [];
     $scope.isGroupAdmin = false;
+    $scope.groupChanges = {};
+    $scope.currentGroup = {};
+
+    $scope.groupModalState = {
+        VIEW_DETAILS: 1
+    };
+    $scope.disabledStates = [$scope.groupModalState.VIEW_DETAILS];
+
+    // read-only data for setting various classes/attributes in group modal
+    $scope.groupModalParams = {
+        readOnly: {
+            class: "",
+            readOnly: true
+        }
+    };
+
+    // paging status for group changes
+    var changePaging = pagingService.getNewPagingParams(100);
 
     function handleError(error, type) {
         var alert = utilityService.failure(error, type);
@@ -207,8 +225,113 @@ angular.module('controller.membership', []).controller('MembershipController', f
 
         $scope.resetNewMemberData();
         $scope.getGroupInfo(id);
+        $scope.refreshGroupChanges(id);
     };
 
+    $scope.refreshGroupChanges = function(id) {
+        if(!id){
+            var id = $location.absUrl().toString();
+            id = id.substring(id.lastIndexOf('/') + 1);
+            id = id.substring(0, id.indexOf('#'))
+        }
+        $log.log('refreshGroupChanges, loading group with id ', id);
+        changePaging = pagingService.resetPaging(changePaging);
+        function success(response) {
+            $log.log('groupsService::getGroupChanges-success');
+            changePaging.next = response.data.nextId;
+            updateChangeDisplay(response.data.changes)
+        }
+        return groupsService
+            .getGroupChanges(id, changePaging.maxItems, undefined)
+            .then(success)
+            .catch(function (error){
+                handleError(error, 'groupsService::getGroupChanges-failure');
+            });
+    };
+
+    function updateChangeDisplay(changes) {
+        var newChanges = [];
+        angular.forEach(changes, function(change) {
+            newChanges.push(change);
+        });
+        $scope.groupChanges = newChanges;
+    }
+
+    /**
+     * Group change paging
+     */
+    $scope.getChangePageTitle = function() {
+        return pagingService.getPanelTitle(changePaging);
+    };
+
+    $scope.changePrevPageEnabled = function() {
+        return pagingService.prevPageEnabled(changePaging);
+    };
+
+    $scope.changeNextPageEnabled = function() {
+        return pagingService.nextPageEnabled(changePaging);
+    };
+
+    $scope.changePrevPage = function() {
+        var startFrom = pagingService.getPrevStartFrom(changePaging);
+        var id = $location.absUrl().toString();
+        id = id.substring(id.lastIndexOf('/') + 1);
+        id = id.substring(0, id.indexOf('#'))
+        $log.log('changePrevPage, loading group with id ', id);
+        return groupsService
+            .getGroupChanges(id, changePaging.maxItems, startFrom)
+            .then(function(response) {
+                changePaging = pagingService.prevPageUpdate(response.data.nextId, changePaging);
+                updateChangeDisplay(response.data.changes);
+            })
+            .catch(function (error) {
+                handleError(error, 'groupsService::changePrevPage-failure');
+            });
+    };
+
+    $scope.changeNextPage = function() {
+        var id = $location.absUrl().toString();
+        id = id.substring(id.lastIndexOf('/') + 1);
+        id = id.substring(0, id.indexOf('#'))
+        $log.log('changeNextPage, loading group with id ', id);
+        return groupsService
+            .getGroupChanges(id, changePaging.maxItems, changePaging.next)
+            .then(function(response) {
+                var changes = response.data.changes;
+                changePaging = pagingService.nextPageUpdate(changes, response.data.nextId, changePaging);
+
+                if(changes.length > 0 ){
+                    updateChangeDisplay(changes);
+                }
+            })
+            .catch(function (error) {
+                handleError(error, 'groupsService::changeNextPage-failure');
+            });
+    };
+
+    $scope.viewGroupInfo = function(group) {
+        var newGroup = angular.copy(group);
+        newGroup.adminIds = [];
+        angular.forEach(group.admins, function(admin) {
+            newGroup.adminIds.push(admin.id);
+        });
+        newGroup.memberIds = [];
+        angular.forEach(group.members, function(member) {
+            newGroup.memberIds.push(member.id);
+        });
+        $scope.currentGroup = newGroup;
+        $scope.groupModal = {
+            action: $scope.groupModalState.VIEW_DETAILS,
+            title: "Group Info",
+            basics: $scope.groupModalParams.readOnly,
+            details: $scope.groupModalParams.readOnly,
+        };
+        $("#group_modal").modal("show");
+    };
+
+    $scope.closeGroupModal = function() {
+        $scope.viewGroupForm.$setPristine();
+    };
 
     $timeout($scope.refresh, 0);
 });
diff --git a/modules/portal/public/lib/services/groups/service.groups.js b/modules/portal/public/lib/services/groups/service.groups.js
index 583cf1684..2702a96e0 100644
--- a/modules/portal/public/lib/services/groups/service.groups.js
+++ b/modules/portal/public/lib/services/groups/service.groups.js
@@ -105,6 +105,12 @@ angular.module('service.groups', [])
             return $http.get(url);
         };
 
+        this.getGroupChanges = function (groupId, count, startFrom) {
+            var url = '/api/groups/' + groupId + '/groupchanges';
+            url = this.urlBuilder(url, { 'startFrom': startFrom, 'maxItems': count });
+            return $http.get(url);
+        };
+
         this.getGroupsStored = function () {
             if (_refreshMyGroups || _myGroupsPromise == undefined) {
                 _myGroupsPromise = this.getGroups().then(

From f9ae48d1af5507c97f8525840c4cd00b5d2b7c32 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Wed, 20 Jul 2022 15:33:14 +0530
Subject: [PATCH 060/147] Fix tests

---
 .../api/domain/membership/MembershipService.scala  |  2 +-
 .../tests/membership/get_group_changes_test.py     |  8 ++------
 .../domain/membership/MembershipServiceSpec.scala  | 14 ++++++++++++--
 modules/portal/conf/routes                         |  2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
index 8d2f2e02f..b9f50c1ba 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
@@ -239,7 +239,7 @@ class MembershipService(
         .getGroupChanges(groupId, startFrom, maxItems)
         .toResult[ListGroupChangesResults]
       userIds = result.changes.map(_.userId).toSet
-      users <- userRepo.getUsers(userIds, None, None).map(_.users).toResult[Seq[User]]
+      users <- getUsers(userIds).map(_.users)
       userMap = users.map(u => (u.id, u.userName)).toMap
     } yield ListGroupChangesResponse(
       result.changes.map(change => GroupChangeInfo.apply(change.copy(userName = userMap.get(change.userId)))),
diff --git a/modules/api/src/test/functional/tests/membership/get_group_changes_test.py b/modules/api/src/test/functional/tests/membership/get_group_changes_test.py
index 7c9f4ac5a..fda94f4c6 100644
--- a/modules/api/src/test/functional/tests/membership/get_group_changes_test.py
+++ b/modules/api/src/test/functional/tests/membership/get_group_changes_test.py
@@ -26,16 +26,12 @@ def test_list_group_activity_start_from_success(group_activity_context, shared_z
     # we grab 3 items, which when sorted by most recent will give the 3 most recent items
     page_one = client.get_group_changes(created_group["id"], max_items=3, status=200)
 
-    # our start from will align with the created on the 3rd change in the list
-    start_from_index = 2
-    start_from = page_one["changes"][start_from_index]["created"]  # start from a known good timestamp
-
     # now, we say give me all changes since the start_from, which should yield 8-7-6-5-4
-    result = client.get_group_changes(created_group["id"], start_from=start_from, max_items=5, status=200)
+    result = client.get_group_changes(created_group["id"], start_from=page_one["nextId"], max_items=5, status=200)
 
     assert_that(result["changes"], has_length(5))
     assert_that(result["maxItems"], is_(5))
-    assert_that(result["startFrom"], is_(start_from))
+    assert_that(result["startFrom"], is_(page_one["nextId"]))
     assert_that(result["nextId"], is_not(none()))
 
     # we should have, in order, changes 8 7 6 5 4
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
index 9276f12b1..85059c8fb 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
@@ -724,8 +724,13 @@ class MembershipServiceSpec
           .when(mockGroupChangeRepo)
           .getGroupChanges(anyString, any[Option[String]], anyInt)
 
+        doReturn(IO.pure(ListUsersResults(Seq(dummyUser), Some("1"))))
+          .when(mockUserRepo)
+          .getUsers(any[Set[String]], any[Option[String]], any[Option[Int]])
+
+        val userMap = Seq(dummyUser).map(u => (u.id, u.userName)).toMap
         val expected: List[GroupChangeInfo] =
-          listOfDummyGroupChanges.map(GroupChangeInfo.apply).take(100)
+          listOfDummyGroupChanges.map(change => GroupChangeInfo.apply(change.copy(userName = userMap.get(change.userId)))).take(100)
 
         val result: ListGroupChangesResponse =
           rightResultOf(underTest.getGroupActivity(dummyGroup.id, None, 100, dummyAuth).value)
@@ -744,8 +749,13 @@ class MembershipServiceSpec
         .when(mockGroupChangeRepo)
         .getGroupChanges(anyString, any[Option[String]], anyInt)
 
+      doReturn(IO.pure(ListUsersResults(Seq(dummyUser), Some("1"))))
+        .when(mockUserRepo)
+        .getUsers(any[Set[String]], any[Option[String]], any[Option[Int]])
+
+      val userMap = Seq(dummyUser).map(u => (u.id, u.userName)).toMap
       val expected: List[GroupChangeInfo] =
-        listOfDummyGroupChanges.map(GroupChangeInfo.apply).take(100)
+        listOfDummyGroupChanges.map(change => GroupChangeInfo.apply(change.copy(userName = userMap.get(change.userId)))).take(100)
 
       val result: ListGroupChangesResponse =
         rightResultOf(underTest.getGroupActivity(dummyGroup.id, None, 100, okAuth).value)
diff --git a/modules/portal/conf/routes b/modules/portal/conf/routes
index bf6b6941f..714bccc42 100644
--- a/modules/portal/conf/routes
+++ b/modules/portal/conf/routes
@@ -44,7 +44,7 @@ GET           /api/zones/:id/recordsetchanges    @controllers.VinylDNS.listRecor
 
 GET           /api/groups                        @controllers.VinylDNS.getGroups
 GET           /api/groups/:gid                   @controllers.VinylDNS.getGroup(gid: String)
-GET           /api/groups/:gid/groupchanges           @controllers.VinylDNS.listGroupChanges(gid: String)
+GET           /api/groups/:gid/groupchanges      @controllers.VinylDNS.listGroupChanges(gid: String)
 POST          /api/groups                        @controllers.VinylDNS.newGroup
 PUT           /api/groups/:gid                   @controllers.VinylDNS.updateGroup(gid: String)
 DELETE        /api/groups/:gid                   @controllers.VinylDNS.deleteGroup(gid: String)

From 2ac219f4a10218c7b6a5a32265772a838a833e71 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Wed, 20 Jul 2022 16:33:43 +0530
Subject: [PATCH 061/147] Fix portal tests

---
 .../controllers/controller.membership.spec.js | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/modules/portal/public/lib/controllers/controller.membership.spec.js b/modules/portal/public/lib/controllers/controller.membership.spec.js
index 17b06c207..0ac63f872 100644
--- a/modules/portal/public/lib/controllers/controller.membership.spec.js
+++ b/modules/portal/public/lib/controllers/controller.membership.spec.js
@@ -20,14 +20,16 @@ describe('Controller: MembershipController', function () {
         module('service.groups'),
         module('service.profile'),
         module('service.utility'),
+        module('service.paging'),
         module('controller.membership')
     });
-    beforeEach(inject(function ($rootScope, $controller, $q, groupsService, profileService, utilityService) {
+    beforeEach(inject(function ($rootScope, $controller, $q, groupsService, profileService, utilityService, pagingService) {
         this.rootScope = $rootScope;
         this.scope = $rootScope.$new();
         this.groupsService = groupsService;
         this.profileService = profileService;
         this.utilityService = utilityService;
+        this.pagingService = pagingService;
         this.q = $q;
         var mockGroup = {
             data: {
@@ -110,7 +112,8 @@ describe('Controller: MembershipController', function () {
         expect(profileService.calls.count()).toBe(1);
         expect(updateGroup.calls.count()).toBe(1);
         expect(this.utilitySuccess.calls.count()).toBe(1);
-        expect(this.scope.alerts).toEqual([this.mockSuccessAlert]);
+        expect(this.scope.alerts[0]).toEqual(this.mockSuccessAlert);
+        expect(this.scope.alerts[1]).toEqual(this.mockFailureAlert);
     });
 
     it('addMember correctly calls utilityService when failing getUserDataByUsername', function(){
@@ -151,9 +154,10 @@ describe('Controller: MembershipController', function () {
         this.scope.$digest();
 
         expect(profileService.calls.count()).toBe(1);
-        expect(this.utilityFailure.calls.count()).toBe(1);
+        expect(this.utilityFailure.calls.count()).toBe(2);
         expect(updateGroup.calls.count()).toBe(1);
-        expect(this.scope.alerts).toEqual([this.mockFailureAlert]);
+        expect(this.scope.alerts[0]).toEqual(this.mockFailureAlert);
+        expect(this.scope.alerts[1]).toEqual(this.mockFailureAlert);
     });
 
     it('removeMember correctly calls utilityService when passing updateGroup', function(){
@@ -177,7 +181,8 @@ describe('Controller: MembershipController', function () {
 
         expect(this.utilitySuccess.calls.count()).toBe(1);
         expect(updateGroup.calls.count()).toBe(1);
-        expect(this.scope.alerts).toEqual([this.mockSuccessAlert]);
+        expect(this.scope.alerts[0]).toEqual(this.mockSuccessAlert);
+        expect(this.scope.alerts[1]).toEqual(this.mockFailureAlert);
     });
 
     it('removeMember correctly calls utilityService when failing updateGroup', function(){
@@ -199,9 +204,10 @@ describe('Controller: MembershipController', function () {
         this.scope.removeMember('memberId');
         this.scope.$digest();
 
-        expect(this.utilityFailure.calls.count()).toBe(1);
+        expect(this.utilityFailure.calls.count()).toBe(2);
         expect(updateGroup.calls.count()).toBe(1);
-        expect(this.scope.alerts).toEqual([this.mockFailureAlert]);
+        expect(this.scope.alerts[0]).toEqual(this.mockFailureAlert);
+        expect(this.scope.alerts[1]).toEqual(this.mockFailureAlert);
     });
 
     it('removeMember correctly calls utilityService when passing updateGroup', function(){
@@ -229,7 +235,8 @@ describe('Controller: MembershipController', function () {
 
         expect(this.utilitySuccess.calls.count()).toBe(1);
         expect(updateGroup.calls.count()).toBe(1);
-        expect(this.scope.alerts).toEqual([this.mockSuccessAlert]);
+        expect(this.scope.alerts[0]).toEqual(this.mockSuccessAlert);
+        expect(this.scope.alerts[1]).toEqual(this.mockFailureAlert);
     });
 
     it('removeMember correctly calls utilityService when failing updateGroup', function(){
@@ -255,9 +262,10 @@ describe('Controller: MembershipController', function () {
         this.scope.toggleAdmin(mockMember);
         this.scope.$digest();
 
-        expect(this.utilityFailure.calls.count()).toBe(1);
+        expect(this.utilityFailure.calls.count()).toBe(2);
         expect(updateGroup.calls.count()).toBe(1);
-        expect(this.scope.alerts).toEqual([this.mockFailureAlert]);
+        expect(this.scope.alerts[0]).toEqual(this.mockFailureAlert);
+        expect(this.scope.alerts[1]).toEqual(this.mockFailureAlert);
     });
 
     it('refresh correctly handles error when failing getGroup', function() {
@@ -269,7 +277,7 @@ describe('Controller: MembershipController', function () {
         this.scope.$digest();
 
         expect(getGroup.calls.count()).toBe(1);
-        expect(this.utilityFailure.calls.count()).toBe(1);
+        expect(this.utilityFailure.calls.count()).toBe(2);
     });
 
     it('refresh correctly handles error when failing getGroupMemberList', function() {
@@ -281,7 +289,7 @@ describe('Controller: MembershipController', function () {
         this.scope.$digest();
 
         expect(getGroupMemberList.calls.count()).toBe(1);
-        expect(this.utilityFailure.calls.count()).toBe(1);
+        expect(this.utilityFailure.calls.count()).toBe(2);
     });
 
     it('getGroupInfo sets the group info, admin status when the user is an admin', function() {

From ce870db0628a47f91d672819a3e7b64c7245178d Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Thu, 21 Jul 2022 10:29:03 +0530
Subject: [PATCH 062/147] Add tests for pagination

---
 .../controllers/controller.membership.spec.js | 172 ++++++++++++++++--
 1 file changed, 161 insertions(+), 11 deletions(-)

diff --git a/modules/portal/public/lib/controllers/controller.membership.spec.js b/modules/portal/public/lib/controllers/controller.membership.spec.js
index 0ac63f872..50e9dfe1f 100644
--- a/modules/portal/public/lib/controllers/controller.membership.spec.js
+++ b/modules/portal/public/lib/controllers/controller.membership.spec.js
@@ -70,6 +70,47 @@ describe('Controller: MembershipController', function () {
         this.groupsService.getGroupMemberList = function() {
             return $q.when(mockGroupList);
         };
+
+        this.groupsService.getGroupChanges = function () {
+            return $q.when({
+                data: {
+                    changes: [
+                        {
+                            newGroup: {
+                                id: "f9329f39-595d-45c9-8cdf-ac36e96e085d",
+                                name: "test-group",
+                                email: "test@test.com",
+                                created: "2022-07-20T10:14:49Z",
+                                status: "Active",
+                                members: [
+                                    {
+                                        id: "ea7ec24e-3cc2-4740-b1b8-acde0158271f"
+                                    },
+                                    {
+                                        id: "5bda099e-be26-4aac-a310-ecf221ee2451"
+                                    }
+                                ],
+                                admins: [
+                                    {
+                                        id: "ea7ec24e-3cc2-4740-b1b8-acde0158271f"
+                                    },
+                                    {
+                                        id: "5bda099e-be26-4aac-a310-ecf221ee2451"
+                                    }
+                                ]
+                            },
+                            changeType: "Delete",
+                            userId: "ea7ec24e-3cc2-4740-b1b8-acde0158271f",
+                            id: "13516a79-1c61-4b9d-b442-0a773fc9c99f",
+                            created: "2022-07-20T10:24:28Z",
+                            userName: "professor"
+                        }
+                    ],
+                    maxItems: 100
+                }
+            });
+        };
+
         this.controller = $controller('MembershipController', {'$scope': this.scope});
 
         this.mockSuccessAlert = "success";
@@ -113,7 +154,6 @@ describe('Controller: MembershipController', function () {
         expect(updateGroup.calls.count()).toBe(1);
         expect(this.utilitySuccess.calls.count()).toBe(1);
         expect(this.scope.alerts[0]).toEqual(this.mockSuccessAlert);
-        expect(this.scope.alerts[1]).toEqual(this.mockFailureAlert);
     });
 
     it('addMember correctly calls utilityService when failing getUserDataByUsername', function(){
@@ -154,10 +194,9 @@ describe('Controller: MembershipController', function () {
         this.scope.$digest();
 
         expect(profileService.calls.count()).toBe(1);
-        expect(this.utilityFailure.calls.count()).toBe(2);
+        expect(this.utilityFailure.calls.count()).toBe(1);
         expect(updateGroup.calls.count()).toBe(1);
         expect(this.scope.alerts[0]).toEqual(this.mockFailureAlert);
-        expect(this.scope.alerts[1]).toEqual(this.mockFailureAlert);
     });
 
     it('removeMember correctly calls utilityService when passing updateGroup', function(){
@@ -182,7 +221,6 @@ describe('Controller: MembershipController', function () {
         expect(this.utilitySuccess.calls.count()).toBe(1);
         expect(updateGroup.calls.count()).toBe(1);
         expect(this.scope.alerts[0]).toEqual(this.mockSuccessAlert);
-        expect(this.scope.alerts[1]).toEqual(this.mockFailureAlert);
     });
 
     it('removeMember correctly calls utilityService when failing updateGroup', function(){
@@ -204,10 +242,9 @@ describe('Controller: MembershipController', function () {
         this.scope.removeMember('memberId');
         this.scope.$digest();
 
-        expect(this.utilityFailure.calls.count()).toBe(2);
+        expect(this.utilityFailure.calls.count()).toBe(1);
         expect(updateGroup.calls.count()).toBe(1);
         expect(this.scope.alerts[0]).toEqual(this.mockFailureAlert);
-        expect(this.scope.alerts[1]).toEqual(this.mockFailureAlert);
     });
 
     it('removeMember correctly calls utilityService when passing updateGroup', function(){
@@ -236,7 +273,6 @@ describe('Controller: MembershipController', function () {
         expect(this.utilitySuccess.calls.count()).toBe(1);
         expect(updateGroup.calls.count()).toBe(1);
         expect(this.scope.alerts[0]).toEqual(this.mockSuccessAlert);
-        expect(this.scope.alerts[1]).toEqual(this.mockFailureAlert);
     });
 
     it('removeMember correctly calls utilityService when failing updateGroup', function(){
@@ -262,10 +298,9 @@ describe('Controller: MembershipController', function () {
         this.scope.toggleAdmin(mockMember);
         this.scope.$digest();
 
-        expect(this.utilityFailure.calls.count()).toBe(2);
+        expect(this.utilityFailure.calls.count()).toBe(1);
         expect(updateGroup.calls.count()).toBe(1);
         expect(this.scope.alerts[0]).toEqual(this.mockFailureAlert);
-        expect(this.scope.alerts[1]).toEqual(this.mockFailureAlert);
     });
 
     it('refresh correctly handles error when failing getGroup', function() {
@@ -277,7 +312,7 @@ describe('Controller: MembershipController', function () {
         this.scope.$digest();
 
         expect(getGroup.calls.count()).toBe(1);
-        expect(this.utilityFailure.calls.count()).toBe(2);
+        expect(this.utilityFailure.calls.count()).toBe(1);
     });
 
     it('refresh correctly handles error when failing getGroupMemberList', function() {
@@ -289,7 +324,7 @@ describe('Controller: MembershipController', function () {
         this.scope.$digest();
 
         expect(getGroupMemberList.calls.count()).toBe(1);
-        expect(this.utilityFailure.calls.count()).toBe(2);
+        expect(this.utilityFailure.calls.count()).toBe(1);
     });
 
     it('getGroupInfo sets the group info, admin status when the user is an admin', function() {
@@ -409,4 +444,119 @@ describe('Controller: MembershipController', function () {
         expect(this.scope.membership.members).toEqual(expectedMembership);
         expect(this.scope.isGroupAdmin).toBe(true);
     });
+
+    it('nextPage should call getGroupChanges with the correct parameters', function () {
+
+        var response = {
+            data: {
+                changes: [
+                    {
+                        newGroup: {
+                            id: "f9329f39-595d-45c9-8cdf-ac36e96e085d",
+                            name: "test-group",
+                            email: "test@test.com",
+                            created: "2022-07-20T10:14:49Z",
+                            status: "Active",
+                            members: [
+                                {
+                                    id: "ea7ec24e-3cc2-4740-b1b8-acde0158271f"
+                                },
+                                {
+                                    id: "5bda099e-be26-4aac-a310-ecf221ee2451"
+                                }
+                            ],
+                            admins: [
+                                {
+                                    id: "ea7ec24e-3cc2-4740-b1b8-acde0158271f"
+                                },
+                                {
+                                    id: "5bda099e-be26-4aac-a310-ecf221ee2451"
+                                }
+                            ]
+                        },
+                        changeType: "Delete",
+                        userId: "ea7ec24e-3cc2-4740-b1b8-acde0158271f",
+                        id: "13516a79-1c61-4b9d-b442-0a773fc9c99f",
+                        created: "2022-07-20T10:24:28Z",
+                        userName: "professor"
+                    }
+                ],
+                maxItems: 100
+            }
+        };
+        var getGroupChangesSets = spyOn(this.groupsService, 'getGroupChanges')
+            .and.stub()
+            .and.returnValue(this.q.when(response));
+
+        var expectedId = "";
+        var expectedMaxItems = 100;
+        var expectedStartFrom = undefined;
+
+        this.scope.changeNextPage();
+
+        expect(getGroupChangesSets.calls.count()).toBe(1);
+        expect(getGroupChangesSets.calls.mostRecent().args).toEqual(
+          [expectedId, expectedMaxItems, expectedStartFrom]);
+    });
+
+    it('prevPage should call getGroupChanges with the correct parameters', function () {
+
+        var response = {
+            data: {
+                changes: [
+                    {
+                        newGroup: {
+                            id: "f9329f39-595d-45c9-8cdf-ac36e96e085d",
+                            name: "test-group",
+                            email: "test@test.com",
+                            created: "2022-07-20T10:14:49Z",
+                            status: "Active",
+                            members: [
+                                {
+                                    id: "ea7ec24e-3cc2-4740-b1b8-acde0158271f"
+                                },
+                                {
+                                    id: "5bda099e-be26-4aac-a310-ecf221ee2451"
+                                }
+                            ],
+                            admins: [
+                                {
+                                    id: "ea7ec24e-3cc2-4740-b1b8-acde0158271f"
+                                },
+                                {
+                                    id: "5bda099e-be26-4aac-a310-ecf221ee2451"
+                                }
+                            ]
+                        },
+                        changeType: "Delete",
+                        userId: "ea7ec24e-3cc2-4740-b1b8-acde0158271f",
+                        id: "13516a79-1c61-4b9d-b442-0a773fc9c99f",
+                        created: "2022-07-20T10:24:28Z",
+                        userName: "professor"
+                    }
+                ],
+                maxItems: 100
+            }
+        };
+        var getGroupChangesSets = spyOn(this.groupsService, 'getGroupChanges')
+            .and.stub()
+            .and.returnValue(this.q.when(response));
+
+        var expectedId = "";
+        var expectedMaxItems = 100;
+        var expectedStartFrom = undefined;
+
+        this.scope.changePrevPage();
+
+        expect(getGroupChangesSets.calls.count()).toBe(1);
+        expect(getGroupChangesSets.calls.mostRecent().args).toEqual(
+            [expectedId, expectedMaxItems, expectedStartFrom]);
+
+        this.scope.changeNextPage();
+        this.scope.changePrevPage();
+
+        expect(getGroupChangesSets.calls.count()).toBe(3);
+        expect(getGroupChangesSets.calls.mostRecent().args).toEqual(
+            [expectedId, expectedMaxItems, expectedStartFrom]);
+    });
 });

From 03155cc376c7719d671e250934cea0af44ab9a51 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Thu, 21 Jul 2022 10:49:04 +0530
Subject: [PATCH 063/147] Add tests for group change data

---
 .../controllers/controller.membership.spec.js | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/modules/portal/public/lib/controllers/controller.membership.spec.js b/modules/portal/public/lib/controllers/controller.membership.spec.js
index 50e9dfe1f..4287973de 100644
--- a/modules/portal/public/lib/controllers/controller.membership.spec.js
+++ b/modules/portal/public/lib/controllers/controller.membership.spec.js
@@ -445,6 +445,56 @@ describe('Controller: MembershipController', function () {
         expect(this.scope.isGroupAdmin).toBe(true);
     });
 
+    it('test that we properly get group change data', function(){
+        this.scope.groupChanges = {};
+        var response = {
+            data: {
+                changes: [
+                    {
+                        newGroup: {
+                            id: "f9329f39-595d-45c9-8cdf-ac36e96e085d",
+                            name: "test-group",
+                            email: "test@test.com",
+                            created: "2022-07-20T10:14:49Z",
+                            status: "Active",
+                            members: [
+                                {
+                                    id: "ea7ec24e-3cc2-4740-b1b8-acde0158271f"
+                                },
+                                {
+                                    id: "5bda099e-be26-4aac-a310-ecf221ee2451"
+                                }
+                            ],
+                            admins: [
+                                {
+                                    id: "ea7ec24e-3cc2-4740-b1b8-acde0158271f"
+                                },
+                                {
+                                    id: "5bda099e-be26-4aac-a310-ecf221ee2451"
+                                }
+                            ]
+                        },
+                        changeType: "Delete",
+                        userId: "ea7ec24e-3cc2-4740-b1b8-acde0158271f",
+                        id: "13516a79-1c61-4b9d-b442-0a773fc9c99f",
+                        created: "2022-07-20T10:24:28Z",
+                        userName: "professor"
+                    }
+                ],
+                maxItems: 100
+            }
+        };
+        var getGroupChangesSets = spyOn(this.groupsService, 'getGroupChanges')
+            .and.stub()
+            .and.returnValue(this.q.when(response));
+
+        this.scope.refresh();
+        this.scope.$digest();
+
+        expect(getGroupChangesSets.calls.count()).toBe(1);
+        expect(this.scope.groupChanges).toEqual(response.data.changes);
+    });
+
     it('nextPage should call getGroupChanges with the correct parameters', function () {
 
         var response = {

From c28d5856cf6817df01c2b3bdd8c6b04061bf8187 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Thu, 21 Jul 2022 11:02:33 +0530
Subject: [PATCH 064/147] Add test

---
 .../test/controllers/VinylDNSSpec.scala       | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/modules/portal/test/controllers/VinylDNSSpec.scala b/modules/portal/test/controllers/VinylDNSSpec.scala
index 58ba4a6cf..d4bace632 100644
--- a/modules/portal/test/controllers/VinylDNSSpec.scala
+++ b/modules/portal/test/controllers/VinylDNSSpec.scala
@@ -800,6 +800,37 @@ class VinylDNSSpec extends Specification with Mockito with TestApplicationData w
       }
     }
 
+    ".listGroupChanges" should {
+      "return unauthorized (401) if requesting user is not logged in" in new WithApplication(app) {
+        val client = mock[WSClient]
+        val underTest = withClient(client)
+        val result =
+          underTest.listGroupChanges(hobbitGroupId)(
+            FakeRequest(GET, s"/api/groups/$hobbitGroupId/activity")
+          )
+
+        status(result) mustEqual 401
+        hasCacheHeaders(result)
+        contentAsString(result) must beEqualTo("You are not logged in. Please login to continue.")
+      }
+      "return forbidden (403) if user account is locked" in new WithApplication(app) {
+        val client = mock[WSClient]
+        val underTest = withLockedClient(client)
+        val result = underTest.listGroupChanges(hobbitGroupId)(
+          FakeRequest(GET, s"/api/groups/$hobbitGroupId/activity").withSession(
+            "username" -> lockedFrodoUser.userName,
+            "accessKey" -> lockedFrodoUser.accessKey
+          )
+        )
+
+        status(result) mustEqual 403
+        hasCacheHeaders(result)
+        contentAsString(result) must beEqualTo(
+          s"User account for `${lockedFrodoUser.userName}` is locked."
+        )
+      }
+    }
+
     ".deleteGroup" should {
       "return ok with no content (204) when delete is successful" in new WithApplication(app) {
         val client = MockWS {

From c88a892ef3c98348f1fb4601e1375d14570c9aec Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Thu, 21 Jul 2022 16:03:20 +0530
Subject: [PATCH 065/147] Add group changes info

---
 .../app/views/groups/groupDetail.scala.html   | 20 ++++--
 .../lib/controllers/controller.membership.js  | 66 ++++++++++++++++++-
 2 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/modules/portal/app/views/groups/groupDetail.scala.html b/modules/portal/app/views/groups/groupDetail.scala.html
index bed494780..874a24132 100644
--- a/modules/portal/app/views/groups/groupDetail.scala.html
+++ b/modules/portal/app/views/groups/groupDetail.scala.html
@@ -150,10 +150,10 @@
                                             <td>{{change.id}}</td>
                                             <td>{{change.changeType}}</td>
                                             <td class="col-md-3 wrap-long-text">
-                                                <a ng-if="change.changeType =='Create'" ng-click="viewGroupInfo(change.newGroup)" class="force-cursor">View created group</a>
+                                                <a ng-if="change.changeType =='Create'" ng-click="viewCreatedOrOldGroupInfo(change.newGroup)" class="force-cursor">View created group</a>
 
-                                                <div><a ng-if="change.changeType =='Update'" ng-click="viewGroupInfo(change.newGroup)" class="force-cursor">View new group</a></div>
-                                                <div><a ng-if="change.changeType =='Update'" ng-click="viewGroupInfo(change.oldGroup)" class="force-cursor">View old group</a></div>
+                                                <div><a ng-if="change.changeType =='Update'" ng-click="viewNewGroupInfo(change.newGroup, change.oldGroup)" class="force-cursor">View new group</a></div>
+                                                <div><a ng-if="change.changeType =='Update'" ng-click="viewCreatedOrOldGroupInfo(change.oldGroup)" class="force-cursor">View old group</a></div>
                                             </td>
                                             <td>{{change.userName}}</td>
                                         </tr>
@@ -190,7 +190,19 @@
     <form name="viewGroupForm" role="form" class="form-horizontal" novalidate>
         <modal modal-id="group_modal" modal-title="{{ groupModal.title }}">
             <modal-body>
-                <modal-element label="Group Name">
+                <modal-element ng-if="isCreatedOrNew" label="Group Changes Made">
+                <textarea id="create-group-change-text"
+                          name="groupChangeMessage"
+                          ng-model="currentGroup.changeMessage"
+                          rows="5"
+                          class="form-control"
+                          ng-trim="false"
+                          ng-class="groupModal.details.class"
+                          ng-readonly="groupModal.details.readOnly">
+                </textarea>
+                </modal-element>
+
+                <modal-element label="Group ID">
                     <input id="create-group-id-text" type="text" name="groupID" class="form-control"
                            ng-model="currentGroup.id"
                            ng-class="groupModal.details.class"
diff --git a/modules/portal/public/lib/controllers/controller.membership.js b/modules/portal/public/lib/controllers/controller.membership.js
index 98e4fbdae..397d3852b 100644
--- a/modules/portal/public/lib/controllers/controller.membership.js
+++ b/modules/portal/public/lib/controllers/controller.membership.js
@@ -23,6 +23,7 @@ angular.module('controller.membership', []).controller('MembershipController', f
     $scope.isGroupAdmin = false;
     $scope.groupChanges = {};
     $scope.currentGroup = {};
+    $scope.isCreatedOrNew = false;
 
     $scope.groupModalState = {
         VIEW_DETAILS: 1
@@ -309,7 +310,56 @@ angular.module('controller.membership', []).controller('MembershipController', f
             });
     };
 
-    $scope.viewGroupInfo = function(group) {
+    function determineGroupDifference(newGroup, oldGroup) {
+        var newGroupData = angular.copy(newGroup);
+        var changeMessage = "";
+        if(oldGroup.name !== newGroup.name){
+            changeMessage += "Group name changed to '" + newGroup.name + "'.";
+        }
+        if(oldGroup.email !== newGroup.email){
+            changeMessage += "Group email changed to '" + newGroup.email + "'.";
+        }
+        if(oldGroup.description !== newGroup.description){
+            changeMessage += "Group description changed to '" + newGroup.description + "'.";
+        }
+        oldGroup.adminIds = [];
+        angular.forEach(oldGroup.admins, function(admin) {
+            oldGroup.adminIds.push(admin.id);
+        });
+        newGroupData.adminIds = [];
+        angular.forEach(newGroup.admins, function(admin) {
+            newGroupData.adminIds.push(admin.id);
+        });
+        var adminAddDifference = newGroupData.adminIds.filter(x => !oldGroup.adminIds.includes(x));
+        if(adminAddDifference.length !== 0){
+            changeMessage += "Group admin/s with userId/s (" + adminAddDifference + ") added.";
+        }
+        var adminRemoveDifference = oldGroup.adminIds.filter(x => !newGroupData.adminIds.includes(x));
+        if(adminRemoveDifference.length !== 0){
+            changeMessage += "Group admin/s with userId/s (" + adminRemoveDifference + ") removed.";
+        }
+        oldGroup.memberIds = [];
+        angular.forEach(oldGroup.members, function(member) {
+            oldGroup.memberIds.push(member.id);
+        });
+        newGroupData.memberIds = [];
+        angular.forEach(newGroup.members, function(member) {
+            newGroupData.memberIds.push(member.id);
+        });
+        var memberAddDifference = newGroupData.memberIds.filter(x => !oldGroup.memberIds.includes(x));
+        if(memberAddDifference.length !== 0){
+            changeMessage += "Group member/s with userId/s (" + memberAddDifference + ") added.";
+        }
+        var memberRemoveDifference = oldGroup.memberIds.filter(x => !newGroupData.memberIds.includes(x));
+        if(memberRemoveDifference.length !== 0){
+            changeMessage += "Group member/s with userId/s (" + memberRemoveDifference + ") removed.";
+        }
+        newGroupData.changeMessage = changeMessage;
+        return newGroupData;
+    }
+
+    $scope.viewCreatedOrOldGroupInfo = function(group) {
+        $scope.isCreatedOrNew = false;
         var newGroup = angular.copy(group);
         newGroup.adminIds = [];
         angular.forEach(group.admins, function(admin) {
@@ -322,7 +372,19 @@ angular.module('controller.membership', []).controller('MembershipController', f
         $scope.currentGroup = newGroup;
         $scope.groupModal = {
             action: $scope.groupModalState.VIEW_DETAILS,
-            title: "Group Info",
+            title: "Created/Old Group Info",
+            basics: $scope.groupModalParams.readOnly,
+            details: $scope.groupModalParams.readOnly,
+        };
+        $("#group_modal").modal("show");
+    };
+
+    $scope.viewNewGroupInfo = function(newGroup, oldGroup) {
+        $scope.isCreatedOrNew = true;
+        $scope.currentGroup = determineGroupDifference(newGroup, oldGroup);
+        $scope.groupModal = {
+            action: $scope.groupModalState.VIEW_DETAILS,
+            title: "New Group Info",
             basics: $scope.groupModalParams.readOnly,
             details: $scope.groupModalParams.readOnly,
         };

From 94c16361b1c823fb090c734f29df5acac0de5692 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Fri, 22 Jul 2022 10:14:58 +0530
Subject: [PATCH 066/147] Add Zone history tab in zones page

---
 modules/portal/app/controllers/VinylDNS.scala |   9 ++
 .../app/views/zones/zoneDetail.scala.html     |   6 +-
 .../zoneTabs/zoneChangeHistory.scala.html     | 145 ++++++++++++++++++
 modules/portal/conf/routes                    |   1 +
 .../lib/controllers/controller.manageZones.js |  83 ++++++++++
 .../lib/services/profile/service.profile.js   |   4 +
 .../lib/services/zones/service.zones.js       |   5 +
 7 files changed, 252 insertions(+), 1 deletion(-)
 create mode 100644 modules/portal/app/views/zones/zoneTabs/zoneChangeHistory.scala.html

diff --git a/modules/portal/app/controllers/VinylDNS.scala b/modules/portal/app/controllers/VinylDNS.scala
index 8e8908252..b592e814a 100644
--- a/modules/portal/app/controllers/VinylDNS.scala
+++ b/modules/portal/app/controllers/VinylDNS.scala
@@ -431,6 +431,15 @@ class VinylDNS @Inject() (
     })
   }
 
+  def getZoneChange(id: String): Action[AnyContent] = userAction.async { implicit request =>
+    val vinyldnsRequest =
+      new VinylDNSRequest("GET", s"$vinyldnsServiceBackend", s"zones/$id/changes")
+    executeRequest(vinyldnsRequest, request.user).map(response => {
+      Status(response.status)(response.body)
+        .withHeaders(cacheHeaders: _*)
+    })
+  }
+
   def syncZone(id: String): Action[AnyContent] = userAction.async { implicit request =>
     // $COVERAGE-OFF$
     val vinyldnsRequest =
diff --git a/modules/portal/app/views/zones/zoneDetail.scala.html b/modules/portal/app/views/zones/zoneDetail.scala.html
index dc8b06c33..00663da8a 100644
--- a/modules/portal/app/views/zones/zoneDetail.scala.html
+++ b/modules/portal/app/views/zones/zoneDetail.scala.html
@@ -41,7 +41,8 @@
                 <ul class="nav nav-tabs bar_tabs">
                     <li class="active"><a href="#tab1" data-toggle="tab">Manage Records</a></li>
                     <li><a id="tab2-button" href="#tab2" data-toggle="tab">Manage Zone</a></li>
-                    <li><a href="#tab3" data-toggle="tab">Change History</a></li>
+                    <li><a href="#tab3" data-toggle="tab">Record Change History</a></li>
+                    <li><a href="#tab4" data-toggle="tab">Zone Change History</a></li>
                 </ul>
                 <div class="panel-body tab-content">
 
@@ -54,6 +55,9 @@
                     <div class="tab-pane" id="tab3">
                         @changeHistory(request)
                     </div>
+                    <div class="tab-pane" id="tab4" ng-controller="ManageZonesController">
+                        @zoneChangeHistory(request)
+                    </div>
                 </div>
             </div>
             <!-- END VERTICAL TABS -->
diff --git a/modules/portal/app/views/zones/zoneTabs/zoneChangeHistory.scala.html b/modules/portal/app/views/zones/zoneTabs/zoneChangeHistory.scala.html
new file mode 100644
index 000000000..9c87d8b7e
--- /dev/null
+++ b/modules/portal/app/views/zones/zoneTabs/zoneChangeHistory.scala.html
@@ -0,0 +1,145 @@
+@(implicit request: play.api.mvc.Request[Any])
+
+<!-- START SIMPLE DATATABLE -->
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">Zone Change History</h3>
+    </div>
+    <div class="panel-body">
+        <div class="btn-group">
+            <button class="btn btn-default" ng-click="refreshZoneChange()"><span class="fa fa-refresh"></span> Refresh</button>
+        </div>
+
+
+        <table id="zoneChangeDataTable" class="table table-hover table-striped">
+            <thead>
+                <tr>
+                    <th>User name</th>
+                    <th>Email</th>
+                    <th>Access</th>
+                    <th>Created</th>
+                    <th>Updated</th>
+                    <th>Change type</th>
+                    <th>ACL</th>
+                    <th>Admin group</th>
+
+                </tr>
+            </thead>
+            <tbody>
+                <tr  ng-repeat="zoneChange in allZonesChange track by $index">
+                    <td>{{ zoneChange.userName }}</td>
+                    <td>{{ zoneChange.zone.email }}</td>
+                    <td>{{zoneChange.zone.shared ? "Shared" : "Private"}}</td>
+                    <td>{{zoneChange.zone.created}}</td>
+                    <td>{{zoneChange.zone.updated}}</td>
+                    <td>{{ zoneChange.changeType }}</td>
+                    <td>
+                        <a href="#aclModal"
+                           ng-if="zoneChange.zone.acl.rules.length != 0"
+                           ng-click="refreshAclRule($index)"
+                           data-toggle="modal"> ACL Rules
+                        </a>
+                    </td>
+                    <td><a>{{zoneChange.zone.adminGroupName}}</a></td>
+                </tr>
+            </tbody>
+        </table>
+
+
+    </div>
+        <!-- PAGINATION -->
+        <div class="dataTables_paginate">
+            <ul class="pagination">
+                <li class="paginate_button previous">
+                    <a ng-if="changePrevPageEnabled()" ng-click="changePrevPage()" class="paginate_button">Previous</a>
+                </li>
+                <li class="paginate_button next">
+                    <a ng-if="changeNextPageEnabled()" ng-click="changeNextPage()" class="paginate_button">Next</a>
+                </li>
+            </ul>
+        </div>
+        <!-- END PAGINATION -->
+</div>
+<div class="panel-footer"></div>
+    <!-- END SIMPLE DATATABLE -->
+
+    <!-- THE ACL RULE MODAL STARTS -->
+<div class="modal" id="aclModal">
+    <div class="modal-dialog">
+        <div class="modal-content">
+
+            <!-- Modal Header -->
+            <div class="modal-header">
+                <h4 class="modal-title">Zone Access Rules</h4>
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+            </div>
+
+            <!-- Modal body -->
+            <div class="modal-body">
+                <div class="btn-group">
+                    <button id="refresh-acl-rules-button" class="btn btn-default" ng-click="refreshAclRule()">
+                        <span class="fa fa-refresh"></span> Refresh
+                    </button>
+                </div>
+
+                <table id="aclRuleTable" class="table table-hover table-striped">
+                    <thead>
+                    <tr>
+                        <th>User/Group</th>
+                        <th>Access Level</th>
+                        <th>Record Types</th>
+                        <th>Record Mask</th>
+                        <th>Description</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr  ng-repeat="rule in allAclRules track by $index">
+                        <td class="wrap-long-text">
+                            <a ng-if="rule.groupId != undefined" href="/groups/{{rule.groupId}}">
+                                {{rule.groupName}}
+                            </a>
+                            <span ng-if="rule.groupId == undefined">
+                                {{rule.userName}}
+                            </span>
+                        </td>
+
+                        <td>
+                            {{rule.accessLevel}}
+                        </td>
+
+                        <td>
+                            <span ng-if="rule.recordTypes.length == 0">All Types</span>
+                            <ul class="table-cell-list">
+                                <li ng-repeat="item in rule.recordTypes">
+                                    {{item}}
+                                </li>
+                            </ul>
+                        </td>
+
+                        <td class="wrap-long-text">
+                            {{rule.recordMask}}
+                        </td>
+
+                        <td class="wrap-long-text">
+                            {{rule.description}}
+                        </td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+
+            <!-- Modal footer -->
+            <div class="modal-footer">
+                <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+            </div>
+
+        </div>
+    </div>
+</div>
+<!-- THE ACL RULE MODAL ENDS -->
+
+
+
+
+
+
diff --git a/modules/portal/conf/routes b/modules/portal/conf/routes
index 643c49919..27eceaebd 100644
--- a/modules/portal/conf/routes
+++ b/modules/portal/conf/routes
@@ -30,6 +30,7 @@ GET           /api/zones                         @controllers.VinylDNS.getZones
 GET           /api/zones/backendids              @controllers.VinylDNS.getBackendIds
 GET           /api/zones/:id                     @controllers.VinylDNS.getZone(id: String)
 GET           /api/zones/name/:name              @controllers.VinylDNS.getZoneByName(name: String)
+GET           /api/zones/:id/changes             @controllers.VinylDNS.getZoneChange(id: String)
 POST          /api/zones                         @controllers.VinylDNS.addZone
 PUT           /api/zones/:id                     @controllers.VinylDNS.updateZone(id: String)
 DELETE        /api/zones/:id                     @controllers.VinylDNS.deleteZone(id: String)
diff --git a/modules/portal/public/lib/controllers/controller.manageZones.js b/modules/portal/public/lib/controllers/controller.manageZones.js
index 4ec47c526..5fcda102e 100644
--- a/modules/portal/public/lib/controllers/controller.manageZones.js
+++ b/modules/portal/public/lib/controllers/controller.manageZones.js
@@ -38,6 +38,8 @@ angular.module('controller.manageZones', [])
 
     $scope.alerts = [];
     $scope.zoneInfo = {};
+    $scope.zoneChanges={};
+    $scope.allAclRules = [];
     $scope.updateZoneInfo = {};
     $scope.manageZoneState = {
         UPDATE: 0,
@@ -285,6 +287,87 @@ angular.module('controller.manageZones', [])
             });
     };
 
+    $scope.refreshZoneChange = function() {
+         function success(response) {
+            $log.log('zonesService::getZoneChanges-success');
+            updateZoneChangeDisplay(response.data.zoneChanges);
+         }
+         return zonesService
+               .getZoneChanges($scope.zoneId)
+               .then(success)
+               .catch(function (error) {
+                    handleError(error, 'zonesService::getZoneChanges-failure');
+               });
+    };
+
+    $scope.refreshAclRule = function (index) {
+            for (var length = 0; length < $scope.allZonesChange[index].zone.acl.rules.length; length++) {
+                $scope.allAclRules.push($scope.allZonesChange[index].zone.acl.rules[length]);
+                getAclUser($scope.allZonesChange[index].zone.acl.rules[length].userId, length, index);
+                getAclGroup($scope.allZonesChange[index].zone.acl.rules[length].groupId, length, index);
+            }
+    }
+
+    function updateZoneChangeDisplay (zoneChange) {
+        $scope.allZonesChange = zoneChange;
+            for (var length = 0; length < zoneChange.length; length++) {
+                getZoneGroup(zoneChange[length].zone.adminGroupId, length);
+                getZoneUser(zoneChange[length].userId, length);
+            }
+        };
+
+    function getZoneGroup(groupId, length) {
+        function success(response) {
+            $log.log('groupsService::getZoneGroup-success');
+            $scope.allZonesChange[length].zone.adminGroupName = response.data.name;
+        }
+            return groupsService
+                    .getGroup(groupId)
+                    .then(success)
+                    .catch(function (error) {
+                        handleError(error, 'groupsService::getZoneGroup-failure');
+                    });
+    }
+
+    function getZoneUser(userId, length) {
+        function success(response) {
+            $log.log('profileService::getZoneUserDataById-success');
+            $scope.allZonesChange[length].userName = response.data.userName;
+        }
+        return profileService
+            .getUserDataById(userId)
+            .then(success)
+            .catch(function (error) {
+                handleError(error, 'profileService::getZoneUserDataById-failure');
+            });
+    };
+
+    function getAclGroup(groupId, length, index) {
+        function success(response) {
+            $log.log('groupsService::getAclGroup-success',length);
+            $scope.allZonesChange[index].zone.acl.rules[length].groupName = response.data.name;
+        }
+        return groupsService
+                .getGroup(groupId)
+                .then(success)
+                .catch(function (error) {
+                    handleError(error, 'groupsService::getAclGroup-failure');
+                });
+    }
+
+    function getAclUser(userId, length, index) {
+        function success(response) {
+            $log.log('profileService::getAclUserDataById-success',userId, length, index);
+            $scope.allZonesChange[index].zone.acl.rules[length].userName = response.data.userName;
+        }
+        return profileService
+            .getUserDataById(userId)
+            .then(success)
+            .catch(function (error) {
+                handleError(error, 'profileService::getAclUserDataById-failure');
+            });
+    };
+
     $scope.refreshAclRuleDisplay = function() {
         $scope.aclRules = [];
         angular.forEach($scope.zoneInfo.acl.rules, function (rule) {
diff --git a/modules/portal/public/lib/services/profile/service.profile.js b/modules/portal/public/lib/services/profile/service.profile.js
index d8ca2f6e0..b6bb5ca39 100644
--- a/modules/portal/public/lib/services/profile/service.profile.js
+++ b/modules/portal/public/lib/services/profile/service.profile.js
@@ -26,6 +26,10 @@ angular.module('service.profile', [])
             return $http.get('/api/users/lookupuser/' + username);
         }
 
+        this.getUserDataById = function(userId){
+            return $http.get('/api/users/' + userId);
+        }
+
         this.regenerateCredentials = function(){
             return $http.post('/regenerate-creds', {}, {headers: utilityService.getCsrfHeader()});
         }
diff --git a/modules/portal/public/lib/services/zones/service.zones.js b/modules/portal/public/lib/services/zones/service.zones.js
index 4ac031860..4fa1cd0ab 100644
--- a/modules/portal/public/lib/services/zones/service.zones.js
+++ b/modules/portal/public/lib/services/zones/service.zones.js
@@ -33,6 +33,11 @@ angular.module('service.zones', [])
             return $http.get(url);
         };
 
+        this.getZoneChanges = function (zoneId) {
+                    var url = '/api/zones/' + zoneId + '/changes';
+                    return $http.get(url);
+        };
+
         this.getBackendIds = function() {
             var url = "/api/zones/backendids";
             return $http.get(url);

From d88051493f6bd1fd1461ed3607be4f572db8795f Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 22 Jul 2022 14:14:59 +0530
Subject: [PATCH 067/147] Move code to scala

---
 .../membership/MembershipProtocol.scala       |  6 +-
 .../domain/membership/MembershipService.scala | 47 ++++++++++++-
 .../api/route/MembershipJsonProtocol.scala    |  1 +
 .../core/domain/membership/GroupChange.scala  |  3 +-
 .../app/views/groups/groupDetail.scala.html   | 20 ++----
 .../lib/controllers/controller.membership.js  | 66 +------------------
 6 files changed, 60 insertions(+), 83 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipProtocol.scala b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipProtocol.scala
index a76244474..c9d85b323 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipProtocol.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipProtocol.scala
@@ -60,7 +60,8 @@ final case class GroupChangeInfo(
     oldGroup: Option[GroupInfo] = None,
     id: String = UUID.randomUUID().toString,
     created: DateTime = DateTime.now,
-    userName: String
+    userName: String,
+    groupChangeMessage: String
 )
 
 object GroupChangeInfo {
@@ -71,7 +72,8 @@ object GroupChangeInfo {
     oldGroup = groupChange.oldGroup.map(GroupInfo.apply),
     id = groupChange.id,
     created = groupChange.created,
-    userName = groupChange.userName.getOrElse("unknown user")
+    userName = groupChange.userName.getOrElse("unknown user"),
+    groupChangeMessage = groupChange.groupChangeMessage.getOrElse("")
   )
 }
 
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
index b9f50c1ba..30e4d7643 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
@@ -238,16 +238,61 @@ class MembershipService(
       result <- groupChangeRepo
         .getGroupChanges(groupId, startFrom, maxItems)
         .toResult[ListGroupChangesResults]
+      groupChangeMessage <- determineGroupDifference(result.changes)
+      groupChanges = (groupChangeMessage, result.changes).zipped.map{ (a, b) => b.copy(groupChangeMessage = Some(a)) }
       userIds = result.changes.map(_.userId).toSet
       users <- getUsers(userIds).map(_.users)
       userMap = users.map(u => (u.id, u.userName)).toMap
     } yield ListGroupChangesResponse(
-      result.changes.map(change => GroupChangeInfo.apply(change.copy(userName = userMap.get(change.userId)))),
+      groupChanges.map(change => GroupChangeInfo.apply(change.copy(userName = userMap.get(change.userId)))),
       startFrom,
       result.lastEvaluatedTimeStamp,
       maxItems
     )
 
+  def determineGroupDifference(groupChange: Seq[GroupChange]): Result[Seq[String]] = {
+    var groupChangeMessage: Seq[String] = Seq.empty[String]
+
+    for (change <- groupChange) {
+      val sb = new StringBuilder
+      if (change.oldGroup.isDefined) {
+        if (change.oldGroup.get.name != change.newGroup.name) {
+          sb.append(s"Group name changed to '${change.newGroup.name}'.")
+        }
+        if (change.oldGroup.get.email != change.newGroup.email) {
+          sb.append(s"Group email changed to '${change.newGroup.email}'.")
+        }
+        if (change.oldGroup.get.description != change.newGroup.description) {
+          sb.append(s"Group description changed to '${change.newGroup.description.get}'.")
+        }
+        val adminAddDifference = change.newGroup.adminUserIds.diff(change.oldGroup.get.adminUserIds)
+        if (adminAddDifference.nonEmpty) {
+          sb.append(s"Group admin/s with userId/s (${adminAddDifference.mkString(",")}) added.")
+        }
+        val adminRemoveDifference = change.oldGroup.get.adminUserIds.diff(change.newGroup.adminUserIds)
+        if (adminRemoveDifference.nonEmpty) {
+          sb.append(s"Group admin/s with userId/s (${adminRemoveDifference.mkString(",")}) removed.")
+        }
+        val memberAddDifference = change.newGroup.memberIds.diff(change.oldGroup.get.memberIds)
+        if (memberAddDifference.nonEmpty) {
+          sb.append(s"Group member/s with userId/s (${memberAddDifference.mkString(",")}) added.")
+        }
+        val memberRemoveDifference = change.oldGroup.get.memberIds.diff(change.newGroup.memberIds)
+        if (memberRemoveDifference.nonEmpty) {
+          sb.append(s"Group member/s with userId/s (${memberRemoveDifference.mkString(",")}) removed.")
+        }
+        println("Query: ", sb)
+        groupChangeMessage = groupChangeMessage :+ sb.toString()
+      }
+      // It'll be a newly created group, so we will have no group change message
+      else {
+        println("Query: ", sb)
+        groupChangeMessage = groupChangeMessage :+ sb.toString()
+      }
+    }
+    groupChangeMessage
+  }.toResult
+
   /**
    * Retrieves the requested User from the given userIdentifier, which can be a userId or username
    * @param userIdentifier The userId or username
diff --git a/modules/api/src/main/scala/vinyldns/api/route/MembershipJsonProtocol.scala b/modules/api/src/main/scala/vinyldns/api/route/MembershipJsonProtocol.scala
index cab7cc3b5..7ec82e732 100644
--- a/modules/api/src/main/scala/vinyldns/api/route/MembershipJsonProtocol.scala
+++ b/modules/api/src/main/scala/vinyldns/api/route/MembershipJsonProtocol.scala
@@ -122,6 +122,7 @@ trait MembershipJsonProtocol extends JsonValidation {
         (js \ "id").default[String](UUID.randomUUID().toString),
         (js \ "created").default[DateTime](DateTime.now),
         (js \ "userName").required[String]("Missing userName"),
+        (js \ "groupChangeMessage").required[String]("Missing groupChangeMessage"),
         ).mapN(GroupChangeInfo.apply)
   }
 }
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/membership/GroupChange.scala b/modules/core/src/main/scala/vinyldns/core/domain/membership/GroupChange.scala
index 7e892023e..61e7c715a 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/membership/GroupChange.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/membership/GroupChange.scala
@@ -35,7 +35,8 @@ case class GroupChange(
     oldGroup: Option[Group] = None,
     id: String = UUID.randomUUID().toString,
     created: DateTime = DateTime.now,
-    userName: Option[String] = None
+    userName: Option[String] = None,
+    groupChangeMessage: Option[String] = None
 )
 
 object GroupChange {
diff --git a/modules/portal/app/views/groups/groupDetail.scala.html b/modules/portal/app/views/groups/groupDetail.scala.html
index 874a24132..73c39ba08 100644
--- a/modules/portal/app/views/groups/groupDetail.scala.html
+++ b/modules/portal/app/views/groups/groupDetail.scala.html
@@ -140,6 +140,7 @@
                                             <th>Time</th>
                                             <th>Group Change ID</th>
                                             <th>Change Type</th>
+                                            <th>Change Message</th>
                                             <th>Change Info</th>
                                             <th>User</th>
                                         </tr>
@@ -149,11 +150,12 @@
                                             <td>{{change.created}}</td>
                                             <td>{{change.id}}</td>
                                             <td>{{change.changeType}}</td>
+                                            <td class="col-md-3 wrap-long-text">{{change.groupChangeMessage}}</td>
                                             <td class="col-md-3 wrap-long-text">
-                                                <a ng-if="change.changeType =='Create'" ng-click="viewCreatedOrOldGroupInfo(change.newGroup)" class="force-cursor">View created group</a>
+                                                <a ng-if="change.changeType =='Create'" ng-click="viewGroupInfo(change.newGroup)" class="force-cursor">View created group</a>
 
-                                                <div><a ng-if="change.changeType =='Update'" ng-click="viewNewGroupInfo(change.newGroup, change.oldGroup)" class="force-cursor">View new group</a></div>
-                                                <div><a ng-if="change.changeType =='Update'" ng-click="viewCreatedOrOldGroupInfo(change.oldGroup)" class="force-cursor">View old group</a></div>
+                                                <div><a ng-if="change.changeType =='Update'" ng-click="viewGroupInfo(change.newGroup)" class="force-cursor">View new group</a></div>
+                                                <div><a ng-if="change.changeType =='Update'" ng-click="viewGroupInfo(change.oldGroup)" class="force-cursor">View old group</a></div>
                                             </td>
                                             <td>{{change.userName}}</td>
                                         </tr>
@@ -190,18 +192,6 @@
     <form name="viewGroupForm" role="form" class="form-horizontal" novalidate>
         <modal modal-id="group_modal" modal-title="{{ groupModal.title }}">
             <modal-body>
-                <modal-element ng-if="isCreatedOrNew" label="Group Changes Made">
-                <textarea id="create-group-change-text"
-                          name="groupChangeMessage"
-                          ng-model="currentGroup.changeMessage"
-                          rows="5"
-                          class="form-control"
-                          ng-trim="false"
-                          ng-class="groupModal.details.class"
-                          ng-readonly="groupModal.details.readOnly">
-                </textarea>
-                </modal-element>
-
                 <modal-element label="Group ID">
                     <input id="create-group-id-text" type="text" name="groupID" class="form-control"
                            ng-model="currentGroup.id"
diff --git a/modules/portal/public/lib/controllers/controller.membership.js b/modules/portal/public/lib/controllers/controller.membership.js
index 397d3852b..98e4fbdae 100644
--- a/modules/portal/public/lib/controllers/controller.membership.js
+++ b/modules/portal/public/lib/controllers/controller.membership.js
@@ -23,7 +23,6 @@ angular.module('controller.membership', []).controller('MembershipController', f
     $scope.isGroupAdmin = false;
     $scope.groupChanges = {};
     $scope.currentGroup = {};
-    $scope.isCreatedOrNew = false;
 
     $scope.groupModalState = {
         VIEW_DETAILS: 1
@@ -310,56 +309,7 @@ angular.module('controller.membership', []).controller('MembershipController', f
             });
     };
 
-    function determineGroupDifference(newGroup, oldGroup) {
-        var newGroupData = angular.copy(newGroup);
-        var changeMessage = "";
-        if(oldGroup.name !== newGroup.name){
-            changeMessage += "Group name changed to '" + newGroup.name + "'.";
-        }
-        if(oldGroup.email !== newGroup.email){
-            changeMessage += "Group email changed to '" + newGroup.email + "'.";
-        }
-        if(oldGroup.description !== newGroup.description){
-            changeMessage += "Group description changed to '" + newGroup.description + "'.";
-        }
-        oldGroup.adminIds = [];
-        angular.forEach(oldGroup.admins, function(admin) {
-            oldGroup.adminIds.push(admin.id);
-        });
-        newGroupData.adminIds = [];
-        angular.forEach(newGroup.admins, function(admin) {
-            newGroupData.adminIds.push(admin.id);
-        });
-        var adminAddDifference = newGroupData.adminIds.filter(x => !oldGroup.adminIds.includes(x));
-        if(adminAddDifference.length !== 0){
-            changeMessage += "Group admin/s with userId/s (" + adminAddDifference + ") added.";
-        }
-        var adminRemoveDifference = oldGroup.adminIds.filter(x => !newGroupData.adminIds.includes(x));
-        if(adminRemoveDifference.length !== 0){
-            changeMessage += "Group admin/s with userId/s (" + adminRemoveDifference + ") removed.";
-        }
-        oldGroup.memberIds = [];
-        angular.forEach(oldGroup.members, function(member) {
-            oldGroup.memberIds.push(member.id);
-        });
-        newGroupData.memberIds = [];
-        angular.forEach(newGroup.members, function(member) {
-            newGroupData.memberIds.push(member.id);
-        });
-        var memberAddDifference = newGroupData.memberIds.filter(x => !oldGroup.memberIds.includes(x));
-        if(memberAddDifference.length !== 0){
-            changeMessage += "Group member/s with userId/s (" + memberAddDifference + ") added.";
-        }
-        var memberRemoveDifference = oldGroup.memberIds.filter(x => !newGroupData.memberIds.includes(x));
-        if(memberRemoveDifference.length !== 0){
-            changeMessage += "Group member/s with userId/s (" + memberRemoveDifference + ") removed.";
-        }
-        newGroupData.changeMessage = changeMessage;
-        return newGroupData;
-    }
-
-    $scope.viewCreatedOrOldGroupInfo = function(group) {
-        $scope.isCreatedOrNew = false;
+    $scope.viewGroupInfo = function(group) {
         var newGroup = angular.copy(group);
         newGroup.adminIds = [];
         angular.forEach(group.admins, function(admin) {
@@ -372,19 +322,7 @@ angular.module('controller.membership', []).controller('MembershipController', f
         $scope.currentGroup = newGroup;
         $scope.groupModal = {
             action: $scope.groupModalState.VIEW_DETAILS,
-            title: "Created/Old Group Info",
-            basics: $scope.groupModalParams.readOnly,
-            details: $scope.groupModalParams.readOnly,
-        };
-        $("#group_modal").modal("show");
-    };
-
-    $scope.viewNewGroupInfo = function(newGroup, oldGroup) {
-        $scope.isCreatedOrNew = true;
-        $scope.currentGroup = determineGroupDifference(newGroup, oldGroup);
-        $scope.groupModal = {
-            action: $scope.groupModalState.VIEW_DETAILS,
-            title: "New Group Info",
+            title: "Group Info",
             basics: $scope.groupModalParams.readOnly,
             details: $scope.groupModalParams.readOnly,
         };

From 8c857bb497a03704477bf4d2f5d798f827221f83 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 22 Jul 2022 14:43:31 +0530
Subject: [PATCH 068/147] Add test

---
 .../api/domain/membership/MembershipServiceSpec.scala | 11 +++++++++++
 .../test/scala/vinyldns/core/TestMembershipData.scala |  7 +++++++
 2 files changed, 18 insertions(+)

diff --git a/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
index 85059c8fb..0aadcc33e 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
@@ -766,6 +766,17 @@ class MembershipServiceSpec
     }
   }
 
+    "determine group difference" should {
+      "return difference between two groups" in {
+        val groupChange = Seq(okGroupChange, dummyGroupChangeUpdate)
+        val result: Seq[String] = rightResultOf(underTest.determineGroupDifference(groupChange).value)
+        // Newly created group won't have group change message
+        result(0) shouldBe ""
+        // Updated group with group change message
+        result(1) shouldBe "Group name changed to 'ok'.Group email changed to 'test@test.com'."
+      }
+    }
+
     "listAdmins" should {
       "return a list of admins" in {
         val testGroup =
diff --git a/modules/core/src/test/scala/vinyldns/core/TestMembershipData.scala b/modules/core/src/test/scala/vinyldns/core/TestMembershipData.scala
index 36ba54ec0..4805b9297 100644
--- a/modules/core/src/test/scala/vinyldns/core/TestMembershipData.scala
+++ b/modules/core/src/test/scala/vinyldns/core/TestMembershipData.scala
@@ -157,4 +157,11 @@ object TestMembershipData {
       id = s"$i"
     )
   }
+  val dummyGroupChangeUpdate: GroupChange = GroupChange(
+    okGroup,
+    GroupChangeType.Update,
+    okUser.id,
+    Some(okGroup.copy(name = "dummy-group", email = "dummy@test.com")),
+    created = DateTime.now.secondOfDay().roundFloorCopy()
+  )
 }

From fce76169d071b92c17330725d4518eb7405b77f5 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 22 Jul 2022 15:35:51 +0530
Subject: [PATCH 069/147] Add test

---
 .../api/domain/membership/MembershipServiceSpec.scala       | 2 +-
 .../src/test/scala/vinyldns/core/TestMembershipData.scala   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
index 0aadcc33e..0db7cd3d7 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
@@ -773,7 +773,7 @@ class MembershipServiceSpec
         // Newly created group won't have group change message
         result(0) shouldBe ""
         // Updated group with group change message
-        result(1) shouldBe "Group name changed to 'ok'.Group email changed to 'test@test.com'."
+        result(1) shouldBe "Group name changed to 'dummy-group'.Group email changed to 'dummy@test.com'.Group description changed to 'dummy group'.Group admin/s with userId/s (12345-abcde-6789,56789-edcba-1234) added.Group admin/s with userId/s (ok) removed.Group member/s with userId/s (12345-abcde-6789,56789-edcba-1234) added.Group member/s with userId/s (ok) removed."
       }
     }
 
diff --git a/modules/core/src/test/scala/vinyldns/core/TestMembershipData.scala b/modules/core/src/test/scala/vinyldns/core/TestMembershipData.scala
index 4805b9297..4f9480ed5 100644
--- a/modules/core/src/test/scala/vinyldns/core/TestMembershipData.scala
+++ b/modules/core/src/test/scala/vinyldns/core/TestMembershipData.scala
@@ -158,10 +158,12 @@ object TestMembershipData {
     )
   }
   val dummyGroupChangeUpdate: GroupChange = GroupChange(
-    okGroup,
+    okGroup.copy(name = "dummy-group", email = "dummy@test.com", description = Some("dummy group"),
+      memberIds = Set(dummyUser.copy(id="12345-abcde-6789").id, superUser.copy(id="56789-edcba-1234").id),
+      adminUserIds = Set(dummyUser.copy(id="12345-abcde-6789").id, superUser.copy(id="56789-edcba-1234").id)),
     GroupChangeType.Update,
     okUser.id,
-    Some(okGroup.copy(name = "dummy-group", email = "dummy@test.com")),
+    Some(okGroup),
     created = DateTime.now.secondOfDay().roundFloorCopy()
   )
 }

From 358ccc8a3a25f7d848a105dc1827c1b308702487 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 22 Jul 2022 15:50:54 +0530
Subject: [PATCH 070/147] Remove print statements

---
 .../vinyldns/api/domain/membership/MembershipService.scala      | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
index 30e4d7643..99a770ab7 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
@@ -281,12 +281,10 @@ class MembershipService(
         if (memberRemoveDifference.nonEmpty) {
           sb.append(s"Group member/s with userId/s (${memberRemoveDifference.mkString(",")}) removed.")
         }
-        println("Query: ", sb)
         groupChangeMessage = groupChangeMessage :+ sb.toString()
       }
       // It'll be a newly created group, so we will have no group change message
       else {
-        println("Query: ", sb)
         groupChangeMessage = groupChangeMessage :+ sb.toString()
       }
     }

From 877d4fe76d232a658e69d4ac6b22508d886c5ff7 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Fri, 22 Jul 2022 16:58:26 +0530
Subject: [PATCH 071/147] Added pagination in zone history tab

---
 modules/portal/app/controllers/VinylDNS.scala | 10 ++-
 .../zoneTabs/zoneChangeHistory.scala.html     | 21 +++---
 .../lib/controllers/controller.manageZones.js | 72 +++++++++++++++----
 .../lib/services/zones/service.zones.js       |  8 ++-
 4 files changed, 83 insertions(+), 28 deletions(-)

diff --git a/modules/portal/app/controllers/VinylDNS.scala b/modules/portal/app/controllers/VinylDNS.scala
index b592e814a..c486698a6 100644
--- a/modules/portal/app/controllers/VinylDNS.scala
+++ b/modules/portal/app/controllers/VinylDNS.scala
@@ -432,8 +432,16 @@ class VinylDNS @Inject() (
   }
 
   def getZoneChange(id: String): Action[AnyContent] = userAction.async { implicit request =>
+    val queryParameters = new HashMap[String, java.util.List[String]]()
+    for {
+      (name, values) <- request.queryString
+    } queryParameters.put(name, values.asJava)
     val vinyldnsRequest =
-      new VinylDNSRequest("GET", s"$vinyldnsServiceBackend", s"zones/$id/changes")
+      new VinylDNSRequest(
+        "GET",
+        s"$vinyldnsServiceBackend",
+        s"zones/$id/changes",
+        parameters = queryParameters)
     executeRequest(vinyldnsRequest, request.user).map(response => {
       Status(response.status)(response.body)
         .withHeaders(cacheHeaders: _*)
diff --git a/modules/portal/app/views/zones/zoneTabs/zoneChangeHistory.scala.html b/modules/portal/app/views/zones/zoneTabs/zoneChangeHistory.scala.html
index 9c87d8b7e..cc47c9d2a 100644
--- a/modules/portal/app/views/zones/zoneTabs/zoneChangeHistory.scala.html
+++ b/modules/portal/app/views/zones/zoneTabs/zoneChangeHistory.scala.html
@@ -40,25 +40,26 @@
                            data-toggle="modal"> ACL Rules
                         </a>
                     </td>
-                    <td><a>{{zoneChange.zone.adminGroupName}}</a></td>
+                    <td><a ng-bind="zoneChange.zone.adminGroupName" href="/groups/{{zoneChange.zone.adminGroupId}}"></a>
+                    </td>
                 </tr>
             </tbody>
         </table>
 
-
-    </div>
         <!-- PAGINATION -->
-        <div class="dataTables_paginate">
+        <div class="dataTables_paginate vinyldns_zones_paginate">
+            <span class="vinyldns_zones_page_number">{{ getZoneHistoryPageNumber() }}</span>
             <ul class="pagination">
                 <li class="paginate_button previous">
-                    <a ng-if="changePrevPageEnabled()" ng-click="changePrevPage()" class="paginate_button">Previous</a>
+                    <a ng-if="prevPageEnabled()" ng-click="prevPageZoneHistory()" class="paginate_button">Previous</a>
                 </li>
                 <li class="paginate_button next">
-                    <a ng-if="changeNextPageEnabled()" ng-click="changeNextPage()" class="paginate_button">Next</a>
+                    <a ng-if="nextPageEnabled()" ng-click="nextPageAllZoneHistory()" class="paginate_button">Next</a>
                 </li>
             </ul>
         </div>
         <!-- END PAGINATION -->
+    </div>
 </div>
 <div class="panel-footer"></div>
     <!-- END SIMPLE DATATABLE -->
@@ -76,12 +77,6 @@
 
             <!-- Modal body -->
             <div class="modal-body">
-                <div class="btn-group">
-                    <button id="refresh-acl-rules-button" class="btn btn-default" ng-click="refreshAclRule()">
-                        <span class="fa fa-refresh"></span> Refresh
-                    </button>
-                </div>
-
                 <table id="aclRuleTable" class="table table-hover table-striped">
                     <thead>
                     <tr>
@@ -130,7 +125,7 @@
 
             <!-- Modal footer -->
             <div class="modal-footer">
-                <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
             </div>
 
         </div>
diff --git a/modules/portal/public/lib/controllers/controller.manageZones.js b/modules/portal/public/lib/controllers/controller.manageZones.js
index 5fcda102e..9e249b0e3 100644
--- a/modules/portal/public/lib/controllers/controller.manageZones.js
+++ b/modules/portal/public/lib/controllers/controller.manageZones.js
@@ -16,7 +16,7 @@
 
 angular.module('controller.manageZones', [])
     .controller('ManageZonesController', function ($scope, $timeout, $log, recordsService, zonesService, groupsService,
-                                                   profileService, utilityService) {
+                                                   profileService, utilityService, pagingService) {
 
     groupsService.getGroupsStored()
         .then(function (results) {
@@ -39,7 +39,6 @@ angular.module('controller.manageZones', [])
     $scope.alerts = [];
     $scope.zoneInfo = {};
     $scope.zoneChanges={};
-    $scope.allAclRules = [];
     $scope.updateZoneInfo = {};
     $scope.manageZoneState = {
         UPDATE: 0,
@@ -76,6 +75,9 @@ angular.module('controller.manageZones', [])
     };
     $scope.aclRecordTypes = ['A', 'AAAA', 'CNAME', 'DS', 'MX', 'NS', 'PTR', 'SRV', 'NAPTR', 'SSHFP', 'TXT'];
 
+    var zoneHistoryPaging = pagingService.getNewPagingParams(100);
+
+
     /**
      * Zone modal control functions
      */
@@ -288,12 +290,14 @@ angular.module('controller.manageZones', [])
     };
 
     $scope.refreshZoneChange = function() {
+        zoneHistoryPaging = pagingService.resetPaging(zoneHistoryPaging);
          function success(response) {
             $log.log('zonesService::getZoneChanges-success');
+            zoneHistoryPaging.next = response.data.nextId;
             updateZoneChangeDisplay(response.data.zoneChanges);
          }
          return zonesService
-               .getZoneChanges($scope.zoneId)
+               .getZoneChanges(zoneHistoryPaging.maxItems, undefined, $scope.zoneId)
                .then(success)
                .catch(function (error) {
                     handleError(error, 'zonesService::getZoneChanges-failure');
@@ -301,12 +305,14 @@ angular.module('controller.manageZones', [])
     };
 
     $scope.refreshAclRule = function (index) {
+        $scope.allAclRules = [];
             for (var length = 0; length < $scope.allZonesChange[index].zone.acl.rules.length; length++) {
                 $scope.allAclRules.push($scope.allZonesChange[index].zone.acl.rules[length]);
-                getAclUser($scope.allZonesChange[index].zone.acl.rules[length].userId, length, index);
-                getAclGroup($scope.allZonesChange[index].zone.acl.rules[length].groupId, length, index);
+                if ($scope.allAclRules[length].hasOwnProperty('userId')){
+                getAclUser($scope.allAclRules[length].userId, length); }
+                else{ getAclGroup($scope.allAclRules[length].groupId, length);}
             }
-    }
+    };
 
     function updateZoneChangeDisplay (zoneChange) {
         $scope.allZonesChange = zoneChange;
@@ -314,6 +320,7 @@ angular.module('controller.manageZones', [])
                 getZoneGroup(zoneChange[length].zone.adminGroupId, length);
                 getZoneUser(zoneChange[length].userId, length);
             }
+
         };
 
     function getZoneGroup(groupId, length) {
@@ -342,10 +349,10 @@ angular.module('controller.manageZones', [])
             });
     };
 
-    function getAclGroup(groupId, length, index) {
+    function getAclGroup(groupId, length) {
         function success(response) {
-            $log.log('groupsService::getAclGroup-success',length);
-            $scope.allZonesChange[index].zone.acl.rules[length].groupName = response.data.name;
+            $log.log('groupsService::getAclGroup-success');
+            $scope.allAclRules[length].groupName = response.data.name;
         }
         return groupsService
                 .getGroup(groupId)
@@ -355,10 +362,10 @@ angular.module('controller.manageZones', [])
                 });
     }
 
-    function getAclUser(userId, length, index) {
+    function getAclUser(userId, length) {
         function success(response) {
-            $log.log('profileService::getAclUserDataById-success',userId, length, index);
-            $scope.allZonesChange[index].zone.acl.rules[length].userName = response.data.userName;
+            $log.log('profileService::getAclUserDataById-success');
+            $scope.allAclRules[length].userName = response.data.userName;
         }
         return profileService
             .getUserDataById(userId)
@@ -368,6 +375,47 @@ angular.module('controller.manageZones', [])
             });
     };
 
+    $scope.getZoneHistoryPageNumber = function() {
+       return pagingService.getPanelTitle(zoneHistoryPaging);
+    };
+
+    $scope.prevPageEnabled = function() {
+        return pagingService.prevPageEnabled(zoneHistoryPaging);
+    };
+
+    $scope.nextPageEnabled = function(tab) {
+        return pagingService.nextPageEnabled(zoneHistoryPaging);
+    };
+
+    $scope.nextPageAllZoneHistory = function () {
+        return zonesService
+            .getZoneChanges(zoneHistoryPaging.maxItems, zoneHistoryPaging.next, $scope.zoneId )
+            .then(function(response) {
+                var zoneChanges = response.data.zoneChanges;
+                zoneHistoryPaging = pagingService.nextPageUpdate(zoneChanges, response.data.nextId, zoneHistoryPaging);
+
+                if (zoneChanges.length > 0) {
+                    updateZoneChangeDisplay(response.data.zoneChanges);
+                }
+            })
+            .catch(function (error) {
+               handleError(error,'zonesService::nextPage-failure')
+            });
+    };
+
+    $scope.prevPageZoneHistory = function() {
+        var startFrom = pagingService.getPrevStartFrom(zoneHistoryPaging);
+        return zonesService
+            .getZoneChanges(zoneHistoryPaging.maxItems, startFrom, $scope.zoneId )
+            .then(function(response) {
+                zoneHistoryPaging = pagingService.prevPageUpdate(response.data.nextId, zoneHistoryPaging);
+                updateZoneChangeDisplay(response.data.zoneChanges);
+            })
+            .catch(function (error) {
+                handleError(error,'zonesService::prevPage-failure');
+            });
+    };
+
     $scope.refreshAclRuleDisplay = function() {
         $scope.aclRules = [];
         angular.forEach($scope.zoneInfo.acl.rules, function (rule) {
diff --git a/modules/portal/public/lib/services/zones/service.zones.js b/modules/portal/public/lib/services/zones/service.zones.js
index 4fa1cd0ab..226542eec 100644
--- a/modules/portal/public/lib/services/zones/service.zones.js
+++ b/modules/portal/public/lib/services/zones/service.zones.js
@@ -33,8 +33,12 @@ angular.module('service.zones', [])
             return $http.get(url);
         };
 
-        this.getZoneChanges = function (zoneId) {
-                    var url = '/api/zones/' + zoneId + '/changes';
+        this.getZoneChanges = function (limit, startFrom, zoneId) {
+                    var params = {
+                        "maxItems": limit,
+                        "startFrom": startFrom
+                        }
+                    var url = utilityService.urlBuilder ( "/api/zones/" + zoneId + "/changes", params);
                     return $http.get(url);
         };
 

From 0e31b8bfcbc3730f712ea391be6da023fb7717a8 Mon Sep 17 00:00:00 2001
From: Nicholas Spadaccino <nicholas_spadaccino@comcast.com>
Date: Fri, 22 Jul 2022 15:00:14 -0400
Subject: [PATCH 072/147] Modify group search filter to ignore case for name
 queries, update unit tests

Signed-off-by: Nicholas Spadaccino <nicholas_spadaccino@comcast.com>
---
 .../domain/membership/MembershipService.scala |  2 +-
 .../membership/MembershipServiceSpec.scala    | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
index 50226337d..1b4be26b1 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
@@ -218,7 +218,7 @@ class MembershipService(
       .map(x => GroupInfo.fromGroup(x, abridged, Some(authPrincipal)))
 
     val filtered = allMyGroups
-      .filter(grp => groupNameFilter.forall(grp.name.contains(_)))
+      .filter(grp => groupNameFilter.map(_.toLowerCase).forall(grp.name.toLowerCase.contains(_)))
       .filter(grp => startFrom.forall(grp.id > _))
 
     val nextId = if (filtered.length > maxItems) Some(filtered(maxItems - 1).id) else None
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
index 9276f12b1..35a66b5df 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
@@ -597,6 +597,30 @@ class MembershipServiceSpec
           ignoreAccess = false
         )
       }
+      "return only return groups whose name matches the filter, regardless of case" in {
+        doReturn(IO.pure(listOfDummyGroups.toSet))
+          .when(mockGroupRepo)
+          .getGroups(any[Set[String]])
+        val result: ListMyGroupsResponse = rightResultOf(
+          underTest
+            .listMyGroups(
+              groupNameFilter = Some("Name-Dummy01"),
+              startFrom = None,
+              maxItems = 100,
+              listOfDummyGroupsAuth,
+              false
+            )
+            .value
+        )
+        result shouldBe ListMyGroupsResponse(
+          groups = listOfDummyGroupInfo.slice(10, 20),
+          groupNameFilter = Some("Name-Dummy01"),
+          startFrom = None,
+          nextId = None,
+          maxItems = 100,
+          ignoreAccess = false
+        )
+      }
       "return only return groups after startFrom" in {
         doReturn(IO.pure(listOfDummyGroups.toSet))
           .when(mockGroupRepo)

From b58efee7f36770410d9dc1838b7478d27ee5136f Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Mon, 25 Jul 2022 18:04:12 +0530
Subject: [PATCH 073/147] Added portal tests and updated ACL modal view page

---
 .../zoneTabs/zoneChangeHistory.scala.html     | 64 +++++++----------
 .../lib/controllers/controller.manageZones.js | 55 ++++++++++-----
 .../controller.manageZones.spec.js            | 70 ++++++++++++++++++-
 .../services/profile/service.profile.spec.js  | 37 ++++++++++
 .../lib/services/zones/service.zones.spec.js  |  9 +++
 .../test/controllers/VinylDNSSpec.scala       | 31 ++++++++
 6 files changed, 209 insertions(+), 57 deletions(-)

diff --git a/modules/portal/app/views/zones/zoneTabs/zoneChangeHistory.scala.html b/modules/portal/app/views/zones/zoneTabs/zoneChangeHistory.scala.html
index cc47c9d2a..df6ada017 100644
--- a/modules/portal/app/views/zones/zoneTabs/zoneChangeHistory.scala.html
+++ b/modules/portal/app/views/zones/zoneTabs/zoneChangeHistory.scala.html
@@ -20,27 +20,28 @@
                     <th>Created</th>
                     <th>Updated</th>
                     <th>Change type</th>
-                    <th>ACL</th>
                     <th>Admin group</th>
-
+                    <th>ACL</th>
                 </tr>
             </thead>
             <tbody>
-                <tr  ng-repeat="zoneChange in allZonesChange track by $index">
+                <tr  ng-repeat="zoneChange in zoneChanges track by $index">
                     <td>{{ zoneChange.userName }}</td>
                     <td>{{ zoneChange.zone.email }}</td>
-                    <td>{{zoneChange.zone.shared ? "Shared" : "Private"}}</td>
-                    <td>{{zoneChange.zone.created}}</td>
-                    <td>{{zoneChange.zone.updated}}</td>
+                    <td>{{ zoneChange.zone.shared ? "Shared" : "Private" }}</td>
+                    <td>{{ zoneChange.zone.created }}</td>
+                    <td>{{ zoneChange.zone.updated }}</td>
                     <td>{{ zoneChange.changeType }}</td>
-                    <td>
-                        <a href="#aclModal"
+                    <td><a ng-bind="zoneChange.zone.adminGroupName" href="/groups/{{zoneChange.zone.adminGroupId}}"></a>
+                    </td>
+                    <td> <button class="btn btn-info btn-sm"
+                                 ng-if="zoneChange.zone.acl.rules.length != 0"
+                                 ng-click="refreshAclRule($index)">ACL Rules</button>
+                        <!--<a href="#aclModal"
                            ng-if="zoneChange.zone.acl.rules.length != 0"
                            ng-click="refreshAclRule($index)"
                            data-toggle="modal"> ACL Rules
-                        </a>
-                    </td>
-                    <td><a ng-bind="zoneChange.zone.adminGroupName" href="/groups/{{zoneChange.zone.adminGroupId}}"></a>
+                        </a>-->
                     </td>
                 </tr>
             </tbody>
@@ -64,19 +65,10 @@
 <div class="panel-footer"></div>
     <!-- END SIMPLE DATATABLE -->
 
-    <!-- THE ACL RULE MODAL STARTS -->
-<div class="modal" id="aclModal">
-    <div class="modal-dialog">
-        <div class="modal-content">
-
-            <!-- Modal Header -->
-            <div class="modal-header">
-                <h4 class="modal-title">Zone Access Rules</h4>
-                <button type="button" class="close" data-dismiss="modal">&times;</button>
-            </div>
-
-            <!-- Modal body -->
-            <div class="modal-body">
+<!-- THE ACL RULE MODAL FORM STARTS -->
+<form name="aclModalViewForm" role="form" class="form-horizontal" novalidate>
+    <modal modal-id="aclModalView" modal-title="{{ aclRulesModal.title }}">
+        <modal-body>
                 <table id="aclRuleTable" class="table table-hover table-striped">
                     <thead>
                     <tr>
@@ -97,11 +89,9 @@
                                 {{rule.userName}}
                             </span>
                         </td>
-
                         <td>
                             {{rule.accessLevel}}
                         </td>
-
                         <td>
                             <span ng-if="rule.recordTypes.length == 0">All Types</span>
                             <ul class="table-cell-list">
@@ -110,28 +100,24 @@
                                 </li>
                             </ul>
                         </td>
-
                         <td class="wrap-long-text">
                             {{rule.recordMask}}
                         </td>
-
                         <td class="wrap-long-text">
                             {{rule.description}}
                         </td>
                     </tr>
                     </tbody>
                 </table>
-            </div>
-
-            <!-- Modal footer -->
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-            </div>
-
-        </div>
-    </div>
-</div>
-<!-- THE ACL RULE MODAL ENDS -->
+        </modal-body>
+        <modal-footer>
+                <span>
+                    <button type="button" class="btn btn-default" data-dismiss="modal" ng-click="closeAclModalView()">Close</button>
+                </span>
+        </modal-footer>
+    </modal>
+</form>
+<!-- THE ACL RULE MODAL FORM ENDS -->
 
 
 
diff --git a/modules/portal/public/lib/controllers/controller.manageZones.js b/modules/portal/public/lib/controllers/controller.manageZones.js
index 9e249b0e3..6b93b034d 100644
--- a/modules/portal/public/lib/controllers/controller.manageZones.js
+++ b/modules/portal/public/lib/controllers/controller.manageZones.js
@@ -38,7 +38,7 @@ angular.module('controller.manageZones', [])
 
     $scope.alerts = [];
     $scope.zoneInfo = {};
-    $scope.zoneChanges={};
+    $scope.zoneChanges = {};
     $scope.updateZoneInfo = {};
     $scope.manageZoneState = {
         UPDATE: 0,
@@ -61,7 +61,8 @@ angular.module('controller.manageZones', [])
         CREATE: 0,
         UPDATE: 1,
         CONFIRM_UPDATE: 2,
-        CONFIRM_DELETE: 3
+        CONFIRM_DELETE: 3,
+        VIEW_DETAILS: 4
     };
     $scope.aclModalParams = {
         readOnly: {
@@ -77,7 +78,6 @@ angular.module('controller.manageZones', [])
 
     var zoneHistoryPaging = pagingService.getNewPagingParams(100);
 
-
     /**
      * Zone modal control functions
      */
@@ -306,27 +306,51 @@ angular.module('controller.manageZones', [])
 
     $scope.refreshAclRule = function (index) {
         $scope.allAclRules = [];
-            for (var length = 0; length < $scope.allZonesChange[index].zone.acl.rules.length; length++) {
-                $scope.allAclRules.push($scope.allZonesChange[index].zone.acl.rules[length]);
+        $scope.aclRulesModal = {
+            action: $scope.aclModalState.VIEW_DETAILS,
+            title: "ACL Rules Info",
+            basics: $scope.aclModalParams.readOnly,
+            details: $scope.aclModalParams.readOnly,
+        };
+        if ($scope.zoneChanges[index].zone.acl.rules.length!=0){
+            for (var length = 0; length < $scope.zoneChanges[index].zone.acl.rules.length; length++) {
+                $scope.allAclRules.push($scope.zoneChanges[index].zone.acl.rules[length]);
                 if ($scope.allAclRules[length].hasOwnProperty('userId')){
                 getAclUser($scope.allAclRules[length].userId, length); }
                 else{ getAclGroup($scope.allAclRules[length].groupId, length);}
             }
+        $scope.aclModalViewForm.$setPristine();
+        $("#aclModalView").modal("show");}
+        else{$("#aclModalView").modal("hide");}
+    };
+
+    $scope.closeAclModalView = function() {
+        $scope.aclModalViewForm.$setPristine();
     };
 
     function updateZoneChangeDisplay (zoneChange) {
-        $scope.allZonesChange = zoneChange;
             for (var length = 0; length < zoneChange.length; length++) {
                 getZoneGroup(zoneChange[length].zone.adminGroupId, length);
                 getZoneUser(zoneChange[length].userId, length);
             }
-
+        $scope.zoneChanges = zoneChange;
         };
 
+    $scope.refreshAclRuleDisplay = function() {
+        $scope.aclRules = [];
+        angular.forEach($scope.zoneInfo.acl.rules, function (rule) {
+            $scope.aclRules.push(zonesService.toDisplayAclRule(rule));
+        });
+    };
+
+    /**
+     * Get User name and Group Name with Ids for Zone history
+     */
+
     function getZoneGroup(groupId, length) {
         function success(response) {
             $log.log('groupsService::getZoneGroup-success');
-            $scope.allZonesChange[length].zone.adminGroupName = response.data.name;
+            $scope.zoneChanges[length].zone.adminGroupName = response.data.name;
         }
             return groupsService
                     .getGroup(groupId)
@@ -339,7 +363,7 @@ angular.module('controller.manageZones', [])
     function getZoneUser(userId, length) {
         function success(response) {
             $log.log('profileService::getZoneUserDataById-success');
-            $scope.allZonesChange[length].userName = response.data.userName;
+            $scope.zoneChanges[length].userName = response.data.userName;
         }
         return profileService
             .getUserDataById(userId)
@@ -375,6 +399,10 @@ angular.module('controller.manageZones', [])
             });
     };
 
+    /**
+     * Zone history Pagination
+     */
+
     $scope.getZoneHistoryPageNumber = function() {
        return pagingService.getPanelTitle(zoneHistoryPaging);
     };
@@ -387,7 +415,7 @@ angular.module('controller.manageZones', [])
         return pagingService.nextPageEnabled(zoneHistoryPaging);
     };
 
-    $scope.nextPageAllZoneHistory = function () {
+    $scope.nextPageZoneHistory = function () {
         return zonesService
             .getZoneChanges(zoneHistoryPaging.maxItems, zoneHistoryPaging.next, $scope.zoneId )
             .then(function(response) {
@@ -416,13 +444,6 @@ angular.module('controller.manageZones', [])
             });
     };
 
-    $scope.refreshAclRuleDisplay = function() {
-        $scope.aclRules = [];
-        angular.forEach($scope.zoneInfo.acl.rules, function (rule) {
-            $scope.aclRules.push(zonesService.toDisplayAclRule(rule));
-        });
-    };
-
     /**
      *  Service interaction functions
      */
diff --git a/modules/portal/public/lib/controllers/controller.manageZones.spec.js b/modules/portal/public/lib/controllers/controller.manageZones.spec.js
index 736fb7f23..f069966d5 100644
--- a/modules/portal/public/lib/controllers/controller.manageZones.spec.js
+++ b/modules/portal/public/lib/controllers/controller.manageZones.spec.js
@@ -22,16 +22,18 @@ describe('Controller: ManageZonesController', function () {
         module('service.utility'),
         module('service.zones'),
         module('service.profile'),
+        module('service.paging'),
         module('controller.manageZones')
     });
     beforeEach(inject(function ($rootScope, $controller, $q, groupsService, recordsService, zonesService,
-        profileService) {
+        profileService, pagingService) {
         this.rootScope = $rootScope;
         this.scope = $rootScope.$new();
         this.groupsService = groupsService;
         this.zonesService = zonesService;
         this.recordsService = recordsService;
         this.profileService = profileService;
+        this.pagingService = pagingService;
         this.q = $q;
         this.groupsService.getGroups = function () {
             return $q.when({
@@ -554,4 +556,70 @@ describe('Controller: ManageZonesController', function () {
         expect(toDisplayAclRule.calls.count()).toBe(3);
         expect(this.scope.aclRules).toEqual(this.scope.zoneInfo.acl.rules);
     });
+
+    it('next page should call listZoneChangesByZoneId with the correct parameters', function () {
+        var mockZoneChange = {data: {
+                zoneId: "c5c87405-2ec8-4e03-b2dc-c6758a5d9666",
+                zoneChanges: [{ zone: {
+            name: "dummy.",
+            email: "test@test.com",
+            status: "Active",
+            created: "2017-02-15T14:58:39Z",
+            account: "c8234503-bfda-4b80-897f-d74129051eaa",
+            acl: {rules: []},
+            adminGroupId: "c8234503-bfda-4b80-897f-d74129051eaa",
+            id: "c5c87405-2ec8-4e03-b2dc-c6758a5d9666",
+            shared: false,
+            status: "Active",
+            latestSync: "2017-02-15T14:58:39Z",
+            isTest: true
+        }}],maxItems: 100}};
+
+        var getZoneChanges = spyOn(this.zonesService, 'getZoneChanges')
+            .and.stub()
+            .and.returnValue(this.q.when(mockZoneChange));
+
+        var expectedMaxItems = 100;
+        var expectedStartFrom = undefined;
+        var expectedZoneId = this.scope.zoneId;
+
+        this.scope.nextPageZoneHistory();
+
+        expect(getZoneChanges.calls.count()).toBe(1);
+        expect(getZoneChanges.calls.mostRecent().args).toEqual(
+            [expectedMaxItems, expectedStartFrom, expectedZoneId]);
+    });
+
+    it('prev page should call getZoneChanges with the correct parameters', function () {
+        var mockZoneChange = {data: {
+                zoneId: "c5c87405-2ec8-4e03-b2dc-c6758a5d9666",
+                zoneChanges: [{ zone: {
+            name: "dummy.",
+            email: "test@test.com",
+            status: "Active",
+            created: "2017-02-15T14:58:39Z",
+            account: "c8234503-bfda-4b80-897f-d74129051eaa",
+            acl: {rules: []},
+            adminGroupId: "c8234503-bfda-4b80-897f-d74129051eaa",
+            id: "c5c87405-2ec8-4e03-b2dc-c6758a5d9666",
+            shared: false,
+            status: "Active",
+            latestSync: "2017-02-15T14:58:39Z",
+            isTest: true
+        }}],maxItems: 100}};
+
+        var getZoneChanges = spyOn(this.zonesService, 'getZoneChanges')
+            .and.stub()
+            .and.returnValue(this.q.when(mockZoneChange));
+
+        var expectedMaxItems = 100;
+        var expectedStartFrom =  undefined;
+        var expectedZoneId = this.scope.zoneId;
+
+        this.scope.prevPageZoneHistory();
+
+        expect(getZoneChanges.calls.count()).toBe(1);
+        expect(getZoneChanges.calls.mostRecent().args).toEqual(
+            [expectedMaxItems, expectedStartFrom, expectedZoneId]);
+    });
 });
diff --git a/modules/portal/public/lib/services/profile/service.profile.spec.js b/modules/portal/public/lib/services/profile/service.profile.spec.js
index 38dd34392..0da6c0cd5 100644
--- a/modules/portal/public/lib/services/profile/service.profile.spec.js
+++ b/modules/portal/public/lib/services/profile/service.profile.spec.js
@@ -43,6 +43,10 @@ describe('Service: profileService', function () {
         expect(this.profileService.getUserDataByUsername).toBeDefined();
     });
 
+    it('should have getUserDataById method', function () {
+        expect(this.profileService.getUserDataByUsername).toBeDefined();
+    });
+
     it('should have regenerateCredentials method', function () {
         expect(this.profileService.regenerateCredentials()).toBeDefined();
     });
@@ -119,6 +123,39 @@ describe('Service: profileService', function () {
         this.$httpBackend.flush();
     });
 
+
+    it('getUserDataByUserId method should return 200 with valid user', function (done) {
+        this.$httpBackend.expectGET('/api/users/userId').respond('success');
+        this.profileService.getUserDataById('userId')
+            .then(function (response) {
+                expect(response.status).toBe(200);
+                expect(response.data).toBe('success');
+                done();
+            }, function (error) {
+                fail('lookupUserAccount expected 200, but got ' + error.status.toString());
+                done();
+            });
+        this.$httpBackend.flush();
+    });
+
+    it('getUserDataByUserId method should return 400 with invalid user', function (done) {
+        var url = '/api/users/:userId';
+        this.$httpBackend.whenRoute('GET', url)
+            .respond(function () {
+                return [400, 'response body', {}, 'TestPhrase'];
+            });
+        this.profileService.getUserDataById('badUserId')
+            .then(function (response) {
+                fail('lookupUserAccount expected 400, but got ' + response.status.toString());
+                done();
+            }, function (error) {
+                expect(error.status).toBe(400);
+                done();
+            });
+        this.$httpBackend.flush();
+    });
+
+
     it('regenerateCredentials method should return 400 with invalid user', function (done) {
         var url = '/regenerate-creds';
         this.$httpBackend.whenRoute('POST', url).respond(400);
diff --git a/modules/portal/public/lib/services/zones/service.zones.spec.js b/modules/portal/public/lib/services/zones/service.zones.spec.js
index 5149008a8..a16d256ea 100644
--- a/modules/portal/public/lib/services/zones/service.zones.spec.js
+++ b/modules/portal/public/lib/services/zones/service.zones.spec.js
@@ -35,6 +35,15 @@ describe('Service: zoneService', function () {
         this.$httpBackend.flush();
     });
 
+    it('http backend gets called properly when getting zoneChanges', function () {
+        this.$httpBackend.expectGET('/api/zones/zoneid/changes?maxItems=100&startFrom=start').respond('zoneChanges returned');
+        this.zonesService.getZoneChanges('100', 'start', 'zoneid', false)
+            .then(function(response) {
+                expect(response.data).toBe('zoneChanges returned');
+            });
+        this.$httpBackend.flush();
+    });
+
     it('http backend gets called properly when sending zone', function (done) {
         this.$httpBackend.expectPOST('/api/zones').respond('zone sent');
         this.zonesService.sendZone('zone payload')
diff --git a/modules/portal/test/controllers/VinylDNSSpec.scala b/modules/portal/test/controllers/VinylDNSSpec.scala
index 58ba4a6cf..180683cf7 100644
--- a/modules/portal/test/controllers/VinylDNSSpec.scala
+++ b/modules/portal/test/controllers/VinylDNSSpec.scala
@@ -1502,6 +1502,37 @@ class VinylDNSSpec extends Specification with Mockito with TestApplicationData w
       }
     }
 
+    ".listZoneChanges" should {
+      "return unauthorized (401) if requesting user is not logged in" in new WithApplication(app) {
+        val client = mock[WSClient]
+        val underTest = withClient(client)
+        val result =
+          underTest.listRecordSetChanges(hobbitZoneId)(
+            FakeRequest(GET, s"/api/zones/$hobbitZoneId/changes")
+          )
+
+        status(result) mustEqual 401
+        hasCacheHeaders(result)
+        contentAsString(result) must beEqualTo("You are not logged in. Please login to continue.")
+      }
+      "return forbidden (403) if user account is locked" in new WithApplication(app) {
+        val client = mock[WSClient]
+        val underTest = withLockedClient(client)
+        val result = underTest.listRecordSetChanges(hobbitZoneId)(
+          FakeRequest(GET, s"/api/zones/$hobbitZoneId/changes").withSession(
+            "username" -> lockedFrodoUser.userName,
+            "accessKey" -> lockedFrodoUser.accessKey
+          )
+        )
+
+        status(result) mustEqual 403
+        hasCacheHeaders(result)
+        contentAsString(result) must beEqualTo(
+          s"User account for `${lockedFrodoUser.userName}` is locked."
+        )
+      }
+    }
+
     ".getZoneByName" should {
       "return ok (200) if the zone is found" in new WithApplication(app) {
         val client = MockWS {

From 1eeb348579808de5901b42c0d3db49178e3a8f49 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Tue, 26 Jul 2022 11:02:14 +0530
Subject: [PATCH 074/147] Remove unused scope variable

---
 modules/portal/public/lib/controllers/controller.membership.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/portal/public/lib/controllers/controller.membership.js b/modules/portal/public/lib/controllers/controller.membership.js
index 98e4fbdae..cd196e018 100644
--- a/modules/portal/public/lib/controllers/controller.membership.js
+++ b/modules/portal/public/lib/controllers/controller.membership.js
@@ -27,7 +27,6 @@ angular.module('controller.membership', []).controller('MembershipController', f
     $scope.groupModalState = {
         VIEW_DETAILS: 1
     };
-    $scope.disabledStates = [$scope.groupModalState.VIEW_DETAILS];
 
     // read-only data for setting various classes/attributes in group modal
     $scope.groupModalParams = {

From 0fd4ecb1f95b88447b6e246e0ef631d5fa73081f Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Tue, 26 Jul 2022 11:15:41 +0530
Subject: [PATCH 075/147] Remove unnecessary changes

---
 .../lib/controllers/controller.membership.spec.js    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/portal/public/lib/controllers/controller.membership.spec.js b/modules/portal/public/lib/controllers/controller.membership.spec.js
index 4287973de..d5429e1b2 100644
--- a/modules/portal/public/lib/controllers/controller.membership.spec.js
+++ b/modules/portal/public/lib/controllers/controller.membership.spec.js
@@ -153,7 +153,7 @@ describe('Controller: MembershipController', function () {
         expect(profileService.calls.count()).toBe(1);
         expect(updateGroup.calls.count()).toBe(1);
         expect(this.utilitySuccess.calls.count()).toBe(1);
-        expect(this.scope.alerts[0]).toEqual(this.mockSuccessAlert);
+        expect(this.scope.alerts).toEqual(this.mockSuccessAlert);
     });
 
     it('addMember correctly calls utilityService when failing getUserDataByUsername', function(){
@@ -196,7 +196,7 @@ describe('Controller: MembershipController', function () {
         expect(profileService.calls.count()).toBe(1);
         expect(this.utilityFailure.calls.count()).toBe(1);
         expect(updateGroup.calls.count()).toBe(1);
-        expect(this.scope.alerts[0]).toEqual(this.mockFailureAlert);
+        expect(this.scope.alerts).toEqual(this.mockFailureAlert);
     });
 
     it('removeMember correctly calls utilityService when passing updateGroup', function(){
@@ -220,7 +220,7 @@ describe('Controller: MembershipController', function () {
 
         expect(this.utilitySuccess.calls.count()).toBe(1);
         expect(updateGroup.calls.count()).toBe(1);
-        expect(this.scope.alerts[0]).toEqual(this.mockSuccessAlert);
+        expect(this.scope.alerts).toEqual(this.mockSuccessAlert);
     });
 
     it('removeMember correctly calls utilityService when failing updateGroup', function(){
@@ -244,7 +244,7 @@ describe('Controller: MembershipController', function () {
 
         expect(this.utilityFailure.calls.count()).toBe(1);
         expect(updateGroup.calls.count()).toBe(1);
-        expect(this.scope.alerts[0]).toEqual(this.mockFailureAlert);
+        expect(this.scope.alerts).toEqual(this.mockFailureAlert);
     });
 
     it('removeMember correctly calls utilityService when passing updateGroup', function(){
@@ -272,7 +272,7 @@ describe('Controller: MembershipController', function () {
 
         expect(this.utilitySuccess.calls.count()).toBe(1);
         expect(updateGroup.calls.count()).toBe(1);
-        expect(this.scope.alerts[0]).toEqual(this.mockSuccessAlert);
+        expect(this.scope.alerts).toEqual(this.mockSuccessAlert);
     });
 
     it('removeMember correctly calls utilityService when failing updateGroup', function(){
@@ -300,7 +300,7 @@ describe('Controller: MembershipController', function () {
 
         expect(this.utilityFailure.calls.count()).toBe(1);
         expect(updateGroup.calls.count()).toBe(1);
-        expect(this.scope.alerts[0]).toEqual(this.mockFailureAlert);
+        expect(this.scope.alerts).toEqual(this.mockFailureAlert);
     });
 
     it('refresh correctly handles error when failing getGroup', function() {

From 3c0c4a26f111691a8f38541061e17eec940edddc Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Tue, 26 Jul 2022 11:37:37 +0530
Subject: [PATCH 076/147] Revert changes

---
 .../lib/controllers/controller.membership.spec.js    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/portal/public/lib/controllers/controller.membership.spec.js b/modules/portal/public/lib/controllers/controller.membership.spec.js
index d5429e1b2..a0af8b2d2 100644
--- a/modules/portal/public/lib/controllers/controller.membership.spec.js
+++ b/modules/portal/public/lib/controllers/controller.membership.spec.js
@@ -153,7 +153,7 @@ describe('Controller: MembershipController', function () {
         expect(profileService.calls.count()).toBe(1);
         expect(updateGroup.calls.count()).toBe(1);
         expect(this.utilitySuccess.calls.count()).toBe(1);
-        expect(this.scope.alerts).toEqual(this.mockSuccessAlert);
+        expect(this.scope.alerts).toEqual([this.mockSuccessAlert]);
     });
 
     it('addMember correctly calls utilityService when failing getUserDataByUsername', function(){
@@ -196,7 +196,7 @@ describe('Controller: MembershipController', function () {
         expect(profileService.calls.count()).toBe(1);
         expect(this.utilityFailure.calls.count()).toBe(1);
         expect(updateGroup.calls.count()).toBe(1);
-        expect(this.scope.alerts).toEqual(this.mockFailureAlert);
+        expect(this.scope.alerts).toEqual([this.mockFailureAlert]);
     });
 
     it('removeMember correctly calls utilityService when passing updateGroup', function(){
@@ -220,7 +220,7 @@ describe('Controller: MembershipController', function () {
 
         expect(this.utilitySuccess.calls.count()).toBe(1);
         expect(updateGroup.calls.count()).toBe(1);
-        expect(this.scope.alerts).toEqual(this.mockSuccessAlert);
+        expect(this.scope.alerts).toEqual([this.mockSuccessAlert]);
     });
 
     it('removeMember correctly calls utilityService when failing updateGroup', function(){
@@ -244,7 +244,7 @@ describe('Controller: MembershipController', function () {
 
         expect(this.utilityFailure.calls.count()).toBe(1);
         expect(updateGroup.calls.count()).toBe(1);
-        expect(this.scope.alerts).toEqual(this.mockFailureAlert);
+        expect(this.scope.alerts).toEqual([this.mockFailureAlert]);
     });
 
     it('removeMember correctly calls utilityService when passing updateGroup', function(){
@@ -272,7 +272,7 @@ describe('Controller: MembershipController', function () {
 
         expect(this.utilitySuccess.calls.count()).toBe(1);
         expect(updateGroup.calls.count()).toBe(1);
-        expect(this.scope.alerts).toEqual(this.mockSuccessAlert);
+        expect(this.scope.alerts).toEqual([this.mockSuccessAlert]);
     });
 
     it('removeMember correctly calls utilityService when failing updateGroup', function(){
@@ -300,7 +300,7 @@ describe('Controller: MembershipController', function () {
 
         expect(this.utilityFailure.calls.count()).toBe(1);
         expect(updateGroup.calls.count()).toBe(1);
-        expect(this.scope.alerts).toEqual(this.mockFailureAlert);
+        expect(this.scope.alerts).toEqual([this.mockFailureAlert]);
     });
 
     it('refresh correctly handles error when failing getGroup', function() {

From 7061bb8e1ade8556696699cca5ab76dcd5bde5f5 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Tue, 26 Jul 2022 15:00:48 +0530
Subject: [PATCH 077/147] Update in portal tests

---
 .../zoneTabs/zoneChangeHistory.scala.html     | 13 +--
 .../lib/controllers/controller.manageZones.js | 11 ++-
 .../controller.manageZones.spec.js            | 93 +++++++++++++------
 3 files changed, 73 insertions(+), 44 deletions(-)

diff --git a/modules/portal/app/views/zones/zoneTabs/zoneChangeHistory.scala.html b/modules/portal/app/views/zones/zoneTabs/zoneChangeHistory.scala.html
index df6ada017..980db3ff7 100644
--- a/modules/portal/app/views/zones/zoneTabs/zoneChangeHistory.scala.html
+++ b/modules/portal/app/views/zones/zoneTabs/zoneChangeHistory.scala.html
@@ -9,8 +9,6 @@
         <div class="btn-group">
             <button class="btn btn-default" ng-click="refreshZoneChange()"><span class="fa fa-refresh"></span> Refresh</button>
         </div>
-
-
         <table id="zoneChangeDataTable" class="table table-hover table-striped">
             <thead>
                 <tr>
@@ -34,14 +32,11 @@
                     <td>{{ zoneChange.changeType }}</td>
                     <td><a ng-bind="zoneChange.zone.adminGroupName" href="/groups/{{zoneChange.zone.adminGroupId}}"></a>
                     </td>
-                    <td> <button class="btn btn-info btn-sm"
+                    <td>
+                        <button class="btn btn-info btn-sm"
                                  ng-if="zoneChange.zone.acl.rules.length != 0"
-                                 ng-click="refreshAclRule($index)">ACL Rules</button>
-                        <!--<a href="#aclModal"
-                           ng-if="zoneChange.zone.acl.rules.length != 0"
-                           ng-click="refreshAclRule($index)"
-                           data-toggle="modal"> ACL Rules
-                        </a>-->
+                                 ng-click="refreshAclRule($index)">ACL Rules
+                        </button>
                     </td>
                 </tr>
             </tbody>
diff --git a/modules/portal/public/lib/controllers/controller.manageZones.js b/modules/portal/public/lib/controllers/controller.manageZones.js
index 6b93b034d..a17c2115d 100644
--- a/modules/portal/public/lib/controllers/controller.manageZones.js
+++ b/modules/portal/public/lib/controllers/controller.manageZones.js
@@ -280,6 +280,7 @@ angular.module('controller.manageZones', [])
             $scope.updateZoneInfo.hiddenTransferKey = '';
             $scope.currentManageZoneState = $scope.manageZoneState.UPDATE;
             $scope.refreshAclRuleDisplay();
+            $scope.refreshZoneChange();
         }
         return recordsService
             .getZone($scope.zoneId)
@@ -294,7 +295,8 @@ angular.module('controller.manageZones', [])
          function success(response) {
             $log.log('zonesService::getZoneChanges-success');
             zoneHistoryPaging.next = response.data.nextId;
-            updateZoneChangeDisplay(response.data.zoneChanges);
+            $scope.zoneChanges = response.data.zoneChanges;
+            $scope.updateZoneChangeDisplay(response.data.zoneChanges);
          }
          return zonesService
                .getZoneChanges(zoneHistoryPaging.maxItems, undefined, $scope.zoneId)
@@ -328,12 +330,11 @@ angular.module('controller.manageZones', [])
         $scope.aclModalViewForm.$setPristine();
     };
 
-    function updateZoneChangeDisplay (zoneChange) {
+    $scope.updateZoneChangeDisplay = function (zoneChange) {
             for (var length = 0; length < zoneChange.length; length++) {
                 getZoneGroup(zoneChange[length].zone.adminGroupId, length);
                 getZoneUser(zoneChange[length].userId, length);
             }
-        $scope.zoneChanges = zoneChange;
         };
 
     $scope.refreshAclRuleDisplay = function() {
@@ -423,7 +424,7 @@ angular.module('controller.manageZones', [])
                 zoneHistoryPaging = pagingService.nextPageUpdate(zoneChanges, response.data.nextId, zoneHistoryPaging);
 
                 if (zoneChanges.length > 0) {
-                    updateZoneChangeDisplay(response.data.zoneChanges);
+                    $scope.updateZoneChangeDisplay(response.data.zoneChanges);
                 }
             })
             .catch(function (error) {
@@ -437,7 +438,7 @@ angular.module('controller.manageZones', [])
             .getZoneChanges(zoneHistoryPaging.maxItems, startFrom, $scope.zoneId )
             .then(function(response) {
                 zoneHistoryPaging = pagingService.prevPageUpdate(response.data.nextId, zoneHistoryPaging);
-                updateZoneChangeDisplay(response.data.zoneChanges);
+                $scope.updateZoneChangeDisplay(response.data.zoneChanges);
             })
             .catch(function (error) {
                 handleError(error,'zonesService::prevPage-failure');
diff --git a/modules/portal/public/lib/controllers/controller.manageZones.spec.js b/modules/portal/public/lib/controllers/controller.manageZones.spec.js
index f069966d5..f11de936c 100644
--- a/modules/portal/public/lib/controllers/controller.manageZones.spec.js
+++ b/modules/portal/public/lib/controllers/controller.manageZones.spec.js
@@ -207,11 +207,14 @@ describe('Controller: ManageZonesController', function () {
                 }
             }
         };
+
         var getZone = spyOn(this.recordsService, 'getZone')
             .and.stub()
             .and.returnValue(this.q.when(mockResponse));
         var refreshAclRuleDisplay = spyOn(this.scope, 'refreshAclRuleDisplay')
             .and.stub();
+        var refreshZoneChange = spyOn(this.scope, 'refreshZoneChange')
+                    .and.stub();
         this.scope.currentManageZoneState = this.scope.manageZoneState.CONFIRM_UPDATE;
         this.scope.updateZoneInfo.hiddenKey = 'some key';
         this.scope.updateZoneInfo.hiddenTransferKey = 'some key';
@@ -219,6 +222,7 @@ describe('Controller: ManageZonesController', function () {
         this.scope.$digest();
         expect(getZone.calls.count()).toBe(1);
         expect(refreshAclRuleDisplay.calls.count()).toBe(1);
+        expect(refreshZoneChange.calls.count()).toBe(1);
         expect(this.scope.zoneInfo).toEqual(mockResponse.data.zone);
         expect(this.scope.updateZoneInfo. adminGroupId).toEqual('id101112');
         expect(this.scope.updateZoneInfo.hiddenKey).toEqual('');
@@ -559,21 +563,21 @@ describe('Controller: ManageZonesController', function () {
 
     it('next page should call listZoneChangesByZoneId with the correct parameters', function () {
         var mockZoneChange = {data: {
-                zoneId: "c5c87405-2ec8-4e03-b2dc-c6758a5d9666",
-                zoneChanges: [{ zone: {
-            name: "dummy.",
-            email: "test@test.com",
-            status: "Active",
-            created: "2017-02-15T14:58:39Z",
-            account: "c8234503-bfda-4b80-897f-d74129051eaa",
-            acl: {rules: []},
-            adminGroupId: "c8234503-bfda-4b80-897f-d74129051eaa",
-            id: "c5c87405-2ec8-4e03-b2dc-c6758a5d9666",
-            shared: false,
-            status: "Active",
-            latestSync: "2017-02-15T14:58:39Z",
-            isTest: true
-        }}],maxItems: 100}};
+                                zoneId: "c5c87405-2ec8-4e03-b2dc-c6758a5d9666",
+                                zoneChanges: [{ zone: {
+                                    name: "dummy.",
+                                    email: "test@test.com",
+                                    status: "Active",
+                                    created: "2017-02-15T14:58:39Z",
+                                    account: "c8234503-bfda-4b80-897f-d74129051eaa",
+                                    acl: {rules: []},
+                                    adminGroupId: "c8234503-bfda-4b80-897f-d74129051eaa",
+                                    id: "c5c87405-2ec8-4e03-b2dc-c6758a5d9666",
+                                    shared: false,
+                                    status: "Active",
+                                    latestSync: "2017-02-15T14:58:39Z",
+                                    isTest: true
+                                }}],maxItems: 100}};
 
         var getZoneChanges = spyOn(this.zonesService, 'getZoneChanges')
             .and.stub()
@@ -592,21 +596,21 @@ describe('Controller: ManageZonesController', function () {
 
     it('prev page should call getZoneChanges with the correct parameters', function () {
         var mockZoneChange = {data: {
-                zoneId: "c5c87405-2ec8-4e03-b2dc-c6758a5d9666",
-                zoneChanges: [{ zone: {
-            name: "dummy.",
-            email: "test@test.com",
-            status: "Active",
-            created: "2017-02-15T14:58:39Z",
-            account: "c8234503-bfda-4b80-897f-d74129051eaa",
-            acl: {rules: []},
-            adminGroupId: "c8234503-bfda-4b80-897f-d74129051eaa",
-            id: "c5c87405-2ec8-4e03-b2dc-c6758a5d9666",
-            shared: false,
-            status: "Active",
-            latestSync: "2017-02-15T14:58:39Z",
-            isTest: true
-        }}],maxItems: 100}};
+                                zoneId: "c5c87405-2ec8-4e03-b2dc-c6758a5d9666",
+                                zoneChanges: [{ zone: {
+                                    name: "dummy.",
+                                    email: "test@test.com",
+                                    status: "Active",
+                                    created: "2017-02-15T14:58:39Z",
+                                    account: "c8234503-bfda-4b80-897f-d74129051eaa",
+                                    acl: {rules: []},
+                                    adminGroupId: "c8234503-bfda-4b80-897f-d74129051eaa",
+                                    id: "c5c87405-2ec8-4e03-b2dc-c6758a5d9666",
+                                    shared: false,
+                                    status: "Active",
+                                    latestSync: "2017-02-15T14:58:39Z",
+                                    isTest: true
+                                }}],maxItems: 100}};
 
         var getZoneChanges = spyOn(this.zonesService, 'getZoneChanges')
             .and.stub()
@@ -622,4 +626,33 @@ describe('Controller: ManageZonesController', function () {
         expect(getZoneChanges.calls.mostRecent().args).toEqual(
             [expectedMaxItems, expectedStartFrom, expectedZoneId]);
     });
+
+    it('test that we properly get Zone History data', function(){
+        this.scope.zoneChanges = {};
+        var mockZoneChange = {data: {
+                                zoneId: "c5c87405-2ec8-4e03-b2dc-c6758a5d9666",
+                                zoneChanges: [{ zone: {
+                                    name: "dummy.",
+                                    email: "test@test.com",
+                                    status: "Active",
+                                    created: "2017-02-15T14:58:39Z",
+                                    account: "c8234503-bfda-4b80-897f-d74129051eaa",
+                                    acl: {rules: []},
+                                    adminGroupId: "c8234503-bfda-4b80-897f-d74129051eaa",
+                                    id: "c5c87405-2ec8-4e03-b2dc-c6758a5d9666",
+                                    shared: false,
+                                    status: "Active",
+                                    latestSync: "2017-02-15T14:58:39Z",
+                                    isTest: true
+                                }}],maxItems: 100}};
+        var updateZoneChangeDisplay = spyOn(this.scope, 'updateZoneChangeDisplay')
+            .and.stub();
+        var getZoneChanges = spyOn(this.zonesService, 'getZoneChanges')
+                    .and.stub()
+                    .and.returnValue(this.q.when(mockZoneChange));
+        this.scope.refreshZoneChange();
+        this.scope.$digest();
+        expect(getZoneChanges.calls.count()).toBe(1);
+        expect(this.scope.zoneChanges).toEqual(mockZoneChange.data.zoneChanges);
+    });
 });

From 4c63161f0c22c91ed438961421d00cebe4f96e65 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Tue, 26 Jul 2022 18:02:55 +0530
Subject: [PATCH 078/147] Update

---
 .../app/views/zones/zoneTabs/zoneChangeHistory.scala.html   | 2 +-
 .../portal/public/lib/controllers/controller.manageZones.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/portal/app/views/zones/zoneTabs/zoneChangeHistory.scala.html b/modules/portal/app/views/zones/zoneTabs/zoneChangeHistory.scala.html
index 980db3ff7..9aa5ee249 100644
--- a/modules/portal/app/views/zones/zoneTabs/zoneChangeHistory.scala.html
+++ b/modules/portal/app/views/zones/zoneTabs/zoneChangeHistory.scala.html
@@ -50,7 +50,7 @@
                     <a ng-if="prevPageEnabled()" ng-click="prevPageZoneHistory()" class="paginate_button">Previous</a>
                 </li>
                 <li class="paginate_button next">
-                    <a ng-if="nextPageEnabled()" ng-click="nextPageAllZoneHistory()" class="paginate_button">Next</a>
+                    <a ng-if="nextPageEnabled()" ng-click="nextPageZoneHistory()" class="paginate_button">Next</a>
                 </li>
             </ul>
         </div>
diff --git a/modules/portal/public/lib/controllers/controller.manageZones.js b/modules/portal/public/lib/controllers/controller.manageZones.js
index a17c2115d..9ed1d1946 100644
--- a/modules/portal/public/lib/controllers/controller.manageZones.js
+++ b/modules/portal/public/lib/controllers/controller.manageZones.js
@@ -333,7 +333,7 @@ angular.module('controller.manageZones', [])
     $scope.updateZoneChangeDisplay = function (zoneChange) {
             for (var length = 0; length < zoneChange.length; length++) {
                 getZoneGroup(zoneChange[length].zone.adminGroupId, length);
-                getZoneUser(zoneChange[length].userId, length);
+                 getZoneUser(zoneChange[length].userId, length);
             }
         };
 
@@ -424,7 +424,7 @@ angular.module('controller.manageZones', [])
                 zoneHistoryPaging = pagingService.nextPageUpdate(zoneChanges, response.data.nextId, zoneHistoryPaging);
 
                 if (zoneChanges.length > 0) {
-                    $scope.updateZoneChangeDisplay(response.data.zoneChanges);
+                    $scope.zoneChanges = response.data.zoneChanges;
                 }
             })
             .catch(function (error) {
@@ -438,7 +438,7 @@ angular.module('controller.manageZones', [])
             .getZoneChanges(zoneHistoryPaging.maxItems, startFrom, $scope.zoneId )
             .then(function(response) {
                 zoneHistoryPaging = pagingService.prevPageUpdate(response.data.nextId, zoneHistoryPaging);
-                $scope.updateZoneChangeDisplay(response.data.zoneChanges);
+                $scope.zoneChanges = response.data.zoneChanges;
             })
             .catch(function (error) {
                 handleError(error,'zonesService::prevPage-failure');

From 61ba1ebca927f5b992fe1d9ae3e7e15359b1b7cb Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Tue, 26 Jul 2022 18:11:54 +0530
Subject: [PATCH 079/147] Update

---
 modules/portal/public/lib/controllers/controller.manageZones.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/portal/public/lib/controllers/controller.manageZones.js b/modules/portal/public/lib/controllers/controller.manageZones.js
index 9ed1d1946..bd9b6ae83 100644
--- a/modules/portal/public/lib/controllers/controller.manageZones.js
+++ b/modules/portal/public/lib/controllers/controller.manageZones.js
@@ -425,6 +425,7 @@ angular.module('controller.manageZones', [])
 
                 if (zoneChanges.length > 0) {
                     $scope.zoneChanges = response.data.zoneChanges;
+                    $scope.updateZoneChangeDisplay(response.data.zoneChanges)
                 }
             })
             .catch(function (error) {
@@ -439,6 +440,7 @@ angular.module('controller.manageZones', [])
             .then(function(response) {
                 zoneHistoryPaging = pagingService.prevPageUpdate(response.data.nextId, zoneHistoryPaging);
                 $scope.zoneChanges = response.data.zoneChanges;
+                $scope.updateZoneChangeDisplay(response.data.zoneChanges);
             })
             .catch(function (error) {
                 handleError(error,'zonesService::prevPage-failure');

From 54e377533cd3729cf64ca1f28bf26d0341196f74 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Thu, 28 Jul 2022 13:15:05 +0530
Subject: [PATCH 080/147] Update in tests

---
 .../controllers/TestApplicationData.scala     | 19 ++++++++
 .../test/controllers/VinylDNSSpec.scala       | 47 +++++++++++++++++--
 2 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/modules/portal/test/controllers/TestApplicationData.scala b/modules/portal/test/controllers/TestApplicationData.scala
index 6b94d4459..c0cda0083 100644
--- a/modules/portal/test/controllers/TestApplicationData.scala
+++ b/modules/portal/test/controllers/TestApplicationData.scala
@@ -196,6 +196,25 @@ trait TestApplicationData { this: Mockito =>
       | }
     """.stripMargin)
 
+  val hobbitZoneChange: JsValue = Json.parse(s"""{
+       | "zoneId":         "$hobbitZoneId",
+       | "zoneChanges":
+       |    [{ "zone": {
+       |             "name":           "$hobbitZoneName",
+       |             "email":          "hobbitAdmin@shire.me",
+       |             "status":         "Active",
+       |             "account":        "system",
+       |             "acl":            "rules",
+       |             "adminGroupId":   "$hobbitGroupId",
+       |             "id":             "$hobbitZoneId",
+       |             "shared":         false,
+       |             "status":         "Active",
+       |             "isTest":         true
+       |     }}],
+       | "maxItems":         100
+       | }
+    """.stripMargin)
+
   val hobbitZoneRequest: JsValue = Json.parse(s"""{
       | "name":           "hobbits",
       | "email":          "hobbitAdmin@shire.me",
diff --git a/modules/portal/test/controllers/VinylDNSSpec.scala b/modules/portal/test/controllers/VinylDNSSpec.scala
index 180683cf7..804276886 100644
--- a/modules/portal/test/controllers/VinylDNSSpec.scala
+++ b/modules/portal/test/controllers/VinylDNSSpec.scala
@@ -1502,12 +1502,52 @@ class VinylDNSSpec extends Specification with Mockito with TestApplicationData w
       }
     }
 
-    ".listZoneChanges" should {
+    ".getZoneChange" should {
+
+      "return ok (200) if the zoneChanges is found" in new WithApplication(app) {
+        val client = MockWS {
+          case (GET, u) if u == s"http://localhost:9001/zones/$hobbitZoneId/changes" =>
+            defaultActionBuilder { Results.Ok(hobbitZoneChange) }
+        }
+        val mockUserAccessor = mock[UserAccountAccessor]
+        mockUserAccessor.get(anyString).returns(IO.pure(Some(frodoUser)))
+        mockUserAccessor.getUserByKey(anyString).returns(IO.pure(Some(frodoUser)))
+        val underTest = withClient(client)
+        val result =
+          underTest.getZoneChange(hobbitZoneId)(
+            FakeRequest(GET, s"/zones/$hobbitZoneId/changes")
+              .withSession("username" -> frodoUser.userName, "accessKey" -> frodoUser.accessKey)
+          )
+
+        status(result) must beEqualTo(OK)
+        hasCacheHeaders(result)
+        contentAsJson(result) must beEqualTo(hobbitZoneChange)
+      }
+
+      "return a not found (404) if the zoneChanges does not exist" in new WithApplication(app) {
+        val client = MockWS {
+          case (GET, u) if u == s"http://localhost:9001/zones/not-hobbits/changes" =>
+            defaultActionBuilder { Results.NotFound }
+        }
+        val mockUserAccessor = mock[UserAccountAccessor]
+        mockUserAccessor.get(anyString).returns(IO.pure(Some(frodoUser)))
+        mockUserAccessor.getUserByKey(anyString).returns(IO.pure(Some(frodoUser)))
+        val underTest = withClient(client)
+        val result =
+          underTest.getZoneChange("not-hobbits")(
+            FakeRequest(GET, "/zones/not-hobbits/changes")
+              .withSession("username" -> frodoUser.userName, "accessKey" -> frodoUser.accessKey)
+          )
+
+        status(result) must beEqualTo(NOT_FOUND)
+        hasCacheHeaders(result)
+      }
+
       "return unauthorized (401) if requesting user is not logged in" in new WithApplication(app) {
         val client = mock[WSClient]
         val underTest = withClient(client)
         val result =
-          underTest.listRecordSetChanges(hobbitZoneId)(
+          underTest.getZoneChange(hobbitZoneId)(
             FakeRequest(GET, s"/api/zones/$hobbitZoneId/changes")
           )
 
@@ -1515,10 +1555,11 @@ class VinylDNSSpec extends Specification with Mockito with TestApplicationData w
         hasCacheHeaders(result)
         contentAsString(result) must beEqualTo("You are not logged in. Please login to continue.")
       }
+
       "return forbidden (403) if user account is locked" in new WithApplication(app) {
         val client = mock[WSClient]
         val underTest = withLockedClient(client)
-        val result = underTest.listRecordSetChanges(hobbitZoneId)(
+        val result = underTest.getZoneChange(hobbitZoneId)(
           FakeRequest(GET, s"/api/zones/$hobbitZoneId/changes").withSession(
             "username" -> lockedFrodoUser.userName,
             "accessKey" -> lockedFrodoUser.accessKey

From 77fdcaf3c8150b597e6f80bfc15e3a6c1cc42125 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Thu, 28 Jul 2022 16:04:47 +0530
Subject: [PATCH 081/147] Make requested changes

---
 .../domain/membership/MembershipService.scala | 14 ++++++------
 .../membership/MembershipServiceSpec.scala    |  2 +-
 modules/portal/app/controllers/VinylDNS.scala |  2 --
 .../app/views/groups/groupDetail.scala.html   |  2 +-
 .../lib/controllers/controller.membership.js  |  7 +++++-
 .../controllers/TestApplicationData.scala     | 22 +++++++++++++++++++
 .../test/controllers/VinylDNSSpec.scala       | 19 ++++++++++++++++
 7 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
index 99a770ab7..c09f3f6da 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
@@ -257,29 +257,29 @@ class MembershipService(
       val sb = new StringBuilder
       if (change.oldGroup.isDefined) {
         if (change.oldGroup.get.name != change.newGroup.name) {
-          sb.append(s"Group name changed to '${change.newGroup.name}'.")
+          sb.append(s"Group name changed to '${change.newGroup.name}'. ")
         }
         if (change.oldGroup.get.email != change.newGroup.email) {
-          sb.append(s"Group email changed to '${change.newGroup.email}'.")
+          sb.append(s"Group email changed to '${change.newGroup.email}'. ")
         }
         if (change.oldGroup.get.description != change.newGroup.description) {
-          sb.append(s"Group description changed to '${change.newGroup.description.get}'.")
+          sb.append(s"Group description changed to '${change.newGroup.description.get}'. ")
         }
         val adminAddDifference = change.newGroup.adminUserIds.diff(change.oldGroup.get.adminUserIds)
         if (adminAddDifference.nonEmpty) {
-          sb.append(s"Group admin/s with userId/s (${adminAddDifference.mkString(",")}) added.")
+          sb.append(s"Group admin/s with userId/s (${adminAddDifference.mkString(",")}) added. ")
         }
         val adminRemoveDifference = change.oldGroup.get.adminUserIds.diff(change.newGroup.adminUserIds)
         if (adminRemoveDifference.nonEmpty) {
-          sb.append(s"Group admin/s with userId/s (${adminRemoveDifference.mkString(",")}) removed.")
+          sb.append(s"Group admin/s with userId/s (${adminRemoveDifference.mkString(",")}) removed. ")
         }
         val memberAddDifference = change.newGroup.memberIds.diff(change.oldGroup.get.memberIds)
         if (memberAddDifference.nonEmpty) {
-          sb.append(s"Group member/s with userId/s (${memberAddDifference.mkString(",")}) added.")
+          sb.append(s"Group member/s with userId/s (${memberAddDifference.mkString(",")}) added. ")
         }
         val memberRemoveDifference = change.oldGroup.get.memberIds.diff(change.newGroup.memberIds)
         if (memberRemoveDifference.nonEmpty) {
-          sb.append(s"Group member/s with userId/s (${memberRemoveDifference.mkString(",")}) removed.")
+          sb.append(s"Group member/s with userId/s (${memberRemoveDifference.mkString(",")}) removed. ")
         }
         groupChangeMessage = groupChangeMessage :+ sb.toString()
       }
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
index 0db7cd3d7..7f8e35aca 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
@@ -773,7 +773,7 @@ class MembershipServiceSpec
         // Newly created group won't have group change message
         result(0) shouldBe ""
         // Updated group with group change message
-        result(1) shouldBe "Group name changed to 'dummy-group'.Group email changed to 'dummy@test.com'.Group description changed to 'dummy group'.Group admin/s with userId/s (12345-abcde-6789,56789-edcba-1234) added.Group admin/s with userId/s (ok) removed.Group member/s with userId/s (12345-abcde-6789,56789-edcba-1234) added.Group member/s with userId/s (ok) removed."
+        result(1) shouldBe "Group name changed to 'dummy-group'. Group email changed to 'dummy@test.com'. Group description changed to 'dummy group'. Group admin/s with userId/s (12345-abcde-6789,56789-edcba-1234) added. Group admin/s with userId/s (ok) removed. Group member/s with userId/s (12345-abcde-6789,56789-edcba-1234) added. Group member/s with userId/s (ok) removed. "
       }
     }
 
diff --git a/modules/portal/app/controllers/VinylDNS.scala b/modules/portal/app/controllers/VinylDNS.scala
index 376b8da46..669507bfa 100644
--- a/modules/portal/app/controllers/VinylDNS.scala
+++ b/modules/portal/app/controllers/VinylDNS.scala
@@ -215,7 +215,6 @@ class VinylDNS @Inject() (
   }
 
   def listGroupChanges(id: String): Action[AnyContent] = userAction.async { implicit request =>
-    // $COVERAGE-OFF$
     val queryParameters = new HashMap[String, java.util.List[String]]()
     for {
       (name, values) <- request.queryString
@@ -230,7 +229,6 @@ class VinylDNS @Inject() (
       Status(response.status)(response.body)
         .withHeaders(cacheHeaders: _*)
     })
-    // $COVERAGE-ON$
   }
 
   def getUser(id: String): Action[AnyContent] = userAction.async { implicit request =>
diff --git a/modules/portal/app/views/groups/groupDetail.scala.html b/modules/portal/app/views/groups/groupDetail.scala.html
index 73c39ba08..62717c8d2 100644
--- a/modules/portal/app/views/groups/groupDetail.scala.html
+++ b/modules/portal/app/views/groups/groupDetail.scala.html
@@ -150,7 +150,7 @@
                                             <td>{{change.created}}</td>
                                             <td>{{change.id}}</td>
                                             <td>{{change.changeType}}</td>
-                                            <td class="col-md-3 wrap-long-text">{{change.groupChangeMessage}}</td>
+                                            <td class="col-md-3 wrap-long-text" ng-bind-html="changeMessage(change.groupChangeMessage)"></td>
                                             <td class="col-md-3 wrap-long-text">
                                                 <a ng-if="change.changeType =='Create'" ng-click="viewGroupInfo(change.newGroup)" class="force-cursor">View created group</a>
 
diff --git a/modules/portal/public/lib/controllers/controller.membership.js b/modules/portal/public/lib/controllers/controller.membership.js
index cd196e018..78bd7a427 100644
--- a/modules/portal/public/lib/controllers/controller.membership.js
+++ b/modules/portal/public/lib/controllers/controller.membership.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-angular.module('controller.membership', []).controller('MembershipController', function ($scope, $log, $location, $timeout, pagingService,
+angular.module('controller.membership', []).controller('MembershipController', function ($scope, $log, $location, $sce, $timeout, pagingService,
                                                                                          groupsService, profileService, utilityService) {
 
     $scope.membership = { members: [], group: {} };
@@ -36,6 +36,11 @@ angular.module('controller.membership', []).controller('MembershipController', f
         }
     };
 
+    $scope.changeMessage = function (groupChangeMessage) {
+        message = groupChangeMessage.replaceAll('. ', '.<br>')
+        return $sce.trustAsHtml(message);
+    };
+
     // paging status for group changes
     var changePaging = pagingService.getNewPagingParams(100);
 
diff --git a/modules/portal/test/controllers/TestApplicationData.scala b/modules/portal/test/controllers/TestApplicationData.scala
index 6b94d4459..ae9a0b0e1 100644
--- a/modules/portal/test/controllers/TestApplicationData.scala
+++ b/modules/portal/test/controllers/TestApplicationData.scala
@@ -145,6 +145,28 @@ trait TestApplicationData { this: Mockito =>
        | }
     """.stripMargin)
 
+  val hobbitGroupChanges: JsValue = Json.parse(s"""{
+       | "changes": [{
+       | "newGroup": {
+       | "id":          "$hobbitGroupId",
+       | "name":        "hobbits",
+       | "email":       "hobbitAdmin@shire.me",
+       | "description": "Hobbits of the shire",
+       | "members":     [ { "id": "${frodoUser.id}" },  { "id": "samwise-userId" } ],
+       | "admins":      [ { "id": "${frodoUser.id}" } ]
+       | },
+       | "changeType": "Create",
+       | "userId": "${frodoUser.id}",
+       | "oldGroup": {},
+       | "id": "b6018a9b-c893-40e9-aa25-4ccfee460c18",
+       | "created": "2022-07-22T08:19:22Z",
+       | "userName": "$frodoUser",
+       | "groupChangeMessage": ""
+       | }],
+       | "maxItems": 100
+       | }
+    """.stripMargin)
+
   val ringbearerGroup: JsValue = Json.parse(
     s"""{
        |  "id":          "ringbearer-group-uuid",
diff --git a/modules/portal/test/controllers/VinylDNSSpec.scala b/modules/portal/test/controllers/VinylDNSSpec.scala
index d4bace632..43f158305 100644
--- a/modules/portal/test/controllers/VinylDNSSpec.scala
+++ b/modules/portal/test/controllers/VinylDNSSpec.scala
@@ -801,6 +801,25 @@ class VinylDNSSpec extends Specification with Mockito with TestApplicationData w
     }
 
     ".listGroupChanges" should {
+      "return group changes - status ok (200)" in new WithApplication(app) {
+        val client = MockWS {
+          case (GET, u) if u == s"http://localhost:9001/groups/${hobbitGroupId}/activity" =>
+            defaultActionBuilder { Results.Ok(hobbitGroupChanges) }
+        }
+        val mockUserAccessor = mock[UserAccountAccessor]
+        mockUserAccessor.get(anyString).returns(IO.pure(Some(frodoUser)))
+        mockUserAccessor.getUserByKey(anyString).returns(IO.pure(Some(frodoUser)))
+        val underTest = withClient(client)
+        val result =
+          underTest.listGroupChanges(hobbitGroupId)(
+            FakeRequest(GET, s"/groups/$hobbitGroupId/activity")
+              .withSession("username" -> frodoUser.userName, "accessKey" -> frodoUser.accessKey)
+          )
+
+        status(result) must beEqualTo(OK)
+        hasCacheHeaders(result)
+        contentAsJson(result) must beEqualTo(hobbitGroupChanges)
+      }
       "return unauthorized (401) if requesting user is not logged in" in new WithApplication(app) {
         val client = mock[WSClient]
         val underTest = withClient(client)

From 49bf335222b0f841f61ca4593ab86a1072b5397a Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Thu, 28 Jul 2022 16:29:06 +0530
Subject: [PATCH 082/147] Use trim

---
 .../vinyldns/api/domain/membership/MembershipService.scala      | 2 +-
 .../vinyldns/api/domain/membership/MembershipServiceSpec.scala  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
index c09f3f6da..2b7087f86 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
@@ -281,7 +281,7 @@ class MembershipService(
         if (memberRemoveDifference.nonEmpty) {
           sb.append(s"Group member/s with userId/s (${memberRemoveDifference.mkString(",")}) removed. ")
         }
-        groupChangeMessage = groupChangeMessage :+ sb.toString()
+        groupChangeMessage = groupChangeMessage :+ sb.toString().trim
       }
       // It'll be a newly created group, so we will have no group change message
       else {
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
index 7f8e35aca..bdae944dd 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
@@ -773,7 +773,7 @@ class MembershipServiceSpec
         // Newly created group won't have group change message
         result(0) shouldBe ""
         // Updated group with group change message
-        result(1) shouldBe "Group name changed to 'dummy-group'. Group email changed to 'dummy@test.com'. Group description changed to 'dummy group'. Group admin/s with userId/s (12345-abcde-6789,56789-edcba-1234) added. Group admin/s with userId/s (ok) removed. Group member/s with userId/s (12345-abcde-6789,56789-edcba-1234) added. Group member/s with userId/s (ok) removed. "
+        result(1) shouldBe "Group name changed to 'dummy-group'. Group email changed to 'dummy@test.com'. Group description changed to 'dummy group'. Group admin/s with userId/s (12345-abcde-6789,56789-edcba-1234) added. Group admin/s with userId/s (ok) removed. Group member/s with userId/s (12345-abcde-6789,56789-edcba-1234) added. Group member/s with userId/s (ok) removed."
       }
     }
 

From 6fd4f730b116fa7b67c80a5ab699a34c37a323ac Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 29 Jul 2022 12:37:48 +0530
Subject: [PATCH 083/147] Add route for single group change

---
 .../domain/membership/MembershipService.scala | 25 ++++-
 .../membership/MembershipServiceAlgebra.scala |  2 +
 .../membership/MembershipValidations.scala    |  7 +-
 .../api/route/MembershipRouting.scala         |  7 ++
 .../membership/MembershipServiceSpec.scala    | 63 +++++++++++-
 .../MembershipValidationsSpec.scala           | 11 +++
 .../membership/GroupChangeRepository.scala    |  3 +-
 modules/portal/app/controllers/VinylDNS.scala |  9 ++
 modules/portal/conf/routes                    |  1 +
 .../controllers/TestApplicationData.scala     | 20 ++++
 .../test/controllers/VinylDNSSpec.scala       | 98 +++++++++++++++++++
 11 files changed, 239 insertions(+), 7 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
index 2b7087f86..e072bce30 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
@@ -227,6 +227,23 @@ class MembershipService(
     ListMyGroupsResponse(groups, groupNameFilter, startFrom, nextId, maxItems, ignoreAccess)
   }
 
+  def getGroupChange(
+    groupChangeId: String,
+    authPrincipal: AuthPrincipal
+  ): Result[GroupChangeInfo] =
+    for {
+      result <- groupChangeRepo
+        .getGroupChange(groupChangeId)
+        .toResult[Option[GroupChange]]
+      _ <- isGroupChangePresent(result).toResult
+      _ <- canSeeGroup(result.get.newGroup.id, authPrincipal).toResult
+      groupChangeMessage <- determineGroupDifference(Seq(result.get))
+      groupChanges = (groupChangeMessage, Seq(result.get)).zipped.map{ (a, b) => b.copy(groupChangeMessage = Some(a)) }
+      userIds = Seq(result.get).map(_.userId).toSet
+      users <- getUsers(userIds).map(_.users)
+      userMap = users.map(u => (u.id, u.userName)).toMap
+    } yield groupChanges.map(change => GroupChangeInfo.apply(change.copy(userName = userMap.get(change.userId)))).head
+
   def getGroupActivity(
       groupId: String,
       startFrom: Option[String],
@@ -283,8 +300,14 @@ class MembershipService(
         }
         groupChangeMessage = groupChangeMessage :+ sb.toString().trim
       }
-      // It'll be a newly created group, so we will have no group change message
+      // It'll be in else statement if the group was created or deleted
       else {
+        if (change.changeType == GroupChangeType.Create) {
+          sb.append("Group Created.")
+        }
+        else if (change.changeType == GroupChangeType.Delete){
+          sb.append("Group Deleted.")
+        }
         groupChangeMessage = groupChangeMessage :+ sb.toString()
       }
     }
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipServiceAlgebra.scala b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipServiceAlgebra.scala
index 5fb2f737b..c71d62c2a 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipServiceAlgebra.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipServiceAlgebra.scala
@@ -39,6 +39,8 @@ trait MembershipServiceAlgebra {
 
   def getGroup(id: String, authPrincipal: AuthPrincipal): Result[Group]
 
+  def getGroupChange(id: String, authPrincipal: AuthPrincipal): Result[GroupChangeInfo]
+
   def listMyGroups(
       groupNameFilter: Option[String],
       startFrom: Option[String],
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipValidations.scala
index cccd1d5e2..898caff91 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipValidations.scala
@@ -19,7 +19,7 @@ package vinyldns.api.domain.membership
 import vinyldns.api.Interfaces.ensuring
 import vinyldns.core.domain.auth.AuthPrincipal
 import vinyldns.api.domain.zone.NotAuthorizedError
-import vinyldns.core.domain.membership.Group
+import vinyldns.core.domain.membership.{Group, GroupChange}
 
 object MembershipValidations {
 
@@ -44,4 +44,9 @@ object MembershipValidations {
     ensuring(NotAuthorizedError("Not authorized")) {
       authPrincipal.isGroupMember(groupId) || authPrincipal.isSystemAdmin || canViewGroupDetails
     }
+
+  def isGroupChangePresent(groupChange: Option[GroupChange]): Either[Throwable, Unit] =
+    ensuring(InvalidGroupRequestError("Invalid Group Change ID")) {
+      groupChange.isDefined
+  }
 }
diff --git a/modules/api/src/main/scala/vinyldns/api/route/MembershipRouting.scala b/modules/api/src/main/scala/vinyldns/api/route/MembershipRouting.scala
index 620c6d79f..fdcebc848 100644
--- a/modules/api/src/main/scala/vinyldns/api/route/MembershipRouting.scala
+++ b/modules/api/src/main/scala/vinyldns/api/route/MembershipRouting.scala
@@ -178,6 +178,13 @@ class MembershipRoute(
         }
       }
     } ~
+    path("groups" / "change" / Segment) { groupChangeId =>
+      (get & monitor("Endpoint.groupSingleChange")) {
+        authenticateAndExecute(membershipService.getGroupChange(groupChangeId, _)) { groupChange =>
+          complete(StatusCodes.OK, groupChange)
+        }
+      }
+    } ~
     path("users" / Segment / "lock") { id =>
       (put & monitor("Endpoint.lockUser")) {
         authenticateAndExecute(membershipService.updateUserLockStatus(id, LockStatus.Locked, _)) {
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
index bdae944dd..c1ac648a3 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipServiceSpec.scala
@@ -714,6 +714,59 @@ class MembershipServiceSpec
       }
     }
 
+    "getGroupChange" should {
+      "return the single group change" in {
+        val groupChangeRepoResponse = listOfDummyGroupChanges.take(1).head
+        doReturn(IO.pure(Option(groupChangeRepoResponse)))
+          .when(mockGroupChangeRepo)
+          .getGroupChange(anyString)
+
+        doReturn(IO.pure(ListUsersResults(Seq(dummyUser), Some("1"))))
+          .when(mockUserRepo)
+          .getUsers(any[Set[String]], any[Option[String]], any[Option[Int]])
+
+        val userMap = Seq(dummyUser).map(u => (u.id, u.userName)).toMap
+        val expected: GroupChangeInfo =
+          listOfDummyGroupChanges.map(change => GroupChangeInfo.apply(change.copy(userName = userMap.get(change.userId)))).take(1).head
+
+        val result: GroupChangeInfo =
+          rightResultOf(underTest.getGroupChange(dummyGroup.id, dummyAuth).value)
+        result shouldBe expected
+      }
+
+      "return the single group change even if the user is not authorized" in {
+        val groupChangeRepoResponse = listOfDummyGroupChanges.take(1).head
+        doReturn(IO.pure(Some(groupChangeRepoResponse)))
+          .when(mockGroupChangeRepo)
+          .getGroupChange(anyString)
+
+        doReturn(IO.pure(ListUsersResults(Seq(dummyUser), Some("1"))))
+          .when(mockUserRepo)
+          .getUsers(any[Set[String]], any[Option[String]], any[Option[Int]])
+
+        val userMap = Seq(dummyUser).map(u => (u.id, u.userName)).toMap
+        val expected: GroupChangeInfo =
+          listOfDummyGroupChanges.map(change => GroupChangeInfo.apply(change.copy(userName = userMap.get(change.userId)))).take(1).head
+
+        val result: GroupChangeInfo =
+          rightResultOf(underTest.getGroupChange(dummyGroup.id, okAuth).value)
+        result shouldBe expected
+      }
+
+      "return a InvalidGroupRequestError if the group change id is not valid" in {
+        doReturn(IO.pure(None))
+          .when(mockGroupChangeRepo)
+          .getGroupChange(anyString)
+
+        doReturn(IO.pure(ListUsersResults(Seq(dummyUser), Some("1"))))
+          .when(mockUserRepo)
+          .getUsers(any[Set[String]], any[Option[String]], any[Option[Int]])
+
+        val result = leftResultOf(underTest.getGroupChange(dummyGroup.id, okAuth).value)
+        result shouldBe a[InvalidGroupRequestError]
+      }
+    }
+
     "getGroupActivity" should {
       "return the group activity" in {
         val groupChangeRepoResponse = ListGroupChangesResults(
@@ -768,12 +821,14 @@ class MembershipServiceSpec
 
     "determine group difference" should {
       "return difference between two groups" in {
-        val groupChange = Seq(okGroupChange, dummyGroupChangeUpdate)
+        val groupChange = Seq(okGroupChange, dummyGroupChangeUpdate, okGroupChange.copy(changeType = GroupChangeType.Delete))
         val result: Seq[String] = rightResultOf(underTest.determineGroupDifference(groupChange).value)
-        // Newly created group won't have group change message
-        result(0) shouldBe ""
-        // Updated group with group change message
+        // Newly created group's change message
+        result(0) shouldBe "Group Created."
+        // Updated group's change message
         result(1) shouldBe "Group name changed to 'dummy-group'. Group email changed to 'dummy@test.com'. Group description changed to 'dummy group'. Group admin/s with userId/s (12345-abcde-6789,56789-edcba-1234) added. Group admin/s with userId/s (ok) removed. Group member/s with userId/s (12345-abcde-6789,56789-edcba-1234) added. Group member/s with userId/s (ok) removed."
+        // Deleted group's change message
+        result(2) shouldBe "Group Deleted."
       }
     }
 
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipValidationsSpec.scala
index 84e7e842c..c59eb2fa0 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/membership/MembershipValidationsSpec.scala
@@ -96,5 +96,16 @@ class MembershipValidationsSpec
       }
 
     }
+
+    "isGroupChangePresent" should {
+      "return true when there is a group change present for the requested group change id" in {
+        isGroupChangePresent(Some(okGroupChange)) should be(right)
+      }
+      "return an error when there is a group change present for the requested group change id" in {
+        val error = leftValue(isGroupChangePresent(None))
+        error shouldBe an[InvalidGroupRequestError]
+      }
+
+    }
   }
 }
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/membership/GroupChangeRepository.scala b/modules/core/src/main/scala/vinyldns/core/domain/membership/GroupChangeRepository.scala
index 846522b78..6a99302e6 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/membership/GroupChangeRepository.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/membership/GroupChangeRepository.scala
@@ -24,7 +24,8 @@ import vinyldns.core.repository.Repository
 trait GroupChangeRepository extends Repository {
   def save(db: DB, groupChange: GroupChange): IO[GroupChange]
 
-  def getGroupChange(groupChangeId: String): IO[Option[GroupChange]] // For testing
+  def getGroupChange(groupChangeId: String): IO[Option[GroupChange]]
+
   def getGroupChanges(
       groupId: String,
       startFrom: Option[String],
diff --git a/modules/portal/app/controllers/VinylDNS.scala b/modules/portal/app/controllers/VinylDNS.scala
index 669507bfa..d26be6728 100644
--- a/modules/portal/app/controllers/VinylDNS.scala
+++ b/modules/portal/app/controllers/VinylDNS.scala
@@ -214,6 +214,15 @@ class VinylDNS @Inject() (
     })
   }
 
+  def getGroupChange(gcid: String): Action[AnyContent] = userAction.async { implicit request =>
+    val vinyldnsRequest = VinylDNSRequest("GET", s"$vinyldnsServiceBackend", s"groups/change/$gcid")
+    executeRequest(vinyldnsRequest, request.user).map(response => {
+      logger.info(s"group change [$gcid] retrieved with status [${response.status}]")
+      Status(response.status)(response.body)
+        .withHeaders(cacheHeaders: _*)
+    })
+  }
+
   def listGroupChanges(id: String): Action[AnyContent] = userAction.async { implicit request =>
     val queryParameters = new HashMap[String, java.util.List[String]]()
     for {
diff --git a/modules/portal/conf/routes b/modules/portal/conf/routes
index 714bccc42..ca6e59674 100644
--- a/modules/portal/conf/routes
+++ b/modules/portal/conf/routes
@@ -45,6 +45,7 @@ GET           /api/zones/:id/recordsetchanges    @controllers.VinylDNS.listRecor
 GET           /api/groups                        @controllers.VinylDNS.getGroups
 GET           /api/groups/:gid                   @controllers.VinylDNS.getGroup(gid: String)
 GET           /api/groups/:gid/groupchanges      @controllers.VinylDNS.listGroupChanges(gid: String)
+GET           /api/groups/change/:gcid           @controllers.VinylDNS.getGroupChange(gcid: String)
 POST          /api/groups                        @controllers.VinylDNS.newGroup
 PUT           /api/groups/:gid                   @controllers.VinylDNS.updateGroup(gid: String)
 DELETE        /api/groups/:gid                   @controllers.VinylDNS.deleteGroup(gid: String)
diff --git a/modules/portal/test/controllers/TestApplicationData.scala b/modules/portal/test/controllers/TestApplicationData.scala
index ae9a0b0e1..db82d6baa 100644
--- a/modules/portal/test/controllers/TestApplicationData.scala
+++ b/modules/portal/test/controllers/TestApplicationData.scala
@@ -145,6 +145,26 @@ trait TestApplicationData { this: Mockito =>
        | }
     """.stripMargin)
 
+  val hobbitGroupChangeId = "b6018a9b-c893-40e9-aa25-4ccfee460c18"
+  val hobbitGroupChange: JsValue = Json.parse(s"""{
+      | "newGroup": {
+      | "id":          "$hobbitGroupId",
+      | "name":        "hobbits",
+      | "email":       "hobbitAdmin@shire.me",
+      | "description": "Hobbits of the shire",
+      | "members":     [ { "id": "${frodoUser.id}" },  { "id": "samwise-userId" } ],
+      | "admins":      [ { "id": "${frodoUser.id}" } ]
+      | },
+      | "changeType": "Create",
+      | "userId": "${frodoUser.id}",
+      | "oldGroup": {},
+      | "id": "b6018a9b-c893-40e9-aa25-4ccfee460c18",
+      | "created": "2022-07-22T08:19:22Z",
+      | "userName": "$frodoUser",
+      | "groupChangeMessage": ""
+      | }
+    """.stripMargin)
+
   val hobbitGroupChanges: JsValue = Json.parse(s"""{
        | "changes": [{
        | "newGroup": {
diff --git a/modules/portal/test/controllers/VinylDNSSpec.scala b/modules/portal/test/controllers/VinylDNSSpec.scala
index 43f158305..2dc582348 100644
--- a/modules/portal/test/controllers/VinylDNSSpec.scala
+++ b/modules/portal/test/controllers/VinylDNSSpec.scala
@@ -800,6 +800,104 @@ class VinylDNSSpec extends Specification with Mockito with TestApplicationData w
       }
     }
 
+    ".getGroupChange" should {
+      tag("slow")
+      "return the group change if it is found - status ok (200)" in new WithApplication(app) {
+        val client = MockWS {
+          case (GET, u) if u == s"http://localhost:9001/groups/change/${hobbitGroupChangeId}" =>
+            defaultActionBuilder { Results.Ok(hobbitGroupChange) }
+        }
+
+        val mockUserAccessor = mock[UserAccountAccessor]
+        mockUserAccessor.get(anyString).returns(IO.pure(Some(frodoUser)))
+        mockUserAccessor.getUserByKey(anyString).returns(IO.pure(Some(frodoUser)))
+        val underTest = withClient(client)
+        val result =
+          underTest.getGroupChange(hobbitGroupChangeId)(
+            FakeRequest(GET, s"/groups/change/$hobbitGroupChangeId")
+              .withSession("username" -> frodoUser.userName, "accessKey" -> frodoUser.accessKey)
+          )
+
+        status(result) must beEqualTo(OK)
+        hasCacheHeaders(result)
+        contentAsJson(result) must beEqualTo(hobbitGroupChange)
+      }
+      "return authentication failed (401) when auth fails in the backend" in new WithApplication(
+        app
+      ) {
+        val client = MockWS {
+          case (GET, u) if u == s"http://localhost:9001/groups/change/${hobbitGroupChangeId}" =>
+            defaultActionBuilder { Results.Unauthorized("Invalid credentials") }
+        }
+        val mockUserAccessor = mock[UserAccountAccessor]
+        mockUserAccessor.get(anyString).returns(IO.pure(Some(frodoUser)))
+        mockUserAccessor.getUserByKey(anyString).returns(IO.pure(Some(frodoUser)))
+        val underTest = withClient(client)
+        val result =
+          underTest.getGroupChange(hobbitGroupChangeId)(
+            FakeRequest(GET, s"/groups/change/$hobbitGroupChangeId")
+              .withSession("username" -> frodoUser.userName, "accessKey" -> frodoUser.accessKey)
+          )
+
+        status(result) must beEqualTo(UNAUTHORIZED)
+        hasCacheHeaders(result)
+      }
+      "return a not found (404) if the group change does not exist" in new WithApplication(app) {
+        val client = MockWS {
+          case (GET, u) if u == "http://localhost:9001/groups/change/not-hobbits" =>
+            defaultActionBuilder { Results.NotFound }
+        }
+        val mockUserAccessor = mock[UserAccountAccessor]
+        mockUserAccessor.get(anyString).returns(IO.pure(Some(frodoUser)))
+        mockUserAccessor.getUserByKey(anyString).returns(IO.pure(Some(frodoUser)))
+        val underTest = withClient(client)
+        val result = underTest.getGroupChange("not-hobbits")(
+          FakeRequest(GET, "/groups/change/not-hobbits")
+            .withSession("username" -> frodoUser.userName, "accessKey" -> frodoUser.accessKey)
+        )
+
+        status(result) must beEqualTo(NOT_FOUND)
+        hasCacheHeaders(result)
+      }
+      "return status forbidden (403) if the user account is locked" in new WithApplication(app) {
+        val client = mock[WSClient]
+        val underTest =
+          TestVinylDNS(
+            testConfigLdap,
+            mockLdapAuthenticator,
+            mockLockedUserAccessor,
+            client,
+            components,
+            crypto,
+            mockOidcAuth
+          )
+        val result =
+          underTest.getGroupChange(hobbitGroupChangeId)(
+            FakeRequest(GET, s"/groups/change/$hobbitGroupChangeId")
+              .withSession(
+                "username" -> lockedFrodoUser.userName,
+                "accessKey" -> lockedFrodoUser.accessKey
+              )
+          )
+
+        status(result) mustEqual 403
+        hasCacheHeaders(result)
+        contentAsString(result) must beEqualTo(
+          s"User account for `${lockedFrodoUser.userName}` is locked."
+        )
+      }
+      "return unauthorized (401) if user is not logged in" in new WithApplication(app) {
+        val client = mock[WSClient]
+        val underTest = withClient(client)
+        val result =
+          underTest.getGroupChange(hobbitGroupChangeId)(FakeRequest(GET, s"/groups/change/$hobbitGroupChangeId"))
+
+        status(result) must beEqualTo(401)
+        contentAsString(result) must beEqualTo("You are not logged in. Please login to continue.")
+        hasCacheHeaders(result)
+      }
+    }
+
     ".listGroupChanges" should {
       "return group changes - status ok (200)" in new WithApplication(app) {
         val client = MockWS {

From 2c3c87fa7e32ba79865a8d0b138b6c9e78638cc3 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 29 Jul 2022 13:03:21 +0530
Subject: [PATCH 084/147] Add route test

---
 .../api/route/MembershipRoutingSpec.scala     | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/modules/api/src/test/scala/vinyldns/api/route/MembershipRoutingSpec.scala b/modules/api/src/test/scala/vinyldns/api/route/MembershipRoutingSpec.scala
index 6f6298c75..e3781fc56 100644
--- a/modules/api/src/test/scala/vinyldns/api/route/MembershipRoutingSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/route/MembershipRoutingSpec.scala
@@ -296,6 +296,28 @@ class MembershipRoutingSpec
     }
   }
 
+  "GET group change" should {
+    "return a 200 response with the group change when found" in {
+      val grpChange = GroupChangeInfo(okGroupChange)
+      doReturn(result(grpChange)).when(membershipService).getGroupChange("ok", okAuth)
+      Get("/groups/change/ok") ~> Route.seal(membershipRoute) ~> check {
+        status shouldBe StatusCodes.OK
+
+        val result = responseAs[GroupChangeInfo]
+        result shouldBe grpChange
+      }
+    }
+
+    "return a 400 Bad Request when the group change id is not valid" in {
+      doReturn(result(InvalidGroupRequestError("Invalid Group Change ID")))
+        .when(membershipService)
+        .getGroupChange("notValid", okAuth)
+      Get("/groups/change/notValid") ~> Route.seal(membershipRoute) ~> check {
+        status shouldBe StatusCodes.BadRequest
+      }
+    }
+  }
+
   "DELETE group" should {
     "return a 200 response with the deleted group when it exists" in {
       val grpBaseTime = deletedGroup.copy(created = baseTime)

From 0ac4c35ced5d61e8ebc11743a7a478804aa6f9db Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 29 Jul 2022 13:07:32 +0530
Subject: [PATCH 085/147] Update route test

---
 .../api/route/MembershipRoutingSpec.scala     | 53 +++++++++++--------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/modules/api/src/test/scala/vinyldns/api/route/MembershipRoutingSpec.scala b/modules/api/src/test/scala/vinyldns/api/route/MembershipRoutingSpec.scala
index e3781fc56..22a8d15f1 100644
--- a/modules/api/src/test/scala/vinyldns/api/route/MembershipRoutingSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/route/MembershipRoutingSpec.scala
@@ -296,28 +296,6 @@ class MembershipRoutingSpec
     }
   }
 
-  "GET group change" should {
-    "return a 200 response with the group change when found" in {
-      val grpChange = GroupChangeInfo(okGroupChange)
-      doReturn(result(grpChange)).when(membershipService).getGroupChange("ok", okAuth)
-      Get("/groups/change/ok") ~> Route.seal(membershipRoute) ~> check {
-        status shouldBe StatusCodes.OK
-
-        val result = responseAs[GroupChangeInfo]
-        result shouldBe grpChange
-      }
-    }
-
-    "return a 400 Bad Request when the group change id is not valid" in {
-      doReturn(result(InvalidGroupRequestError("Invalid Group Change ID")))
-        .when(membershipService)
-        .getGroupChange("notValid", okAuth)
-      Get("/groups/change/notValid") ~> Route.seal(membershipRoute) ~> check {
-        status shouldBe StatusCodes.BadRequest
-      }
-    }
-  }
-
   "DELETE group" should {
     "return a 200 response with the deleted group when it exists" in {
       val grpBaseTime = deletedGroup.copy(created = baseTime)
@@ -752,6 +730,37 @@ class MembershipRoutingSpec
     }
   }
 
+  "GET group change" should {
+    "return a 200 response with the group change when found" in {
+      val grpChange = GroupChangeInfo(okGroupChange)
+      doReturn(result(grpChange)).when(membershipService).getGroupChange("ok", okAuth)
+      Get("/groups/change/ok") ~> Route.seal(membershipRoute) ~> check {
+        status shouldBe StatusCodes.OK
+
+        val result = responseAs[GroupChangeInfo]
+        result shouldBe grpChange
+      }
+    }
+
+    "return a 400 Bad Request when the group change id is not valid" in {
+      doReturn(result(InvalidGroupRequestError("Invalid Group Change ID")))
+        .when(membershipService)
+        .getGroupChange("notValid", okAuth)
+      Get("/groups/change/notValid") ~> Route.seal(membershipRoute) ~> check {
+        status shouldBe StatusCodes.BadRequest
+      }
+    }
+
+    "return a 500 response on failure" in {
+      doReturn(result(new RuntimeException("fail")))
+        .when(membershipService)
+        .getGroupChange("bad", okAuth)
+      Get(s"/groups/change/bad") ~> Route.seal(membershipRoute) ~> check {
+        status shouldBe StatusCodes.InternalServerError
+      }
+    }
+  }
+
   "PUT update user lock status" should {
     "return a 200 response with the user locked" in {
       membershipRoute = superUserRoute

From bc5972b05d4e7f8d50596a0a3e35f135270acc77 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Wed, 10 Aug 2022 11:55:52 +0530
Subject: [PATCH 086/147] Update func test

---
 .../api/route/MembershipJsonProtocol.scala         | 14 +++++++++++++-
 .../tests/membership/get_group_changes_test.py     | 13 +++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/route/MembershipJsonProtocol.scala b/modules/api/src/main/scala/vinyldns/api/route/MembershipJsonProtocol.scala
index 7ec82e732..aba3f527f 100644
--- a/modules/api/src/main/scala/vinyldns/api/route/MembershipJsonProtocol.scala
+++ b/modules/api/src/main/scala/vinyldns/api/route/MembershipJsonProtocol.scala
@@ -21,6 +21,7 @@ import cats.data._
 import cats.implicits._
 import org.joda.time.DateTime
 import org.json4s._
+import org.json4s.JsonDSL._
 import vinyldns.api.domain.membership._
 import vinyldns.core.domain.membership.{Group, GroupChangeType, GroupStatus, LockStatus}
 
@@ -113,7 +114,7 @@ trait MembershipJsonProtocol extends JsonValidation {
   }
 
   case object GroupChangeInfoSerializer extends ValidationSerializer[GroupChangeInfo] {
-    override def fromJson(js: JValue): ValidatedNel[String, GroupChangeInfo] =
+    override def fromJson(js: JValue): ValidatedNel[String, GroupChangeInfo] = {
       (
         (js \ "newGroup").required[GroupInfo]("Missing new group"),
         (js \ "changeType").required(GroupChangeType, "Missing change type"),
@@ -124,5 +125,16 @@ trait MembershipJsonProtocol extends JsonValidation {
         (js \ "userName").required[String]("Missing userName"),
         (js \ "groupChangeMessage").required[String]("Missing groupChangeMessage"),
         ).mapN(GroupChangeInfo.apply)
+    }
+
+    override def toJson(gci: GroupChangeInfo): JValue =
+      ("newGroup" -> Extraction.decompose(gci.newGroup)) ~
+      ("changeType" -> Extraction.decompose(gci.changeType)) ~
+      ("userId" -> gci.userId) ~
+      ("oldGroup" -> Extraction.decompose(gci.oldGroup)) ~
+      ("id" -> gci.id) ~
+      ("created" -> gci.created.toString) ~
+      ("userName" -> gci.userName) ~
+      ("groupChangeMessage" -> gci.groupChangeMessage)
   }
 }
diff --git a/modules/api/src/test/functional/tests/membership/get_group_changes_test.py b/modules/api/src/test/functional/tests/membership/get_group_changes_test.py
index fda94f4c6..f78b892ca 100644
--- a/modules/api/src/test/functional/tests/membership/get_group_changes_test.py
+++ b/modules/api/src/test/functional/tests/membership/get_group_changes_test.py
@@ -1,5 +1,5 @@
 import pytest
-
+from datetime import datetime
 from hamcrest import *
 
 
@@ -25,13 +25,18 @@ def test_list_group_activity_start_from_success(group_activity_context, shared_z
 
     # we grab 3 items, which when sorted by most recent will give the 3 most recent items
     page_one = client.get_group_changes(created_group["id"], max_items=3, status=200)
-
+    # our start from will align with the created on the 3rd change in the list
+    start_from_index = 2
+    # using epoch time to start from a timestamp
+    epoch = datetime.utcfromtimestamp(0)
+    # start from a known good timestamp
+    start_from = str(int((datetime.strptime(page_one["changes"][start_from_index]["created"], "%Y-%m-%dT%H:%M:%S.%fZ") - epoch).total_seconds() * 1000))
     # now, we say give me all changes since the start_from, which should yield 8-7-6-5-4
-    result = client.get_group_changes(created_group["id"], start_from=page_one["nextId"], max_items=5, status=200)
+    result = client.get_group_changes(created_group["id"], start_from=start_from, max_items=5, status=200)
 
     assert_that(result["changes"], has_length(5))
     assert_that(result["maxItems"], is_(5))
-    assert_that(result["startFrom"], is_(page_one["nextId"]))
+    assert_that(result["startFrom"], is_(start_from))
     assert_that(result["nextId"], is_not(none()))
 
     # we should have, in order, changes 8 7 6 5 4

From 3e8d86f81d4691f1a3d75f7f1a8857209cb40d77 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Wed, 10 Aug 2022 12:18:35 +0530
Subject: [PATCH 087/147] Revert changes

---
 .../api/route/MembershipJsonProtocol.scala         | 14 +-------------
 .../tests/membership/get_group_changes_test.py     | 13 ++++---------
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/route/MembershipJsonProtocol.scala b/modules/api/src/main/scala/vinyldns/api/route/MembershipJsonProtocol.scala
index aba3f527f..7ec82e732 100644
--- a/modules/api/src/main/scala/vinyldns/api/route/MembershipJsonProtocol.scala
+++ b/modules/api/src/main/scala/vinyldns/api/route/MembershipJsonProtocol.scala
@@ -21,7 +21,6 @@ import cats.data._
 import cats.implicits._
 import org.joda.time.DateTime
 import org.json4s._
-import org.json4s.JsonDSL._
 import vinyldns.api.domain.membership._
 import vinyldns.core.domain.membership.{Group, GroupChangeType, GroupStatus, LockStatus}
 
@@ -114,7 +113,7 @@ trait MembershipJsonProtocol extends JsonValidation {
   }
 
   case object GroupChangeInfoSerializer extends ValidationSerializer[GroupChangeInfo] {
-    override def fromJson(js: JValue): ValidatedNel[String, GroupChangeInfo] = {
+    override def fromJson(js: JValue): ValidatedNel[String, GroupChangeInfo] =
       (
         (js \ "newGroup").required[GroupInfo]("Missing new group"),
         (js \ "changeType").required(GroupChangeType, "Missing change type"),
@@ -125,16 +124,5 @@ trait MembershipJsonProtocol extends JsonValidation {
         (js \ "userName").required[String]("Missing userName"),
         (js \ "groupChangeMessage").required[String]("Missing groupChangeMessage"),
         ).mapN(GroupChangeInfo.apply)
-    }
-
-    override def toJson(gci: GroupChangeInfo): JValue =
-      ("newGroup" -> Extraction.decompose(gci.newGroup)) ~
-      ("changeType" -> Extraction.decompose(gci.changeType)) ~
-      ("userId" -> gci.userId) ~
-      ("oldGroup" -> Extraction.decompose(gci.oldGroup)) ~
-      ("id" -> gci.id) ~
-      ("created" -> gci.created.toString) ~
-      ("userName" -> gci.userName) ~
-      ("groupChangeMessage" -> gci.groupChangeMessage)
   }
 }
diff --git a/modules/api/src/test/functional/tests/membership/get_group_changes_test.py b/modules/api/src/test/functional/tests/membership/get_group_changes_test.py
index f78b892ca..fda94f4c6 100644
--- a/modules/api/src/test/functional/tests/membership/get_group_changes_test.py
+++ b/modules/api/src/test/functional/tests/membership/get_group_changes_test.py
@@ -1,5 +1,5 @@
 import pytest
-from datetime import datetime
+
 from hamcrest import *
 
 
@@ -25,18 +25,13 @@ def test_list_group_activity_start_from_success(group_activity_context, shared_z
 
     # we grab 3 items, which when sorted by most recent will give the 3 most recent items
     page_one = client.get_group_changes(created_group["id"], max_items=3, status=200)
-    # our start from will align with the created on the 3rd change in the list
-    start_from_index = 2
-    # using epoch time to start from a timestamp
-    epoch = datetime.utcfromtimestamp(0)
-    # start from a known good timestamp
-    start_from = str(int((datetime.strptime(page_one["changes"][start_from_index]["created"], "%Y-%m-%dT%H:%M:%S.%fZ") - epoch).total_seconds() * 1000))
+
     # now, we say give me all changes since the start_from, which should yield 8-7-6-5-4
-    result = client.get_group_changes(created_group["id"], start_from=start_from, max_items=5, status=200)
+    result = client.get_group_changes(created_group["id"], start_from=page_one["nextId"], max_items=5, status=200)
 
     assert_that(result["changes"], has_length(5))
     assert_that(result["maxItems"], is_(5))
-    assert_that(result["startFrom"], is_(start_from))
+    assert_that(result["startFrom"], is_(page_one["nextId"]))
     assert_that(result["nextId"], is_not(none()))
 
     # we should have, in order, changes 8 7 6 5 4

From d95ac71c4cd644ad194ccca10c0717fdfb97602a Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Thu, 25 Aug 2022 12:24:05 +0530
Subject: [PATCH 088/147] Remove complete zone sync status

---
 .../scala/vinyldns/api/route/ZoneRoutingSpec.scala   | 12 ++++++------
 .../scala/vinyldns/core/domain/zone/ZoneChange.scala |  2 +-
 .../src/test/scala/vinyldns/core/TestZoneData.scala  |  4 ++--
 .../vinyldns/core/domain/zone/ZoneChangeSpec.scala   |  2 +-
 .../core/protobuf/ProtobufConversionsSpec.scala      |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/api/src/test/scala/vinyldns/api/route/ZoneRoutingSpec.scala b/modules/api/src/test/scala/vinyldns/api/route/ZoneRoutingSpec.scala
index 38927d2d8..b19cfce8e 100644
--- a/modules/api/src/test/scala/vinyldns/api/route/ZoneRoutingSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/route/ZoneRoutingSpec.scala
@@ -124,7 +124,7 @@ class ZoneRoutingSpec
       ("status" -> "invalidStatus") ~~
       ("adminGroupId" -> "admin-group-id")
 
-  private val zoneCreate = ZoneChange(ok, "ok", ZoneChangeType.Create, ZoneChangeStatus.Complete)
+  private val zoneCreate = ZoneChange(ok, "ok", ZoneChangeType.Create, ZoneChangeStatus.Synced)
   private val listZoneChangeResponse = ListZoneChangesResponse(
     ok.id,
     List(zoneCreate, zoneUpdate),
@@ -157,7 +157,7 @@ class ZoneRoutingSpec
         case ok.email | connectionOk.email | trailingDot.email | "invalid-zone-status@test.com" =>
           Right(
             zoneCreate.copy(
-              status = ZoneChangeStatus.Complete,
+              status = ZoneChangeStatus.Synced,
               zone = Zone(createZoneInput, false).copy(status = ZoneStatus.Active)
             )
           )
@@ -183,7 +183,7 @@ class ZoneRoutingSpec
         case ok.email | connectionOk.email =>
           Right(
             zoneUpdate.copy(
-              status = ZoneChangeStatus.Complete,
+              status = ZoneChangeStatus.Synced,
               zone = Zone(updateZoneInput, zoneUpdate.zone).copy(status = ZoneStatus.Active)
             )
           )
@@ -208,7 +208,7 @@ class ZoneRoutingSpec
         case notFound.id => Left(ZoneNotFoundError(s"$zoneId"))
         case notAuthorized.id => Left(NotAuthorizedError(s"$zoneId"))
         case ok.id | connectionOk.id =>
-          Right(ZoneChange(ok, "ok", ZoneChangeType.Delete, ZoneChangeStatus.Complete))
+          Right(ZoneChange(ok, "ok", ZoneChangeType.Delete, ZoneChangeStatus.Synced))
         case error.id => Left(new RuntimeException("fail"))
         case zone1.id => Left(ZoneUnavailableError(zoneId))
       }
@@ -372,7 +372,7 @@ class ZoneRoutingSpec
                 authPrincipal,
                 NoOpCrypto.instance
               )
-              .copy(status = ZoneChangeStatus.Complete)
+              .copy(status = ZoneChangeStatus.Synced)
           )
         case error.id => Left(new RuntimeException("fail"))
       }
@@ -397,7 +397,7 @@ class ZoneRoutingSpec
                 authPrincipal,
                 NoOpCrypto.instance
               )
-              .copy(status = ZoneChangeStatus.Complete)
+              .copy(status = ZoneChangeStatus.Synced)
           )
         case error.id => Left(new RuntimeException("fail"))
       }
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/zone/ZoneChange.scala b/modules/core/src/main/scala/vinyldns/core/domain/zone/ZoneChange.scala
index 4c6533ba1..b56e73085 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/zone/ZoneChange.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/zone/ZoneChange.scala
@@ -22,7 +22,7 @@ import org.joda.time.DateTime
 
 object ZoneChangeStatus extends Enumeration {
   type ZoneChangeStatus = Value
-  val Pending, Complete, Failed, Synced = Value
+  val Pending, Failed, Synced = Value
 }
 
 object ZoneChangeType extends Enumeration {
diff --git a/modules/core/src/test/scala/vinyldns/core/TestZoneData.scala b/modules/core/src/test/scala/vinyldns/core/TestZoneData.scala
index 751d44359..7a9600edd 100644
--- a/modules/core/src/test/scala/vinyldns/core/TestZoneData.scala
+++ b/modules/core/src/test/scala/vinyldns/core/TestZoneData.scala
@@ -79,11 +79,11 @@ object TestZoneData {
     okZone,
     "ok",
     ZoneChangeType.Create,
-    ZoneChangeStatus.Complete,
+    ZoneChangeStatus.Synced,
     created = DateTime.now.minus(1000)
   )
 
-  val zoneUpdate: ZoneChange = zoneChangePending.copy(status = ZoneChangeStatus.Complete)
+  val zoneUpdate: ZoneChange = zoneChangePending.copy(status = ZoneChangeStatus.Synced)
 
   def makeTestPendingZoneChange(zone: Zone): ZoneChange =
     ZoneChange(zone, "userId", ZoneChangeType.Update, ZoneChangeStatus.Pending)
diff --git a/modules/core/src/test/scala/vinyldns/core/domain/zone/ZoneChangeSpec.scala b/modules/core/src/test/scala/vinyldns/core/domain/zone/ZoneChangeSpec.scala
index 76d70dd80..9d704a935 100644
--- a/modules/core/src/test/scala/vinyldns/core/domain/zone/ZoneChangeSpec.scala
+++ b/modules/core/src/test/scala/vinyldns/core/domain/zone/ZoneChangeSpec.scala
@@ -26,7 +26,7 @@ class ZoneChangeSpec extends AnyWordSpec with Matchers {
     Zone("test", "test"),
     "ok",
     ZoneChangeType.Create,
-    ZoneChangeStatus.Complete,
+    ZoneChangeStatus.Synced,
     created = DateTime.now.minus(1000)
   )
 
diff --git a/modules/core/src/test/scala/vinyldns/core/protobuf/ProtobufConversionsSpec.scala b/modules/core/src/test/scala/vinyldns/core/protobuf/ProtobufConversionsSpec.scala
index 63015254b..5fcbe80f7 100644
--- a/modules/core/src/test/scala/vinyldns/core/protobuf/ProtobufConversionsSpec.scala
+++ b/modules/core/src/test/scala/vinyldns/core/protobuf/ProtobufConversionsSpec.scala
@@ -74,7 +74,7 @@ class ProtobufConversionsSpec
     zone,
     "system",
     ZoneChangeType.Update,
-    ZoneChangeStatus.Complete,
+    ZoneChangeStatus.Synced,
     DateTime.now,
     Some("hello")
   )

From c6def527bcb14605ea877502098e2a89979c39f6 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 26 Aug 2022 16:28:32 +0530
Subject: [PATCH 089/147] Allow dotted host with config

---
 .../api/src/main/resources/application.conf   |  5 ++
 modules/api/src/main/resources/reference.conf |  5 ++
 .../src/main/scala/vinyldns/api/Boot.scala    |  4 +-
 .../api/config/DottedHostsConfig.scala        | 28 +++++++
 .../vinyldns/api/config/VinylDNSConfig.scala  |  3 +
 .../api/domain/batch/BatchChangeService.scala | 46 +++++++----
 .../domain/batch/BatchChangeValidations.scala | 53 ++++++++-----
 .../api/domain/record/RecordSetService.scala  | 39 +++++++++-
 .../domain/record/RecordSetValidations.scala  | 78 +++++++++++++++----
 .../core/domain/DomainValidationErrors.scala  |  6 ++
 .../core/domain/SingleChangeError.scala       |  3 +-
 11 files changed, 215 insertions(+), 55 deletions(-)
 create mode 100644 modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala

diff --git a/modules/api/src/main/resources/application.conf b/modules/api/src/main/resources/application.conf
index a8aa7175c..be699fb20 100644
--- a/modules/api/src/main/resources/application.conf
+++ b/modules/api/src/main/resources/application.conf
@@ -165,6 +165,11 @@ vinyldns {
     "ns1.parent.com4."
   ]
 
+  # approved zones/domains that are allowed to create dotted hosts
+  zone-list = [
+  "ok." # for local testing
+  ]
+
   # Note: This MUST match the Portal or strange errors will ensue, NoOpCrypto should not be used for production
   crypto {
     type = "vinyldns.core.crypto.NoOpCrypto"
diff --git a/modules/api/src/main/resources/reference.conf b/modules/api/src/main/resources/reference.conf
index b82cb74d6..c60afc5f0 100644
--- a/modules/api/src/main/resources/reference.conf
+++ b/modules/api/src/main/resources/reference.conf
@@ -90,6 +90,11 @@ vinyldns {
     "ns1.parent.com."
   ]
 
+  # approved zones/domains that are allowed to create dotted hosts
+  zone-list = [
+    "ok." # for local testing
+  ]
+
   # color should be green or blue, used in order to do blue/green deployment
   color = "green"
 
diff --git a/modules/api/src/main/scala/vinyldns/api/Boot.scala b/modules/api/src/main/scala/vinyldns/api/Boot.scala
index 24db9b737..782ee3d61 100644
--- a/modules/api/src/main/scala/vinyldns/api/Boot.scala
+++ b/modules/api/src/main/scala/vinyldns/api/Boot.scala
@@ -121,7 +121,8 @@ object Boot extends App {
         vinyldnsConfig.highValueDomainConfig,
         vinyldnsConfig.manualReviewConfig,
         vinyldnsConfig.batchChangeConfig,
-        vinyldnsConfig.scheduledChangesConfig
+        vinyldnsConfig.scheduledChangesConfig,
+        vinyldnsConfig.dottedHostsConfig
       )
       val membershipService = MembershipService(repositories)
 
@@ -139,6 +140,7 @@ object Boot extends App {
           backendResolver,
           vinyldnsConfig.serverConfig.validateRecordLookupAgainstDnsBackend,
           vinyldnsConfig.highValueDomainConfig,
+          vinyldnsConfig.dottedHostsConfig,
           vinyldnsConfig.serverConfig.approvedNameServers,
           vinyldnsConfig.serverConfig.useRecordSetCache
         )
diff --git a/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala b/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
new file mode 100644
index 000000000..e6a375d69
--- /dev/null
+++ b/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2018 Comcast Cable Communications Management, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package vinyldns.api.config
+
+import pureconfig.ConfigReader
+
+final case class DottedHostsConfig(zoneList: List[String])
+object DottedHostsConfig {
+  implicit val configReader: ConfigReader[DottedHostsConfig] =
+    ConfigReader.forProduct1[DottedHostsConfig, List[String]](
+      "zone-list"
+    )(zoneList =>
+      DottedHostsConfig(zoneList))
+}
diff --git a/modules/api/src/main/scala/vinyldns/api/config/VinylDNSConfig.scala b/modules/api/src/main/scala/vinyldns/api/config/VinylDNSConfig.scala
index abb75c4be..fc5a0d42e 100644
--- a/modules/api/src/main/scala/vinyldns/api/config/VinylDNSConfig.scala
+++ b/modules/api/src/main/scala/vinyldns/api/config/VinylDNSConfig.scala
@@ -47,6 +47,7 @@ final case class VinylDNSConfig(
     notifierConfigs: List[NotifierConfig],
     dataStoreConfigs: List[DataStoreConfig],
     backendConfigs: BackendConfigs,
+    dottedHostsConfig: DottedHostsConfig,
     configuredDnsConnections: ConfiguredDnsConnections,
     apiMetricSettings: APIMetricsSettings,
     crypto: CryptoAlgebra,
@@ -85,6 +86,7 @@ object VinylDNSConfig {
       serverConfig <- loadIO[ServerConfig](config, "vinyldns")
       batchChangeConfig <- loadIO[BatchChangeConfig](config, "vinyldns")
       backendConfigs <- loadIO[BackendConfigs](config, "vinyldns.backend")
+      dottedHostsConfig <- loadIO[DottedHostsConfig](config, "vinyldns")
       httpConfig <- loadIO[HttpConfig](config, "vinyldns.rest")
       hvdConfig <- loadIO[HighValueDomainConfig](config, "vinyldns.high-value-domains")
       scheduledChangesConfig <- loadIO[ScheduledChangesConfig](config, "vinyldns")
@@ -110,6 +112,7 @@ object VinylDNSConfig {
       notifierConfigs,
       dataStoreConfigs,
       backendConfigs,
+      dottedHostsConfig,
       connections,
       metricSettings,
       crypto,
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala
index 2bccc1699..1a28df53d 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala
@@ -32,21 +32,10 @@ import vinyldns.core.domain.auth.AuthPrincipal
 import vinyldns.core.domain.batch.BatchChangeApprovalStatus.BatchChangeApprovalStatus
 import vinyldns.core.domain.batch._
 import vinyldns.core.domain.batch.BatchChangeApprovalStatus._
-import vinyldns.core.domain.{
-  CnameAtZoneApexError,
-  SingleChangeError,
-  UserIsNotAuthorizedError,
-  ZoneDiscoveryError
-}
-import vinyldns.core.domain.membership.{
-  Group,
-  GroupRepository,
-  ListUsersResults,
-  User,
-  UserRepository
-}
+import vinyldns.core.domain.{CnameAtZoneApexError, SingleChangeError, UserIsNotAuthorizedError, ZoneDiscoveryError}
+import vinyldns.core.domain.membership.{Group, GroupRepository, ListUsersResults, User, UserRepository}
 import vinyldns.core.domain.record.RecordType._
-import vinyldns.core.domain.record.RecordSetRepository
+import vinyldns.core.domain.record.{RecordSet, RecordSetRepository}
 import vinyldns.core.domain.zone.ZoneRepository
 import vinyldns.core.notifier.{AllNotifiers, Notification}
 
@@ -133,16 +122,43 @@ class BatchChangeService(
       recordSets <- getExistingRecordSets(changesWithZones, zoneMap).toBatchResult
       withTtl = doTtlMapping(changesWithZones, recordSets)
       groupedChanges = ChangeForValidationMap(withTtl, recordSets)
+      zoneOrRecordDoesNotAlreadyExist <- zoneOrRecordDoesNotExist(groupedChanges).toBatchResult
       validatedSingleChanges = validateChangesWithContext(
         groupedChanges,
         auth,
         isApproved,
-        batchChangeInput.ownerGroupId
+        batchChangeInput.ownerGroupId,
+        zoneOrRecordDoesNotAlreadyExist
       )
       errorGroupIds <- getGroupIdsFromUnauthorizedErrors(validatedSingleChanges)
       validatedSingleChangesWithGroups = errorGroupMapping(errorGroupIds, validatedSingleChanges)
     } yield BatchValidationFlowOutput(validatedSingleChangesWithGroups, zoneMap, groupedChanges)
 
+  // For dotted hosts. Check if a zone or record that may conflict with dotted host exist or not
+  def zoneOrRecordDoesNotExist(groupedChanges: ChangeForValidationMap): IO[Boolean] = {
+    val inputChange = groupedChanges.changes.map(x => x.toOption).map(x => x.get)
+    // Use fqdn for searching through `recordset` and `zone` mysql table to see if it already exist
+    val newRecordFqdn = inputChange.map(_.recordName).head + "." + inputChange.map(_.zone.name).head
+    for {
+      zone <- zoneRepository.getZoneByName(newRecordFqdn)
+      record <- recordSetRepository.getRecordSetsByFQDNs(Set(newRecordFqdn))
+      isZoneAlreadyExist = zone.isDefined
+      isRecordAlreadyExist = doesRecordWithSameTypeExist(record, inputChange.map(_.inputChange))
+      doesNotExist = if(isZoneAlreadyExist || isRecordAlreadyExist) false else true
+    } yield doesNotExist
+  }
+
+  // Check if a record with same type already exist in 'recordset' mysql table
+  def doesRecordWithSameTypeExist(oldRecord: List[RecordSet], newRecord: List[ChangeInput]): Boolean = {
+    if(oldRecord.nonEmpty) {
+      val typeExists = oldRecord.map(x => x.typ == newRecord.map(_.typ))
+      if (typeExists.contains(true)) true else false
+    }
+    else {
+      false
+    }
+  }
+
   def getGroupIdsFromUnauthorizedErrors(
       changes: ValidatedBatch[ChangeForValidation]
   ): BatchResult[Set[Group]] = {
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
index efa72e443..f3354fbc3 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
@@ -17,15 +17,9 @@
 package vinyldns.api.domain.batch
 
 import java.net.InetAddress
-
 import cats.data._
 import cats.implicits._
-import vinyldns.api.config.{
-  BatchChangeConfig,
-  HighValueDomainConfig,
-  ManualReviewConfig,
-  ScheduledChangesConfig
-}
+import vinyldns.api.config.{BatchChangeConfig, DottedHostsConfig, HighValueDomainConfig, ManualReviewConfig, ScheduledChangesConfig}
 import vinyldns.api.domain.DomainValidations._
 import vinyldns.api.domain.access.AccessValidationsAlgebra
 import vinyldns.core.domain.auth.AuthPrincipal
@@ -54,7 +48,8 @@ trait BatchChangeValidationsAlgebra {
       groupedChanges: ChangeForValidationMap,
       auth: AuthPrincipal,
       isApproved: Boolean,
-      batchOwnerGroupId: Option[String]
+      batchOwnerGroupId: Option[String],
+      zoneOrRecordDoesNotAlreadyExist: Boolean
   ): ValidatedBatch[ChangeForValidation]
 
   def canGetBatchChange(
@@ -85,7 +80,8 @@ class BatchChangeValidations(
     highValueDomainConfig: HighValueDomainConfig,
     manualReviewConfig: ManualReviewConfig,
     batchChangeConfig: BatchChangeConfig,
-    scheduledChangesConfig: ScheduledChangesConfig
+    scheduledChangesConfig: ScheduledChangesConfig,
+    dottedHostsConfig: DottedHostsConfig
 ) extends BatchChangeValidationsAlgebra {
 
   import RecordType._
@@ -275,7 +271,8 @@ class BatchChangeValidations(
       groupedChanges: ChangeForValidationMap,
       auth: AuthPrincipal,
       isApproved: Boolean,
-      batchOwnerGroupId: Option[String]
+      batchOwnerGroupId: Option[String],
+      zoneOrRecordDoesNotAlreadyExist: Boolean
   ): ValidatedBatch[ChangeForValidation] =
     // Updates are a combination of an add and delete for a record with the same name and type in a zone.
     groupedChanges.changes.mapValid {
@@ -283,7 +280,7 @@ class BatchChangeValidations(
           if groupedChanges
             .getLogicalChangeType(add.recordKey)
             .contains(LogicalChangeType.Add) =>
-        validateAddWithContext(add, groupedChanges, auth, isApproved, batchOwnerGroupId)
+        validateAddWithContext(add, groupedChanges, auth, isApproved, batchOwnerGroupId, zoneOrRecordDoesNotAlreadyExist)
       case addUpdate: AddChangeForValidation =>
         validateAddUpdateWithContext(addUpdate, groupedChanges, auth, isApproved, batchOwnerGroupId)
       // These cases MUST be below adds because:
@@ -298,11 +295,28 @@ class BatchChangeValidations(
         validateDeleteUpdateWithContext(deleteUpdate, groupedChanges, auth, isApproved)
     }
 
-  def newRecordSetIsNotDotted(change: AddChangeForValidation): SingleValidation[Unit] =
-    if (change.recordName != change.zone.name && change.recordName.contains("."))
-      ZoneDiscoveryError(change.inputChange.inputName).invalidNel
-    else
-      ().validNel
+  // Check if the new record set has dots and if so whether they are allowed or not
+  def newRecordSetDottedCheck(change: AddChangeForValidation, zoneOrRecordDoesNotAlreadyExist: Boolean): SingleValidation[Unit] = {
+
+    // Check if the zone of the record set is present in dotted hosts config list
+    val isDomainAllowed = dottedHostsConfig.zoneList.contains(change.zone.name)
+
+    // Check if record set contains dot and if it is in zone which is allowed to have dotted records from dotted hosts config
+    if(change.recordName.contains(".") && isDomainAllowed) {
+      // If there is a zone or record already present which conflicts with the new dotted record, throw an error
+      if (!zoneOrRecordDoesNotAlreadyExist || change.recordName == change.zone.name)
+        DottedHostError(change.recordName, change.inputChange.typ.toString).invalidNel
+      else
+        ().validNel
+    }
+    else {
+      // If the recordset contains dot but is not in the allowed zones to create dotted records, throw an error
+      if (change.recordName != change.zone.name && change.recordName.contains("."))
+        ZoneDiscoveryError(change.inputChange.inputName).invalidNel
+      else
+        ().validNel
+    }
+  }
 
   def matchRecordData(existingRecordSetData: List[RecordData], recordData: RecordData): Boolean =
     existingRecordSetData.exists { rd =>
@@ -412,14 +426,15 @@ class BatchChangeValidations(
       groupedChanges: ChangeForValidationMap,
       auth: AuthPrincipal,
       isApproved: Boolean,
-      ownerGroupId: Option[String]
+      ownerGroupId: Option[String],
+      zoneOrRecordDoesNotAlreadyExist: Boolean
   ): SingleValidation[ChangeForValidation] = {
     val typedValidations = change.inputChange.typ match {
       case A | AAAA | MX =>
-        newRecordSetIsNotDotted(change)
+        newRecordSetDottedCheck(change, zoneOrRecordDoesNotAlreadyExist)
       case CNAME =>
         cnameHasUniqueNameInBatch(change, groupedChanges) |+|
-          newRecordSetIsNotDotted(change)
+          newRecordSetDottedCheck(change, zoneOrRecordDoesNotAlreadyExist)
       case TXT | PTR =>
         ().validNel
       case other =>
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 cc4f18331..517fbcc47 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
@@ -28,7 +28,7 @@ import vinyldns.core.queue.MessageQueue
 import cats.data._
 import cats.effect.IO
 import org.xbill.DNS.ReverseMap
-import vinyldns.api.config.HighValueDomainConfig
+import vinyldns.api.config.{DottedHostsConfig, HighValueDomainConfig}
 import vinyldns.api.domain.DomainValidations.{validateIpv4Address, validateIpv6Address}
 import vinyldns.api.domain.access.AccessValidationsAlgebra
 import vinyldns.core.domain.record.NameSort.NameSort
@@ -46,6 +46,7 @@ object RecordSetService {
              backendResolver: BackendResolver,
              validateRecordLookupAgainstDnsBackend: Boolean,
              highValueDomainConfig: HighValueDomainConfig,
+             dottedHostsConfig: DottedHostsConfig,
              approvedNameServers: List[Regex],
              useRecordSetCache: Boolean
            ): RecordSetService =
@@ -61,6 +62,7 @@ object RecordSetService {
       backendResolver,
       validateRecordLookupAgainstDnsBackend,
       highValueDomainConfig,
+      dottedHostsConfig,
       approvedNameServers,
       useRecordSetCache
     )
@@ -78,6 +80,7 @@ class RecordSetService(
                         backendResolver: BackendResolver,
                         validateRecordLookupAgainstDnsBackend: Boolean,
                         highValueDomainConfig: HighValueDomainConfig,
+                        dottedHostsConfig: DottedHostsConfig,
                         approvedNameServers: List[Regex],
                         useRecordSetCache: Boolean
                       ) extends RecordSetServiceAlgebra {
@@ -107,12 +110,15 @@ class RecordSetService(
       ownerGroup <- getGroupIfProvided(rsForValidations.ownerGroupId)
       _ <- canUseOwnerGroup(rsForValidations.ownerGroupId, ownerGroup, auth).toResult
       _ <- noCnameWithNewName(rsForValidations, existingRecordsWithName, zone).toResult
+      zoneOrRecordDoesNotAlreadyExist <- zoneOrRecordDoesNotExist(rsForValidations, zone).toResult[Boolean]
       _ <- typeSpecificValidations(
         rsForValidations,
         existingRecordsWithName,
         zone,
         None,
-        approvedNameServers
+        approvedNameServers,
+        zoneOrRecordDoesNotAlreadyExist,
+        dottedHostsConfig
       ).toResult
       _ <- messageQueue.send(change).toResult[Unit]
     } yield change
@@ -143,12 +149,15 @@ class RecordSetService(
         validateRecordLookupAgainstDnsBackend
       )
       _ <- noCnameWithNewName(rsForValidations, existingRecordsWithName, zone).toResult
+      zoneOrRecordDoesNotAlreadyExist <- zoneOrRecordDoesNotExist(rsForValidations, zone).toResult[Boolean]
       _ <- typeSpecificValidations(
         rsForValidations,
         existingRecordsWithName,
         zone,
         Some(existing),
-        approvedNameServers
+        approvedNameServers,
+        zoneOrRecordDoesNotAlreadyExist,
+        dottedHostsConfig
       ).toResult
       _ <- messageQueue.send(change).toResult[Unit]
     } yield change
@@ -169,6 +178,30 @@ class RecordSetService(
       _ <- messageQueue.send(change).toResult[Unit]
     } yield change
 
+  // For dotted hosts. Check if a zone or record that may conflict with dotted host exist or not
+  def zoneOrRecordDoesNotExist(newRecordSet: RecordSet, zone: Zone): IO[Boolean] = {
+    // Use fqdn for searching through `recordset` and `zone` mysql table to see if it already exist
+    val newRecordFqdn = newRecordSet.name + "." + zone.name
+    for {
+      zone <- zoneRepository.getZoneByName(newRecordFqdn)
+      record <- recordSetRepository.getRecordSetsByFQDNs(Set(newRecordFqdn))
+      isZoneAlreadyExist = zone.isDefined
+      isRecordAlreadyExist = doesRecordWithSameTypeExist(record, newRecordSet)
+      doesNotExist = if(isZoneAlreadyExist || isRecordAlreadyExist) false else true
+    } yield doesNotExist
+  }
+
+  // Check if a record with same type already exist in 'recordset' mysql table
+  def doesRecordWithSameTypeExist(oldRecord: List[RecordSet], newRecord: RecordSet): Boolean = {
+    if(oldRecord.nonEmpty) {
+      val typeExists = oldRecord.map(x => x.typ == newRecord.typ)
+      if (typeExists.contains(true)) true else false
+    }
+    else {
+      false
+    }
+  }
+
   def getRecordSet(
                     recordSetId: String,
                     authPrincipal: AuthPrincipal
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 0bff5984a..b82490667 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
@@ -19,14 +19,14 @@ package vinyldns.api.domain.record
 import cats.syntax.either._
 import vinyldns.api.Interfaces._
 import vinyldns.api.backend.dns.DnsConversions
-import vinyldns.api.config.HighValueDomainConfig
+import vinyldns.api.config.{DottedHostsConfig, HighValueDomainConfig}
 import vinyldns.api.domain._
 import vinyldns.core.domain.DomainHelpers._
 import vinyldns.core.domain.record.RecordType._
 import vinyldns.api.domain.zone._
 import vinyldns.core.domain.auth.AuthPrincipal
 import vinyldns.core.domain.membership.Group
-import vinyldns.core.domain.record.{RecordType, RecordSet}
+import vinyldns.core.domain.record.{RecordSet, RecordType}
 import vinyldns.core.domain.zone.Zone
 import vinyldns.core.Messages._
 
@@ -90,6 +90,44 @@ object RecordSetValidations {
       !existingRecordsWithName.exists(rs => rs.id != newRecordSet.id && rs.typ == newRecordSet.typ)
     )
 
+  // Check whether the record has dot or not
+  def checkForDot(
+      newRecordSet: RecordSet,
+      zone: Zone,
+      existingRecordSet: Option[RecordSet] = None,
+      zoneOrRecordDoesNotAlreadyExist: Boolean,
+      dottedHostConfig: DottedHostsConfig
+  ): Either[Throwable, Unit] = {
+
+    // Check if the zone of the record set is present in dotted hosts config list
+    val isDomainAllowed = dottedHostConfig.zoneList.contains(zone.name)
+
+    // Check if record set contains dot and if it is in zone which is allowed to have dotted records from dotted hosts config
+    if(newRecordSet.name.contains(".") && isDomainAllowed) {
+      isDotted(newRecordSet, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist)
+    }
+    else{
+      isNotDotted(newRecordSet, zone, existingRecordSet)
+    }
+  }
+
+  // Check if there is a zone or record already present which conflicts with the new dotted record. If so, throw an error
+  def isDotted(
+     newRecordSet: RecordSet,
+     zone: Zone,
+     existingRecordSet: Option[RecordSet] = None,
+     zoneOrRecordDoesNotAlreadyExist: Boolean
+  ): Either[Throwable, Unit] =
+    ensuring(
+      InvalidRequest(
+        s"Record with name ${newRecordSet.name} and type ${newRecordSet.typ} already exists. " +
+          s"Please check the record and zone that's already present and make the change there."
+      )
+    )(
+      (newRecordSet.name != zone.name || existingRecordSet.exists(_.name == newRecordSet.name)) && zoneOrRecordDoesNotAlreadyExist
+    )
+
+  // Check if the recordset contains dot but is not in the allowed zones to create dotted records. If so, throw an error
   def isNotDotted(
       newRecordSet: RecordSet,
       zone: Zone,
@@ -110,16 +148,18 @@ object RecordSetValidations {
       existingRecordsWithName: List[RecordSet],
       zone: Zone,
       existingRecordSet: Option[RecordSet],
-      approvedNameServers: List[Regex]
+      approvedNameServers: List[Regex],
+      zoneOrRecordDoesNotAlreadyExist: Boolean = true,
+      dottedHostConfig: DottedHostsConfig
   ): Either[Throwable, Unit] =
     newRecordSet.typ match {
-      case CNAME => cnameValidations(newRecordSet, existingRecordsWithName, zone, existingRecordSet)
-      case NS => nsValidations(newRecordSet, zone, existingRecordSet, approvedNameServers)
-      case SOA => soaValidations(newRecordSet, zone)
+      case CNAME => cnameValidations(newRecordSet, existingRecordsWithName, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig)
+      case NS => nsValidations(newRecordSet, zone, existingRecordSet, approvedNameServers, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig)
+      case SOA => soaValidations(newRecordSet, zone, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig)
       case PTR => ptrValidations(newRecordSet, zone)
       case SRV | TXT | NAPTR => ().asRight // SRV, TXT and NAPTR do not go through dotted host check
-      case DS => dsValidations(newRecordSet, existingRecordsWithName, zone)
-      case _ => isNotDotted(newRecordSet, zone, existingRecordSet)
+      case DS => dsValidations(newRecordSet, existingRecordsWithName, zone, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig)
+      case _ => checkForDot(newRecordSet, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig)
     }
 
   def typeSpecificDeleteValidations(recordSet: RecordSet, zone: Zone): Either[Throwable, Unit] =
@@ -140,7 +180,9 @@ object RecordSetValidations {
       newRecordSet: RecordSet,
       existingRecordsWithName: List[RecordSet],
       zone: Zone,
-      existingRecordSet: Option[RecordSet] = None
+      existingRecordSet: Option[RecordSet] = None,
+      zoneOrRecordDoesNotAlreadyExist: Boolean,
+      dottedHostConfig: DottedHostsConfig
   ): Either[Throwable, Unit] = {
     // cannot create a cname record if a record with the same exists
     val noRecordWithName = {
@@ -173,7 +215,7 @@ object RecordSetValidations {
       )
       _ <- noRecordWithName
       _ <- RDataWithConsecutiveDots
-      _ <- isNotDotted(newRecordSet, zone, existingRecordSet)
+      _ <- checkForDot(newRecordSet, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig)
     } yield ()
 
   }
@@ -181,7 +223,9 @@ object RecordSetValidations {
   def dsValidations(
       newRecordSet: RecordSet,
       existingRecordsWithName: List[RecordSet],
-      zone: Zone
+      zone: Zone,
+      zoneOrRecordDoesNotAlreadyExist: Boolean,
+      dottedHostConfig: DottedHostsConfig
   ): Either[Throwable, Unit] = {
     // see https://tools.ietf.org/html/rfc4035#section-2.4
     val nsChecks = existingRecordsWithName.find(_.typ == NS) match {
@@ -194,7 +238,7 @@ object RecordSetValidations {
     }
 
     for {
-      _ <- isNotDotted(newRecordSet, zone)
+      _ <- checkForDot(newRecordSet, zone, None, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig)
       _ <- isNotOrigin(
         newRecordSet,
         zone,
@@ -208,10 +252,12 @@ object RecordSetValidations {
       newRecordSet: RecordSet,
       zone: Zone,
       oldRecordSet: Option[RecordSet],
-      approvedNameServers: List[Regex]
+      approvedNameServers: List[Regex],
+      zoneOrRecordDoesNotAlreadyExist: Boolean,
+      dottedHostConfig: DottedHostsConfig
   ): Either[Throwable, Unit] = {
     // TODO kept consistency with old validation. Not sure why NS could be dotted in reverse specifically
-    val isNotDottedHost = if (!zone.isReverse) isNotDotted(newRecordSet, zone) else ().asRight
+    val isNotDottedHost = if (!zone.isReverse) checkForDot(newRecordSet, zone, None, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig) else ().asRight
 
     for {
       _ <- isNotDottedHost
@@ -233,9 +279,9 @@ object RecordSetValidations {
     } yield ()
   }
 
-  def soaValidations(newRecordSet: RecordSet, zone: Zone): Either[Throwable, Unit] =
+  def soaValidations(newRecordSet: RecordSet, zone: Zone, zoneOrRecordDoesNotAlreadyExist: Boolean, dottedHostConfig: DottedHostsConfig): Either[Throwable, Unit] =
     // TODO kept consistency with old validation. in theory if SOA always == zone name, no special case is needed here
-    if (!zone.isReverse) isNotDotted(newRecordSet, zone) else ().asRight
+    if (!zone.isReverse) checkForDot(newRecordSet, zone, None, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig) else ().asRight
 
   def ptrValidations(newRecordSet: RecordSet, zone: Zone): Either[Throwable, Unit] =
     // TODO we don't check for PTR as dotted...not sure why
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
index 91486ce79..6b56663d1 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
@@ -109,6 +109,12 @@ final case class ZoneDiscoveryError(name: String, fatal: Boolean = false)
       "If zone exists, then it must be connected to in VinylDNS."
 }
 
+final case class DottedHostError(name: String, rsType: String) extends DomainValidationError {
+  def message: String =
+    s"Record with name $name and type $rsType already exists. " +
+      s"Please check the record and zone that's already present and make the change there."
+}
+
 final case class RecordAlreadyExists(name: String) extends DomainValidationError {
   def message: String =
     s"""Record "$name" Already Exists: cannot add an existing record; to update it, """ +
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala b/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala
index a7ed47b4e..c2d8aba44 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala
@@ -32,7 +32,7 @@ object DomainValidationErrorType extends Enumeration {
   val ChangeLimitExceeded, BatchChangeIsEmpty, GroupDoesNotExist, NotAMemberOfOwnerGroup,
   InvalidDomainName, InvalidLength, InvalidEmail, InvalidRecordType, InvalidPortNumber,
   InvalidIpv4Address, InvalidIpv6Address, InvalidIPAddress, InvalidTTL, InvalidMxPreference,
-  InvalidBatchRecordType, ZoneDiscoveryError, RecordAlreadyExists, RecordDoesNotExist,
+  InvalidBatchRecordType, ZoneDiscoveryError, DottedHostError, RecordAlreadyExists, RecordDoesNotExist,
   CnameIsNotUniqueError, UserIsNotAuthorized, UserIsNotAuthorizedError, RecordNameNotUniqueInBatch,
   RecordInReverseZoneError, HighValueDomainError, MissingOwnerGroupId, ExistingMultiRecordError,
   NewMultiRecordError, CnameAtZoneApexError, RecordRequiresManualReview, UnsupportedOperation,
@@ -57,6 +57,7 @@ object DomainValidationErrorType extends Enumeration {
       case _: InvalidMxPreference => InvalidMxPreference
       case _: InvalidBatchRecordType => InvalidBatchRecordType
       case _: ZoneDiscoveryError => ZoneDiscoveryError
+      case _: DottedHostError => DottedHostError
       case _: RecordAlreadyExists => RecordAlreadyExists
       case _: RecordDoesNotExist => RecordDoesNotExist
       case _: CnameIsNotUniqueError => CnameIsNotUniqueError

From 774d23d19c93f7ab3fe487c218c55d65af4f4d81 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Tue, 30 Aug 2022 11:40:19 +0530
Subject: [PATCH 090/147] Override ZoneConnection toString

---
 .../main/scala/vinyldns/core/domain/zone/Zone.scala    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/core/src/main/scala/vinyldns/core/domain/zone/Zone.scala b/modules/core/src/main/scala/vinyldns/core/domain/zone/Zone.scala
index 398bf6131..d5b658315 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/zone/Zone.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/zone/Zone.scala
@@ -188,6 +188,16 @@ case class ZoneConnection(
 
   def decrypted(crypto: CryptoAlgebra): ZoneConnection =
     copy(key = crypto.decrypt(key))
+
+  override def toString: String = {
+    val sb = new StringBuilder
+    sb.append("ZoneConnection: [")
+    sb.append("name=\"").append(name).append("\"; ")
+    sb.append("keyName=\"").append(keyName).append("\"; ")
+    sb.append("primaryServer=\"").append(primaryServer).append("\"; ")
+    sb.append("]")
+    sb.toString
+  }
 }
 
 final case class LegacyDnsBackend(

From 0e804618603df0beb4042067fe231f40270cb09f Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Tue, 30 Aug 2022 12:11:02 +0530
Subject: [PATCH 091/147] Add test

---
 .../api/domain/zone/ZoneConnectionValidatorSpec.scala  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/api/src/test/scala/vinyldns/api/domain/zone/ZoneConnectionValidatorSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/zone/ZoneConnectionValidatorSpec.scala
index 10e3e53ac..a5d0bf393 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/zone/ZoneConnectionValidatorSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/zone/ZoneConnectionValidatorSpec.scala
@@ -241,5 +241,15 @@ class ZoneConnectionValidatorSpec
         underTest.isValidBackendId(Some("bad")) shouldBe left
       }
     }
+
+    "Zone Connection toString" should {
+      "not display key and algorithm" in {
+        zc.toString shouldBe "ZoneConnection: [name=\"zc.\"; keyName=\"zc.\"; primaryServer=\"10.1.1.1\"; ]"
+
+        // verify the same while displaying connection and transferConnection in Zone
+        val zoneString = s"""Zone: [id="${testZone.id}"; name="vinyldns."; account="system"; adminGroupId="system"; status="Active"; shared="false"; connection="Some(ZoneConnection: [name="vinyldns."; keyName="vinyldns."; primaryServer="10.1.1.1"; ])"; transferConnection="Some(ZoneConnection: [name="vinyldns."; keyName="vinyldns."; primaryServer="10.1.1.1"; ])"; reverse="false"; isTest="false"; created="${testZone.created}"; ]"""
+        testZone.toString shouldBe zoneString
+      }
+    }
   }
 }

From f741de0b17fe86c76681dbf9712cae76d5efdaf3 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Thu, 1 Sep 2022 14:07:53 +0530
Subject: [PATCH 092/147] Handle SPF correctly

---
 .../api/backend/dns/DnsConversions.scala      |  5 ++--
 .../tests/recordsets/create_recordset_test.py | 23 +++++++++++++++++++
 .../api/backend/dns/DnsConversionsSpec.scala  |  9 +++++---
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/backend/dns/DnsConversions.scala b/modules/api/src/main/scala/vinyldns/api/backend/dns/DnsConversions.scala
index b9953d3a7..e541c021b 100644
--- a/modules/api/src/main/scala/vinyldns/api/backend/dns/DnsConversions.scala
+++ b/modules/api/src/main/scala/vinyldns/api/backend/dns/DnsConversions.scala
@@ -278,7 +278,7 @@ trait DnsConversions {
 
   def fromSPFRecord(r: DNS.SPFRecord, zoneName: DNS.Name, zoneId: String): RecordSet =
     fromDnsRecord(r, zoneName, zoneId) { data =>
-      List(SPFData(data.getStrings.asScala.mkString(",")))
+      List(SPFData(data.getStrings.asScala.mkString))
     }
 
   def fromSRVRecord(r: DNS.SRVRecord, zoneName: DNS.Name, zoneId: String): RecordSet =
@@ -393,7 +393,8 @@ trait DnsConversions {
           new DNS.SSHFPRecord(recordName, DNS.DClass.IN, ttl, algorithm, typ, Hex.decodeHex(fingerprint.toCharArray()))
 
         case SPFData(text) =>
-          new DNS.SPFRecord(recordName, DNS.DClass.IN, ttl, text)
+          val texts = text.grouped(255).toList
+          new DNS.SPFRecord(recordName, DNS.DClass.IN, ttl, texts.asJava)
 
         case TXTData(text) =>
           val texts = text.grouped(255).toList
diff --git a/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py b/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py
index c86d0e6a7..03948eda4 100644
--- a/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py
+++ b/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py
@@ -1554,6 +1554,29 @@ def test_create_long_txt_record_succeeds(shared_zone_test_context):
             pass
 
 
+def test_create_long_spf_record_succeeds(shared_zone_test_context):
+    client = shared_zone_test_context.ok_vinyldns_client
+
+    zone = shared_zone_test_context.system_test_zone
+
+    # Anything larger than 255 will test the limits of SPF, 4000 is the value used by R53
+    # (https://aws.amazon.com/premiumsupport/knowledge-center/route-53-configure-long-spf-txt-records/)
+    record_data = "a" * 4000
+    long_spf_rs = create_recordset(zone, "long-spf-record", "SPF", [{"text": record_data}])
+
+    try:
+        rs_create = client.create_recordset(long_spf_rs, status=202)
+        rs = client.wait_until_recordset_change_status(rs_create, "Complete")["recordSet"]
+        assert_that(rs["records"][0]["text"], is_(record_data))
+    finally:
+        try:
+            delete_result = client.delete_recordset(rs["zoneId"], rs["id"], status=202)
+            client.wait_until_recordset_change_status(delete_result, "Complete")
+        except Exception:
+            traceback.print_exc()
+            pass
+
+
 def test_txt_dotted_host_create_succeeds(shared_zone_test_context):
     """
     Tests that a TXT dotted host recordset create succeeds
diff --git a/modules/api/src/test/scala/vinyldns/api/backend/dns/DnsConversionsSpec.scala b/modules/api/src/test/scala/vinyldns/api/backend/dns/DnsConversionsSpec.scala
index bb8c06ae7..7ef6fc886 100644
--- a/modules/api/src/test/scala/vinyldns/api/backend/dns/DnsConversionsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/backend/dns/DnsConversionsSpec.scala
@@ -398,9 +398,9 @@ class DnsConversionsSpec
       verifyMatch(result, testLongTXT)
     }
 
-    "fail to convert a bad SPF record set" in {
-      val result = toDnsRRset(testLongSPF, testZoneName).left.value
-      result shouldBe a[java.lang.IllegalArgumentException]
+    "convert long SPF record set" in {
+      val result = toDnsRRset(testLongSPF, testZoneName).right.value
+      verifyMatch(result, testLongSPF)
     }
   }
 
@@ -514,6 +514,9 @@ class DnsConversionsSpec
     "convert to/from RecordType TXT long TXT record data" in {
       verifyMatch(testLongTXT, roundTrip(testLongTXT))
     }
+    "convert to/from RecordType SPF long SPF record data" in {
+      verifyMatch(testLongSPF, roundTrip(testLongSPF))
+    }
   }
 
   "Converting to DNS RecordType" should {

From 3485401bd3d480ea2fbfcce7d5bb9c99a1934bd6 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Fri, 2 Sep 2022 18:42:34 +0530
Subject: [PATCH 093/147] Added spinner in zone search

---
 modules/portal/app/views/zones/zones.scala.html       |  3 +++
 .../portal/public/lib/services/zones/service.zones.js | 11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/portal/app/views/zones/zones.scala.html b/modules/portal/app/views/zones/zones.scala.html
index 52ab8b759..9c56548df 100644
--- a/modules/portal/app/views/zones/zones.scala.html
+++ b/modules/portal/app/views/zones/zones.scala.html
@@ -144,6 +144,9 @@
                         </div>
                     </div>
                 </div>
+                <div class="modal fade" id="loader" tabindex="-1" role="dialog" >
+                    <div class="spinner" ></div>
+                </div>
                 <div class="tab-pane" id="allZones">
                     <div class="row">
                         <div class="col-md-12">
diff --git a/modules/portal/public/lib/services/zones/service.zones.js b/modules/portal/public/lib/services/zones/service.zones.js
index 4ac031860..2273421e9 100644
--- a/modules/portal/public/lib/services/zones/service.zones.js
+++ b/modules/portal/public/lib/services/zones/service.zones.js
@@ -30,7 +30,16 @@ angular.module('service.zones', [])
                 "ignoreAccess": ignoreAccess
             };
             var url = groupsService.urlBuilder("/api/zones", params);
-            return $http.get(url);
+            let loader = $("#loader");
+            loader.modal({
+                          backdrop: "static", //remove ability to close modal with click
+                          keyboard: false, //remove option to close with keyboard
+                          show: true //Display loader!
+                          })
+            let promis =  $http.get(url);
+            // Hide loader when api gets response
+            promis.then(()=>loader.modal("hide"), ()=>loader.modal("hide"))
+            return promis
         };
 
         this.getBackendIds = function() {

From 96f179d6948db13cfa057b3fd3460f0703e198c7 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 5 Sep 2022 13:53:33 +0530
Subject: [PATCH 094/147] Allow wildcard zones in config

---
 .../api/src/main/resources/application.conf   |  3 +-
 .../src/main/scala/vinyldns/api/Boot.scala    |  6 ++--
 .../api/domain/batch/BatchChangeService.scala | 33 ++++++++++++++++---
 .../domain/batch/BatchChangeValidations.scala | 24 +++++++-------
 .../api/domain/record/RecordSetService.scala  | 25 ++++++++++++--
 .../domain/record/RecordSetValidations.scala  | 16 ++++-----
 6 files changed, 78 insertions(+), 29 deletions(-)

diff --git a/modules/api/src/main/resources/application.conf b/modules/api/src/main/resources/application.conf
index be699fb20..9091cdc7c 100644
--- a/modules/api/src/main/resources/application.conf
+++ b/modules/api/src/main/resources/application.conf
@@ -167,7 +167,8 @@ vinyldns {
 
   # approved zones/domains that are allowed to create dotted hosts
   zone-list = [
-  "ok." # for local testing
+  "dummy.", # for local testing
+  "*en.", # for local testing with wildcard zones (allows 'open.' zone)
   ]
 
   # Note: This MUST match the Portal or strange errors will ensue, NoOpCrypto should not be used for production
diff --git a/modules/api/src/main/scala/vinyldns/api/Boot.scala b/modules/api/src/main/scala/vinyldns/api/Boot.scala
index 782ee3d61..aa7cffb33 100644
--- a/modules/api/src/main/scala/vinyldns/api/Boot.scala
+++ b/modules/api/src/main/scala/vinyldns/api/Boot.scala
@@ -121,8 +121,7 @@ object Boot extends App {
         vinyldnsConfig.highValueDomainConfig,
         vinyldnsConfig.manualReviewConfig,
         vinyldnsConfig.batchChangeConfig,
-        vinyldnsConfig.scheduledChangesConfig,
-        vinyldnsConfig.dottedHostsConfig
+        vinyldnsConfig.scheduledChangesConfig
       )
       val membershipService = MembershipService(repositories)
 
@@ -185,7 +184,8 @@ object Boot extends App {
         notifiers,
         vinyldnsConfig.scheduledChangesConfig.enabled,
         vinyldnsConfig.batchChangeConfig.v6DiscoveryNibbleBoundaries,
-        vinyldnsConfig.serverConfig.defaultTtl
+        vinyldnsConfig.serverConfig.defaultTtl,
+        vinyldnsConfig.dottedHostsConfig
       )
       val collectorRegistry = CollectorRegistry.defaultRegistry
       val vinyldnsService = new VinylDNSService(
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala
index 1a28df53d..d35bcaf16 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala
@@ -27,6 +27,7 @@ import vinyldns.api.domain.auth.AuthPrincipalProvider
 import vinyldns.api.domain.batch.BatchChangeInterfaces._
 import vinyldns.api.domain.batch.BatchTransformations._
 import vinyldns.api.backend.dns.DnsConversions._
+import vinyldns.api.config.DottedHostsConfig
 import vinyldns.api.repository.ApiDataAccessor
 import vinyldns.core.domain.auth.AuthPrincipal
 import vinyldns.core.domain.batch.BatchChangeApprovalStatus.BatchChangeApprovalStatus
@@ -49,7 +50,8 @@ object BatchChangeService {
       notifiers: AllNotifiers,
       scheduledChangesEnabled: Boolean,
       v6DiscoveryNibbleBoundaries: V6DiscoveryNibbleBoundaries,
-      defaultTtl: Long
+      defaultTtl: Long,
+      dottedHostsConfig: DottedHostsConfig
   ): BatchChangeService =
     new BatchChangeService(
       dataAccessor.zoneRepository,
@@ -64,7 +66,8 @@ object BatchChangeService {
       notifiers,
       scheduledChangesEnabled,
       v6DiscoveryNibbleBoundaries,
-      defaultTtl
+      defaultTtl,
+      dottedHostsConfig
     )
 }
 
@@ -81,7 +84,8 @@ class BatchChangeService(
     notifiers: AllNotifiers,
     scheduledChangesEnabled: Boolean,
     v6zoneNibbleBoundaries: V6DiscoveryNibbleBoundaries,
-    defaultTtl: Long
+    defaultTtl: Long,
+    dottedHostsConfig: DottedHostsConfig
 ) extends BatchChangeServiceAlgebra {
 
   import batchChangeValidations._
@@ -122,13 +126,15 @@ class BatchChangeService(
       recordSets <- getExistingRecordSets(changesWithZones, zoneMap).toBatchResult
       withTtl = doTtlMapping(changesWithZones, recordSets)
       groupedChanges = ChangeForValidationMap(withTtl, recordSets)
+      allowedZoneList <- getAllowedZones(dottedHostsConfig.zoneList).toBatchResult
       zoneOrRecordDoesNotAlreadyExist <- zoneOrRecordDoesNotExist(groupedChanges).toBatchResult
       validatedSingleChanges = validateChangesWithContext(
         groupedChanges,
         auth,
         isApproved,
         batchChangeInput.ownerGroupId,
-        zoneOrRecordDoesNotAlreadyExist
+        zoneOrRecordDoesNotAlreadyExist,
+        allowedZoneList
       )
       errorGroupIds <- getGroupIdsFromUnauthorizedErrors(validatedSingleChanges)
       validatedSingleChangesWithGroups = errorGroupMapping(errorGroupIds, validatedSingleChanges)
@@ -159,6 +165,25 @@ class BatchChangeService(
     }
   }
 
+  // Get zones that are allowed to create dotted hosts using the zones present in dotted hosts config
+  def  getAllowedZones(zones: List[String]): IO[Set[String]] = {
+    if(zones.isEmpty){
+      val noZones: IO[Set[String]] = IO(Set.empty)
+      noZones
+    }
+    else {
+      // Wildcard zones needs to be passed to a separate method
+      val wildcardZones = zones.filter(_.contains("*")).map(_.replace("*", ""))
+      // Zones without wildcard character are passed to a separate function
+      val namedZones = zones.filter(zone => !zone.contains("*"))
+      for{
+        namedZoneResult <- zoneRepository.getZonesByNames(namedZones.toSet)
+        wildcardZoneResult <- zoneRepository.getZonesByFilters(wildcardZones.toSet)
+        zoneResult = namedZoneResult ++ wildcardZoneResult // Combine the zones
+      } yield zoneResult.map(x => x.name)
+    }
+  }
+
   def getGroupIdsFromUnauthorizedErrors(
       changes: ValidatedBatch[ChangeForValidation]
   ): BatchResult[Set[Group]] = {
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
index f3354fbc3..76a0eb6fd 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
@@ -19,7 +19,7 @@ package vinyldns.api.domain.batch
 import java.net.InetAddress
 import cats.data._
 import cats.implicits._
-import vinyldns.api.config.{BatchChangeConfig, DottedHostsConfig, HighValueDomainConfig, ManualReviewConfig, ScheduledChangesConfig}
+import vinyldns.api.config.{BatchChangeConfig, HighValueDomainConfig, ManualReviewConfig, ScheduledChangesConfig}
 import vinyldns.api.domain.DomainValidations._
 import vinyldns.api.domain.access.AccessValidationsAlgebra
 import vinyldns.core.domain.auth.AuthPrincipal
@@ -49,7 +49,8 @@ trait BatchChangeValidationsAlgebra {
       auth: AuthPrincipal,
       isApproved: Boolean,
       batchOwnerGroupId: Option[String],
-      zoneOrRecordDoesNotAlreadyExist: Boolean
+      zoneOrRecordDoesNotAlreadyExist: Boolean,
+      dottedHostConfig: Set[String]
   ): ValidatedBatch[ChangeForValidation]
 
   def canGetBatchChange(
@@ -80,8 +81,7 @@ class BatchChangeValidations(
     highValueDomainConfig: HighValueDomainConfig,
     manualReviewConfig: ManualReviewConfig,
     batchChangeConfig: BatchChangeConfig,
-    scheduledChangesConfig: ScheduledChangesConfig,
-    dottedHostsConfig: DottedHostsConfig
+    scheduledChangesConfig: ScheduledChangesConfig
 ) extends BatchChangeValidationsAlgebra {
 
   import RecordType._
@@ -272,7 +272,8 @@ class BatchChangeValidations(
       auth: AuthPrincipal,
       isApproved: Boolean,
       batchOwnerGroupId: Option[String],
-      zoneOrRecordDoesNotAlreadyExist: Boolean
+      zoneOrRecordDoesNotAlreadyExist: Boolean,
+      dottedHostConfig: Set[String]
   ): ValidatedBatch[ChangeForValidation] =
     // Updates are a combination of an add and delete for a record with the same name and type in a zone.
     groupedChanges.changes.mapValid {
@@ -280,7 +281,7 @@ class BatchChangeValidations(
           if groupedChanges
             .getLogicalChangeType(add.recordKey)
             .contains(LogicalChangeType.Add) =>
-        validateAddWithContext(add, groupedChanges, auth, isApproved, batchOwnerGroupId, zoneOrRecordDoesNotAlreadyExist)
+        validateAddWithContext(add, groupedChanges, auth, isApproved, batchOwnerGroupId, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig)
       case addUpdate: AddChangeForValidation =>
         validateAddUpdateWithContext(addUpdate, groupedChanges, auth, isApproved, batchOwnerGroupId)
       // These cases MUST be below adds because:
@@ -296,10 +297,10 @@ class BatchChangeValidations(
     }
 
   // Check if the new record set has dots and if so whether they are allowed or not
-  def newRecordSetDottedCheck(change: AddChangeForValidation, zoneOrRecordDoesNotAlreadyExist: Boolean): SingleValidation[Unit] = {
+  def newRecordSetDottedCheck(change: AddChangeForValidation, zoneOrRecordDoesNotAlreadyExist: Boolean, dottedHostConfig: Set[String]): SingleValidation[Unit] = {
 
     // Check if the zone of the record set is present in dotted hosts config list
-    val isDomainAllowed = dottedHostsConfig.zoneList.contains(change.zone.name)
+    val isDomainAllowed = dottedHostConfig.contains(change.zone.name)
 
     // Check if record set contains dot and if it is in zone which is allowed to have dotted records from dotted hosts config
     if(change.recordName.contains(".") && isDomainAllowed) {
@@ -427,14 +428,15 @@ class BatchChangeValidations(
       auth: AuthPrincipal,
       isApproved: Boolean,
       ownerGroupId: Option[String],
-      zoneOrRecordDoesNotAlreadyExist: Boolean
+      zoneOrRecordDoesNotAlreadyExist: Boolean,
+      dottedHostConfig: Set[String]
   ): SingleValidation[ChangeForValidation] = {
     val typedValidations = change.inputChange.typ match {
       case A | AAAA | MX =>
-        newRecordSetDottedCheck(change, zoneOrRecordDoesNotAlreadyExist)
+        newRecordSetDottedCheck(change, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig: Set[String])
       case CNAME =>
         cnameHasUniqueNameInBatch(change, groupedChanges) |+|
-          newRecordSetDottedCheck(change, zoneOrRecordDoesNotAlreadyExist)
+          newRecordSetDottedCheck(change, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig: Set[String])
       case TXT | PTR =>
         ().validNel
       case other =>
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 517fbcc47..c7f97aac6 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
@@ -110,6 +110,7 @@ class RecordSetService(
       ownerGroup <- getGroupIfProvided(rsForValidations.ownerGroupId)
       _ <- canUseOwnerGroup(rsForValidations.ownerGroupId, ownerGroup, auth).toResult
       _ <- noCnameWithNewName(rsForValidations, existingRecordsWithName, zone).toResult
+      allowedZoneList <- getAllowedZones(dottedHostsConfig.zoneList).toResult[Set[String]]
       zoneOrRecordDoesNotAlreadyExist <- zoneOrRecordDoesNotExist(rsForValidations, zone).toResult[Boolean]
       _ <- typeSpecificValidations(
         rsForValidations,
@@ -118,7 +119,7 @@ class RecordSetService(
         None,
         approvedNameServers,
         zoneOrRecordDoesNotAlreadyExist,
-        dottedHostsConfig
+        allowedZoneList
       ).toResult
       _ <- messageQueue.send(change).toResult[Unit]
     } yield change
@@ -149,6 +150,7 @@ class RecordSetService(
         validateRecordLookupAgainstDnsBackend
       )
       _ <- noCnameWithNewName(rsForValidations, existingRecordsWithName, zone).toResult
+      allowedZoneList <- getAllowedZones(dottedHostsConfig.zoneList).toResult[Set[String]]
       zoneOrRecordDoesNotAlreadyExist <- zoneOrRecordDoesNotExist(rsForValidations, zone).toResult[Boolean]
       _ <- typeSpecificValidations(
         rsForValidations,
@@ -157,7 +159,7 @@ class RecordSetService(
         Some(existing),
         approvedNameServers,
         zoneOrRecordDoesNotAlreadyExist,
-        dottedHostsConfig
+        allowedZoneList
       ).toResult
       _ <- messageQueue.send(change).toResult[Unit]
     } yield change
@@ -202,6 +204,25 @@ class RecordSetService(
     }
   }
 
+  // Get zones that are allowed to create dotted hosts using the zones present in dotted hosts config
+  def  getAllowedZones(zones: List[String]): IO[Set[String]] = {
+    if(zones.isEmpty){
+      val noZones: IO[Set[String]] = IO(Set.empty)
+      noZones
+    }
+    else {
+      // Wildcard zones needs to be passed to a separate method
+      val wildcardZones = zones.filter(_.contains("*")).map(_.replace("*", ""))
+      // Zones without wildcard character are passed to a separate function
+      val namedZones = zones.filter(zone => !zone.contains("*"))
+      for{
+        namedZoneResult <- zoneRepository.getZonesByNames(namedZones.toSet)
+        wildcardZoneResult <- zoneRepository.getZonesByFilters(wildcardZones.toSet)
+        zoneResult = namedZoneResult ++ wildcardZoneResult // Combine the zones
+      } yield zoneResult.map(x => x.name)
+    }
+  }
+
   def getRecordSet(
                     recordSetId: String,
                     authPrincipal: AuthPrincipal
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 b82490667..6124acefe 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
@@ -19,7 +19,7 @@ package vinyldns.api.domain.record
 import cats.syntax.either._
 import vinyldns.api.Interfaces._
 import vinyldns.api.backend.dns.DnsConversions
-import vinyldns.api.config.{DottedHostsConfig, HighValueDomainConfig}
+import vinyldns.api.config.HighValueDomainConfig
 import vinyldns.api.domain._
 import vinyldns.core.domain.DomainHelpers._
 import vinyldns.core.domain.record.RecordType._
@@ -96,11 +96,11 @@ object RecordSetValidations {
       zone: Zone,
       existingRecordSet: Option[RecordSet] = None,
       zoneOrRecordDoesNotAlreadyExist: Boolean,
-      dottedHostConfig: DottedHostsConfig
+      dottedHostConfig: Set[String]
   ): Either[Throwable, Unit] = {
 
     // Check if the zone of the record set is present in dotted hosts config list
-    val isDomainAllowed = dottedHostConfig.zoneList.contains(zone.name)
+    val isDomainAllowed = dottedHostConfig.contains(zone.name)
 
     // Check if record set contains dot and if it is in zone which is allowed to have dotted records from dotted hosts config
     if(newRecordSet.name.contains(".") && isDomainAllowed) {
@@ -150,7 +150,7 @@ object RecordSetValidations {
       existingRecordSet: Option[RecordSet],
       approvedNameServers: List[Regex],
       zoneOrRecordDoesNotAlreadyExist: Boolean = true,
-      dottedHostConfig: DottedHostsConfig
+      dottedHostConfig: Set[String]
   ): Either[Throwable, Unit] =
     newRecordSet.typ match {
       case CNAME => cnameValidations(newRecordSet, existingRecordsWithName, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig)
@@ -182,7 +182,7 @@ object RecordSetValidations {
       zone: Zone,
       existingRecordSet: Option[RecordSet] = None,
       zoneOrRecordDoesNotAlreadyExist: Boolean,
-      dottedHostConfig: DottedHostsConfig
+      dottedHostConfig: Set[String]
   ): Either[Throwable, Unit] = {
     // cannot create a cname record if a record with the same exists
     val noRecordWithName = {
@@ -225,7 +225,7 @@ object RecordSetValidations {
       existingRecordsWithName: List[RecordSet],
       zone: Zone,
       zoneOrRecordDoesNotAlreadyExist: Boolean,
-      dottedHostConfig: DottedHostsConfig
+      dottedHostConfig: Set[String]
   ): Either[Throwable, Unit] = {
     // see https://tools.ietf.org/html/rfc4035#section-2.4
     val nsChecks = existingRecordsWithName.find(_.typ == NS) match {
@@ -254,7 +254,7 @@ object RecordSetValidations {
       oldRecordSet: Option[RecordSet],
       approvedNameServers: List[Regex],
       zoneOrRecordDoesNotAlreadyExist: Boolean,
-      dottedHostConfig: DottedHostsConfig
+      dottedHostConfig: Set[String]
   ): Either[Throwable, Unit] = {
     // TODO kept consistency with old validation. Not sure why NS could be dotted in reverse specifically
     val isNotDottedHost = if (!zone.isReverse) checkForDot(newRecordSet, zone, None, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig) else ().asRight
@@ -279,7 +279,7 @@ object RecordSetValidations {
     } yield ()
   }
 
-  def soaValidations(newRecordSet: RecordSet, zone: Zone, zoneOrRecordDoesNotAlreadyExist: Boolean, dottedHostConfig: DottedHostsConfig): Either[Throwable, Unit] =
+  def soaValidations(newRecordSet: RecordSet, zone: Zone, zoneOrRecordDoesNotAlreadyExist: Boolean, dottedHostConfig: Set[String]): Either[Throwable, Unit] =
     // TODO kept consistency with old validation. in theory if SOA always == zone name, no special case is needed here
     if (!zone.isReverse) checkForDot(newRecordSet, zone, None, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig) else ().asRight
 

From e04500656a52e46dc52bc779296c9515a1396c90 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 5 Sep 2022 15:15:16 +0530
Subject: [PATCH 095/147] Update as separate test

---
 .../api/domain/zone/ZoneConnectionValidatorSpec.scala         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/api/src/test/scala/vinyldns/api/domain/zone/ZoneConnectionValidatorSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/zone/ZoneConnectionValidatorSpec.scala
index a5d0bf393..d47b2e2d3 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/zone/ZoneConnectionValidatorSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/zone/ZoneConnectionValidatorSpec.scala
@@ -245,8 +245,8 @@ class ZoneConnectionValidatorSpec
     "Zone Connection toString" should {
       "not display key and algorithm" in {
         zc.toString shouldBe "ZoneConnection: [name=\"zc.\"; keyName=\"zc.\"; primaryServer=\"10.1.1.1\"; ]"
-
-        // verify the same while displaying connection and transferConnection in Zone
+      }
+      "not display key and algorithm while displaying connection and transferConnection of a Zone" in {
         val zoneString = s"""Zone: [id="${testZone.id}"; name="vinyldns."; account="system"; adminGroupId="system"; status="Active"; shared="false"; connection="Some(ZoneConnection: [name="vinyldns."; keyName="vinyldns."; primaryServer="10.1.1.1"; ])"; transferConnection="Some(ZoneConnection: [name="vinyldns."; keyName="vinyldns."; primaryServer="10.1.1.1"; ])"; reverse="false"; isTest="false"; created="${testZone.created}"; ]"""
         testZone.toString shouldBe zoneString
       }

From cb90f790bd353eb589b5776725caccfa2fdc70a3 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Tue, 6 Sep 2022 17:34:56 +0530
Subject: [PATCH 096/147] Update functionality

---
 .../RecordSetServiceIntegrationSpec.scala     |   1 +
 .../api/src/main/resources/application.conf   |   2 +-
 .../domain/batch/BatchChangeValidations.scala |   4 +-
 .../api/domain/record/RecordSetService.scala  |  13 +-
 .../domain/record/RecordSetValidations.scala  |   6 +-
 .../vinyldns/api/VinylDNSTestHelpers.scala    |   4 +-
 .../domain/batch/BatchChangeServiceSpec.scala |  24 +-
 .../batch/BatchChangeValidationsSpec.scala    | 212 +++++++++++++-----
 .../domain/record/RecordSetServiceSpec.scala  |  14 ++
 .../record/RecordSetValidationsSpec.scala     |  82 +++----
 .../core/domain/DomainValidationErrors.scala  |   6 +-
 .../scala/vinyldns/core/TestZoneData.scala    |   1 +
 12 files changed, 258 insertions(+), 111 deletions(-)

diff --git a/modules/api/src/it/scala/vinyldns/api/domain/record/RecordSetServiceIntegrationSpec.scala b/modules/api/src/it/scala/vinyldns/api/domain/record/RecordSetServiceIntegrationSpec.scala
index df845b477..1cf0d50f6 100644
--- a/modules/api/src/it/scala/vinyldns/api/domain/record/RecordSetServiceIntegrationSpec.scala
+++ b/modules/api/src/it/scala/vinyldns/api/domain/record/RecordSetServiceIntegrationSpec.scala
@@ -300,6 +300,7 @@ class RecordSetServiceIntegrationSpec
       mockBackendResolver,
       false,
       vinyldnsConfig.highValueDomainConfig,
+      vinyldnsConfig.dottedHostsConfig,
       vinyldnsConfig.serverConfig.approvedNameServers,
       useRecordSetCache = true
     )
diff --git a/modules/api/src/main/resources/application.conf b/modules/api/src/main/resources/application.conf
index 9091cdc7c..8b7df4d5c 100644
--- a/modules/api/src/main/resources/application.conf
+++ b/modules/api/src/main/resources/application.conf
@@ -168,7 +168,7 @@ vinyldns {
   # approved zones/domains that are allowed to create dotted hosts
   zone-list = [
   "dummy.", # for local testing
-  "*en.", # for local testing with wildcard zones (allows 'open.' zone)
+  "*ent.com", # for local testing with wildcard zones (allows parent.com and child.parent.com zone)
   ]
 
   # Note: This MUST match the Portal or strange errors will ensue, NoOpCrypto should not be used for production
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
index 76a0eb6fd..1ac65e91c 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
@@ -303,10 +303,10 @@ class BatchChangeValidations(
     val isDomainAllowed = dottedHostConfig.contains(change.zone.name)
 
     // Check if record set contains dot and if it is in zone which is allowed to have dotted records from dotted hosts config
-    if(change.recordName.contains(".") && isDomainAllowed) {
+    if((change.recordName.contains(".") || !zoneOrRecordDoesNotAlreadyExist) && isDomainAllowed && change.recordName != change.zone.name) {
       // If there is a zone or record already present which conflicts with the new dotted record, throw an error
       if (!zoneOrRecordDoesNotAlreadyExist || change.recordName == change.zone.name)
-        DottedHostError(change.recordName, change.inputChange.typ.toString).invalidNel
+        DottedHostError(change.recordName, change.zone.name).invalidNel
       else
         ().validNel
     }
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 c7f97aac6..719f2595c 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
@@ -183,13 +183,22 @@ class RecordSetService(
   // For dotted hosts. Check if a zone or record that may conflict with dotted host exist or not
   def zoneOrRecordDoesNotExist(newRecordSet: RecordSet, zone: Zone): IO[Boolean] = {
     // Use fqdn for searching through `recordset` and `zone` mysql table to see if it already exist
-    val newRecordFqdn = newRecordSet.name + "." + zone.name
+    val newRecordFqdn = if(newRecordSet.name != zone.name) newRecordSet.name + "." + zone.name else newRecordSet.name
+
+    val possibleZones = if(newRecordSet.name.contains(".")){
+      newRecordSet.name.split('.').map(x => x + "." + zone.name)
+    } else {
+      Array(newRecordSet.name)
+    }
+
     for {
       zone <- zoneRepository.getZoneByName(newRecordFqdn)
+      allMatchingZones <- zoneRepository.getZonesByFilters(possibleZones.toSet)
       record <- recordSetRepository.getRecordSetsByFQDNs(Set(newRecordFqdn))
+      isNotTheIntendedZone = allMatchingZones.map(x => x.name).exists(x => newRecordFqdn.contains(x))
       isZoneAlreadyExist = zone.isDefined
       isRecordAlreadyExist = doesRecordWithSameTypeExist(record, newRecordSet)
-      doesNotExist = if(isZoneAlreadyExist || isRecordAlreadyExist) false else true
+      doesNotExist = if(isZoneAlreadyExist || isRecordAlreadyExist || isNotTheIntendedZone) false else true
     } yield doesNotExist
   }
 
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 6124acefe..4c8e5139f 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
@@ -103,7 +103,7 @@ object RecordSetValidations {
     val isDomainAllowed = dottedHostConfig.contains(zone.name)
 
     // Check if record set contains dot and if it is in zone which is allowed to have dotted records from dotted hosts config
-    if(newRecordSet.name.contains(".") && isDomainAllowed) {
+    if((newRecordSet.name.contains(".") || !zoneOrRecordDoesNotAlreadyExist) && isDomainAllowed && newRecordSet.name != zone.name) {
       isDotted(newRecordSet, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist)
     }
     else{
@@ -120,8 +120,8 @@ object RecordSetValidations {
   ): Either[Throwable, Unit] =
     ensuring(
       InvalidRequest(
-        s"Record with name ${newRecordSet.name} and type ${newRecordSet.typ} already exists. " +
-          s"Please check the record and zone that's already present and make the change there."
+        s"Record with fqdn '${newRecordSet.name}.${zone.name}' cannot be created. " +
+          s"Please check if there's a zone or record that already exist and make the change there."
       )
     )(
       (newRecordSet.name != zone.name || existingRecordSet.exists(_.name == newRecordSet.name)) && zoneOrRecordDoesNotAlreadyExist
diff --git a/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala b/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala
index d071b846d..50d63a36e 100644
--- a/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala
+++ b/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala
@@ -18,7 +18,7 @@ package vinyldns.api
 
 import com.comcast.ip4s.IpAddress
 import org.joda.time.DateTime
-import vinyldns.api.config.{BatchChangeConfig, HighValueDomainConfig, LimitsConfig, ManualReviewConfig, ScheduledChangesConfig}
+import vinyldns.api.config.{BatchChangeConfig, DottedHostsConfig, HighValueDomainConfig, LimitsConfig, ManualReviewConfig, ScheduledChangesConfig}
 import vinyldns.api.domain.batch.V6DiscoveryNibbleBoundaries
 import vinyldns.core.domain.record._
 import vinyldns.core.domain.zone._
@@ -40,6 +40,8 @@ trait VinylDNSTestHelpers {
 
   val approvedNameServers: List[Regex] = List(new Regex("some.test.ns."))
 
+  val dottedHostsConfig: DottedHostsConfig = DottedHostsConfig(List("dotted.xyz"))
+
   val defaultTtl: Long = 7200
 
   val manualReviewDomainList: List[Regex] = List(new Regex("needs-review.*"))
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeServiceSpec.scala
index fb27338c1..d80caee54 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeServiceSpec.scala
@@ -418,7 +418,8 @@ class BatchChangeServiceSpec
     mockNotifiers,
     false,
     defaultv6Discovery,
-    7200L
+    7200L,
+    VinylDNSTestHelpers.dottedHostsConfig
   )
 
   private val underTestManualEnabled = new BatchChangeService(
@@ -434,7 +435,8 @@ class BatchChangeServiceSpec
     mockNotifiers,
     false,
     defaultv6Discovery,
-    7200L
+    7200L,
+    VinylDNSTestHelpers.dottedHostsConfig
   )
 
   private val underTestScheduledEnabled = new BatchChangeService(
@@ -450,7 +452,8 @@ class BatchChangeServiceSpec
     mockNotifiers,
     true,
     defaultv6Discovery,
-    7200L
+    7200L,
+    VinylDNSTestHelpers.dottedHostsConfig
   )
 
   "applyBatchChange" should {
@@ -476,7 +479,8 @@ class BatchChangeServiceSpec
         mockNotifiers,
         false,
         new V6DiscoveryNibbleBoundaries(16, 17),
-        7200L
+        7200L,
+        VinylDNSTestHelpers.dottedHostsConfig
       )
       val ptr = AddChangeInput(
         "2001:0000:0000:0001:0000:ff00:0042:8329",
@@ -507,7 +511,8 @@ class BatchChangeServiceSpec
         mockNotifiers,
         false,
         new V6DiscoveryNibbleBoundaries(16, 16),
-        7200L
+        7200L,
+        VinylDNSTestHelpers.dottedHostsConfig
       )
       val ptr = AddChangeInput(
         "2001:0000:0000:0001:0000:ff00:0042:8329",
@@ -1177,7 +1182,8 @@ class BatchChangeServiceSpec
         mockNotifiers,
         false,
         defaultv6Discovery,
-        7200L
+        7200L,
+        VinylDNSTestHelpers.dottedHostsConfig
       )
 
       val ip = "2001:0db8:0000:0000:0000:ff00:0042:8329"
@@ -1218,7 +1224,8 @@ class BatchChangeServiceSpec
         mockNotifiers,
         false,
         new V6DiscoveryNibbleBoundaries(16, 16),
-        7200L
+        7200L,
+        VinylDNSTestHelpers.dottedHostsConfig
       )
 
       val ip = "2001:0db8:0000:0000:0000:ff00:0042:8329"
@@ -1244,7 +1251,8 @@ class BatchChangeServiceSpec
         mockNotifiers,
         false,
         defaultv6Discovery,
-        7200L
+        7200L,
+        VinylDNSTestHelpers.dottedHostsConfig
       )
 
       val ip1 = "::1"
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
index f322b2523..576494f3f 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
@@ -819,7 +819,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) shouldBe valid
@@ -884,7 +886,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result.foreach(_ shouldBe valid)
@@ -924,7 +928,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result.foreach(_ shouldBe valid)
@@ -951,7 +957,9 @@ class BatchChangeValidationsSpec
       ),
       notAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) shouldBe valid
@@ -982,7 +990,9 @@ class BatchChangeValidationsSpec
       ),
       notAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1022,7 +1032,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) shouldBe valid
@@ -1072,7 +1084,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) shouldBe valid
@@ -1110,7 +1124,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result.foreach(_ shouldBe valid)
@@ -1133,7 +1149,9 @@ class BatchChangeValidationsSpec
           ChangeForValidationMap(List(input.validNel), ExistingRecordSets(newRecordSetList)),
           okAuth,
           false,
-          None
+          None,
+          true,
+          VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
         )
 
         result(0) should haveInvalid[DomainValidationError](
@@ -1150,7 +1168,9 @@ class BatchChangeValidationsSpec
           ChangeForValidationMap(List(input.validNel), ExistingRecordSets(recordSetList)),
           okAuth,
           false,
-          None
+          None,
+          true,
+          VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
         )
 
       result(0) shouldBe valid
@@ -1166,7 +1186,9 @@ class BatchChangeValidationsSpec
           ChangeForValidationMap(List(input.validNel), ExistingRecordSets(recordSetList)),
           okAuth,
           false,
-          None
+          None,
+          true,
+          VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
         )
         result(0) shouldBe valid
       }
@@ -1185,7 +1207,9 @@ class BatchChangeValidationsSpec
         ChangeForValidationMap(List(input.validNel), ExistingRecordSets(existingRecordSetList)),
         okAuth,
         false,
-        None
+        None,
+        true,
+        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
       )
 
       result(0) should haveInvalid[DomainValidationError](
@@ -1217,7 +1241,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) shouldBe valid
@@ -1238,7 +1264,9 @@ class BatchChangeValidationsSpec
       ChangeForValidationMap(List(addCname.validNel), ExistingRecordSets(newRecordSetList)),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1267,7 +1295,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) shouldBe valid
@@ -1292,7 +1322,9 @@ class BatchChangeValidationsSpec
       ChangeForValidationMap(List(addCname.validNel), ExistingRecordSets(List(existingRecordPTR))),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1327,7 +1359,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) shouldBe valid
@@ -1362,7 +1396,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) shouldBe valid
@@ -1402,7 +1438,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) shouldBe valid
@@ -1444,7 +1482,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result.map(_ shouldBe valid)
@@ -1463,7 +1503,9 @@ class BatchChangeValidationsSpec
         ChangeForValidationMap(List(addA.validNel), ExistingRecordSets(recordSetList)),
         okAuth,
         false,
-        None
+        None,
+        true,
+        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
       )
 
     result(0) shouldBe valid
@@ -1482,7 +1524,9 @@ class BatchChangeValidationsSpec
       ChangeForValidationMap(List(addA.validNel), ExistingRecordSets(recordSetList)),
       AuthPrincipal(superUser, Seq.empty),
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1509,7 +1553,9 @@ class BatchChangeValidationsSpec
         ChangeForValidationMap(List(addA.validNel), ExistingRecordSets(recordSetList)),
         notAuth,
         false,
-        None
+        None,
+        true,
+        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
       )
 
     result(0) shouldBe valid
@@ -1525,7 +1571,9 @@ class BatchChangeValidationsSpec
           ChangeForValidationMap(List(input.validNel), ExistingRecordSets(recordSetList)),
           notAuth,
           false,
-          None
+          None,
+          true,
+          VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
         )
 
       result(0) should haveInvalid[DomainValidationError](
@@ -1557,7 +1605,9 @@ class BatchChangeValidationsSpec
       ChangeForValidationMap(List(addCname.validNel, addPtr.validNel), ExistingRecordSets(List())),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1582,7 +1632,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) shouldBe valid
@@ -1603,7 +1655,9 @@ class BatchChangeValidationsSpec
         ),
         okAuth,
         false,
-        None
+        None,
+        true,
+        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
       )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1633,7 +1687,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) shouldBe valid
@@ -1655,7 +1711,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) shouldBe valid
@@ -1677,7 +1735,9 @@ class BatchChangeValidationsSpec
       ),
       AuthPrincipal(superUser, Seq.empty),
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1708,7 +1768,9 @@ class BatchChangeValidationsSpec
       ),
       notAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) shouldBe valid
@@ -1731,7 +1793,9 @@ class BatchChangeValidationsSpec
       ),
       notAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1799,7 +1863,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) shouldBe valid
@@ -1848,7 +1914,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
     result.map(_ shouldBe valid)
   }
@@ -1891,7 +1959,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
     result.map(_ shouldBe valid)
   }
@@ -1921,7 +1991,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
     result.map(_ shouldBe valid)
   }
@@ -1959,7 +2031,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) shouldBe valid
@@ -1998,7 +2072,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
     result.map(_ shouldBe valid)
   }
@@ -2031,7 +2107,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
     result.map(_ shouldBe valid)
   }
@@ -2069,7 +2147,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result.map(_ shouldBe valid)
@@ -2183,7 +2263,9 @@ class BatchChangeValidationsSpec
         ChangeForValidationMap(List(addMX.validNel), ExistingRecordSets(List(existingMX))),
         okAuth,
         false,
-        None
+        None,
+        true,
+        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
       )
     result(0) should haveInvalid[DomainValidationError](RecordAlreadyExists("name-conflict."))
   }
@@ -2206,7 +2288,9 @@ class BatchChangeValidationsSpec
       ChangeForValidationMap(List(addMx.validNel, addMx2.validNel), ExistingRecordSets(List())),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
     result(0) shouldBe valid
   }
@@ -2237,7 +2321,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
     result(0) shouldBe valid
   }
@@ -2266,7 +2352,9 @@ class BatchChangeValidationsSpec
       ),
       AuthPrincipal(okUser, Seq(abcGroup.id, okGroup.id)),
       false,
-      Some("some-owner-group-id")
+      Some("some-owner-group-id"),
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result.foreach(_ shouldBe valid)
@@ -2296,7 +2384,9 @@ class BatchChangeValidationsSpec
       ),
       AuthPrincipal(okUser, Seq(abcGroup.id, okGroup.id)),
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) shouldBe valid
@@ -2325,7 +2415,9 @@ class BatchChangeValidationsSpec
       ),
       dummyAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) should
@@ -2349,7 +2441,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) shouldBe valid
@@ -2363,7 +2457,9 @@ class BatchChangeValidationsSpec
       ),
       sharedAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) shouldBe valid
@@ -2397,7 +2493,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      Some(okGroup.id)
+      Some(okGroup.id),
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) shouldBe valid
@@ -2442,7 +2540,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      Some(okGroup.id)
+      Some(okGroup.id),
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) shouldBe valid
@@ -2501,7 +2601,9 @@ class BatchChangeValidationsSpec
         ),
         okAuth,
         false,
-        None
+        None,
+        true,
+        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
       )
 
     result(0) should haveInvalid[DomainValidationError](ZoneDiscoveryError("dotted.a.ok."))
@@ -2555,7 +2657,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) shouldBe valid
@@ -2657,7 +2761,9 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None
+      None,
+      true,
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
     )
 
     result(0) shouldBe valid
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
index 3d629e43b..34df9e161 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
@@ -83,6 +83,7 @@ class RecordSetServiceSpec
     mockBackendResolver,
     false,
     VinylDNSTestHelpers.highValueDomainConfig,
+    VinylDNSTestHelpers.dottedHostsConfig,
     VinylDNSTestHelpers.approvedNameServers,
     true
   )
@@ -101,6 +102,7 @@ class RecordSetServiceSpec
     mockBackendResolver,
     true,
     VinylDNSTestHelpers.highValueDomainConfig,
+    VinylDNSTestHelpers.dottedHostsConfig,
     VinylDNSTestHelpers.approvedNameServers,
     true
   )
@@ -165,6 +167,18 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, record.name)
+      doReturn(IO.pure(Set(dottedZone)))
+        .when(mockZoneRepo)
+        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(Set.empty)
+      doReturn(IO.pure(None))
+        .when(mockZoneRepo)
+        .getZoneByName(record.name + "." + okZone.name)
+      doReturn(IO.pure(List()))
+        .when(mockRecordRepo)
+        .getRecordSetsByFQDNs(Set(record.name + "." + okZone.name))
 
       val result = leftResultOf(underTest.addRecordSet(record, okAuth).value)
       result shouldBe an[InvalidRequest]
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala
index 304f65ed4..bcbfa747d 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala
@@ -189,19 +189,19 @@ class RecordSetValidationsSpec
         val dottedARecord = rsOk.copy(name = "this.is.a.failure.")
         "return a failure for any new record with dotted hosts in forward zones" in {
           leftValue(
-            typeSpecificValidations(dottedARecord, List(), okZone, None, Nil)
+            typeSpecificValidations(dottedARecord, List(), okZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
           ) shouldBe an[InvalidRequest]
         }
 
         "return a failure for any new record with dotted hosts in forward zones (CNAME)" in {
           leftValue(
-            typeSpecificValidations(dottedARecord.copy(typ = CNAME), List(), okZone, None, Nil)
+            typeSpecificValidations(dottedARecord.copy(typ = CNAME), List(), okZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
           ) shouldBe an[InvalidRequest]
         }
 
         "return a failure for any new record with dotted hosts in forward zones (NS)" in {
           leftValue(
-            typeSpecificValidations(dottedARecord.copy(typ = NS), List(), okZone, None, Nil)
+            typeSpecificValidations(dottedARecord.copy(typ = NS), List(), okZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
           ) shouldBe an[InvalidRequest]
         }
 
@@ -211,7 +211,9 @@ class RecordSetValidationsSpec
             List(),
             okZone,
             Some(dottedARecord.copy(ttl = 300)),
-            Nil
+            Nil,
+            true,
+            VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
           ) should be(right)
         }
 
@@ -222,7 +224,9 @@ class RecordSetValidationsSpec
             List(),
             okZone,
             Some(dottedCNAMERecord.copy(ttl = 300)),
-            Nil
+            Nil,
+            true,
+            VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
           ) should be(right)
         }
 
@@ -234,7 +238,9 @@ class RecordSetValidationsSpec
               List(),
               okZone,
               Some(dottedNSRecord.copy(ttl = 300)),
-              Nil
+              Nil,
+              true,
+              VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
             )
           ) shouldBe an[InvalidRequest]
         }
@@ -245,35 +251,35 @@ class RecordSetValidationsSpec
           val test = srv.copy(name = "_sip._tcp.example.com.")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
         }
 
         "return success for an SRV record following convention without FQDN" in {
           val test = srv.copy(name = "_sip._tcp")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
         }
 
         "return success for an SRV record following convention with a record name" in {
           val test = srv.copy(name = "_sip._tcp.foo.")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
         }
 
         "return success on a wildcard SRV that follows convention" in {
           val test = srv.copy(name = "*._tcp.example.com.")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
         }
 
         "return success on a wildcard in second position SRV that follows convention" in {
           val test = srv.copy(name = "_sip._*.example.com.")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
         }
       }
       "Skip dotted checks on NAPTR" should {
@@ -281,21 +287,21 @@ class RecordSetValidationsSpec
           val test = naptr.copy(name = "sub.naptr.example.com.")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
         }
 
         "return success for an NAPTR record without FQDN" in {
           val test = naptr.copy(name = "sub.naptr")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
         }
 
         "return success on a wildcard NAPTR" in {
           val test = naptr.copy(name = "*.sub.naptr.example.com.")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
         }
 
       }
@@ -304,7 +310,7 @@ class RecordSetValidationsSpec
           val test = ptrIp4.copy(name = "10.1.2.")
           val zone = zoneIp4.copy(name = "198.in-addr.arpa.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
         }
       }
       "Skip dotted checks on TXT" should {
@@ -312,7 +318,7 @@ class RecordSetValidationsSpec
           val test = txt.copy(name = "sub.txt.example.com.")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
         }
 
       }
@@ -329,7 +335,7 @@ class RecordSetValidationsSpec
             List(SOAData(Fqdn("something"), "other", 1, 2, 3, 5, 6))
           )
 
-          typeSpecificValidations(test, List(), zoneIp4, None, Nil) should be(right)
+          typeSpecificValidations(test, List(), zoneIp4, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
         }
       }
     }
@@ -342,29 +348,29 @@ class RecordSetValidationsSpec
           records = List(NSData(Fqdn("some.test.ns.")))
         )
 
-        nsValidations(valid, okZone, None, List(new Regex(".*"))) should be(right)
+        nsValidations(valid, okZone, None, List(new Regex(".*")), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
       }
 
       "return an InvalidRequest if an NS record is '@'" in {
-        val error = leftValue(nsValidations(invalidNsApexRs, okZone, None, Nil))
+        val error = leftValue(nsValidations(invalidNsApexRs, okZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
         error shouldBe an[InvalidRequest]
       }
 
       "return an InvalidRequest if an NS record is the same as the zone" in {
         val invalid = invalidNsApexRs.copy(name = okZone.name)
-        val error = leftValue(nsValidations(invalid, okZone, None, Nil))
+        val error = leftValue(nsValidations(invalid, okZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
         error shouldBe an[InvalidRequest]
       }
 
       "return an InvalidRequest if the NS record being updated is '@'" in {
         val valid = invalidNsApexRs.copy(name = "this-is-not-origin-mate")
-        val error = leftValue(nsValidations(valid, okZone, Some(invalidNsApexRs), Nil))
+        val error = leftValue(nsValidations(valid, okZone, Some(invalidNsApexRs), Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
         error shouldBe an[InvalidRequest]
       }
 
       "return an InvalidRequest if an NS record data is not in the approved server list" in {
         val ns = invalidNsApexRs.copy(records = List(NSData(Fqdn("not.approved."))))
-        val error = leftValue(nsValidations(ns, okZone, None, List(new Regex("not.*"))))
+        val error = leftValue(nsValidations(ns, okZone, None, List(new Regex("not.*")), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
         error shouldBe an[InvalidRequest]
       }
     }
@@ -372,25 +378,25 @@ class RecordSetValidationsSpec
     "DSValidations" should {
       val matchingNs = ns.copy(zoneId = ds.zoneId, name = ds.name, ttl = ds.ttl)
       "return ok if the record is non-origin DS with matching NS" in {
-        dsValidations(ds, List(matchingNs), okZone) should be(right)
+        dsValidations(ds, List(matchingNs), okZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
       }
       "return an InvalidRequest if a DS record is '@'" in {
         val apex = ds.copy(name = "@")
-        val error = leftValue(dsValidations(apex, List(matchingNs), okZone))
+        val error = leftValue(dsValidations(apex, List(matchingNs), okZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
         error shouldBe an[InvalidRequest]
       }
       "return an InvalidRequest if a DS record is the same as the zone" in {
         val apex = ds.copy(name = okZone.name)
-        val error = leftValue(dsValidations(apex, List(matchingNs), okZone))
+        val error = leftValue(dsValidations(apex, List(matchingNs), okZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
         error shouldBe an[InvalidRequest]
       }
       "return an InvalidRequest if there is no NS matching the record" in {
-        val error = leftValue(dsValidations(ds, List(), okZone))
+        val error = leftValue(dsValidations(ds, List(), okZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
         error shouldBe an[InvalidRequest]
       }
       "return an InvalidRequest if the DS is dotted" in {
         val error =
-          leftValue(dsValidations(ds.copy(name = "test.dotted"), List(matchingNs), okZone))
+          leftValue(dsValidations(ds.copy(name = "test.dotted"), List(matchingNs), okZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
         error shouldBe an[InvalidRequest]
       }
     }
@@ -398,51 +404,51 @@ class RecordSetValidationsSpec
     "CnameValidations" should {
       val invalidCnameApexRs: RecordSet = cname.copy(name = "@")
       "return a RecordSetAlreadyExistsError if a record with the same name exists and creating a cname" in {
-        val error = leftValue(cnameValidations(cname, List(aaaa), okZone))
+        val error = leftValue(cnameValidations(cname, List(aaaa), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
         error shouldBe a[RecordSetAlreadyExists]
       }
       "return ok if name is not '@'" in {
-        cnameValidations(cname, List(), okZone) should be(right)
+        cnameValidations(cname, List(), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
       }
       "return an InvalidRequest if a cname record set name is '@'" in {
-        val error = leftValue(cnameValidations(invalidCnameApexRs, List(), okZone))
+        val error = leftValue(cnameValidations(invalidCnameApexRs, List(), okZone, None,  true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
         error shouldBe an[InvalidRequest]
       }
       "return an InvalidRequest if a cname record set name is same as zone" in {
         val invalid = invalidCnameApexRs.copy(name = okZone.name)
-        val error = leftValue(cnameValidations(invalid, List(), okZone))
+        val error = leftValue(cnameValidations(invalid, List(), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
         error shouldBe an[InvalidRequest]
       }
       "return an InvalidRequest if a cname record set name is dotted" in {
-        val error = leftValue(cnameValidations(cname.copy(name = "dot.ted"), List(), okZone))
+        val error = leftValue(cnameValidations(cname.copy(name = "dot.ted"), List(), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
         error shouldBe an[InvalidRequest]
       }
       "return ok if new recordset name does not contain dot" in {
-        cnameValidations(cname, List(), okZone, Some(cname.copy(name = "not-dotted"))) should be(
+        cnameValidations(cname, List(), okZone, Some(cname.copy(name = "not-dotted")), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(
           right
         )
       }
       "return ok if dotted host name doesn't change" in {
         val newRecord = cname.copy(name = "dot.ted", ttl = 500)
-        cnameValidations(newRecord, List(), okZone, Some(newRecord.copy(ttl = 300))) should be(
+        cnameValidations(newRecord, List(), okZone, Some(newRecord.copy(ttl = 300)), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(
           right
         )
       }
       "return an InvalidRequest if a cname record set name is updated to '@'" in {
-        val error = leftValue(cnameValidations(cname.copy(name = "@"), List(), okZone, Some(cname)))
+        val error = leftValue(cnameValidations(cname.copy(name = "@"), List(), okZone, Some(cname), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
         error shouldBe an[InvalidRequest]
       }
       "return an InvalidRequest if updated cname record set name is same as zone" in {
         val error =
-          leftValue(cnameValidations(cname.copy(name = okZone.name), List(), okZone, Some(cname)))
+          leftValue(cnameValidations(cname.copy(name = okZone.name), List(), okZone, Some(cname), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
         error shouldBe an[InvalidRequest]
       }
       "return an RecordSetValidation error if recordset data contain more than one sequential '.'" in {
-        val error = leftValue(cnameValidations(cname.copy(records = List(CNAMEData(Fqdn("record..zone")))), List(), okZone))
+        val error = leftValue(cnameValidations(cname.copy(records = List(CNAMEData(Fqdn("record..zone")))), List(), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
         error shouldBe an[RecordSetValidation]
       }
       "return ok if recordset data does not contain sequential '.'" in {
-        cnameValidations(cname.copy(records = List(CNAMEData(Fqdn("record.zone")))), List(), okZone) should be(
+        cnameValidations(cname.copy(records = List(CNAMEData(Fqdn("record.zone")))), List(), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(
           right
         )
       }
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
index 6b56663d1..79998757b 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
@@ -109,10 +109,10 @@ final case class ZoneDiscoveryError(name: String, fatal: Boolean = false)
       "If zone exists, then it must be connected to in VinylDNS."
 }
 
-final case class DottedHostError(name: String, rsType: String) extends DomainValidationError {
+final case class DottedHostError(name: String, zone: String) extends DomainValidationError {
   def message: String =
-    s"Record with name $name and type $rsType already exists. " +
-      s"Please check the record and zone that's already present and make the change there."
+    s"Record with fqdn '$name.$zone' cannot be created. " +
+      s"Please check if there's a zone or record that already exist and make the change there."
 }
 
 final case class RecordAlreadyExists(name: String) extends DomainValidationError {
diff --git a/modules/core/src/test/scala/vinyldns/core/TestZoneData.scala b/modules/core/src/test/scala/vinyldns/core/TestZoneData.scala
index 751d44359..cdc6cc925 100644
--- a/modules/core/src/test/scala/vinyldns/core/TestZoneData.scala
+++ b/modules/core/src/test/scala/vinyldns/core/TestZoneData.scala
@@ -34,6 +34,7 @@ object TestZoneData {
     adminGroupId = okGroup.id,
     connection = testConnection
   )
+  val dottedZone: Zone = Zone("dotted.xyz", "dotted@xyz.com", adminGroupId = xyzGroup.id)
   val abcZone: Zone = Zone("abc.zone.recordsets.", "test@test.com", adminGroupId = abcGroup.id)
   val xyzZone: Zone = Zone("xyz.", "abc@xyz.com", adminGroupId = xyzGroup.id)
   val zoneIp4: Zone = Zone("0.162.198.in-addr.arpa.", "test@test.com", adminGroupId = abcGroup.id)

From 567ae9ea6c5ac6005f3a573311c9b8647942bd2b Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 9 Sep 2022 11:37:33 +0530
Subject: [PATCH 097/147] Change to debug

---
 .../portal/public/lib/controllers/controller.groups.js    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/portal/public/lib/controllers/controller.groups.js b/modules/portal/public/lib/controllers/controller.groups.js
index 22bff01f3..43cc396c8 100644
--- a/modules/portal/public/lib/controllers/controller.groups.js
+++ b/modules/portal/public/lib/controllers/controller.groups.js
@@ -117,7 +117,7 @@ angular.module('controller.groups', []).controller('GroupsController', function
         groupsService
             .getGroupsAbridged(groupsPaging.maxItems, undefined, false, $scope.query)
             .then(function (result) {
-                  $log.log('getGroups:refresh-success', result);
+                  $log.debug('getGroups:refresh-success', result);
                   //update groups
                   groupsPaging.next = result.data.nextId;
                   updateGroupDisplay(result.data.groups);
@@ -132,7 +132,7 @@ angular.module('controller.groups', []).controller('GroupsController', function
         groupsService
             .getGroupsAbridged(allGroupsPaging.maxItems, undefined, true, $scope.query)
             .then(function (result) {
-                $log.log('getGroups:refresh-success', result);
+                $log.debug('getGroups:refresh-success', result);
                 //update groups
                 allGroupsPaging.next = result.data.nextId;
                 updateAllGroupDisplay(result.data.groups);
@@ -296,7 +296,7 @@ angular.module('controller.groups', []).controller('GroupsController', function
     function updateGroupDisplay (groups) {
         $scope.groups.items = groups;
         $scope.groupsLoaded = true;
-        $log.log("Displaying my groups: ", $scope.groups.items);
+        $log.debug("Displaying my groups: ", $scope.groups.items);
         if($scope.groups.items.length > 0) {
             $("td.dataTables_empty").hide();
         } else {
@@ -307,7 +307,7 @@ angular.module('controller.groups', []).controller('GroupsController', function
     function updateAllGroupDisplay (groups) {
         $scope.allGroup.items = groups;
         $scope.allGroupsLoaded = true;
-        $log.log("Displaying all groups: ", $scope.allGroup.items);
+        $log.debug("Displaying all groups: ", $scope.allGroup.items);
         if($scope.allGroup.items.length > 0) {
             $("td.dataTables_empty").hide();
         } else {

From adc212e04b5dc58cc9c2af8eee67be10f32b4b93 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 9 Sep 2022 12:23:07 +0530
Subject: [PATCH 099/147] Change to debug

---
 .../public/lib/controllers/controller.membership.js       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/portal/public/lib/controllers/controller.membership.js b/modules/portal/public/lib/controllers/controller.membership.js
index 78bd7a427..fd0fbf907 100644
--- a/modules/portal/public/lib/controllers/controller.membership.js
+++ b/modules/portal/public/lib/controllers/controller.membership.js
@@ -238,10 +238,10 @@ angular.module('controller.membership', []).controller('MembershipController', f
             id = id.substring(id.lastIndexOf('/') + 1);
             id = id.substring(0, id.indexOf('#'))
         }
-        $log.log('refreshGroupChanges, loading group with id ', id);
+        $log.debug('refreshGroupChanges, loading group with id ', id);
         changePaging = pagingService.resetPaging(changePaging);
         function success(response) {
-            $log.log('groupsService::getGroupChanges-success');
+            $log.debug('groupsService::getGroupChanges-success');
             changePaging.next = response.data.nextId;
             updateChangeDisplay(response.data.changes)
         }
@@ -281,7 +281,7 @@ angular.module('controller.membership', []).controller('MembershipController', f
         var id = $location.absUrl().toString();
         id = id.substring(id.lastIndexOf('/') + 1);
         id = id.substring(0, id.indexOf('#'))
-        $log.log('changePrevPage, loading group with id ', id);
+        $log.debug('changePrevPage, loading group with id ', id);
         return groupsService
             .getGroupChanges(id, changePaging.maxItems, startFrom)
             .then(function(response) {
@@ -297,7 +297,7 @@ angular.module('controller.membership', []).controller('MembershipController', f
         var id = $location.absUrl().toString();
         id = id.substring(id.lastIndexOf('/') + 1);
         id = id.substring(0, id.indexOf('#'))
-        $log.log('changeNextPage, loading group with id ', id);
+        $log.debug('changeNextPage, loading group with id ', id);
         return groupsService
             .getGroupChanges(id, changePaging.maxItems, changePaging.next)
             .then(function(response) {

From 7c5bb6316020b527218147ecf7fca18e0c4f07db Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 12 Sep 2022 13:16:07 +0530
Subject: [PATCH 100/147] Fix bug

---
 modules/portal/public/css/vinyldns.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/portal/public/css/vinyldns.css b/modules/portal/public/css/vinyldns.css
index 96d2a2a67..5d09bcd6e 100644
--- a/modules/portal/public/css/vinyldns.css
+++ b/modules/portal/public/css/vinyldns.css
@@ -104,7 +104,7 @@ a.action-link {
     top: 3px;
     left: 50%;
     width: 40%;
-    z-index: 100;
+    z-index: 2000;
 }
 
 .dns-connection-form {

From fe69ae7acfbce269d0cb0a883db910defb04fee8 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Wed, 14 Sep 2022 14:07:08 +0530
Subject: [PATCH 101/147] Restrict user access

---
 .../api/src/main/resources/application.conf   |  15 +-
 modules/api/src/main/resources/reference.conf |  14 +-
 .../api/config/DottedHostsConfig.scala        |  13 +-
 .../vinyldns/api/config/VinylDNSConfig.scala  |   2 +-
 .../api/domain/batch/BatchChangeService.scala |  31 ++-
 .../domain/batch/BatchChangeValidations.scala |  23 +-
 .../api/domain/record/RecordSetService.scala  |  30 ++-
 .../domain/record/RecordSetValidations.scala  |  48 +++--
 .../domain/record/RecordSetServiceSpec.scala  | 200 +++++++++++++++++-
 .../core/domain/DomainValidationErrors.scala  |   2 +-
 10 files changed, 313 insertions(+), 65 deletions(-)

diff --git a/modules/api/src/main/resources/application.conf b/modules/api/src/main/resources/application.conf
index 8b7df4d5c..3d717a112 100644
--- a/modules/api/src/main/resources/application.conf
+++ b/modules/api/src/main/resources/application.conf
@@ -165,11 +165,16 @@ vinyldns {
     "ns1.parent.com4."
   ]
 
-  # approved zones/domains that are allowed to create dotted hosts
-  zone-list = [
-  "dummy.", # for local testing
-  "*ent.com", # for local testing with wildcard zones (allows parent.com and child.parent.com zone)
-  ]
+  # approved zones/domains and users that are allowed to create dotted hosts
+  dotted-hosts = {
+      zone-list = [
+      "dummy.", # for local testing
+      "*ent.com", # for local testing with wildcard zones (allows parent.com and child.parent.com zone)
+      ]
+      allowed-user-list = [
+      "testuser" # for local testing
+      ]
+  }
 
   # Note: This MUST match the Portal or strange errors will ensue, NoOpCrypto should not be used for production
   crypto {
diff --git a/modules/api/src/main/resources/reference.conf b/modules/api/src/main/resources/reference.conf
index c60afc5f0..5dec2af5b 100644
--- a/modules/api/src/main/resources/reference.conf
+++ b/modules/api/src/main/resources/reference.conf
@@ -90,10 +90,16 @@ vinyldns {
     "ns1.parent.com."
   ]
 
-  # approved zones/domains that are allowed to create dotted hosts
-  zone-list = [
-    "ok." # for local testing
-  ]
+  # approved zones/domains and users that are allowed to create dotted hosts
+  dotted-hosts = {
+      zone-list = [
+      "dummy.", # for local testing
+      "*ent.com", # for local testing with wildcard zones (allows parent.com and child.parent.com zone)
+      ]
+      allowed-user-list = [
+      "testuser" # for local testing
+      ]
+  }
 
   # color should be green or blue, used in order to do blue/green deployment
   color = "green"
diff --git a/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala b/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
index e6a375d69..178d0c254 100644
--- a/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
+++ b/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
@@ -18,11 +18,14 @@ package vinyldns.api.config
 
 import pureconfig.ConfigReader
 
-final case class DottedHostsConfig(zoneList: List[String])
+final case class DottedHostsConfig(zoneList: List[String], allowedUserList: List[String])
 object DottedHostsConfig {
   implicit val configReader: ConfigReader[DottedHostsConfig] =
-    ConfigReader.forProduct1[DottedHostsConfig, List[String]](
-      "zone-list"
-    )(zoneList =>
-      DottedHostsConfig(zoneList))
+    ConfigReader.forProduct2[DottedHostsConfig, List[String], List[String]](
+      "zone-list",
+      "allowed-user-list"
+    ){
+      case (zoneList, allowedUserList) =>
+        DottedHostsConfig(zoneList, allowedUserList)
+    }
 }
diff --git a/modules/api/src/main/scala/vinyldns/api/config/VinylDNSConfig.scala b/modules/api/src/main/scala/vinyldns/api/config/VinylDNSConfig.scala
index fc5a0d42e..dd41bb3a0 100644
--- a/modules/api/src/main/scala/vinyldns/api/config/VinylDNSConfig.scala
+++ b/modules/api/src/main/scala/vinyldns/api/config/VinylDNSConfig.scala
@@ -86,7 +86,7 @@ object VinylDNSConfig {
       serverConfig <- loadIO[ServerConfig](config, "vinyldns")
       batchChangeConfig <- loadIO[BatchChangeConfig](config, "vinyldns")
       backendConfigs <- loadIO[BackendConfigs](config, "vinyldns.backend")
-      dottedHostsConfig <- loadIO[DottedHostsConfig](config, "vinyldns")
+      dottedHostsConfig <- loadIO[DottedHostsConfig](config, "vinyldns.dotted-hosts")
       httpConfig <- loadIO[HttpConfig](config, "vinyldns.rest")
       hvdConfig <- loadIO[HighValueDomainConfig](config, "vinyldns.high-value-domains")
       scheduledChangesConfig <- loadIO[ScheduledChangesConfig](config, "vinyldns")
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala
index d35bcaf16..7c9d07efb 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala
@@ -127,6 +127,7 @@ class BatchChangeService(
       withTtl = doTtlMapping(changesWithZones, recordSets)
       groupedChanges = ChangeForValidationMap(withTtl, recordSets)
       allowedZoneList <- getAllowedZones(dottedHostsConfig.zoneList).toBatchResult
+      isUserAllowed = checkIfAllowedUsers(dottedHostsConfig.allowedUserList, auth)
       zoneOrRecordDoesNotAlreadyExist <- zoneOrRecordDoesNotExist(groupedChanges).toBatchResult
       validatedSingleChanges = validateChangesWithContext(
         groupedChanges,
@@ -134,7 +135,8 @@ class BatchChangeService(
         isApproved,
         batchChangeInput.ownerGroupId,
         zoneOrRecordDoesNotAlreadyExist,
-        allowedZoneList
+        allowedZoneList,
+        isUserAllowed
       )
       errorGroupIds <- getGroupIdsFromUnauthorizedErrors(validatedSingleChanges)
       validatedSingleChangesWithGroups = errorGroupMapping(errorGroupIds, validatedSingleChanges)
@@ -142,14 +144,21 @@ class BatchChangeService(
 
   // For dotted hosts. Check if a zone or record that may conflict with dotted host exist or not
   def zoneOrRecordDoesNotExist(groupedChanges: ChangeForValidationMap): IO[Boolean] = {
-    val inputChange = groupedChanges.changes.map(x => x.toOption).map(x => x.get)
-    // Use fqdn for searching through `recordset` and `zone` mysql table to see if it already exist
-    val newRecordFqdn = inputChange.map(_.recordName).head + "." + inputChange.map(_.zone.name).head
+    val groupedChangesMap = groupedChanges.changes.map(x => x.toOption).filter(x => x.isDefined)
+
+    val newRecordFqdn = if(groupedChangesMap.nonEmpty){
+      val inputChange = groupedChangesMap.map(x => x.get)
+      // Use fqdn for searching through `recordset` and `zone` mysql table to see if it already exist
+      inputChange.map(_.recordName).head + "." + inputChange.map(_.zone.name).head
+    } else {
+      ""
+    }
+
     for {
       zone <- zoneRepository.getZoneByName(newRecordFqdn)
       record <- recordSetRepository.getRecordSetsByFQDNs(Set(newRecordFqdn))
       isZoneAlreadyExist = zone.isDefined
-      isRecordAlreadyExist = doesRecordWithSameTypeExist(record, inputChange.map(_.inputChange))
+      isRecordAlreadyExist = if(groupedChangesMap.nonEmpty) doesRecordWithSameTypeExist(record, groupedChangesMap.map(x => x.get).map(_.inputChange)) else false
       doesNotExist = if(isZoneAlreadyExist || isRecordAlreadyExist) false else true
     } yield doesNotExist
   }
@@ -176,7 +185,7 @@ class BatchChangeService(
       val wildcardZones = zones.filter(_.contains("*")).map(_.replace("*", ""))
       // Zones without wildcard character are passed to a separate function
       val namedZones = zones.filter(zone => !zone.contains("*"))
-      for{
+      for {
         namedZoneResult <- zoneRepository.getZonesByNames(namedZones.toSet)
         wildcardZoneResult <- zoneRepository.getZonesByFilters(wildcardZones.toSet)
         zoneResult = namedZoneResult ++ wildcardZoneResult // Combine the zones
@@ -184,6 +193,16 @@ class BatchChangeService(
     }
   }
 
+  // Check if the user is allowed to create dotted hosts using the users present in dotted hosts config
+  def  checkIfAllowedUsers(users: List[String], auth: AuthPrincipal): Boolean = {
+    if(users.contains(auth.signedInUser.userName)){
+      true
+    }
+    else {
+      false
+    }
+  }
+
   def getGroupIdsFromUnauthorizedErrors(
       changes: ValidatedBatch[ChangeForValidation]
   ): BatchResult[Set[Group]] = {
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
index 1ac65e91c..4ff99e0de 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
@@ -50,7 +50,8 @@ trait BatchChangeValidationsAlgebra {
       isApproved: Boolean,
       batchOwnerGroupId: Option[String],
       zoneOrRecordDoesNotAlreadyExist: Boolean,
-      dottedHostConfig: Set[String]
+      dottedHostZoneConfig: Set[String],
+      isUserAllowed: Boolean
   ): ValidatedBatch[ChangeForValidation]
 
   def canGetBatchChange(
@@ -273,7 +274,8 @@ class BatchChangeValidations(
       isApproved: Boolean,
       batchOwnerGroupId: Option[String],
       zoneOrRecordDoesNotAlreadyExist: Boolean,
-      dottedHostConfig: Set[String]
+      dottedHostZoneConfig: Set[String],
+      isUserAllowed: Boolean
   ): ValidatedBatch[ChangeForValidation] =
     // Updates are a combination of an add and delete for a record with the same name and type in a zone.
     groupedChanges.changes.mapValid {
@@ -281,7 +283,7 @@ class BatchChangeValidations(
           if groupedChanges
             .getLogicalChangeType(add.recordKey)
             .contains(LogicalChangeType.Add) =>
-        validateAddWithContext(add, groupedChanges, auth, isApproved, batchOwnerGroupId, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig)
+        validateAddWithContext(add, groupedChanges, auth, isApproved, batchOwnerGroupId, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isUserAllowed)
       case addUpdate: AddChangeForValidation =>
         validateAddUpdateWithContext(addUpdate, groupedChanges, auth, isApproved, batchOwnerGroupId)
       // These cases MUST be below adds because:
@@ -297,15 +299,15 @@ class BatchChangeValidations(
     }
 
   // Check if the new record set has dots and if so whether they are allowed or not
-  def newRecordSetDottedCheck(change: AddChangeForValidation, zoneOrRecordDoesNotAlreadyExist: Boolean, dottedHostConfig: Set[String]): SingleValidation[Unit] = {
+  def newRecordSetDottedCheck(change: AddChangeForValidation, zoneOrRecordDoesNotAlreadyExist: Boolean, dottedHostZoneConfig: Set[String], isUserAllowed: Boolean): SingleValidation[Unit] = {
 
     // Check if the zone of the record set is present in dotted hosts config list
-    val isDomainAllowed = dottedHostConfig.contains(change.zone.name)
+    val isDomainAllowed = dottedHostZoneConfig.contains(change.zone.name)
 
     // Check if record set contains dot and if it is in zone which is allowed to have dotted records from dotted hosts config
     if((change.recordName.contains(".") || !zoneOrRecordDoesNotAlreadyExist) && isDomainAllowed && change.recordName != change.zone.name) {
-      // If there is a zone or record already present which conflicts with the new dotted record, throw an error
-      if (!zoneOrRecordDoesNotAlreadyExist || change.recordName == change.zone.name)
+      // If the user is not authorized or if there is a zone/record already present which conflicts with the new dotted record, throw an error
+      if (!zoneOrRecordDoesNotAlreadyExist || change.recordName == change.zone.name || !isUserAllowed)
         DottedHostError(change.recordName, change.zone.name).invalidNel
       else
         ().validNel
@@ -429,14 +431,15 @@ class BatchChangeValidations(
       isApproved: Boolean,
       ownerGroupId: Option[String],
       zoneOrRecordDoesNotAlreadyExist: Boolean,
-      dottedHostConfig: Set[String]
+      dottedHostZoneConfig: Set[String],
+      isUserAllowed: Boolean
   ): SingleValidation[ChangeForValidation] = {
     val typedValidations = change.inputChange.typ match {
       case A | AAAA | MX =>
-        newRecordSetDottedCheck(change, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig: Set[String])
+        newRecordSetDottedCheck(change, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig: Set[String], isUserAllowed)
       case CNAME =>
         cnameHasUniqueNameInBatch(change, groupedChanges) |+|
-          newRecordSetDottedCheck(change, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig: Set[String])
+          newRecordSetDottedCheck(change, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig: Set[String], isUserAllowed)
       case TXT | PTR =>
         ().validNel
       case other =>
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 719f2595c..13ef634a8 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
@@ -111,6 +111,7 @@ class RecordSetService(
       _ <- canUseOwnerGroup(rsForValidations.ownerGroupId, ownerGroup, auth).toResult
       _ <- noCnameWithNewName(rsForValidations, existingRecordsWithName, zone).toResult
       allowedZoneList <- getAllowedZones(dottedHostsConfig.zoneList).toResult[Set[String]]
+      isUserAllowed = checkIfAllowedUsers(dottedHostsConfig.allowedUserList, auth)
       zoneOrRecordDoesNotAlreadyExist <- zoneOrRecordDoesNotExist(rsForValidations, zone).toResult[Boolean]
       _ <- typeSpecificValidations(
         rsForValidations,
@@ -119,7 +120,8 @@ class RecordSetService(
         None,
         approvedNameServers,
         zoneOrRecordDoesNotAlreadyExist,
-        allowedZoneList
+        allowedZoneList,
+        isUserAllowed
       ).toResult
       _ <- messageQueue.send(change).toResult[Unit]
     } yield change
@@ -151,6 +153,7 @@ class RecordSetService(
       )
       _ <- noCnameWithNewName(rsForValidations, existingRecordsWithName, zone).toResult
       allowedZoneList <- getAllowedZones(dottedHostsConfig.zoneList).toResult[Set[String]]
+      isUserAllowed = checkIfAllowedUsers(dottedHostsConfig.allowedUserList, auth)
       zoneOrRecordDoesNotAlreadyExist <- zoneOrRecordDoesNotExist(rsForValidations, zone).toResult[Boolean]
       _ <- typeSpecificValidations(
         rsForValidations,
@@ -159,7 +162,8 @@ class RecordSetService(
         Some(existing),
         approvedNameServers,
         zoneOrRecordDoesNotAlreadyExist,
-        allowedZoneList
+        allowedZoneList,
+        isUserAllowed
       ).toResult
       _ <- messageQueue.send(change).toResult[Unit]
     } yield change
@@ -185,18 +189,12 @@ class RecordSetService(
     // Use fqdn for searching through `recordset` and `zone` mysql table to see if it already exist
     val newRecordFqdn = if(newRecordSet.name != zone.name) newRecordSet.name + "." + zone.name else newRecordSet.name
 
-    val possibleZones = if(newRecordSet.name.contains(".")){
-      newRecordSet.name.split('.').map(x => x + "." + zone.name)
-    } else {
-      Array(newRecordSet.name)
-    }
-
     for {
-      zone <- zoneRepository.getZoneByName(newRecordFqdn)
-      allMatchingZones <- zoneRepository.getZonesByFilters(possibleZones.toSet)
+      existingZone <- zoneRepository.getZoneByName(newRecordFqdn)
+      allMatchingZones <- if(newRecordSet.name.contains(".")) zoneRepository.getZonesByFilters(newRecordSet.name.split('.').map(x => x + "." + zone.name).toSet) else zoneRepository.getZonesByFilters(Set.empty)
       record <- recordSetRepository.getRecordSetsByFQDNs(Set(newRecordFqdn))
       isNotTheIntendedZone = allMatchingZones.map(x => x.name).exists(x => newRecordFqdn.contains(x))
-      isZoneAlreadyExist = zone.isDefined
+      isZoneAlreadyExist = existingZone.isDefined
       isRecordAlreadyExist = doesRecordWithSameTypeExist(record, newRecordSet)
       doesNotExist = if(isZoneAlreadyExist || isRecordAlreadyExist || isNotTheIntendedZone) false else true
     } yield doesNotExist
@@ -232,6 +230,16 @@ class RecordSetService(
     }
   }
 
+  // Check if user is allowed to create dotted hosts using the users present in dotted hosts config
+  def  checkIfAllowedUsers(users: List[String], auth: AuthPrincipal): Boolean = {
+    if(users.contains(auth.signedInUser.userName)){
+      true
+    }
+    else {
+      false
+    }
+  }
+
   def getRecordSet(
                     recordSetId: String,
                     authPrincipal: AuthPrincipal
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 4c8e5139f..92a2e051a 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
@@ -96,35 +96,37 @@ object RecordSetValidations {
       zone: Zone,
       existingRecordSet: Option[RecordSet] = None,
       zoneOrRecordDoesNotAlreadyExist: Boolean,
-      dottedHostConfig: Set[String]
+      dottedHostZoneConfig: Set[String],
+      isUserAllowed: Boolean
   ): Either[Throwable, Unit] = {
 
     // Check if the zone of the record set is present in dotted hosts config list
-    val isDomainAllowed = dottedHostConfig.contains(zone.name)
+    val isDomainAllowed = dottedHostZoneConfig.contains(zone.name)
 
     // Check if record set contains dot and if it is in zone which is allowed to have dotted records from dotted hosts config
     if((newRecordSet.name.contains(".") || !zoneOrRecordDoesNotAlreadyExist) && isDomainAllowed && newRecordSet.name != zone.name) {
-      isDotted(newRecordSet, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist)
+      isDotted(newRecordSet, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, isUserAllowed)
     }
     else{
       isNotDotted(newRecordSet, zone, existingRecordSet)
     }
   }
 
-  // Check if there is a zone or record already present which conflicts with the new dotted record. If so, throw an error
+  // Check if the user is not authorized and if there is a zone/record already present which conflicts with the new dotted record. If so, throw an error
   def isDotted(
      newRecordSet: RecordSet,
      zone: Zone,
      existingRecordSet: Option[RecordSet] = None,
-     zoneOrRecordDoesNotAlreadyExist: Boolean
+     zoneOrRecordDoesNotAlreadyExist: Boolean,
+     isUserAllowed: Boolean
   ): Either[Throwable, Unit] =
     ensuring(
       InvalidRequest(
         s"Record with fqdn '${newRecordSet.name}.${zone.name}' cannot be created. " +
-          s"Please check if there's a zone or record that already exist and make the change there."
+          s"Please check if user has permission or if there's a zone/record that already exist and make the change there."
       )
     )(
-      (newRecordSet.name != zone.name || existingRecordSet.exists(_.name == newRecordSet.name)) && zoneOrRecordDoesNotAlreadyExist
+      (newRecordSet.name != zone.name || existingRecordSet.exists(_.name == newRecordSet.name)) && zoneOrRecordDoesNotAlreadyExist && isUserAllowed
     )
 
   // Check if the recordset contains dot but is not in the allowed zones to create dotted records. If so, throw an error
@@ -150,16 +152,17 @@ object RecordSetValidations {
       existingRecordSet: Option[RecordSet],
       approvedNameServers: List[Regex],
       zoneOrRecordDoesNotAlreadyExist: Boolean = true,
-      dottedHostConfig: Set[String]
+      dottedHostZoneConfig: Set[String],
+      isUserAllowed: Boolean
   ): Either[Throwable, Unit] =
     newRecordSet.typ match {
-      case CNAME => cnameValidations(newRecordSet, existingRecordsWithName, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig)
-      case NS => nsValidations(newRecordSet, zone, existingRecordSet, approvedNameServers, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig)
-      case SOA => soaValidations(newRecordSet, zone, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig)
+      case CNAME => cnameValidations(newRecordSet, existingRecordsWithName, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isUserAllowed)
+      case NS => nsValidations(newRecordSet, zone, existingRecordSet, approvedNameServers, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isUserAllowed)
+      case SOA => soaValidations(newRecordSet, zone, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isUserAllowed)
       case PTR => ptrValidations(newRecordSet, zone)
       case SRV | TXT | NAPTR => ().asRight // SRV, TXT and NAPTR do not go through dotted host check
-      case DS => dsValidations(newRecordSet, existingRecordsWithName, zone, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig)
-      case _ => checkForDot(newRecordSet, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig)
+      case DS => dsValidations(newRecordSet, existingRecordsWithName, zone, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isUserAllowed)
+      case _ => checkForDot(newRecordSet, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isUserAllowed)
     }
 
   def typeSpecificDeleteValidations(recordSet: RecordSet, zone: Zone): Either[Throwable, Unit] =
@@ -182,7 +185,8 @@ object RecordSetValidations {
       zone: Zone,
       existingRecordSet: Option[RecordSet] = None,
       zoneOrRecordDoesNotAlreadyExist: Boolean,
-      dottedHostConfig: Set[String]
+      dottedHostZoneConfig: Set[String],
+      isUserAllowed: Boolean
   ): Either[Throwable, Unit] = {
     // cannot create a cname record if a record with the same exists
     val noRecordWithName = {
@@ -215,7 +219,7 @@ object RecordSetValidations {
       )
       _ <- noRecordWithName
       _ <- RDataWithConsecutiveDots
-      _ <- checkForDot(newRecordSet, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig)
+      _ <- checkForDot(newRecordSet, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isUserAllowed)
     } yield ()
 
   }
@@ -225,7 +229,8 @@ object RecordSetValidations {
       existingRecordsWithName: List[RecordSet],
       zone: Zone,
       zoneOrRecordDoesNotAlreadyExist: Boolean,
-      dottedHostConfig: Set[String]
+      dottedHostZoneConfig: Set[String],
+      isUserAllowed: Boolean
   ): Either[Throwable, Unit] = {
     // see https://tools.ietf.org/html/rfc4035#section-2.4
     val nsChecks = existingRecordsWithName.find(_.typ == NS) match {
@@ -238,7 +243,7 @@ object RecordSetValidations {
     }
 
     for {
-      _ <- checkForDot(newRecordSet, zone, None, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig)
+      _ <- checkForDot(newRecordSet, zone, None, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isUserAllowed)
       _ <- isNotOrigin(
         newRecordSet,
         zone,
@@ -254,10 +259,11 @@ object RecordSetValidations {
       oldRecordSet: Option[RecordSet],
       approvedNameServers: List[Regex],
       zoneOrRecordDoesNotAlreadyExist: Boolean,
-      dottedHostConfig: Set[String]
+      dottedHostZoneConfig: Set[String],
+      isUserAllowed: Boolean
   ): Either[Throwable, Unit] = {
     // TODO kept consistency with old validation. Not sure why NS could be dotted in reverse specifically
-    val isNotDottedHost = if (!zone.isReverse) checkForDot(newRecordSet, zone, None, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig) else ().asRight
+    val isNotDottedHost = if (!zone.isReverse) checkForDot(newRecordSet, zone, None, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isUserAllowed) else ().asRight
 
     for {
       _ <- isNotDottedHost
@@ -279,9 +285,9 @@ object RecordSetValidations {
     } yield ()
   }
 
-  def soaValidations(newRecordSet: RecordSet, zone: Zone, zoneOrRecordDoesNotAlreadyExist: Boolean, dottedHostConfig: Set[String]): Either[Throwable, Unit] =
+  def soaValidations(newRecordSet: RecordSet, zone: Zone, zoneOrRecordDoesNotAlreadyExist: Boolean, dottedHostZoneConfig: Set[String], isUserAllowed: Boolean): Either[Throwable, Unit] =
     // TODO kept consistency with old validation. in theory if SOA always == zone name, no special case is needed here
-    if (!zone.isReverse) checkForDot(newRecordSet, zone, None, zoneOrRecordDoesNotAlreadyExist, dottedHostConfig) else ().asRight
+    if (!zone.isReverse) checkForDot(newRecordSet, zone, None, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isUserAllowed) else ().asRight
 
   def ptrValidations(newRecordSet: RecordSet, zone: Zone): Either[Throwable, Unit] =
     // TODO we don't check for PTR as dotted...not sure why
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
index 34df9e161..52bd78588 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
@@ -117,6 +117,21 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, record.name)
+      doReturn(IO.pure(Set(dottedZone)))
+        .when(mockZoneRepo)
+        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(Set.empty)
+      doReturn(IO.pure(None))
+        .when(mockZoneRepo)
+        .getZoneByName(record.name + "." + okZone.name)
+      doReturn(IO.pure(List()))
+        .when(mockRecordRepo)
+        .getRecordSetsByFQDNs(Set(record.name + "." + okZone.name))
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(Set.empty)
 
       val result: RecordSetChange =
         rightResultOf(
@@ -157,7 +172,7 @@ class RecordSetServiceSpec
       val result = leftResultOf(underTest.addRecordSet(aaaa, okAuth).value)
       result shouldBe a[RecordSetAlreadyExists]
     }
-    "fail if the record is dotted" in {
+    "fail if the record is dotted and zone is not in the dotted hosts config allowed zones" in {
       val record =
         aaaa.copy(name = "new.name", zoneId = okZone.id, status = RecordSetStatus.Active)
 
@@ -179,6 +194,9 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByFQDNs(Set(record.name + "." + okZone.name))
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(record.name.split('.').map(x => x + "." + okZone.name).toSet)
 
       val result = leftResultOf(underTest.addRecordSet(record, okAuth).value)
       result shouldBe an[InvalidRequest]
@@ -193,6 +211,21 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, record.name)
+      doReturn(IO.pure(Set(dottedZone)))
+        .when(mockZoneRepo)
+        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(Set.empty)
+      doReturn(IO.pure(None))
+        .when(mockZoneRepo)
+        .getZoneByName(record.name + "." + okZone.name)
+      doReturn(IO.pure(List()))
+        .when(mockRecordRepo)
+        .getRecordSetsByFQDNs(Set(record.name + "." + okZone.name))
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(record.name.split('.').map(x => x + "." + okZone.name).toSet)
 
       val result =
         leftResultOf(underTestWithDnsBackendValidations.addRecordSet(record, okAuth).value)
@@ -218,6 +251,21 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, record.name)
+      doReturn(IO.pure(Set(dottedZone)))
+        .when(mockZoneRepo)
+        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(Set.empty)
+      doReturn(IO.pure(None))
+        .when(mockZoneRepo)
+        .getZoneByName(record.name)
+      doReturn(IO.pure(List()))
+        .when(mockRecordRepo)
+        .getRecordSetsByFQDNs(Set(record.name))
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(record.name.split('.').map(x => x + "." + okZone.name).toSet)
 
       val result: RecordSetChange = rightResultOf(
         underTest.addRecordSet(record, okAuth).map(_.asInstanceOf[RecordSetChange]).value
@@ -236,6 +284,21 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, record.name)
+      doReturn(IO.pure(Set(dottedZone)))
+        .when(mockZoneRepo)
+        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(Set.empty)
+      doReturn(IO.pure(None))
+        .when(mockZoneRepo)
+        .getZoneByName(record.name)
+      doReturn(IO.pure(List()))
+        .when(mockRecordRepo)
+        .getRecordSetsByFQDNs(Set(record.name))
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(record.name.split('.').map(x => x + "." + okZone.name).toSet)
 
       val result: RecordSetChange = rightResultOf(
         underTest.addRecordSet(record, okAuth).map(_.asInstanceOf[RecordSetChange]).value
@@ -273,6 +336,21 @@ class RecordSetServiceSpec
       doReturn(IO.pure(Some(okGroup)))
         .when(mockGroupRepo)
         .getGroup(okGroup.id)
+      doReturn(IO.pure(Set(dottedZone)))
+        .when(mockZoneRepo)
+        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(Set.empty)
+      doReturn(IO.pure(None))
+        .when(mockZoneRepo)
+        .getZoneByName(record.name + "." + okZone.name)
+      doReturn(IO.pure(List()))
+        .when(mockRecordRepo)
+        .getRecordSetsByFQDNs(Set(record.name + "." + okZone.name))
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(Set.empty)
 
       val result: RecordSetChange = rightResultOf(
         underTest.addRecordSet(record, okAuth).map(_.asInstanceOf[RecordSetChange]).value
@@ -326,6 +404,21 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, record.name)
+      doReturn(IO.pure(Set(dottedZone)))
+        .when(mockZoneRepo)
+        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(Set.empty)
+      doReturn(IO.pure(None))
+        .when(mockZoneRepo)
+        .getZoneByName(record.name + "." + okZone.name)
+      doReturn(IO.pure(List()))
+        .when(mockRecordRepo)
+        .getRecordSetsByFQDNs(Set(record.name + "." + okZone.name))
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(Set.empty)
 
       val result: RecordSetChange =
         rightResultOf(
@@ -355,6 +448,21 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, newRecord.name)
+      doReturn(IO.pure(Set(dottedZone)))
+        .when(mockZoneRepo)
+        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(Set.empty)
+      doReturn(IO.pure(None))
+        .when(mockZoneRepo)
+        .getZoneByName(newRecord.name + "." + okZone.name)
+      doReturn(IO.pure(List()))
+        .when(mockRecordRepo)
+        .getRecordSetsByFQDNs(Set(newRecord.name + "." + okZone.name))
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(Set.empty)
 
       val result: RecordSetChange = rightResultOf(
         underTest.updateRecordSet(newRecord, okAuth).map(_.asInstanceOf[RecordSetChange]).value
@@ -391,6 +499,21 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, newRecord.name)
+      doReturn(IO.pure(Set(dottedZone)))
+        .when(mockZoneRepo)
+        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(Set.empty)
+      doReturn(IO.pure(None))
+        .when(mockZoneRepo)
+        .getZoneByName(newRecord.name + "." + okZone.name)
+      doReturn(IO.pure(List()))
+        .when(mockRecordRepo)
+        .getRecordSetsByFQDNs(Set(newRecord.name + "." + okZone.name))
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(newRecord.name.split('.').map(x => x + "." + okZone.name).toSet)
 
       val result: RecordSetChange = rightResultOf(
         underTest.updateRecordSet(newRecord, okAuth).map(_.asInstanceOf[RecordSetChange]).value
@@ -430,6 +553,21 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, newRecord.name)
+      doReturn(IO.pure(Set(dottedZone)))
+        .when(mockZoneRepo)
+        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(Set.empty)
+      doReturn(IO.pure(None))
+        .when(mockZoneRepo)
+        .getZoneByName(newRecord.name)
+      doReturn(IO.pure(List()))
+        .when(mockRecordRepo)
+        .getRecordSetsByFQDNs(Set(newRecord.name))
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(newRecord.name.split('.').map(x => x + "." + okZone.name).toSet)
 
       val result: RecordSetChange = rightResultOf(
         underTest.updateRecordSet(newRecord, okAuth).map(_.asInstanceOf[RecordSetChange]).value
@@ -452,6 +590,21 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, newRecord.name)
+      doReturn(IO.pure(Set(dottedZone)))
+        .when(mockZoneRepo)
+        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(Set.empty)
+      doReturn(IO.pure(None))
+        .when(mockZoneRepo)
+        .getZoneByName(newRecord.name)
+      doReturn(IO.pure(List()))
+        .when(mockRecordRepo)
+        .getRecordSetsByFQDNs(Set(newRecord.name))
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(newRecord.name.split('.').map(x => x + "." + okZone.name).toSet)
 
       val result: RecordSetChange = rightResultOf(
         underTest.updateRecordSet(newRecord, okAuth).map(_.asInstanceOf[RecordSetChange]).value
@@ -474,6 +627,21 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, newRecord.name)
+      doReturn(IO.pure(Set(dottedZone)))
+        .when(mockZoneRepo)
+        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(Set.empty)
+      doReturn(IO.pure(None))
+        .when(mockZoneRepo)
+        .getZoneByName(newRecord.name)
+      doReturn(IO.pure(List()))
+        .when(mockRecordRepo)
+        .getRecordSetsByFQDNs(Set(newRecord.name))
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(newRecord.name.split('.').map(x => x + "." + okZone.name).toSet)
 
       val result: RecordSetChange = rightResultOf(
         underTest.updateRecordSet(newRecord, okAuth).map(_.asInstanceOf[RecordSetChange]).value
@@ -609,6 +777,21 @@ class RecordSetServiceSpec
       doReturn(IO.pure(Some(oneUserDummyGroup)))
         .when(mockGroupRepo)
         .getGroup(oneUserDummyGroup.id)
+      doReturn(IO.pure(Set(dottedZone)))
+        .when(mockZoneRepo)
+        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(Set.empty)
+      doReturn(IO.pure(None))
+        .when(mockZoneRepo)
+        .getZoneByName(newRecord.name + "." + okZone.name)
+      doReturn(IO.pure(List()))
+        .when(mockRecordRepo)
+        .getRecordSetsByFQDNs(Set(newRecord.name + "." + okZone.name))
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(Set.empty)
 
       val result = rightResultOf(
         underTest.updateRecordSet(newRecord, auth).map(_.asInstanceOf[RecordSetChange]).value
@@ -638,6 +821,21 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List(oldRecord)))
         .when(mockRecordRepo)
         .getRecordSetsByName(zone.id, newRecord.name)
+      doReturn(IO.pure(Set(dottedZone)))
+        .when(mockZoneRepo)
+        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(Set.empty)
+      doReturn(IO.pure(None))
+        .when(mockZoneRepo)
+        .getZoneByName(newRecord.name + "." + okZone.name)
+      doReturn(IO.pure(List()))
+        .when(mockRecordRepo)
+        .getRecordSetsByFQDNs(Set(newRecord.name + "." + okZone.name))
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(Set.empty)
 
       val result = rightResultOf(
         underTest.updateRecordSet(newRecord, auth).map(_.asInstanceOf[RecordSetChange]).value
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
index 79998757b..457fbfc27 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
@@ -112,7 +112,7 @@ final case class ZoneDiscoveryError(name: String, fatal: Boolean = false)
 final case class DottedHostError(name: String, zone: String) extends DomainValidationError {
   def message: String =
     s"Record with fqdn '$name.$zone' cannot be created. " +
-      s"Please check if there's a zone or record that already exist and make the change there."
+      s"Please check if user has permission or if there's a zone/record that already exist and make the change there."
 }
 
 final case class RecordAlreadyExists(name: String) extends DomainValidationError {

From 701b60753c40239712e1cca2534931e5f9201718 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Thu, 15 Sep 2022 14:24:32 +0530
Subject: [PATCH 102/147] Fix for safari issue in autocomplete recordset search

---
 .../lib/recordset/recordsets.controller.js    | 68 ++++++++++---------
 1 file changed, 36 insertions(+), 32 deletions(-)

diff --git a/modules/portal/public/lib/recordset/recordsets.controller.js b/modules/portal/public/lib/recordset/recordsets.controller.js
index c35e4b865..2c2478b3d 100644
--- a/modules/portal/public/lib/recordset/recordsets.controller.js
+++ b/modules/portal/public/lib/recordset/recordsets.controller.js
@@ -34,6 +34,42 @@
             var recordType = [];
             var recordName = [];
 
+            $( "#record-search-text" ).autocomplete({
+              source: function( request, response ) {
+                $.ajax({
+                  url: "/api/recordsets?maxItems=100",
+                  dataType: "json",
+                  data: "recordNameFilter="+request.term+"%25&nameSort=asc",
+                  success: function( data ) {
+                      const recordSearch =  JSON.parse(JSON.stringify(data));
+                      response($.map(recordSearch.recordSets, function(item) {
+                      $log.log(request.term);
+                      $log.log(item.fqdn);
+                      return {value: item.fqdn +' | '+ item.type , label: 'name: ' + item.fqdn + ' | type: ' + item.type }}))}
+                });
+              },
+              minLength: 2,
+              select: function (event, ui) {
+                  $scope.query = ui.item.value;
+                  $("#record-search-text").val(ui.item.value);
+                  return false;
+                },
+              open: function() {
+                $( this ).removeClass( "ui-corner-all" ).addClass( "ui-corner-top" );
+              },
+              close: function() {
+                $( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" );
+              }
+            });
+
+            $.ui.autocomplete.prototype._renderItem = function( ul, item ) {
+                    let recordSet = String(item.label).replace(new RegExp(this.term, "gi"),"<b>$&</b>");
+                    $log.log(recordSet)
+                    return $("<li></li>")
+                          .data("ui-autocomplete-item", item.value)
+                          .append("<div>" + recordSet + "</div>")
+                          .appendTo(ul); };
+
             $scope.refreshRecords = function() {
             if($scope.query.includes("|")) {
                 const queryRecord = $scope.query.split('|');
@@ -88,38 +124,6 @@
                 }
             };
 
-            $( "#record-search-text" ).autocomplete({
-              source: function( request, response ) {
-                $.ajax({
-                  url: "/api/recordsets?maxItems=100",
-                  dataType: "json",
-                  data: "recordNameFilter="+request.term+"%25&nameSort=asc",
-                  success: function( data ) {
-                      const recordSearch =  JSON.parse(JSON.stringify(data));
-                      response($.map(recordSearch.recordSets, function(item) {
-                      return {value: item.fqdn +' | '+ item.type , label: 'name: ' + item.fqdn + ' | type: ' + item.type }}))}
-                });
-              },
-              minLength: 2,
-              select: function (event, ui) {
-                  $("#record-search-text").val(ui.item.value);
-                  return false;
-                },
-              open: function() {
-                $( this ).removeClass( "ui-corner-all" ).addClass( "ui-corner-top" );
-              },
-              close: function() {
-                $( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" );
-              }
-            });
-
-            $.ui.autocomplete.prototype._renderItem = function( ul, item ) {
-                    let recordSet = String(item.label).replace(new RegExp(this.term, "gi"),"<b>$&</b>");
-                    return $("<li></li>")
-                          .data("ui-autocomplete-item", item.value)
-                          .append("<div>" + recordSet + "</div>")
-                          .appendTo(ul); };
-
             function updateRecordDisplay(records) {
                 var newRecords = [];
                 angular.forEach(records, function(record) {

From d26d53a639fb412ef9838ed2e2fc77c8927e811f Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Thu, 15 Sep 2022 14:51:23 +0530
Subject: [PATCH 103/147] Fix for safari issue in autocomplete group search

---
 modules/portal/public/lib/controllers/controller.groups.js   | 1 +
 modules/portal/public/lib/recordset/recordsets.controller.js | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/portal/public/lib/controllers/controller.groups.js b/modules/portal/public/lib/controllers/controller.groups.js
index f2e8ac4e4..323fe61d7 100644
--- a/modules/portal/public/lib/controllers/controller.groups.js
+++ b/modules/portal/public/lib/controllers/controller.groups.js
@@ -81,6 +81,7 @@ angular.module('controller.groups', []).controller('GroupsController', function
       },
       minLength: 1,
       select: function (event, ui) {
+          $scope.query = ui.item.value;
           $("#group-search-text").val(ui.item.value);
           return false;
         },
diff --git a/modules/portal/public/lib/recordset/recordsets.controller.js b/modules/portal/public/lib/recordset/recordsets.controller.js
index 2c2478b3d..c5a50c1a3 100644
--- a/modules/portal/public/lib/recordset/recordsets.controller.js
+++ b/modules/portal/public/lib/recordset/recordsets.controller.js
@@ -43,8 +43,6 @@
                   success: function( data ) {
                       const recordSearch =  JSON.parse(JSON.stringify(data));
                       response($.map(recordSearch.recordSets, function(item) {
-                      $log.log(request.term);
-                      $log.log(item.fqdn);
                       return {value: item.fqdn +' | '+ item.type , label: 'name: ' + item.fqdn + ' | type: ' + item.type }}))}
                 });
               },
@@ -124,6 +122,7 @@
                 }
             };
 
+
             function updateRecordDisplay(records) {
                 var newRecords = [];
                 angular.forEach(records, function(record) {

From e9a0063ea921de72219cbdfc4696aa39ebec6ae6 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Thu, 15 Sep 2022 15:06:27 +0530
Subject: [PATCH 104/147] removed logs

---
 modules/portal/public/lib/recordset/recordsets.controller.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/portal/public/lib/recordset/recordsets.controller.js b/modules/portal/public/lib/recordset/recordsets.controller.js
index c5a50c1a3..42c36355c 100644
--- a/modules/portal/public/lib/recordset/recordsets.controller.js
+++ b/modules/portal/public/lib/recordset/recordsets.controller.js
@@ -62,7 +62,6 @@
 
             $.ui.autocomplete.prototype._renderItem = function( ul, item ) {
                     let recordSet = String(item.label).replace(new RegExp(this.term, "gi"),"<b>$&</b>");
-                    $log.log(recordSet)
                     return $("<li></li>")
                           .data("ui-autocomplete-item", item.value)
                           .append("<div>" + recordSet + "</div>")

From 2544d821cd6c426c9d359ac428e369632b0d93f4 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Thu, 15 Sep 2022 17:44:41 +0530
Subject: [PATCH 105/147] Restrict record type

---
 .../api/src/main/resources/application.conf   | 15 +++++--
 modules/api/src/main/resources/reference.conf |  6 +++
 .../api/config/DottedHostsConfig.scala        | 12 +++---
 .../api/domain/batch/BatchChangeService.scala | 22 ++++++++--
 .../domain/batch/BatchChangeValidations.scala | 23 ++++++-----
 .../api/domain/record/RecordSetService.scala  | 29 +++++++++++---
 .../domain/record/RecordSetValidations.scala  | 40 +++++++++----------
 .../domain/membership/GroupRepository.scala   |  2 +
 .../repository/MySqlGroupRepository.scala     | 28 +++++++++++++
 9 files changed, 131 insertions(+), 46 deletions(-)

diff --git a/modules/api/src/main/resources/application.conf b/modules/api/src/main/resources/application.conf
index 3d717a112..f9f6cf6e3 100644
--- a/modules/api/src/main/resources/application.conf
+++ b/modules/api/src/main/resources/application.conf
@@ -165,14 +165,23 @@ vinyldns {
     "ns1.parent.com4."
   ]
 
-  # approved zones/domains and users that are allowed to create dotted hosts
+  # approved zones, individual users, users in groups and record types that are allowed for dotted hosts
   dotted-hosts = {
       zone-list = [
       "dummy.", # for local testing
-      "*ent.com", # for local testing with wildcard zones (allows parent.com and child.parent.com zone)
+      "*ent.com" # for local testing with wildcard zones (allows parent.com and child.parent.com zones)
       ]
       allowed-user-list = [
-      "testuser" # for local testing
+      "testuser",
+      "professor" # for local testing (username)
+      ]
+      allowed-group-list = [
+      "test-group",
+      "duGroup" # for local testing (group name)
+      ]
+      allowed-record-type = [
+      "A",
+      "CNAME" # for local testing
       ]
   }
 
diff --git a/modules/api/src/main/resources/reference.conf b/modules/api/src/main/resources/reference.conf
index 5dec2af5b..e83541a12 100644
--- a/modules/api/src/main/resources/reference.conf
+++ b/modules/api/src/main/resources/reference.conf
@@ -99,6 +99,12 @@ vinyldns {
       allowed-user-list = [
       "testuser" # for local testing
       ]
+      allowed-group-list = [
+      "test-group" # for local testing
+      ]
+      allowed-record-type = [
+      "A" # for local testing
+      ]
   }
 
   # color should be green or blue, used in order to do blue/green deployment
diff --git a/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala b/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
index 178d0c254..2a5051976 100644
--- a/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
+++ b/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
@@ -18,14 +18,16 @@ package vinyldns.api.config
 
 import pureconfig.ConfigReader
 
-final case class DottedHostsConfig(zoneList: List[String], allowedUserList: List[String])
+final case class DottedHostsConfig(zoneList: List[String], allowedUserList: List[String], allowedGroupList: List[String], allowedRecordType: List[String])
 object DottedHostsConfig {
   implicit val configReader: ConfigReader[DottedHostsConfig] =
-    ConfigReader.forProduct2[DottedHostsConfig, List[String], List[String]](
+    ConfigReader.forProduct4[DottedHostsConfig, List[String], List[String], List[String], List[String]](
       "zone-list",
-      "allowed-user-list"
+      "allowed-user-list",
+      "allowed-group-list",
+      "allowed-record-type"
     ){
-      case (zoneList, allowedUserList) =>
-        DottedHostsConfig(zoneList, allowedUserList)
+      case (zoneList, allowedUserList, allowedGroupList, allowedRecordType) =>
+        DottedHostsConfig(zoneList, allowedUserList, allowedGroupList, allowedRecordType)
     }
 }
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala
index 7c9d07efb..b38d45fe2 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala
@@ -127,7 +127,9 @@ class BatchChangeService(
       withTtl = doTtlMapping(changesWithZones, recordSets)
       groupedChanges = ChangeForValidationMap(withTtl, recordSets)
       allowedZoneList <- getAllowedZones(dottedHostsConfig.zoneList).toBatchResult
-      isUserAllowed = checkIfAllowedUsers(dottedHostsConfig.allowedUserList, auth)
+      isInAllowedUsers = checkIfInAllowedUsers(dottedHostsConfig.allowedUserList, auth)
+      isUserInAllowedGroups <- checkIfInAllowedGroups(dottedHostsConfig.allowedGroupList, auth).toBatchResult
+      isAllowedUser = isInAllowedUsers || isUserInAllowedGroups
       zoneOrRecordDoesNotAlreadyExist <- zoneOrRecordDoesNotExist(groupedChanges).toBatchResult
       validatedSingleChanges = validateChangesWithContext(
         groupedChanges,
@@ -136,7 +138,8 @@ class BatchChangeService(
         batchChangeInput.ownerGroupId,
         zoneOrRecordDoesNotAlreadyExist,
         allowedZoneList,
-        isUserAllowed
+        isAllowedUser,
+        dottedHostsConfig
       )
       errorGroupIds <- getGroupIdsFromUnauthorizedErrors(validatedSingleChanges)
       validatedSingleChangesWithGroups = errorGroupMapping(errorGroupIds, validatedSingleChanges)
@@ -193,8 +196,8 @@ class BatchChangeService(
     }
   }
 
-  // Check if the user is allowed to create dotted hosts using the users present in dotted hosts config
-  def  checkIfAllowedUsers(users: List[String], auth: AuthPrincipal): Boolean = {
+  // Check if user is allowed to create dotted hosts using the users present in dotted hosts config
+  def checkIfInAllowedUsers(users: List[String], auth: AuthPrincipal): Boolean = {
     if(users.contains(auth.signedInUser.userName)){
       true
     }
@@ -203,6 +206,17 @@ class BatchChangeService(
     }
   }
 
+  // Check if user is allowed to create dotted hosts using the groups present in dotted hosts config
+  def checkIfInAllowedGroups(groups: List[String], auth: AuthPrincipal): IO[Boolean] = {
+    for{
+      groupsInConfig <- groupRepository.getGroupsByName(groups.toSet)
+      members = groupsInConfig.flatMap(x => x.memberIds)
+      usersList <- userRepository.getUsers(members, None, None)
+      users = usersList.users.map(x => x.userName)
+      isPresent = users.contains(auth.signedInUser.userName)
+    } yield isPresent
+  }
+
   def getGroupIdsFromUnauthorizedErrors(
       changes: ValidatedBatch[ChangeForValidation]
   ): BatchResult[Set[Group]] = {
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
index 4ff99e0de..fd1eac402 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
@@ -19,7 +19,7 @@ package vinyldns.api.domain.batch
 import java.net.InetAddress
 import cats.data._
 import cats.implicits._
-import vinyldns.api.config.{BatchChangeConfig, HighValueDomainConfig, ManualReviewConfig, ScheduledChangesConfig}
+import vinyldns.api.config.{BatchChangeConfig, DottedHostsConfig, HighValueDomainConfig, ManualReviewConfig, ScheduledChangesConfig}
 import vinyldns.api.domain.DomainValidations._
 import vinyldns.api.domain.access.AccessValidationsAlgebra
 import vinyldns.core.domain.auth.AuthPrincipal
@@ -51,7 +51,8 @@ trait BatchChangeValidationsAlgebra {
       batchOwnerGroupId: Option[String],
       zoneOrRecordDoesNotAlreadyExist: Boolean,
       dottedHostZoneConfig: Set[String],
-      isUserAllowed: Boolean
+      isUserAllowed: Boolean,
+      dottedHostsConfig: DottedHostsConfig
   ): ValidatedBatch[ChangeForValidation]
 
   def canGetBatchChange(
@@ -275,7 +276,8 @@ class BatchChangeValidations(
       batchOwnerGroupId: Option[String],
       zoneOrRecordDoesNotAlreadyExist: Boolean,
       dottedHostZoneConfig: Set[String],
-      isUserAllowed: Boolean
+      isUserAllowed: Boolean,
+      dottedHostsConfig: DottedHostsConfig
   ): ValidatedBatch[ChangeForValidation] =
     // Updates are a combination of an add and delete for a record with the same name and type in a zone.
     groupedChanges.changes.mapValid {
@@ -283,7 +285,7 @@ class BatchChangeValidations(
           if groupedChanges
             .getLogicalChangeType(add.recordKey)
             .contains(LogicalChangeType.Add) =>
-        validateAddWithContext(add, groupedChanges, auth, isApproved, batchOwnerGroupId, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isUserAllowed)
+        validateAddWithContext(add, groupedChanges, auth, isApproved, batchOwnerGroupId, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isUserAllowed, dottedHostsConfig)
       case addUpdate: AddChangeForValidation =>
         validateAddUpdateWithContext(addUpdate, groupedChanges, auth, isApproved, batchOwnerGroupId)
       // These cases MUST be below adds because:
@@ -299,13 +301,15 @@ class BatchChangeValidations(
     }
 
   // Check if the new record set has dots and if so whether they are allowed or not
-  def newRecordSetDottedCheck(change: AddChangeForValidation, zoneOrRecordDoesNotAlreadyExist: Boolean, dottedHostZoneConfig: Set[String], isUserAllowed: Boolean): SingleValidation[Unit] = {
+  def newRecordSetDottedCheck(change: AddChangeForValidation, zoneOrRecordDoesNotAlreadyExist: Boolean, dottedHostZoneConfig: Set[String], isUserAllowed: Boolean, dottedHostsConfig: DottedHostsConfig): SingleValidation[Unit] = {
 
     // Check if the zone of the record set is present in dotted hosts config list
     val isDomainAllowed = dottedHostZoneConfig.contains(change.zone.name)
 
+    val isRecordTypeAllowed = dottedHostsConfig.allowedRecordType.contains(change.inputChange.typ.toString)
+
     // Check if record set contains dot and if it is in zone which is allowed to have dotted records from dotted hosts config
-    if((change.recordName.contains(".") || !zoneOrRecordDoesNotAlreadyExist) && isDomainAllowed && change.recordName != change.zone.name) {
+    if((change.recordName.contains(".") || !zoneOrRecordDoesNotAlreadyExist) && isDomainAllowed && isUserAllowed && isRecordTypeAllowed && change.recordName != change.zone.name) {
       // If the user is not authorized or if there is a zone/record already present which conflicts with the new dotted record, throw an error
       if (!zoneOrRecordDoesNotAlreadyExist || change.recordName == change.zone.name || !isUserAllowed)
         DottedHostError(change.recordName, change.zone.name).invalidNel
@@ -432,14 +436,15 @@ class BatchChangeValidations(
       ownerGroupId: Option[String],
       zoneOrRecordDoesNotAlreadyExist: Boolean,
       dottedHostZoneConfig: Set[String],
-      isUserAllowed: Boolean
+      isUserAllowed: Boolean,
+      dottedHostsConfig: DottedHostsConfig
   ): SingleValidation[ChangeForValidation] = {
     val typedValidations = change.inputChange.typ match {
       case A | AAAA | MX =>
-        newRecordSetDottedCheck(change, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig: Set[String], isUserAllowed)
+        newRecordSetDottedCheck(change, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig: Set[String], isUserAllowed, dottedHostsConfig)
       case CNAME =>
         cnameHasUniqueNameInBatch(change, groupedChanges) |+|
-          newRecordSetDottedCheck(change, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig: Set[String], isUserAllowed)
+          newRecordSetDottedCheck(change, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig: Set[String], isUserAllowed, dottedHostsConfig)
       case TXT | PTR =>
         ().validNel
       case other =>
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 13ef634a8..897ff5f6c 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
@@ -111,7 +111,11 @@ class RecordSetService(
       _ <- canUseOwnerGroup(rsForValidations.ownerGroupId, ownerGroup, auth).toResult
       _ <- noCnameWithNewName(rsForValidations, existingRecordsWithName, zone).toResult
       allowedZoneList <- getAllowedZones(dottedHostsConfig.zoneList).toResult[Set[String]]
-      isUserAllowed = checkIfAllowedUsers(dottedHostsConfig.allowedUserList, auth)
+      isInAllowedUsers = checkIfInAllowedUsers(dottedHostsConfig.allowedUserList, auth)
+      isUserInAllowedGroups <- checkIfInAllowedGroups(dottedHostsConfig.allowedGroupList, auth).toResult[Boolean]
+      isAllowedUser = isInAllowedUsers || isUserInAllowedGroups
+      isRecordTypeAllowed = dottedHostsConfig.allowedRecordType.contains(rsForValidations.typ.toString)
+      isRecordTypeAndUserAllowed = isAllowedUser && isRecordTypeAllowed
       zoneOrRecordDoesNotAlreadyExist <- zoneOrRecordDoesNotExist(rsForValidations, zone).toResult[Boolean]
       _ <- typeSpecificValidations(
         rsForValidations,
@@ -121,7 +125,7 @@ class RecordSetService(
         approvedNameServers,
         zoneOrRecordDoesNotAlreadyExist,
         allowedZoneList,
-        isUserAllowed
+        isRecordTypeAndUserAllowed
       ).toResult
       _ <- messageQueue.send(change).toResult[Unit]
     } yield change
@@ -153,7 +157,11 @@ class RecordSetService(
       )
       _ <- noCnameWithNewName(rsForValidations, existingRecordsWithName, zone).toResult
       allowedZoneList <- getAllowedZones(dottedHostsConfig.zoneList).toResult[Set[String]]
-      isUserAllowed = checkIfAllowedUsers(dottedHostsConfig.allowedUserList, auth)
+      isInAllowedUsers = checkIfInAllowedUsers(dottedHostsConfig.allowedUserList, auth)
+      isUserInAllowedGroups <- checkIfInAllowedGroups(dottedHostsConfig.allowedGroupList, auth).toResult[Boolean]
+      isAllowedUser = isInAllowedUsers || isUserInAllowedGroups
+      isRecordTypeAllowed = dottedHostsConfig.allowedRecordType.contains(rsForValidations.typ.toString)
+      isRecordTypeAndUserAllowed = isAllowedUser && isRecordTypeAllowed
       zoneOrRecordDoesNotAlreadyExist <- zoneOrRecordDoesNotExist(rsForValidations, zone).toResult[Boolean]
       _ <- typeSpecificValidations(
         rsForValidations,
@@ -163,7 +171,7 @@ class RecordSetService(
         approvedNameServers,
         zoneOrRecordDoesNotAlreadyExist,
         allowedZoneList,
-        isUserAllowed
+        isRecordTypeAndUserAllowed,
       ).toResult
       _ <- messageQueue.send(change).toResult[Unit]
     } yield change
@@ -231,7 +239,7 @@ class RecordSetService(
   }
 
   // Check if user is allowed to create dotted hosts using the users present in dotted hosts config
-  def  checkIfAllowedUsers(users: List[String], auth: AuthPrincipal): Boolean = {
+  def checkIfInAllowedUsers(users: List[String], auth: AuthPrincipal): Boolean = {
     if(users.contains(auth.signedInUser.userName)){
       true
     }
@@ -240,6 +248,17 @@ class RecordSetService(
     }
   }
 
+  // Check if user is allowed to create dotted hosts using the groups present in dotted hosts config
+  def checkIfInAllowedGroups(groups: List[String], auth: AuthPrincipal): IO[Boolean] = {
+    for{
+      groupsInConfig <- groupRepository.getGroupsByName(groups.toSet)
+      members = groupsInConfig.flatMap(x => x.memberIds)
+      usersList <- userRepository.getUsers(members, None, None)
+      users = usersList.users.map(x => x.userName)
+      isPresent = users.contains(auth.signedInUser.userName)
+    } yield isPresent
+  }
+
   def getRecordSet(
                     recordSetId: String,
                     authPrincipal: AuthPrincipal
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 92a2e051a..1fe942aa0 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
@@ -97,17 +97,17 @@ object RecordSetValidations {
       existingRecordSet: Option[RecordSet] = None,
       zoneOrRecordDoesNotAlreadyExist: Boolean,
       dottedHostZoneConfig: Set[String],
-      isUserAllowed: Boolean
+      isRecordTypeAndUserAllowed: Boolean
   ): Either[Throwable, Unit] = {
 
     // Check if the zone of the record set is present in dotted hosts config list
     val isDomainAllowed = dottedHostZoneConfig.contains(zone.name)
 
     // Check if record set contains dot and if it is in zone which is allowed to have dotted records from dotted hosts config
-    if((newRecordSet.name.contains(".") || !zoneOrRecordDoesNotAlreadyExist) && isDomainAllowed && newRecordSet.name != zone.name) {
-      isDotted(newRecordSet, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, isUserAllowed)
+    if((newRecordSet.name.contains(".") || !zoneOrRecordDoesNotAlreadyExist) && isDomainAllowed && isRecordTypeAndUserAllowed && newRecordSet.name != zone.name) {
+      isDotted(newRecordSet, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, isRecordTypeAndUserAllowed)
     }
-    else{
+    else {
       isNotDotted(newRecordSet, zone, existingRecordSet)
     }
   }
@@ -118,7 +118,7 @@ object RecordSetValidations {
      zone: Zone,
      existingRecordSet: Option[RecordSet] = None,
      zoneOrRecordDoesNotAlreadyExist: Boolean,
-     isUserAllowed: Boolean
+     isRecordTypeAndUserAllowed: Boolean
   ): Either[Throwable, Unit] =
     ensuring(
       InvalidRequest(
@@ -126,7 +126,7 @@ object RecordSetValidations {
           s"Please check if user has permission or if there's a zone/record that already exist and make the change there."
       )
     )(
-      (newRecordSet.name != zone.name || existingRecordSet.exists(_.name == newRecordSet.name)) && zoneOrRecordDoesNotAlreadyExist && isUserAllowed
+      (newRecordSet.name != zone.name || existingRecordSet.exists(_.name == newRecordSet.name)) && zoneOrRecordDoesNotAlreadyExist && isRecordTypeAndUserAllowed
     )
 
   // Check if the recordset contains dot but is not in the allowed zones to create dotted records. If so, throw an error
@@ -153,16 +153,16 @@ object RecordSetValidations {
       approvedNameServers: List[Regex],
       zoneOrRecordDoesNotAlreadyExist: Boolean = true,
       dottedHostZoneConfig: Set[String],
-      isUserAllowed: Boolean
+      isRecordTypeAndUserAllowed: Boolean
   ): Either[Throwable, Unit] =
     newRecordSet.typ match {
-      case CNAME => cnameValidations(newRecordSet, existingRecordsWithName, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isUserAllowed)
-      case NS => nsValidations(newRecordSet, zone, existingRecordSet, approvedNameServers, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isUserAllowed)
-      case SOA => soaValidations(newRecordSet, zone, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isUserAllowed)
+      case CNAME => cnameValidations(newRecordSet, existingRecordsWithName, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
+      case NS => nsValidations(newRecordSet, zone, existingRecordSet, approvedNameServers, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
+      case SOA => soaValidations(newRecordSet, zone, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
       case PTR => ptrValidations(newRecordSet, zone)
       case SRV | TXT | NAPTR => ().asRight // SRV, TXT and NAPTR do not go through dotted host check
-      case DS => dsValidations(newRecordSet, existingRecordsWithName, zone, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isUserAllowed)
-      case _ => checkForDot(newRecordSet, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isUserAllowed)
+      case DS => dsValidations(newRecordSet, existingRecordsWithName, zone, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
+      case _ => checkForDot(newRecordSet, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
     }
 
   def typeSpecificDeleteValidations(recordSet: RecordSet, zone: Zone): Either[Throwable, Unit] =
@@ -186,7 +186,7 @@ object RecordSetValidations {
       existingRecordSet: Option[RecordSet] = None,
       zoneOrRecordDoesNotAlreadyExist: Boolean,
       dottedHostZoneConfig: Set[String],
-      isUserAllowed: Boolean
+      isRecordTypeAndUserAllowed: Boolean
   ): Either[Throwable, Unit] = {
     // cannot create a cname record if a record with the same exists
     val noRecordWithName = {
@@ -219,7 +219,7 @@ object RecordSetValidations {
       )
       _ <- noRecordWithName
       _ <- RDataWithConsecutiveDots
-      _ <- checkForDot(newRecordSet, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isUserAllowed)
+      _ <- checkForDot(newRecordSet, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
     } yield ()
 
   }
@@ -230,7 +230,7 @@ object RecordSetValidations {
       zone: Zone,
       zoneOrRecordDoesNotAlreadyExist: Boolean,
       dottedHostZoneConfig: Set[String],
-      isUserAllowed: Boolean
+      isRecordTypeAndUserAllowed: Boolean
   ): Either[Throwable, Unit] = {
     // see https://tools.ietf.org/html/rfc4035#section-2.4
     val nsChecks = existingRecordsWithName.find(_.typ == NS) match {
@@ -243,7 +243,7 @@ object RecordSetValidations {
     }
 
     for {
-      _ <- checkForDot(newRecordSet, zone, None, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isUserAllowed)
+      _ <- checkForDot(newRecordSet, zone, None, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
       _ <- isNotOrigin(
         newRecordSet,
         zone,
@@ -260,10 +260,10 @@ object RecordSetValidations {
       approvedNameServers: List[Regex],
       zoneOrRecordDoesNotAlreadyExist: Boolean,
       dottedHostZoneConfig: Set[String],
-      isUserAllowed: Boolean
+      isRecordTypeAndUserAllowed: Boolean
   ): Either[Throwable, Unit] = {
     // TODO kept consistency with old validation. Not sure why NS could be dotted in reverse specifically
-    val isNotDottedHost = if (!zone.isReverse) checkForDot(newRecordSet, zone, None, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isUserAllowed) else ().asRight
+    val isNotDottedHost = if (!zone.isReverse) checkForDot(newRecordSet, zone, None, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed) else ().asRight
 
     for {
       _ <- isNotDottedHost
@@ -285,9 +285,9 @@ object RecordSetValidations {
     } yield ()
   }
 
-  def soaValidations(newRecordSet: RecordSet, zone: Zone, zoneOrRecordDoesNotAlreadyExist: Boolean, dottedHostZoneConfig: Set[String], isUserAllowed: Boolean): Either[Throwable, Unit] =
+  def soaValidations(newRecordSet: RecordSet, zone: Zone, zoneOrRecordDoesNotAlreadyExist: Boolean, dottedHostZoneConfig: Set[String], isRecordTypeAndUserAllowed: Boolean): Either[Throwable, Unit] =
     // TODO kept consistency with old validation. in theory if SOA always == zone name, no special case is needed here
-    if (!zone.isReverse) checkForDot(newRecordSet, zone, None, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isUserAllowed) else ().asRight
+    if (!zone.isReverse) checkForDot(newRecordSet, zone, None, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed) else ().asRight
 
   def ptrValidations(newRecordSet: RecordSet, zone: Zone): Either[Throwable, Unit] =
     // TODO we don't check for PTR as dotted...not sure why
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/membership/GroupRepository.scala b/modules/core/src/main/scala/vinyldns/core/domain/membership/GroupRepository.scala
index 233a2f6b5..9532bd6a4 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/membership/GroupRepository.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/membership/GroupRepository.scala
@@ -31,6 +31,8 @@ trait GroupRepository extends Repository {
 
   def getGroups(groupIds: Set[String]): IO[Set[Group]]
 
+  def getGroupsByName(groupNames: Set[String]): IO[Set[Group]]
+
   def getGroupByName(groupName: String): IO[Option[Group]]
 
   def getAllGroups(): IO[Set[Group]]
diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlGroupRepository.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlGroupRepository.scala
index 83ead82f7..1ba0bdf08 100644
--- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlGroupRepository.scala
+++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlGroupRepository.scala
@@ -69,6 +69,13 @@ class MySqlGroupRepository extends GroupRepository with GroupProtobufConversions
       | WHERE id
     """.stripMargin
 
+  private val BASE_GET_GROUPS_BY_NAMES =
+    """
+      |SELECT data
+      |  FROM groups
+      | WHERE name
+    """.stripMargin
+
   def save(db: DB, group: Group): IO[Group] =
     monitor("repo.Group.save") {
       IO {
@@ -141,6 +148,27 @@ class MySqlGroupRepository extends GroupRepository with GroupProtobufConversions
       }
     }
 
+  def getGroupsByName(groupNames: Set[String]): IO[Set[Group]] =
+    monitor("repo.Group.getGroups") {
+      IO {
+        logger.debug(s"Getting group with names: $groupNames")
+        if (groupNames.isEmpty)
+          Set[Group]()
+        else {
+          DB.readOnly { implicit s =>
+            val groupNameList = groupNames.toList
+            val inClause = " IN (" + groupNameList.as("?").mkString(",") + ")"
+            val query = BASE_GET_GROUPS_BY_NAMES + inClause
+            SQL(query)
+              .bind(groupNameList: _*)
+              .map(toGroup(1))
+              .list()
+              .apply()
+          }.toSet
+        }
+      }
+    }
+
   def getGroupByName(groupName: String): IO[Option[Group]] =
     monitor("repo.Group.getGroupByName") {
       IO {

From c10f8e44a95b2ee98f7f136a48915a65fc5929a8 Mon Sep 17 00:00:00 2001
From: Nicholas Spadaccino <37352107+nspadaccino@users.noreply.github.com>
Date: Thu, 15 Sep 2022 16:00:57 -0400
Subject: [PATCH 106/147] Bump version to v0.14.1

---
 version.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.sbt b/version.sbt
index 501eb5530..3c3c14dd9 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.14.0"
+version in ThisBuild := "0.14.1"

From 231a30a9231a65e6e0e207555c799a17bfe75df8 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 16 Sep 2022 13:03:12 +0530
Subject: [PATCH 107/147] Resolve existing tests

---
 .../api/domain/batch/BatchChangeService.scala |   4 +-
 .../api/domain/record/RecordSetService.scala  |   4 +-
 .../vinyldns/api/VinylDNSTestHelpers.scala    |   2 +-
 .../batch/BatchChangeValidationsSpec.scala    | 212 +++++++++++++-----
 .../domain/record/RecordSetServiceSpec.scala  |  84 +++++++
 .../record/RecordSetValidationsSpec.scala     |  79 +++----
 .../api/repository/EmptyRepositories.scala    |   2 +
 7 files changed, 291 insertions(+), 96 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala
index b38d45fe2..f10094d3a 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala
@@ -211,8 +211,8 @@ class BatchChangeService(
     for{
       groupsInConfig <- groupRepository.getGroupsByName(groups.toSet)
       members = groupsInConfig.flatMap(x => x.memberIds)
-      usersList <- userRepository.getUsers(members, None, None)
-      users = usersList.users.map(x => x.userName)
+      usersList <- if(members.isEmpty) IO(Seq.empty) else userRepository.getUsers(members, None, None).map(x => x.users)
+      users = if(usersList.isEmpty) Seq.empty else usersList.map(x => x.userName)
       isPresent = users.contains(auth.signedInUser.userName)
     } yield isPresent
   }
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 897ff5f6c..52675be88 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
@@ -253,8 +253,8 @@ class RecordSetService(
     for{
       groupsInConfig <- groupRepository.getGroupsByName(groups.toSet)
       members = groupsInConfig.flatMap(x => x.memberIds)
-      usersList <- userRepository.getUsers(members, None, None)
-      users = usersList.users.map(x => x.userName)
+      usersList <- if(members.isEmpty) IO(Seq.empty) else userRepository.getUsers(members, None, None).map(x => x.users)
+      users = if(usersList.isEmpty) Seq.empty else usersList.map(x => x.userName)
       isPresent = users.contains(auth.signedInUser.userName)
     } yield isPresent
   }
diff --git a/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala b/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala
index 50d63a36e..70ec98f27 100644
--- a/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala
+++ b/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala
@@ -40,7 +40,7 @@ trait VinylDNSTestHelpers {
 
   val approvedNameServers: List[Regex] = List(new Regex("some.test.ns."))
 
-  val dottedHostsConfig: DottedHostsConfig = DottedHostsConfig(List("dotted.xyz"))
+  val dottedHostsConfig: DottedHostsConfig = DottedHostsConfig(List("dotted.xyz"), List("super"), List("dummy"), List("CNAME"))
 
   val defaultTtl: Long = 7200
 
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
index 576494f3f..43bad4d9f 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
@@ -821,7 +821,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) shouldBe valid
@@ -888,7 +890,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result.foreach(_ shouldBe valid)
@@ -930,7 +934,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result.foreach(_ shouldBe valid)
@@ -959,7 +965,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) shouldBe valid
@@ -992,7 +1000,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1034,7 +1044,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) shouldBe valid
@@ -1086,7 +1098,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) shouldBe valid
@@ -1126,7 +1140,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result.foreach(_ shouldBe valid)
@@ -1151,7 +1167,9 @@ class BatchChangeValidationsSpec
           false,
           None,
           true,
-          VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+          VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+          false,
+          VinylDNSTestHelpers.dottedHostsConfig
         )
 
         result(0) should haveInvalid[DomainValidationError](
@@ -1170,7 +1188,9 @@ class BatchChangeValidationsSpec
           false,
           None,
           true,
-          VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+          VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+          false,
+          VinylDNSTestHelpers.dottedHostsConfig
         )
 
       result(0) shouldBe valid
@@ -1188,7 +1208,9 @@ class BatchChangeValidationsSpec
           false,
           None,
           true,
-          VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+          VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+          false,
+          VinylDNSTestHelpers.dottedHostsConfig
         )
         result(0) shouldBe valid
       }
@@ -1209,7 +1231,9 @@ class BatchChangeValidationsSpec
         false,
         None,
         true,
-        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+        false,
+        VinylDNSTestHelpers.dottedHostsConfig
       )
 
       result(0) should haveInvalid[DomainValidationError](
@@ -1243,7 +1267,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) shouldBe valid
@@ -1266,7 +1292,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1297,7 +1325,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) shouldBe valid
@@ -1324,7 +1354,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1361,7 +1393,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) shouldBe valid
@@ -1398,7 +1432,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) shouldBe valid
@@ -1440,7 +1476,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) shouldBe valid
@@ -1484,7 +1522,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result.map(_ shouldBe valid)
@@ -1505,7 +1545,9 @@ class BatchChangeValidationsSpec
         false,
         None,
         true,
-        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+        false,
+        VinylDNSTestHelpers.dottedHostsConfig
       )
 
     result(0) shouldBe valid
@@ -1526,7 +1568,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1555,7 +1599,9 @@ class BatchChangeValidationsSpec
         false,
         None,
         true,
-        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+        false,
+        VinylDNSTestHelpers.dottedHostsConfig
       )
 
     result(0) shouldBe valid
@@ -1573,7 +1619,9 @@ class BatchChangeValidationsSpec
           false,
           None,
           true,
-          VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+          VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+          false,
+          VinylDNSTestHelpers.dottedHostsConfig
         )
 
       result(0) should haveInvalid[DomainValidationError](
@@ -1607,7 +1655,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1634,7 +1684,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) shouldBe valid
@@ -1657,7 +1709,9 @@ class BatchChangeValidationsSpec
         false,
         None,
         true,
-        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+        false,
+        VinylDNSTestHelpers.dottedHostsConfig
       )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1689,7 +1743,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) shouldBe valid
@@ -1713,7 +1769,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) shouldBe valid
@@ -1737,7 +1795,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1770,7 +1830,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) shouldBe valid
@@ -1795,7 +1857,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1865,7 +1929,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) shouldBe valid
@@ -1916,7 +1982,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
     result.map(_ shouldBe valid)
   }
@@ -1961,7 +2029,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
     result.map(_ shouldBe valid)
   }
@@ -1993,7 +2063,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
     result.map(_ shouldBe valid)
   }
@@ -2033,7 +2105,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) shouldBe valid
@@ -2074,7 +2148,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
     result.map(_ shouldBe valid)
   }
@@ -2109,7 +2185,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
     result.map(_ shouldBe valid)
   }
@@ -2149,7 +2227,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result.map(_ shouldBe valid)
@@ -2265,7 +2345,9 @@ class BatchChangeValidationsSpec
         false,
         None,
         true,
-        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+        false,
+        VinylDNSTestHelpers.dottedHostsConfig
       )
     result(0) should haveInvalid[DomainValidationError](RecordAlreadyExists("name-conflict."))
   }
@@ -2290,7 +2372,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
     result(0) shouldBe valid
   }
@@ -2323,7 +2407,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
     result(0) shouldBe valid
   }
@@ -2354,7 +2440,9 @@ class BatchChangeValidationsSpec
       false,
       Some("some-owner-group-id"),
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result.foreach(_ shouldBe valid)
@@ -2386,7 +2474,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) shouldBe valid
@@ -2417,7 +2507,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) should
@@ -2443,7 +2535,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) shouldBe valid
@@ -2459,7 +2553,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) shouldBe valid
@@ -2495,7 +2591,9 @@ class BatchChangeValidationsSpec
       false,
       Some(okGroup.id),
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) shouldBe valid
@@ -2542,7 +2640,9 @@ class BatchChangeValidationsSpec
       false,
       Some(okGroup.id),
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) shouldBe valid
@@ -2603,7 +2703,9 @@ class BatchChangeValidationsSpec
         false,
         None,
         true,
-        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+        false,
+        VinylDNSTestHelpers.dottedHostsConfig
       )
 
     result(0) should haveInvalid[DomainValidationError](ZoneDiscoveryError("dotted.a.ok."))
@@ -2659,7 +2761,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) shouldBe valid
@@ -2763,7 +2867,9 @@ class BatchChangeValidationsSpec
       false,
       None,
       true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+      false,
+      VinylDNSTestHelpers.dottedHostsConfig
     )
 
     result(0) shouldBe valid
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
index 52bd78588..23cb9e161 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
@@ -132,6 +132,12 @@ class RecordSetServiceSpec
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(Set.empty)
+      doReturn(IO.pure(Set()))
+        .when(mockGroupRepo)
+        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+      doReturn(IO.pure(ListUsersResults(Seq(), None)))
+        .when(mockUserRepo)
+        .getUsers(Set.empty, None, None)
 
       val result: RecordSetChange =
         rightResultOf(
@@ -197,6 +203,12 @@ class RecordSetServiceSpec
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(record.name.split('.').map(x => x + "." + okZone.name).toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockGroupRepo)
+        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+      doReturn(IO.pure(ListUsersResults(Seq(), None)))
+        .when(mockUserRepo)
+        .getUsers(Set.empty, None, None)
 
       val result = leftResultOf(underTest.addRecordSet(record, okAuth).value)
       result shouldBe an[InvalidRequest]
@@ -226,6 +238,12 @@ class RecordSetServiceSpec
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(record.name.split('.').map(x => x + "." + okZone.name).toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockGroupRepo)
+        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+      doReturn(IO.pure(ListUsersResults(Seq(), None)))
+        .when(mockUserRepo)
+        .getUsers(Set.empty, None, None)
 
       val result =
         leftResultOf(underTestWithDnsBackendValidations.addRecordSet(record, okAuth).value)
@@ -266,6 +284,12 @@ class RecordSetServiceSpec
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(record.name.split('.').map(x => x + "." + okZone.name).toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockGroupRepo)
+        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+      doReturn(IO.pure(ListUsersResults(Seq(), None)))
+        .when(mockUserRepo)
+        .getUsers(Set.empty, None, None)
 
       val result: RecordSetChange = rightResultOf(
         underTest.addRecordSet(record, okAuth).map(_.asInstanceOf[RecordSetChange]).value
@@ -299,6 +323,12 @@ class RecordSetServiceSpec
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(record.name.split('.').map(x => x + "." + okZone.name).toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockGroupRepo)
+        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+      doReturn(IO.pure(ListUsersResults(Seq(), None)))
+        .when(mockUserRepo)
+        .getUsers(Set.empty, None, None)
 
       val result: RecordSetChange = rightResultOf(
         underTest.addRecordSet(record, okAuth).map(_.asInstanceOf[RecordSetChange]).value
@@ -351,6 +381,12 @@ class RecordSetServiceSpec
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(Set.empty)
+      doReturn(IO.pure(Set()))
+        .when(mockGroupRepo)
+        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+      doReturn(IO.pure(ListUsersResults(Seq(), None)))
+        .when(mockUserRepo)
+        .getUsers(Set.empty, None, None)
 
       val result: RecordSetChange = rightResultOf(
         underTest.addRecordSet(record, okAuth).map(_.asInstanceOf[RecordSetChange]).value
@@ -419,6 +455,12 @@ class RecordSetServiceSpec
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(Set.empty)
+      doReturn(IO.pure(Set()))
+        .when(mockGroupRepo)
+        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+      doReturn(IO.pure(ListUsersResults(Seq(), None)))
+        .when(mockUserRepo)
+        .getUsers(Set.empty, None, None)
 
       val result: RecordSetChange =
         rightResultOf(
@@ -463,6 +505,12 @@ class RecordSetServiceSpec
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(Set.empty)
+      doReturn(IO.pure(Set()))
+        .when(mockGroupRepo)
+        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+      doReturn(IO.pure(ListUsersResults(Seq(), None)))
+        .when(mockUserRepo)
+        .getUsers(Set.empty, None, None)
 
       val result: RecordSetChange = rightResultOf(
         underTest.updateRecordSet(newRecord, okAuth).map(_.asInstanceOf[RecordSetChange]).value
@@ -514,6 +562,12 @@ class RecordSetServiceSpec
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(newRecord.name.split('.').map(x => x + "." + okZone.name).toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockGroupRepo)
+        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+      doReturn(IO.pure(ListUsersResults(Seq(), None)))
+        .when(mockUserRepo)
+        .getUsers(Set.empty, None, None)
 
       val result: RecordSetChange = rightResultOf(
         underTest.updateRecordSet(newRecord, okAuth).map(_.asInstanceOf[RecordSetChange]).value
@@ -568,6 +622,12 @@ class RecordSetServiceSpec
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(newRecord.name.split('.').map(x => x + "." + okZone.name).toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockGroupRepo)
+        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+      doReturn(IO.pure(ListUsersResults(Seq(), None)))
+        .when(mockUserRepo)
+        .getUsers(Set.empty, None, None)
 
       val result: RecordSetChange = rightResultOf(
         underTest.updateRecordSet(newRecord, okAuth).map(_.asInstanceOf[RecordSetChange]).value
@@ -605,6 +665,12 @@ class RecordSetServiceSpec
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(newRecord.name.split('.').map(x => x + "." + okZone.name).toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockGroupRepo)
+        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+      doReturn(IO.pure(ListUsersResults(Seq(), None)))
+        .when(mockUserRepo)
+        .getUsers(Set.empty, None, None)
 
       val result: RecordSetChange = rightResultOf(
         underTest.updateRecordSet(newRecord, okAuth).map(_.asInstanceOf[RecordSetChange]).value
@@ -642,6 +708,12 @@ class RecordSetServiceSpec
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(newRecord.name.split('.').map(x => x + "." + okZone.name).toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockGroupRepo)
+        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+      doReturn(IO.pure(ListUsersResults(Seq(), None)))
+        .when(mockUserRepo)
+        .getUsers(Set.empty, None, None)
 
       val result: RecordSetChange = rightResultOf(
         underTest.updateRecordSet(newRecord, okAuth).map(_.asInstanceOf[RecordSetChange]).value
@@ -792,6 +864,12 @@ class RecordSetServiceSpec
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(Set.empty)
+      doReturn(IO.pure(Set()))
+        .when(mockGroupRepo)
+        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+      doReturn(IO.pure(ListUsersResults(Seq(), None)))
+        .when(mockUserRepo)
+        .getUsers(Set.empty, None, None)
 
       val result = rightResultOf(
         underTest.updateRecordSet(newRecord, auth).map(_.asInstanceOf[RecordSetChange]).value
@@ -836,6 +914,12 @@ class RecordSetServiceSpec
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(Set.empty)
+      doReturn(IO.pure(Set()))
+        .when(mockGroupRepo)
+        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+      doReturn(IO.pure(ListUsersResults(Seq(), None)))
+        .when(mockUserRepo)
+        .getUsers(Set.empty, None, None)
 
       val result = rightResultOf(
         underTest.updateRecordSet(newRecord, auth).map(_.asInstanceOf[RecordSetChange]).value
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala
index bcbfa747d..045a69512 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala
@@ -189,19 +189,19 @@ class RecordSetValidationsSpec
         val dottedARecord = rsOk.copy(name = "this.is.a.failure.")
         "return a failure for any new record with dotted hosts in forward zones" in {
           leftValue(
-            typeSpecificValidations(dottedARecord, List(), okZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+            typeSpecificValidations(dottedARecord, List(), okZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false)
           ) shouldBe an[InvalidRequest]
         }
 
         "return a failure for any new record with dotted hosts in forward zones (CNAME)" in {
           leftValue(
-            typeSpecificValidations(dottedARecord.copy(typ = CNAME), List(), okZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+            typeSpecificValidations(dottedARecord.copy(typ = CNAME), List(), okZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false)
           ) shouldBe an[InvalidRequest]
         }
 
         "return a failure for any new record with dotted hosts in forward zones (NS)" in {
           leftValue(
-            typeSpecificValidations(dottedARecord.copy(typ = NS), List(), okZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+            typeSpecificValidations(dottedARecord.copy(typ = NS), List(), okZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false)
           ) shouldBe an[InvalidRequest]
         }
 
@@ -213,7 +213,8 @@ class RecordSetValidationsSpec
             Some(dottedARecord.copy(ttl = 300)),
             Nil,
             true,
-            VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+            VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+            false
           ) should be(right)
         }
 
@@ -226,7 +227,8 @@ class RecordSetValidationsSpec
             Some(dottedCNAMERecord.copy(ttl = 300)),
             Nil,
             true,
-            VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+            VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+            false
           ) should be(right)
         }
 
@@ -240,7 +242,8 @@ class RecordSetValidationsSpec
               Some(dottedNSRecord.copy(ttl = 300)),
               Nil,
               true,
-              VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet
+              VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+              false
             )
           ) shouldBe an[InvalidRequest]
         }
@@ -251,35 +254,35 @@ class RecordSetValidationsSpec
           val test = srv.copy(name = "_sip._tcp.example.com.")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
         }
 
         "return success for an SRV record following convention without FQDN" in {
           val test = srv.copy(name = "_sip._tcp")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
         }
 
         "return success for an SRV record following convention with a record name" in {
           val test = srv.copy(name = "_sip._tcp.foo.")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
         }
 
         "return success on a wildcard SRV that follows convention" in {
           val test = srv.copy(name = "*._tcp.example.com.")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
         }
 
         "return success on a wildcard in second position SRV that follows convention" in {
           val test = srv.copy(name = "_sip._*.example.com.")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
         }
       }
       "Skip dotted checks on NAPTR" should {
@@ -287,21 +290,21 @@ class RecordSetValidationsSpec
           val test = naptr.copy(name = "sub.naptr.example.com.")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
         }
 
         "return success for an NAPTR record without FQDN" in {
           val test = naptr.copy(name = "sub.naptr")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
         }
 
         "return success on a wildcard NAPTR" in {
           val test = naptr.copy(name = "*.sub.naptr.example.com.")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
         }
 
       }
@@ -310,7 +313,7 @@ class RecordSetValidationsSpec
           val test = ptrIp4.copy(name = "10.1.2.")
           val zone = zoneIp4.copy(name = "198.in-addr.arpa.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
         }
       }
       "Skip dotted checks on TXT" should {
@@ -318,7 +321,7 @@ class RecordSetValidationsSpec
           val test = txt.copy(name = "sub.txt.example.com.")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
         }
 
       }
@@ -335,7 +338,7 @@ class RecordSetValidationsSpec
             List(SOAData(Fqdn("something"), "other", 1, 2, 3, 5, 6))
           )
 
-          typeSpecificValidations(test, List(), zoneIp4, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
+          typeSpecificValidations(test, List(), zoneIp4, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
         }
       }
     }
@@ -348,29 +351,29 @@ class RecordSetValidationsSpec
           records = List(NSData(Fqdn("some.test.ns.")))
         )
 
-        nsValidations(valid, okZone, None, List(new Regex(".*")), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
+        nsValidations(valid, okZone, None, List(new Regex(".*")), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
       }
 
       "return an InvalidRequest if an NS record is '@'" in {
-        val error = leftValue(nsValidations(invalidNsApexRs, okZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
+        val error = leftValue(nsValidations(invalidNsApexRs, okZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
         error shouldBe an[InvalidRequest]
       }
 
       "return an InvalidRequest if an NS record is the same as the zone" in {
         val invalid = invalidNsApexRs.copy(name = okZone.name)
-        val error = leftValue(nsValidations(invalid, okZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
+        val error = leftValue(nsValidations(invalid, okZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
         error shouldBe an[InvalidRequest]
       }
 
       "return an InvalidRequest if the NS record being updated is '@'" in {
         val valid = invalidNsApexRs.copy(name = "this-is-not-origin-mate")
-        val error = leftValue(nsValidations(valid, okZone, Some(invalidNsApexRs), Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
+        val error = leftValue(nsValidations(valid, okZone, Some(invalidNsApexRs), Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
         error shouldBe an[InvalidRequest]
       }
 
       "return an InvalidRequest if an NS record data is not in the approved server list" in {
         val ns = invalidNsApexRs.copy(records = List(NSData(Fqdn("not.approved."))))
-        val error = leftValue(nsValidations(ns, okZone, None, List(new Regex("not.*")), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
+        val error = leftValue(nsValidations(ns, okZone, None, List(new Regex("not.*")), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
         error shouldBe an[InvalidRequest]
       }
     }
@@ -378,25 +381,25 @@ class RecordSetValidationsSpec
     "DSValidations" should {
       val matchingNs = ns.copy(zoneId = ds.zoneId, name = ds.name, ttl = ds.ttl)
       "return ok if the record is non-origin DS with matching NS" in {
-        dsValidations(ds, List(matchingNs), okZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
+        dsValidations(ds, List(matchingNs), okZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
       }
       "return an InvalidRequest if a DS record is '@'" in {
         val apex = ds.copy(name = "@")
-        val error = leftValue(dsValidations(apex, List(matchingNs), okZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
+        val error = leftValue(dsValidations(apex, List(matchingNs), okZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
         error shouldBe an[InvalidRequest]
       }
       "return an InvalidRequest if a DS record is the same as the zone" in {
         val apex = ds.copy(name = okZone.name)
-        val error = leftValue(dsValidations(apex, List(matchingNs), okZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
+        val error = leftValue(dsValidations(apex, List(matchingNs), okZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
         error shouldBe an[InvalidRequest]
       }
       "return an InvalidRequest if there is no NS matching the record" in {
-        val error = leftValue(dsValidations(ds, List(), okZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
+        val error = leftValue(dsValidations(ds, List(), okZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
         error shouldBe an[InvalidRequest]
       }
       "return an InvalidRequest if the DS is dotted" in {
         val error =
-          leftValue(dsValidations(ds.copy(name = "test.dotted"), List(matchingNs), okZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
+          leftValue(dsValidations(ds.copy(name = "test.dotted"), List(matchingNs), okZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
         error shouldBe an[InvalidRequest]
       }
     }
@@ -404,51 +407,51 @@ class RecordSetValidationsSpec
     "CnameValidations" should {
       val invalidCnameApexRs: RecordSet = cname.copy(name = "@")
       "return a RecordSetAlreadyExistsError if a record with the same name exists and creating a cname" in {
-        val error = leftValue(cnameValidations(cname, List(aaaa), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
+        val error = leftValue(cnameValidations(cname, List(aaaa), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
         error shouldBe a[RecordSetAlreadyExists]
       }
       "return ok if name is not '@'" in {
-        cnameValidations(cname, List(), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(right)
+        cnameValidations(cname, List(), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
       }
       "return an InvalidRequest if a cname record set name is '@'" in {
-        val error = leftValue(cnameValidations(invalidCnameApexRs, List(), okZone, None,  true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
+        val error = leftValue(cnameValidations(invalidCnameApexRs, List(), okZone, None,  true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
         error shouldBe an[InvalidRequest]
       }
       "return an InvalidRequest if a cname record set name is same as zone" in {
         val invalid = invalidCnameApexRs.copy(name = okZone.name)
-        val error = leftValue(cnameValidations(invalid, List(), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
+        val error = leftValue(cnameValidations(invalid, List(), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
         error shouldBe an[InvalidRequest]
       }
       "return an InvalidRequest if a cname record set name is dotted" in {
-        val error = leftValue(cnameValidations(cname.copy(name = "dot.ted"), List(), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
+        val error = leftValue(cnameValidations(cname.copy(name = "dot.ted"), List(), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
         error shouldBe an[InvalidRequest]
       }
       "return ok if new recordset name does not contain dot" in {
-        cnameValidations(cname, List(), okZone, Some(cname.copy(name = "not-dotted")), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(
+        cnameValidations(cname, List(), okZone, Some(cname.copy(name = "not-dotted")), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(
           right
         )
       }
       "return ok if dotted host name doesn't change" in {
         val newRecord = cname.copy(name = "dot.ted", ttl = 500)
-        cnameValidations(newRecord, List(), okZone, Some(newRecord.copy(ttl = 300)), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(
+        cnameValidations(newRecord, List(), okZone, Some(newRecord.copy(ttl = 300)), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(
           right
         )
       }
       "return an InvalidRequest if a cname record set name is updated to '@'" in {
-        val error = leftValue(cnameValidations(cname.copy(name = "@"), List(), okZone, Some(cname), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
+        val error = leftValue(cnameValidations(cname.copy(name = "@"), List(), okZone, Some(cname), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
         error shouldBe an[InvalidRequest]
       }
       "return an InvalidRequest if updated cname record set name is same as zone" in {
         val error =
-          leftValue(cnameValidations(cname.copy(name = okZone.name), List(), okZone, Some(cname), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
+          leftValue(cnameValidations(cname.copy(name = okZone.name), List(), okZone, Some(cname), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
         error shouldBe an[InvalidRequest]
       }
       "return an RecordSetValidation error if recordset data contain more than one sequential '.'" in {
-        val error = leftValue(cnameValidations(cname.copy(records = List(CNAMEData(Fqdn("record..zone")))), List(), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet))
+        val error = leftValue(cnameValidations(cname.copy(records = List(CNAMEData(Fqdn("record..zone")))), List(), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
         error shouldBe an[RecordSetValidation]
       }
       "return ok if recordset data does not contain sequential '.'" in {
-        cnameValidations(cname.copy(records = List(CNAMEData(Fqdn("record.zone")))), List(), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet) should be(
+        cnameValidations(cname.copy(records = List(CNAMEData(Fqdn("record.zone")))), List(), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(
           right
         )
       }
diff --git a/modules/api/src/test/scala/vinyldns/api/repository/EmptyRepositories.scala b/modules/api/src/test/scala/vinyldns/api/repository/EmptyRepositories.scala
index a1239cc71..ee466aca3 100644
--- a/modules/api/src/test/scala/vinyldns/api/repository/EmptyRepositories.scala
+++ b/modules/api/src/test/scala/vinyldns/api/repository/EmptyRepositories.scala
@@ -111,6 +111,8 @@ trait EmptyGroupRepo extends GroupRepository {
 
   def getGroups(groupIds: Set[String]): IO[Set[Group]] = IO.pure(Set())
 
+  def getGroupsByName(groupNames: Set[String]): IO[Set[Group]] = IO.pure(Set())
+
   def getGroupByName(groupName: String): IO[Option[Group]] = IO.pure(None)
 
   def getAllGroups(): IO[Set[Group]] = IO.pure(Set())

From fc8b1240e47111fe193d1462bb3190237c369e76 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Tue, 20 Sep 2022 10:16:14 +0530
Subject: [PATCH 108/147] updated AUTHORS.md

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index 6e42640fd..f90e0e6b4 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -18,6 +18,7 @@ in any way, but do not see your name here, please open a PR to add yourself (in
 - Peter Cline
 - Kemar Cockburn
 - Luke Cori
+- Jayaraj
 - Joe Crowe
 - Jearvon Dharrie
 - Andrew Dunn

From c59f31f25d09a683eb5ac240ee30990ef8c78843 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Tue, 20 Sep 2022 12:21:02 +0530
Subject: [PATCH 109/147] Add tests

---
 .../api/src/main/resources/application.conf   |   2 +-
 modules/api/src/main/resources/reference.conf |  11 +-
 .../api/domain/record/RecordSetService.scala  |  16 +-
 .../tests/recordsets/create_recordset_test.py |  32 +++-
 .../domain/record/RecordSetServiceSpec.scala  | 153 +++++++++++++++++-
 .../record/RecordSetValidationsSpec.scala     |  65 ++++++++
 .../vinyldns/core/TestMembershipData.scala    |   1 +
 .../MySqlGroupRepositoryIntegrationSpec.scala |  18 +++
 8 files changed, 275 insertions(+), 23 deletions(-)

diff --git a/modules/api/src/main/resources/application.conf b/modules/api/src/main/resources/application.conf
index f9f6cf6e3..c0f51b0ce 100644
--- a/modules/api/src/main/resources/application.conf
+++ b/modules/api/src/main/resources/application.conf
@@ -168,7 +168,7 @@ vinyldns {
   # approved zones, individual users, users in groups and record types that are allowed for dotted hosts
   dotted-hosts = {
       zone-list = [
-      "dummy.", # for local testing
+      "dummy", # for local testing
       "*ent.com" # for local testing with wildcard zones (allows parent.com and child.parent.com zones)
       ]
       allowed-user-list = [
diff --git a/modules/api/src/main/resources/reference.conf b/modules/api/src/main/resources/reference.conf
index e83541a12..a4d8b19d7 100644
--- a/modules/api/src/main/resources/reference.conf
+++ b/modules/api/src/main/resources/reference.conf
@@ -90,20 +90,19 @@ vinyldns {
     "ns1.parent.com."
   ]
 
-  # approved zones/domains and users that are allowed to create dotted hosts
+  # approved zones, individual users, users in groups and record types that are allowed for dotted hosts
   dotted-hosts = {
       zone-list = [
-      "dummy.", # for local testing
-      "*ent.com", # for local testing with wildcard zones (allows parent.com and child.parent.com zone)
+      "parent.com*" # for local testing with wildcard zones (allows parent.com and child.parent.com zones)
       ]
       allowed-user-list = [
-      "testuser" # for local testing
+      "ok" # for local testing (username)
       ]
       allowed-group-list = [
-      "test-group" # for local testing
+      "dummy-group*" # for local testing (group name)
       ]
       allowed-record-type = [
-      "A" # for local testing
+      "CNAME" # for local testing
       ]
   }
 
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 52675be88..ef118e604 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
@@ -116,7 +116,7 @@ class RecordSetService(
       isAllowedUser = isInAllowedUsers || isUserInAllowedGroups
       isRecordTypeAllowed = dottedHostsConfig.allowedRecordType.contains(rsForValidations.typ.toString)
       isRecordTypeAndUserAllowed = isAllowedUser && isRecordTypeAllowed
-      zoneOrRecordDoesNotAlreadyExist <- zoneOrRecordDoesNotExist(rsForValidations, zone).toResult[Boolean]
+      zoneOrRecordDoesNotAlreadyExist <- recordFQDNDoesNotExist(rsForValidations, zone).toResult[Boolean]
       _ <- typeSpecificValidations(
         rsForValidations,
         existingRecordsWithName,
@@ -162,7 +162,7 @@ class RecordSetService(
       isAllowedUser = isInAllowedUsers || isUserInAllowedGroups
       isRecordTypeAllowed = dottedHostsConfig.allowedRecordType.contains(rsForValidations.typ.toString)
       isRecordTypeAndUserAllowed = isAllowedUser && isRecordTypeAllowed
-      zoneOrRecordDoesNotAlreadyExist <- zoneOrRecordDoesNotExist(rsForValidations, zone).toResult[Boolean]
+      zoneOrRecordDoesNotAlreadyExist <- recordFQDNDoesNotExist(rsForValidations, zone).toResult[Boolean]
       _ <- typeSpecificValidations(
         rsForValidations,
         existingRecordsWithName,
@@ -192,19 +192,15 @@ class RecordSetService(
       _ <- messageQueue.send(change).toResult[Unit]
     } yield change
 
-  // For dotted hosts. Check if a zone or record that may conflict with dotted host exist or not
-  def zoneOrRecordDoesNotExist(newRecordSet: RecordSet, zone: Zone): IO[Boolean] = {
-    // Use fqdn for searching through `recordset` and `zone` mysql table to see if it already exist
+  // For dotted hosts. Check if a record that may conflict with dotted host exist or not
+  def recordFQDNDoesNotExist(newRecordSet: RecordSet, zone: Zone): IO[Boolean] = {
+    // Use fqdn for searching through `recordset` mysql table to see if it already exist
     val newRecordFqdn = if(newRecordSet.name != zone.name) newRecordSet.name + "." + zone.name else newRecordSet.name
 
     for {
-      existingZone <- zoneRepository.getZoneByName(newRecordFqdn)
-      allMatchingZones <- if(newRecordSet.name.contains(".")) zoneRepository.getZonesByFilters(newRecordSet.name.split('.').map(x => x + "." + zone.name).toSet) else zoneRepository.getZonesByFilters(Set.empty)
       record <- recordSetRepository.getRecordSetsByFQDNs(Set(newRecordFqdn))
-      isNotTheIntendedZone = allMatchingZones.map(x => x.name).exists(x => newRecordFqdn.contains(x))
-      isZoneAlreadyExist = existingZone.isDefined
       isRecordAlreadyExist = doesRecordWithSameTypeExist(record, newRecordSet)
-      doesNotExist = if(isZoneAlreadyExist || isRecordAlreadyExist || isNotTheIntendedZone) false else true
+      doesNotExist = if(isRecordAlreadyExist) false else true
     } yield doesNotExist
   }
 
diff --git a/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py b/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py
index c86d0e6a7..b909627e9 100644
--- a/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py
+++ b/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py
@@ -582,6 +582,25 @@ def test_create_dotted_a_record_apex_with_trailing_dot_succeeds(shared_zone_test
 
 
 def test_create_dotted_cname_record_fails(shared_zone_test_context):
+    """
+    Test that creating a CNAME record set with dotted host record name returns an error.
+    """
+    client = shared_zone_test_context.dummy_vinyldns_client
+    zone = shared_zone_test_context.dummy_zone
+    apex_cname_rs = {
+        "zoneId": zone["id"],
+        "name": "dot.ted",
+        "type": "CNAME",
+        "ttl": 500,
+        "records": [{"cname": "foo.bar."}]
+    }
+
+    error = client.create_recordset(apex_cname_rs, status=422)
+    assert_that(error,
+                is_(f'Record with name dot.ted and type CNAME is a dotted host which is not allowed in zone {zone["name"]}'))
+
+
+def test_create_dotted_cname_record_succeeds_if_all_dotted_hosts_config_satisfies(shared_zone_test_context):
     """
     Test that creating a CNAME record set with dotted host record name returns an error.
     """
@@ -595,8 +614,15 @@ def test_create_dotted_cname_record_fails(shared_zone_test_context):
         "records": [{"cname": "foo.bar."}]
     }
 
-    error = client.create_recordset(apex_cname_rs, status=422)
-    assert_that(error, is_(f'Record with name dot.ted and type CNAME is a dotted host which is not allowed in zone {zone["name"]}'))
+    apex_cname_record = None
+    try:
+        apex_cname_response = client.create_recordset(apex_cname_rs, status=202)
+        apex_cname_record = client.wait_until_recordset_change_status(apex_cname_response, "Complete")["recordSet"]
+        assert_that(apex_cname_record["name"], is_(apex_cname_rs["name"]))
+    finally:
+        if apex_cname_record:
+            delete_result = client.delete_recordset(apex_cname_record["zoneId"], apex_cname_record["id"], status=202)
+            client.wait_until_recordset_change_status(delete_result, "Complete")
 
 
 def test_create_cname_with_multiple_records(shared_zone_test_context):
@@ -1368,7 +1394,6 @@ def test_at_create_recordset(shared_zone_test_context):
         }
         result = client.create_recordset(new_rs, status=202)
 
-
         assert_that(result["changeType"], is_("Create"))
         assert_that(result["status"], is_("Pending"))
         assert_that(result["created"], is_not(none()))
@@ -1418,7 +1443,6 @@ def test_create_record_with_escape_characters_in_record_data_succeeds(shared_zon
         }
         result = client.create_recordset(new_rs, status=202)
 
-
         assert_that(result["changeType"], is_("Create"))
         assert_that(result["status"], is_("Pending"))
         assert_that(result["created"], is_not(none()))
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
index 23cb9e161..63ee4ccf0 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
@@ -155,7 +155,6 @@ class RecordSetServiceSpec
       val result = leftResultOf(underTest.getRecordSetByZone(aaaa.id, mockZone.id, okAuth).value)
       result shouldBe a[ZoneNotFoundError]
     }
-
     "fail when the account is not authorized" in {
       doReturn(IO.pure(Some(aaaa)))
         .when(mockRecordRepo)
@@ -178,7 +177,7 @@ class RecordSetServiceSpec
       val result = leftResultOf(underTest.addRecordSet(aaaa, okAuth).value)
       result shouldBe a[RecordSetAlreadyExists]
     }
-    "fail if the record is dotted and zone is not in the dotted hosts config allowed zones" in {
+    "fail if the record is dotted and does not satisfy properties in dotted hosts config" in {
       val record =
         aaaa.copy(name = "new.name", zoneId = okZone.id, status = RecordSetStatus.Active)
 
@@ -475,6 +474,156 @@ class RecordSetServiceSpec
       result.status shouldBe RecordSetChangeStatus.Pending
     }
   }
+  "succeed if the record is dotted and zone, user, record type is in allowed dotted hosts config" in {
+    val record =
+      cname.copy(name = "new.name", zoneId = dottedZone.id, status = RecordSetStatus.Active)
+
+    doReturn(IO.pure(Some(dottedZone))).when(mockZoneRepo).getZone(dottedZone.id)
+    doReturn(IO.pure(List()))
+      .when(mockRecordRepo)
+      .getRecordSets(dottedZone.id, record.name, record.typ)
+    doReturn(IO.pure(List()))
+      .when(mockRecordRepo)
+      .getRecordSetsByName(dottedZone.id, record.name)
+    doReturn(IO.pure(Set(dottedZone)))
+      .when(mockZoneRepo)
+      .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+    doReturn(IO.pure(Set()))
+      .when(mockZoneRepo)
+      .getZonesByFilters(Set.empty)
+    doReturn(IO.pure(None))
+      .when(mockZoneRepo)
+      .getZoneByName(record.name + "." + dottedZone.name)
+    doReturn(IO.pure(List()))
+      .when(mockRecordRepo)
+      .getRecordSetsByFQDNs(Set(record.name + "." + dottedZone.name))
+    doReturn(IO.pure(Set()))
+      .when(mockZoneRepo)
+      .getZonesByFilters(record.name.split('.').map(x => x + "." + dottedZone.name).toSet)
+    doReturn(IO.pure(Set(xyzGroup)))
+      .when(mockGroupRepo)
+      .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+    doReturn(IO.pure(ListUsersResults(Seq(xyzUser), None)))
+      .when(mockUserRepo)
+      .getUsers(xyzGroup.memberIds, None, None)
+
+    // passes as all three properties within dotted hosts config (allowed zones, users and record types) are satisfied
+    val result: RecordSetChange = rightResultOf(
+      underTest.addRecordSet(record, xyzAuth).map(_.asInstanceOf[RecordSetChange]).value
+    )
+
+    result.recordSet.name shouldBe record.name
+  }
+  "fail if the record is dotted and user, record type is in allowed dotted hosts config except zone" in {
+    val record =
+      cname.copy(name = "new.name", zoneId = okZone.id, status = RecordSetStatus.Active)
+
+    doReturn(IO.pure(List()))
+      .when(mockRecordRepo)
+      .getRecordSets(okZone.id, record.name, record.typ)
+    doReturn(IO.pure(List()))
+      .when(mockRecordRepo)
+      .getRecordSetsByName(okZone.id, record.name)
+    doReturn(IO.pure(Set(dottedZone)))
+      .when(mockZoneRepo)
+      .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+    doReturn(IO.pure(Set()))
+      .when(mockZoneRepo)
+      .getZonesByFilters(Set.empty)
+    doReturn(IO.pure(None))
+      .when(mockZoneRepo)
+      .getZoneByName(record.name + "." + okZone.name)
+    doReturn(IO.pure(List()))
+      .when(mockRecordRepo)
+      .getRecordSetsByFQDNs(Set(record.name + "." + okZone.name))
+    doReturn(IO.pure(Set()))
+      .when(mockZoneRepo)
+      .getZonesByFilters(record.name.split('.').map(x => x + "." + okZone.name).toSet)
+    doReturn(IO.pure(Set(xyzGroup)))
+      .when(mockGroupRepo)
+      .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+    doReturn(IO.pure(ListUsersResults(Seq(xyzUser), None)))
+      .when(mockUserRepo)
+      .getUsers(xyzGroup.memberIds, None, None)
+
+    // fails as only two properties within dotted hosts config (users and record types) are satisfied while zone is not allowed
+    val result = leftResultOf(underTest.addRecordSet(record, okAuth).value)
+    result shouldBe an[InvalidRequest]
+  }
+  "fail if the record is dotted and zone, record type is in allowed dotted hosts config except user" in {
+    val record =
+      cname.copy(name = "new.name", zoneId = dottedZone.id, status = RecordSetStatus.Active)
+
+    doReturn(IO.pure(Some(dottedZone))).when(mockZoneRepo).getZone(dottedZone.id)
+    doReturn(IO.pure(List()))
+      .when(mockRecordRepo)
+      .getRecordSets(dottedZone.id, record.name, record.typ)
+    doReturn(IO.pure(List()))
+      .when(mockRecordRepo)
+      .getRecordSetsByName(dottedZone.id, record.name)
+    doReturn(IO.pure(Set(dottedZone)))
+      .when(mockZoneRepo)
+      .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+    doReturn(IO.pure(Set()))
+      .when(mockZoneRepo)
+      .getZonesByFilters(Set.empty)
+    doReturn(IO.pure(None))
+      .when(mockZoneRepo)
+      .getZoneByName(record.name + "." + dottedZone.name)
+    doReturn(IO.pure(List()))
+      .when(mockRecordRepo)
+      .getRecordSetsByFQDNs(Set(record.name + "." + dottedZone.name))
+    doReturn(IO.pure(Set()))
+      .when(mockZoneRepo)
+      .getZonesByFilters(record.name.split('.').map(x => x + "." + dottedZone.name).toSet)
+    doReturn(IO.pure(Set(xyzGroup)))
+      .when(mockGroupRepo)
+      .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+    doReturn(IO.pure(ListUsersResults(Seq(), None)))
+      .when(mockUserRepo)
+      .getUsers(xyzGroup.memberIds, None, None)
+
+    // fails as only two properties within dotted hosts config (zones and record types) are satisfied while user is not allowed
+    val result = leftResultOf(underTest.addRecordSet(record, xyzAuth).value)
+    result shouldBe an[InvalidRequest]
+  }
+  "fail if the record is dotted and zone, user is in allowed dotted hosts config except record type" in {
+    val record =
+      aaaa.copy(name = "new.name", zoneId = dottedZone.id, status = RecordSetStatus.Active)
+
+    doReturn(IO.pure(Some(dottedZone))).when(mockZoneRepo).getZone(dottedZone.id)
+    doReturn(IO.pure(List()))
+      .when(mockRecordRepo)
+      .getRecordSets(dottedZone.id, record.name, record.typ)
+    doReturn(IO.pure(List()))
+      .when(mockRecordRepo)
+      .getRecordSetsByName(dottedZone.id, record.name)
+    doReturn(IO.pure(Set(dottedZone)))
+      .when(mockZoneRepo)
+      .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+    doReturn(IO.pure(Set()))
+      .when(mockZoneRepo)
+      .getZonesByFilters(Set.empty)
+    doReturn(IO.pure(None))
+      .when(mockZoneRepo)
+      .getZoneByName(record.name + "." + dottedZone.name)
+    doReturn(IO.pure(List()))
+      .when(mockRecordRepo)
+      .getRecordSetsByFQDNs(Set(record.name + "." + dottedZone.name))
+    doReturn(IO.pure(Set()))
+      .when(mockZoneRepo)
+      .getZonesByFilters(record.name.split('.').map(x => x + "." + dottedZone.name).toSet)
+    doReturn(IO.pure(Set(xyzGroup)))
+      .when(mockGroupRepo)
+      .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+    doReturn(IO.pure(ListUsersResults(Seq(xyzUser), None)))
+      .when(mockUserRepo)
+      .getUsers(xyzGroup.memberIds, None, None)
+
+    // fails as only two properties within dotted hosts config (zone and user) are satisfied while record type is not allowed
+    val result = leftResultOf(underTest.addRecordSet(record, xyzAuth).value)
+    result shouldBe an[InvalidRequest]
+  }
 
   "updateRecordSet" should {
     "return the recordSet change as the result" in {
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala
index 045a69512..57625b9c1 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala
@@ -184,6 +184,36 @@ class RecordSetValidationsSpec
       }
     }
 
+    "isDotted" should {
+      "return a failure for any record with dotted hosts if it is already present" in {
+        val test = aaaa.copy(name = "this.is.a.failure.")
+        leftValue(isDotted(test, okZone, None, false, true)) shouldBe an[InvalidRequest]
+      }
+
+      "return a failure for any record that is a dotted host if user or record type is not allowed" in {
+        val test = aaaa.copy(name = "this.is.a.failure." + okZone.name)
+        leftValue(isDotted(test, okZone, None, true, false)) shouldBe an[InvalidRequest]
+      }
+
+      "return a failure for a dotted record name that matches the zone name" in {
+        val test = aaaa.copy(name = "ok.www.comcast.net")
+        val zone = okZone.copy(name = "ok.www.comcast.net")
+        leftValue(isDotted(test, zone, None, true, true)) shouldBe an[InvalidRequest]
+      }
+
+      "return success for a dotted record if it does not already have a record or zone with same name and user is allowed" in {
+        val test = aaaa.copy(name = "this.passes")
+        isDotted(test, okZone, None, true, true) should be(right)
+      }
+
+      "return success for a new record that has the same name as the existing record" in {
+        val newRecord = aaaa.copy(name = "dot.ted")
+        val existingRecord = newRecord.copy(ttl = 330)
+
+        isDotted(newRecord, okZone, Some(existingRecord), true, true) should be(right)
+      }
+    }
+
     "typeSpecificValidations" should {
       "Run dotted hosts checks" should {
         val dottedARecord = rsOk.copy(name = "this.is.a.failure.")
@@ -205,6 +235,21 @@ class RecordSetValidationsSpec
           ) shouldBe an[InvalidRequest]
         }
 
+        "return a success for any new record with dotted hosts in forward zones if it satisfies dotted hosts configs" in {
+          val record = typeSpecificValidations(dottedARecord.copy(zoneId = dottedZone.id), List(), dottedZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, true)
+          record should be(right)
+        }
+
+        "return a failure for any new record with dotted hosts in forward zones (CNAME) if it satisfies dotted hosts configs" in {
+          val record = typeSpecificValidations(dottedARecord.copy(typ = CNAME, zoneId = dottedZone.id), List(), dottedZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, true)
+          record should be(right)
+        }
+
+        "return a failure for any new record with dotted hosts in forward zones (NS) if it satisfies dotted hosts configs" in {
+          val record = typeSpecificValidations(dottedARecord.copy(typ = NS, zoneId = dottedZone.id), List(), dottedZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, true)
+          record should be(right)
+        }
+
         "return a success for any existing record with dotted hosts in forward zones" in {
           typeSpecificValidations(
             dottedARecord,
@@ -402,6 +447,16 @@ class RecordSetValidationsSpec
           leftValue(dsValidations(ds.copy(name = "test.dotted"), List(matchingNs), okZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
         error shouldBe an[InvalidRequest]
       }
+      "return ok if the DS is dotted and zone, user, record type is allowed in dotted hosts config" in {
+        val record =
+          dsValidations(ds.copy(name = "dotted.trial", zoneId = dottedZone.id), List(matchingNs), dottedZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, true)
+        record should be(right)
+      }
+      "return an InvalidRequest if the DS is dotted and zone, user, record type is allowed in dotted hosts config but has a conflict with existing record or zone" in {
+        val error =
+          leftValue(dsValidations(ds.copy(name = "dotted.trial", zoneId = dottedZone.id), List(matchingNs), dottedZone, false, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, true))
+        error shouldBe an[InvalidRequest]
+      }
     }
 
     "CnameValidations" should {
@@ -455,6 +510,16 @@ class RecordSetValidationsSpec
           right
         )
       }
+      "return ok if the CNAME is dotted and zone, user, record type is allowed in dotted hosts config" in {
+        val record =
+          cnameValidations(cname.copy(name = "dot.ted", zoneId = dottedZone.id), List(), dottedZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, true)
+        record should be(right)
+      }
+      "return an InvalidRequest if the CNAME is dotted and zone, user, record type is allowed in dotted hosts config but has a conflict with existing record or zone" in {
+        val error =
+          leftValue(cnameValidations(cname.copy(name = "dot.ted", zoneId = dottedZone.id), List(), dottedZone, None, false, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, true))
+        error shouldBe an[InvalidRequest]
+      }
     }
 
     "isNotHighValueDomain" should {
diff --git a/modules/core/src/test/scala/vinyldns/core/TestMembershipData.scala b/modules/core/src/test/scala/vinyldns/core/TestMembershipData.scala
index 36ba54ec0..641b4db1e 100644
--- a/modules/core/src/test/scala/vinyldns/core/TestMembershipData.scala
+++ b/modules/core/src/test/scala/vinyldns/core/TestMembershipData.scala
@@ -36,6 +36,7 @@ object TestMembershipData {
 
   val dummyUser = User("dummyName", "dummyAccess", "dummySecret")
   val superUser = User("super", "superAccess", "superSecret", isSuper = true)
+  val xyzUser = User("xyz", "xyzAccess", "xyzSecret")
   val supportUser = User("support", "supportAccess", "supportSecret", isSupport = true)
   val lockedUser = User("locked", "lockedAccess", "lockedSecret", lockStatus = LockStatus.Locked)
   val sharedZoneUser = User("sharedZoneAdmin", "sharedAccess", "sharedSecret")
diff --git a/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlGroupRepositoryIntegrationSpec.scala b/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlGroupRepositoryIntegrationSpec.scala
index b658c741a..c207c880d 100644
--- a/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlGroupRepositoryIntegrationSpec.scala
+++ b/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlGroupRepositoryIntegrationSpec.scala
@@ -93,6 +93,24 @@ class MySqlGroupRepositoryIntegrationSpec
     }
   }
 
+  "MySqlGroupRepository.getGroupsByName" should {
+    "omits all non existing groups" in {
+      val result = repo.getGroupsByName(Set("no-existo", groups.head.name)).unsafeRunSync()
+      result should contain theSameElementsAs Set(groups.head)
+    }
+
+    "returns correct list of groups" in {
+      val names = Set(groups(0).name, groups(1).name, groups(2).name)
+      val result = repo.getGroupsByName(names).unsafeRunSync()
+      result should contain theSameElementsAs groups.take(3).toSet
+    }
+
+    "returns empty list when given no names" in {
+      val result = repo.getGroupsByName(Set[String]()).unsafeRunSync()
+      result should contain theSameElementsAs Set()
+    }
+  }
+
   "MySqlGroupRepository.getGroupByName" should {
     "retrieve a group" in {
       repo.getGroupByName(groups.head.name).unsafeRunSync() shouldBe Some(groups.head)

From 6f3ed18d4de36c7e20473cb6fe5a1f24862a107f Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Tue, 20 Sep 2022 12:39:33 +0530
Subject: [PATCH 110/147] updated AUTHORS.md

---
 AUTHORS.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index f90e0e6b4..2e713ac03 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -18,7 +18,6 @@ in any way, but do not see your name here, please open a PR to add yourself (in
 - Peter Cline
 - Kemar Cockburn
 - Luke Cori
-- Jayaraj
 - Joe Crowe
 - Jearvon Dharrie
 - Andrew Dunn
@@ -37,14 +36,17 @@ in any way, but do not see your name here, please open a PR to add yourself (in
 - Joshulyne Park
 - Nathan Pierce
 - Michael Pilquist
+- Aravindh Raju
 - Sriram Ramakrishnan
 - Khalid Reid
 - Timo Schmid
 - Trent Schmidt
+- Nick Spadaccino
 - Ghafar Shah
 - Rebecca Star
 - Jess Stodola
 - Juan Valencia
+- Jayaraj Velkumar
 - Anastasia Vishnyakova
 - Jim Wakemen
 - Fei Wan

From 453d92df20cf4373a915391ff9634fa66ffe6745 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Tue, 20 Sep 2022 14:18:05 +0530
Subject: [PATCH 111/147] updated DEVELOPER_GUIDE.md

---
 DEVELOPER_GUIDE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md
index a37c18ae5..c1a0c76f0 100644
--- a/DEVELOPER_GUIDE.md
+++ b/DEVELOPER_GUIDE.md
@@ -267,7 +267,7 @@ Additionally, you can pass `--interactive` to `make run` or `make run-local` to
 From there you can run tests with the `/functional_test/run.sh` command. This allows for finer-grained control over the
 test execution process as well as easier inspection of logs.
 
-You can run a specific test by name by running `make run -- -k <name of test function>`. Any arguments after
+You can run a specific test by name by running `make build` and `make run -- -k <name of test function>`. Any arguments after
 `make run --` will be passed to the test runner [`test/api/functional/run.sh`](test/api/functional/run.sh).
 
 Finally, you can execute `make run-deps-bg` to all of the dependencies for the functional test, but not run the tests.

From 75feb72db43dd779499205e7b28fa72cb10a8d98 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Wed, 21 Sep 2022 17:40:59 +0530
Subject: [PATCH 112/147] Refactor functionality and tests

---
 .../api/src/main/resources/application.conf   |  40 +-
 modules/api/src/main/resources/reference.conf |  22 +-
 .../src/main/scala/vinyldns/api/Boot.scala    |   3 +-
 .../api/config/DottedHostsConfig.scala        |  19 +-
 .../api/domain/batch/BatchChangeService.scala |  95 +----
 .../domain/batch/BatchChangeValidations.scala |  83 ++--
 .../api/domain/record/RecordSetService.scala  | 114 +++++-
 .../domain/record/RecordSetValidations.scala  |  42 +-
 .../vinyldns/api/VinylDNSTestHelpers.scala    |   4 +-
 .../domain/batch/BatchChangeServiceSpec.scala |  28 +-
 .../batch/BatchChangeValidationsSpec.scala    | 368 ++++--------------
 .../domain/record/RecordSetServiceSpec.scala  | 203 +++++++---
 .../record/RecordSetValidationsSpec.scala     |  95 ++---
 .../scala/vinyldns/core/TestZoneData.scala    |   2 +-
 14 files changed, 478 insertions(+), 640 deletions(-)

diff --git a/modules/api/src/main/resources/application.conf b/modules/api/src/main/resources/application.conf
index c0f51b0ce..073b7065a 100644
--- a/modules/api/src/main/resources/application.conf
+++ b/modules/api/src/main/resources/application.conf
@@ -165,25 +165,27 @@ vinyldns {
     "ns1.parent.com4."
   ]
 
-  # approved zones, individual users, users in groups and record types that are allowed for dotted hosts
-  dotted-hosts = {
-      zone-list = [
-      "dummy", # for local testing
-      "*ent.com" # for local testing with wildcard zones (allows parent.com and child.parent.com zones)
-      ]
-      allowed-user-list = [
-      "testuser",
-      "professor" # for local testing (username)
-      ]
-      allowed-group-list = [
-      "test-group",
-      "duGroup" # for local testing (group name)
-      ]
-      allowed-record-type = [
-      "A",
-      "CNAME" # for local testing
-      ]
-  }
+# approved zones, individual users, users in groups and record types that are allowed for dotted hosts
+dotted-hosts = {
+  # for local testing
+  allowed-settings = [
+    {
+    type = "auth-configs"
+    zone = "dummy."
+    allowed-user-list = ["testuser"]
+    allowed-group-list = ["dummy-group"]
+    allowed-record-type = ["AAAA"]
+    },
+    {
+    # for wildcard zones. Settings will be applied to all matching zones
+    type = "auth-configs"
+    zone = "*ent.com."
+    allowed-user-list = ["professor", "testuser"]
+    allowed-group-list = ["testing-group"]
+    allowed-record-type = ["A", "CNAME"]
+    }
+  ]
+}
 
   # Note: This MUST match the Portal or strange errors will ensue, NoOpCrypto should not be used for production
   crypto {
diff --git a/modules/api/src/main/resources/reference.conf b/modules/api/src/main/resources/reference.conf
index a4d8b19d7..da75134ca 100644
--- a/modules/api/src/main/resources/reference.conf
+++ b/modules/api/src/main/resources/reference.conf
@@ -92,18 +92,16 @@ vinyldns {
 
   # approved zones, individual users, users in groups and record types that are allowed for dotted hosts
   dotted-hosts = {
-      zone-list = [
-      "parent.com*" # for local testing with wildcard zones (allows parent.com and child.parent.com zones)
-      ]
-      allowed-user-list = [
-      "ok" # for local testing (username)
-      ]
-      allowed-group-list = [
-      "dummy-group*" # for local testing (group name)
-      ]
-      allowed-record-type = [
-      "CNAME" # for local testing
-      ]
+    allowed-settings = [
+      {
+      # for wildcard zones. Settings will be applied to all matching zones
+      type = "auth-configs"
+      zone = "*ent.com*."
+      allowed-user-list = ["ok"]
+      allowed-group-list = ["dummy-group*"]
+      allowed-record-type = ["CNAME"]
+      }
+    ]
   }
 
   # color should be green or blue, used in order to do blue/green deployment
diff --git a/modules/api/src/main/scala/vinyldns/api/Boot.scala b/modules/api/src/main/scala/vinyldns/api/Boot.scala
index aa7cffb33..ae4077f49 100644
--- a/modules/api/src/main/scala/vinyldns/api/Boot.scala
+++ b/modules/api/src/main/scala/vinyldns/api/Boot.scala
@@ -184,8 +184,7 @@ object Boot extends App {
         notifiers,
         vinyldnsConfig.scheduledChangesConfig.enabled,
         vinyldnsConfig.batchChangeConfig.v6DiscoveryNibbleBoundaries,
-        vinyldnsConfig.serverConfig.defaultTtl,
-        vinyldnsConfig.dottedHostsConfig
+        vinyldnsConfig.serverConfig.defaultTtl
       )
       val collectorRegistry = CollectorRegistry.defaultRegistry
       val vinyldnsService = new VinylDNSService(
diff --git a/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala b/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
index 2a5051976..183b1b4e0 100644
--- a/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
+++ b/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
@@ -17,17 +17,16 @@
 package vinyldns.api.config
 
 import pureconfig.ConfigReader
+import pureconfig.generic.auto._
+
+sealed trait AuthMethod
+final case class AuthConfigs(zone: String, allowedUserList: List[String], allowedGroupList: List[String], allowedRecordType: List[String]) extends AuthMethod
+final case class DottedHostsConfig(authMethods: List[AuthMethod])
 
-final case class DottedHostsConfig(zoneList: List[String], allowedUserList: List[String], allowedGroupList: List[String], allowedRecordType: List[String])
 object DottedHostsConfig {
   implicit val configReader: ConfigReader[DottedHostsConfig] =
-    ConfigReader.forProduct4[DottedHostsConfig, List[String], List[String], List[String], List[String]](
-      "zone-list",
-      "allowed-user-list",
-      "allowed-group-list",
-      "allowed-record-type"
-    ){
-      case (zoneList, allowedUserList, allowedGroupList, allowedRecordType) =>
-        DottedHostsConfig(zoneList, allowedUserList, allowedGroupList, allowedRecordType)
-    }
+    ConfigReader.forProduct1[DottedHostsConfig, List[AuthMethod]](
+      "allowed-settings",
+    )(authMethods =>
+      DottedHostsConfig(authMethods))
 }
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala
index f10094d3a..ae2ff56c4 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeService.scala
@@ -27,7 +27,6 @@ import vinyldns.api.domain.auth.AuthPrincipalProvider
 import vinyldns.api.domain.batch.BatchChangeInterfaces._
 import vinyldns.api.domain.batch.BatchTransformations._
 import vinyldns.api.backend.dns.DnsConversions._
-import vinyldns.api.config.DottedHostsConfig
 import vinyldns.api.repository.ApiDataAccessor
 import vinyldns.core.domain.auth.AuthPrincipal
 import vinyldns.core.domain.batch.BatchChangeApprovalStatus.BatchChangeApprovalStatus
@@ -36,7 +35,7 @@ import vinyldns.core.domain.batch.BatchChangeApprovalStatus._
 import vinyldns.core.domain.{CnameAtZoneApexError, SingleChangeError, UserIsNotAuthorizedError, ZoneDiscoveryError}
 import vinyldns.core.domain.membership.{Group, GroupRepository, ListUsersResults, User, UserRepository}
 import vinyldns.core.domain.record.RecordType._
-import vinyldns.core.domain.record.{RecordSet, RecordSetRepository}
+import vinyldns.core.domain.record.RecordSetRepository
 import vinyldns.core.domain.zone.ZoneRepository
 import vinyldns.core.notifier.{AllNotifiers, Notification}
 
@@ -50,8 +49,7 @@ object BatchChangeService {
       notifiers: AllNotifiers,
       scheduledChangesEnabled: Boolean,
       v6DiscoveryNibbleBoundaries: V6DiscoveryNibbleBoundaries,
-      defaultTtl: Long,
-      dottedHostsConfig: DottedHostsConfig
+      defaultTtl: Long
   ): BatchChangeService =
     new BatchChangeService(
       dataAccessor.zoneRepository,
@@ -66,8 +64,7 @@ object BatchChangeService {
       notifiers,
       scheduledChangesEnabled,
       v6DiscoveryNibbleBoundaries,
-      defaultTtl,
-      dottedHostsConfig
+      defaultTtl
     )
 }
 
@@ -84,8 +81,7 @@ class BatchChangeService(
     notifiers: AllNotifiers,
     scheduledChangesEnabled: Boolean,
     v6zoneNibbleBoundaries: V6DiscoveryNibbleBoundaries,
-    defaultTtl: Long,
-    dottedHostsConfig: DottedHostsConfig
+    defaultTtl: Long
 ) extends BatchChangeServiceAlgebra {
 
   import batchChangeValidations._
@@ -126,97 +122,16 @@ class BatchChangeService(
       recordSets <- getExistingRecordSets(changesWithZones, zoneMap).toBatchResult
       withTtl = doTtlMapping(changesWithZones, recordSets)
       groupedChanges = ChangeForValidationMap(withTtl, recordSets)
-      allowedZoneList <- getAllowedZones(dottedHostsConfig.zoneList).toBatchResult
-      isInAllowedUsers = checkIfInAllowedUsers(dottedHostsConfig.allowedUserList, auth)
-      isUserInAllowedGroups <- checkIfInAllowedGroups(dottedHostsConfig.allowedGroupList, auth).toBatchResult
-      isAllowedUser = isInAllowedUsers || isUserInAllowedGroups
-      zoneOrRecordDoesNotAlreadyExist <- zoneOrRecordDoesNotExist(groupedChanges).toBatchResult
       validatedSingleChanges = validateChangesWithContext(
         groupedChanges,
         auth,
         isApproved,
-        batchChangeInput.ownerGroupId,
-        zoneOrRecordDoesNotAlreadyExist,
-        allowedZoneList,
-        isAllowedUser,
-        dottedHostsConfig
+        batchChangeInput.ownerGroupId
       )
       errorGroupIds <- getGroupIdsFromUnauthorizedErrors(validatedSingleChanges)
       validatedSingleChangesWithGroups = errorGroupMapping(errorGroupIds, validatedSingleChanges)
     } yield BatchValidationFlowOutput(validatedSingleChangesWithGroups, zoneMap, groupedChanges)
 
-  // For dotted hosts. Check if a zone or record that may conflict with dotted host exist or not
-  def zoneOrRecordDoesNotExist(groupedChanges: ChangeForValidationMap): IO[Boolean] = {
-    val groupedChangesMap = groupedChanges.changes.map(x => x.toOption).filter(x => x.isDefined)
-
-    val newRecordFqdn = if(groupedChangesMap.nonEmpty){
-      val inputChange = groupedChangesMap.map(x => x.get)
-      // Use fqdn for searching through `recordset` and `zone` mysql table to see if it already exist
-      inputChange.map(_.recordName).head + "." + inputChange.map(_.zone.name).head
-    } else {
-      ""
-    }
-
-    for {
-      zone <- zoneRepository.getZoneByName(newRecordFqdn)
-      record <- recordSetRepository.getRecordSetsByFQDNs(Set(newRecordFqdn))
-      isZoneAlreadyExist = zone.isDefined
-      isRecordAlreadyExist = if(groupedChangesMap.nonEmpty) doesRecordWithSameTypeExist(record, groupedChangesMap.map(x => x.get).map(_.inputChange)) else false
-      doesNotExist = if(isZoneAlreadyExist || isRecordAlreadyExist) false else true
-    } yield doesNotExist
-  }
-
-  // Check if a record with same type already exist in 'recordset' mysql table
-  def doesRecordWithSameTypeExist(oldRecord: List[RecordSet], newRecord: List[ChangeInput]): Boolean = {
-    if(oldRecord.nonEmpty) {
-      val typeExists = oldRecord.map(x => x.typ == newRecord.map(_.typ))
-      if (typeExists.contains(true)) true else false
-    }
-    else {
-      false
-    }
-  }
-
-  // Get zones that are allowed to create dotted hosts using the zones present in dotted hosts config
-  def  getAllowedZones(zones: List[String]): IO[Set[String]] = {
-    if(zones.isEmpty){
-      val noZones: IO[Set[String]] = IO(Set.empty)
-      noZones
-    }
-    else {
-      // Wildcard zones needs to be passed to a separate method
-      val wildcardZones = zones.filter(_.contains("*")).map(_.replace("*", ""))
-      // Zones without wildcard character are passed to a separate function
-      val namedZones = zones.filter(zone => !zone.contains("*"))
-      for {
-        namedZoneResult <- zoneRepository.getZonesByNames(namedZones.toSet)
-        wildcardZoneResult <- zoneRepository.getZonesByFilters(wildcardZones.toSet)
-        zoneResult = namedZoneResult ++ wildcardZoneResult // Combine the zones
-      } yield zoneResult.map(x => x.name)
-    }
-  }
-
-  // Check if user is allowed to create dotted hosts using the users present in dotted hosts config
-  def checkIfInAllowedUsers(users: List[String], auth: AuthPrincipal): Boolean = {
-    if(users.contains(auth.signedInUser.userName)){
-      true
-    }
-    else {
-      false
-    }
-  }
-
-  // Check if user is allowed to create dotted hosts using the groups present in dotted hosts config
-  def checkIfInAllowedGroups(groups: List[String], auth: AuthPrincipal): IO[Boolean] = {
-    for{
-      groupsInConfig <- groupRepository.getGroupsByName(groups.toSet)
-      members = groupsInConfig.flatMap(x => x.memberIds)
-      usersList <- if(members.isEmpty) IO(Seq.empty) else userRepository.getUsers(members, None, None).map(x => x.users)
-      users = if(usersList.isEmpty) Seq.empty else usersList.map(x => x.userName)
-      isPresent = users.contains(auth.signedInUser.userName)
-    } yield isPresent
-  }
-
   def getGroupIdsFromUnauthorizedErrors(
       changes: ValidatedBatch[ChangeForValidation]
   ): BatchResult[Set[Group]] = {
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
index fd1eac402..233ac590c 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeValidations.scala
@@ -19,7 +19,7 @@ package vinyldns.api.domain.batch
 import java.net.InetAddress
 import cats.data._
 import cats.implicits._
-import vinyldns.api.config.{BatchChangeConfig, DottedHostsConfig, HighValueDomainConfig, ManualReviewConfig, ScheduledChangesConfig}
+import vinyldns.api.config.{BatchChangeConfig, HighValueDomainConfig, ManualReviewConfig, ScheduledChangesConfig}
 import vinyldns.api.domain.DomainValidations._
 import vinyldns.api.domain.access.AccessValidationsAlgebra
 import vinyldns.core.domain.auth.AuthPrincipal
@@ -45,14 +45,10 @@ trait BatchChangeValidationsAlgebra {
   ): ValidatedBatch[ChangeInput]
 
   def validateChangesWithContext(
-      groupedChanges: ChangeForValidationMap,
-      auth: AuthPrincipal,
-      isApproved: Boolean,
-      batchOwnerGroupId: Option[String],
-      zoneOrRecordDoesNotAlreadyExist: Boolean,
-      dottedHostZoneConfig: Set[String],
-      isUserAllowed: Boolean,
-      dottedHostsConfig: DottedHostsConfig
+    groupedChanges: ChangeForValidationMap,
+    auth: AuthPrincipal,
+    isApproved: Boolean,
+    batchOwnerGroupId: Option[String]
   ): ValidatedBatch[ChangeForValidation]
 
   def canGetBatchChange(
@@ -270,22 +266,18 @@ class BatchChangeValidations(
   /* context validations */
 
   def validateChangesWithContext(
-      groupedChanges: ChangeForValidationMap,
-      auth: AuthPrincipal,
-      isApproved: Boolean,
-      batchOwnerGroupId: Option[String],
-      zoneOrRecordDoesNotAlreadyExist: Boolean,
-      dottedHostZoneConfig: Set[String],
-      isUserAllowed: Boolean,
-      dottedHostsConfig: DottedHostsConfig
+    groupedChanges: ChangeForValidationMap,
+    auth: AuthPrincipal,
+    isApproved: Boolean,
+    batchOwnerGroupId: Option[String]
   ): ValidatedBatch[ChangeForValidation] =
-    // Updates are a combination of an add and delete for a record with the same name and type in a zone.
+  // Updates are a combination of an add and delete for a record with the same name and type in a zone.
     groupedChanges.changes.mapValid {
       case add: AddChangeForValidation
-          if groupedChanges
-            .getLogicalChangeType(add.recordKey)
-            .contains(LogicalChangeType.Add) =>
-        validateAddWithContext(add, groupedChanges, auth, isApproved, batchOwnerGroupId, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isUserAllowed, dottedHostsConfig)
+        if groupedChanges
+          .getLogicalChangeType(add.recordKey)
+          .contains(LogicalChangeType.Add) =>
+        validateAddWithContext(add, groupedChanges, auth, isApproved, batchOwnerGroupId)
       case addUpdate: AddChangeForValidation =>
         validateAddUpdateWithContext(addUpdate, groupedChanges, auth, isApproved, batchOwnerGroupId)
       // These cases MUST be below adds because:
@@ -300,30 +292,11 @@ class BatchChangeValidations(
         validateDeleteUpdateWithContext(deleteUpdate, groupedChanges, auth, isApproved)
     }
 
-  // Check if the new record set has dots and if so whether they are allowed or not
-  def newRecordSetDottedCheck(change: AddChangeForValidation, zoneOrRecordDoesNotAlreadyExist: Boolean, dottedHostZoneConfig: Set[String], isUserAllowed: Boolean, dottedHostsConfig: DottedHostsConfig): SingleValidation[Unit] = {
-
-    // Check if the zone of the record set is present in dotted hosts config list
-    val isDomainAllowed = dottedHostZoneConfig.contains(change.zone.name)
-
-    val isRecordTypeAllowed = dottedHostsConfig.allowedRecordType.contains(change.inputChange.typ.toString)
-
-    // Check if record set contains dot and if it is in zone which is allowed to have dotted records from dotted hosts config
-    if((change.recordName.contains(".") || !zoneOrRecordDoesNotAlreadyExist) && isDomainAllowed && isUserAllowed && isRecordTypeAllowed && change.recordName != change.zone.name) {
-      // If the user is not authorized or if there is a zone/record already present which conflicts with the new dotted record, throw an error
-      if (!zoneOrRecordDoesNotAlreadyExist || change.recordName == change.zone.name || !isUserAllowed)
-        DottedHostError(change.recordName, change.zone.name).invalidNel
-      else
-        ().validNel
-    }
-    else {
-      // If the recordset contains dot but is not in the allowed zones to create dotted records, throw an error
-      if (change.recordName != change.zone.name && change.recordName.contains("."))
-        ZoneDiscoveryError(change.inputChange.inputName).invalidNel
-      else
-        ().validNel
-    }
-  }
+  def newRecordSetIsNotDotted(change: AddChangeForValidation): SingleValidation[Unit] =
+    if (change.recordName != change.zone.name && change.recordName.contains("."))
+      ZoneDiscoveryError(change.inputChange.inputName).invalidNel
+    else
+      ().validNel
 
   def matchRecordData(existingRecordSetData: List[RecordData], recordData: RecordData): Boolean =
     existingRecordSetData.exists { rd =>
@@ -429,22 +402,18 @@ class BatchChangeValidations(
   }
 
   def validateAddWithContext(
-      change: AddChangeForValidation,
-      groupedChanges: ChangeForValidationMap,
-      auth: AuthPrincipal,
-      isApproved: Boolean,
-      ownerGroupId: Option[String],
-      zoneOrRecordDoesNotAlreadyExist: Boolean,
-      dottedHostZoneConfig: Set[String],
-      isUserAllowed: Boolean,
-      dottedHostsConfig: DottedHostsConfig
+    change: AddChangeForValidation,
+    groupedChanges: ChangeForValidationMap,
+    auth: AuthPrincipal,
+    isApproved: Boolean,
+    ownerGroupId: Option[String]
   ): SingleValidation[ChangeForValidation] = {
     val typedValidations = change.inputChange.typ match {
       case A | AAAA | MX =>
-        newRecordSetDottedCheck(change, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig: Set[String], isUserAllowed, dottedHostsConfig)
+        newRecordSetIsNotDotted(change)
       case CNAME =>
         cnameHasUniqueNameInBatch(change, groupedChanges) |+|
-          newRecordSetDottedCheck(change, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig: Set[String], isUserAllowed, dottedHostsConfig)
+          newRecordSetIsNotDotted(change)
       case TXT | PTR =>
         ().validNel
       case other =>
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 ef118e604..210d26937 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
@@ -28,7 +28,7 @@ import vinyldns.core.queue.MessageQueue
 import cats.data._
 import cats.effect.IO
 import org.xbill.DNS.ReverseMap
-import vinyldns.api.config.{DottedHostsConfig, HighValueDomainConfig}
+import vinyldns.api.config.{AuthConfigs, DottedHostsConfig, HighValueDomainConfig}
 import vinyldns.api.domain.DomainValidations.{validateIpv4Address, validateIpv6Address}
 import vinyldns.api.domain.access.AccessValidationsAlgebra
 import vinyldns.core.domain.record.NameSort.NameSort
@@ -110,20 +110,23 @@ class RecordSetService(
       ownerGroup <- getGroupIfProvided(rsForValidations.ownerGroupId)
       _ <- canUseOwnerGroup(rsForValidations.ownerGroupId, ownerGroup, auth).toResult
       _ <- noCnameWithNewName(rsForValidations, existingRecordsWithName, zone).toResult
-      allowedZoneList <- getAllowedZones(dottedHostsConfig.zoneList).toResult[Set[String]]
-      isInAllowedUsers = checkIfInAllowedUsers(dottedHostsConfig.allowedUserList, auth)
-      isUserInAllowedGroups <- checkIfInAllowedGroups(dottedHostsConfig.allowedGroupList, auth).toResult[Boolean]
+      authZones = dottedHostsConfig.authMethods.map {
+        case y:AuthConfigs => y.zone
+      }
+      allowedZoneList <- getAllowedZones(authZones).toResult[Set[String]]
+      isInAllowedUsers = checkIfInAllowedUsers(zone, dottedHostsConfig, auth)
+      isUserInAllowedGroups <- checkIfInAllowedGroups(zone, dottedHostsConfig, auth).toResult[Boolean]
       isAllowedUser = isInAllowedUsers || isUserInAllowedGroups
-      isRecordTypeAllowed = dottedHostsConfig.allowedRecordType.contains(rsForValidations.typ.toString)
+      isRecordTypeAllowed = checkIfInAllowedRecordType(zone, dottedHostsConfig, rsForValidations)
       isRecordTypeAndUserAllowed = isAllowedUser && isRecordTypeAllowed
-      zoneOrRecordDoesNotAlreadyExist <- recordFQDNDoesNotExist(rsForValidations, zone).toResult[Boolean]
+      recordFqdnDoesNotAlreadyExist <- recordFQDNDoesNotExist(rsForValidations, zone).toResult[Boolean]
       _ <- typeSpecificValidations(
         rsForValidations,
         existingRecordsWithName,
         zone,
         None,
         approvedNameServers,
-        zoneOrRecordDoesNotAlreadyExist,
+        recordFqdnDoesNotAlreadyExist,
         allowedZoneList,
         isRecordTypeAndUserAllowed
       ).toResult
@@ -156,20 +159,23 @@ class RecordSetService(
         validateRecordLookupAgainstDnsBackend
       )
       _ <- noCnameWithNewName(rsForValidations, existingRecordsWithName, zone).toResult
-      allowedZoneList <- getAllowedZones(dottedHostsConfig.zoneList).toResult[Set[String]]
-      isInAllowedUsers = checkIfInAllowedUsers(dottedHostsConfig.allowedUserList, auth)
-      isUserInAllowedGroups <- checkIfInAllowedGroups(dottedHostsConfig.allowedGroupList, auth).toResult[Boolean]
+      authZones = dottedHostsConfig.authMethods.map {
+        case y:AuthConfigs => y.zone
+      }
+      allowedZoneList <- getAllowedZones(authZones).toResult[Set[String]]
+      isInAllowedUsers = checkIfInAllowedUsers(zone, dottedHostsConfig, auth)
+      isUserInAllowedGroups <- checkIfInAllowedGroups(zone, dottedHostsConfig, auth).toResult[Boolean]
       isAllowedUser = isInAllowedUsers || isUserInAllowedGroups
-      isRecordTypeAllowed = dottedHostsConfig.allowedRecordType.contains(rsForValidations.typ.toString)
+      isRecordTypeAllowed = checkIfInAllowedRecordType(zone, dottedHostsConfig, rsForValidations)
       isRecordTypeAndUserAllowed = isAllowedUser && isRecordTypeAllowed
-      zoneOrRecordDoesNotAlreadyExist <- recordFQDNDoesNotExist(rsForValidations, zone).toResult[Boolean]
+      recordFqdnDoesNotAlreadyExist <- recordFQDNDoesNotExist(rsForValidations, zone).toResult[Boolean]
       _ <- typeSpecificValidations(
         rsForValidations,
         existingRecordsWithName,
         zone,
         Some(existing),
         approvedNameServers,
-        zoneOrRecordDoesNotAlreadyExist,
+        recordFqdnDoesNotAlreadyExist,
         allowedZoneList,
         isRecordTypeAndUserAllowed,
       ).toResult
@@ -223,7 +229,7 @@ class RecordSetService(
     }
     else {
       // Wildcard zones needs to be passed to a separate method
-      val wildcardZones = zones.filter(_.contains("*")).map(_.replace("*", ""))
+      val wildcardZones = zones.filter(_.contains("*")).map(_.replace("*", "%"))
       // Zones without wildcard character are passed to a separate function
       val namedZones = zones.filter(zone => !zone.contains("*"))
       for{
@@ -235,17 +241,87 @@ class RecordSetService(
   }
 
   // Check if user is allowed to create dotted hosts using the users present in dotted hosts config
-  def checkIfInAllowedUsers(users: List[String], auth: AuthPrincipal): Boolean = {
-    if(users.contains(auth.signedInUser.userName)){
-      true
+  def checkIfInAllowedUsers(zone: Zone, config: DottedHostsConfig, auth: AuthPrincipal): Boolean = {
+    val configZones = config.authMethods.map{
+      case x: AuthConfigs => x.zone
     }
-    else {
+    val zoneName = if(zone.name.takeRight(1) != ".") zone.name + "." else zone.name
+    val dottedZoneConfig = configZones.filter(_.contains("*")).map(_.replace("*", "[A-Za-z0-9.]*"))
+    val isContainWildcardZone = dottedZoneConfig.exists(x => zoneName.matches(x))
+    val isContainNormalZone = configZones.contains(zoneName)
+    if(isContainWildcardZone || isContainNormalZone){
+      val users = config.authMethods.flatMap {
+        case x: AuthConfigs => if (x.zone.contains("*")) {
+          val wildcardZone = x.zone.replace("*", "[A-Za-z0-9.]*")
+          if(zoneName.matches(wildcardZone)) x.allowedUserList else List.empty
+        } else {
+          if (x.zone == zoneName) x.allowedUserList else List.empty
+        }
+      }
+      if(users.contains(auth.signedInUser.userName)){
+        true
+      }
+      else {
+        false
+      }
+    }
+    else{
+      false
+    }
+  }
+
+  // Check if user is allowed to create dotted hosts using the users present in dotted hosts config
+  def checkIfInAllowedRecordType(zone: Zone, config: DottedHostsConfig, rs: RecordSet): Boolean = {
+    val configZones = config.authMethods.map{
+      case x: AuthConfigs => x.zone
+    }
+    val zoneName = if(zone.name.takeRight(1) != ".") zone.name + "." else zone.name
+    val dottedZoneConfig = configZones.filter(_.contains("*")).map(_.replace("*", "[A-Za-z0-9.]*"))
+    val isContainWildcardZone = dottedZoneConfig.exists(x => zoneName.matches(x))
+    val isContainNormalZone = configZones.contains(zoneName)
+    if(isContainWildcardZone || isContainNormalZone){
+      val rType = config.authMethods.flatMap {
+        case x: AuthConfigs => if (x.zone.contains("*")) {
+          val wildcardZone = x.zone.replace("*", "[A-Za-z0-9.]*")
+          if(zoneName.matches(wildcardZone)) x.allowedRecordType else List.empty
+        } else {
+          if (x.zone == zoneName) x.allowedRecordType else List.empty
+        }
+      }
+      if(rType.contains(rs.typ.toString)){
+        true
+      }
+      else {
+        false
+      }
+    }
+    else{
       false
     }
   }
 
   // Check if user is allowed to create dotted hosts using the groups present in dotted hosts config
-  def checkIfInAllowedGroups(groups: List[String], auth: AuthPrincipal): IO[Boolean] = {
+  def checkIfInAllowedGroups(zone: Zone, config: DottedHostsConfig, auth: AuthPrincipal): IO[Boolean] = {
+    val configZones = config.authMethods.map{
+      case x: AuthConfigs => x.zone
+    }
+    val zoneName = if(zone.name.takeRight(1) != ".") zone.name + "." else zone.name
+    val dottedZoneConfig = configZones.filter(_.contains("*")).map(_.replace("*", "[A-Za-z0-9.]*"))
+    val isContainWildcardZone = dottedZoneConfig.exists(x => zoneName.matches(x))
+    val isContainNormalZone = configZones.contains(zoneName)
+    val groups = if(isContainWildcardZone || isContainNormalZone){
+      config.authMethods.flatMap {
+        case x: AuthConfigs => if (x.zone.contains("*")) {
+          val wildcardZone = x.zone.replace("*", "[A-Za-z0-9.]*")
+          if(zoneName.matches(wildcardZone)) x.allowedGroupList else List.empty
+        } else {
+          if (x.zone == zoneName) x.allowedGroupList else List.empty
+        }
+      }
+    }
+    else {
+      List.empty
+    }
     for{
       groupsInConfig <- groupRepository.getGroupsByName(groups.toSet)
       members = groupsInConfig.flatMap(x => x.memberIds)
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 1fe942aa0..1d7c3a427 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
@@ -95,17 +95,17 @@ object RecordSetValidations {
       newRecordSet: RecordSet,
       zone: Zone,
       existingRecordSet: Option[RecordSet] = None,
-      zoneOrRecordDoesNotAlreadyExist: Boolean,
+      recordFqdnDoesNotExist: Boolean,
       dottedHostZoneConfig: Set[String],
       isRecordTypeAndUserAllowed: Boolean
   ): Either[Throwable, Unit] = {
 
+    val zoneName = if(zone.name.takeRight(1) != ".") zone.name + "." else zone.name
     // Check if the zone of the record set is present in dotted hosts config list
-    val isDomainAllowed = dottedHostZoneConfig.contains(zone.name)
-
+    val isDomainAllowed = dottedHostZoneConfig.contains(zoneName)
     // Check if record set contains dot and if it is in zone which is allowed to have dotted records from dotted hosts config
-    if((newRecordSet.name.contains(".") || !zoneOrRecordDoesNotAlreadyExist) && isDomainAllowed && isRecordTypeAndUserAllowed && newRecordSet.name != zone.name) {
-      isDotted(newRecordSet, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, isRecordTypeAndUserAllowed)
+    if((newRecordSet.name.contains(".") || !recordFqdnDoesNotExist) && isDomainAllowed && isRecordTypeAndUserAllowed && newRecordSet.name != zone.name) {
+      isDotted(newRecordSet, zone, existingRecordSet, recordFqdnDoesNotExist, isRecordTypeAndUserAllowed)
     }
     else {
       isNotDotted(newRecordSet, zone, existingRecordSet)
@@ -117,7 +117,7 @@ object RecordSetValidations {
      newRecordSet: RecordSet,
      zone: Zone,
      existingRecordSet: Option[RecordSet] = None,
-     zoneOrRecordDoesNotAlreadyExist: Boolean,
+     recordFqdnDoesNotExist: Boolean,
      isRecordTypeAndUserAllowed: Boolean
   ): Either[Throwable, Unit] =
     ensuring(
@@ -126,7 +126,7 @@ object RecordSetValidations {
           s"Please check if user has permission or if there's a zone/record that already exist and make the change there."
       )
     )(
-      (newRecordSet.name != zone.name || existingRecordSet.exists(_.name == newRecordSet.name)) && zoneOrRecordDoesNotAlreadyExist && isRecordTypeAndUserAllowed
+      (newRecordSet.name != zone.name || existingRecordSet.exists(_.name == newRecordSet.name)) && recordFqdnDoesNotExist && isRecordTypeAndUserAllowed
     )
 
   // Check if the recordset contains dot but is not in the allowed zones to create dotted records. If so, throw an error
@@ -151,18 +151,18 @@ object RecordSetValidations {
       zone: Zone,
       existingRecordSet: Option[RecordSet],
       approvedNameServers: List[Regex],
-      zoneOrRecordDoesNotAlreadyExist: Boolean = true,
+      recordFqdnDoesNotExist: Boolean = true,
       dottedHostZoneConfig: Set[String],
       isRecordTypeAndUserAllowed: Boolean
   ): Either[Throwable, Unit] =
     newRecordSet.typ match {
-      case CNAME => cnameValidations(newRecordSet, existingRecordsWithName, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
-      case NS => nsValidations(newRecordSet, zone, existingRecordSet, approvedNameServers, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
-      case SOA => soaValidations(newRecordSet, zone, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
+      case CNAME => cnameValidations(newRecordSet, existingRecordsWithName, zone, existingRecordSet, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
+      case NS => nsValidations(newRecordSet, zone, existingRecordSet, approvedNameServers, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
+      case SOA => soaValidations(newRecordSet, zone, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
       case PTR => ptrValidations(newRecordSet, zone)
       case SRV | TXT | NAPTR => ().asRight // SRV, TXT and NAPTR do not go through dotted host check
-      case DS => dsValidations(newRecordSet, existingRecordsWithName, zone, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
-      case _ => checkForDot(newRecordSet, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
+      case DS => dsValidations(newRecordSet, existingRecordsWithName, zone, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
+      case _ => checkForDot(newRecordSet, zone, existingRecordSet, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
     }
 
   def typeSpecificDeleteValidations(recordSet: RecordSet, zone: Zone): Either[Throwable, Unit] =
@@ -184,7 +184,7 @@ object RecordSetValidations {
       existingRecordsWithName: List[RecordSet],
       zone: Zone,
       existingRecordSet: Option[RecordSet] = None,
-      zoneOrRecordDoesNotAlreadyExist: Boolean,
+      recordFqdnDoesNotExist: Boolean,
       dottedHostZoneConfig: Set[String],
       isRecordTypeAndUserAllowed: Boolean
   ): Either[Throwable, Unit] = {
@@ -219,7 +219,7 @@ object RecordSetValidations {
       )
       _ <- noRecordWithName
       _ <- RDataWithConsecutiveDots
-      _ <- checkForDot(newRecordSet, zone, existingRecordSet, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
+      _ <- checkForDot(newRecordSet, zone, existingRecordSet, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
     } yield ()
 
   }
@@ -228,7 +228,7 @@ object RecordSetValidations {
       newRecordSet: RecordSet,
       existingRecordsWithName: List[RecordSet],
       zone: Zone,
-      zoneOrRecordDoesNotAlreadyExist: Boolean,
+      recordFqdnDoesNotExist: Boolean,
       dottedHostZoneConfig: Set[String],
       isRecordTypeAndUserAllowed: Boolean
   ): Either[Throwable, Unit] = {
@@ -243,7 +243,7 @@ object RecordSetValidations {
     }
 
     for {
-      _ <- checkForDot(newRecordSet, zone, None, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
+      _ <- checkForDot(newRecordSet, zone, None, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
       _ <- isNotOrigin(
         newRecordSet,
         zone,
@@ -258,12 +258,12 @@ object RecordSetValidations {
       zone: Zone,
       oldRecordSet: Option[RecordSet],
       approvedNameServers: List[Regex],
-      zoneOrRecordDoesNotAlreadyExist: Boolean,
+      recordFqdnDoesNotExist: Boolean,
       dottedHostZoneConfig: Set[String],
       isRecordTypeAndUserAllowed: Boolean
   ): Either[Throwable, Unit] = {
     // TODO kept consistency with old validation. Not sure why NS could be dotted in reverse specifically
-    val isNotDottedHost = if (!zone.isReverse) checkForDot(newRecordSet, zone, None, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed) else ().asRight
+    val isNotDottedHost = if (!zone.isReverse) checkForDot(newRecordSet, zone, None, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed) else ().asRight
 
     for {
       _ <- isNotDottedHost
@@ -285,9 +285,9 @@ object RecordSetValidations {
     } yield ()
   }
 
-  def soaValidations(newRecordSet: RecordSet, zone: Zone, zoneOrRecordDoesNotAlreadyExist: Boolean, dottedHostZoneConfig: Set[String], isRecordTypeAndUserAllowed: Boolean): Either[Throwable, Unit] =
+  def soaValidations(newRecordSet: RecordSet, zone: Zone, recordFqdnDoesNotExist: Boolean, dottedHostZoneConfig: Set[String], isRecordTypeAndUserAllowed: Boolean): Either[Throwable, Unit] =
     // TODO kept consistency with old validation. in theory if SOA always == zone name, no special case is needed here
-    if (!zone.isReverse) checkForDot(newRecordSet, zone, None, zoneOrRecordDoesNotAlreadyExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed) else ().asRight
+    if (!zone.isReverse) checkForDot(newRecordSet, zone, None, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed) else ().asRight
 
   def ptrValidations(newRecordSet: RecordSet, zone: Zone): Either[Throwable, Unit] =
     // TODO we don't check for PTR as dotted...not sure why
diff --git a/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala b/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala
index 70ec98f27..24f0ae8c4 100644
--- a/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala
+++ b/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala
@@ -18,7 +18,7 @@ package vinyldns.api
 
 import com.comcast.ip4s.IpAddress
 import org.joda.time.DateTime
-import vinyldns.api.config.{BatchChangeConfig, DottedHostsConfig, HighValueDomainConfig, LimitsConfig, ManualReviewConfig, ScheduledChangesConfig}
+import vinyldns.api.config.{AuthConfigs, BatchChangeConfig, DottedHostsConfig, HighValueDomainConfig, LimitsConfig, ManualReviewConfig, ScheduledChangesConfig}
 import vinyldns.api.domain.batch.V6DiscoveryNibbleBoundaries
 import vinyldns.core.domain.record._
 import vinyldns.core.domain.zone._
@@ -40,7 +40,7 @@ trait VinylDNSTestHelpers {
 
   val approvedNameServers: List[Regex] = List(new Regex("some.test.ns."))
 
-  val dottedHostsConfig: DottedHostsConfig = DottedHostsConfig(List("dotted.xyz"), List("super"), List("dummy"), List("CNAME"))
+  val dottedHostsConfig: DottedHostsConfig = DottedHostsConfig(List(AuthConfigs("dotted.xyz.",List("xyz"),List("dummy"),List("CNAME")), AuthConfigs("abc.zone.recordsets.",List("locked"),List("dummy"),List("CNAME")), AuthConfigs("xyz.",List("super"),List("xyz"),List("CNAME"))))
 
   val defaultTtl: Long = 7200
 
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeServiceSpec.scala
index d80caee54..ffc29190e 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeServiceSpec.scala
@@ -55,7 +55,7 @@ import vinyldns.api.domain.access.AccessValidations
 import scala.concurrent.ExecutionContext
 
 class BatchChangeServiceSpec
-    extends AnyWordSpec
+  extends AnyWordSpec
     with Matchers
     with MockitoSugar
     with CatsHelpers
@@ -418,8 +418,7 @@ class BatchChangeServiceSpec
     mockNotifiers,
     false,
     defaultv6Discovery,
-    7200L,
-    VinylDNSTestHelpers.dottedHostsConfig
+    7200L
   )
 
   private val underTestManualEnabled = new BatchChangeService(
@@ -435,8 +434,7 @@ class BatchChangeServiceSpec
     mockNotifiers,
     false,
     defaultv6Discovery,
-    7200L,
-    VinylDNSTestHelpers.dottedHostsConfig
+    7200L
   )
 
   private val underTestScheduledEnabled = new BatchChangeService(
@@ -452,8 +450,7 @@ class BatchChangeServiceSpec
     mockNotifiers,
     true,
     defaultv6Discovery,
-    7200L,
-    VinylDNSTestHelpers.dottedHostsConfig
+    7200L
   )
 
   "applyBatchChange" should {
@@ -479,8 +476,7 @@ class BatchChangeServiceSpec
         mockNotifiers,
         false,
         new V6DiscoveryNibbleBoundaries(16, 17),
-        7200L,
-        VinylDNSTestHelpers.dottedHostsConfig
+        7200L
       )
       val ptr = AddChangeInput(
         "2001:0000:0000:0001:0000:ff00:0042:8329",
@@ -511,8 +507,7 @@ class BatchChangeServiceSpec
         mockNotifiers,
         false,
         new V6DiscoveryNibbleBoundaries(16, 16),
-        7200L,
-        VinylDNSTestHelpers.dottedHostsConfig
+        7200L
       )
       val ptr = AddChangeInput(
         "2001:0000:0000:0001:0000:ff00:0042:8329",
@@ -1182,8 +1177,7 @@ class BatchChangeServiceSpec
         mockNotifiers,
         false,
         defaultv6Discovery,
-        7200L,
-        VinylDNSTestHelpers.dottedHostsConfig
+        7200L
       )
 
       val ip = "2001:0db8:0000:0000:0000:ff00:0042:8329"
@@ -1224,8 +1218,7 @@ class BatchChangeServiceSpec
         mockNotifiers,
         false,
         new V6DiscoveryNibbleBoundaries(16, 16),
-        7200L,
-        VinylDNSTestHelpers.dottedHostsConfig
+        7200L
       )
 
       val ip = "2001:0db8:0000:0000:0000:ff00:0042:8329"
@@ -1251,8 +1244,7 @@ class BatchChangeServiceSpec
         mockNotifiers,
         false,
         defaultv6Discovery,
-        7200L,
-        VinylDNSTestHelpers.dottedHostsConfig
+        7200L
       )
 
       val ip1 = "::1"
@@ -2566,4 +2558,4 @@ class BatchChangeServiceSpec
       )
     }
   }
-}
+}
\ No newline at end of file
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
index 43bad4d9f..72d48401c 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeValidationsSpec.scala
@@ -41,7 +41,7 @@ import vinyldns.core.domain.zone.{ACLRule, AccessLevel, Zone, ZoneStatus}
 import scala.util.Random
 
 class BatchChangeValidationsSpec
-    extends AnyPropSpec
+  extends AnyPropSpec
     with Matchers
     with ScalaCheckDrivenPropertyChecks
     with EitherMatchers
@@ -192,9 +192,9 @@ class BatchChangeValidationsSpec
   )
 
   private def makeAddUpdateRecord(
-      recordName: String,
-      aData: AData = AData("1.2.3.4")
-  ): AddChangeForValidation =
+                                   recordName: String,
+                                   aData: AData = AData("1.2.3.4")
+                                 ): AddChangeForValidation =
     AddChangeForValidation(
       okZone,
       s"$recordName",
@@ -203,9 +203,9 @@ class BatchChangeValidationsSpec
     )
 
   private def makeDeleteUpdateDeleteRRSet(
-      recordName: String,
-      recordData: Option[RecordData] = None
-  ): DeleteRRSetChangeForValidation =
+                                           recordName: String,
+                                           recordData: Option[RecordData] = None
+                                         ): DeleteRRSetChangeForValidation =
     DeleteRRSetChangeForValidation(
       okZone,
       s"$recordName",
@@ -666,7 +666,7 @@ class BatchChangeValidationsSpec
   }
 
   property("""validateAddChangeInput: should fail with InvalidIpv4Address
-      |if validateRecordData fails for an invalid ipv4 address""".stripMargin) {
+             |if validateRecordData fails for an invalid ipv4 address""".stripMargin) {
     val invalidIpv4 = "invalidIpv4:123"
     val change = AddChangeInput("test.comcast.com.", RecordType.A, ttl, AData(invalidIpv4))
     val result = validateAddChangeInput(change, false)
@@ -819,11 +819,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) shouldBe valid
@@ -888,11 +884,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result.foreach(_ shouldBe valid)
@@ -932,11 +924,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result.foreach(_ shouldBe valid)
@@ -963,11 +951,7 @@ class BatchChangeValidationsSpec
       ),
       notAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) shouldBe valid
@@ -998,11 +982,7 @@ class BatchChangeValidationsSpec
       ),
       notAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1042,11 +1022,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) shouldBe valid
@@ -1069,7 +1045,7 @@ class BatchChangeValidationsSpec
 
   property(
     """validateChangesWithContext: should succeed for update in shared zone if user belongs to record
-             | owner group""".stripMargin
+      | owner group""".stripMargin
   ) {
     val existingRecord =
       sharedZoneRecord.copy(
@@ -1096,11 +1072,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) shouldBe valid
@@ -1108,7 +1080,7 @@ class BatchChangeValidationsSpec
   }
 
   property("""validateChangesWithContext: should succeed adding a record
-      |if an existing CNAME with the same name exists but is being deleted""".stripMargin) {
+             |if an existing CNAME with the same name exists but is being deleted""".stripMargin) {
     val existingCname = rsOk.copy(name = "deleteRRSet", typ = RecordType.CNAME)
     val existingCname2 =
       existingCname.copy(name = "deleteRecord", records = List(CNAMEData(Fqdn("cname.data."))))
@@ -1138,11 +1110,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result.foreach(_ shouldBe valid)
@@ -1165,11 +1133,7 @@ class BatchChangeValidationsSpec
           ChangeForValidationMap(List(input.validNel), ExistingRecordSets(newRecordSetList)),
           okAuth,
           false,
-          None,
-          true,
-          VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-          false,
-          VinylDNSTestHelpers.dottedHostsConfig
+          None
         )
 
         result(0) should haveInvalid[DomainValidationError](
@@ -1186,11 +1150,7 @@ class BatchChangeValidationsSpec
           ChangeForValidationMap(List(input.validNel), ExistingRecordSets(recordSetList)),
           okAuth,
           false,
-          None,
-          true,
-          VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-          false,
-          VinylDNSTestHelpers.dottedHostsConfig
+          None
         )
 
       result(0) shouldBe valid
@@ -1206,11 +1166,7 @@ class BatchChangeValidationsSpec
           ChangeForValidationMap(List(input.validNel), ExistingRecordSets(recordSetList)),
           okAuth,
           false,
-          None,
-          true,
-          VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-          false,
-          VinylDNSTestHelpers.dottedHostsConfig
+          None
         )
         result(0) shouldBe valid
       }
@@ -1229,11 +1185,7 @@ class BatchChangeValidationsSpec
         ChangeForValidationMap(List(input.validNel), ExistingRecordSets(existingRecordSetList)),
         okAuth,
         false,
-        None,
-        true,
-        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-        false,
-        VinylDNSTestHelpers.dottedHostsConfig
+        None
       )
 
       result(0) should haveInvalid[DomainValidationError](
@@ -1265,11 +1217,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) shouldBe valid
@@ -1277,7 +1225,7 @@ class BatchChangeValidationsSpec
   }
 
   property("""validateChangesWithContext: should fail with CnameIsNotUniqueError
-      |if CNAME record name already exists""".stripMargin) {
+             |if CNAME record name already exists""".stripMargin) {
     val addCname = AddChangeForValidation(
       validZone,
       "existingCname",
@@ -1290,11 +1238,7 @@ class BatchChangeValidationsSpec
       ChangeForValidationMap(List(addCname.validNel), ExistingRecordSets(newRecordSetList)),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1303,7 +1247,7 @@ class BatchChangeValidationsSpec
   }
 
   property("""validateChangesWithContext: should succeed for CNAME record
-      |if there's a duplicate PTR ipv4 record that is being deleted""".stripMargin) {
+             |if there's a duplicate PTR ipv4 record that is being deleted""".stripMargin) {
     val addCname = AddChangeForValidation(
       validIp4ReverseZone,
       "30",
@@ -1323,11 +1267,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) shouldBe valid
@@ -1335,7 +1275,7 @@ class BatchChangeValidationsSpec
   }
 
   property("""validateChangesWithContext: should fail with CnameIsNotUniqueError for CNAME record
-      |if there's a duplicate PTR ipv6 record""".stripMargin) {
+             |if there's a duplicate PTR ipv6 record""".stripMargin) {
     val addCname = AddChangeForValidation(
       validZone,
       "0.6.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0",
@@ -1352,11 +1292,7 @@ class BatchChangeValidationsSpec
       ChangeForValidationMap(List(addCname.validNel), ExistingRecordSets(List(existingRecordPTR))),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1365,7 +1301,7 @@ class BatchChangeValidationsSpec
   }
 
   property("""validateChangesWithContext: CNAME record should pass
-      |if no other changes in batch change have same record name""".stripMargin) {
+             |if no other changes in batch change have same record name""".stripMargin) {
     val addA = AddChangeForValidation(
       okZone,
       "test",
@@ -1391,11 +1327,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) shouldBe valid
@@ -1404,7 +1336,7 @@ class BatchChangeValidationsSpec
   }
 
   property("""validateChangesWithContext: CNAME record should fail
-      |if another add change in batch change has the same record name""".stripMargin) {
+             |if another add change in batch change has the same record name""".stripMargin) {
     val addA = AddChangeForValidation(
       okZone,
       "test",
@@ -1430,11 +1362,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) shouldBe valid
@@ -1448,7 +1376,7 @@ class BatchChangeValidationsSpec
   }
 
   property("""validateChangesWithContext: both CNAME records should fail
-      |if there are duplicate CNAME add change inputs""".stripMargin) {
+             |if there are duplicate CNAME add change inputs""".stripMargin) {
     val addA = AddChangeForValidation(
       okZone,
       "test",
@@ -1474,11 +1402,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) shouldBe valid
@@ -1494,7 +1418,7 @@ class BatchChangeValidationsSpec
   }
 
   property("""validateChangesWithContext: both PTR records should succeed
-      |if there are duplicate PTR add change inputs""".stripMargin) {
+             |if there are duplicate PTR add change inputs""".stripMargin) {
     val addA = AddChangeForValidation(
       okZone,
       "test",
@@ -1520,18 +1444,14 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result.map(_ shouldBe valid)
   }
 
   property("""validateChangesWithContext: should succeed for AddChangeForValidation
-      |if user has group admin access""".stripMargin) {
+             |if user has group admin access""".stripMargin) {
     val addA = AddChangeForValidation(
       validZone,
       "valid",
@@ -1543,11 +1463,7 @@ class BatchChangeValidationsSpec
         ChangeForValidationMap(List(addA.validNel), ExistingRecordSets(recordSetList)),
         okAuth,
         false,
-        None,
-        true,
-        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-        false,
-        VinylDNSTestHelpers.dottedHostsConfig
+        None
       )
 
     result(0) shouldBe valid
@@ -1566,11 +1482,7 @@ class BatchChangeValidationsSpec
       ChangeForValidationMap(List(addA.validNel), ExistingRecordSets(recordSetList)),
       AuthPrincipal(superUser, Seq.empty),
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1597,11 +1509,7 @@ class BatchChangeValidationsSpec
         ChangeForValidationMap(List(addA.validNel), ExistingRecordSets(recordSetList)),
         notAuth,
         false,
-        None,
-        true,
-        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-        false,
-        VinylDNSTestHelpers.dottedHostsConfig
+        None
       )
 
     result(0) shouldBe valid
@@ -1617,11 +1525,7 @@ class BatchChangeValidationsSpec
           ChangeForValidationMap(List(input.validNel), ExistingRecordSets(recordSetList)),
           notAuth,
           false,
-          None,
-          true,
-          VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-          false,
-          VinylDNSTestHelpers.dottedHostsConfig
+          None
         )
 
       result(0) should haveInvalid[DomainValidationError](
@@ -1636,7 +1540,7 @@ class BatchChangeValidationsSpec
   }
 
   property("""validateChangesWithContext: should fail with RecordNameNotUniqueInBatch for PTR record
-      |if valid CNAME with same name exists in batch""".stripMargin) {
+             |if valid CNAME with same name exists in batch""".stripMargin) {
     val addCname = AddChangeForValidation(
       validZone,
       "existing",
@@ -1653,11 +1557,7 @@ class BatchChangeValidationsSpec
       ChangeForValidationMap(List(addCname.validNel, addPtr.validNel), ExistingRecordSets(List())),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1682,11 +1582,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) shouldBe valid
@@ -1707,11 +1603,7 @@ class BatchChangeValidationsSpec
         ),
         okAuth,
         false,
-        None,
-        true,
-        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-        false,
-        VinylDNSTestHelpers.dottedHostsConfig
+        None
       )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1723,7 +1615,7 @@ class BatchChangeValidationsSpec
   }
 
   property("""validateChangesWithContext: should succeed for DeleteChangeForValidation
-      |if record set status is Active""".stripMargin) {
+             |if record set status is Active""".stripMargin) {
     val deleteA = DeleteRRSetChangeForValidation(
       validZone,
       "Active-record-status",
@@ -1741,18 +1633,14 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) shouldBe valid
   }
 
   property("""validateChangesWithContext: should succeed for DeleteChangeForValidation
-      |if user has group admin access"""".stripMargin) {
+             |if user has group admin access"""".stripMargin) {
     val deleteA =
       DeleteRRSetChangeForValidation(
         validZone,
@@ -1767,18 +1655,14 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) shouldBe valid
   }
 
   property(""" validateChangesWithContext: should fail for DeleteChangeForValidation
-      | if user is superUser with no other access""".stripMargin) {
+             | if user is superUser with no other access""".stripMargin) {
     val deleteA =
       DeleteRRSetChangeForValidation(
         validZone,
@@ -1793,11 +1677,7 @@ class BatchChangeValidationsSpec
       ),
       AuthPrincipal(superUser, Seq.empty),
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1828,11 +1708,7 @@ class BatchChangeValidationsSpec
       ),
       notAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) shouldBe valid
@@ -1855,11 +1731,7 @@ class BatchChangeValidationsSpec
       ),
       notAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) should haveInvalid[DomainValidationError](
@@ -1873,7 +1745,7 @@ class BatchChangeValidationsSpec
   }
 
   property("""validateChangesWithContext: should properly process batch that contains
-      |a CNAME and different type record with the same name""".stripMargin) {
+             |a CNAME and different type record with the same name""".stripMargin) {
     val addDuplicateA = AddChangeForValidation(
       okZone,
       "test",
@@ -1927,11 +1799,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) shouldBe valid
@@ -1980,11 +1848,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
     result.map(_ shouldBe valid)
   }
@@ -2027,11 +1891,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
     result.map(_ shouldBe valid)
   }
@@ -2061,11 +1921,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
     result.map(_ shouldBe valid)
   }
@@ -2103,11 +1959,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) shouldBe valid
@@ -2146,11 +1998,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
     result.map(_ shouldBe valid)
   }
@@ -2183,11 +2031,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
     result.map(_ shouldBe valid)
   }
@@ -2225,11 +2069,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result.map(_ shouldBe valid)
@@ -2343,11 +2183,7 @@ class BatchChangeValidationsSpec
         ChangeForValidationMap(List(addMX.validNel), ExistingRecordSets(List(existingMX))),
         okAuth,
         false,
-        None,
-        true,
-        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-        false,
-        VinylDNSTestHelpers.dottedHostsConfig
+        None
       )
     result(0) should haveInvalid[DomainValidationError](RecordAlreadyExists("name-conflict."))
   }
@@ -2370,11 +2206,7 @@ class BatchChangeValidationsSpec
       ChangeForValidationMap(List(addMx.validNel, addMx2.validNel), ExistingRecordSets(List())),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
     result(0) shouldBe valid
   }
@@ -2405,11 +2237,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
     result(0) shouldBe valid
   }
@@ -2438,11 +2266,7 @@ class BatchChangeValidationsSpec
       ),
       AuthPrincipal(okUser, Seq(abcGroup.id, okGroup.id)),
       false,
-      Some("some-owner-group-id"),
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      Some("some-owner-group-id")
     )
 
     result.foreach(_ shouldBe valid)
@@ -2472,11 +2296,7 @@ class BatchChangeValidationsSpec
       ),
       AuthPrincipal(okUser, Seq(abcGroup.id, okGroup.id)),
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) shouldBe valid
@@ -2505,11 +2325,7 @@ class BatchChangeValidationsSpec
       ),
       dummyAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) should
@@ -2533,11 +2349,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) shouldBe valid
@@ -2551,11 +2363,7 @@ class BatchChangeValidationsSpec
       ),
       sharedAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) shouldBe valid
@@ -2589,11 +2397,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      Some(okGroup.id),
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      Some(okGroup.id)
     )
 
     result(0) shouldBe valid
@@ -2638,11 +2442,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      Some(okGroup.id),
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      Some(okGroup.id)
     )
 
     result(0) shouldBe valid
@@ -2656,7 +2456,7 @@ class BatchChangeValidationsSpec
 
   property(
     """validateChangesWithContext: should fail validateAddWithContext with
-             |ZoneDiscoveryError if new record is dotted host but not a TXT record type""".stripMargin
+      |ZoneDiscoveryError if new record is dotted host but not a TXT record type""".stripMargin
   ) {
     val addA = AddChangeForValidation(
       okZone,
@@ -2701,11 +2501,7 @@ class BatchChangeValidationsSpec
         ),
         okAuth,
         false,
-        None,
-        true,
-        VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-        false,
-        VinylDNSTestHelpers.dottedHostsConfig
+        None
       )
 
     result(0) should haveInvalid[DomainValidationError](ZoneDiscoveryError("dotted.a.ok."))
@@ -2759,11 +2555,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) shouldBe valid
@@ -2865,11 +2657,7 @@ class BatchChangeValidationsSpec
       ),
       okAuth,
       false,
-      None,
-      true,
-      VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
-      false,
-      VinylDNSTestHelpers.dottedHostsConfig
+      None
     )
 
     result(0) shouldBe valid
@@ -2878,4 +2666,4 @@ class BatchChangeValidationsSpec
     result(3) shouldBe valid
     result(4) shouldBe valid
   }
-}
+}
\ No newline at end of file
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
index 63ee4ccf0..7174a2c72 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
@@ -24,6 +24,7 @@ import org.scalatestplus.mockito.MockitoSugar
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 import org.scalatest.BeforeAndAfterEach
+import vinyldns.api.config.{AuthConfigs, DottedHostsConfig}
 import vinyldns.api.{ResultHelpers, VinylDNSTestHelpers}
 import vinyldns.api.domain.access.AccessValidations
 import vinyldns.api.domain.record.RecordSetHelpers._
@@ -107,6 +108,36 @@ class RecordSetServiceSpec
     true
   )
 
+  def getDottedHostsConfigGroupsAllowed(zone: Zone, config: DottedHostsConfig): List[String] = {
+    val configZones = config.authMethods.map {
+      case x: AuthConfigs => x.zone
+    }
+    val zoneName = if(zone.name.takeRight(1) != ".") zone.name + "." else zone.name
+    val dottedZoneConfig = configZones.filter(_.contains("*")).map(_.replace("*", "[A-Za-z.]*"))
+    val isContainWildcardZone = dottedZoneConfig.exists(x => zoneName.substring(0, zoneName.length - 1).matches(x))
+    val isContainNormalZone = configZones.contains(zoneName)
+    val groups = if (isContainWildcardZone || isContainNormalZone) {
+      config.authMethods.flatMap {
+        case x: AuthConfigs => if (x.zone.contains("*")) {
+          val wildcardZone = x.zone.replace("*", "[A-Za-z.]*")
+          if (zoneName.substring(0, zoneName.length - 1).matches(wildcardZone)) x.allowedGroupList else List.empty
+        } else {
+          if (x.zone == zoneName) x.allowedGroupList else List.empty
+        }
+      }
+    }
+    else {
+      List.empty
+    }
+    groups
+  }
+
+  val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authMethods.map {
+    case y:AuthConfigs => y.zone
+  }
+
+  val dottedHostsConfigGroupsAllowed: List[String] = getDottedHostsConfigGroupsAllowed(okZone, VinylDNSTestHelpers.dottedHostsConfig)
+
   "addRecordSet" should {
     "return the recordSet change as the result" in {
       val record = aaaa.copy(zoneId = okZone.id)
@@ -119,7 +150,7 @@ class RecordSetServiceSpec
         .getRecordSetsByName(okZone.id, record.name)
       doReturn(IO.pure(Set(dottedZone)))
         .when(mockZoneRepo)
-        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+        .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(Set.empty)
@@ -134,7 +165,7 @@ class RecordSetServiceSpec
         .getZonesByFilters(Set.empty)
       doReturn(IO.pure(Set()))
         .when(mockGroupRepo)
-        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+        .getGroupsByName(dottedHostsConfigGroupsAllowed.toSet)
       doReturn(IO.pure(ListUsersResults(Seq(), None)))
         .when(mockUserRepo)
         .getUsers(Set.empty, None, None)
@@ -189,7 +220,7 @@ class RecordSetServiceSpec
         .getRecordSetsByName(okZone.id, record.name)
       doReturn(IO.pure(Set(dottedZone)))
         .when(mockZoneRepo)
-        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+        .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(Set.empty)
@@ -204,7 +235,7 @@ class RecordSetServiceSpec
         .getZonesByFilters(record.name.split('.').map(x => x + "." + okZone.name).toSet)
       doReturn(IO.pure(Set()))
         .when(mockGroupRepo)
-        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+        .getGroupsByName(dottedHostsConfigGroupsAllowed.toSet)
       doReturn(IO.pure(ListUsersResults(Seq(), None)))
         .when(mockUserRepo)
         .getUsers(Set.empty, None, None)
@@ -224,7 +255,7 @@ class RecordSetServiceSpec
         .getRecordSetsByName(okZone.id, record.name)
       doReturn(IO.pure(Set(dottedZone)))
         .when(mockZoneRepo)
-        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+        .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(Set.empty)
@@ -239,7 +270,7 @@ class RecordSetServiceSpec
         .getZonesByFilters(record.name.split('.').map(x => x + "." + okZone.name).toSet)
       doReturn(IO.pure(Set()))
         .when(mockGroupRepo)
-        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+        .getGroupsByName(dottedHostsConfigGroupsAllowed.toSet)
       doReturn(IO.pure(ListUsersResults(Seq(), None)))
         .when(mockUserRepo)
         .getUsers(Set.empty, None, None)
@@ -270,7 +301,7 @@ class RecordSetServiceSpec
         .getRecordSetsByName(okZone.id, record.name)
       doReturn(IO.pure(Set(dottedZone)))
         .when(mockZoneRepo)
-        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+        .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(Set.empty)
@@ -285,7 +316,7 @@ class RecordSetServiceSpec
         .getZonesByFilters(record.name.split('.').map(x => x + "." + okZone.name).toSet)
       doReturn(IO.pure(Set()))
         .when(mockGroupRepo)
-        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+        .getGroupsByName(dottedHostsConfigGroupsAllowed.toSet)
       doReturn(IO.pure(ListUsersResults(Seq(), None)))
         .when(mockUserRepo)
         .getUsers(Set.empty, None, None)
@@ -309,7 +340,7 @@ class RecordSetServiceSpec
         .getRecordSetsByName(okZone.id, record.name)
       doReturn(IO.pure(Set(dottedZone)))
         .when(mockZoneRepo)
-        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+        .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(Set.empty)
@@ -324,7 +355,7 @@ class RecordSetServiceSpec
         .getZonesByFilters(record.name.split('.').map(x => x + "." + okZone.name).toSet)
       doReturn(IO.pure(Set()))
         .when(mockGroupRepo)
-        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+        .getGroupsByName(dottedHostsConfigGroupsAllowed.toSet)
       doReturn(IO.pure(ListUsersResults(Seq(), None)))
         .when(mockUserRepo)
         .getUsers(Set.empty, None, None)
@@ -367,7 +398,7 @@ class RecordSetServiceSpec
         .getGroup(okGroup.id)
       doReturn(IO.pure(Set(dottedZone)))
         .when(mockZoneRepo)
-        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+        .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(Set.empty)
@@ -382,7 +413,7 @@ class RecordSetServiceSpec
         .getZonesByFilters(Set.empty)
       doReturn(IO.pure(Set()))
         .when(mockGroupRepo)
-        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+        .getGroupsByName(dottedHostsConfigGroupsAllowed.toSet)
       doReturn(IO.pure(ListUsersResults(Seq(), None)))
         .when(mockUserRepo)
         .getUsers(Set.empty, None, None)
@@ -441,7 +472,7 @@ class RecordSetServiceSpec
         .getRecordSetsByName(okZone.id, record.name)
       doReturn(IO.pure(Set(dottedZone)))
         .when(mockZoneRepo)
-        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+        .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(Set.empty)
@@ -456,7 +487,7 @@ class RecordSetServiceSpec
         .getZonesByFilters(Set.empty)
       doReturn(IO.pure(Set()))
         .when(mockGroupRepo)
-        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+        .getGroupsByName(dottedHostsConfigGroupsAllowed.toSet)
       doReturn(IO.pure(ListUsersResults(Seq(), None)))
         .when(mockUserRepo)
         .getUsers(Set.empty, None, None)
@@ -478,6 +509,12 @@ class RecordSetServiceSpec
     val record =
       cname.copy(name = "new.name", zoneId = dottedZone.id, status = RecordSetStatus.Active)
 
+    val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authMethods.map {
+      case y:AuthConfigs => y.zone
+    }
+
+    val dottedHostsConfigGroupsAllowed: List[String] = getDottedHostsConfigGroupsAllowed(dottedZone, VinylDNSTestHelpers.dottedHostsConfig)
+
     doReturn(IO.pure(Some(dottedZone))).when(mockZoneRepo).getZone(dottedZone.id)
     doReturn(IO.pure(List()))
       .when(mockRecordRepo)
@@ -487,7 +524,7 @@ class RecordSetServiceSpec
       .getRecordSetsByName(dottedZone.id, record.name)
     doReturn(IO.pure(Set(dottedZone)))
       .when(mockZoneRepo)
-      .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+      .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
     doReturn(IO.pure(Set()))
       .when(mockZoneRepo)
       .getZonesByFilters(Set.empty)
@@ -500,9 +537,55 @@ class RecordSetServiceSpec
     doReturn(IO.pure(Set()))
       .when(mockZoneRepo)
       .getZonesByFilters(record.name.split('.').map(x => x + "." + dottedZone.name).toSet)
+    doReturn(IO.pure(Set(dummyGroup)))
+      .when(mockGroupRepo)
+      .getGroupsByName(dottedHostsConfigGroupsAllowed.toSet)
+    doReturn(IO.pure(ListUsersResults(listOfDummyUsers.toSeq, None)))
+      .when(mockUserRepo)
+      .getUsers(dummyGroup.memberIds, None, None)
+
+    // passes as all three properties within dotted hosts config (allowed zones, users and record types) are satisfied
+    val result: RecordSetChange = rightResultOf(
+      underTest.addRecordSet(record, xyzAuth).map(_.asInstanceOf[RecordSetChange]).value
+    )
+
+    result.recordSet.name shouldBe record.name
+  }
+  "succeed if the record is dotted and zone, user in group, record type is in allowed dotted hosts config" in {
+    val record =
+      cname.copy(name = "new.name", zoneId = xyzZone.id, status = RecordSetStatus.Active)
+
+    val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authMethods.map {
+      case y:AuthConfigs => y.zone
+    }
+
+    val dottedHostsConfigGroupsAllowed: List[String] = getDottedHostsConfigGroupsAllowed(xyzZone, VinylDNSTestHelpers.dottedHostsConfig)
+
+    doReturn(IO.pure(Some(xyzZone))).when(mockZoneRepo).getZone(xyzZone.id)
+    doReturn(IO.pure(List()))
+      .when(mockRecordRepo)
+      .getRecordSets(xyzZone.id, record.name, record.typ)
+    doReturn(IO.pure(List()))
+      .when(mockRecordRepo)
+      .getRecordSetsByName(xyzZone.id, record.name)
+    doReturn(IO.pure(Set(xyzZone)))
+      .when(mockZoneRepo)
+      .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
+    doReturn(IO.pure(Set()))
+      .when(mockZoneRepo)
+      .getZonesByFilters(Set.empty)
+    doReturn(IO.pure(None))
+      .when(mockZoneRepo)
+      .getZoneByName(record.name + "." + xyzZone.name)
+    doReturn(IO.pure(List()))
+      .when(mockRecordRepo)
+      .getRecordSetsByFQDNs(Set(record.name + "." + xyzZone.name))
+    doReturn(IO.pure(Set()))
+      .when(mockZoneRepo)
+      .getZonesByFilters(record.name.split('.').map(x => x + "." + xyzZone.name).toSet)
     doReturn(IO.pure(Set(xyzGroup)))
       .when(mockGroupRepo)
-      .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+      .getGroupsByName(dottedHostsConfigGroupsAllowed.toSet)
     doReturn(IO.pure(ListUsersResults(Seq(xyzUser), None)))
       .when(mockUserRepo)
       .getUsers(xyzGroup.memberIds, None, None)
@@ -526,7 +609,7 @@ class RecordSetServiceSpec
       .getRecordSetsByName(okZone.id, record.name)
     doReturn(IO.pure(Set(dottedZone)))
       .when(mockZoneRepo)
-      .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+      .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
     doReturn(IO.pure(Set()))
       .when(mockZoneRepo)
       .getZonesByFilters(Set.empty)
@@ -539,12 +622,12 @@ class RecordSetServiceSpec
     doReturn(IO.pure(Set()))
       .when(mockZoneRepo)
       .getZonesByFilters(record.name.split('.').map(x => x + "." + okZone.name).toSet)
-    doReturn(IO.pure(Set(xyzGroup)))
+    doReturn(IO.pure(Set()))
       .when(mockGroupRepo)
-      .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
-    doReturn(IO.pure(ListUsersResults(Seq(xyzUser), None)))
+      .getGroupsByName(dottedHostsConfigGroupsAllowed.toSet)
+    doReturn(IO.pure(ListUsersResults(Seq(), None)))
       .when(mockUserRepo)
-      .getUsers(xyzGroup.memberIds, None, None)
+      .getUsers(Set.empty, None, None)
 
     // fails as only two properties within dotted hosts config (users and record types) are satisfied while zone is not allowed
     val result = leftResultOf(underTest.addRecordSet(record, okAuth).value)
@@ -552,45 +635,57 @@ class RecordSetServiceSpec
   }
   "fail if the record is dotted and zone, record type is in allowed dotted hosts config except user" in {
     val record =
-      cname.copy(name = "new.name", zoneId = dottedZone.id, status = RecordSetStatus.Active)
+      cname.copy(name = "new.name", zoneId = abcZone.id, status = RecordSetStatus.Active)
 
-    doReturn(IO.pure(Some(dottedZone))).when(mockZoneRepo).getZone(dottedZone.id)
+    val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authMethods.map {
+      case y:AuthConfigs => y.zone
+    }
+
+    val dottedHostsConfigGroupsAllowed: List[String] = getDottedHostsConfigGroupsAllowed(abcZone, VinylDNSTestHelpers.dottedHostsConfig)
+
+    doReturn(IO.pure(Some(abcZone))).when(mockZoneRepo).getZone(abcZone.id)
     doReturn(IO.pure(List()))
       .when(mockRecordRepo)
-      .getRecordSets(dottedZone.id, record.name, record.typ)
+      .getRecordSets(abcZone.id, record.name, record.typ)
     doReturn(IO.pure(List()))
       .when(mockRecordRepo)
-      .getRecordSetsByName(dottedZone.id, record.name)
-    doReturn(IO.pure(Set(dottedZone)))
+      .getRecordSetsByName(abcZone.id, record.name)
+    doReturn(IO.pure(Set(abcZone)))
       .when(mockZoneRepo)
-      .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+      .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
     doReturn(IO.pure(Set()))
       .when(mockZoneRepo)
       .getZonesByFilters(Set.empty)
     doReturn(IO.pure(None))
       .when(mockZoneRepo)
-      .getZoneByName(record.name + "." + dottedZone.name)
+      .getZoneByName(record.name + "." + abcZone.name)
     doReturn(IO.pure(List()))
       .when(mockRecordRepo)
-      .getRecordSetsByFQDNs(Set(record.name + "." + dottedZone.name))
+      .getRecordSetsByFQDNs(Set(record.name + "." + abcZone.name))
     doReturn(IO.pure(Set()))
       .when(mockZoneRepo)
-      .getZonesByFilters(record.name.split('.').map(x => x + "." + dottedZone.name).toSet)
-    doReturn(IO.pure(Set(xyzGroup)))
+      .getZonesByFilters(record.name.split('.').map(x => x + "." + abcZone.name).toSet)
+    doReturn(IO.pure(Set(dummyGroup)))
       .when(mockGroupRepo)
-      .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
-    doReturn(IO.pure(ListUsersResults(Seq(), None)))
+      .getGroupsByName(dottedHostsConfigGroupsAllowed.toSet)
+    doReturn(IO.pure(ListUsersResults(listOfDummyUsers.toSeq, None)))
       .when(mockUserRepo)
-      .getUsers(xyzGroup.memberIds, None, None)
+      .getUsers(dummyGroup.memberIds, None, None)
 
     // fails as only two properties within dotted hosts config (zones and record types) are satisfied while user is not allowed
-    val result = leftResultOf(underTest.addRecordSet(record, xyzAuth).value)
+    val result = leftResultOf(underTest.addRecordSet(record, abcAuth).value)
     result shouldBe an[InvalidRequest]
   }
   "fail if the record is dotted and zone, user is in allowed dotted hosts config except record type" in {
     val record =
       aaaa.copy(name = "new.name", zoneId = dottedZone.id, status = RecordSetStatus.Active)
 
+    val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authMethods.map {
+      case y:AuthConfigs => y.zone
+    }
+
+    val dottedHostsConfigGroupsAllowed: List[String] = getDottedHostsConfigGroupsAllowed(dottedZone, VinylDNSTestHelpers.dottedHostsConfig)
+
     doReturn(IO.pure(Some(dottedZone))).when(mockZoneRepo).getZone(dottedZone.id)
     doReturn(IO.pure(List()))
       .when(mockRecordRepo)
@@ -600,7 +695,7 @@ class RecordSetServiceSpec
       .getRecordSetsByName(dottedZone.id, record.name)
     doReturn(IO.pure(Set(dottedZone)))
       .when(mockZoneRepo)
-      .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+      .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
     doReturn(IO.pure(Set()))
       .when(mockZoneRepo)
       .getZonesByFilters(Set.empty)
@@ -613,12 +708,12 @@ class RecordSetServiceSpec
     doReturn(IO.pure(Set()))
       .when(mockZoneRepo)
       .getZonesByFilters(record.name.split('.').map(x => x + "." + dottedZone.name).toSet)
-    doReturn(IO.pure(Set(xyzGroup)))
+    doReturn(IO.pure(Set(dummyGroup)))
       .when(mockGroupRepo)
-      .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
-    doReturn(IO.pure(ListUsersResults(Seq(xyzUser), None)))
+      .getGroupsByName(dottedHostsConfigGroupsAllowed.toSet)
+    doReturn(IO.pure(ListUsersResults(listOfDummyUsers.toSeq, None)))
       .when(mockUserRepo)
-      .getUsers(xyzGroup.memberIds, None, None)
+      .getUsers(dummyGroup.memberIds, None, None)
 
     // fails as only two properties within dotted hosts config (zone and user) are satisfied while record type is not allowed
     val result = leftResultOf(underTest.addRecordSet(record, xyzAuth).value)
@@ -641,7 +736,7 @@ class RecordSetServiceSpec
         .getRecordSetsByName(okZone.id, newRecord.name)
       doReturn(IO.pure(Set(dottedZone)))
         .when(mockZoneRepo)
-        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+        .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(Set.empty)
@@ -656,7 +751,7 @@ class RecordSetServiceSpec
         .getZonesByFilters(Set.empty)
       doReturn(IO.pure(Set()))
         .when(mockGroupRepo)
-        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+        .getGroupsByName(dottedHostsConfigGroupsAllowed.toSet)
       doReturn(IO.pure(ListUsersResults(Seq(), None)))
         .when(mockUserRepo)
         .getUsers(Set.empty, None, None)
@@ -698,7 +793,7 @@ class RecordSetServiceSpec
         .getRecordSetsByName(okZone.id, newRecord.name)
       doReturn(IO.pure(Set(dottedZone)))
         .when(mockZoneRepo)
-        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+        .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(Set.empty)
@@ -713,7 +808,7 @@ class RecordSetServiceSpec
         .getZonesByFilters(newRecord.name.split('.').map(x => x + "." + okZone.name).toSet)
       doReturn(IO.pure(Set()))
         .when(mockGroupRepo)
-        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+        .getGroupsByName(dottedHostsConfigGroupsAllowed.toSet)
       doReturn(IO.pure(ListUsersResults(Seq(), None)))
         .when(mockUserRepo)
         .getUsers(Set.empty, None, None)
@@ -758,7 +853,7 @@ class RecordSetServiceSpec
         .getRecordSetsByName(okZone.id, newRecord.name)
       doReturn(IO.pure(Set(dottedZone)))
         .when(mockZoneRepo)
-        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+        .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(Set.empty)
@@ -773,7 +868,7 @@ class RecordSetServiceSpec
         .getZonesByFilters(newRecord.name.split('.').map(x => x + "." + okZone.name).toSet)
       doReturn(IO.pure(Set()))
         .when(mockGroupRepo)
-        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+        .getGroupsByName(dottedHostsConfigGroupsAllowed.toSet)
       doReturn(IO.pure(ListUsersResults(Seq(), None)))
         .when(mockUserRepo)
         .getUsers(Set.empty, None, None)
@@ -801,7 +896,7 @@ class RecordSetServiceSpec
         .getRecordSetsByName(okZone.id, newRecord.name)
       doReturn(IO.pure(Set(dottedZone)))
         .when(mockZoneRepo)
-        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+        .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(Set.empty)
@@ -816,7 +911,7 @@ class RecordSetServiceSpec
         .getZonesByFilters(newRecord.name.split('.').map(x => x + "." + okZone.name).toSet)
       doReturn(IO.pure(Set()))
         .when(mockGroupRepo)
-        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+        .getGroupsByName(dottedHostsConfigGroupsAllowed.toSet)
       doReturn(IO.pure(ListUsersResults(Seq(), None)))
         .when(mockUserRepo)
         .getUsers(Set.empty, None, None)
@@ -844,7 +939,7 @@ class RecordSetServiceSpec
         .getRecordSetsByName(okZone.id, newRecord.name)
       doReturn(IO.pure(Set(dottedZone)))
         .when(mockZoneRepo)
-        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+        .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(Set.empty)
@@ -859,7 +954,7 @@ class RecordSetServiceSpec
         .getZonesByFilters(newRecord.name.split('.').map(x => x + "." + okZone.name).toSet)
       doReturn(IO.pure(Set()))
         .when(mockGroupRepo)
-        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+        .getGroupsByName(dottedHostsConfigGroupsAllowed.toSet)
       doReturn(IO.pure(ListUsersResults(Seq(), None)))
         .when(mockUserRepo)
         .getUsers(Set.empty, None, None)
@@ -1000,7 +1095,7 @@ class RecordSetServiceSpec
         .getGroup(oneUserDummyGroup.id)
       doReturn(IO.pure(Set(dottedZone)))
         .when(mockZoneRepo)
-        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+        .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(Set.empty)
@@ -1015,7 +1110,7 @@ class RecordSetServiceSpec
         .getZonesByFilters(Set.empty)
       doReturn(IO.pure(Set()))
         .when(mockGroupRepo)
-        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+        .getGroupsByName(dottedHostsConfigGroupsAllowed.toSet)
       doReturn(IO.pure(ListUsersResults(Seq(), None)))
         .when(mockUserRepo)
         .getUsers(Set.empty, None, None)
@@ -1050,7 +1145,7 @@ class RecordSetServiceSpec
         .getRecordSetsByName(zone.id, newRecord.name)
       doReturn(IO.pure(Set(dottedZone)))
         .when(mockZoneRepo)
-        .getZonesByNames(VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet)
+        .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
         .when(mockZoneRepo)
         .getZonesByFilters(Set.empty)
@@ -1065,7 +1160,7 @@ class RecordSetServiceSpec
         .getZonesByFilters(Set.empty)
       doReturn(IO.pure(Set()))
         .when(mockGroupRepo)
-        .getGroupsByName(VinylDNSTestHelpers.dottedHostsConfig.allowedGroupList.toSet)
+        .getGroupsByName(dottedHostsConfigGroupsAllowed.toSet)
       doReturn(IO.pure(ListUsersResults(Seq(), None)))
         .when(mockUserRepo)
         .getUsers(Set.empty, None, None)
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala
index 57625b9c1..f39600191 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala
@@ -25,6 +25,7 @@ import vinyldns.core.domain.record.RecordType._
 import vinyldns.api.domain.zone.{InvalidGroupError, InvalidRequest, PendingUpdateError, RecordSetAlreadyExists, RecordSetValidation}
 import vinyldns.api.ResultHelpers
 import vinyldns.api.VinylDNSTestHelpers
+import vinyldns.api.config.AuthConfigs
 import vinyldns.core.TestRecordSetData._
 import vinyldns.core.TestZoneData._
 import vinyldns.core.TestMembershipData._
@@ -44,6 +45,10 @@ class RecordSetValidationsSpec
 
   import RecordSetValidations._
 
+  val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authMethods.map {
+    case y:AuthConfigs => y.zone
+  }
+
   "RecordSetValidations" should {
     "validRecordTypes" should {
       "return invalid request when adding a PTR record to a forward zone" in {
@@ -219,34 +224,34 @@ class RecordSetValidationsSpec
         val dottedARecord = rsOk.copy(name = "this.is.a.failure.")
         "return a failure for any new record with dotted hosts in forward zones" in {
           leftValue(
-            typeSpecificValidations(dottedARecord, List(), okZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false)
+            typeSpecificValidations(dottedARecord, List(), okZone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, false)
           ) shouldBe an[InvalidRequest]
         }
 
         "return a failure for any new record with dotted hosts in forward zones (CNAME)" in {
           leftValue(
-            typeSpecificValidations(dottedARecord.copy(typ = CNAME), List(), okZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false)
+            typeSpecificValidations(dottedARecord.copy(typ = CNAME), List(), okZone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, false)
           ) shouldBe an[InvalidRequest]
         }
 
         "return a failure for any new record with dotted hosts in forward zones (NS)" in {
           leftValue(
-            typeSpecificValidations(dottedARecord.copy(typ = NS), List(), okZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false)
+            typeSpecificValidations(dottedARecord.copy(typ = NS), List(), okZone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, false)
           ) shouldBe an[InvalidRequest]
         }
 
         "return a success for any new record with dotted hosts in forward zones if it satisfies dotted hosts configs" in {
-          val record = typeSpecificValidations(dottedARecord.copy(zoneId = dottedZone.id), List(), dottedZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, true)
+          val record = typeSpecificValidations(dottedARecord.copy(zoneId = dottedZone.id), List(), dottedZone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, true)
           record should be(right)
         }
 
         "return a failure for any new record with dotted hosts in forward zones (CNAME) if it satisfies dotted hosts configs" in {
-          val record = typeSpecificValidations(dottedARecord.copy(typ = CNAME, zoneId = dottedZone.id), List(), dottedZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, true)
+          val record = typeSpecificValidations(dottedARecord.copy(typ = CNAME, zoneId = dottedZone.id), List(), dottedZone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, true)
           record should be(right)
         }
 
         "return a failure for any new record with dotted hosts in forward zones (NS) if it satisfies dotted hosts configs" in {
-          val record = typeSpecificValidations(dottedARecord.copy(typ = NS, zoneId = dottedZone.id), List(), dottedZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, true)
+          val record = typeSpecificValidations(dottedARecord.copy(typ = NS, zoneId = dottedZone.id), List(), dottedZone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, true)
           record should be(right)
         }
 
@@ -258,7 +263,7 @@ class RecordSetValidationsSpec
             Some(dottedARecord.copy(ttl = 300)),
             Nil,
             true,
-            VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+            dottedHostsConfigZonesAllowed.toSet,
             false
           ) should be(right)
         }
@@ -272,7 +277,7 @@ class RecordSetValidationsSpec
             Some(dottedCNAMERecord.copy(ttl = 300)),
             Nil,
             true,
-            VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+            dottedHostsConfigZonesAllowed.toSet,
             false
           ) should be(right)
         }
@@ -287,7 +292,7 @@ class RecordSetValidationsSpec
               Some(dottedNSRecord.copy(ttl = 300)),
               Nil,
               true,
-              VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet,
+              dottedHostsConfigZonesAllowed.toSet,
               false
             )
           ) shouldBe an[InvalidRequest]
@@ -299,35 +304,35 @@ class RecordSetValidationsSpec
           val test = srv.copy(name = "_sip._tcp.example.com.")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, false) should be(right)
         }
 
         "return success for an SRV record following convention without FQDN" in {
           val test = srv.copy(name = "_sip._tcp")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, false) should be(right)
         }
 
         "return success for an SRV record following convention with a record name" in {
           val test = srv.copy(name = "_sip._tcp.foo.")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, false) should be(right)
         }
 
         "return success on a wildcard SRV that follows convention" in {
           val test = srv.copy(name = "*._tcp.example.com.")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, false) should be(right)
         }
 
         "return success on a wildcard in second position SRV that follows convention" in {
           val test = srv.copy(name = "_sip._*.example.com.")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, false) should be(right)
         }
       }
       "Skip dotted checks on NAPTR" should {
@@ -335,21 +340,21 @@ class RecordSetValidationsSpec
           val test = naptr.copy(name = "sub.naptr.example.com.")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, false) should be(right)
         }
 
         "return success for an NAPTR record without FQDN" in {
           val test = naptr.copy(name = "sub.naptr")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, false) should be(right)
         }
 
         "return success on a wildcard NAPTR" in {
           val test = naptr.copy(name = "*.sub.naptr.example.com.")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, false) should be(right)
         }
 
       }
@@ -358,7 +363,7 @@ class RecordSetValidationsSpec
           val test = ptrIp4.copy(name = "10.1.2.")
           val zone = zoneIp4.copy(name = "198.in-addr.arpa.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, false) should be(right)
         }
       }
       "Skip dotted checks on TXT" should {
@@ -366,7 +371,7 @@ class RecordSetValidationsSpec
           val test = txt.copy(name = "sub.txt.example.com.")
           val zone = okZone.copy(name = "example.com.")
 
-          typeSpecificValidations(test, List(), zone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
+          typeSpecificValidations(test, List(), zone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, false) should be(right)
         }
 
       }
@@ -383,7 +388,7 @@ class RecordSetValidationsSpec
             List(SOAData(Fqdn("something"), "other", 1, 2, 3, 5, 6))
           )
 
-          typeSpecificValidations(test, List(), zoneIp4, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
+          typeSpecificValidations(test, List(), zoneIp4, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, false) should be(right)
         }
       }
     }
@@ -396,29 +401,29 @@ class RecordSetValidationsSpec
           records = List(NSData(Fqdn("some.test.ns.")))
         )
 
-        nsValidations(valid, okZone, None, List(new Regex(".*")), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
+        nsValidations(valid, okZone, None, List(new Regex(".*")), true, dottedHostsConfigZonesAllowed.toSet, false) should be(right)
       }
 
       "return an InvalidRequest if an NS record is '@'" in {
-        val error = leftValue(nsValidations(invalidNsApexRs, okZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
+        val error = leftValue(nsValidations(invalidNsApexRs, okZone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, false))
         error shouldBe an[InvalidRequest]
       }
 
       "return an InvalidRequest if an NS record is the same as the zone" in {
         val invalid = invalidNsApexRs.copy(name = okZone.name)
-        val error = leftValue(nsValidations(invalid, okZone, None, Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
+        val error = leftValue(nsValidations(invalid, okZone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, false))
         error shouldBe an[InvalidRequest]
       }
 
       "return an InvalidRequest if the NS record being updated is '@'" in {
         val valid = invalidNsApexRs.copy(name = "this-is-not-origin-mate")
-        val error = leftValue(nsValidations(valid, okZone, Some(invalidNsApexRs), Nil, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
+        val error = leftValue(nsValidations(valid, okZone, Some(invalidNsApexRs), Nil, true, dottedHostsConfigZonesAllowed.toSet, false))
         error shouldBe an[InvalidRequest]
       }
 
       "return an InvalidRequest if an NS record data is not in the approved server list" in {
         val ns = invalidNsApexRs.copy(records = List(NSData(Fqdn("not.approved."))))
-        val error = leftValue(nsValidations(ns, okZone, None, List(new Regex("not.*")), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
+        val error = leftValue(nsValidations(ns, okZone, None, List(new Regex("not.*")), true, dottedHostsConfigZonesAllowed.toSet, false))
         error shouldBe an[InvalidRequest]
       }
     }
@@ -426,35 +431,35 @@ class RecordSetValidationsSpec
     "DSValidations" should {
       val matchingNs = ns.copy(zoneId = ds.zoneId, name = ds.name, ttl = ds.ttl)
       "return ok if the record is non-origin DS with matching NS" in {
-        dsValidations(ds, List(matchingNs), okZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
+        dsValidations(ds, List(matchingNs), okZone, true, dottedHostsConfigZonesAllowed.toSet, false) should be(right)
       }
       "return an InvalidRequest if a DS record is '@'" in {
         val apex = ds.copy(name = "@")
-        val error = leftValue(dsValidations(apex, List(matchingNs), okZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
+        val error = leftValue(dsValidations(apex, List(matchingNs), okZone, true, dottedHostsConfigZonesAllowed.toSet, false))
         error shouldBe an[InvalidRequest]
       }
       "return an InvalidRequest if a DS record is the same as the zone" in {
         val apex = ds.copy(name = okZone.name)
-        val error = leftValue(dsValidations(apex, List(matchingNs), okZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
+        val error = leftValue(dsValidations(apex, List(matchingNs), okZone, true, dottedHostsConfigZonesAllowed.toSet, false))
         error shouldBe an[InvalidRequest]
       }
       "return an InvalidRequest if there is no NS matching the record" in {
-        val error = leftValue(dsValidations(ds, List(), okZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
+        val error = leftValue(dsValidations(ds, List(), okZone, true, dottedHostsConfigZonesAllowed.toSet, false))
         error shouldBe an[InvalidRequest]
       }
       "return an InvalidRequest if the DS is dotted" in {
         val error =
-          leftValue(dsValidations(ds.copy(name = "test.dotted"), List(matchingNs), okZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
+          leftValue(dsValidations(ds.copy(name = "test.dotted"), List(matchingNs), okZone, true, dottedHostsConfigZonesAllowed.toSet, false))
         error shouldBe an[InvalidRequest]
       }
       "return ok if the DS is dotted and zone, user, record type is allowed in dotted hosts config" in {
         val record =
-          dsValidations(ds.copy(name = "dotted.trial", zoneId = dottedZone.id), List(matchingNs), dottedZone, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, true)
+          dsValidations(ds.copy(name = "dotted.trial", zoneId = dottedZone.id), List(matchingNs), dottedZone, true, dottedHostsConfigZonesAllowed.toSet, true)
         record should be(right)
       }
       "return an InvalidRequest if the DS is dotted and zone, user, record type is allowed in dotted hosts config but has a conflict with existing record or zone" in {
         val error =
-          leftValue(dsValidations(ds.copy(name = "dotted.trial", zoneId = dottedZone.id), List(matchingNs), dottedZone, false, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, true))
+          leftValue(dsValidations(ds.copy(name = "dotted.trial", zoneId = dottedZone.id), List(matchingNs), dottedZone, false, dottedHostsConfigZonesAllowed.toSet, true))
         error shouldBe an[InvalidRequest]
       }
     }
@@ -462,62 +467,62 @@ class RecordSetValidationsSpec
     "CnameValidations" should {
       val invalidCnameApexRs: RecordSet = cname.copy(name = "@")
       "return a RecordSetAlreadyExistsError if a record with the same name exists and creating a cname" in {
-        val error = leftValue(cnameValidations(cname, List(aaaa), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
+        val error = leftValue(cnameValidations(cname, List(aaaa), okZone, None, true, dottedHostsConfigZonesAllowed.toSet, false))
         error shouldBe a[RecordSetAlreadyExists]
       }
       "return ok if name is not '@'" in {
-        cnameValidations(cname, List(), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(right)
+        cnameValidations(cname, List(), okZone, None, true, dottedHostsConfigZonesAllowed.toSet, false) should be(right)
       }
       "return an InvalidRequest if a cname record set name is '@'" in {
-        val error = leftValue(cnameValidations(invalidCnameApexRs, List(), okZone, None,  true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
+        val error = leftValue(cnameValidations(invalidCnameApexRs, List(), okZone, None,  true, dottedHostsConfigZonesAllowed.toSet, false))
         error shouldBe an[InvalidRequest]
       }
       "return an InvalidRequest if a cname record set name is same as zone" in {
         val invalid = invalidCnameApexRs.copy(name = okZone.name)
-        val error = leftValue(cnameValidations(invalid, List(), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
+        val error = leftValue(cnameValidations(invalid, List(), okZone, None, true, dottedHostsConfigZonesAllowed.toSet, false))
         error shouldBe an[InvalidRequest]
       }
       "return an InvalidRequest if a cname record set name is dotted" in {
-        val error = leftValue(cnameValidations(cname.copy(name = "dot.ted"), List(), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
+        val error = leftValue(cnameValidations(cname.copy(name = "dot.ted"), List(), okZone, None, true, dottedHostsConfigZonesAllowed.toSet, false))
         error shouldBe an[InvalidRequest]
       }
       "return ok if new recordset name does not contain dot" in {
-        cnameValidations(cname, List(), okZone, Some(cname.copy(name = "not-dotted")), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(
+        cnameValidations(cname, List(), okZone, Some(cname.copy(name = "not-dotted")), true, dottedHostsConfigZonesAllowed.toSet, false) should be(
           right
         )
       }
       "return ok if dotted host name doesn't change" in {
         val newRecord = cname.copy(name = "dot.ted", ttl = 500)
-        cnameValidations(newRecord, List(), okZone, Some(newRecord.copy(ttl = 300)), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(
+        cnameValidations(newRecord, List(), okZone, Some(newRecord.copy(ttl = 300)), true, dottedHostsConfigZonesAllowed.toSet, false) should be(
           right
         )
       }
       "return an InvalidRequest if a cname record set name is updated to '@'" in {
-        val error = leftValue(cnameValidations(cname.copy(name = "@"), List(), okZone, Some(cname), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
+        val error = leftValue(cnameValidations(cname.copy(name = "@"), List(), okZone, Some(cname), true, dottedHostsConfigZonesAllowed.toSet, false))
         error shouldBe an[InvalidRequest]
       }
       "return an InvalidRequest if updated cname record set name is same as zone" in {
         val error =
-          leftValue(cnameValidations(cname.copy(name = okZone.name), List(), okZone, Some(cname), true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
+          leftValue(cnameValidations(cname.copy(name = okZone.name), List(), okZone, Some(cname), true, dottedHostsConfigZonesAllowed.toSet, false))
         error shouldBe an[InvalidRequest]
       }
       "return an RecordSetValidation error if recordset data contain more than one sequential '.'" in {
-        val error = leftValue(cnameValidations(cname.copy(records = List(CNAMEData(Fqdn("record..zone")))), List(), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false))
+        val error = leftValue(cnameValidations(cname.copy(records = List(CNAMEData(Fqdn("record..zone")))), List(), okZone, None, true, dottedHostsConfigZonesAllowed.toSet, false))
         error shouldBe an[RecordSetValidation]
       }
       "return ok if recordset data does not contain sequential '.'" in {
-        cnameValidations(cname.copy(records = List(CNAMEData(Fqdn("record.zone")))), List(), okZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, false) should be(
+        cnameValidations(cname.copy(records = List(CNAMEData(Fqdn("record.zone")))), List(), okZone, None, true, dottedHostsConfigZonesAllowed.toSet, false) should be(
           right
         )
       }
       "return ok if the CNAME is dotted and zone, user, record type is allowed in dotted hosts config" in {
         val record =
-          cnameValidations(cname.copy(name = "dot.ted", zoneId = dottedZone.id), List(), dottedZone, None, true, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, true)
+          cnameValidations(cname.copy(name = "dot.ted", zoneId = dottedZone.id), List(), dottedZone, None, true, dottedHostsConfigZonesAllowed.toSet, true)
         record should be(right)
       }
       "return an InvalidRequest if the CNAME is dotted and zone, user, record type is allowed in dotted hosts config but has a conflict with existing record or zone" in {
         val error =
-          leftValue(cnameValidations(cname.copy(name = "dot.ted", zoneId = dottedZone.id), List(), dottedZone, None, false, VinylDNSTestHelpers.dottedHostsConfig.zoneList.toSet, true))
+          leftValue(cnameValidations(cname.copy(name = "dot.ted", zoneId = dottedZone.id), List(), dottedZone, None, false, dottedHostsConfigZonesAllowed.toSet, true))
         error shouldBe an[InvalidRequest]
       }
     }
diff --git a/modules/core/src/test/scala/vinyldns/core/TestZoneData.scala b/modules/core/src/test/scala/vinyldns/core/TestZoneData.scala
index cdc6cc925..34c1495f1 100644
--- a/modules/core/src/test/scala/vinyldns/core/TestZoneData.scala
+++ b/modules/core/src/test/scala/vinyldns/core/TestZoneData.scala
@@ -34,7 +34,7 @@ object TestZoneData {
     adminGroupId = okGroup.id,
     connection = testConnection
   )
-  val dottedZone: Zone = Zone("dotted.xyz", "dotted@xyz.com", adminGroupId = xyzGroup.id)
+  val dottedZone: Zone = Zone("dotted.xyz.", "dotted@xyz.com", adminGroupId = xyzGroup.id)
   val abcZone: Zone = Zone("abc.zone.recordsets.", "test@test.com", adminGroupId = abcGroup.id)
   val xyzZone: Zone = Zone("xyz.", "abc@xyz.com", adminGroupId = xyzGroup.id)
   val zoneIp4: Zone = Zone("0.162.198.in-addr.arpa.", "test@test.com", adminGroupId = abcGroup.id)

From 228d2c169aec9c04017558dee0d23656ef780f81 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Thu, 22 Sep 2022 15:16:35 +0530
Subject: [PATCH 113/147] Update tests

---
 modules/api/src/main/resources/reference.conf | 24 +++--
 .../tests/recordsets/create_recordset_test.py | 64 ++++++++++---
 .../tests/shared_zone_test_context.py         |  9 ++
 .../vinyldns/api/VinylDNSTestHelpers.scala    |  2 +
 .../domain/record/RecordSetServiceSpec.scala  | 92 +++++++++++++++----
 5 files changed, 149 insertions(+), 42 deletions(-)

diff --git a/modules/api/src/main/resources/reference.conf b/modules/api/src/main/resources/reference.conf
index da75134ca..e353f10ce 100644
--- a/modules/api/src/main/resources/reference.conf
+++ b/modules/api/src/main/resources/reference.conf
@@ -93,14 +93,22 @@ vinyldns {
   # approved zones, individual users, users in groups and record types that are allowed for dotted hosts
   dotted-hosts = {
     allowed-settings = [
-      {
-      # for wildcard zones. Settings will be applied to all matching zones
-      type = "auth-configs"
-      zone = "*ent.com*."
-      allowed-user-list = ["ok"]
-      allowed-group-list = ["dummy-group*"]
-      allowed-record-type = ["CNAME"]
-      }
+        {
+        # for wildcard zones. Settings will be applied to all matching zones
+        type = "auth-configs"
+        zone = "*ent.com*."
+        allowed-user-list = ["ok"]
+        allowed-group-list = ["dummy-group"]
+        allowed-record-type = ["CNAME"]
+        },
+        {
+        # for wildcard zones. Settings will be applied to all matching zones
+        type = "auth-configs"
+        zone = "dummy*."
+        allowed-user-list = ["sharedZoneUser"]
+        allowed-group-list = ["history-group1"]
+        allowed-record-type = ["A"]
+        }
     ]
   }
 
diff --git a/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py b/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py
index b909627e9..514bf8c40 100644
--- a/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py
+++ b/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py
@@ -508,9 +508,11 @@ def test_create_invalid_record_data(shared_zone_test_context):
     ))
 
 
-def test_create_dotted_a_record_not_apex_fails(shared_zone_test_context):
+def test_create_dotted_a_record_not_apex_fails_when_dotted_hosts_config_not_satisfied(shared_zone_test_context):
     """
-    Test that creating a dotted host name A record set fails.
+    Test that creating a dotted host name A record set fails
+    Here the zone and user (individual) is allowed but record type is not allowed. Hence the test fails
+    Config present in reference.conf
     """
     client = shared_zone_test_context.ok_vinyldns_client
 
@@ -528,6 +530,33 @@ def test_create_dotted_a_record_not_apex_fails(shared_zone_test_context):
                                                                                 "is not allowed in zone " + zone_name))
 
 
+def test_create_dotted_a_record_succeeds_if_all_dotted_hosts_config_satisfies(shared_zone_test_context):
+    """
+    Test that creating a A record set with dotted host record name succeeds
+    Here the zone, user (in group) and record type is allowed. Hence the test succeeds
+    Config present in reference.conf
+    """
+    client = shared_zone_test_context.history_client
+    zone = shared_zone_test_context.dummy_zone
+    dotted_host_a_record = {
+        "zoneId": zone["id"],
+        "name": "dot.ted",
+        "type": "A",
+        "ttl": 500,
+        "records": [{"address": "127.0.0.1"}]
+    }
+
+    dotted_a_record = None
+    try:
+        dotted_cname_response = client.create_recordset(dotted_host_a_record, status=202)
+        dotted_a_record = client.wait_until_recordset_change_status(dotted_cname_response, "Complete")["recordSet"]
+        assert_that(dotted_a_record["name"], is_(dotted_host_a_record["name"]))
+    finally:
+        if dotted_a_record:
+            delete_result = client.delete_recordset(dotted_a_record["zoneId"], dotted_a_record["id"], status=202)
+            client.wait_until_recordset_change_status(delete_result, "Complete")
+
+
 def test_create_dotted_a_record_apex_succeeds(shared_zone_test_context):
     """
     Test that creating an apex A record set containing dots succeeds.
@@ -581,13 +610,15 @@ def test_create_dotted_a_record_apex_with_trailing_dot_succeeds(shared_zone_test
             client.wait_until_recordset_change_status(delete_result, "Complete")
 
 
-def test_create_dotted_cname_record_fails(shared_zone_test_context):
+def test_create_dotted_cname_record_fails_when_dotted_hosts_config_not_satisfied(shared_zone_test_context):
     """
-    Test that creating a CNAME record set with dotted host record name returns an error.
+    Test that creating a CNAME record set with dotted host record name returns an error
+    Here the zone is allowed but user (individual or in group) and record type is not allowed. Hence the test fails
+    Config present in reference.conf
     """
     client = shared_zone_test_context.dummy_vinyldns_client
     zone = shared_zone_test_context.dummy_zone
-    apex_cname_rs = {
+    dotted_host_cname_record = {
         "zoneId": zone["id"],
         "name": "dot.ted",
         "type": "CNAME",
@@ -595,18 +626,20 @@ def test_create_dotted_cname_record_fails(shared_zone_test_context):
         "records": [{"cname": "foo.bar."}]
     }
 
-    error = client.create_recordset(apex_cname_rs, status=422)
+    error = client.create_recordset(dotted_host_cname_record, status=422)
     assert_that(error,
                 is_(f'Record with name dot.ted and type CNAME is a dotted host which is not allowed in zone {zone["name"]}'))
 
 
 def test_create_dotted_cname_record_succeeds_if_all_dotted_hosts_config_satisfies(shared_zone_test_context):
     """
-    Test that creating a CNAME record set with dotted host record name returns an error.
+    Test that creating a CNAME record set with dotted host record name succeeds.
+    Here the zone, user (individual) and record type is allowed. Hence the test succeeds
+    Config present in reference.conf
     """
     client = shared_zone_test_context.ok_vinyldns_client
     zone = shared_zone_test_context.parent_zone
-    apex_cname_rs = {
+    dotted_host_cname_record = {
         "zoneId": zone["id"],
         "name": "dot.ted",
         "type": "CNAME",
@@ -614,14 +647,14 @@ def test_create_dotted_cname_record_succeeds_if_all_dotted_hosts_config_satisfie
         "records": [{"cname": "foo.bar."}]
     }
 
-    apex_cname_record = None
+    dotted_cname_record = None
     try:
-        apex_cname_response = client.create_recordset(apex_cname_rs, status=202)
-        apex_cname_record = client.wait_until_recordset_change_status(apex_cname_response, "Complete")["recordSet"]
-        assert_that(apex_cname_record["name"], is_(apex_cname_rs["name"]))
+        dotted_cname_response = client.create_recordset(dotted_host_cname_record, status=202)
+        dotted_cname_record = client.wait_until_recordset_change_status(dotted_cname_response, "Complete")["recordSet"]
+        assert_that(dotted_cname_record["name"], is_(dotted_host_cname_record["name"]))
     finally:
-        if apex_cname_record:
-            delete_result = client.delete_recordset(apex_cname_record["zoneId"], apex_cname_record["id"], status=202)
+        if dotted_cname_record:
+            delete_result = client.delete_recordset(dotted_cname_record["zoneId"], dotted_cname_record["id"], status=202)
             client.wait_until_recordset_change_status(delete_result, "Complete")
 
 
@@ -2099,7 +2132,8 @@ def test_create_apex_ds_fails(shared_zone_test_context):
     """
     client = shared_zone_test_context.ok_vinyldns_client
     zone = shared_zone_test_context.ds_zone
-    record_data = [{"keytag": 60485, "algorithm": 5, "digesttype": 1, "digest": "2BB183AF5F22588179A53B0A98631FAD1A292118"}]
+    record_data = [
+        {"keytag": 60485, "algorithm": 5, "digesttype": 1, "digest": "2BB183AF5F22588179A53B0A98631FAD1A292118"}]
     record_json = create_recordset(zone, "@", "DS", record_data, ttl=100)
     error = client.create_recordset(record_json, status=422)
     assert_that(error, is_(f'Record with name [{zone["name"]}] is an DS record at apex and cannot be added'))
diff --git a/modules/api/src/test/functional/tests/shared_zone_test_context.py b/modules/api/src/test/functional/tests/shared_zone_test_context.py
index 8d919cb23..1206d608c 100644
--- a/modules/api/src/test/functional/tests/shared_zone_test_context.py
+++ b/modules/api/src/test/functional/tests/shared_zone_test_context.py
@@ -174,6 +174,15 @@ class SharedZoneTestContext(object):
                     "shared": False,
                     "adminGroupId": self.dummy_group["id"],
                     "isTest": True,
+                    "acl": {
+                        "rules": [
+                            {
+                                "accessLevel": "Delete",
+                                "description": "some_test_rule",
+                                "userId": "history-id"
+                            }
+                        ]
+                    },
                     "connection": {
                         "name": "dummy.",
                         "keyName": VinylDNSTestContext.dns_key_name,
diff --git a/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala b/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala
index 24f0ae8c4..80b88abbb 100644
--- a/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala
+++ b/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala
@@ -42,6 +42,8 @@ trait VinylDNSTestHelpers {
 
   val dottedHostsConfig: DottedHostsConfig = DottedHostsConfig(List(AuthConfigs("dotted.xyz.",List("xyz"),List("dummy"),List("CNAME")), AuthConfigs("abc.zone.recordsets.",List("locked"),List("dummy"),List("CNAME")), AuthConfigs("xyz.",List("super"),List("xyz"),List("CNAME"))))
 
+  val emptyDottedHostsConfig: DottedHostsConfig = DottedHostsConfig(List.empty)
+
   val defaultTtl: Long = 7200
 
   val manualReviewDomainList: List[Regex] = List(new Regex("needs-review.*"))
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
index 7174a2c72..f5257eaa0 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
@@ -108,6 +108,25 @@ class RecordSetServiceSpec
     true
   )
 
+  val underTestWithEmptyDottedHostsConfig = new RecordSetService(
+    mockZoneRepo,
+    mockGroupRepo,
+    mockRecordRepo,
+    mockRecordDataRepo,
+    mockRecordChangeRepo,
+    mockUserRepo,
+    mockMessageQueue,
+    new AccessValidations(
+      sharedApprovedTypes = VinylDNSTestHelpers.sharedApprovedTypes
+    ),
+    mockBackendResolver,
+    true,
+    VinylDNSTestHelpers.highValueDomainConfig,
+    VinylDNSTestHelpers.emptyDottedHostsConfig,
+    VinylDNSTestHelpers.approvedNameServers,
+    true
+  )
+
   def getDottedHostsConfigGroupsAllowed(zone: Zone, config: DottedHostsConfig): List[String] = {
     val configZones = config.authMethods.map {
       case x: AuthConfigs => x.zone
@@ -148,7 +167,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, record.name)
-      doReturn(IO.pure(Set(dottedZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -218,7 +237,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, record.name)
-      doReturn(IO.pure(Set(dottedZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -243,6 +262,41 @@ class RecordSetServiceSpec
       val result = leftResultOf(underTest.addRecordSet(record, okAuth).value)
       result shouldBe an[InvalidRequest]
     }
+    "fail if the record is dotted and dotted hosts config is empty" in {
+      val record =
+        aaaa.copy(name = "new.name", zoneId = okZone.id, status = RecordSetStatus.Active)
+
+      doReturn(IO.pure(List()))
+        .when(mockRecordRepo)
+        .getRecordSets(okZone.id, record.name, record.typ)
+      doReturn(IO.pure(List()))
+        .when(mockRecordRepo)
+        .getRecordSetsByName(okZone.id, record.name)
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByNames(Set.empty)
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(Set.empty)
+      doReturn(IO.pure(None))
+        .when(mockZoneRepo)
+        .getZoneByName(record.name + "." + okZone.name)
+      doReturn(IO.pure(List()))
+        .when(mockRecordRepo)
+        .getRecordSetsByFQDNs(Set(record.name + "." + okZone.name))
+      doReturn(IO.pure(Set()))
+        .when(mockZoneRepo)
+        .getZonesByFilters(record.name.split('.').map(x => x + "." + okZone.name).toSet)
+      doReturn(IO.pure(Set()))
+        .when(mockGroupRepo)
+        .getGroupsByName(Set.empty)
+      doReturn(IO.pure(ListUsersResults(Seq(), None)))
+        .when(mockUserRepo)
+        .getUsers(Set.empty, None, None)
+
+      val result = leftResultOf(underTestWithEmptyDottedHostsConfig.addRecordSet(record, okAuth).value)
+      result shouldBe an[InvalidRequest]
+    }
     "fail if the record is relative with trailing dot" in {
       val record =
         aaaa.copy(name = "new.", zoneId = okZone.id, status = RecordSetStatus.Active)
@@ -253,7 +307,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, record.name)
-      doReturn(IO.pure(Set(dottedZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -299,7 +353,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, record.name)
-      doReturn(IO.pure(Set(dottedZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -338,7 +392,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, record.name)
-      doReturn(IO.pure(Set(dottedZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -396,7 +450,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(Some(okGroup)))
         .when(mockGroupRepo)
         .getGroup(okGroup.id)
-      doReturn(IO.pure(Set(dottedZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -470,7 +524,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, record.name)
-      doReturn(IO.pure(Set(dottedZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -522,7 +576,7 @@ class RecordSetServiceSpec
     doReturn(IO.pure(List()))
       .when(mockRecordRepo)
       .getRecordSetsByName(dottedZone.id, record.name)
-    doReturn(IO.pure(Set(dottedZone)))
+    doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
       .when(mockZoneRepo)
       .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
     doReturn(IO.pure(Set()))
@@ -568,7 +622,7 @@ class RecordSetServiceSpec
     doReturn(IO.pure(List()))
       .when(mockRecordRepo)
       .getRecordSetsByName(xyzZone.id, record.name)
-    doReturn(IO.pure(Set(xyzZone)))
+    doReturn(IO.pure(Set(xyzZone, abcZone, xyzZone)))
       .when(mockZoneRepo)
       .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
     doReturn(IO.pure(Set()))
@@ -607,7 +661,7 @@ class RecordSetServiceSpec
     doReturn(IO.pure(List()))
       .when(mockRecordRepo)
       .getRecordSetsByName(okZone.id, record.name)
-    doReturn(IO.pure(Set(dottedZone)))
+    doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
       .when(mockZoneRepo)
       .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
     doReturn(IO.pure(Set()))
@@ -650,7 +704,7 @@ class RecordSetServiceSpec
     doReturn(IO.pure(List()))
       .when(mockRecordRepo)
       .getRecordSetsByName(abcZone.id, record.name)
-    doReturn(IO.pure(Set(abcZone)))
+    doReturn(IO.pure(Set(abcZone, dottedZone, xyzZone)))
       .when(mockZoneRepo)
       .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
     doReturn(IO.pure(Set()))
@@ -693,7 +747,7 @@ class RecordSetServiceSpec
     doReturn(IO.pure(List()))
       .when(mockRecordRepo)
       .getRecordSetsByName(dottedZone.id, record.name)
-    doReturn(IO.pure(Set(dottedZone)))
+    doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
       .when(mockZoneRepo)
       .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
     doReturn(IO.pure(Set()))
@@ -734,7 +788,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, newRecord.name)
-      doReturn(IO.pure(Set(dottedZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -791,7 +845,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, newRecord.name)
-      doReturn(IO.pure(Set(dottedZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -851,7 +905,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, newRecord.name)
-      doReturn(IO.pure(Set(dottedZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -894,7 +948,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, newRecord.name)
-      doReturn(IO.pure(Set(dottedZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -937,7 +991,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, newRecord.name)
-      doReturn(IO.pure(Set(dottedZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -1093,7 +1147,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(Some(oneUserDummyGroup)))
         .when(mockGroupRepo)
         .getGroup(oneUserDummyGroup.id)
-      doReturn(IO.pure(Set(dottedZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -1143,7 +1197,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List(oldRecord)))
         .when(mockRecordRepo)
         .getRecordSetsByName(zone.id, newRecord.name)
-      doReturn(IO.pure(Set(dottedZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))

From 204ce5f93925fde05dd78b47e2f6e00ea6ffe29f Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Thu, 22 Sep 2022 16:42:46 +0530
Subject: [PATCH 114/147] Add it test

---
 .../RecordSetServiceIntegrationSpec.scala     | 58 ++++++++++++++++++-
 1 file changed, 55 insertions(+), 3 deletions(-)

diff --git a/modules/api/src/it/scala/vinyldns/api/domain/record/RecordSetServiceIntegrationSpec.scala b/modules/api/src/it/scala/vinyldns/api/domain/record/RecordSetServiceIntegrationSpec.scala
index 1cf0d50f6..544632028 100644
--- a/modules/api/src/it/scala/vinyldns/api/domain/record/RecordSetServiceIntegrationSpec.scala
+++ b/modules/api/src/it/scala/vinyldns/api/domain/record/RecordSetServiceIntegrationSpec.scala
@@ -32,7 +32,6 @@ import vinyldns.api.domain.access.AccessValidations
 import vinyldns.api.domain.zone._
 import vinyldns.api.engine.TestMessageQueue
 import vinyldns.mysql.TransactionProvider
-import vinyldns.core.TestMembershipData._
 import vinyldns.core.TestZoneData.testConnection
 import vinyldns.core.domain.{Fqdn, HighValueDomainError}
 import vinyldns.core.domain.auth.AuthPrincipal
@@ -64,13 +63,16 @@ class RecordSetServiceIntegrationSpec
   private var testRecordSetService: RecordSetServiceAlgebra = _
 
   private val user = User("live-test-user", "key", "secret")
+  private val testUser = User("testuser", "key", "secret")
   private val user2 = User("shared-record-test-user", "key-shared", "secret-shared")
   private val group = Group(s"test-group", "test@test.com", adminUserIds = Set(user.id))
+  private val dummyGroup = Group(s"dummy-group", "test@test.com", adminUserIds = Set(testUser.id))
   private val group2 = Group(s"test-group", "test@test.com", adminUserIds = Set(user.id, user2.id))
   private val sharedGroup =
     Group(s"test-shared-group", "test@test.com", adminUserIds = Set(user.id, user2.id))
   private val auth = AuthPrincipal(user, Seq(group.id, sharedGroup.id))
   private val auth2 = AuthPrincipal(user2, Seq(sharedGroup.id, group2.id))
+  val dummyAuth: AuthPrincipal = AuthPrincipal(testUser, Seq(dummyGroup.id))
 
   private val zone = Zone(
     s"live-zone-test.",
@@ -167,6 +169,14 @@ class RecordSetServiceIntegrationSpec
     adminGroupId = group.id
   )
 
+  private val dummyZone = Zone(
+    s"dummy.",
+    "test@test.com",
+    status = ZoneStatus.Active,
+    connection = testConnection,
+    adminGroupId = dummyGroup.id
+  )
+
   private val highValueDomainRecord = RecordSet(
     zone.id,
     "high-value-domain-existing",
@@ -254,8 +264,8 @@ class RecordSetServiceIntegrationSpec
         groupRepo.save(db, group)
       }
 
-    List(group, group2, sharedGroup).traverse(g => saveGroupData(groupRepo, g).void).unsafeRunSync()
-    List(zone, zoneTestNameConflicts, zoneTestAddRecords, sharedZone)
+    List(group, group2, sharedGroup, dummyGroup).traverse(g => saveGroupData(groupRepo, g).void).unsafeRunSync()
+    List(zone, dummyZone, zoneTestNameConflicts, zoneTestAddRecords, sharedZone)
       .traverse(
         z => zoneRepo.save(z)
       )
@@ -339,6 +349,48 @@ class RecordSetServiceIntegrationSpec
         .name shouldBe "zone-test-add-records."
     }
 
+    "create dotted record fails if it doesn't satisfy dotted hosts config" in {
+      val newRecord = RecordSet(
+        zoneTestAddRecords.id,
+        "test.dot",
+        A,
+        38400,
+        RecordSetStatus.Active,
+        DateTime.now,
+        None,
+        List(AData("10.1.1.1"))
+      )
+      val result =
+        testRecordSetService
+          .addRecordSet(newRecord, auth)
+          .value
+          .unsafeRunSync()
+      leftValue(result) shouldBe a[InvalidRequest]
+    }
+
+    "create dotted record succeeds if it satisfies all dotted hosts config" in {
+      val newRecord = RecordSet(
+        dummyZone.id,
+        "test.dotted",
+        AAAA,
+        38400,
+        RecordSetStatus.Active,
+        DateTime.now,
+        None,
+        List(AAAAData("fd69:27cc:fe91::60"))
+      )
+      // succeeds as zone, user and record type is allowed as defined in application.conf
+      val result =
+        testRecordSetService
+          .addRecordSet(newRecord, dummyAuth)
+          .value
+          .unsafeRunSync()
+      rightValue(result)
+        .asInstanceOf[RecordSetChange]
+        .recordSet
+        .name shouldBe "test.dotted"
+    }
+
     "update apex A record and add trailing dot" in {
       val newRecord = apexTestRecordA.copy(ttl = 200)
       val result = testRecordSetService

From e4ad55e5f77c39e19be05d2e190258869ff6ec3c Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 23 Sep 2022 12:16:53 +0530
Subject: [PATCH 115/147] Add documentation

---
 modules/api/src/it/resources/application.conf | 22 +++++++
 .../api/src/main/resources/application.conf   | 25 ++------
 modules/api/src/main/resources/reference.conf | 32 +++++-----
 .../docs/src/main/mdoc/operator/config-api.md | 64 +++++++++++++++++++
 4 files changed, 106 insertions(+), 37 deletions(-)

diff --git a/modules/api/src/it/resources/application.conf b/modules/api/src/it/resources/application.conf
index a64eddac2..8d506c8e7 100644
--- a/modules/api/src/it/resources/application.conf
+++ b/modules/api/src/it/resources/application.conf
@@ -163,6 +163,28 @@ vinyldns {
     "ns1.parent.com4."
   ]
 
+  # approved zones, individual users, users in groups and record types that are allowed for dotted hosts
+  dotted-hosts = {
+    # for local testing
+    allowed-settings = [
+      {
+      type = "auth-configs"
+      zone = "dummy."
+      allowed-user-list = ["testuser"]
+      allowed-group-list = ["dummy-group"]
+      allowed-record-type = ["AAAA"]
+      },
+      {
+      # for wildcard zones. Settings will be applied to all matching zones
+      type = "auth-configs"
+      zone = "*ent.com."
+      allowed-user-list = ["professor", "testuser"]
+      allowed-group-list = ["testing-group"]
+      allowed-record-type = ["A", "CNAME"]
+      }
+    ]
+  }
+
   # Note: This MUST match the Portal or strange errors will ensue, NoOpCrypto should not be used for production
   crypto {
     type = "vinyldns.core.crypto.NoOpCrypto"
diff --git a/modules/api/src/main/resources/application.conf b/modules/api/src/main/resources/application.conf
index 073b7065a..1667d9298 100644
--- a/modules/api/src/main/resources/application.conf
+++ b/modules/api/src/main/resources/application.conf
@@ -165,27 +165,10 @@ vinyldns {
     "ns1.parent.com4."
   ]
 
-# approved zones, individual users, users in groups and record types that are allowed for dotted hosts
-dotted-hosts = {
-  # for local testing
-  allowed-settings = [
-    {
-    type = "auth-configs"
-    zone = "dummy."
-    allowed-user-list = ["testuser"]
-    allowed-group-list = ["dummy-group"]
-    allowed-record-type = ["AAAA"]
-    },
-    {
-    # for wildcard zones. Settings will be applied to all matching zones
-    type = "auth-configs"
-    zone = "*ent.com."
-    allowed-user-list = ["professor", "testuser"]
-    allowed-group-list = ["testing-group"]
-    allowed-record-type = ["A", "CNAME"]
-    }
-  ]
-}
+  # approved zones, individual users, users in groups and record types that are allowed for dotted hosts
+  dotted-hosts = {
+    allowed-settings = []
+  }
 
   # Note: This MUST match the Portal or strange errors will ensue, NoOpCrypto should not be used for production
   crypto {
diff --git a/modules/api/src/main/resources/reference.conf b/modules/api/src/main/resources/reference.conf
index e353f10ce..a93327696 100644
--- a/modules/api/src/main/resources/reference.conf
+++ b/modules/api/src/main/resources/reference.conf
@@ -93,22 +93,22 @@ vinyldns {
   # approved zones, individual users, users in groups and record types that are allowed for dotted hosts
   dotted-hosts = {
     allowed-settings = [
-        {
-        # for wildcard zones. Settings will be applied to all matching zones
-        type = "auth-configs"
-        zone = "*ent.com*."
-        allowed-user-list = ["ok"]
-        allowed-group-list = ["dummy-group"]
-        allowed-record-type = ["CNAME"]
-        },
-        {
-        # for wildcard zones. Settings will be applied to all matching zones
-        type = "auth-configs"
-        zone = "dummy*."
-        allowed-user-list = ["sharedZoneUser"]
-        allowed-group-list = ["history-group1"]
-        allowed-record-type = ["A"]
-        }
+      {
+      # for wildcard zones. Settings will be applied to all matching zones
+      type = "auth-configs"
+      zone = "*ent.com*."
+      allowed-user-list = ["ok"]
+      allowed-group-list = ["dummy-group"]
+      allowed-record-type = ["CNAME"]
+      },
+      {
+      # for wildcard zones. Settings will be applied to all matching zones
+      type = "auth-configs"
+      zone = "dummy*."
+      allowed-user-list = ["sharedZoneUser"]
+      allowed-group-list = ["history-group1"]
+      allowed-record-type = ["A"]
+      }
     ]
   }
 
diff --git a/modules/docs/src/main/mdoc/operator/config-api.md b/modules/docs/src/main/mdoc/operator/config-api.md
index 2d820849a..d62bd0699 100644
--- a/modules/docs/src/main/mdoc/operator/config-api.md
+++ b/modules/docs/src/main/mdoc/operator/config-api.md
@@ -536,7 +536,50 @@ v6-discovery-nibble-boundaries {
   min = 5
   max = 20
 }
+```
 
+### Dotted Hosts
+
+Configuration setting that determines the zones, users (either individual or based on group) and record types that are 
+allowed to create dotted hosts. If only all the above are satisfied, one can create a dotted host in VinylDNS.
+
+Note the following: 
+1. The config `type = "auth-configs"` is a default which shouldn't be changed.
+2. Zones defined in the `zone` must always end with a dot. Eg: `comcast.com.`
+3. Wildcard character `*` can be used in `zone` to allow dotted hosts for all zones matching it.
+4. Individual users who are allowed to create dotted hosts are added to the `allowed-user-list` using their username.
+5. A set of users in a group who are allowed to create dotted hosts are added to the `allowed-group-list` using group name.
+6. The record types which are allowed while creating a dotted host is added to the `allowed-record-type`.
+
+```yaml
+# approved zones, individual users, users in groups and record types that are allowed for dotted hosts
+dotted-hosts = {
+   allowed-settings = [
+      {
+      type = "auth-configs"
+      zone = "dummy."
+      allowed-user-list = ["testuser"]
+      allowed-group-list = ["dummy-group"]
+      allowed-record-type = ["AAAA"]
+      },
+      {
+      # for wildcard zones. Settings will be applied to all matching zones
+      type = "auth-configs"
+      zone = "*ent.com."
+      allowed-user-list = ["professor", "testuser"]
+      allowed-group-list = ["testing-group"]
+      allowed-record-type = ["A", "CNAME"]
+      }
+   ]
+}
+```
+
+The config can be left empty as follows if we don't want to use it:
+
+```yaml
+dotted-hosts = {
+   allowed-settings = []
+}
 ```
 
 ### Full Example Config
@@ -713,6 +756,27 @@ v6-discovery-nibble-boundaries {
      }
   }
 
+  # approved zones, individual users, users in groups and record types that are allowed for dotted hosts
+  dotted-hosts = {
+     allowed-settings = [
+        {
+        type = "auth-configs"
+        zone = "dummy."
+        allowed-user-list = ["testuser"]
+        allowed-group-list = ["dummy-group"]
+        allowed-record-type = ["AAAA"]
+        },
+        {
+        # for wildcard zones. Settings will be applied to all matching zones
+        type = "auth-configs"
+        zone = "*ent.com."
+        allowed-user-list = ["professor", "testuser"]
+        allowed-group-list = ["testing-group"]
+        allowed-record-type = ["A", "CNAME"]
+        }
+     ]
+  }
+
   # true if you want to enable manual review for non-fatal errors
   manual-batch-review-enabled = true
 

From d47d2e1a1de128d238d90410105c26bd1af5e225 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 23 Sep 2022 13:17:08 +0530
Subject: [PATCH 116/147] Update documentation

---
 modules/api/src/main/resources/reference.conf     | 1 +
 modules/docs/src/main/mdoc/operator/config-api.md | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/modules/api/src/main/resources/reference.conf b/modules/api/src/main/resources/reference.conf
index a93327696..0ad8da47f 100644
--- a/modules/api/src/main/resources/reference.conf
+++ b/modules/api/src/main/resources/reference.conf
@@ -92,6 +92,7 @@ vinyldns {
 
   # approved zones, individual users, users in groups and record types that are allowed for dotted hosts
   dotted-hosts = {
+    # for local testing
     allowed-settings = [
       {
       # for wildcard zones. Settings will be applied to all matching zones
diff --git a/modules/docs/src/main/mdoc/operator/config-api.md b/modules/docs/src/main/mdoc/operator/config-api.md
index d62bd0699..6c462f8ae 100644
--- a/modules/docs/src/main/mdoc/operator/config-api.md
+++ b/modules/docs/src/main/mdoc/operator/config-api.md
@@ -574,6 +574,12 @@ dotted-hosts = {
 }
 ```
 
+In the above, the dotted hosts can be created only in the zone `dummy.` and zones matching `*ent.com.` (parent.com., child.parent.com.)
+
+Also, it must satisfy the allowed users, group users and record type of the respective zone to create a dotted host.
+
+For eg, we can't create a dotted host with `CNAME` record type in the zone `dummy.` as it's not in `allowed-record-type`
+
 The config can be left empty as follows if we don't want to use it:
 
 ```yaml

From 97d9a2c3bb1571d7108678238f746e9e9a45fc88 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 23 Sep 2022 13:38:53 +0530
Subject: [PATCH 117/147] Remove unused changes

---
 .../vinyldns/api/domain/record/RecordSetValidations.scala   | 2 +-
 .../scala/vinyldns/core/domain/DomainValidationErrors.scala | 6 ------
 .../main/scala/vinyldns/core/domain/SingleChangeError.scala | 3 +--
 3 files changed, 2 insertions(+), 9 deletions(-)

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 1d7c3a427..a620b3afd 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
@@ -123,7 +123,7 @@ object RecordSetValidations {
     ensuring(
       InvalidRequest(
         s"Record with fqdn '${newRecordSet.name}.${zone.name}' cannot be created. " +
-          s"Please check if user has permission or if there's a zone/record that already exist and make the change there."
+          s"Please check if there's a record with the same fqdn and type already exist and make the change there."
       )
     )(
       (newRecordSet.name != zone.name || existingRecordSet.exists(_.name == newRecordSet.name)) && recordFqdnDoesNotExist && isRecordTypeAndUserAllowed
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
index cea5fb3df..c258ad975 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/DomainValidationErrors.scala
@@ -121,12 +121,6 @@ final case class ZoneDiscoveryError(name: String, fatal: Boolean = false)
       "If zone exists, then it must be connected to in VinylDNS."
 }
 
-final case class DottedHostError(name: String, zone: String) extends DomainValidationError {
-  def message: String =
-    s"Record with fqdn '$name.$zone' cannot be created. " +
-      s"Please check if user has permission or if there's a zone/record that already exist and make the change there."
-}
-
 final case class RecordAlreadyExists(name: String) extends DomainValidationError {
   def message: String =
     s"""Record "$name" Already Exists: cannot add an existing record; to update it, """ +
diff --git a/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala b/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala
index 63f1e33a9..c7805e74c 100644
--- a/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala
+++ b/modules/core/src/main/scala/vinyldns/core/domain/SingleChangeError.scala
@@ -32,7 +32,7 @@ object DomainValidationErrorType extends Enumeration {
   val ChangeLimitExceeded, BatchChangeIsEmpty, GroupDoesNotExist, NotAMemberOfOwnerGroup,
   InvalidDomainName, InvalidCname, InvalidLength, InvalidEmail, InvalidRecordType, InvalidPortNumber,
   InvalidIpv4Address, InvalidIpv6Address, InvalidIPAddress, InvalidTTL, InvalidMxPreference,
-  InvalidBatchRecordType, ZoneDiscoveryError, DottedHostError, RecordAlreadyExists, RecordDoesNotExist,
+  InvalidBatchRecordType, ZoneDiscoveryError, RecordAlreadyExists, RecordDoesNotExist,
   CnameIsNotUniqueError, UserIsNotAuthorized, UserIsNotAuthorizedError, RecordNameNotUniqueInBatch,
   RecordInReverseZoneError, HighValueDomainError, MissingOwnerGroupId, ExistingMultiRecordError,
   NewMultiRecordError, CnameAtZoneApexError, RecordRequiresManualReview, UnsupportedOperation,
@@ -58,7 +58,6 @@ object DomainValidationErrorType extends Enumeration {
       case _: InvalidMxPreference => InvalidMxPreference
       case _: InvalidBatchRecordType => InvalidBatchRecordType
       case _: ZoneDiscoveryError => ZoneDiscoveryError
-      case _: DottedHostError => DottedHostError
       case _: RecordAlreadyExists => RecordAlreadyExists
       case _: RecordDoesNotExist => RecordDoesNotExist
       case _: CnameIsNotUniqueError => CnameIsNotUniqueError

From 4cf0d8a9a8015297d1ed0d091be95f41e13b44c0 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 23 Sep 2022 13:57:43 +0530
Subject: [PATCH 118/147] Update doc

---
 modules/docs/src/main/mdoc/operator/config-api.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/docs/src/main/mdoc/operator/config-api.md b/modules/docs/src/main/mdoc/operator/config-api.md
index 6c462f8ae..338a2df7c 100644
--- a/modules/docs/src/main/mdoc/operator/config-api.md
+++ b/modules/docs/src/main/mdoc/operator/config-api.md
@@ -549,7 +549,9 @@ Note the following:
 3. Wildcard character `*` can be used in `zone` to allow dotted hosts for all zones matching it.
 4. Individual users who are allowed to create dotted hosts are added to the `allowed-user-list` using their username.
 5. A set of users in a group who are allowed to create dotted hosts are added to the `allowed-group-list` using group name.
-6. The record types which are allowed while creating a dotted host is added to the `allowed-record-type`.
+6. If the user is either in `allowed-user-list` or `allowed-group-list`, they are allowed to create a dotted host. It is
+not necessary for the user to be in both `allowed-user-list` and `allowed-group-list`.
+7. The record types which are allowed while creating a dotted host is added to the `allowed-record-type`.
 
 ```yaml
 # approved zones, individual users, users in groups and record types that are allowed for dotted hosts
@@ -576,7 +578,7 @@ dotted-hosts = {
 
 In the above, the dotted hosts can be created only in the zone `dummy.` and zones matching `*ent.com.` (parent.com., child.parent.com.)
 
-Also, it must satisfy the allowed users, group users and record type of the respective zone to create a dotted host.
+Also, it must satisfy the allowed users or group users and record type of the respective zone to create a dotted host.
 
 For eg, we can't create a dotted host with `CNAME` record type in the zone `dummy.` as it's not in `allowed-record-type`
 

From 371404a5e5c5221d977af9970fc8012e5ae9b716 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 23 Sep 2022 14:02:11 +0530
Subject: [PATCH 119/147] Update doc

---
 modules/docs/src/main/mdoc/operator/config-api.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/docs/src/main/mdoc/operator/config-api.md b/modules/docs/src/main/mdoc/operator/config-api.md
index 338a2df7c..4038bdb85 100644
--- a/modules/docs/src/main/mdoc/operator/config-api.md
+++ b/modules/docs/src/main/mdoc/operator/config-api.md
@@ -580,7 +580,9 @@ In the above, the dotted hosts can be created only in the zone `dummy.` and zone
 
 Also, it must satisfy the allowed users or group users and record type of the respective zone to create a dotted host.
 
-For eg, we can't create a dotted host with `CNAME` record type in the zone `dummy.` as it's not in `allowed-record-type`
+For eg, we can't create a dotted host with `CNAME` record type in the zone `dummy.` as it's not in `allowed-record-type`.
+And the user `professor` can't create a dotted host in the zone `dummy.` as the user is not in `allowed-user-list` or 
+`allowed-group-list`.
 
 The config can be left empty as follows if we don't want to use it:
 

From 18333fe3ab09f6f972fef6884bbfa14269ae735d Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 26 Sep 2022 11:57:27 +0530
Subject: [PATCH 120/147] Update config

---
 modules/api/src/it/resources/application.conf |  2 -
 modules/api/src/main/resources/reference.conf |  2 -
 .../api/config/DottedHostsConfig.scala        | 11 ++--
 .../api/domain/record/RecordSetService.scala  | 65 +++++++++----------
 .../domain/record/RecordSetServiceSpec.scala  | 37 ++++-------
 .../record/RecordSetValidationsSpec.scala     |  5 +-
 .../docs/src/main/mdoc/operator/config-api.md | 19 ++----
 7 files changed, 56 insertions(+), 85 deletions(-)

diff --git a/modules/api/src/it/resources/application.conf b/modules/api/src/it/resources/application.conf
index 8d506c8e7..e14cb169d 100644
--- a/modules/api/src/it/resources/application.conf
+++ b/modules/api/src/it/resources/application.conf
@@ -168,7 +168,6 @@ vinyldns {
     # for local testing
     allowed-settings = [
       {
-      type = "auth-configs"
       zone = "dummy."
       allowed-user-list = ["testuser"]
       allowed-group-list = ["dummy-group"]
@@ -176,7 +175,6 @@ vinyldns {
       },
       {
       # for wildcard zones. Settings will be applied to all matching zones
-      type = "auth-configs"
       zone = "*ent.com."
       allowed-user-list = ["professor", "testuser"]
       allowed-group-list = ["testing-group"]
diff --git a/modules/api/src/main/resources/reference.conf b/modules/api/src/main/resources/reference.conf
index 0ad8da47f..16c7724f4 100644
--- a/modules/api/src/main/resources/reference.conf
+++ b/modules/api/src/main/resources/reference.conf
@@ -96,7 +96,6 @@ vinyldns {
     allowed-settings = [
       {
       # for wildcard zones. Settings will be applied to all matching zones
-      type = "auth-configs"
       zone = "*ent.com*."
       allowed-user-list = ["ok"]
       allowed-group-list = ["dummy-group"]
@@ -104,7 +103,6 @@ vinyldns {
       },
       {
       # for wildcard zones. Settings will be applied to all matching zones
-      type = "auth-configs"
       zone = "dummy*."
       allowed-user-list = ["sharedZoneUser"]
       allowed-group-list = ["history-group1"]
diff --git a/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala b/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
index 183b1b4e0..3e4429898 100644
--- a/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
+++ b/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
@@ -19,14 +19,13 @@ package vinyldns.api.config
 import pureconfig.ConfigReader
 import pureconfig.generic.auto._
 
-sealed trait AuthMethod
-final case class AuthConfigs(zone: String, allowedUserList: List[String], allowedGroupList: List[String], allowedRecordType: List[String]) extends AuthMethod
-final case class DottedHostsConfig(authMethods: List[AuthMethod])
+final case class AuthConfigs(zone: String, allowedUserList: List[String], allowedGroupList: List[String], allowedRecordType: List[String])
+final case class DottedHostsConfig(authConfigs: List[AuthConfigs])
 
 object DottedHostsConfig {
   implicit val configReader: ConfigReader[DottedHostsConfig] =
-    ConfigReader.forProduct1[DottedHostsConfig, List[AuthMethod]](
+    ConfigReader.forProduct1[DottedHostsConfig, List[AuthConfigs]](
       "allowed-settings",
-    )(authMethods =>
-      DottedHostsConfig(authMethods))
+    )(authConfigs =>
+      DottedHostsConfig(authConfigs))
 }
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 210d26937..309b1054d 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
@@ -110,9 +110,7 @@ class RecordSetService(
       ownerGroup <- getGroupIfProvided(rsForValidations.ownerGroupId)
       _ <- canUseOwnerGroup(rsForValidations.ownerGroupId, ownerGroup, auth).toResult
       _ <- noCnameWithNewName(rsForValidations, existingRecordsWithName, zone).toResult
-      authZones = dottedHostsConfig.authMethods.map {
-        case y:AuthConfigs => y.zone
-      }
+      authZones = dottedHostsConfig.authConfigs.map(x => x.zone)
       allowedZoneList <- getAllowedZones(authZones).toResult[Set[String]]
       isInAllowedUsers = checkIfInAllowedUsers(zone, dottedHostsConfig, auth)
       isUserInAllowedGroups <- checkIfInAllowedGroups(zone, dottedHostsConfig, auth).toResult[Boolean]
@@ -159,9 +157,7 @@ class RecordSetService(
         validateRecordLookupAgainstDnsBackend
       )
       _ <- noCnameWithNewName(rsForValidations, existingRecordsWithName, zone).toResult
-      authZones = dottedHostsConfig.authMethods.map {
-        case y:AuthConfigs => y.zone
-      }
+      authZones = dottedHostsConfig.authConfigs.map(x => x.zone)
       allowedZoneList <- getAllowedZones(authZones).toResult[Set[String]]
       isInAllowedUsers = checkIfInAllowedUsers(zone, dottedHostsConfig, auth)
       isUserInAllowedGroups <- checkIfInAllowedGroups(zone, dottedHostsConfig, auth).toResult[Boolean]
@@ -242,21 +238,20 @@ class RecordSetService(
 
   // Check if user is allowed to create dotted hosts using the users present in dotted hosts config
   def checkIfInAllowedUsers(zone: Zone, config: DottedHostsConfig, auth: AuthPrincipal): Boolean = {
-    val configZones = config.authMethods.map{
-      case x: AuthConfigs => x.zone
-    }
+    val configZones = config.authConfigs.map(x => x.zone)
     val zoneName = if(zone.name.takeRight(1) != ".") zone.name + "." else zone.name
     val dottedZoneConfig = configZones.filter(_.contains("*")).map(_.replace("*", "[A-Za-z0-9.]*"))
     val isContainWildcardZone = dottedZoneConfig.exists(x => zoneName.matches(x))
     val isContainNormalZone = configZones.contains(zoneName)
     if(isContainWildcardZone || isContainNormalZone){
-      val users = config.authMethods.flatMap {
-        case x: AuthConfigs => if (x.zone.contains("*")) {
-          val wildcardZone = x.zone.replace("*", "[A-Za-z0-9.]*")
-          if(zoneName.matches(wildcardZone)) x.allowedUserList else List.empty
-        } else {
-          if (x.zone == zoneName) x.allowedUserList else List.empty
-        }
+      val users = config.authConfigs.flatMap {
+        x: AuthConfigs =>
+          if (x.zone.contains("*")) {
+            val wildcardZone = x.zone.replace("*", "[A-Za-z0-9.]*")
+            if (zoneName.matches(wildcardZone)) x.allowedUserList else List.empty
+          } else {
+            if (x.zone == zoneName) x.allowedUserList else List.empty
+          }
       }
       if(users.contains(auth.signedInUser.userName)){
         true
@@ -272,21 +267,20 @@ class RecordSetService(
 
   // Check if user is allowed to create dotted hosts using the users present in dotted hosts config
   def checkIfInAllowedRecordType(zone: Zone, config: DottedHostsConfig, rs: RecordSet): Boolean = {
-    val configZones = config.authMethods.map{
-      case x: AuthConfigs => x.zone
-    }
+    val configZones = config.authConfigs.map(x => x.zone)
     val zoneName = if(zone.name.takeRight(1) != ".") zone.name + "." else zone.name
     val dottedZoneConfig = configZones.filter(_.contains("*")).map(_.replace("*", "[A-Za-z0-9.]*"))
     val isContainWildcardZone = dottedZoneConfig.exists(x => zoneName.matches(x))
     val isContainNormalZone = configZones.contains(zoneName)
     if(isContainWildcardZone || isContainNormalZone){
-      val rType = config.authMethods.flatMap {
-        case x: AuthConfigs => if (x.zone.contains("*")) {
-          val wildcardZone = x.zone.replace("*", "[A-Za-z0-9.]*")
-          if(zoneName.matches(wildcardZone)) x.allowedRecordType else List.empty
-        } else {
-          if (x.zone == zoneName) x.allowedRecordType else List.empty
-        }
+      val rType = config.authConfigs.flatMap {
+        x: AuthConfigs =>
+          if (x.zone.contains("*")) {
+            val wildcardZone = x.zone.replace("*", "[A-Za-z0-9.]*")
+            if (zoneName.matches(wildcardZone)) x.allowedRecordType else List.empty
+          } else {
+            if (x.zone == zoneName) x.allowedRecordType else List.empty
+          }
       }
       if(rType.contains(rs.typ.toString)){
         true
@@ -302,21 +296,20 @@ class RecordSetService(
 
   // Check if user is allowed to create dotted hosts using the groups present in dotted hosts config
   def checkIfInAllowedGroups(zone: Zone, config: DottedHostsConfig, auth: AuthPrincipal): IO[Boolean] = {
-    val configZones = config.authMethods.map{
-      case x: AuthConfigs => x.zone
-    }
+    val configZones = config.authConfigs.map(x => x.zone)
     val zoneName = if(zone.name.takeRight(1) != ".") zone.name + "." else zone.name
     val dottedZoneConfig = configZones.filter(_.contains("*")).map(_.replace("*", "[A-Za-z0-9.]*"))
     val isContainWildcardZone = dottedZoneConfig.exists(x => zoneName.matches(x))
     val isContainNormalZone = configZones.contains(zoneName)
     val groups = if(isContainWildcardZone || isContainNormalZone){
-      config.authMethods.flatMap {
-        case x: AuthConfigs => if (x.zone.contains("*")) {
-          val wildcardZone = x.zone.replace("*", "[A-Za-z0-9.]*")
-          if(zoneName.matches(wildcardZone)) x.allowedGroupList else List.empty
-        } else {
-          if (x.zone == zoneName) x.allowedGroupList else List.empty
-        }
+      config.authConfigs.flatMap {
+        x: AuthConfigs =>
+          if (x.zone.contains("*")) {
+            val wildcardZone = x.zone.replace("*", "[A-Za-z0-9.]*")
+            if (zoneName.matches(wildcardZone)) x.allowedGroupList else List.empty
+          } else {
+            if (x.zone == zoneName) x.allowedGroupList else List.empty
+          }
       }
     }
     else {
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
index f5257eaa0..05978d393 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
@@ -128,21 +128,20 @@ class RecordSetServiceSpec
   )
 
   def getDottedHostsConfigGroupsAllowed(zone: Zone, config: DottedHostsConfig): List[String] = {
-    val configZones = config.authMethods.map {
-      case x: AuthConfigs => x.zone
-    }
+    val configZones = config.authConfigs.map(x => x.zone)
     val zoneName = if(zone.name.takeRight(1) != ".") zone.name + "." else zone.name
     val dottedZoneConfig = configZones.filter(_.contains("*")).map(_.replace("*", "[A-Za-z.]*"))
     val isContainWildcardZone = dottedZoneConfig.exists(x => zoneName.substring(0, zoneName.length - 1).matches(x))
     val isContainNormalZone = configZones.contains(zoneName)
     val groups = if (isContainWildcardZone || isContainNormalZone) {
-      config.authMethods.flatMap {
-        case x: AuthConfigs => if (x.zone.contains("*")) {
-          val wildcardZone = x.zone.replace("*", "[A-Za-z.]*")
-          if (zoneName.substring(0, zoneName.length - 1).matches(wildcardZone)) x.allowedGroupList else List.empty
-        } else {
-          if (x.zone == zoneName) x.allowedGroupList else List.empty
-        }
+      config.authConfigs.flatMap {
+        x: AuthConfigs =>
+          if (x.zone.contains("*")) {
+            val wildcardZone = x.zone.replace("*", "[A-Za-z.]*")
+            if (zoneName.substring(0, zoneName.length - 1).matches(wildcardZone)) x.allowedGroupList else List.empty
+          } else {
+            if (x.zone == zoneName) x.allowedGroupList else List.empty
+          }
       }
     }
     else {
@@ -151,9 +150,7 @@ class RecordSetServiceSpec
     groups
   }
 
-  val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authMethods.map {
-    case y:AuthConfigs => y.zone
-  }
+  val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authConfigs.map(x => x.zone)
 
   val dottedHostsConfigGroupsAllowed: List[String] = getDottedHostsConfigGroupsAllowed(okZone, VinylDNSTestHelpers.dottedHostsConfig)
 
@@ -563,9 +560,7 @@ class RecordSetServiceSpec
     val record =
       cname.copy(name = "new.name", zoneId = dottedZone.id, status = RecordSetStatus.Active)
 
-    val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authMethods.map {
-      case y:AuthConfigs => y.zone
-    }
+    val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authConfigs.map(x => x.zone)
 
     val dottedHostsConfigGroupsAllowed: List[String] = getDottedHostsConfigGroupsAllowed(dottedZone, VinylDNSTestHelpers.dottedHostsConfig)
 
@@ -609,9 +604,7 @@ class RecordSetServiceSpec
     val record =
       cname.copy(name = "new.name", zoneId = xyzZone.id, status = RecordSetStatus.Active)
 
-    val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authMethods.map {
-      case y:AuthConfigs => y.zone
-    }
+    val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authConfigs.map(x => x.zone)
 
     val dottedHostsConfigGroupsAllowed: List[String] = getDottedHostsConfigGroupsAllowed(xyzZone, VinylDNSTestHelpers.dottedHostsConfig)
 
@@ -691,9 +684,7 @@ class RecordSetServiceSpec
     val record =
       cname.copy(name = "new.name", zoneId = abcZone.id, status = RecordSetStatus.Active)
 
-    val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authMethods.map {
-      case y:AuthConfigs => y.zone
-    }
+    val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authConfigs.map(x => x.zone)
 
     val dottedHostsConfigGroupsAllowed: List[String] = getDottedHostsConfigGroupsAllowed(abcZone, VinylDNSTestHelpers.dottedHostsConfig)
 
@@ -734,7 +725,7 @@ class RecordSetServiceSpec
     val record =
       aaaa.copy(name = "new.name", zoneId = dottedZone.id, status = RecordSetStatus.Active)
 
-    val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authMethods.map {
+    val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authConfigs.map {
       case y:AuthConfigs => y.zone
     }
 
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala
index f39600191..f07efa589 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala
@@ -25,7 +25,6 @@ import vinyldns.core.domain.record.RecordType._
 import vinyldns.api.domain.zone.{InvalidGroupError, InvalidRequest, PendingUpdateError, RecordSetAlreadyExists, RecordSetValidation}
 import vinyldns.api.ResultHelpers
 import vinyldns.api.VinylDNSTestHelpers
-import vinyldns.api.config.AuthConfigs
 import vinyldns.core.TestRecordSetData._
 import vinyldns.core.TestZoneData._
 import vinyldns.core.TestMembershipData._
@@ -45,9 +44,7 @@ class RecordSetValidationsSpec
 
   import RecordSetValidations._
 
-  val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authMethods.map {
-    case y:AuthConfigs => y.zone
-  }
+  val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authConfigs.map(x => x.zone)
 
   "RecordSetValidations" should {
     "validRecordTypes" should {
diff --git a/modules/docs/src/main/mdoc/operator/config-api.md b/modules/docs/src/main/mdoc/operator/config-api.md
index 4038bdb85..576dd63aa 100644
--- a/modules/docs/src/main/mdoc/operator/config-api.md
+++ b/modules/docs/src/main/mdoc/operator/config-api.md
@@ -543,22 +543,20 @@ v6-discovery-nibble-boundaries {
 Configuration setting that determines the zones, users (either individual or based on group) and record types that are 
 allowed to create dotted hosts. If only all the above are satisfied, one can create a dotted host in VinylDNS.
 
-Note the following: 
-1. The config `type = "auth-configs"` is a default which shouldn't be changed.
-2. Zones defined in the `zone` must always end with a dot. Eg: `comcast.com.`
-3. Wildcard character `*` can be used in `zone` to allow dotted hosts for all zones matching it.
-4. Individual users who are allowed to create dotted hosts are added to the `allowed-user-list` using their username.
-5. A set of users in a group who are allowed to create dotted hosts are added to the `allowed-group-list` using group name.
-6. If the user is either in `allowed-user-list` or `allowed-group-list`, they are allowed to create a dotted host. It is
+Note the following:
+1. Zones defined in the `zone` must always end with a dot. Eg: `comcast.com.`
+2. Wildcard character `*` can be used in `zone` to allow dotted hosts for all zones matching it.
+3. Individual users who are allowed to create dotted hosts are added to the `allowed-user-list` using their username.
+4. A set of users in a group who are allowed to create dotted hosts are added to the `allowed-group-list` using group name.
+5. If the user is either in `allowed-user-list` or `allowed-group-list`, they are allowed to create a dotted host. It is
 not necessary for the user to be in both `allowed-user-list` and `allowed-group-list`.
-7. The record types which are allowed while creating a dotted host is added to the `allowed-record-type`.
+6. The record types which are allowed while creating a dotted host is added to the `allowed-record-type`.
 
 ```yaml
 # approved zones, individual users, users in groups and record types that are allowed for dotted hosts
 dotted-hosts = {
    allowed-settings = [
       {
-      type = "auth-configs"
       zone = "dummy."
       allowed-user-list = ["testuser"]
       allowed-group-list = ["dummy-group"]
@@ -566,7 +564,6 @@ dotted-hosts = {
       },
       {
       # for wildcard zones. Settings will be applied to all matching zones
-      type = "auth-configs"
       zone = "*ent.com."
       allowed-user-list = ["professor", "testuser"]
       allowed-group-list = ["testing-group"]
@@ -770,7 +767,6 @@ dotted-hosts = {
   dotted-hosts = {
      allowed-settings = [
         {
-        type = "auth-configs"
         zone = "dummy."
         allowed-user-list = ["testuser"]
         allowed-group-list = ["dummy-group"]
@@ -778,7 +774,6 @@ dotted-hosts = {
         },
         {
         # for wildcard zones. Settings will be applied to all matching zones
-        type = "auth-configs"
         zone = "*ent.com."
         allowed-user-list = ["professor", "testuser"]
         allowed-group-list = ["testing-group"]

From 524525e67b333f93fa35273b570182fb95445fc6 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 3 Oct 2022 14:22:21 +0530
Subject: [PATCH 121/147] Address PR comments

---
 .../api/domain/record/RecordSetService.scala  |  7 ++--
 .../domain/record/RecordSetValidations.scala  | 32 ++++++++++++++++---
 .../tests/recordsets/create_recordset_test.py |  8 ++---
 .../zones/zoneTabs/manageRecords.scala.html   |  2 +-
 4 files changed, 36 insertions(+), 13 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 309b1054d..44d745584 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
@@ -91,10 +91,12 @@ class RecordSetService(
   def addRecordSet(recordSet: RecordSet, auth: AuthPrincipal): Result[ZoneCommandResult] =
     for {
       zone <- getZone(recordSet.zoneId)
-      change <- RecordSetChangeGenerator.forAdd(recordSet, zone, Some(auth)).toResult
+      authZones = dottedHostsConfig.authConfigs.map(x => x.zone)
+      newRs = if(authZones.contains(zone.name) && recordSet.name.takeRight(1) == ".") recordSet.copy(name = recordSet.name.dropRight(1)) else recordSet
+      change <- RecordSetChangeGenerator.forAdd(newRs, zone, Some(auth)).toResult
       // because changes happen to the RS in forAdd itself, converting 1st and validating on that
       rsForValidations = change.recordSet
-      _ <- isNotHighValueDomain(recordSet, zone, highValueDomainConfig).toResult
+      _ <- isNotHighValueDomain(newRs, zone, highValueDomainConfig).toResult
       _ <- recordSetDoesNotExist(
         backendResolver.resolve,
         zone,
@@ -110,7 +112,6 @@ class RecordSetService(
       ownerGroup <- getGroupIfProvided(rsForValidations.ownerGroupId)
       _ <- canUseOwnerGroup(rsForValidations.ownerGroupId, ownerGroup, auth).toResult
       _ <- noCnameWithNewName(rsForValidations, existingRecordsWithName, zone).toResult
-      authZones = dottedHostsConfig.authConfigs.map(x => x.zone)
       allowedZoneList <- getAllowedZones(authZones).toResult[Set[String]]
       isInAllowedUsers = checkIfInAllowedUsers(zone, dottedHostsConfig, auth)
       isUserInAllowedGroups <- checkIfInAllowedGroups(zone, dottedHostsConfig, auth).toResult[Boolean]
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 a620b3afd..d12a4f3ea 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
@@ -101,18 +101,24 @@ object RecordSetValidations {
   ): Either[Throwable, Unit] = {
 
     val zoneName = if(zone.name.takeRight(1) != ".") zone.name + "." else zone.name
-    // Check if the zone of the record set is present in dotted hosts config list
+    // Check if the zone of the recordset is present in dotted hosts config list
     val isDomainAllowed = dottedHostZoneConfig.contains(zoneName)
+
     // Check if record set contains dot and if it is in zone which is allowed to have dotted records from dotted hosts config
-    if((newRecordSet.name.contains(".") || !recordFqdnDoesNotExist) && isDomainAllowed && isRecordTypeAndUserAllowed && newRecordSet.name != zone.name) {
-      isDotted(newRecordSet, zone, existingRecordSet, recordFqdnDoesNotExist, isRecordTypeAndUserAllowed)
+    if(newRecordSet.name.contains(".") && isDomainAllowed && newRecordSet.name != zone.name) {
+      if(!isRecordTypeAndUserAllowed){
+        isUserAndRecordTypeAuthorized(newRecordSet, zone, existingRecordSet, recordFqdnDoesNotExist, isRecordTypeAndUserAllowed)
+      }
+      else {
+        isDotted(newRecordSet, zone, existingRecordSet, recordFqdnDoesNotExist, isRecordTypeAndUserAllowed)
+      }
     }
     else {
       isNotDotted(newRecordSet, zone, existingRecordSet)
     }
   }
 
-  // Check if the user is not authorized and if there is a zone/record already present which conflicts with the new dotted record. If so, throw an error
+  // For dotted host. Check if a record is already present which conflicts with the new dotted record. If so, throw an error
   def isDotted(
      newRecordSet: RecordSet,
      zone: Zone,
@@ -129,6 +135,22 @@ object RecordSetValidations {
       (newRecordSet.name != zone.name || existingRecordSet.exists(_.name == newRecordSet.name)) && recordFqdnDoesNotExist && isRecordTypeAndUserAllowed
     )
 
+  // For dotted host. Check if the user is authorized and the record type is allowed. If not, throw an error
+  def isUserAndRecordTypeAuthorized(
+     newRecordSet: RecordSet,
+     zone: Zone,
+     existingRecordSet: Option[RecordSet] = None,
+     recordFqdnDoesNotExist: Boolean,
+     isRecordTypeAndUserAllowed: Boolean
+  ): Either[Throwable, Unit] =
+    ensuring(
+      InvalidRequest(
+        s"Record type is not allowed or the user is not authorized to create a dotted host in the zone '${zone.name}'"
+      )
+    )(
+      (newRecordSet.name != zone.name || existingRecordSet.exists(_.name == newRecordSet.name)) && recordFqdnDoesNotExist && isRecordTypeAndUserAllowed
+    )
+
   // Check if the recordset contains dot but is not in the allowed zones to create dotted records. If so, throw an error
   def isNotDotted(
       newRecordSet: RecordSet,
@@ -151,7 +173,7 @@ object RecordSetValidations {
       zone: Zone,
       existingRecordSet: Option[RecordSet],
       approvedNameServers: List[Regex],
-      recordFqdnDoesNotExist: Boolean = true,
+      recordFqdnDoesNotExist: Boolean,
       dottedHostZoneConfig: Set[String],
       isRecordTypeAndUserAllowed: Boolean
   ): Either[Throwable, Unit] =
diff --git a/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py b/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py
index 514bf8c40..f3f768777 100644
--- a/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py
+++ b/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py
@@ -526,8 +526,8 @@ def test_create_dotted_a_record_not_apex_fails_when_dotted_hosts_config_not_sati
 
     zone_name = shared_zone_test_context.parent_zone["name"]
     error = client.create_recordset(dotted_host_a_record, status=422)
-    assert_that(error, is_("Record with name " + dotted_host_a_record["name"] + " and type A is a dotted host which "
-                                                                                "is not allowed in zone " + zone_name))
+    assert_that(error, is_("Record type is not allowed or the user is not authorized to create a dotted host in the "
+                           "zone '" + zone_name + "'"))
 
 
 def test_create_dotted_a_record_succeeds_if_all_dotted_hosts_config_satisfies(shared_zone_test_context):
@@ -627,8 +627,8 @@ def test_create_dotted_cname_record_fails_when_dotted_hosts_config_not_satisfied
     }
 
     error = client.create_recordset(dotted_host_cname_record, status=422)
-    assert_that(error,
-                is_(f'Record with name dot.ted and type CNAME is a dotted host which is not allowed in zone {zone["name"]}'))
+    assert_that(error, is_("Record type is not allowed or the user is not authorized to create a dotted host in the "
+                           "zone '" + zone["name"] + "'"))
 
 
 def test_create_dotted_cname_record_succeeds_if_all_dotted_hosts_config_satisfies(shared_zone_test_context):
diff --git a/modules/portal/app/views/zones/zoneTabs/manageRecords.scala.html b/modules/portal/app/views/zones/zoneTabs/manageRecords.scala.html
index 850bd8a81..61272b245 100644
--- a/modules/portal/app/views/zones/zoneTabs/manageRecords.scala.html
+++ b/modules/portal/app/views/zones/zoneTabs/manageRecords.scala.html
@@ -122,7 +122,7 @@
                 <tr ng-repeat="(recordName, record) in records track by $index">
                     <td>
                         <div ng-if="record.isDotted && record.type != 'TXT' && record.type != 'SRV' && record.type != 'NAPTR'" class="text-danger wrap-long-text" data-toggle="tooltip" data-placement="top"
-                        title="Dotted hosts are invalid! Please delete or update without a '.'">
+                        title="This is a dotted host!">
                             {{record.name}} <span class="fa fa-warning" />
                         </div>
                         <div class="wrap-long-text" ng-if="!record.isDotted || (record.type != 'TXT' || record.type != 'SRV' || record.type != 'NAPTR')">

From 5950a84215c62cf1730153742cf6fbb0d5e4fb78 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 7 Oct 2022 15:13:32 +0530
Subject: [PATCH 123/147] Address PR comments

---
 .../scala/vinyldns/api/domain/record/RecordSetService.scala | 2 +-
 .../vinyldns/api/domain/record/RecordSetValidations.scala   | 2 +-
 .../functional/tests/recordsets/create_recordset_test.py    | 4 ++--
 .../api/domain/record/RecordSetValidationsSpec.scala        | 6 ------
 modules/docs/src/main/mdoc/operator/config-api.md           | 2 +-
 5 files changed, 5 insertions(+), 11 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 44d745584..8041a3320 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
@@ -266,7 +266,7 @@ class RecordSetService(
     }
   }
 
-  // Check if user is allowed to create dotted hosts using the users present in dotted hosts config
+  // Check if user is allowed to create dotted hosts using the record types present in dotted hosts config
   def checkIfInAllowedRecordType(zone: Zone, config: DottedHostsConfig, rs: RecordSet): Boolean = {
     val configZones = config.authConfigs.map(x => x.zone)
     val zoneName = if(zone.name.takeRight(1) != ".") zone.name + "." else zone.name
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 d12a4f3ea..58e35b518 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
@@ -129,7 +129,7 @@ object RecordSetValidations {
     ensuring(
       InvalidRequest(
         s"Record with fqdn '${newRecordSet.name}.${zone.name}' cannot be created. " +
-          s"Please check if there's a record with the same fqdn and type already exist and make the change there."
+          s"Please check if a record with the same FQDN and type already exist and make the change there."
       )
     )(
       (newRecordSet.name != zone.name || existingRecordSet.exists(_.name == newRecordSet.name)) && recordFqdnDoesNotExist && isRecordTypeAndUserAllowed
diff --git a/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py b/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py
index f3f768777..d3705298d 100644
--- a/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py
+++ b/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py
@@ -530,7 +530,7 @@ def test_create_dotted_a_record_not_apex_fails_when_dotted_hosts_config_not_sati
                            "zone '" + zone_name + "'"))
 
 
-def test_create_dotted_a_record_succeeds_if_all_dotted_hosts_config_satisfies(shared_zone_test_context):
+def test_create_dotted_a_record_succeeds_if_all_dotted_hosts_config_satisfied(shared_zone_test_context):
     """
     Test that creating a A record set with dotted host record name succeeds
     Here the zone, user (in group) and record type is allowed. Hence the test succeeds
@@ -631,7 +631,7 @@ def test_create_dotted_cname_record_fails_when_dotted_hosts_config_not_satisfied
                            "zone '" + zone["name"] + "'"))
 
 
-def test_create_dotted_cname_record_succeeds_if_all_dotted_hosts_config_satisfies(shared_zone_test_context):
+def test_create_dotted_cname_record_succeeds_if_all_dotted_hosts_config_satisfied(shared_zone_test_context):
     """
     Test that creating a CNAME record set with dotted host record name succeeds.
     Here the zone, user (individual) and record type is allowed. Hence the test succeeds
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala
index f07efa589..10fd0a99e 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala
@@ -197,12 +197,6 @@ class RecordSetValidationsSpec
         leftValue(isDotted(test, okZone, None, true, false)) shouldBe an[InvalidRequest]
       }
 
-      "return a failure for a dotted record name that matches the zone name" in {
-        val test = aaaa.copy(name = "ok.www.comcast.net")
-        val zone = okZone.copy(name = "ok.www.comcast.net")
-        leftValue(isDotted(test, zone, None, true, true)) shouldBe an[InvalidRequest]
-      }
-
       "return success for a dotted record if it does not already have a record or zone with same name and user is allowed" in {
         val test = aaaa.copy(name = "this.passes")
         isDotted(test, okZone, None, true, true) should be(right)
diff --git a/modules/docs/src/main/mdoc/operator/config-api.md b/modules/docs/src/main/mdoc/operator/config-api.md
index 576dd63aa..c1ad37b6e 100644
--- a/modules/docs/src/main/mdoc/operator/config-api.md
+++ b/modules/docs/src/main/mdoc/operator/config-api.md
@@ -579,7 +579,7 @@ Also, it must satisfy the allowed users or group users and record type of the re
 
 For eg, we can't create a dotted host with `CNAME` record type in the zone `dummy.` as it's not in `allowed-record-type`.
 And the user `professor` can't create a dotted host in the zone `dummy.` as the user is not in `allowed-user-list` or 
-`allowed-group-list`.
+`allowed-group-list` (not part of `dummy-group`).
 
 The config can be left empty as follows if we don't want to use it:
 

From 91dea767741b935cf8278dcac44372992ad4fced Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 7 Oct 2022 16:02:03 +0530
Subject: [PATCH 124/147] Address PR comments

---
 .../api/domain/record/RecordSetService.scala  | 64 +++++++++++++------
 1 file changed, 44 insertions(+), 20 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 8041a3320..f2e769c79 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
@@ -244,15 +244,10 @@ class RecordSetService(
     val dottedZoneConfig = configZones.filter(_.contains("*")).map(_.replace("*", "[A-Za-z0-9.]*"))
     val isContainWildcardZone = dottedZoneConfig.exists(x => zoneName.matches(x))
     val isContainNormalZone = configZones.contains(zoneName)
-    if(isContainWildcardZone || isContainNormalZone){
+    if(isContainNormalZone){
       val users = config.authConfigs.flatMap {
         x: AuthConfigs =>
-          if (x.zone.contains("*")) {
-            val wildcardZone = x.zone.replace("*", "[A-Za-z0-9.]*")
-            if (zoneName.matches(wildcardZone)) x.allowedUserList else List.empty
-          } else {
-            if (x.zone == zoneName) x.allowedUserList else List.empty
-          }
+          if (x.zone == zoneName) x.allowedUserList else List.empty
       }
       if(users.contains(auth.signedInUser.userName)){
         true
@@ -261,7 +256,22 @@ class RecordSetService(
         false
       }
     }
-    else{
+    else if(isContainWildcardZone){
+      val users = config.authConfigs.flatMap {
+        x: AuthConfigs =>
+          if (x.zone.contains("*")) {
+            val wildcardZone = x.zone.replace("*", "[A-Za-z0-9.]*")
+            if (zoneName.matches(wildcardZone)) x.allowedUserList else List.empty
+          } else List.empty
+      }
+      if(users.contains(auth.signedInUser.userName)){
+        true
+      }
+      else {
+        false
+      }
+    }
+    else {
       false
     }
   }
@@ -273,15 +283,10 @@ class RecordSetService(
     val dottedZoneConfig = configZones.filter(_.contains("*")).map(_.replace("*", "[A-Za-z0-9.]*"))
     val isContainWildcardZone = dottedZoneConfig.exists(x => zoneName.matches(x))
     val isContainNormalZone = configZones.contains(zoneName)
-    if(isContainWildcardZone || isContainNormalZone){
+    if(isContainNormalZone){
       val rType = config.authConfigs.flatMap {
         x: AuthConfigs =>
-          if (x.zone.contains("*")) {
-            val wildcardZone = x.zone.replace("*", "[A-Za-z0-9.]*")
-            if (zoneName.matches(wildcardZone)) x.allowedRecordType else List.empty
-          } else {
-            if (x.zone == zoneName) x.allowedRecordType else List.empty
-          }
+          if (x.zone == zoneName) x.allowedRecordType else List.empty
       }
       if(rType.contains(rs.typ.toString)){
         true
@@ -290,7 +295,22 @@ class RecordSetService(
         false
       }
     }
-    else{
+    else if(isContainWildcardZone){
+      val rType = config.authConfigs.flatMap {
+        x: AuthConfigs =>
+          if (x.zone.contains("*")) {
+            val wildcardZone = x.zone.replace("*", "[A-Za-z0-9.]*")
+            if (zoneName.matches(wildcardZone)) x.allowedRecordType else List.empty
+          } else List.empty
+      }
+      if(rType.contains(rs.typ.toString)){
+        true
+      }
+      else {
+        false
+      }
+    }
+    else {
       false
     }
   }
@@ -302,15 +322,19 @@ class RecordSetService(
     val dottedZoneConfig = configZones.filter(_.contains("*")).map(_.replace("*", "[A-Za-z0-9.]*"))
     val isContainWildcardZone = dottedZoneConfig.exists(x => zoneName.matches(x))
     val isContainNormalZone = configZones.contains(zoneName)
-    val groups = if(isContainWildcardZone || isContainNormalZone){
+    val groups = if(isContainNormalZone){
+      config.authConfigs.flatMap {
+        x: AuthConfigs =>
+          if (x.zone == zoneName) x.allowedGroupList else List.empty
+      }
+    }
+    else if(isContainWildcardZone){
       config.authConfigs.flatMap {
         x: AuthConfigs =>
           if (x.zone.contains("*")) {
             val wildcardZone = x.zone.replace("*", "[A-Za-z0-9.]*")
             if (zoneName.matches(wildcardZone)) x.allowedGroupList else List.empty
-          } else {
-            if (x.zone == zoneName) x.allowedGroupList else List.empty
-          }
+          } else List.empty
       }
     }
     else {

From a60991a073b79d0b9650004dae8e7aca3d7a5edc Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 7 Oct 2022 19:17:01 +0530
Subject: [PATCH 125/147] Address PR comments

---
 modules/api/src/it/resources/application.conf |  2 +
 modules/api/src/main/resources/reference.conf |  2 +
 .../api/config/DottedHostsConfig.scala        |  2 +-
 .../api/domain/record/RecordSetService.scala  | 20 +++++
 .../domain/record/RecordSetValidations.scala  | 13 +++
 .../tests/recordsets/create_recordset_test.py | 80 ++++++++++++++-----
 .../vinyldns/api/VinylDNSTestHelpers.scala    |  2 +-
 .../docs/src/main/mdoc/operator/config-api.md |  5 ++
 8 files changed, 105 insertions(+), 21 deletions(-)

diff --git a/modules/api/src/it/resources/application.conf b/modules/api/src/it/resources/application.conf
index e14cb169d..876d39527 100644
--- a/modules/api/src/it/resources/application.conf
+++ b/modules/api/src/it/resources/application.conf
@@ -172,6 +172,7 @@ vinyldns {
       allowed-user-list = ["testuser"]
       allowed-group-list = ["dummy-group"]
       allowed-record-type = ["AAAA"]
+      allowed-dots-limit = 3
       },
       {
       # for wildcard zones. Settings will be applied to all matching zones
@@ -179,6 +180,7 @@ vinyldns {
       allowed-user-list = ["professor", "testuser"]
       allowed-group-list = ["testing-group"]
       allowed-record-type = ["A", "CNAME"]
+      allowed-dots-limit = 3
       }
     ]
   }
diff --git a/modules/api/src/main/resources/reference.conf b/modules/api/src/main/resources/reference.conf
index 16c7724f4..021ad67ce 100644
--- a/modules/api/src/main/resources/reference.conf
+++ b/modules/api/src/main/resources/reference.conf
@@ -100,6 +100,7 @@ vinyldns {
       allowed-user-list = ["ok"]
       allowed-group-list = ["dummy-group"]
       allowed-record-type = ["CNAME"]
+      allowed-dots-limit = 3
       },
       {
       # for wildcard zones. Settings will be applied to all matching zones
@@ -107,6 +108,7 @@ vinyldns {
       allowed-user-list = ["sharedZoneUser"]
       allowed-group-list = ["history-group1"]
       allowed-record-type = ["A"]
+      allowed-dots-limit = 3
       }
     ]
   }
diff --git a/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala b/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
index 3e4429898..e28f35f3b 100644
--- a/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
+++ b/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
@@ -19,7 +19,7 @@ package vinyldns.api.config
 import pureconfig.ConfigReader
 import pureconfig.generic.auto._
 
-final case class AuthConfigs(zone: String, allowedUserList: List[String], allowedGroupList: List[String], allowedRecordType: List[String])
+final case class AuthConfigs(zone: String, allowedUserList: List[String], allowedGroupList: List[String], allowedRecordType: List[String], allowedDotsLimit: Int)
 final case class DottedHostsConfig(authConfigs: List[AuthConfigs])
 
 object DottedHostsConfig {
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 f2e769c79..cfd51c9ba 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
@@ -118,6 +118,7 @@ class RecordSetService(
       isAllowedUser = isInAllowedUsers || isUserInAllowedGroups
       isRecordTypeAllowed = checkIfInAllowedRecordType(zone, dottedHostsConfig, rsForValidations)
       isRecordTypeAndUserAllowed = isAllowedUser && isRecordTypeAllowed
+      allowedDotsLimit = getAllowedDotsLimit(zone, dottedHostsConfig)
       recordFqdnDoesNotAlreadyExist <- recordFQDNDoesNotExist(rsForValidations, zone).toResult[Boolean]
       _ <- typeSpecificValidations(
         rsForValidations,
@@ -129,6 +130,7 @@ class RecordSetService(
         allowedZoneList,
         isRecordTypeAndUserAllowed
       ).toResult
+      _ <- checkAllowedDots(allowedDotsLimit, rsForValidations, zone).toResult
       _ <- messageQueue.send(change).toResult[Unit]
     } yield change
 
@@ -237,6 +239,24 @@ class RecordSetService(
     }
   }
 
+  // Check if user is allowed to create dotted hosts using the users present in dotted hosts config
+  def getAllowedDotsLimit(zone: Zone, config: DottedHostsConfig): Int = {
+    val configZones = config.authConfigs.map(x => x.zone)
+    val zoneName = if(zone.name.takeRight(1) != ".") zone.name + "." else zone.name
+    val dottedZoneConfig = configZones.filter(_.contains("*")).map(_.replace("*", "[A-Za-z0-9.]*"))
+    val isContainWildcardZone = dottedZoneConfig.exists(x => zoneName.matches(x))
+    val isContainNormalZone = configZones.contains(zoneName)
+    if(isContainNormalZone){
+      config.authConfigs.filter(x => x.zone == zoneName).head.allowedDotsLimit
+    }
+    else if(isContainWildcardZone){
+      config.authConfigs.filter(x => zoneName.matches(x.zone.replace("*", "[A-Za-z0-9.]*"))).head.allowedDotsLimit
+    }
+    else {
+      0
+    }
+  }
+
   // Check if user is allowed to create dotted hosts using the users present in dotted hosts config
   def checkIfInAllowedUsers(zone: Zone, config: DottedHostsConfig, auth: AuthPrincipal): Boolean = {
     val configZones = config.authConfigs.map(x => x.zone)
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 58e35b518..3e59c9088 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
@@ -352,6 +352,19 @@ object RecordSetValidations {
       .leftMap(errors => InvalidRequest(errors.toList.map(_.message).mkString(", ")))
   }
 
+  def checkAllowedDots(allowedDotsLimit: Int, recordSet: RecordSet, zone: Zone): Either[Throwable, Unit] = {
+    ensuring(
+      InvalidRequest(
+        s"RecordSet with name ${recordSet.name} has more dots than that is allowed in config for this zone " +
+          s"which is, 'allowed-dots-limit = $allowedDotsLimit'."
+      )
+    )(
+      recordSet.name.count(_ == '.') <= allowedDotsLimit || (recordSet.name.count(_ == '.') == 1 &&
+        recordSet.name.takeRight(1) == ".") || recordSet.name == zone.name ||
+        (recordSet.typ.toString == "PTR" || recordSet.typ.toString == "SRV" || recordSet.typ.toString == "TXT" || recordSet.typ.toString == "NAPTR")
+    )
+  }
+
   def canUseOwnerGroup(
       ownerGroupId: Option[String],
       group: Option[Group],
diff --git a/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py b/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py
index d3705298d..d6c9a6cff 100644
--- a/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py
+++ b/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py
@@ -557,6 +557,28 @@ def test_create_dotted_a_record_succeeds_if_all_dotted_hosts_config_satisfied(sh
             client.wait_until_recordset_change_status(delete_result, "Complete")
 
 
+def test_create_dotted_a_record_fails_if_all_dotted_hosts_config_not_satisfied(shared_zone_test_context):
+    """
+    Test that creating a A record set with dotted host record name fails
+    Here the zone, user (in group) and record type is allowed.
+    But the record name has more dots than the number of dots allowed for this zone. Hence the test fails
+    The 'allowed-dots-limit' config from dotted-hosts config is not satisfied. Config present in reference.conf
+    """
+    client = shared_zone_test_context.history_client
+    zone = shared_zone_test_context.dummy_zone
+    dotted_host_a_record = {
+        "zoneId": zone["id"],
+        "name": "dot.ted.trial.test.host",
+        "type": "A",
+        "ttl": 500,
+        "records": [{"address": "127.0.0.1"}]
+    }
+
+    error = client.create_recordset(dotted_host_a_record, status=422)
+    assert_that(error, is_("RecordSet with name " + dotted_host_a_record["name"] + " has more dots than that is "
+                           "allowed in config for this zone which is, 'allowed-dots-limit = 3'."))
+
+
 def test_create_dotted_a_record_apex_succeeds(shared_zone_test_context):
     """
     Test that creating an apex A record set containing dots succeeds.
@@ -654,7 +676,8 @@ def test_create_dotted_cname_record_succeeds_if_all_dotted_hosts_config_satisfie
         assert_that(dotted_cname_record["name"], is_(dotted_host_cname_record["name"]))
     finally:
         if dotted_cname_record:
-            delete_result = client.delete_recordset(dotted_cname_record["zoneId"], dotted_cname_record["id"], status=202)
+            delete_result = client.delete_recordset(dotted_cname_record["zoneId"], dotted_cname_record["id"],
+                                                    status=202)
             client.wait_until_recordset_change_status(delete_result, "Complete")
 
 
@@ -760,7 +783,8 @@ def test_create_cname_with_existing_record_with_name_fails(shared_zone_test_cont
         a_record = client.wait_until_recordset_change_status(a_create, "Complete")["recordSet"]
 
         error = client.create_recordset(cname_rs, status=409)
-        assert_that(error, is_(f'RecordSet with name duplicate-test-name already exists in zone {zone["name"]}, CNAME record cannot use duplicate name'))
+        assert_that(error,
+                    is_(f'RecordSet with name duplicate-test-name already exists in zone {zone["name"]}, CNAME record cannot use duplicate name'))
     finally:
         if a_record:
             delete_result = client.delete_recordset(a_record["zoneId"], a_record["id"], status=202)
@@ -803,7 +827,8 @@ def test_create_record_with_existing_cname_fails(shared_zone_test_context):
         cname_record = client.wait_until_recordset_change_status(cname_create, "Complete")["recordSet"]
 
         error = client.create_recordset(a_rs, status=409)
-        assert_that(error, is_(f'RecordSet with name duplicate-test-name and type CNAME already exists in zone {zone["name"]}'))
+        assert_that(error,
+                    is_(f'RecordSet with name duplicate-test-name and type CNAME already exists in zone {zone["name"]}'))
     finally:
         if cname_record:
             delete_result = client.delete_recordset(cname_record["zoneId"], cname_record["id"], status=202)
@@ -1800,7 +1825,8 @@ def test_create_high_value_domain_fails(shared_zone_test_context):
     }
 
     error = client.create_recordset(new_rs, status=422)
-    assert_that(error, is_(f'Record name "high-value-domain.{zone["name"]}" is configured as a High Value Domain, so it cannot be modified.'))
+    assert_that(error,
+                is_(f'Record name "high-value-domain.{zone["name"]}" is configured as a High Value Domain, so it cannot be modified.'))
 
 
 def test_create_high_value_domain_fails_case_insensitive(shared_zone_test_context):
@@ -1822,7 +1848,8 @@ def test_create_high_value_domain_fails_case_insensitive(shared_zone_test_contex
     }
 
     error = client.create_recordset(new_rs, status=422)
-    assert_that(error, is_(f'Record name "hIgH-vAlUe-dOmAiN.{zone["name"]}" is configured as a High Value Domain, so it cannot be modified.'))
+    assert_that(error,
+                is_(f'Record name "hIgH-vAlUe-dOmAiN.{zone["name"]}" is configured as a High Value Domain, so it cannot be modified.'))
 
 
 def test_create_high_value_domain_fails_for_ip4_ptr(shared_zone_test_context):
@@ -1843,7 +1870,8 @@ def test_create_high_value_domain_fails_for_ip4_ptr(shared_zone_test_context):
     }
 
     error_ptr = client.create_recordset(ptr, status=422)
-    assert_that(error_ptr, is_(f'Record name "{shared_zone_test_context.ip4_classless_prefix}.252" is configured as a High Value Domain, so it cannot be modified.'))
+    assert_that(error_ptr,
+                is_(f'Record name "{shared_zone_test_context.ip4_classless_prefix}.252" is configured as a High Value Domain, so it cannot be modified.'))
 
 
 def test_create_high_value_domain_fails_for_ip6_ptr(shared_zone_test_context):
@@ -1864,7 +1892,8 @@ def test_create_high_value_domain_fails_for_ip6_ptr(shared_zone_test_context):
     }
 
     error_ptr = client.create_recordset(ptr, status=422)
-    assert_that(error_ptr, is_(f'Record name "{shared_zone_test_context.ip6_prefix}:0000:0000:0000:0000:ffff" is configured as a High Value Domain, so it cannot be modified.'))
+    assert_that(error_ptr,
+                is_(f'Record name "{shared_zone_test_context.ip6_prefix}:0000:0000:0000:0000:ffff" is configured as a High Value Domain, so it cannot be modified.'))
 
 
 def test_create_with_owner_group_in_private_zone_by_admin_passes(shared_zone_test_context):
@@ -1931,7 +1960,8 @@ def test_create_with_owner_group_in_private_zone_by_acl_passes(shared_zone_test_
     finally:
         clear_ok_acl_rules(shared_zone_test_context)
         if create_rs:
-            delete_result = shared_zone_test_context.ok_vinyldns_client.delete_recordset(zone["id"], create_rs["id"], status=202)
+            delete_result = shared_zone_test_context.ok_vinyldns_client.delete_recordset(zone["id"], create_rs["id"],
+                                                                                         status=202)
             shared_zone_test_context.ok_vinyldns_client.wait_until_recordset_change_status(delete_result, "Complete")
 
 
@@ -1957,8 +1987,11 @@ def test_create_with_owner_group_in_shared_zone_by_acl_passes(shared_zone_test_c
     finally:
         clear_shared_zone_acl_rules(shared_zone_test_context)
         if create_rs:
-            delete_result = shared_zone_test_context.shared_zone_vinyldns_client.delete_recordset(zone["id"], create_rs["id"], status=202)
-            shared_zone_test_context.shared_zone_vinyldns_client.wait_until_recordset_change_status(delete_result, "Complete")
+            delete_result = shared_zone_test_context.shared_zone_vinyldns_client.delete_recordset(zone["id"],
+                                                                                                  create_rs["id"],
+                                                                                                  status=202)
+            shared_zone_test_context.shared_zone_vinyldns_client.wait_until_recordset_change_status(delete_result,
+                                                                                                    "Complete")
 
 
 def test_create_in_shared_zone_without_owner_group_id_succeeds(shared_zone_test_context):
@@ -2012,10 +2045,12 @@ def test_create_in_shared_zone_by_unassociated_user_fails_if_record_type_is_not_
     zone = shared_zone_test_context.shared_zone
     group = shared_zone_test_context.dummy_group
 
-    record_json = create_recordset(zone, "test_shared_not_approved_record_type", "MX", [{"preference": 3, "exchange": "mx"}])
+    record_json = create_recordset(zone, "test_shared_not_approved_record_type", "MX",
+                                   [{"preference": 3, "exchange": "mx"}])
     record_json["ownerGroupId"] = group["id"]
     error = client.create_recordset(record_json, status=403)
-    assert_that(error, is_(f'User dummy does not have access to create test-shared-not-approved-record-type.{zone["name"]}'))
+    assert_that(error,
+                is_(f'User dummy does not have access to create test-shared-not-approved-record-type.{zone["name"]}'))
 
 
 def test_create_with_not_found_owner_group_fails(shared_zone_test_context):
@@ -2054,7 +2089,8 @@ def test_create_ds_success(shared_zone_test_context):
     zone = shared_zone_test_context.ds_zone
     record_data = [
         {"keytag": 60485, "algorithm": 5, "digesttype": 1, "digest": "2BB183AF5F22588179A53B0A98631FAD1A292118"},
-        {"keytag": 60485, "algorithm": 5, "digesttype": 2, "digest": "D4B7D520E7BB5F0F67674A0CCEB1E3E0614B93C4F9E99B8383F6A1E4469DA50A"}
+        {"keytag": 60485, "algorithm": 5, "digesttype": 2,
+         "digest": "D4B7D520E7BB5F0F67674A0CCEB1E3E0614B93C4F9E99B8383F6A1E4469DA50A"}
     ]
     record_json = create_recordset(zone, "dskey", "DS", record_data, ttl=3600)
     result_rs = None
@@ -2096,7 +2132,8 @@ def test_create_ds_unknown_algorithm(shared_zone_test_context):
     """
     client = shared_zone_test_context.ok_vinyldns_client
     zone = shared_zone_test_context.ds_zone
-    record_data = [{"keytag": 60485, "algorithm": 0, "digesttype": 1, "digest": "2BB183AF5F22588179A53B0A98631FAD1A292118"}]
+    record_data = [
+        {"keytag": 60485, "algorithm": 0, "digesttype": 1, "digest": "2BB183AF5F22588179A53B0A98631FAD1A292118"}]
     record_json = create_recordset(zone, "dskey", "DS", record_data)
     errors = client.create_recordset(record_json, status=400)["errors"]
     assert_that(errors, contains_inanyorder("Algorithm 0 is not a supported DNSSEC algorithm"))
@@ -2108,7 +2145,8 @@ def test_create_ds_unknown_digest_type(shared_zone_test_context):
     """
     client = shared_zone_test_context.ok_vinyldns_client
     zone = shared_zone_test_context.ds_zone
-    record_data = [{"keytag": 60485, "algorithm": 5, "digesttype": 0, "digest": "2BB183AF5F22588179A53B0A98631FAD1A292118"}]
+    record_data = [
+        {"keytag": 60485, "algorithm": 5, "digesttype": 0, "digest": "2BB183AF5F22588179A53B0A98631FAD1A292118"}]
     record_json = create_recordset(zone, "dskey", "DS", record_data)
     errors = client.create_recordset(record_json, status=400)["errors"]
     assert_that(errors, contains_inanyorder("Digest Type 0 is not a supported DS record digest type"))
@@ -2120,10 +2158,12 @@ def test_create_ds_no_ns_fails(shared_zone_test_context):
     """
     client = shared_zone_test_context.ok_vinyldns_client
     zone = shared_zone_test_context.ds_zone
-    record_data = [{"keytag": 60485, "algorithm": 5, "digesttype": 1, "digest": "2BB183AF5F22588179A53B0A98631FAD1A292118"}]
+    record_data = [
+        {"keytag": 60485, "algorithm": 5, "digesttype": 1, "digest": "2BB183AF5F22588179A53B0A98631FAD1A292118"}]
     record_json = create_recordset(zone, "no-ns-exists", "DS", record_data, ttl=3600)
     error = client.create_recordset(record_json, status=422)
-    assert_that(error, is_(f'DS record [no-ns-exists] is invalid because there is no NS record with that name in the zone [{zone["name"]}]'))
+    assert_that(error,
+                is_(f'DS record [no-ns-exists] is invalid because there is no NS record with that name in the zone [{zone["name"]}]'))
 
 
 def test_create_apex_ds_fails(shared_zone_test_context):
@@ -2145,7 +2185,9 @@ def test_create_dotted_ds_fails(shared_zone_test_context):
     """
     client = shared_zone_test_context.ok_vinyldns_client
     zone = shared_zone_test_context.ds_zone
-    record_data = [{"keytag": 60485, "algorithm": 5, "digesttype": 1, "digest": "2BB183AF5F22588179A53B0A98631FAD1A292118"}]
+    record_data = [
+        {"keytag": 60485, "algorithm": 5, "digesttype": 1, "digest": "2BB183AF5F22588179A53B0A98631FAD1A292118"}]
     record_json = create_recordset(zone, "dotted.ds", "DS", record_data, ttl=100)
     error = client.create_recordset(record_json, status=422)
-    assert_that(error, is_(f'Record with name dotted.ds and type DS is a dotted host which is not allowed in zone {zone["name"]}'))
+    assert_that(error,
+                is_(f'Record with name dotted.ds and type DS is a dotted host which is not allowed in zone {zone["name"]}'))
diff --git a/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala b/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala
index 80b88abbb..08c4d28e1 100644
--- a/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala
+++ b/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala
@@ -40,7 +40,7 @@ trait VinylDNSTestHelpers {
 
   val approvedNameServers: List[Regex] = List(new Regex("some.test.ns."))
 
-  val dottedHostsConfig: DottedHostsConfig = DottedHostsConfig(List(AuthConfigs("dotted.xyz.",List("xyz"),List("dummy"),List("CNAME")), AuthConfigs("abc.zone.recordsets.",List("locked"),List("dummy"),List("CNAME")), AuthConfigs("xyz.",List("super"),List("xyz"),List("CNAME"))))
+  val dottedHostsConfig: DottedHostsConfig = DottedHostsConfig(List(AuthConfigs("dotted.xyz.",List("xyz"),List("dummy"),List("CNAME"), 3), AuthConfigs("abc.zone.recordsets.",List("locked"),List("dummy"),List("CNAME"), 3), AuthConfigs("xyz.",List("super"),List("xyz"),List("CNAME"), 3)))
 
   val emptyDottedHostsConfig: DottedHostsConfig = DottedHostsConfig(List.empty)
 
diff --git a/modules/docs/src/main/mdoc/operator/config-api.md b/modules/docs/src/main/mdoc/operator/config-api.md
index c1ad37b6e..d32df144d 100644
--- a/modules/docs/src/main/mdoc/operator/config-api.md
+++ b/modules/docs/src/main/mdoc/operator/config-api.md
@@ -551,6 +551,7 @@ Note the following:
 5. If the user is either in `allowed-user-list` or `allowed-group-list`, they are allowed to create a dotted host. It is
 not necessary for the user to be in both `allowed-user-list` and `allowed-group-list`.
 6. The record types which are allowed while creating a dotted host is added to the `allowed-record-type`.
+7. The number of dots allowed in a record name for a zone is given in `allowed-dots-limit`.
 
 ```yaml
 # approved zones, individual users, users in groups and record types that are allowed for dotted hosts
@@ -561,6 +562,7 @@ dotted-hosts = {
       allowed-user-list = ["testuser"]
       allowed-group-list = ["dummy-group"]
       allowed-record-type = ["AAAA"]
+      allowed-dots-limit = 3
       },
       {
       # for wildcard zones. Settings will be applied to all matching zones
@@ -568,6 +570,7 @@ dotted-hosts = {
       allowed-user-list = ["professor", "testuser"]
       allowed-group-list = ["testing-group"]
       allowed-record-type = ["A", "CNAME"]
+      allowed-dots-limit = 3
       }
    ]
 }
@@ -771,6 +774,7 @@ dotted-hosts = {
         allowed-user-list = ["testuser"]
         allowed-group-list = ["dummy-group"]
         allowed-record-type = ["AAAA"]
+        allowed-dots-limit = 3
         },
         {
         # for wildcard zones. Settings will be applied to all matching zones
@@ -778,6 +782,7 @@ dotted-hosts = {
         allowed-user-list = ["professor", "testuser"]
         allowed-group-list = ["testing-group"]
         allowed-record-type = ["A", "CNAME"]
+        allowed-dots-limit = 3
         }
      ]
   }

From bfd369e9c0c62dd759cda29f529c026fd627f1da Mon Sep 17 00:00:00 2001
From: Joshua Edwards <joshua_edwards@comcast.com>
Date: Fri, 7 Oct 2022 13:31:24 -0400
Subject: [PATCH 126/147] Update developer guide with section on support for M1
 Macs

---
 DEVELOPER_GUIDE.md | 68 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md
index a37c18ae5..2f17c7d79 100644
--- a/DEVELOPER_GUIDE.md
+++ b/DEVELOPER_GUIDE.md
@@ -10,6 +10,7 @@
     * [Portal](#portal)
     * [Documentation](#documentation)
 - [Running VinylDNS Locally](#running-vinyldns-locally)
+    * [Support for M1 Macs](#support-for-m1-macs)
     * [Starting the API Server](#starting-the-api-server)
     * [Starting the Portal](#starting-the-portal)
 - [Testing](#testing)
@@ -161,6 +162,73 @@ settings for the microsite are also configured in `build.sbt` of the project roo
 VinylDNS can be started in the background by running the [quickstart instructions](README.md#quickstart) located in the
 README. However, VinylDNS can also be run in the foreground.
 
+### Support for M1 Macs
+
+If you are using a Mac running macOS with one of the new Apple M1 chips, you will need to update some dependencies to
+newer versions before attempting to run VinylDNS locally. To verify whether your computer has one of these chips,
+go to About This Mac in the Apple menu in the top-left corner of your screen. If next to Chip you see Apple M1,
+or any later chip such as the Apple M1 Pro or Apple M1 Max, then you will need to apply these changes to the code.
+
+#### build.sbt
+
+Update protoc from version 2.6.1:
+
+```shell
+PB.targets in Compile := Seq(PB.gens.java("2.6.1") -> (sourceManaged in Compile).value),
+PB.protocVersion := "-v261"
+```
+
+to version 3.21.7:
+
+```shell
+PB.targets in Compile := Seq(PB.gens.java("3.21.7") -> (sourceManaged in Compile).value),
+PB.protocVersion := "-v3.21.7"
+```
+
+#### project/build.properties
+
+Update `sbt.version=1.4.0` to `sbt.version=1.7.2`
+
+#### project/Dependencies.scala
+
+Update protobuf from version 2.6.1:
+
+```shell
+"com.google.protobuf"       %  "protobuf-java"                  % "2.6.1",
+```
+
+to version 3.21.7:
+
+```shell
+"com.google.protobuf"       %  "protobuf-java"                  % "3.21.7",
+```
+
+#### project/plugins.sbt
+
+Update the sbt-protoc plugin from version 0.99.18:
+
+```shell
+addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.18")
+```
+
+to version 1.0.6:
+
+```shell
+addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6")
+```
+
+Also update the sbt-plugin for the Play framework from version 2.7.4:
+
+```shell
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.4")
+```
+
+to version 2.8.16:
+
+```shell
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
+``` 
+
 ### Starting the API Server
 
 Before starting the API service, you can start the dependencies for local development:

From a8dde474a6073a13d626fd190eb9181e6713f0d5 Mon Sep 17 00:00:00 2001
From: Joshua Edwards <joshua_edwards@comcast.com>
Date: Fri, 7 Oct 2022 16:40:22 -0400
Subject: [PATCH 127/147] Remove sbt-plugin from dependencies that need
 updating

---
 DEVELOPER_GUIDE.md | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md
index 2f17c7d79..a74f5d1b5 100644
--- a/DEVELOPER_GUIDE.md
+++ b/DEVELOPER_GUIDE.md
@@ -217,18 +217,6 @@ to version 1.0.6:
 addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6")
 ```
 
-Also update the sbt-plugin for the Play framework from version 2.7.4:
-
-```shell
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.4")
-```
-
-to version 2.8.16:
-
-```shell
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
-``` 
-
 ### Starting the API Server
 
 Before starting the API service, you can start the dependencies for local development:

From 552704eea332a4175b3af391c5b2d3c983d99d8e Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Sat, 8 Oct 2022 15:30:55 +0530
Subject: [PATCH 128/147] Increase test coverage

---
 modules/api/src/it/resources/application.conf |  4 ++--
 .../RecordSetServiceIntegrationSpec.scala     | 22 +++++++++++++++++++
 .../api/domain/record/RecordSetService.scala  |  4 +++-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/modules/api/src/it/resources/application.conf b/modules/api/src/it/resources/application.conf
index 876d39527..aedb547d1 100644
--- a/modules/api/src/it/resources/application.conf
+++ b/modules/api/src/it/resources/application.conf
@@ -168,7 +168,7 @@ vinyldns {
     # for local testing
     allowed-settings = [
       {
-      zone = "dummy."
+      zone = "*mmy."
       allowed-user-list = ["testuser"]
       allowed-group-list = ["dummy-group"]
       allowed-record-type = ["AAAA"]
@@ -176,7 +176,7 @@ vinyldns {
       },
       {
       # for wildcard zones. Settings will be applied to all matching zones
-      zone = "*ent.com."
+      zone = "parent.com."
       allowed-user-list = ["professor", "testuser"]
       allowed-group-list = ["testing-group"]
       allowed-record-type = ["A", "CNAME"]
diff --git a/modules/api/src/it/scala/vinyldns/api/domain/record/RecordSetServiceIntegrationSpec.scala b/modules/api/src/it/scala/vinyldns/api/domain/record/RecordSetServiceIntegrationSpec.scala
index 544632028..52bded45e 100644
--- a/modules/api/src/it/scala/vinyldns/api/domain/record/RecordSetServiceIntegrationSpec.scala
+++ b/modules/api/src/it/scala/vinyldns/api/domain/record/RecordSetServiceIntegrationSpec.scala
@@ -391,6 +391,28 @@ class RecordSetServiceIntegrationSpec
         .name shouldBe "test.dotted"
     }
 
+    "fail creating dotted record if it satisfies all dotted hosts config except allowed-dots-limit for the zone" in {
+      val newRecord = RecordSet(
+        dummyZone.id,
+        "test.dotted.more.dots.than.allowed",
+        AAAA,
+        38400,
+        RecordSetStatus.Active,
+        DateTime.now,
+        None,
+        List(AAAAData("fd69:27cc:fe91::60"))
+      )
+
+      // The number of dots allowed in the record name for this zone as defined in the config is 3.
+      // Creating with 4 dots results in an error
+      val result =
+        testRecordSetService
+          .addRecordSet(newRecord, dummyAuth)
+          .value
+          .unsafeRunSync()
+      leftValue(result) shouldBe a[InvalidRequest]
+    }
+
     "update apex A record and add trailing dot" in {
       val newRecord = apexTestRecordA.copy(ttl = 200)
       val result = testRecordSetService
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 cfd51c9ba..210d2d83a 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
@@ -130,7 +130,7 @@ class RecordSetService(
         allowedZoneList,
         isRecordTypeAndUserAllowed
       ).toResult
-      _ <- checkAllowedDots(allowedDotsLimit, rsForValidations, zone).toResult
+      _ <- if(allowedZoneList.contains(zone.name)) checkAllowedDots(allowedDotsLimit, rsForValidations, zone).toResult else ().toResult
       _ <- messageQueue.send(change).toResult[Unit]
     } yield change
 
@@ -167,6 +167,7 @@ class RecordSetService(
       isAllowedUser = isInAllowedUsers || isUserInAllowedGroups
       isRecordTypeAllowed = checkIfInAllowedRecordType(zone, dottedHostsConfig, rsForValidations)
       isRecordTypeAndUserAllowed = isAllowedUser && isRecordTypeAllowed
+      allowedDotsLimit = getAllowedDotsLimit(zone, dottedHostsConfig)
       recordFqdnDoesNotAlreadyExist <- recordFQDNDoesNotExist(rsForValidations, zone).toResult[Boolean]
       _ <- typeSpecificValidations(
         rsForValidations,
@@ -178,6 +179,7 @@ class RecordSetService(
         allowedZoneList,
         isRecordTypeAndUserAllowed,
       ).toResult
+      _ <- if(existing.name == rsForValidations.name) ().toResult else if(allowedZoneList.contains(zone.name)) checkAllowedDots(allowedDotsLimit, rsForValidations, zone).toResult else ().toResult
       _ <- messageQueue.send(change).toResult[Unit]
     } yield change
 

From 3e509d5ce5d53541ea3ae0bff7b9cfbe50fce3d4 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Sat, 8 Oct 2022 16:10:20 +0530
Subject: [PATCH 129/147] Fix test

---
 .../scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
index 05978d393..9f613b7e3 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
@@ -286,7 +286,7 @@ class RecordSetServiceSpec
         .getZonesByFilters(record.name.split('.').map(x => x + "." + okZone.name).toSet)
       doReturn(IO.pure(Set()))
         .when(mockGroupRepo)
-        .getGroupsByName(Set.empty)
+        .getGroupsByName(dottedHostsConfigGroupsAllowed.toSet)
       doReturn(IO.pure(ListUsersResults(Seq(), None)))
         .when(mockUserRepo)
         .getUsers(Set.empty, None, None)

From 125aa892d4bfad9e7ee8b4daa3348652d26f0da3 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 10 Oct 2022 12:40:47 +0530
Subject: [PATCH 131/147] Fix sorting

---
 .../api/domain/membership/MembershipService.scala  | 14 ++++++++++----
 .../public/lib/controllers/controller.groups.js    |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
index 9345bb4ff..410d37233 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
@@ -216,12 +216,18 @@ class MembershipService(
     ): ListMyGroupsResponse = {
     val allMyGroups = allGroups
       .filter(_.status == GroupStatus.Active)
-      .sortBy(_.id)
+      .sortBy(_.name)
       .map(x => GroupInfo.fromGroup(x, abridged, Some(authPrincipal)))
 
-    val filtered = allMyGroups
-      .filter(grp => groupNameFilter.map(_.toLowerCase).forall(grp.name.toLowerCase.contains(_)))
-      .filter(grp => startFrom.forall(grp.id > _))
+    val filtered = if(startFrom.isDefined){
+      val prevPageGroup = allMyGroups.filter(_.id == startFrom.get).head.name
+      allMyGroups
+        .filter(grp => groupNameFilter.map(_.toLowerCase).forall(grp.name.toLowerCase.contains(_)))
+        .filter(grp => grp.name > prevPageGroup)
+    } else {
+      allMyGroups
+        .filter(grp => groupNameFilter.map(_.toLowerCase).forall(grp.name.toLowerCase.contains(_)))
+    }
 
     val nextId = if (filtered.length > maxItems) Some(filtered(maxItems - 1).id) else None
     val groups = filtered.take(maxItems)
diff --git a/modules/portal/public/lib/controllers/controller.groups.js b/modules/portal/public/lib/controllers/controller.groups.js
index 1fa74a9a2..b5776ed5e 100644
--- a/modules/portal/public/lib/controllers/controller.groups.js
+++ b/modules/portal/public/lib/controllers/controller.groups.js
@@ -74,7 +74,7 @@ angular.module('controller.groups', []).controller('GroupsController', function
     $("#group-search-text").autocomplete({
       source: function( request, response ) {
         $.ajax({
-          url: "/api/groups?maxItems=1500&abridged=true",
+          url: "/api/groups?maxItems=100&abridged=true",
           dataType: "json",
           data: {groupNameFilter: request.term, ignoreAccess: $scope.ignoreAccess},
           success: function(data) {

From 33cf6537dd8edcb285faf7ebacde05098bfa6551 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 10 Oct 2022 14:51:36 +0530
Subject: [PATCH 132/147] Make sort case insensitive

---
 .../vinyldns/api/domain/membership/MembershipService.scala    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
index 410d37233..68d0a17b0 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/membership/MembershipService.scala
@@ -216,14 +216,14 @@ class MembershipService(
     ): ListMyGroupsResponse = {
     val allMyGroups = allGroups
       .filter(_.status == GroupStatus.Active)
-      .sortBy(_.name)
+      .sortBy(_.name.toLowerCase)
       .map(x => GroupInfo.fromGroup(x, abridged, Some(authPrincipal)))
 
     val filtered = if(startFrom.isDefined){
       val prevPageGroup = allMyGroups.filter(_.id == startFrom.get).head.name
       allMyGroups
         .filter(grp => groupNameFilter.map(_.toLowerCase).forall(grp.name.toLowerCase.contains(_)))
-        .filter(grp => grp.name > prevPageGroup)
+        .filter(grp => grp.name.toLowerCase > prevPageGroup.toLowerCase)
     } else {
       allMyGroups
         .filter(grp => groupNameFilter.map(_.toLowerCase).forall(grp.name.toLowerCase.contains(_)))

From 843dcf20e52af2d5892cbf898b646918198c4cfa Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Tue, 11 Oct 2022 18:04:33 +0530
Subject: [PATCH 133/147] Resolve DNS failure

---
 .../vinyldns/api/domain/record/RecordSetService.scala  |  7 ++++---
 .../api/domain/record/RecordSetValidations.scala       | 10 ++++++++++
 2 files changed, 14 insertions(+), 3 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 210d2d83a..6913fe7a1 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
@@ -92,11 +92,10 @@ class RecordSetService(
     for {
       zone <- getZone(recordSet.zoneId)
       authZones = dottedHostsConfig.authConfigs.map(x => x.zone)
-      newRs = if(authZones.contains(zone.name) && recordSet.name.takeRight(1) == ".") recordSet.copy(name = recordSet.name.dropRight(1)) else recordSet
-      change <- RecordSetChangeGenerator.forAdd(newRs, zone, Some(auth)).toResult
+      change <- RecordSetChangeGenerator.forAdd(recordSet, zone, Some(auth)).toResult
       // because changes happen to the RS in forAdd itself, converting 1st and validating on that
       rsForValidations = change.recordSet
-      _ <- isNotHighValueDomain(newRs, zone, highValueDomainConfig).toResult
+      _ <- isNotHighValueDomain(recordSet, zone, highValueDomainConfig).toResult
       _ <- recordSetDoesNotExist(
         backendResolver.resolve,
         zone,
@@ -131,6 +130,7 @@ class RecordSetService(
         isRecordTypeAndUserAllowed
       ).toResult
       _ <- if(allowedZoneList.contains(zone.name)) checkAllowedDots(allowedDotsLimit, rsForValidations, zone).toResult else ().toResult
+      _ <- if(allowedZoneList.contains(zone.name)) isNotApexEndsWithDot(rsForValidations, zone).toResult else ().toResult
       _ <- messageQueue.send(change).toResult[Unit]
     } yield change
 
@@ -180,6 +180,7 @@ class RecordSetService(
         isRecordTypeAndUserAllowed,
       ).toResult
       _ <- if(existing.name == rsForValidations.name) ().toResult else if(allowedZoneList.contains(zone.name)) checkAllowedDots(allowedDotsLimit, rsForValidations, zone).toResult else ().toResult
+      _ <- if(allowedZoneList.contains(zone.name)) isNotApexEndsWithDot(rsForValidations, zone).toResult else ().toResult
       _ <- messageQueue.send(change).toResult[Unit]
     } yield change
 
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 3e59c9088..7fd3ca050 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
@@ -365,6 +365,16 @@ object RecordSetValidations {
     )
   }
 
+  def isNotApexEndsWithDot(recordSet: RecordSet, zone: Zone): Either[Throwable, Unit] = {
+    ensuring(
+      InvalidRequest(
+        "RecordSet name cannot end with a dot, unless it's an apex record."
+      )
+    )(
+      recordSet.name.endsWith(zone.name) || !recordSet.name.endsWith(".")
+    )
+  }
+
   def canUseOwnerGroup(
       ownerGroupId: Option[String],
       group: Option[Group],

From adb933a783086579a3e9152f59268e712897f028 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Wed, 12 Oct 2022 11:37:35 +0530
Subject: [PATCH 134/147] Address PR comments

---
 .../api/config/DottedHostsConfig.scala        | 10 +-
 .../api/domain/record/RecordSetService.scala  | 46 ++++-----
 .../domain/record/RecordSetValidations.scala  | 37 ++++----
 .../vinyldns/api/VinylDNSTestHelpers.scala    |  4 +-
 .../domain/record/RecordSetServiceSpec.scala  | 93 +++++++++++++------
 .../record/RecordSetValidationsSpec.scala     | 32 +++++--
 .../scala/vinyldns/core/TestZoneData.scala    |  1 +
 7 files changed, 142 insertions(+), 81 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala b/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
index e28f35f3b..2c0721ac7 100644
--- a/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
+++ b/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
@@ -19,13 +19,13 @@ package vinyldns.api.config
 import pureconfig.ConfigReader
 import pureconfig.generic.auto._
 
-final case class AuthConfigs(zone: String, allowedUserList: List[String], allowedGroupList: List[String], allowedRecordType: List[String], allowedDotsLimit: Int)
-final case class DottedHostsConfig(authConfigs: List[AuthConfigs])
+final case class ZoneAuthConfigs(zone: String, allowedUserList: List[String], allowedGroupList: List[String], allowedRecordType: List[String], allowedDotsLimit: Int)
+final case class DottedHostsConfig(zoneAuthConfigs: List[ZoneAuthConfigs])
 
 object DottedHostsConfig {
   implicit val configReader: ConfigReader[DottedHostsConfig] =
-    ConfigReader.forProduct1[DottedHostsConfig, List[AuthConfigs]](
+    ConfigReader.forProduct1[DottedHostsConfig, List[ZoneAuthConfigs]](
       "allowed-settings",
-    )(authConfigs =>
-      DottedHostsConfig(authConfigs))
+    )(zoneAuthConfigs =>
+      DottedHostsConfig(zoneAuthConfigs))
 }
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 6913fe7a1..cd699261d 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
@@ -28,7 +28,7 @@ import vinyldns.core.queue.MessageQueue
 import cats.data._
 import cats.effect.IO
 import org.xbill.DNS.ReverseMap
-import vinyldns.api.config.{AuthConfigs, DottedHostsConfig, HighValueDomainConfig}
+import vinyldns.api.config.{ZoneAuthConfigs, DottedHostsConfig, HighValueDomainConfig}
 import vinyldns.api.domain.DomainValidations.{validateIpv4Address, validateIpv6Address}
 import vinyldns.api.domain.access.AccessValidationsAlgebra
 import vinyldns.core.domain.record.NameSort.NameSort
@@ -91,7 +91,7 @@ class RecordSetService(
   def addRecordSet(recordSet: RecordSet, auth: AuthPrincipal): Result[ZoneCommandResult] =
     for {
       zone <- getZone(recordSet.zoneId)
-      authZones = dottedHostsConfig.authConfigs.map(x => x.zone)
+      authZones = dottedHostsConfig.zoneAuthConfigs.map(x => x.zone)
       change <- RecordSetChangeGenerator.forAdd(recordSet, zone, Some(auth)).toResult
       // because changes happen to the RS in forAdd itself, converting 1st and validating on that
       rsForValidations = change.recordSet
@@ -127,7 +127,8 @@ class RecordSetService(
         approvedNameServers,
         recordFqdnDoesNotAlreadyExist,
         allowedZoneList,
-        isRecordTypeAndUserAllowed
+        isRecordTypeAndUserAllowed,
+        allowedDotsLimit
       ).toResult
       _ <- if(allowedZoneList.contains(zone.name)) checkAllowedDots(allowedDotsLimit, rsForValidations, zone).toResult else ().toResult
       _ <- if(allowedZoneList.contains(zone.name)) isNotApexEndsWithDot(rsForValidations, zone).toResult else ().toResult
@@ -160,7 +161,7 @@ class RecordSetService(
         validateRecordLookupAgainstDnsBackend
       )
       _ <- noCnameWithNewName(rsForValidations, existingRecordsWithName, zone).toResult
-      authZones = dottedHostsConfig.authConfigs.map(x => x.zone)
+      authZones = dottedHostsConfig.zoneAuthConfigs.map(x => x.zone)
       allowedZoneList <- getAllowedZones(authZones).toResult[Set[String]]
       isInAllowedUsers = checkIfInAllowedUsers(zone, dottedHostsConfig, auth)
       isUserInAllowedGroups <- checkIfInAllowedGroups(zone, dottedHostsConfig, auth).toResult[Boolean]
@@ -178,6 +179,7 @@ class RecordSetService(
         recordFqdnDoesNotAlreadyExist,
         allowedZoneList,
         isRecordTypeAndUserAllowed,
+        allowedDotsLimit
       ).toResult
       _ <- if(existing.name == rsForValidations.name) ().toResult else if(allowedZoneList.contains(zone.name)) checkAllowedDots(allowedDotsLimit, rsForValidations, zone).toResult else ().toResult
       _ <- if(allowedZoneList.contains(zone.name)) isNotApexEndsWithDot(rsForValidations, zone).toResult else ().toResult
@@ -244,16 +246,16 @@ class RecordSetService(
 
   // Check if user is allowed to create dotted hosts using the users present in dotted hosts config
   def getAllowedDotsLimit(zone: Zone, config: DottedHostsConfig): Int = {
-    val configZones = config.authConfigs.map(x => x.zone)
+    val configZones = config.zoneAuthConfigs.map(x => x.zone)
     val zoneName = if(zone.name.takeRight(1) != ".") zone.name + "." else zone.name
     val dottedZoneConfig = configZones.filter(_.contains("*")).map(_.replace("*", "[A-Za-z0-9.]*"))
     val isContainWildcardZone = dottedZoneConfig.exists(x => zoneName.matches(x))
     val isContainNormalZone = configZones.contains(zoneName)
     if(isContainNormalZone){
-      config.authConfigs.filter(x => x.zone == zoneName).head.allowedDotsLimit
+      config.zoneAuthConfigs.filter(x => x.zone == zoneName).head.allowedDotsLimit
     }
     else if(isContainWildcardZone){
-      config.authConfigs.filter(x => zoneName.matches(x.zone.replace("*", "[A-Za-z0-9.]*"))).head.allowedDotsLimit
+      config.zoneAuthConfigs.filter(x => zoneName.matches(x.zone.replace("*", "[A-Za-z0-9.]*"))).head.allowedDotsLimit
     }
     else {
       0
@@ -262,14 +264,14 @@ class RecordSetService(
 
   // Check if user is allowed to create dotted hosts using the users present in dotted hosts config
   def checkIfInAllowedUsers(zone: Zone, config: DottedHostsConfig, auth: AuthPrincipal): Boolean = {
-    val configZones = config.authConfigs.map(x => x.zone)
+    val configZones = config.zoneAuthConfigs.map(x => x.zone)
     val zoneName = if(zone.name.takeRight(1) != ".") zone.name + "." else zone.name
     val dottedZoneConfig = configZones.filter(_.contains("*")).map(_.replace("*", "[A-Za-z0-9.]*"))
     val isContainWildcardZone = dottedZoneConfig.exists(x => zoneName.matches(x))
     val isContainNormalZone = configZones.contains(zoneName)
     if(isContainNormalZone){
-      val users = config.authConfigs.flatMap {
-        x: AuthConfigs =>
+      val users = config.zoneAuthConfigs.flatMap {
+        x: ZoneAuthConfigs =>
           if (x.zone == zoneName) x.allowedUserList else List.empty
       }
       if(users.contains(auth.signedInUser.userName)){
@@ -280,8 +282,8 @@ class RecordSetService(
       }
     }
     else if(isContainWildcardZone){
-      val users = config.authConfigs.flatMap {
-        x: AuthConfigs =>
+      val users = config.zoneAuthConfigs.flatMap {
+        x: ZoneAuthConfigs =>
           if (x.zone.contains("*")) {
             val wildcardZone = x.zone.replace("*", "[A-Za-z0-9.]*")
             if (zoneName.matches(wildcardZone)) x.allowedUserList else List.empty
@@ -301,14 +303,14 @@ class RecordSetService(
 
   // Check if user is allowed to create dotted hosts using the record types present in dotted hosts config
   def checkIfInAllowedRecordType(zone: Zone, config: DottedHostsConfig, rs: RecordSet): Boolean = {
-    val configZones = config.authConfigs.map(x => x.zone)
+    val configZones = config.zoneAuthConfigs.map(x => x.zone)
     val zoneName = if(zone.name.takeRight(1) != ".") zone.name + "." else zone.name
     val dottedZoneConfig = configZones.filter(_.contains("*")).map(_.replace("*", "[A-Za-z0-9.]*"))
     val isContainWildcardZone = dottedZoneConfig.exists(x => zoneName.matches(x))
     val isContainNormalZone = configZones.contains(zoneName)
     if(isContainNormalZone){
-      val rType = config.authConfigs.flatMap {
-        x: AuthConfigs =>
+      val rType = config.zoneAuthConfigs.flatMap {
+        x: ZoneAuthConfigs =>
           if (x.zone == zoneName) x.allowedRecordType else List.empty
       }
       if(rType.contains(rs.typ.toString)){
@@ -319,8 +321,8 @@ class RecordSetService(
       }
     }
     else if(isContainWildcardZone){
-      val rType = config.authConfigs.flatMap {
-        x: AuthConfigs =>
+      val rType = config.zoneAuthConfigs.flatMap {
+        x: ZoneAuthConfigs =>
           if (x.zone.contains("*")) {
             val wildcardZone = x.zone.replace("*", "[A-Za-z0-9.]*")
             if (zoneName.matches(wildcardZone)) x.allowedRecordType else List.empty
@@ -340,20 +342,20 @@ class RecordSetService(
 
   // Check if user is allowed to create dotted hosts using the groups present in dotted hosts config
   def checkIfInAllowedGroups(zone: Zone, config: DottedHostsConfig, auth: AuthPrincipal): IO[Boolean] = {
-    val configZones = config.authConfigs.map(x => x.zone)
+    val configZones = config.zoneAuthConfigs.map(x => x.zone)
     val zoneName = if(zone.name.takeRight(1) != ".") zone.name + "." else zone.name
     val dottedZoneConfig = configZones.filter(_.contains("*")).map(_.replace("*", "[A-Za-z0-9.]*"))
     val isContainWildcardZone = dottedZoneConfig.exists(x => zoneName.matches(x))
     val isContainNormalZone = configZones.contains(zoneName)
     val groups = if(isContainNormalZone){
-      config.authConfigs.flatMap {
-        x: AuthConfigs =>
+      config.zoneAuthConfigs.flatMap {
+        x: ZoneAuthConfigs =>
           if (x.zone == zoneName) x.allowedGroupList else List.empty
       }
     }
     else if(isContainWildcardZone){
-      config.authConfigs.flatMap {
-        x: AuthConfigs =>
+      config.zoneAuthConfigs.flatMap {
+        x: ZoneAuthConfigs =>
           if (x.zone.contains("*")) {
             val wildcardZone = x.zone.replace("*", "[A-Za-z0-9.]*")
             if (zoneName.matches(wildcardZone)) x.allowedGroupList else List.empty
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 7fd3ca050..4a625e0cc 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
@@ -97,7 +97,8 @@ object RecordSetValidations {
       existingRecordSet: Option[RecordSet] = None,
       recordFqdnDoesNotExist: Boolean,
       dottedHostZoneConfig: Set[String],
-      isRecordTypeAndUserAllowed: Boolean
+      isRecordTypeAndUserAllowed: Boolean,
+      allowedDotsLimit: Int = 0
   ): Either[Throwable, Unit] = {
 
     val zoneName = if(zone.name.takeRight(1) != ".") zone.name + "." else zone.name
@@ -105,7 +106,7 @@ object RecordSetValidations {
     val isDomainAllowed = dottedHostZoneConfig.contains(zoneName)
 
     // Check if record set contains dot and if it is in zone which is allowed to have dotted records from dotted hosts config
-    if(newRecordSet.name.contains(".") && isDomainAllowed && newRecordSet.name != zone.name) {
+    if(allowedDotsLimit != 0 && newRecordSet.name.contains(".") && isDomainAllowed && newRecordSet.name != zone.name) {
       if(!isRecordTypeAndUserAllowed){
         isUserAndRecordTypeAuthorized(newRecordSet, zone, existingRecordSet, recordFqdnDoesNotExist, isRecordTypeAndUserAllowed)
       }
@@ -175,16 +176,17 @@ object RecordSetValidations {
       approvedNameServers: List[Regex],
       recordFqdnDoesNotExist: Boolean,
       dottedHostZoneConfig: Set[String],
-      isRecordTypeAndUserAllowed: Boolean
+      isRecordTypeAndUserAllowed: Boolean,
+      allowedDotsLimit: Int = 0
   ): Either[Throwable, Unit] =
     newRecordSet.typ match {
-      case CNAME => cnameValidations(newRecordSet, existingRecordsWithName, zone, existingRecordSet, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
-      case NS => nsValidations(newRecordSet, zone, existingRecordSet, approvedNameServers, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
-      case SOA => soaValidations(newRecordSet, zone, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
+      case CNAME => cnameValidations(newRecordSet, existingRecordsWithName, zone, existingRecordSet, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed, allowedDotsLimit)
+      case NS => nsValidations(newRecordSet, zone, existingRecordSet, approvedNameServers, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed, allowedDotsLimit)
+      case SOA => soaValidations(newRecordSet, zone, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed, allowedDotsLimit)
       case PTR => ptrValidations(newRecordSet, zone)
       case SRV | TXT | NAPTR => ().asRight // SRV, TXT and NAPTR do not go through dotted host check
-      case DS => dsValidations(newRecordSet, existingRecordsWithName, zone, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
-      case _ => checkForDot(newRecordSet, zone, existingRecordSet, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
+      case DS => dsValidations(newRecordSet, existingRecordsWithName, zone, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed, allowedDotsLimit)
+      case _ => checkForDot(newRecordSet, zone, existingRecordSet, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed, allowedDotsLimit)
     }
 
   def typeSpecificDeleteValidations(recordSet: RecordSet, zone: Zone): Either[Throwable, Unit] =
@@ -208,7 +210,8 @@ object RecordSetValidations {
       existingRecordSet: Option[RecordSet] = None,
       recordFqdnDoesNotExist: Boolean,
       dottedHostZoneConfig: Set[String],
-      isRecordTypeAndUserAllowed: Boolean
+      isRecordTypeAndUserAllowed: Boolean,
+      allowedDotsLimit: Int = 0
   ): Either[Throwable, Unit] = {
     // cannot create a cname record if a record with the same exists
     val noRecordWithName = {
@@ -241,7 +244,7 @@ object RecordSetValidations {
       )
       _ <- noRecordWithName
       _ <- RDataWithConsecutiveDots
-      _ <- checkForDot(newRecordSet, zone, existingRecordSet, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
+      _ <- checkForDot(newRecordSet, zone, existingRecordSet, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed, allowedDotsLimit)
     } yield ()
 
   }
@@ -252,7 +255,8 @@ object RecordSetValidations {
       zone: Zone,
       recordFqdnDoesNotExist: Boolean,
       dottedHostZoneConfig: Set[String],
-      isRecordTypeAndUserAllowed: Boolean
+      isRecordTypeAndUserAllowed: Boolean,
+      allowedDotsLimit: Int = 0
   ): Either[Throwable, Unit] = {
     // see https://tools.ietf.org/html/rfc4035#section-2.4
     val nsChecks = existingRecordsWithName.find(_.typ == NS) match {
@@ -265,7 +269,7 @@ object RecordSetValidations {
     }
 
     for {
-      _ <- checkForDot(newRecordSet, zone, None, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed)
+      _ <- checkForDot(newRecordSet, zone, None, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed, allowedDotsLimit)
       _ <- isNotOrigin(
         newRecordSet,
         zone,
@@ -282,10 +286,11 @@ object RecordSetValidations {
       approvedNameServers: List[Regex],
       recordFqdnDoesNotExist: Boolean,
       dottedHostZoneConfig: Set[String],
-      isRecordTypeAndUserAllowed: Boolean
+      isRecordTypeAndUserAllowed: Boolean,
+      allowedDotsLimit: Int = 0
   ): Either[Throwable, Unit] = {
     // TODO kept consistency with old validation. Not sure why NS could be dotted in reverse specifically
-    val isNotDottedHost = if (!zone.isReverse) checkForDot(newRecordSet, zone, None, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed) else ().asRight
+    val isNotDottedHost = if (!zone.isReverse) checkForDot(newRecordSet, zone, None, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed, allowedDotsLimit) else ().asRight
 
     for {
       _ <- isNotDottedHost
@@ -307,9 +312,9 @@ object RecordSetValidations {
     } yield ()
   }
 
-  def soaValidations(newRecordSet: RecordSet, zone: Zone, recordFqdnDoesNotExist: Boolean, dottedHostZoneConfig: Set[String], isRecordTypeAndUserAllowed: Boolean): Either[Throwable, Unit] =
+  def soaValidations(newRecordSet: RecordSet, zone: Zone, recordFqdnDoesNotExist: Boolean, dottedHostZoneConfig: Set[String], isRecordTypeAndUserAllowed: Boolean, allowedDotsLimit: Int = 0): Either[Throwable, Unit] =
     // TODO kept consistency with old validation. in theory if SOA always == zone name, no special case is needed here
-    if (!zone.isReverse) checkForDot(newRecordSet, zone, None, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed) else ().asRight
+    if (!zone.isReverse) checkForDot(newRecordSet, zone, None, recordFqdnDoesNotExist, dottedHostZoneConfig, isRecordTypeAndUserAllowed, allowedDotsLimit) else ().asRight
 
   def ptrValidations(newRecordSet: RecordSet, zone: Zone): Either[Throwable, Unit] =
     // TODO we don't check for PTR as dotted...not sure why
diff --git a/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala b/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala
index 08c4d28e1..94eabc111 100644
--- a/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala
+++ b/modules/api/src/test/scala/vinyldns/api/VinylDNSTestHelpers.scala
@@ -18,7 +18,7 @@ package vinyldns.api
 
 import com.comcast.ip4s.IpAddress
 import org.joda.time.DateTime
-import vinyldns.api.config.{AuthConfigs, BatchChangeConfig, DottedHostsConfig, HighValueDomainConfig, LimitsConfig, ManualReviewConfig, ScheduledChangesConfig}
+import vinyldns.api.config.{ZoneAuthConfigs, BatchChangeConfig, DottedHostsConfig, HighValueDomainConfig, LimitsConfig, ManualReviewConfig, ScheduledChangesConfig}
 import vinyldns.api.domain.batch.V6DiscoveryNibbleBoundaries
 import vinyldns.core.domain.record._
 import vinyldns.core.domain.zone._
@@ -40,7 +40,7 @@ trait VinylDNSTestHelpers {
 
   val approvedNameServers: List[Regex] = List(new Regex("some.test.ns."))
 
-  val dottedHostsConfig: DottedHostsConfig = DottedHostsConfig(List(AuthConfigs("dotted.xyz.",List("xyz"),List("dummy"),List("CNAME"), 3), AuthConfigs("abc.zone.recordsets.",List("locked"),List("dummy"),List("CNAME"), 3), AuthConfigs("xyz.",List("super"),List("xyz"),List("CNAME"), 3)))
+  val dottedHostsConfig: DottedHostsConfig = DottedHostsConfig(List(ZoneAuthConfigs("dotted.xyz.",List("xyz"),List("dummy"),List("CNAME"), 3), ZoneAuthConfigs("abc.zone.recordsets.",List("locked"),List("dummy"),List("CNAME"), 3), ZoneAuthConfigs("xyz.",List("super"),List("xyz"),List("CNAME"), 3), ZoneAuthConfigs("dot.xyz.",List("super"),List("xyz"),List("CNAME"), 0)))
 
   val emptyDottedHostsConfig: DottedHostsConfig = DottedHostsConfig(List.empty)
 
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
index 9f613b7e3..6891fbddd 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
@@ -24,7 +24,7 @@ import org.scalatestplus.mockito.MockitoSugar
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 import org.scalatest.BeforeAndAfterEach
-import vinyldns.api.config.{AuthConfigs, DottedHostsConfig}
+import vinyldns.api.config.{ZoneAuthConfigs, DottedHostsConfig}
 import vinyldns.api.{ResultHelpers, VinylDNSTestHelpers}
 import vinyldns.api.domain.access.AccessValidations
 import vinyldns.api.domain.record.RecordSetHelpers._
@@ -128,14 +128,14 @@ class RecordSetServiceSpec
   )
 
   def getDottedHostsConfigGroupsAllowed(zone: Zone, config: DottedHostsConfig): List[String] = {
-    val configZones = config.authConfigs.map(x => x.zone)
+    val configZones = config.zoneAuthConfigs.map(x => x.zone)
     val zoneName = if(zone.name.takeRight(1) != ".") zone.name + "." else zone.name
     val dottedZoneConfig = configZones.filter(_.contains("*")).map(_.replace("*", "[A-Za-z.]*"))
     val isContainWildcardZone = dottedZoneConfig.exists(x => zoneName.substring(0, zoneName.length - 1).matches(x))
     val isContainNormalZone = configZones.contains(zoneName)
     val groups = if (isContainWildcardZone || isContainNormalZone) {
-      config.authConfigs.flatMap {
-        x: AuthConfigs =>
+      config.zoneAuthConfigs.flatMap {
+        x: ZoneAuthConfigs =>
           if (x.zone.contains("*")) {
             val wildcardZone = x.zone.replace("*", "[A-Za-z.]*")
             if (zoneName.substring(0, zoneName.length - 1).matches(wildcardZone)) x.allowedGroupList else List.empty
@@ -150,7 +150,7 @@ class RecordSetServiceSpec
     groups
   }
 
-  val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authConfigs.map(x => x.zone)
+  val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.zoneAuthConfigs.map(x => x.zone)
 
   val dottedHostsConfigGroupsAllowed: List[String] = getDottedHostsConfigGroupsAllowed(okZone, VinylDNSTestHelpers.dottedHostsConfig)
 
@@ -164,7 +164,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, record.name)
-      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone, dotZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -234,7 +234,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, record.name)
-      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone, dotZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -304,7 +304,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, record.name)
-      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone, dotZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -350,7 +350,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, record.name)
-      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone, dotZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -389,7 +389,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, record.name)
-      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone, dotZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -447,7 +447,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(Some(okGroup)))
         .when(mockGroupRepo)
         .getGroup(okGroup.id)
-      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone, dotZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -521,7 +521,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, record.name)
-      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone, dotZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -560,7 +560,7 @@ class RecordSetServiceSpec
     val record =
       cname.copy(name = "new.name", zoneId = dottedZone.id, status = RecordSetStatus.Active)
 
-    val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authConfigs.map(x => x.zone)
+    val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.zoneAuthConfigs.map(x => x.zone)
 
     val dottedHostsConfigGroupsAllowed: List[String] = getDottedHostsConfigGroupsAllowed(dottedZone, VinylDNSTestHelpers.dottedHostsConfig)
 
@@ -571,7 +571,7 @@ class RecordSetServiceSpec
     doReturn(IO.pure(List()))
       .when(mockRecordRepo)
       .getRecordSetsByName(dottedZone.id, record.name)
-    doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
+    doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone, dotZone)))
       .when(mockZoneRepo)
       .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
     doReturn(IO.pure(Set()))
@@ -604,7 +604,7 @@ class RecordSetServiceSpec
     val record =
       cname.copy(name = "new.name", zoneId = xyzZone.id, status = RecordSetStatus.Active)
 
-    val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authConfigs.map(x => x.zone)
+    val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.zoneAuthConfigs.map(x => x.zone)
 
     val dottedHostsConfigGroupsAllowed: List[String] = getDottedHostsConfigGroupsAllowed(xyzZone, VinylDNSTestHelpers.dottedHostsConfig)
 
@@ -644,6 +644,47 @@ class RecordSetServiceSpec
 
     result.recordSet.name shouldBe record.name
   }
+  "fail if the record is dotted and zone, user, record type is allowed but number of dots allowed in config is 0" in {
+    val record =
+      cname.copy(name = "new.name", zoneId = dotZone.id, status = RecordSetStatus.Active)
+
+    val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.zoneAuthConfigs.map(x => x.zone)
+
+    val dottedHostsConfigGroupsAllowed: List[String] = getDottedHostsConfigGroupsAllowed(dottedZone, VinylDNSTestHelpers.dottedHostsConfig)
+
+    doReturn(IO.pure(Some(dotZone))).when(mockZoneRepo).getZone(dotZone.id)
+    doReturn(IO.pure(List()))
+      .when(mockRecordRepo)
+      .getRecordSets(dotZone.id, record.name, record.typ)
+    doReturn(IO.pure(List()))
+      .when(mockRecordRepo)
+      .getRecordSetsByName(dotZone.id, record.name)
+    doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone, dotZone)))
+      .when(mockZoneRepo)
+      .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
+    doReturn(IO.pure(Set()))
+      .when(mockZoneRepo)
+      .getZonesByFilters(Set.empty)
+    doReturn(IO.pure(None))
+      .when(mockZoneRepo)
+      .getZoneByName(record.name + "." + dotZone.name)
+    doReturn(IO.pure(List()))
+      .when(mockRecordRepo)
+      .getRecordSetsByFQDNs(Set(record.name + "." + dotZone.name))
+    doReturn(IO.pure(Set()))
+      .when(mockZoneRepo)
+      .getZonesByFilters(record.name.split('.').map(x => x + "." + dotZone.name).toSet)
+    doReturn(IO.pure(Set(dummyGroup)))
+      .when(mockGroupRepo)
+      .getGroupsByName(dottedHostsConfigGroupsAllowed.toSet)
+    doReturn(IO.pure(ListUsersResults(listOfDummyUsers.toSeq, None)))
+      .when(mockUserRepo)
+      .getUsers(dummyGroup.memberIds, None, None)
+
+    // fails as no.of.dots allowed for the zone in the config is 0
+    val result = leftResultOf(underTest.addRecordSet(record, xyzAuth).value)
+    result shouldBe an[InvalidRequest]
+  }
   "fail if the record is dotted and user, record type is in allowed dotted hosts config except zone" in {
     val record =
       cname.copy(name = "new.name", zoneId = okZone.id, status = RecordSetStatus.Active)
@@ -654,7 +695,7 @@ class RecordSetServiceSpec
     doReturn(IO.pure(List()))
       .when(mockRecordRepo)
       .getRecordSetsByName(okZone.id, record.name)
-    doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
+    doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone, dotZone)))
       .when(mockZoneRepo)
       .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
     doReturn(IO.pure(Set()))
@@ -684,7 +725,7 @@ class RecordSetServiceSpec
     val record =
       cname.copy(name = "new.name", zoneId = abcZone.id, status = RecordSetStatus.Active)
 
-    val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authConfigs.map(x => x.zone)
+    val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.zoneAuthConfigs.map(x => x.zone)
 
     val dottedHostsConfigGroupsAllowed: List[String] = getDottedHostsConfigGroupsAllowed(abcZone, VinylDNSTestHelpers.dottedHostsConfig)
 
@@ -725,8 +766,8 @@ class RecordSetServiceSpec
     val record =
       aaaa.copy(name = "new.name", zoneId = dottedZone.id, status = RecordSetStatus.Active)
 
-    val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authConfigs.map {
-      case y:AuthConfigs => y.zone
+    val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.zoneAuthConfigs.map {
+      case y:ZoneAuthConfigs => y.zone
     }
 
     val dottedHostsConfigGroupsAllowed: List[String] = getDottedHostsConfigGroupsAllowed(dottedZone, VinylDNSTestHelpers.dottedHostsConfig)
@@ -738,7 +779,7 @@ class RecordSetServiceSpec
     doReturn(IO.pure(List()))
       .when(mockRecordRepo)
       .getRecordSetsByName(dottedZone.id, record.name)
-    doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
+    doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone, dotZone)))
       .when(mockZoneRepo)
       .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
     doReturn(IO.pure(Set()))
@@ -779,7 +820,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, newRecord.name)
-      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone, dotZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -836,7 +877,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, newRecord.name)
-      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone, dotZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -896,7 +937,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, newRecord.name)
-      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone, dotZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -939,7 +980,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, newRecord.name)
-      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone, dotZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -982,7 +1023,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(List()))
         .when(mockRecordRepo)
         .getRecordSetsByName(okZone.id, newRecord.name)
-      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone, dotZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
@@ -1138,7 +1179,7 @@ class RecordSetServiceSpec
       doReturn(IO.pure(Some(oneUserDummyGroup)))
         .when(mockGroupRepo)
         .getGroup(oneUserDummyGroup.id)
-      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone)))
+      doReturn(IO.pure(Set(dottedZone, abcZone, xyzZone, dotZone)))
         .when(mockZoneRepo)
         .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
       doReturn(IO.pure(Set()))
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala
index 10fd0a99e..e0a03905e 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetValidationsSpec.scala
@@ -44,7 +44,7 @@ class RecordSetValidationsSpec
 
   import RecordSetValidations._
 
-  val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.authConfigs.map(x => x.zone)
+  val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.zoneAuthConfigs.map(x => x.zone)
 
   "RecordSetValidations" should {
     "validRecordTypes" should {
@@ -232,18 +232,30 @@ class RecordSetValidationsSpec
         }
 
         "return a success for any new record with dotted hosts in forward zones if it satisfies dotted hosts configs" in {
-          val record = typeSpecificValidations(dottedARecord.copy(zoneId = dottedZone.id), List(), dottedZone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, true)
+          // Zone, User, Record Type and Number of dots are all satisfied
+          val record = typeSpecificValidations(dottedARecord.copy(typ = CNAME, zoneId = dottedZone.id), List(), dottedZone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, true, 5)
           record should be(right)
         }
 
-        "return a failure for any new record with dotted hosts in forward zones (CNAME) if it satisfies dotted hosts configs" in {
-          val record = typeSpecificValidations(dottedARecord.copy(typ = CNAME, zoneId = dottedZone.id), List(), dottedZone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, true)
-          record should be(right)
+        "return a failure for any new record with dotted hosts if no.of.dots allowed is 0" in {
+          // Zone, User, Record Type and Number of dots are all satisfied
+          leftValue(
+            typeSpecificValidations(dottedARecord.copy(typ = CNAME, zoneId = dottedZone.id), List(), dottedZone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, true, 0)
+          ) shouldBe an[InvalidRequest]
         }
 
-        "return a failure for any new record with dotted hosts in forward zones (NS) if it satisfies dotted hosts configs" in {
-          val record = typeSpecificValidations(dottedARecord.copy(typ = NS, zoneId = dottedZone.id), List(), dottedZone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, true)
-          record should be(right)
+        "return a failure for any new record with dotted hosts in forward zones (A record) if it doesn't satisfy dotted hosts configs" in {
+          // 'A' record is not allowed in the config
+          leftValue(
+            typeSpecificValidations(dottedARecord.copy(zoneId = dottedZone.id), List(), dottedZone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, false, 5)
+          ) shouldBe an[InvalidRequest]
+        }
+
+        "return a failure for any new record with dotted hosts in forward zones (NS record) if it doesn't satisfy dotted hosts configs" in {
+          // 'NS' record is not allowed in the config
+          leftValue(
+            typeSpecificValidations(dottedARecord.copy(typ = NS, zoneId = dottedZone.id), List(), dottedZone, None, Nil, true, dottedHostsConfigZonesAllowed.toSet, false, 5)
+          ) shouldBe an[InvalidRequest]
         }
 
         "return a success for any existing record with dotted hosts in forward zones" in {
@@ -445,7 +457,7 @@ class RecordSetValidationsSpec
       }
       "return ok if the DS is dotted and zone, user, record type is allowed in dotted hosts config" in {
         val record =
-          dsValidations(ds.copy(name = "dotted.trial", zoneId = dottedZone.id), List(matchingNs), dottedZone, true, dottedHostsConfigZonesAllowed.toSet, true)
+          dsValidations(ds.copy(name = "dotted.trial", zoneId = dottedZone.id), List(matchingNs), dottedZone, true, dottedHostsConfigZonesAllowed.toSet, true, 5)
         record should be(right)
       }
       "return an InvalidRequest if the DS is dotted and zone, user, record type is allowed in dotted hosts config but has a conflict with existing record or zone" in {
@@ -508,7 +520,7 @@ class RecordSetValidationsSpec
       }
       "return ok if the CNAME is dotted and zone, user, record type is allowed in dotted hosts config" in {
         val record =
-          cnameValidations(cname.copy(name = "dot.ted", zoneId = dottedZone.id), List(), dottedZone, None, true, dottedHostsConfigZonesAllowed.toSet, true)
+          cnameValidations(cname.copy(name = "dot.ted", zoneId = dottedZone.id), List(), dottedZone, None, true, dottedHostsConfigZonesAllowed.toSet, true, 5)
         record should be(right)
       }
       "return an InvalidRequest if the CNAME is dotted and zone, user, record type is allowed in dotted hosts config but has a conflict with existing record or zone" in {
diff --git a/modules/core/src/test/scala/vinyldns/core/TestZoneData.scala b/modules/core/src/test/scala/vinyldns/core/TestZoneData.scala
index 34c1495f1..df08e8a0a 100644
--- a/modules/core/src/test/scala/vinyldns/core/TestZoneData.scala
+++ b/modules/core/src/test/scala/vinyldns/core/TestZoneData.scala
@@ -35,6 +35,7 @@ object TestZoneData {
     connection = testConnection
   )
   val dottedZone: Zone = Zone("dotted.xyz.", "dotted@xyz.com", adminGroupId = xyzGroup.id)
+  val dotZone: Zone = Zone("dot.xyz.", "dotted@xyz.com", adminGroupId = xyzGroup.id)
   val abcZone: Zone = Zone("abc.zone.recordsets.", "test@test.com", adminGroupId = abcGroup.id)
   val xyzZone: Zone = Zone("xyz.", "abc@xyz.com", adminGroupId = xyzGroup.id)
   val zoneIp4: Zone = Zone("0.162.198.in-addr.arpa.", "test@test.com", adminGroupId = abcGroup.id)

From a0448b922b5a334bc024dcfb6bf186374398ca4b Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Wed, 12 Oct 2022 11:54:47 +0530
Subject: [PATCH 135/147] Update docs

---
 modules/docs/src/main/mdoc/operator/config-api.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/docs/src/main/mdoc/operator/config-api.md b/modules/docs/src/main/mdoc/operator/config-api.md
index d32df144d..9e31806ef 100644
--- a/modules/docs/src/main/mdoc/operator/config-api.md
+++ b/modules/docs/src/main/mdoc/operator/config-api.md
@@ -552,6 +552,12 @@ Note the following:
 not necessary for the user to be in both `allowed-user-list` and `allowed-group-list`.
 6. The record types which are allowed while creating a dotted host is added to the `allowed-record-type`.
 7. The number of dots allowed in a record name for a zone is given in `allowed-dots-limit`.
+8. If `allowed-user-list` is left empty (`allowed-user-list = []`), no user will be allowed to create dotted hosts unless 
+they're present in `allowed-group-list` and vice-versa. If both `allowed-user-list` and `allowed-group-list` is left empty
+no users will be allowed to create dotted hosts in that zone.
+9. If `allowed-record-type` is left empty (`allowed-record-type = []`), user cannot create dotted hosts of any record type
+in that zone.
+10. If `allowed-dots-limit` is set to 0 (`allowed-dots-limit = 0`), we cannot create dotted hosts record in that zone.
 
 ```yaml
 # approved zones, individual users, users in groups and record types that are allowed for dotted hosts

From 3527fdb72264854968638d9dd32d32cba1595812 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Wed, 12 Oct 2022 12:22:06 +0530
Subject: [PATCH 136/147] Add test

---
 .../domain/record/RecordSetServiceSpec.scala  | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
index 6891fbddd..43b5ffc0c 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
@@ -644,6 +644,47 @@ class RecordSetServiceSpec
 
     result.recordSet.name shouldBe record.name
   }
+  "fail if the record is dotted and zone, user in group, record type is allowed but record name has dot in the end and is not an apex record" in {
+    val record =
+      cname.copy(name = "new.name.", zoneId = xyzZone.id, status = RecordSetStatus.Active)
+
+    val dottedHostsConfigZonesAllowed: List[String] = VinylDNSTestHelpers.dottedHostsConfig.zoneAuthConfigs.map(x => x.zone)
+
+    val dottedHostsConfigGroupsAllowed: List[String] = getDottedHostsConfigGroupsAllowed(xyzZone, VinylDNSTestHelpers.dottedHostsConfig)
+
+    doReturn(IO.pure(Some(xyzZone))).when(mockZoneRepo).getZone(xyzZone.id)
+    doReturn(IO.pure(List()))
+      .when(mockRecordRepo)
+      .getRecordSets(xyzZone.id, record.name, record.typ)
+    doReturn(IO.pure(List()))
+      .when(mockRecordRepo)
+      .getRecordSetsByName(xyzZone.id, record.name)
+    doReturn(IO.pure(Set(xyzZone, abcZone, xyzZone)))
+      .when(mockZoneRepo)
+      .getZonesByNames(dottedHostsConfigZonesAllowed.toSet)
+    doReturn(IO.pure(Set()))
+      .when(mockZoneRepo)
+      .getZonesByFilters(Set.empty)
+    doReturn(IO.pure(None))
+      .when(mockZoneRepo)
+      .getZoneByName(record.name + "." + xyzZone.name)
+    doReturn(IO.pure(List()))
+      .when(mockRecordRepo)
+      .getRecordSetsByFQDNs(Set(record.name + "." + xyzZone.name))
+    doReturn(IO.pure(Set()))
+      .when(mockZoneRepo)
+      .getZonesByFilters(record.name.split('.').map(x => x + "." + xyzZone.name).toSet)
+    doReturn(IO.pure(Set(xyzGroup)))
+      .when(mockGroupRepo)
+      .getGroupsByName(dottedHostsConfigGroupsAllowed.toSet)
+    doReturn(IO.pure(ListUsersResults(Seq(xyzUser), None)))
+      .when(mockUserRepo)
+      .getUsers(xyzGroup.memberIds, None, None)
+
+    // fails as dotted host record name has dot at the end and is not an apex record
+    val result = leftResultOf(underTest.addRecordSet(record, xyzAuth).value)
+    result shouldBe an[InvalidRequest]
+  }
   "fail if the record is dotted and zone, user, record type is allowed but number of dots allowed in config is 0" in {
     val record =
       cname.copy(name = "new.name", zoneId = dotZone.id, status = RecordSetStatus.Active)

From 3189bcbdfa588e276337842fdc2d96396f26a4f0 Mon Sep 17 00:00:00 2001
From: Nicholas Spadaccino <37352107+nspadaccino@users.noreply.github.com>
Date: Wed, 12 Oct 2022 14:35:09 -0400
Subject: [PATCH 137/147]  Bump version to v0.15.0

---
 version.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.sbt b/version.sbt
index 3c3c14dd9..b2771948a 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.14.1"
+version in ThisBuild := "0.15.0"

From 6b0b1a32f6adf8c41b9088e2920bac2d32fa95ed Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 14 Oct 2022 12:02:22 +0530
Subject: [PATCH 138/147] Rename config properties

---
 modules/api/src/it/resources/application.conf | 16 ++---
 .../RecordSetServiceIntegrationSpec.scala     |  2 +-
 modules/api/src/main/resources/reference.conf | 16 ++---
 .../api/config/DottedHostsConfig.scala        |  2 +-
 .../api/domain/record/RecordSetService.scala  | 16 ++---
 .../domain/record/RecordSetValidations.scala  |  2 +-
 .../tests/recordsets/create_recordset_test.py |  4 +-
 .../domain/record/RecordSetServiceSpec.scala  |  4 +-
 .../docs/src/main/mdoc/operator/config-api.md | 58 +++++++++----------
 9 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/modules/api/src/it/resources/application.conf b/modules/api/src/it/resources/application.conf
index aedb547d1..550af4139 100644
--- a/modules/api/src/it/resources/application.conf
+++ b/modules/api/src/it/resources/application.conf
@@ -169,18 +169,18 @@ vinyldns {
     allowed-settings = [
       {
       zone = "*mmy."
-      allowed-user-list = ["testuser"]
-      allowed-group-list = ["dummy-group"]
-      allowed-record-type = ["AAAA"]
-      allowed-dots-limit = 3
+      user-list = ["testuser"]
+      group-list = ["dummy-group"]
+      record-types = ["AAAA"]
+      dots-limit = 3
       },
       {
       # for wildcard zones. Settings will be applied to all matching zones
       zone = "parent.com."
-      allowed-user-list = ["professor", "testuser"]
-      allowed-group-list = ["testing-group"]
-      allowed-record-type = ["A", "CNAME"]
-      allowed-dots-limit = 3
+      user-list = ["professor", "testuser"]
+      group-list = ["testing-group"]
+      record-types = ["A", "CNAME"]
+      dots-limit = 3
       }
     ]
   }
diff --git a/modules/api/src/it/scala/vinyldns/api/domain/record/RecordSetServiceIntegrationSpec.scala b/modules/api/src/it/scala/vinyldns/api/domain/record/RecordSetServiceIntegrationSpec.scala
index 52bded45e..c789d8305 100644
--- a/modules/api/src/it/scala/vinyldns/api/domain/record/RecordSetServiceIntegrationSpec.scala
+++ b/modules/api/src/it/scala/vinyldns/api/domain/record/RecordSetServiceIntegrationSpec.scala
@@ -391,7 +391,7 @@ class RecordSetServiceIntegrationSpec
         .name shouldBe "test.dotted"
     }
 
-    "fail creating dotted record if it satisfies all dotted hosts config except allowed-dots-limit for the zone" in {
+    "fail creating dotted record if it satisfies all dotted hosts config except dots-limit for the zone" in {
       val newRecord = RecordSet(
         dummyZone.id,
         "test.dotted.more.dots.than.allowed",
diff --git a/modules/api/src/main/resources/reference.conf b/modules/api/src/main/resources/reference.conf
index 021ad67ce..402a8b1e6 100644
--- a/modules/api/src/main/resources/reference.conf
+++ b/modules/api/src/main/resources/reference.conf
@@ -97,18 +97,18 @@ vinyldns {
       {
       # for wildcard zones. Settings will be applied to all matching zones
       zone = "*ent.com*."
-      allowed-user-list = ["ok"]
-      allowed-group-list = ["dummy-group"]
-      allowed-record-type = ["CNAME"]
-      allowed-dots-limit = 3
+      user-list = ["ok"]
+      group-list = ["dummy-group"]
+      record-types = ["CNAME"]
+      dots-limit = 3
       },
       {
       # for wildcard zones. Settings will be applied to all matching zones
       zone = "dummy*."
-      allowed-user-list = ["sharedZoneUser"]
-      allowed-group-list = ["history-group1"]
-      allowed-record-type = ["A"]
-      allowed-dots-limit = 3
+      user-list = ["sharedZoneUser"]
+      group-list = ["history-group1"]
+      record-types = ["A"]
+      dots-limit = 3
       }
     ]
   }
diff --git a/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala b/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
index 2c0721ac7..a5d1e546d 100644
--- a/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
+++ b/modules/api/src/main/scala/vinyldns/api/config/DottedHostsConfig.scala
@@ -19,7 +19,7 @@ package vinyldns.api.config
 import pureconfig.ConfigReader
 import pureconfig.generic.auto._
 
-final case class ZoneAuthConfigs(zone: String, allowedUserList: List[String], allowedGroupList: List[String], allowedRecordType: List[String], allowedDotsLimit: Int)
+final case class ZoneAuthConfigs(zone: String, userList: List[String], groupList: List[String], recordTypes: List[String], dotsLimit: Int)
 final case class DottedHostsConfig(zoneAuthConfigs: List[ZoneAuthConfigs])
 
 object DottedHostsConfig {
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 cd699261d..0a38bae89 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
@@ -252,10 +252,10 @@ class RecordSetService(
     val isContainWildcardZone = dottedZoneConfig.exists(x => zoneName.matches(x))
     val isContainNormalZone = configZones.contains(zoneName)
     if(isContainNormalZone){
-      config.zoneAuthConfigs.filter(x => x.zone == zoneName).head.allowedDotsLimit
+      config.zoneAuthConfigs.filter(x => x.zone == zoneName).head.dotsLimit
     }
     else if(isContainWildcardZone){
-      config.zoneAuthConfigs.filter(x => zoneName.matches(x.zone.replace("*", "[A-Za-z0-9.]*"))).head.allowedDotsLimit
+      config.zoneAuthConfigs.filter(x => zoneName.matches(x.zone.replace("*", "[A-Za-z0-9.]*"))).head.dotsLimit
     }
     else {
       0
@@ -272,7 +272,7 @@ class RecordSetService(
     if(isContainNormalZone){
       val users = config.zoneAuthConfigs.flatMap {
         x: ZoneAuthConfigs =>
-          if (x.zone == zoneName) x.allowedUserList else List.empty
+          if (x.zone == zoneName) x.userList else List.empty
       }
       if(users.contains(auth.signedInUser.userName)){
         true
@@ -286,7 +286,7 @@ class RecordSetService(
         x: ZoneAuthConfigs =>
           if (x.zone.contains("*")) {
             val wildcardZone = x.zone.replace("*", "[A-Za-z0-9.]*")
-            if (zoneName.matches(wildcardZone)) x.allowedUserList else List.empty
+            if (zoneName.matches(wildcardZone)) x.userList else List.empty
           } else List.empty
       }
       if(users.contains(auth.signedInUser.userName)){
@@ -311,7 +311,7 @@ class RecordSetService(
     if(isContainNormalZone){
       val rType = config.zoneAuthConfigs.flatMap {
         x: ZoneAuthConfigs =>
-          if (x.zone == zoneName) x.allowedRecordType else List.empty
+          if (x.zone == zoneName) x.recordTypes else List.empty
       }
       if(rType.contains(rs.typ.toString)){
         true
@@ -325,7 +325,7 @@ class RecordSetService(
         x: ZoneAuthConfigs =>
           if (x.zone.contains("*")) {
             val wildcardZone = x.zone.replace("*", "[A-Za-z0-9.]*")
-            if (zoneName.matches(wildcardZone)) x.allowedRecordType else List.empty
+            if (zoneName.matches(wildcardZone)) x.recordTypes else List.empty
           } else List.empty
       }
       if(rType.contains(rs.typ.toString)){
@@ -350,7 +350,7 @@ class RecordSetService(
     val groups = if(isContainNormalZone){
       config.zoneAuthConfigs.flatMap {
         x: ZoneAuthConfigs =>
-          if (x.zone == zoneName) x.allowedGroupList else List.empty
+          if (x.zone == zoneName) x.groupList else List.empty
       }
     }
     else if(isContainWildcardZone){
@@ -358,7 +358,7 @@ class RecordSetService(
         x: ZoneAuthConfigs =>
           if (x.zone.contains("*")) {
             val wildcardZone = x.zone.replace("*", "[A-Za-z0-9.]*")
-            if (zoneName.matches(wildcardZone)) x.allowedGroupList else List.empty
+            if (zoneName.matches(wildcardZone)) x.groupList else List.empty
           } else List.empty
       }
     }
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 4a625e0cc..cbbd35b60 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
@@ -361,7 +361,7 @@ object RecordSetValidations {
     ensuring(
       InvalidRequest(
         s"RecordSet with name ${recordSet.name} has more dots than that is allowed in config for this zone " +
-          s"which is, 'allowed-dots-limit = $allowedDotsLimit'."
+          s"which is, 'dots-limit = $allowedDotsLimit'."
       )
     )(
       recordSet.name.count(_ == '.') <= allowedDotsLimit || (recordSet.name.count(_ == '.') == 1 &&
diff --git a/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py b/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py
index d6c9a6cff..f04152c13 100644
--- a/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py
+++ b/modules/api/src/test/functional/tests/recordsets/create_recordset_test.py
@@ -562,7 +562,7 @@ def test_create_dotted_a_record_fails_if_all_dotted_hosts_config_not_satisfied(s
     Test that creating a A record set with dotted host record name fails
     Here the zone, user (in group) and record type is allowed.
     But the record name has more dots than the number of dots allowed for this zone. Hence the test fails
-    The 'allowed-dots-limit' config from dotted-hosts config is not satisfied. Config present in reference.conf
+    The 'dots-limit' config from dotted-hosts config is not satisfied. Config present in reference.conf
     """
     client = shared_zone_test_context.history_client
     zone = shared_zone_test_context.dummy_zone
@@ -576,7 +576,7 @@ def test_create_dotted_a_record_fails_if_all_dotted_hosts_config_not_satisfied(s
 
     error = client.create_recordset(dotted_host_a_record, status=422)
     assert_that(error, is_("RecordSet with name " + dotted_host_a_record["name"] + " has more dots than that is "
-                           "allowed in config for this zone which is, 'allowed-dots-limit = 3'."))
+                           "allowed in config for this zone which is, 'dots-limit = 3'."))
 
 
 def test_create_dotted_a_record_apex_succeeds(shared_zone_test_context):
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
index 43b5ffc0c..520a4bd9e 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/record/RecordSetServiceSpec.scala
@@ -138,9 +138,9 @@ class RecordSetServiceSpec
         x: ZoneAuthConfigs =>
           if (x.zone.contains("*")) {
             val wildcardZone = x.zone.replace("*", "[A-Za-z.]*")
-            if (zoneName.substring(0, zoneName.length - 1).matches(wildcardZone)) x.allowedGroupList else List.empty
+            if (zoneName.substring(0, zoneName.length - 1).matches(wildcardZone)) x.groupList else List.empty
           } else {
-            if (x.zone == zoneName) x.allowedGroupList else List.empty
+            if (x.zone == zoneName) x.groupList else List.empty
           }
       }
     }
diff --git a/modules/docs/src/main/mdoc/operator/config-api.md b/modules/docs/src/main/mdoc/operator/config-api.md
index 9e31806ef..db3e449dc 100644
--- a/modules/docs/src/main/mdoc/operator/config-api.md
+++ b/modules/docs/src/main/mdoc/operator/config-api.md
@@ -546,18 +546,18 @@ allowed to create dotted hosts. If only all the above are satisfied, one can cre
 Note the following:
 1. Zones defined in the `zone` must always end with a dot. Eg: `comcast.com.`
 2. Wildcard character `*` can be used in `zone` to allow dotted hosts for all zones matching it.
-3. Individual users who are allowed to create dotted hosts are added to the `allowed-user-list` using their username.
-4. A set of users in a group who are allowed to create dotted hosts are added to the `allowed-group-list` using group name.
-5. If the user is either in `allowed-user-list` or `allowed-group-list`, they are allowed to create a dotted host. It is
-not necessary for the user to be in both `allowed-user-list` and `allowed-group-list`.
-6. The record types which are allowed while creating a dotted host is added to the `allowed-record-type`.
-7. The number of dots allowed in a record name for a zone is given in `allowed-dots-limit`.
-8. If `allowed-user-list` is left empty (`allowed-user-list = []`), no user will be allowed to create dotted hosts unless 
-they're present in `allowed-group-list` and vice-versa. If both `allowed-user-list` and `allowed-group-list` is left empty
+3. Individual users who are allowed to create dotted hosts are added to the `user-list` using their username.
+4. A set of users in a group who are allowed to create dotted hosts are added to the `group-list` using group name.
+5. If the user is either in `user-list` or `group-list`, they are allowed to create a dotted host. It is
+not necessary for the user to be in both `user-list` and `group-list`.
+6. The record types which are allowed while creating a dotted host is added to the `record-types`.
+7. The number of dots allowed in a record name for a zone is given in `dots-limit`.
+8. If `user-list` is left empty (`user-list = []`), no user will be allowed to create dotted hosts unless 
+they're present in `group-list` and vice-versa. If both `user-list` and `group-list` is left empty
 no users will be allowed to create dotted hosts in that zone.
-9. If `allowed-record-type` is left empty (`allowed-record-type = []`), user cannot create dotted hosts of any record type
+9. If `record-types` is left empty (`record-types = []`), user cannot create dotted hosts of any record type
 in that zone.
-10. If `allowed-dots-limit` is set to 0 (`allowed-dots-limit = 0`), we cannot create dotted hosts record in that zone.
+10. If `dots-limit` is set to 0 (`dots-limit = 0`), we cannot create dotted hosts record in that zone.
 
 ```yaml
 # approved zones, individual users, users in groups and record types that are allowed for dotted hosts
@@ -565,18 +565,18 @@ dotted-hosts = {
    allowed-settings = [
       {
       zone = "dummy."
-      allowed-user-list = ["testuser"]
-      allowed-group-list = ["dummy-group"]
-      allowed-record-type = ["AAAA"]
-      allowed-dots-limit = 3
+      user-list = ["testuser"]
+      group-list = ["dummy-group"]
+      record-types = ["AAAA"]
+      dots-limit = 3
       },
       {
       # for wildcard zones. Settings will be applied to all matching zones
       zone = "*ent.com."
-      allowed-user-list = ["professor", "testuser"]
-      allowed-group-list = ["testing-group"]
-      allowed-record-type = ["A", "CNAME"]
-      allowed-dots-limit = 3
+      user-list = ["professor", "testuser"]
+      group-list = ["testing-group"]
+      record-types = ["A", "CNAME"]
+      dots-limit = 3
       }
    ]
 }
@@ -586,9 +586,9 @@ In the above, the dotted hosts can be created only in the zone `dummy.` and zone
 
 Also, it must satisfy the allowed users or group users and record type of the respective zone to create a dotted host.
 
-For eg, we can't create a dotted host with `CNAME` record type in the zone `dummy.` as it's not in `allowed-record-type`.
-And the user `professor` can't create a dotted host in the zone `dummy.` as the user is not in `allowed-user-list` or 
-`allowed-group-list` (not part of `dummy-group`).
+For eg, we can't create a dotted host with `CNAME` record type in the zone `dummy.` as it's not in `record-types`.
+And the user `professor` can't create a dotted host in the zone `dummy.` as the user is not in `user-list` or 
+`group-list` (not part of `dummy-group`).
 
 The config can be left empty as follows if we don't want to use it:
 
@@ -777,18 +777,18 @@ dotted-hosts = {
      allowed-settings = [
         {
         zone = "dummy."
-        allowed-user-list = ["testuser"]
-        allowed-group-list = ["dummy-group"]
-        allowed-record-type = ["AAAA"]
-        allowed-dots-limit = 3
+        user-list = ["testuser"]
+        group-list = ["dummy-group"]
+        record-types = ["AAAA"]
+        dots-limit = 3
         },
         {
         # for wildcard zones. Settings will be applied to all matching zones
         zone = "*ent.com."
-        allowed-user-list = ["professor", "testuser"]
-        allowed-group-list = ["testing-group"]
-        allowed-record-type = ["A", "CNAME"]
-        allowed-dots-limit = 3
+        user-list = ["professor", "testuser"]
+        group-list = ["testing-group"]
+        record-types = ["A", "CNAME"]
+        dots-limit = 3
         }
      ]
   }

From da7240ae59278a3fbd2cf908f0e40428f0570d39 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 14 Oct 2022 13:20:31 +0530
Subject: [PATCH 139/147] Update config

---
 modules/api/src/it/resources/application.conf     |  2 +-
 modules/api/src/main/resources/application.conf   | 12 ++++++++++--
 modules/api/src/main/resources/reference.conf     |  2 +-
 modules/docs/src/main/mdoc/operator/config-api.md |  4 ++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/modules/api/src/it/resources/application.conf b/modules/api/src/it/resources/application.conf
index 550af4139..dd3b7006e 100644
--- a/modules/api/src/it/resources/application.conf
+++ b/modules/api/src/it/resources/application.conf
@@ -163,7 +163,7 @@ vinyldns {
     "ns1.parent.com4."
   ]
 
-  # approved zones, individual users, users in groups and record types that are allowed for dotted hosts
+  # approved zones, individual users, users in groups, record types and no.of.dots that are allowed for dotted hosts
   dotted-hosts = {
     # for local testing
     allowed-settings = [
diff --git a/modules/api/src/main/resources/application.conf b/modules/api/src/main/resources/application.conf
index 1667d9298..7407c07e4 100644
--- a/modules/api/src/main/resources/application.conf
+++ b/modules/api/src/main/resources/application.conf
@@ -165,9 +165,17 @@ vinyldns {
     "ns1.parent.com4."
   ]
 
-  # approved zones, individual users, users in groups and record types that are allowed for dotted hosts
+  # approved zones, individual users, users in groups, record types and no.of.dots that are allowed for dotted hosts
   dotted-hosts = {
-    allowed-settings = []
+    allowed-settings = [
+      {
+      zone = "zonenamehere."
+      user-list = []
+      group-list = []
+      record-types = []
+      dots-limit = 0
+      }
+    ]
   }
 
   # Note: This MUST match the Portal or strange errors will ensue, NoOpCrypto should not be used for production
diff --git a/modules/api/src/main/resources/reference.conf b/modules/api/src/main/resources/reference.conf
index 402a8b1e6..f7a74e2f9 100644
--- a/modules/api/src/main/resources/reference.conf
+++ b/modules/api/src/main/resources/reference.conf
@@ -90,7 +90,7 @@ vinyldns {
     "ns1.parent.com."
   ]
 
-  # approved zones, individual users, users in groups and record types that are allowed for dotted hosts
+  # approved zones, individual users, users in groups, record types and no.of.dots that are allowed for dotted hosts
   dotted-hosts = {
     # for local testing
     allowed-settings = [
diff --git a/modules/docs/src/main/mdoc/operator/config-api.md b/modules/docs/src/main/mdoc/operator/config-api.md
index db3e449dc..fa8b69ba3 100644
--- a/modules/docs/src/main/mdoc/operator/config-api.md
+++ b/modules/docs/src/main/mdoc/operator/config-api.md
@@ -560,7 +560,7 @@ in that zone.
 10. If `dots-limit` is set to 0 (`dots-limit = 0`), we cannot create dotted hosts record in that zone.
 
 ```yaml
-# approved zones, individual users, users in groups and record types that are allowed for dotted hosts
+# approved zones, individual users, users in groups, record types and no.of.dots that are allowed for dotted hosts
 dotted-hosts = {
    allowed-settings = [
       {
@@ -772,7 +772,7 @@ dotted-hosts = {
      }
   }
 
-  # approved zones, individual users, users in groups and record types that are allowed for dotted hosts
+  # approved zones, individual users, users in groups, record types and no.of.dots that are allowed for dotted hosts
   dotted-hosts = {
      allowed-settings = [
         {

From 2e723268fc17f817fe3b99acb564b32ae6627366 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Wed, 19 Oct 2022 11:36:52 +0530
Subject: [PATCH 140/147] Revert maxItems change

---
 modules/api/src/main/resources/reference.conf               | 4 ++--
 modules/portal/public/lib/services/groups/service.groups.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/api/src/main/resources/reference.conf b/modules/api/src/main/resources/reference.conf
index aff3f95cc..b82cb74d6 100644
--- a/modules/api/src/main/resources/reference.conf
+++ b/modules/api/src/main/resources/reference.conf
@@ -110,8 +110,8 @@ vinyldns {
     limits {
       batchchange-routing-max-items-limit = 100
       membership-routing-default-max-items = 100
-      membership-routing-max-items-limit = 100
-      membership-routing-max-groups-list-limit = 100
+      membership-routing-max-items-limit = 1000
+      membership-routing-max-groups-list-limit = 1500
       recordset-routing-default-max-items= 100
       zone-routing-default-max-items = 100
       zone-routing-max-items-limit = 100
diff --git a/modules/portal/public/lib/services/groups/service.groups.js b/modules/portal/public/lib/services/groups/service.groups.js
index e36e937e7..a38e9691c 100644
--- a/modules/portal/public/lib/services/groups/service.groups.js
+++ b/modules/portal/public/lib/services/groups/service.groups.js
@@ -56,7 +56,7 @@ angular.module('service.groups', [])
 
         this.getGroupMemberList = function (uuid) {
             var url = '/api/groups/' + uuid + '/members';
-            url = this.urlBuilder(url, { maxItems: 100 });
+            url = this.urlBuilder(url, { maxItems: 1000 });
             return $http.get(url);
         };
 
@@ -75,7 +75,7 @@ angular.module('service.groups', [])
                 query = null;
             }
             var params = {
-                "maxItems": 100,
+                "maxItems": 1500,
                 "groupNameFilter": query,
                 "ignoreAccess": ignoreAccess
             };

From 8cf7e44a6d7e922eafd72683e7b5dfaa537f5ca5 Mon Sep 17 00:00:00 2001
From: Nicholas Spadaccino <37352107+nspadaccino@users.noreply.github.com>
Date: Wed, 19 Oct 2022 13:33:22 -0400
Subject: [PATCH 141/147]  Bump version to v0.15.1

---
 version.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.sbt b/version.sbt
index b2771948a..dbba836ba 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.15.0"
+version in ThisBuild := "0.15.1"

From 9e0a38d3b38125083679b65dbb88944dbd8ae57a Mon Sep 17 00:00:00 2001
From: Nicholas Spadaccino <37352107+nspadaccino@users.noreply.github.com>
Date: Thu, 20 Oct 2022 15:45:45 -0400
Subject: [PATCH 142/147] Bump version to v0.16.0

---
 version.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.sbt b/version.sbt
index dbba836ba..4eec90b0d 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.15.1"
+version in ThisBuild := "0.16.0"

From dd6f1ba008723605b654429a32ddbda03864b113 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Tue, 25 Oct 2022 10:56:16 +0530
Subject: [PATCH 143/147] Fix dotted hosts update

---
 .../scala/vinyldns/api/domain/record/RecordSetService.scala    | 3 +--
 1 file changed, 1 insertion(+), 2 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 0a38bae89..67f3a0ac1 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
@@ -169,14 +169,13 @@ class RecordSetService(
       isRecordTypeAllowed = checkIfInAllowedRecordType(zone, dottedHostsConfig, rsForValidations)
       isRecordTypeAndUserAllowed = isAllowedUser && isRecordTypeAllowed
       allowedDotsLimit = getAllowedDotsLimit(zone, dottedHostsConfig)
-      recordFqdnDoesNotAlreadyExist <- recordFQDNDoesNotExist(rsForValidations, zone).toResult[Boolean]
       _ <- typeSpecificValidations(
         rsForValidations,
         existingRecordsWithName,
         zone,
         Some(existing),
         approvedNameServers,
-        recordFqdnDoesNotAlreadyExist,
+        true,
         allowedZoneList,
         isRecordTypeAndUserAllowed,
         allowedDotsLimit

From 99d067d965139a47cdd8d8d8e59b5a3039243d71 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Tue, 25 Oct 2022 14:26:42 +0530
Subject: [PATCH 144/147] Add test

---
 .../RecordSetServiceIntegrationSpec.scala     | 62 ++++++++++++++++---
 1 file changed, 52 insertions(+), 10 deletions(-)

diff --git a/modules/api/src/it/scala/vinyldns/api/domain/record/RecordSetServiceIntegrationSpec.scala b/modules/api/src/it/scala/vinyldns/api/domain/record/RecordSetServiceIntegrationSpec.scala
index c789d8305..cb2685c9a 100644
--- a/modules/api/src/it/scala/vinyldns/api/domain/record/RecordSetServiceIntegrationSpec.scala
+++ b/modules/api/src/it/scala/vinyldns/api/domain/record/RecordSetServiceIntegrationSpec.scala
@@ -74,6 +74,13 @@ class RecordSetServiceIntegrationSpec
   private val auth2 = AuthPrincipal(user2, Seq(sharedGroup.id, group2.id))
   val dummyAuth: AuthPrincipal = AuthPrincipal(testUser, Seq(dummyGroup.id))
 
+  private val dummyZone = Zone(
+    s"dummy.",
+    "test@test.com",
+    status = ZoneStatus.Active,
+    connection = testConnection,
+    adminGroupId = dummyGroup.id
+  )
   private val zone = Zone(
     s"live-zone-test.",
     "test@test.com",
@@ -102,6 +109,16 @@ class RecordSetServiceIntegrationSpec
     None,
     List(AAAAData("fd69:27cc:fe91::60"))
   )
+  private val dottedTestRecord = RecordSet(
+    dummyZone.id,
+    "test.dotted",
+    AAAA,
+    38400,
+    RecordSetStatus.Active,
+    DateTime.now,
+    None,
+    List(AAAAData("fd69:27cc:fe91::60"))
+  )
   private val subTestRecordA = RecordSet(
     zone.id,
     "a-record",
@@ -169,14 +186,6 @@ class RecordSetServiceIntegrationSpec
     adminGroupId = group.id
   )
 
-  private val dummyZone = Zone(
-    s"dummy.",
-    "test@test.com",
-    status = ZoneStatus.Active,
-    connection = testConnection,
-    adminGroupId = dummyGroup.id
-  )
-
   private val highValueDomainRecord = RecordSet(
     zone.id,
     "high-value-domain-existing",
@@ -283,6 +292,7 @@ class RecordSetServiceIntegrationSpec
     val zoneRecords = List(
       apexTestRecordA,
       apexTestRecordAAAA,
+      dottedTestRecord,
       subTestRecordA,
       subTestRecordAAAA,
       subTestRecordNS,
@@ -371,7 +381,7 @@ class RecordSetServiceIntegrationSpec
     "create dotted record succeeds if it satisfies all dotted hosts config" in {
       val newRecord = RecordSet(
         dummyZone.id,
-        "test.dotted",
+        "testing.dotted",
         AAAA,
         38400,
         RecordSetStatus.Active,
@@ -388,7 +398,7 @@ class RecordSetServiceIntegrationSpec
       rightValue(result)
         .asInstanceOf[RecordSetChange]
         .recordSet
-        .name shouldBe "test.dotted"
+        .name shouldBe "testing.dotted"
     }
 
     "fail creating dotted record if it satisfies all dotted hosts config except dots-limit for the zone" in {
@@ -413,6 +423,29 @@ class RecordSetServiceIntegrationSpec
       leftValue(result) shouldBe a[InvalidRequest]
     }
 
+    "update dotted record succeeds if it satisfies all dotted hosts config" in {
+      val newRecord = dottedTestRecord.copy(ttl = 37000)
+
+      val result = testRecordSetService
+        .updateRecordSet(newRecord, dummyAuth)
+        .value
+        .unsafeRunSync()
+      val change = rightValue(result).asInstanceOf[RecordSetChange]
+      change.recordSet.name shouldBe "test.dotted"
+      change.recordSet.ttl shouldBe 37000
+    }
+
+    "update dotted record name fails as updating a record name is not allowed" in {
+      val newRecord = dottedTestRecord.copy(name = "trial.dotted")
+
+      val result = testRecordSetService
+        .updateRecordSet(newRecord, dummyAuth)
+        .value
+        .unsafeRunSync()
+      // We get an "InvalidRequest: Cannot update RecordSet's name."
+      leftValue(result) shouldBe a[InvalidRequest]
+    }
+
     "update apex A record and add trailing dot" in {
       val newRecord = apexTestRecordA.copy(ttl = 200)
       val result = testRecordSetService
@@ -624,6 +657,15 @@ class RecordSetServiceIntegrationSpec
         Some(group2.id)
     }
 
+    "delete dotted host record successfully for user in record owner group" in {
+      val result = testRecordSetService
+        .deleteRecordSet(dottedTestRecord.id, dottedTestRecord.zoneId, dummyAuth)
+        .value
+        .unsafeRunSync()
+
+      result should be(right)
+    }
+
     "fail deleting for user not in record owner group in shared zone" in {
       val result = leftResultOf(
         testRecordSetService

From 1d1255126380b6ef7138bd76fd45b45ea3eb783e Mon Sep 17 00:00:00 2001
From: Nicholas Spadaccino <37352107+nspadaccino@users.noreply.github.com>
Date: Tue, 25 Oct 2022 13:58:34 -0400
Subject: [PATCH 145/147]  Bump version to v0.16.1

---
 version.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.sbt b/version.sbt
index 4eec90b0d..cf86f1176 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.16.0"
+version in ThisBuild := "0.16.1"

From 2761889e92990169faac2049bd99fe17116a712c Mon Sep 17 00:00:00 2001
From: Nicholas Spadaccino <nicholas_spadaccino@comcast.com>
Date: Wed, 26 Oct 2022 14:38:10 -0400
Subject: [PATCH 146/147] Raised limit for the maximum amount of groups in a
 groups list to 3000.

Signed-off-by: Nicholas Spadaccino <nicholas_spadaccino@comcast.com>
---
 modules/api/src/main/resources/reference.conf               | 2 +-
 modules/portal/public/lib/services/groups/service.groups.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/api/src/main/resources/reference.conf b/modules/api/src/main/resources/reference.conf
index f7a74e2f9..4d1db46a1 100644
--- a/modules/api/src/main/resources/reference.conf
+++ b/modules/api/src/main/resources/reference.conf
@@ -134,7 +134,7 @@ vinyldns {
       batchchange-routing-max-items-limit = 100
       membership-routing-default-max-items = 100
       membership-routing-max-items-limit = 1000
-      membership-routing-max-groups-list-limit = 1500
+      membership-routing-max-groups-list-limit = 3000
       recordset-routing-default-max-items= 100
       zone-routing-default-max-items = 100
       zone-routing-max-items-limit = 100
diff --git a/modules/portal/public/lib/services/groups/service.groups.js b/modules/portal/public/lib/services/groups/service.groups.js
index a38e9691c..41f1a7f5e 100644
--- a/modules/portal/public/lib/services/groups/service.groups.js
+++ b/modules/portal/public/lib/services/groups/service.groups.js
@@ -75,7 +75,7 @@ angular.module('service.groups', [])
                 query = null;
             }
             var params = {
-                "maxItems": 1500,
+                "maxItems": 3000,
                 "groupNameFilter": query,
                 "ignoreAccess": ignoreAccess
             };

From 5e9616c12f61d59708c2fff0dc5ad3ff4903467d Mon Sep 17 00:00:00 2001
From: Nicholas Spadaccino <37352107+nspadaccino@users.noreply.github.com>
Date: Wed, 26 Oct 2022 15:01:05 -0400
Subject: [PATCH 147/147] Bump version to v0.16.2

---
 version.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.sbt b/version.sbt
index cf86f1176..a716b7c34 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.16.1"
+version in ThisBuild := "0.16.2"