From fe69fc0125f42edee55dfaebe23a31243145b9fb Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Tue, 20 Feb 2024 12:21:37 +0530
Subject: [PATCH 01/49] alignment fix for abandoned zones

---
 modules/portal/app/views/zones/zones.scala.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/portal/app/views/zones/zones.scala.html b/modules/portal/app/views/zones/zones.scala.html
index ac3b0ca86..bd81306d8 100644
--- a/modules/portal/app/views/zones/zones.scala.html
+++ b/modules/portal/app/views/zones/zones.scala.html
@@ -312,7 +312,7 @@
                                             <li class="active"><a href="#myDeletedZones" data-toggle="tab" ng-click="myZonesAccess()" >My Zones</a></li>
                                             <li><a id="tab2-button" href="#allDeletedZones" data-toggle="tab"  ng-click="allZonesAccess()">All Zones</a></li>
                                         </ul>
-                                        <div class="panel-body tab-content">
+                                        <div class="tab-content">
                                             <div class="tab-pane active" id="myDeletedZones">
                                                 <div id="zone-list-table" class="panel-body">
                                                     <p ng-if="!myDeletedZonesLoaded">Loading my deleted zones...</p>

From acc0a33224ddf3bfd926cdb7efb3eaca4a2875fe Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Wed, 20 Mar 2024 11:03:15 +0530
Subject: [PATCH 02/49] update

---
 .../portal/app/views/zones/zones.scala.html   | 312 +++++++++---------
 1 file changed, 155 insertions(+), 157 deletions(-)

diff --git a/modules/portal/app/views/zones/zones.scala.html b/modules/portal/app/views/zones/zones.scala.html
index bd81306d8..6d34ba5da 100644
--- a/modules/portal/app/views/zones/zones.scala.html
+++ b/modules/portal/app/views/zones/zones.scala.html
@@ -308,170 +308,168 @@
 
                                     <!-- DELETED ZONES TABS -->
                                     <div class="panel panel-default panel-tabs">
-                                        <ul class="nav nav-tabs bar_tabs">
-                                            <li class="active"><a href="#myDeletedZones" data-toggle="tab" ng-click="myZonesAccess()" >My Zones</a></li>
-                                            <li><a id="tab2-button" href="#allDeletedZones" data-toggle="tab"  ng-click="allZonesAccess()">All Zones</a></li>
-                                        </ul>
-                                        <div class="tab-content">
-                                            <div class="tab-pane active" id="myDeletedZones">
-                                                <div id="zone-list-table" class="panel-body">
-                                                    <p ng-if="!myDeletedZonesLoaded">Loading my deleted zones...</p>
-                                                    <p ng-if="myDeletedZonesLoaded && !myDeletedZones.length">No zones match the search criteria.</p>
+                                        <span class=" container-fluid" >
+                                           <!-- MY DELETED ZONE PAGINATION -->
+                                            <div class="dataTables_paginate vinyldns_zones_paginate" ng-show="tab == 'myDeletedZones'">
+                                                <span class="vinyldns_zones_page_number">{{ getZonesPageNumber("myDeletedZones") }}</span>
+                                                <ul class="pagination">
+                                                    <li class="pull-right paginate_button previous">
+                                                        <a ng-if="prevPageEnabled('myDeletedZones')" ng-click="prevPageMyDeletedZones()">Previous</a>
+                                                    </li>
+                                                    <li class=" pull-right paginate_button next">
+                                                        <a ng-if="nextPageEnabled('myDeletedZones')" ng-click="nextPageMyDeletedZones()">Next</a>
+                                                    </li>
+                                                </ul>
+                                            </div>
+                                            <!-- MY DELETED ZONE END PAGINATION -->
+                                            <!-- ALL DELETED ZONE PAGINATION -->
+                                            <div class="dataTables_paginate vinyldns_zones_paginate" ng-show="tab == 'allDeletedZones'" >
+                                                <span class="vinyldns_zones_page_number">{{ getZonesPageNumber("allDeletedZones") }}</span>
+                                                <ul class="pagination ">
+                                                    <li class="paginate_button previous  ">
+                                                        <a ng-if="prevPageEnabled('allDeletedZones')" ng-click="prevPageAllDeletedZones()">Previous</a>
+                                                    </li>
+                                                    <li class="paginate_button next " >
+                                                        <a ng-if="nextPageEnabled('allDeletedZones')" ng-click="nextPageAllDeletedZones()">Next</a>
+                                                    </li>
+                                                </ul>
+                                            </div>
+                                            <!--ALL DELETED ZONE END PAGINATION -->
+                                            <ul class="nav nav-tabs bar_tabs"  >
+                                                <li class = "active"><a ng-class="{active: tab == 'myDeletedZones'}" href="#myDeletedZones" data-toggle="tab" ng-click="tab = 'myDeletedZones'; myZonesAccess()" >My Zones</a></li>
+                                                <li><a ng-class="{active: tab == 'allDeletedZones'}" href="#allDeletedZones" data-toggle="tab"  ng-click="tab = 'allDeletedZones'; allZonesAccess()" >All Zones</a></li>
+                                            </ul>
+                                            <div class="tab-content">
+                                                <div class="tab-pane active" id="myDeletedZones">
+                                                    <div id="zone-list-table">
+                                                        <p ng-if="!myDeletedZonesLoaded">Loading my deleted zones...</p>
+                                                        <p ng-if="myDeletedZonesLoaded && !myDeletedZones.length">No zones match the search criteria.</p>
+                                                        <table class="table" ng-if="myDeletedZones.length">
+                                                            <thead>
+                                                            <tr>
+                                                                <th>Name</th>
+                                                                <th>Email</th>
+                                                                <th>Admin Group</th>
+                                                                <th>Created</th>
+                                                                <th>Abandoned</th>
+                                                                <th>Status</th>
+                                                                <th>Abandoned By</th>
+                                                                @if(meta.sharedDisplayEnabled) {
+                                                                <th>Access</th>
+                                                                }
+                                                            </tr>
+                                                            </thead>
+                                                            <tbody>
+                                                            <tr ng-repeat="deletedZone in myDeletedZones">
+                                                                <td class="wrap-long-text" ng-bind="deletedZone.zoneChange.zone.name">
+                                                                </td>
+                                                                <td class="wrap-long-text" ng-bind="deletedZone.zoneChange.zone.email">
+                                                                </td>
+                                                                <td>
+                                                                    <a ng-if="canAccessGroup(deletedZone.zoneChange.zone.adminGroupId)" ng-bind="deletedZone.adminGroupName"
+                                                                       href="/groups/{{deletedZone.zoneChange.zone.adminGroupId}}"></a>
+                                                                    <span ng-if="!canAccessGroup(deletedZone.zoneChange.zone.adminGroupId)" ng-bind="deletedZone.adminGroupName"
+                                                                          style="line-height: 0"></span>
+                                                                </td>
+                                                                <td>
+                                                                    {{deletedZone.zoneChange.zone.created}}
+                                                                </td>
+                                                                <td>
+                                                                    {{deletedZone.zoneChange.zone.updated}}
+                                                                </td>
+                                                                <td ng-bind="deletedZone.zoneChange.zone.status"></td>
+                                                                <td>
+                                                                    {{deletedZone.userName}}
+                                                                </td>
+                                                                @if(meta.sharedDisplayEnabled) {
+                                                                <td>{{zone.shared ? "Shared" : "Private"}}</td>
+                                                                }
+                                                            </tr>
+                                                            </tbody>
+                                                        </table>
+
+                                                        <!-- PAGINATION -->
+                                                        <div class="dataTables_paginate vinyldns_zones_paginate">
+                                                            <span class="vinyldns_zones_page_number">{{ getZonesPageNumber("myDeletedZones") }}</span>
+                                                            <ul class="pagination">
+                                                                <li class="paginate_button previous">
+                                                                    <a ng-if="prevPageEnabled('myDeletedZones')" ng-click="prevPageMyDeletedZones()">Previous</a>
+                                                                </li>
+                                                                <li class="paginate_button next">
+                                                                    <a ng-if="nextPageEnabled('myDeletedZones')" ng-click="nextPageMyDeletedZones()">Next</a>
+                                                                </li>
+                                                            </ul>
+                                                        </div>
+                                                        <!-- END PAGINATION -->
 
-                                                    <!-- PAGINATION -->
-                                                    <div class="dataTables_paginate vinyldns_zones_paginate">
-                                                        <span class="vinyldns_zones_page_number">{{ getZonesPageNumber("myDeletedZones") }}</span>
-                                                        <ul class="pagination">
-                                                            <li class="paginate_button previous">
-                                                                <a ng-if="prevPageEnabled('myDeletedZones')" ng-click="prevPageMyDeletedZones()">Previous</a>
-                                                            </li>
-                                                            <li class="paginate_button next">
-                                                                <a ng-if="nextPageEnabled('myDeletedZones')" ng-click="nextPageMyDeletedZones()">Next</a>
-                                                            </li>
-                                                        </ul>
                                                     </div>
-                                                    <!-- END PAGINATION -->
+                                                </div>
+                                                <div class="tab-pane" id="allDeletedZones">
+                                                    <div id="zone-list-table">
+                                                        <p ng-if="!allDeletedZonesLoaded">Loading all deleted zones...</p>
+                                                        <p ng-if="allDeletedZonesLoaded && !allDeletedZones.length">No zones match the search criteria.</p>
+                                                        <table class="table" ng-if="allDeletedZones.length">
+                                                            <thead>
+                                                            <tr>
+                                                                <th>Name</th>
+                                                                <th>Email</th>
+                                                                <th>Admin Group</th>
+                                                                <th>Created</th>
+                                                                <th>Abandoned</th>
+                                                                <th>Status</th>
+                                                                <th>Abandoned By</th>
+                                                                @if(meta.sharedDisplayEnabled) {
+                                                                <th>Access</th>
+                                                                }
+                                                            </tr>
+                                                            </thead>
+                                                            <tbody>
+                                                            <tr ng-repeat="deletedZone in allDeletedZones">
+                                                                <td class="wrap-long-text" ng-bind="deletedZone.zoneChange.zone.name">
+                                                                </td>
+                                                                <td class="wrap-long-text" ng-bind="deletedZone.zoneChange.zone.email">
+                                                                </td>
+                                                                <td>
+                                                                    <a ng-if="canAccessGroup(deletedZone.zoneChange.zone.adminGroupId)" ng-bind="deletedZone.adminGroupName"
+                                                                       href="/groups/{{deletedZone.zoneChange.zone.adminGroupId}}"></a>
+                                                                    <span ng-if="!canAccessGroup(deletedZone.zoneChange.zone.adminGroupId)" ng-bind="deletedZone.adminGroupName"
+                                                                          style="line-height: 0"></span>
+                                                                </td>
+                                                                <td>
+                                                                    {{deletedZone.zoneChange.zone.created}}
+                                                                </td>
+                                                                <td>
+                                                                    {{deletedZone.zoneChange.zone.updated}}
+                                                                </td>
+                                                                <td ng-bind="deletedZone.zoneChange.zone.status"></td>
+                                                                <td>
+                                                                    {{deletedZone.userName}}
+                                                                </td>
+                                                                @if(meta.sharedDisplayEnabled) {
+                                                                <td>{{zone.shared ? "Shared" : "Private"}}</td>
+                                                                }
+                                                            </tr>
+                                                            </tbody>
+                                                        </table>
 
-                                                    <table class="table" ng-if="myDeletedZones.length">
-                                                        <thead>
-                                                        <tr>
-                                                            <th>Name</th>
-                                                            <th>Email</th>
-                                                            <th>Admin Group</th>
-                                                            <th>Created</th>
-                                                            <th>Abandoned</th>
-                                                            <th>Status</th>
-                                                            <th>Abandoned By</th>
-                                                            @if(meta.sharedDisplayEnabled) {
-                                                            <th>Access</th>
-                                                            }
-                                                        </tr>
-                                                        </thead>
-                                                        <tbody>
-                                                        <tr ng-repeat="deletedZone in myDeletedZones">
-                                                            <td class="wrap-long-text" ng-bind="deletedZone.zoneChange.zone.name">
-                                                            </td>
-                                                            <td class="wrap-long-text" ng-bind="deletedZone.zoneChange.zone.email">
-                                                            </td>
-                                                            <td>
-                                                                <a ng-if="canAccessGroup(deletedZone.zoneChange.zone.adminGroupId)" ng-bind="deletedZone.adminGroupName"
-                                                                   href="/groups/{{deletedZone.zoneChange.zone.adminGroupId}}"></a>
-                                                                <span ng-if="!canAccessGroup(deletedZone.zoneChange.zone.adminGroupId)" ng-bind="deletedZone.adminGroupName"
-                                                                      style="line-height: 0"></span>
-                                                            </td>
-                                                            <td>
-                                                                {{deletedZone.zoneChange.zone.created}}
-                                                            </td>
-                                                            <td>
-                                                                {{deletedZone.zoneChange.zone.updated}}
-                                                            </td>
-                                                            <td ng-bind="deletedZone.zoneChange.zone.status"></td>
-                                                            <td>
-                                                                {{deletedZone.userName}}
-                                                            </td>
-                                                            @if(meta.sharedDisplayEnabled) {
-                                                            <td>{{zone.shared ? "Shared" : "Private"}}</td>
-                                                            }
-                                                        </tr>
-                                                        </tbody>
-                                                    </table>
+                                                        <!-- PAGINATION -->
+                                                        <div class="dataTables_paginate vinyldns_zones_paginate">
+                                                            <span class="vinyldns_zones_page_number">{{ getZonesPageNumber("allDeletedZones") }}</span>
+                                                            <ul class="pagination">
+                                                                <li class="paginate_button previous">
+                                                                    <a ng-if="prevPageEnabled('allDeletedZones')" ng-click="prevPageAllDeletedZones()">Previous</a>
+                                                                </li>
+                                                                <li class="paginate_button next">
+                                                                    <a ng-if="nextPageEnabled('allDeletedZones')" ng-click="nextPageAllDeletedZones()">Next</a>
+                                                                </li>
+                                                            </ul>
+                                                        </div>
+                                                        <!-- END PAGINATION -->
 
-                                                    <!-- PAGINATION -->
-                                                    <div class="dataTables_paginate vinyldns_zones_paginate">
-                                                        <span class="vinyldns_zones_page_number">{{ getZonesPageNumber("myDeletedZones") }}</span>
-                                                        <ul class="pagination">
-                                                            <li class="paginate_button previous">
-                                                                <a ng-if="prevPageEnabled('myDeletedZones')" ng-click="prevPageMyDeletedZones()">Previous</a>
-                                                            </li>
-                                                            <li class="paginate_button next">
-                                                                <a ng-if="nextPageEnabled('myDeletedZones')" ng-click="nextPageMyDeletedZones()">Next</a>
-                                                            </li>
-                                                        </ul>
                                                     </div>
-                                                    <!-- END PAGINATION -->
-
                                                 </div>
                                             </div>
-                                            <div class="tab-pane" id="allDeletedZones">
-                                                <div id="zone-list-table" class="panel-body">
-                                                    <p ng-if="!allDeletedZonesLoaded">Loading all deleted zones...</p>
-                                                    <p ng-if="allDeletedZonesLoaded && !allDeletedZones.length">No zones match the search criteria.</p>
-
-                                                    <!-- PAGINATION -->
-                                                    <div class="dataTables_paginate vinyldns_zones_paginate">
-                                                        <span class="vinyldns_zones_page_number">{{ getZonesPageNumber("allDeletedZones") }}</span>
-                                                        <ul class="pagination">
-                                                            <li class="paginate_button previous">
-                                                                <a ng-if="prevPageEnabled('allDeletedZones')" ng-click="prevPageAllDeletedZones()">Previous</a>
-                                                            </li>
-                                                            <li class="paginate_button next">
-                                                                <a ng-if="nextPageEnabled('allDeletedZones')" ng-click="nextPageAllDeletedZones()">Next</a>
-                                                            </li>
-                                                        </ul>
-                                                    </div>
-                                                    <!-- END PAGINATION -->
-
-                                                    <table class="table" ng-if="allDeletedZones.length">
-                                                        <thead>
-                                                        <tr>
-                                                            <th>Name</th>
-                                                            <th>Email</th>
-                                                            <th>Admin Group</th>
-                                                            <th>Created</th>
-                                                            <th>Abandoned</th>
-                                                            <th>Status</th>
-                                                            <th>Abandoned By</th>
-                                                            @if(meta.sharedDisplayEnabled) {
-                                                            <th>Access</th>
-                                                            }
-                                                        </tr>
-                                                        </thead>
-                                                        <tbody>
-                                                        <tr ng-repeat="deletedZone in allDeletedZones">
-                                                            <td class="wrap-long-text" ng-bind="deletedZone.zoneChange.zone.name">
-                                                            </td>
-                                                            <td class="wrap-long-text" ng-bind="deletedZone.zoneChange.zone.email">
-                                                            </td>
-                                                            <td>
-                                                                <a ng-if="canAccessGroup(deletedZone.zoneChange.zone.adminGroupId)" ng-bind="deletedZone.adminGroupName"
-                                                                   href="/groups/{{deletedZone.zoneChange.zone.adminGroupId}}"></a>
-                                                                <span ng-if="!canAccessGroup(deletedZone.zoneChange.zone.adminGroupId)" ng-bind="deletedZone.adminGroupName"
-                                                                      style="line-height: 0"></span>
-                                                            </td>
-                                                            <td>
-                                                                {{deletedZone.zoneChange.zone.created}}
-                                                            </td>
-                                                            <td>
-                                                                {{deletedZone.zoneChange.zone.updated}}
-                                                            </td>
-                                                            <td ng-bind="deletedZone.zoneChange.zone.status"></td>
-                                                            <td>
-                                                                {{deletedZone.userName}}
-                                                            </td>
-                                                            @if(meta.sharedDisplayEnabled) {
-                                                            <td>{{zone.shared ? "Shared" : "Private"}}</td>
-                                                            }
-                                                        </tr>
-                                                        </tbody>
-                                                    </table>
-
-                                                    <!-- PAGINATION -->
-                                                    <div class="dataTables_paginate vinyldns_zones_paginate">
-                                                        <span class="vinyldns_zones_page_number">{{ getZonesPageNumber("allDeletedZones") }}</span>
-                                                        <ul class="pagination">
-                                                            <li class="paginate_button previous">
-                                                                <a ng-if="prevPageEnabled('allDeletedZones')" ng-click="prevPageAllDeletedZones()">Previous</a>
-                                                            </li>
-                                                            <li class="paginate_button next">
-                                                                <a ng-if="nextPageEnabled('allDeletedZones')" ng-click="nextPageAllDeletedZones()">Next</a>
-                                                            </li>
-                                                        </ul>
-                                                    </div>
-                                                    <!-- END PAGINATION -->
-
-                                                </div>
-                                            </div>
-                                        </div>
+                                        </span>
                                     </div>
                                     <!-- END DELETED ZONES TABS -->
                                 </div>

From be6df8266833260100f9903b9fc59ca1d15dde55 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Wed, 20 Mar 2024 15:25:59 +0530
Subject: [PATCH 03/49] update

---
 modules/portal/app/views/zones/zones.scala.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/portal/app/views/zones/zones.scala.html b/modules/portal/app/views/zones/zones.scala.html
index 6d34ba5da..3da9ad22c 100644
--- a/modules/portal/app/views/zones/zones.scala.html
+++ b/modules/portal/app/views/zones/zones.scala.html
@@ -341,7 +341,7 @@
                                             </ul>
                                             <div class="tab-content">
                                                 <div class="tab-pane active" id="myDeletedZones">
-                                                    <div id="zone-list-table">
+                                                    <div id="zone-list-table" class="panel-body">
                                                         <p ng-if="!myDeletedZonesLoaded">Loading my deleted zones...</p>
                                                         <p ng-if="myDeletedZonesLoaded && !myDeletedZones.length">No zones match the search criteria.</p>
                                                         <table class="table" ng-if="myDeletedZones.length">
@@ -405,7 +405,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="tab-pane" id="allDeletedZones">
-                                                    <div id="zone-list-table">
+                                                    <div id="zone-list-table" class="panel-body">
                                                         <p ng-if="!allDeletedZonesLoaded">Loading all deleted zones...</p>
                                                         <p ng-if="allDeletedZonesLoaded && !allDeletedZones.length">No zones match the search criteria.</p>
                                                         <table class="table" ng-if="allDeletedZones.length">

From 42fd4375174b128014bdf5903f310e86ec075867 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Wed, 20 Mar 2024 16:06:30 +0530
Subject: [PATCH 04/49] update

---
 .../portal/app/views/zones/zones.scala.html   | 24 +++++++++----------
 modules/portal/public/css/vinyldns.css        |  4 ++++
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/modules/portal/app/views/zones/zones.scala.html b/modules/portal/app/views/zones/zones.scala.html
index 3da9ad22c..e3ef4c40f 100644
--- a/modules/portal/app/views/zones/zones.scala.html
+++ b/modules/portal/app/views/zones/zones.scala.html
@@ -310,26 +310,26 @@
                                     <div class="panel panel-default panel-tabs">
                                         <span class=" container-fluid" >
                                            <!-- MY DELETED ZONE PAGINATION -->
-                                            <div class="dataTables_paginate vinyldns_zones_paginate" ng-show="tab == 'myDeletedZones'">
-                                                <span class="vinyldns_zones_page_number">{{ getZonesPageNumber("myDeletedZones") }}</span>
+                                            <div class="dataTables_paginate vinyldns_paginate" ng-show="tab == 'myDeletedZones'" >
+                                                <span class="vinyldns_page_number">{{ getZonesPageNumber("myDeletedZones") }}</span>
                                                 <ul class="pagination">
-                                                    <li class="pull-right paginate_button previous">
+                                                    <li class="vinyldns_paginate_button previous">
                                                         <a ng-if="prevPageEnabled('myDeletedZones')" ng-click="prevPageMyDeletedZones()">Previous</a>
                                                     </li>
-                                                    <li class=" pull-right paginate_button next">
+                                                    <li class="vinyldns_paginate_button next">
                                                         <a ng-if="nextPageEnabled('myDeletedZones')" ng-click="nextPageMyDeletedZones()">Next</a>
                                                     </li>
                                                 </ul>
                                             </div>
                                             <!-- MY DELETED ZONE END PAGINATION -->
                                             <!-- ALL DELETED ZONE PAGINATION -->
-                                            <div class="dataTables_paginate vinyldns_zones_paginate" ng-show="tab == 'allDeletedZones'" >
-                                                <span class="vinyldns_zones_page_number">{{ getZonesPageNumber("allDeletedZones") }}</span>
+                                            <div class="dataTables_paginate vinyldns_paginate"  ng-show="tab == 'allDeletedZones'" >
+                                                <span class="vinyldns_page_number">{{ getZonesPageNumber("allDeletedZones") }}</span>
                                                 <ul class="pagination ">
-                                                    <li class="paginate_button previous  ">
+                                                    <li class="vinyldns_paginate_button previous">
                                                         <a ng-if="prevPageEnabled('allDeletedZones')" ng-click="prevPageAllDeletedZones()">Previous</a>
                                                     </li>
-                                                    <li class="paginate_button next " >
+                                                    <li class="vinyldns_paginate_button next">
                                                         <a ng-if="nextPageEnabled('allDeletedZones')" ng-click="nextPageAllDeletedZones()">Next</a>
                                                     </li>
                                                 </ul>
@@ -389,8 +389,8 @@
                                                         </table>
 
                                                         <!-- PAGINATION -->
-                                                        <div class="dataTables_paginate vinyldns_zones_paginate">
-                                                            <span class="vinyldns_zones_page_number">{{ getZonesPageNumber("myDeletedZones") }}</span>
+                                                        <div class="dataTables_paginate vinyldns_paginate">
+                                                            <span class="vinyldns_page_number">{{ getZonesPageNumber("myDeletedZones") }}</span>
                                                             <ul class="pagination">
                                                                 <li class="paginate_button previous">
                                                                     <a ng-if="prevPageEnabled('myDeletedZones')" ng-click="prevPageMyDeletedZones()">Previous</a>
@@ -453,8 +453,8 @@
                                                         </table>
 
                                                         <!-- PAGINATION -->
-                                                        <div class="dataTables_paginate vinyldns_zones_paginate">
-                                                            <span class="vinyldns_zones_page_number">{{ getZonesPageNumber("allDeletedZones") }}</span>
+                                                        <div class="dataTables_paginate vinyldns_paginate">
+                                                            <span class="vinyldns_page_number">{{ getZonesPageNumber("allDeletedZones") }}</span>
                                                             <ul class="pagination">
                                                                 <li class="paginate_button previous">
                                                                     <a ng-if="prevPageEnabled('allDeletedZones')" ng-click="prevPageAllDeletedZones()">Previous</a>
diff --git a/modules/portal/public/css/vinyldns.css b/modules/portal/public/css/vinyldns.css
index 601a17b92..4beac8b20 100644
--- a/modules/portal/public/css/vinyldns.css
+++ b/modules/portal/public/css/vinyldns.css
@@ -462,6 +462,10 @@ input[type="file"] {
     margin-right: 10px;
 }
 
+.vinyldns_paginate_button {
+    margin-right: 8px;
+}
+
 .no-top-margin {
     margin-top: 0px;
 }

From 37121aa4511375ce2b0eadc28cf5a5401e5d8b07 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Wed, 20 Mar 2024 18:44:58 +0530
Subject: [PATCH 05/49] update

---
 modules/portal/app/views/zones/zones.scala.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/portal/app/views/zones/zones.scala.html b/modules/portal/app/views/zones/zones.scala.html
index e3ef4c40f..671edd406 100644
--- a/modules/portal/app/views/zones/zones.scala.html
+++ b/modules/portal/app/views/zones/zones.scala.html
@@ -335,8 +335,8 @@
                                                 </ul>
                                             </div>
                                             <!--ALL DELETED ZONE END PAGINATION -->
-                                            <ul class="nav nav-tabs bar_tabs"  >
-                                                <li class = "active"><a ng-class="{active: tab == 'myDeletedZones'}" href="#myDeletedZones" data-toggle="tab" ng-click="tab = 'myDeletedZones'; myZonesAccess()" >My Zones</a></li>
+                                            <ul class="nav nav-tabs bar_tabs" ng-init = "tab='myDeletedZones'">
+                                                <li class = "active"><a ng-class="{active: tab == 'myDeletedZones'}" id = "myDeletedZone" href="#myDeletedZones" data-toggle="tab" ng-click="tab = 'myDeletedZones'; myZonesAccess()" >My Zones</a></li>
                                                 <li><a ng-class="{active: tab == 'allDeletedZones'}" href="#allDeletedZones" data-toggle="tab"  ng-click="tab = 'allDeletedZones'; allZonesAccess()" >All Zones</a></li>
                                             </ul>
                                             <div class="tab-content">

From 1cfecc5fbe0b25b488f78e44cbe6abccd0450de3 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Thu, 21 Mar 2024 13:00:38 +0530
Subject: [PATCH 06/49] fix pagination

---
 modules/portal/public/lib/recordset/recordsets.controller.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/portal/public/lib/recordset/recordsets.controller.js b/modules/portal/public/lib/recordset/recordsets.controller.js
index 256a1e95a..2fac5cd5a 100644
--- a/modules/portal/public/lib/recordset/recordsets.controller.js
+++ b/modules/portal/public/lib/recordset/recordsets.controller.js
@@ -279,7 +279,7 @@
             $scope.changeHistoryPrevPage = function() {
                 var startFrom = pagingService.getPrevStartFrom(changePaging);
                 return recordsService
-                    .listRecordSetChangeHistory(changePaging.maxItems, startFrom, $scope.recordFqdn, $scope.recordType)
+                    .listRecordSetChangeHistory($scope.zoneId, changePaging.maxItems, startFrom, $scope.recordFqdn, $scope.recordType)
                     .then(function(response) {
                         changePaging = pagingService.prevPageUpdate(response.data.nextId, changePaging);
                         updateChangeDisplay(response.data.recordSetChanges);
@@ -291,7 +291,7 @@
 
             $scope.changeHistoryNextPage = function() {
                 return recordsService
-                    .listRecordSetChangeHistory(changePaging.maxItems, changePaging.next, $scope.recordFqdn, $scope.recordType)
+                    .listRecordSetChangeHistory($scope.zoneId, changePaging.maxItems, changePaging.next, $scope.recordFqdn, $scope.recordType)
                     .then(function(response) {
                         var changes = response.data.recordSetChanges;
                         changePaging = pagingService.nextPageUpdate(changes, response.data.nextId, changePaging);

From 620d3ee11090aaf8d917a241f73119af606752ec Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Tue, 26 Mar 2024 12:15:43 +0530
Subject: [PATCH 07/49] update

---
 .../portal/app/views/zones/zones.scala.html   | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/modules/portal/app/views/zones/zones.scala.html b/modules/portal/app/views/zones/zones.scala.html
index 671edd406..6ca22c8d1 100644
--- a/modules/portal/app/views/zones/zones.scala.html
+++ b/modules/portal/app/views/zones/zones.scala.html
@@ -282,12 +282,10 @@
                 <div class="tab-pane" id="deletedZones">
                     <div class="row">
                         <div class="col-md-12">
-
                             <!-- SIMPLE DATATABLE -->
                             <div class="panel panel-default">
                                 <div class="panel-heading">
-
-                                    <button id="zone-refresh-button" class="btn btn-default" ng-click="refreshZones()">
+                                    <button  id="deleted-zone-refresh-button"  class="btn btn-default" ng-click="refreshZones()">
                                         <span class="fa fa-refresh"></span> Refresh
                                     </button>
 
@@ -295,7 +293,7 @@
                                     <div class="pull-right">
                                         <form class="input-group" ng-submit="refreshZones()">
                                             <div class="input-group">
-                                                <span class="input-group-btn">
+                                                <span class="input-group-btn" >
                                                     <button id="my-deleted-zones-search-button" type="submit" class="btn btn-primary btn-left-round">
                                                         <span class="fa fa-search"></span>
                                                     </button>
@@ -304,11 +302,12 @@
                                             </div>
                                         </form>
                                     </div>
+                                </div>
                                     <!-- END SEARCH BOX -->
 
                                     <!-- DELETED ZONES TABS -->
-                                    <div class="panel panel-default panel-tabs">
-                                        <span class=" container-fluid" >
+                                    <div class="panel-default panel-tabs">
+                                        <span class="container-fluid" >
                                            <!-- MY DELETED ZONE PAGINATION -->
                                             <div class="dataTables_paginate vinyldns_paginate" ng-show="tab == 'myDeletedZones'" >
                                                 <span class="vinyldns_page_number">{{ getZonesPageNumber("myDeletedZones") }}</span>
@@ -341,7 +340,7 @@
                                             </ul>
                                             <div class="tab-content">
                                                 <div class="tab-pane active" id="myDeletedZones">
-                                                    <div id="zone-list-table" class="panel-body">
+                                                    <div id="my-deleted-zone-list-table" class="panel-body">
                                                         <p ng-if="!myDeletedZonesLoaded">Loading my deleted zones...</p>
                                                         <p ng-if="myDeletedZonesLoaded && !myDeletedZones.length">No zones match the search criteria.</p>
                                                         <table class="table" ng-if="myDeletedZones.length">
@@ -401,11 +400,10 @@
                                                             </ul>
                                                         </div>
                                                         <!-- END PAGINATION -->
-
                                                     </div>
                                                 </div>
                                                 <div class="tab-pane" id="allDeletedZones">
-                                                    <div id="zone-list-table" class="panel-body">
+                                                    <div id="all-deleted-zone-list-table" class="panel-body">
                                                         <p ng-if="!allDeletedZonesLoaded">Loading all deleted zones...</p>
                                                         <p ng-if="allDeletedZonesLoaded && !allDeletedZones.length">No zones match the search criteria.</p>
                                                         <table class="table" ng-if="allDeletedZones.length">
@@ -465,27 +463,25 @@
                                                             </ul>
                                                         </div>
                                                         <!-- END PAGINATION -->
-
                                                     </div>
                                                 </div>
                                             </div>
                                         </span>
                                     </div>
-                                    <!-- END DELETED ZONES TABS -->
-                                </div>
+                            <!-- END DELETED ZONES TABS -->
                                 <div class="panel-footer"></div>
                             </div>
                             <!-- END SIMPLE DATATABLE -->
-
                         </div>
                     </div>
                 </div>
             </div>
         </div>
+    </div>
+</div>
         <!-- END VERTICAL TABS -->
 
-
-    </div>
+</div>
     <!-- END PAGE CONTENT WRAPPER -->
 
 </div>

From c7641905cfc701b679147d2f35efedabfe184575 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Fri, 29 Mar 2024 09:18:21 +0530
Subject: [PATCH 08/49] update

---
 modules/portal/app/views/zones/zones.scala.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/portal/app/views/zones/zones.scala.html b/modules/portal/app/views/zones/zones.scala.html
index 6ca22c8d1..c79adf294 100644
--- a/modules/portal/app/views/zones/zones.scala.html
+++ b/modules/portal/app/views/zones/zones.scala.html
@@ -477,13 +477,9 @@
                 </div>
             </div>
         </div>
-    </div>
-</div>
         <!-- END VERTICAL TABS -->
-
-</div>
+    </div>
     <!-- END PAGE CONTENT WRAPPER -->
-
 </div>
 <!-- END PAGE CONTENT -->
 

From 11e89cb211c2ee6cbfcb9174fdcc39555aca564f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 Apr 2024 21:58:08 +0000
Subject: [PATCH 09/49] Bump dnspython from 2.1.0 to 2.6.1 in
 /modules/api/src/test/functional

Bumps [dnspython](https://github.com/rthalley/dnspython) from 2.1.0 to 2.6.1.
- [Release notes](https://github.com/rthalley/dnspython/releases)
- [Changelog](https://github.com/rthalley/dnspython/blob/main/doc/whatsnew.rst)
- [Commits](https://github.com/rthalley/dnspython/compare/v2.1.0...v2.6.1)

---
updated-dependencies:
- dependency-name: dnspython
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/api/src/test/functional/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/api/src/test/functional/requirements.txt b/modules/api/src/test/functional/requirements.txt
index dcfb21080..6a5a7140d 100644
--- a/modules/api/src/test/functional/requirements.txt
+++ b/modules/api/src/test/functional/requirements.txt
@@ -2,7 +2,7 @@ pyhamcrest==2.0.2
 pytz>=2014
 pytest==6.2.5
 mock==4.0.3
-dnspython==2.1.0
+dnspython==2.6.1
 boto3==1.18.51
 botocore==1.21.51
 requests==2.31.0

From 8a2c6924712d319b9f0e9d0b5e4fe92ab38f5b45 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Thu, 18 Apr 2024 14:48:46 +0530
Subject: [PATCH 10/49] remove unnecessary parameters

---
 .../api/domain/record/RecordSetService.scala      | 10 ++++------
 .../domain/record/RecordSetServiceAlgebra.scala   |  4 +---
 .../vinyldns/api/route/RecordSetRouting.scala     |  6 +++---
 .../api/domain/record/RecordSetServiceSpec.scala  | 15 +++++++++------
 .../vinyldns/api/route/RecordSetRoutingSpec.scala |  8 +++-----
 5 files changed, 20 insertions(+), 23 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 cf6191eb4..537ff2f23 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
@@ -584,21 +584,19 @@ class RecordSetService(
     } yield change
 
   def listRecordSetChanges(
-                            zoneId: Option[String] = None,
+                            zoneId: String,
                             startFrom: Option[Int] = None,
                             maxItems: Int = 100,
-                            fqdn: Option[String] = None,
-                            recordType: Option[RecordType] = None,
                             authPrincipal: AuthPrincipal
                           ): Result[ListRecordSetChangesResponse] =
       for {
-        zone <- getZone(zoneId.get)
+        zone <- getZone(zoneId)
         _ <- canSeeZone(authPrincipal, zone).toResult
         recordSetChangesResults <- recordChangeRepository
-          .listRecordSetChanges(Some(zone.id), startFrom, maxItems, fqdn, recordType)
+          .listRecordSetChanges(Some(zone.id), startFrom, maxItems, None, None)
           .toResult[ListRecordSetChangesResults]
         recordSetChangesInfo <- buildRecordSetChangeInfo(recordSetChangesResults.items)
-      } yield ListRecordSetChangesResponse(zoneId.get, recordSetChangesResults, recordSetChangesInfo)
+      } yield ListRecordSetChangesResponse(zoneId, recordSetChangesResults, recordSetChangesInfo)
 
   def listRecordSetChangeHistory(
                             zoneId: Option[String] = None,
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/record/RecordSetServiceAlgebra.scala b/modules/api/src/main/scala/vinyldns/api/domain/record/RecordSetServiceAlgebra.scala
index 10f1c3e5b..d21374b93 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/record/RecordSetServiceAlgebra.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/record/RecordSetServiceAlgebra.scala
@@ -101,11 +101,9 @@ trait RecordSetServiceAlgebra {
                         ): Result[RecordSetChange]
 
   def listRecordSetChanges(
-                            zoneId: Option[String],
+                            zoneId: String,
                             startFrom: Option[Int],
                             maxItems: Int,
-                            fqdn: Option[String],
-                            recordType: Option[RecordType],
                             authPrincipal: AuthPrincipal
                           ): Result[ListRecordSetChangesResponse]
 
diff --git a/modules/api/src/main/scala/vinyldns/api/route/RecordSetRouting.scala b/modules/api/src/main/scala/vinyldns/api/route/RecordSetRouting.scala
index 1b289c21d..99c676813 100644
--- a/modules/api/src/main/scala/vinyldns/api/route/RecordSetRouting.scala
+++ b/modules/api/src/main/scala/vinyldns/api/route/RecordSetRouting.scala
@@ -230,8 +230,8 @@ class RecordSetRoute(
     } ~
     path("zones" / Segment / "recordsetchanges") { zoneId =>
       (get & monitor("Endpoint.listRecordSetChanges")) {
-        parameters("startFrom".as[Int].?, "maxItems".as[Int].?(DEFAULT_MAX_ITEMS), "fqdn".as[String].?, "recordType".as[String].?) {
-          (startFrom: Option[Int], maxItems: Int, fqdn: Option[String], _: Option[String]) =>
+        parameters("startFrom".as[Int].?, "maxItems".as[Int].?(DEFAULT_MAX_ITEMS)) {
+          (startFrom: Option[Int], maxItems: Int) =>
             handleRejections(invalidQueryHandler) {
               validate(
                 check = 0 < maxItems && maxItems <= DEFAULT_MAX_ITEMS,
@@ -240,7 +240,7 @@ class RecordSetRoute(
               ) {
                 authenticateAndExecute(
                   recordSetService
-                    .listRecordSetChanges(Some(zoneId), startFrom, maxItems, fqdn, None, _)
+                    .listRecordSetChanges(zoneId, startFrom, maxItems, _)
                 ) { changes =>
                   complete(StatusCodes.OK, changes)
                 }
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 137579884..68be5f775 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
@@ -1937,19 +1937,22 @@ class RecordSetServiceSpec
       val completeRecordSetChanges: List[RecordSetChange] =
         List(pendingCreateAAAA, pendingCreateCNAME, completeCreateAAAA, completeCreateCNAME)
 
+      doReturn(IO.pure(Some(zoneActive)))
+        .when(mockZoneRepo)
+        .getZone(zoneActive.id)
       doReturn(IO.pure(ListRecordSetChangesResults(completeRecordSetChanges)))
         .when(mockRecordChangeRepo)
-        .listRecordSetChanges(zoneId = Some(okZone.id), startFrom = None, maxItems = 100, fqdn = None, recordType = None)
+        .listRecordSetChanges(zoneId = Some(zoneActive.id), startFrom = None, maxItems = 100, fqdn = None, recordType = None)
       doReturn(IO.pure(ListUsersResults(Seq(okUser), None)))
         .when(mockUserRepo)
         .getUsers(any[Set[String]], any[Option[String]], any[Option[Int]])
 
       val result: ListRecordSetChangesResponse =
-        underTest.listRecordSetChanges(Some(okZone.id), authPrincipal = okAuth).value.unsafeRunSync().toOption.get
+        underTest.listRecordSetChanges(zoneActive.id, authPrincipal = okAuth).value.unsafeRunSync().toOption.get
       val changesWithName =
         completeRecordSetChanges.map(change => RecordSetChangeInfo(change, Some("ok")))
       val expectedResults = ListRecordSetChangesResponse(
-        zoneId = okZone.id,
+        zoneId = zoneActive.id,
         recordSetChanges = changesWithName,
         nextId = None,
         startFrom = None,
@@ -1996,7 +1999,7 @@ class RecordSetServiceSpec
         .getUsers(any[Set[String]], any[Option[String]], any[Option[Int]])
 
       val result: ListRecordSetChangesResponse =
-        underTest.listRecordSetChanges(Some(okZone.id), authPrincipal = okAuth).value.unsafeRunSync().toOption.get
+        underTest.listRecordSetChanges(okZone.id, authPrincipal = okAuth).value.unsafeRunSync().toOption.get
       val expectedResults = ListRecordSetChangesResponse(
         zoneId = okZone.id,
         recordSetChanges = List(),
@@ -2062,7 +2065,7 @@ class RecordSetServiceSpec
 
     "return a NotAuthorizedError" in {
       val error =
-        underTest.listRecordSetChanges(Some(zoneNotAuthorized.id), authPrincipal = okAuth).value.unsafeRunSync().swap.toOption.get
+        underTest.listRecordSetChanges(zoneNotAuthorized.id, authPrincipal = okAuth).value.unsafeRunSync().swap.toOption.get
 
       error shouldBe a[NotAuthorizedError]
     }
@@ -2079,7 +2082,7 @@ class RecordSetServiceSpec
         .getUsers(any[Set[String]], any[Option[String]], any[Option[Int]])
 
       val result: ListRecordSetChangesResponse =
-        underTest.listRecordSetChanges(Some(okZone.id), authPrincipal = okAuth).value.unsafeRunSync().toOption.get
+        underTest.listRecordSetChanges(okZone.id, authPrincipal = okAuth).value.unsafeRunSync().toOption.get
       val changesWithName =
         List(RecordSetChangeInfo(rsChange2, Some("ok")), RecordSetChangeInfo(rsChange1, Some("ok")))
       val expectedResults = ListRecordSetChangesResponse(
diff --git a/modules/api/src/test/scala/vinyldns/api/route/RecordSetRoutingSpec.scala b/modules/api/src/test/scala/vinyldns/api/route/RecordSetRoutingSpec.scala
index 2aea6247b..2e997702e 100644
--- a/modules/api/src/test/scala/vinyldns/api/route/RecordSetRoutingSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/route/RecordSetRoutingSpec.scala
@@ -758,16 +758,14 @@ class RecordSetRoutingSpec
     }.toResult
 
     def listRecordSetChanges(
-                              zoneId: Option[String],
+                              zoneId: String,
                               startFrom: Option[Int],
                               maxItems: Int,
-                              fqdn: Option[String],
-                              recordType: Option[RecordType],
                               authPrincipal: AuthPrincipal
                             ): Result[ListRecordSetChangesResponse] = {
       zoneId match {
-        case Some(zoneNotFound.id) => Left(ZoneNotFoundError(s"$zoneId"))
-        case Some(notAuthorizedZone.id) => Left(NotAuthorizedError("no way"))
+        case zoneNotFound.id => Left(ZoneNotFoundError(s"$zoneId"))
+        case notAuthorizedZone.id => Left(NotAuthorizedError("no way"))
         case _ => Right(listRecordSetChangesResponse)
       }
     }.toResult

From 8a8c22338c4de5fe57287e1006aec27a62657711 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Wed, 24 Apr 2024 14:59:53 +0530
Subject: [PATCH 11/49] fixed deleted zone access in portal

---
 modules/portal/app/views/zones/zones.scala.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/portal/app/views/zones/zones.scala.html b/modules/portal/app/views/zones/zones.scala.html
index ac3b0ca86..6d907944c 100644
--- a/modules/portal/app/views/zones/zones.scala.html
+++ b/modules/portal/app/views/zones/zones.scala.html
@@ -370,7 +370,7 @@
                                                                 {{deletedZone.userName}}
                                                             </td>
                                                             @if(meta.sharedDisplayEnabled) {
-                                                            <td>{{zone.shared ? "Shared" : "Private"}}</td>
+                                                            <td>{{deletedZone.zoneChange.zone.shared ? "Shared" : "Private"}}</td>
                                                             }
                                                         </tr>
                                                         </tbody>
@@ -449,7 +449,7 @@
                                                                 {{deletedZone.userName}}
                                                             </td>
                                                             @if(meta.sharedDisplayEnabled) {
-                                                            <td>{{zone.shared ? "Shared" : "Private"}}</td>
+                                                            <td>{{deletedZone.zoneChange.zone.shared ? "Shared" : "Private"}}</td>
                                                             }
                                                         </tr>
                                                         </tbody>

From 8335ee9b0134080a140d2d913a87a2355956ae9d Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Thu, 25 Apr 2024 14:21:11 +0530
Subject: [PATCH 12/49] reuse toFqdn method

---
 .../mysql/repository/MySqlRecordChangeRepository.scala        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlRecordChangeRepository.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlRecordChangeRepository.scala
index 47e085cc8..130b89363 100644
--- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlRecordChangeRepository.scala
+++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlRecordChangeRepository.scala
@@ -23,7 +23,7 @@ import vinyldns.core.domain.record.RecordType.RecordType
 import vinyldns.core.domain.record._
 import vinyldns.core.protobuf.ProtobufConversions
 import vinyldns.core.route.Monitored
-import vinyldns.mysql.repository.MySqlRecordSetRepository.fromRecordType
+import vinyldns.mysql.repository.MySqlRecordSetRepository.{fromRecordType, toFQDN}
 import vinyldns.proto.VinylDNSProto
 
 class MySqlRecordChangeRepository
@@ -103,7 +103,7 @@ class MySqlRecordChangeRepository
                   change.zoneId,
                   change.created.toEpochMilli,
                   fromChangeType(change.changeType),
-                  if(change.recordSet.name == change.zone.name) change.zone.name else change.recordSet.name + "." + change.zone.name,
+                  toFQDN(change.zone.name, change.recordSet.name),
                   fromRecordType(change.recordSet.typ),
                   toPB(change).toByteArray,
                 )

From fa0be01a6246812c39a1a6cc623fac8828bf9e8a Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Thu, 2 May 2024 12:23:20 +0530
Subject: [PATCH 13/49] update

---
 modules/portal/app/views/zones/zones.scala.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/portal/app/views/zones/zones.scala.html b/modules/portal/app/views/zones/zones.scala.html
index 6221dadf7..662de3669 100644
--- a/modules/portal/app/views/zones/zones.scala.html
+++ b/modules/portal/app/views/zones/zones.scala.html
@@ -487,7 +487,7 @@
 }
 
 @plugins = {
-<script type='text/javascript' src='/public/js/ui.js'></script>
+    <script type='text/javascript' src='/public/js/ui.js'></script>
 }
 
 @main(rootAccountName)("ZonesController")("Zones")(content)(plugins)

From 176a0ce6592f672d63a98a62abca67ba47d7d697 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Tue, 7 May 2024 10:47:34 +0530
Subject: [PATCH 14/49] update info messages

---
 .../vinyldns/api/engine/RecordSetChangeHandler.scala     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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 51dde4b37..6fe54b1fb 100644
--- a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
+++ b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
@@ -38,6 +38,7 @@ object RecordSetChangeHandler extends TransactionProvider {
   private val outOfSyncFailureMessage: String = "This record set is out of sync with the DNS backend; sync this zone before attempting to update this record set."
   private val incompatibleRecordFailureMessage: String = "Incompatible record in DNS."
   private val syncZoneMessage: String = "This record set is out of sync with the DNS backend. Sync this zone before attempting to update this record set."
+  private val wrongRecordDataMessage: String = "The record data entered doesn't exist. Please enter the correct record data or leave the field empty if it's a delete operation."
   private val recordConflictMessage: String = "Conflict due to the record having the same name as an NS record in the same zone. Please create the record using the DNS service the NS record has been delegated to (ex. AWS r53), or use a different record name."
 
   final case class Requeue(change: RecordSetChange) extends Throwable
@@ -392,12 +393,18 @@ object RecordSetChangeHandler extends TransactionProvider {
       case AlreadyApplied(_) => Completed(change.successful)
       case ReadyToApply(_) => Validated(change)
       case Failure(_, message) =>
-        if(message == outOfSyncFailureMessage || message == incompatibleRecordFailureMessage){
+        if(message == outOfSyncFailureMessage){
           Completed(
             change.failed(
               syncZoneMessage
             )
           )
+        } else if (message == incompatibleRecordFailureMessage) {
+          Completed(
+            change.failed(
+              wrongRecordDataMessage
+            )
+          )
         } else if (message == "referral") {
           Completed(
             change.failed(

From dfea1651f82df471dd94790d103ce38a63da2b03 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Tue, 14 May 2024 16:14:09 +0530
Subject: [PATCH 15/49] add jks details

---
 modules/docs/src/main/mdoc/operator/setup-ldap.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/docs/src/main/mdoc/operator/setup-ldap.md b/modules/docs/src/main/mdoc/operator/setup-ldap.md
index 1ccf61116..c2b4a8606 100644
--- a/modules/docs/src/main/mdoc/operator/setup-ldap.md
+++ b/modules/docs/src/main/mdoc/operator/setup-ldap.md
@@ -17,7 +17,7 @@ can read data from the Directory.  Once you have that information, proceed to th
 **Considerations**
 You _should_ communicate to your Directory over LDAP using TLS.  To do so, the SSL certs should be installed
 on the portal servers, or provided via a java trust store (key store).  The portal provides an option to specific
-a java key store when it starts up.
+a java key store when it starts up. For more information: [Using Java Key Store In VinylDNS](https://github.com/vinyldns/vinyldns/tree/master/modules/portal#building-locally)
 
 ## Configuring LDAP
 Before you can configure LDAP, make note of the host, username, and password that you will be using.

From fdf2601680553cebde3f179b2df0ef84279bf82e Mon Sep 17 00:00:00 2001
From: Arpit Shah <arpit_shah@cable.comcast.com>
Date: Tue, 14 May 2024 10:38:31 -0400
Subject: [PATCH 16/49] Updated codecov version to v4

---
 .github/workflows/verify.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
index 126b64c90..c46ac0f20 100644
--- a/.github/workflows/verify.yml
+++ b/.github/workflows/verify.yml
@@ -31,28 +31,28 @@ jobs:
 
       - name: Codecov
         id: codecov0
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v4
         continue-on-error: true
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
       - name: Codecov Retry
         id: codecov1
         if: steps.codecov0.outcome=='failure'
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v4
         continue-on-error: true
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
       - name: Codecov Retry 2
         id: codecov2
         if: steps.codecov1.outcome=='failure'
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v4
         continue-on-error: true
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
       - name: Codecov Retry 3
         id: codecov3
         if: steps.codecov2.outcome=='failure'
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v4
         continue-on-error: true
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

From 8c242b65e6b1a2a03ebf3d214e9bf9091498c56c Mon Sep 17 00:00:00 2001
From: Arpit Shah <arpit_shah@cable.comcast.com>
Date: Tue, 14 May 2024 13:01:14 -0400
Subject: [PATCH 17/49] Updated maintainers and contributors

---
 AUTHORS.md | 3 ++-
 README.md  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 2e713ac03..3c3eb170b 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -41,8 +41,9 @@ in any way, but do not see your name here, please open a PR to add yourself (in
 - Khalid Reid
 - Timo Schmid
 - Trent Schmidt
-- Nick Spadaccino
+- Arpit Shah
 - Ghafar Shah
+- Nick Spadaccino
 - Rebecca Star
 - Jess Stodola
 - Juan Valencia
diff --git a/README.md b/README.md
index 1759bc105..ee01cc4cc 100644
--- a/README.md
+++ b/README.md
@@ -146,7 +146,8 @@ See the [Contributing Guide](CONTRIBUTING.md).
 The current maintainers (people who can merge pull requests) are:
 
 - Ryan Emerle ([@remerle](https://github.com/remerle))
-- Sriram Ramakrishnan ([@sramakr](https://github.com/sramakr))
+- Arpit Shah ([@arpit4ever](https://github.com/arpit4ever))
+- Nick Spadaccino ([@nspadaccino](https://github.com/nspadaccino))
 - Jim Wakemen ([@jwakemen](https://github.com/jwakemen))
 
 See [AUTHORS.md](AUTHORS.md) for the full list of contributors to VinylDNS.

From 5d7db47a16c01e4b167f72454aadb0bbb7f4d41d Mon Sep 17 00:00:00 2001
From: Arpit Shah <arpit_shah@cable.comcast.com>
Date: Fri, 17 May 2024 09:52:25 -0400
Subject: [PATCH 18/49] Updated contributors

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

diff --git a/AUTHORS.md b/AUTHORS.md
index 3c3eb170b..45040ece9 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -21,6 +21,7 @@ in any way, but do not see your name here, please open a PR to add yourself (in
 - Joe Crowe
 - Jearvon Dharrie
 - Andrew Dunn
+- Josh Edwards
 - Ryan Emerle
 - David Grizzanti
 - Alejandro Guirao

From 372e7db7bcb42a6e27834546e91af5a6115ef797 Mon Sep 17 00:00:00 2001
From: Nicholas Spadaccino <37352107+nspadaccino@users.noreply.github.com>
Date: Fri, 17 May 2024 13:49:07 -0400
Subject: [PATCH 19/49] Bump version to v0.20.1

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

diff --git a/version.sbt b/version.sbt
index 163659bda..6681ab794 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.20.0"
+version in ThisBuild := "0.20.1"

From 8e0104d3c2ea1e33fe73b8c38e3cd7363b6d70de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 05:46:38 +0000
Subject: [PATCH 20/49] --- updated-dependencies: - dependency-name: requests  
 dependency-type: direct:production ...

Signed-off-by: dependabot[bot] <support@github.com>
---
 modules/api/src/test/functional/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/api/src/test/functional/requirements.txt b/modules/api/src/test/functional/requirements.txt
index 6a5a7140d..a7336c3f5 100644
--- a/modules/api/src/test/functional/requirements.txt
+++ b/modules/api/src/test/functional/requirements.txt
@@ -5,7 +5,7 @@ mock==4.0.3
 dnspython==2.6.1
 boto3==1.18.51
 botocore==1.21.51
-requests==2.31.0
+requests==2.32.0
 pytest-xdist==2.4.0
 python-dateutil==2.8.2
 filelock==3.2.0

From ba3ab43671af9278912b73c1ab6e0aa6cab644bd Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 24 Jun 2024 13:44:21 +0530
Subject: [PATCH 21/49] fix group update bug

---
 .../portal/app/views/groups/groups.scala.html  |  8 ++++----
 .../lib/controllers/controller.groups.js       | 18 +++++++++++++++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/modules/portal/app/views/groups/groups.scala.html b/modules/portal/app/views/groups/groups.scala.html
index b324c1551..811f2f4da 100644
--- a/modules/portal/app/views/groups/groups.scala.html
+++ b/modules/portal/app/views/groups/groups.scala.html
@@ -347,7 +347,7 @@
                                    name="name"
                                    class="form-control"
                                    ng-model="currentGroup.name"
-                                   ng-model-options="{ updateOn: 'submit' }"
+                                   ng-change="checkForChanges()"
                                    type="text"
                                    required>
                             </input>
@@ -360,7 +360,7 @@
                                    name="email"
                                    class="form-control"
                                    ng-model="currentGroup.email"
-                                   ng-model-options="{ updateOn: 'submit' }"
+                                   ng-change="checkForChanges()"
                                    type="text"
                                    required>
                             </input>
@@ -389,7 +389,7 @@
                                    name="description"
                                    class="form-control"
                                    ng-model="currentGroup.description"
-                                   ng-model-options="{ updateOn: 'submit' }"
+                                   ng-change="checkForChanges()"
                                    type="text">
                             </input>
                             <span class="help-block">
@@ -399,7 +399,7 @@
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <button id="edit-group-button" class="btn btn-primary pull-right">Update</button>
+                    <button id="edit-group-button" class="btn btn-primary pull-right" ng-disabled="submitEditGroupForm.$invalid || !hasChanges">Update</button>
                     <button type="button" class="btn btn-default" data-dismiss="modal" ng-click="closeEditModal()">Close</button>
                 </div>
             </div>
diff --git a/modules/portal/public/lib/controllers/controller.groups.js b/modules/portal/public/lib/controllers/controller.groups.js
index 16244fc70..c35d961bf 100644
--- a/modules/portal/public/lib/controllers/controller.groups.js
+++ b/modules/portal/public/lib/controllers/controller.groups.js
@@ -210,8 +210,8 @@ angular.module('controller.groups', []).controller('GroupsController', function
                 handleError(error, 'groupsService::getGroups-failure');
             });
   }
-    //Function for fetching list of valid domains
 
+    //Function for fetching list of valid domains
      $scope.validDomains=function getValidEmailDomains() {
             function success(response) {
                  $log.debug('groupsService::listEmailDomains-success', response);
@@ -247,10 +247,25 @@ angular.module('controller.groups', []).controller('GroupsController', function
 
     $scope.editGroup = function (groupInfo) {
         $scope.currentGroup = groupInfo;
+        $scope.initialGroup = {
+            name: $scope.currentGroup.name,
+            email: $scope.currentGroup.email,
+            description: $scope.currentGroup.description
+        };
+        $scope.hasChanges = false;
         $scope.validDomains();
         $("#modal_edit_group").modal("show");
     };
 
+    // Function to check for changes
+    $scope.checkForChanges = function() {
+        $scope.hasChanges =
+            $scope.currentGroup.name !== $scope.initialGroup.name ||
+            $scope.currentGroup.email !== $scope.initialGroup.email ||
+            ($scope.currentGroup.description !== $scope.initialGroup.description &&
+            !($scope.currentGroup.description === "" && $scope.initialGroup.description === undefined));
+    };
+
     $scope.getGroupAndUpdate = function(groupId, name, email, description) {
         function success(response) {
             $log.debug('groupsService::getGroup-success');
@@ -281,6 +296,7 @@ angular.module('controller.groups', []).controller('GroupsController', function
             return groupsService.updateGroup(groupId, payload)
                 .then(success)
                 .catch(function (error) {
+                    $scope.closeEditModal();
                     handleError(error, 'groupsService::updateGroup-failure');
                 });
         }

From 04d6dcb52c59f683d8e9693b5154f93f79c77b6c Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Tue, 2 Jul 2024 15:33:53 +0530
Subject: [PATCH 22/49] removed docker compose version since no more use

---
 quickstart/docker-compose.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/quickstart/docker-compose.yml b/quickstart/docker-compose.yml
index 7cdca0699..09109d7fd 100644
--- a/quickstart/docker-compose.yml
+++ b/quickstart/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
 
   # LDAP container hosting example users

From b9020329a33e824fa84a83127885fe8dc81ca72b Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Tue, 2 Jul 2024 17:54:31 +0530
Subject: [PATCH 23/49] typo

---
 quickstart/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstart/docker-compose.yml b/quickstart/docker-compose.yml
index 09109d7fd..315d93fb8 100644
--- a/quickstart/docker-compose.yml
+++ b/quickstart/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     ports:
       - "19004:19004"
 
-  # Integration image hosting r53, sns, sqs, bind, and mysql
+  # Integration image hosting r53, sns, sqs, bind and mysql
   integration:
     container_name: "vinyldns-api-integration"
     hostname: "vinyldns-integration"

From 810ad389ea073d7417861b55daa252f88e0b80e1 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 12 Jul 2024 16:01:56 +0530
Subject: [PATCH 24/49] optimize batch change

---
 build/docker/api/logback.xml                  |   4 -
 build/docker/portal/logback.xml               |   4 -
 modules/api/src/main/resources/logback.xml    |   4 -
 .../domain/batch/BatchChangeConverter.scala   |  37 +-----
 .../domain/batch/BatchChangeProtocol.scala    |  17 ++-
 .../domain/batch/BatchChangeValidations.scala | 108 ++++++++++++------
 .../domain/batch/BatchTransformations.scala   |  34 +++---
 .../api/route/BatchChangeJsonProtocol.scala   |   2 +
 .../batch/BatchChangeConverterSpec.scala      |  45 +-------
 modules/api/src/universal/conf/logback.xml    |   4 -
 .../core/domain/batch/SingleChange.scala      |   6 +-
 modules/portal/conf/logback.xml               |   4 -
 modules/portal/public/app.js                  |   2 +-
 .../dns-change/dns-change-new.controller.js   |  10 +-
 14 files changed, 123 insertions(+), 158 deletions(-)

diff --git a/build/docker/api/logback.xml b/build/docker/api/logback.xml
index 6b90f7dcb..ac3c468e2 100644
--- a/build/docker/api/logback.xml
+++ b/build/docker/api/logback.xml
@@ -14,10 +14,6 @@
 
     <logger name="scalikejdbc.StatementExecutor$$anon$1" level="OFF"/>
 
-    <logger name="com.zaxxer.hikari" level="TRACE">
-        <appender-ref ref="CONSOLE"/>
-    </logger>
-
     <root level="${VINYLDNS_LOG_LEVEL}">
         <appender-ref ref="CONSOLE"/>
     </root>
diff --git a/build/docker/portal/logback.xml b/build/docker/portal/logback.xml
index b7e61088c..86b11f6d7 100644
--- a/build/docker/portal/logback.xml
+++ b/build/docker/portal/logback.xml
@@ -15,10 +15,6 @@
   <logger name="play" level="INFO" />
   <logger name="application" level="DEBUG" />
 
-  <logger name="com.zaxxer.hikari" level="TRACE">
-    <appender-ref ref="CONSOLE"/>
-  </logger>
-
   <root level="${VINYLDNS_LOG_LEVEL}">
     <appender-ref ref="CONSOLE" />
   </root>
diff --git a/modules/api/src/main/resources/logback.xml b/modules/api/src/main/resources/logback.xml
index 688a07b6b..4f55b5431 100644
--- a/modules/api/src/main/resources/logback.xml
+++ b/modules/api/src/main/resources/logback.xml
@@ -7,10 +7,6 @@
         </encoder>
     </appender>
 
-    <logger name="com.zaxxer.hikari" level="TRACE">
-        <appender-ref ref="CONSOLE"/>
-    </logger>
-
     <root level="INFO">
         <appender-ref ref="CONSOLE"/>
     </root>
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 d561bc121..a4c238c0c 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
@@ -30,7 +30,6 @@ import vinyldns.core.domain.zone.Zone
 import vinyldns.core.domain.batch._
 import vinyldns.core.domain.record.RecordType.{RecordType, UNKNOWN}
 import vinyldns.core.queue.MessageQueue
-import java.net.InetAddress
 
 class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue: MessageQueue)
     extends BatchChangeConverterAlgebra {
@@ -52,17 +51,17 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
       s"Converting BatchChange [${batchChange.id}] with SingleChanges [${batchChange.changes.map(_.id)}]"
     )
     for {
-      updatedBatchChange <- updateBatchChange(batchChange, groupedChanges).toRightBatchResult
       recordSetChanges <- createRecordSetChangesForBatch(
-        updatedBatchChange.changes,
+        batchChange.changes,
         existingZones,
         groupedChanges,
         batchChange.userId,
         ownerGroupId
       ).toRightBatchResult
-      _ <- allChangesWereConverted(updatedBatchChange.changes, recordSetChanges)
+      _ = println("recordSetChanges: ", recordSetChanges)
+      _ <- allChangesWereConverted(batchChange.changes, recordSetChanges)
       _ <- batchChangeRepo
-        .save(updatedBatchChange)
+        .save(batchChange)
         .toBatchResult // need to save the change before queueing, backend processing expects the changes to exist
       queued <- putChangesOnQueue(recordSetChanges, batchChange.id)
       changeToStore = updateWithQueueingFailures(batchChange, queued)
@@ -129,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(nonExistentRecordDeleteMessage)
+              change.withDoesNotExistMessage
             case _ =>
               // Failure here means there was a message queue issue for this change
               change.withFailureMessage(failedMessage)
@@ -142,35 +141,11 @@ 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.contains(nonExistentRecordDeleteMessage) => change
+      case change if change.status == SingleChangeStatus.Failed || change.systemMessage.contains(nonExistentRecordDeleteMessage) || change.systemMessage.contains(nonExistentRecordDataDeleteMessage) => change
     }
     batchChangeRepo.updateSingleChanges(failedAndNotExistsChanges).as(())
   }.toBatchResult
 
-  def matchRecordData(existingRecordSetData: List[RecordData], recordData: RecordData): Boolean =
-    existingRecordSetData.exists { rd =>
-      (rd, recordData) match {
-        case (AAAAData(rdAddress), AAAAData(proposedAddress)) =>
-          InetAddress.getByName(proposedAddress).getHostName == InetAddress
-            .getByName(rdAddress)
-            .getHostName
-        case _ => rd == recordData
-      }
-    }
-
-  def updateBatchChange(batchChange: BatchChange, groupedChanges: ChangeForValidationMap): BatchChange = {
-    // Update system message to be display the information if record data doesn't exist for the delete request
-    val singleChanges = batchChange.changes.map {
-      case change@(sd: SingleDeleteRRSetChange) =>
-        if (sd.recordData.isDefined && !groupedChanges.getExistingRecordSet(change.recordKey.get).exists(rs => matchRecordData(rs.records, sd.recordData.get))) {
-          sd.copy(systemMessage = Some(nonExistentRecordDataDeleteMessage))
-        }
-        else change
-      case change => change
-    }
-    batchChange.copy(changes = singleChanges)
-  }
-
   def createRecordSetChangesForBatch(
       changes: List[SingleChange],
       existingZones: ExistingZones,
diff --git a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeProtocol.scala b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeProtocol.scala
index cef50fbd1..6b3b98364 100644
--- a/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeProtocol.scala
+++ b/modules/api/src/main/scala/vinyldns/api/domain/batch/BatchChangeProtocol.scala
@@ -44,12 +44,14 @@ object BatchChangeInput {
 sealed trait ChangeInput {
   val inputName: String
   val typ: RecordType
+  val systemMessage: Option[String]
   def asNewStoredChange(errors: NonEmptyList[DomainValidationError], defaultTtl: Long): SingleChange
 }
 
 final case class AddChangeInput(
     inputName: String,
     typ: RecordType,
+    systemMessage: Option[String],
     ttl: Option[Long],
     record: RecordData
 ) extends ChangeInput {
@@ -68,7 +70,7 @@ final case class AddChangeInput(
       knownTtl,
       record,
       SingleChangeStatus.NeedsReview,
-      None,
+      systemMessage,
       None,
       None,
       errors.toList.map(SingleChangeError(_))
@@ -79,6 +81,7 @@ final case class AddChangeInput(
 final case class DeleteRRSetChangeInput(
     inputName: String,
     typ: RecordType,
+    systemMessage: Option[String],
     record: Option[RecordData]
 ) extends ChangeInput {
   def asNewStoredChange(
@@ -93,7 +96,7 @@ final case class DeleteRRSetChangeInput(
       typ,
       record,
       SingleChangeStatus.NeedsReview,
-      None,
+      systemMessage,
       None,
       None,
       errors.toList.map(SingleChangeError(_))
@@ -104,6 +107,7 @@ object AddChangeInput {
   def apply(
       inputName: String,
       typ: RecordType,
+      systemMessage: Option[String],
       ttl: Option[Long],
       record: RecordData
   ): AddChangeInput = {
@@ -111,28 +115,29 @@ object AddChangeInput {
       case PTR => inputName
       case _ => ensureTrailingDot(inputName)
     }
-    new AddChangeInput(transformName, typ, ttl, record)
+    new AddChangeInput(transformName, typ, systemMessage, ttl, record)
   }
 
   def apply(sc: SingleAddChange): AddChangeInput =
-    AddChangeInput(sc.inputName, sc.typ, Some(sc.ttl), sc.recordData)
+    AddChangeInput(sc.inputName, sc.typ, sc.systemMessage, Some(sc.ttl), sc.recordData)
 }
 
 object DeleteRRSetChangeInput {
   def apply(
       inputName: String,
       typ: RecordType,
+      systemMessage: Option[String],
       record: Option[RecordData] = None
   ): DeleteRRSetChangeInput = {
     val transformName = typ match {
       case PTR => inputName
       case _ => ensureTrailingDot(inputName)
     }
-    new DeleteRRSetChangeInput(transformName, typ, record)
+    new DeleteRRSetChangeInput(transformName, typ, systemMessage, record)
   }
 
   def apply(sc: SingleDeleteRRSetChange): DeleteRRSetChangeInput =
-    DeleteRRSetChangeInput(sc.inputName, sc.typ, sc.recordData)
+    DeleteRRSetChangeInput(sc.inputName, sc.typ, sc.systemMessage, sc.recordData)
 }
 
 object ChangeInputType extends Enumeration {
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 342128bd2..7b24c40a5 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
@@ -16,7 +16,6 @@
 
 package vinyldns.api.domain.batch
 
-import java.net.InetAddress
 import java.time.Instant
 import java.time.temporal.ChronoUnit
 import cats.data._
@@ -315,16 +314,34 @@ class BatchChangeValidations(
     else
       ().validNel
 
-  def matchRecordData(existingRecordSetData: List[RecordData], recordData: RecordData): Boolean =
-    existingRecordSetData.exists { rd =>
-      (rd, recordData) match {
-        case (AAAAData(rdAddress), AAAAData(proposedAddress)) =>
-          InetAddress.getByName(proposedAddress).getHostName == InetAddress
-            .getByName(rdAddress)
-            .getHostName
-        case _ => rd == recordData
-      }
+  def matchRecordData(existingRecordSetData: List[RecordData], recordData: RecordData): Boolean = {
+    existingRecordSetData.par.exists { rd =>
+      rd == recordData
     }
+  }
+
+  def ensureRecordExists(
+    change: ChangeForValidation,
+    groupedChanges: ChangeForValidationMap
+  ): Boolean = {
+    change match {
+      // For DeleteRecord inputs, need to verify that the record data actually exists
+      case DeleteRRSetChangeForValidation(_, _, DeleteRRSetChangeInput(_, _, _, Some(recordData)))
+        if !groupedChanges
+          .getExistingRecordSet(change.recordKey)
+          .exists(rs => matchRecordData(rs.records, recordData)) =>
+        false
+      case _ =>
+        true
+    }
+  }
+
+  def updateSystemMessage(changeInput: ChangeInput, systemMessage: String): ChangeInput = {
+    changeInput match {
+      case dci: DeleteRRSetChangeInput => dci.copy(systemMessage = Some(systemMessage))
+      case _ => changeInput
+    }
+  }
 
   def validateDeleteWithContext(
       change: ChangeForValidation,
@@ -333,26 +350,37 @@ class BatchChangeValidations(
       isApproved: Boolean
   ): SingleValidation[ChangeForValidation] = {
 
-    // To handle add and delete for the record with same record data is present in the batch
+    val nonExistentRecordDeleteMessage = "This record does not exist. No further action is required."
+    val nonExistentRecordDataDeleteMessage = "Record data entered does not exist. No further action is required."
+
     val recordData = change match {
       case AddChangeForValidation(_, _, inputChange, _, _) => inputChange.record.toString
-      case DeleteRRSetChangeForValidation(_, _, inputChange) => if(inputChange.record.isDefined) inputChange.record.get.toString else ""
+      case DeleteRRSetChangeForValidation(_, _, inputChange) => inputChange.record.map(_.toString).getOrElse("")
     }
 
     val addInBatch = groupedChanges.getProposedAdds(change.recordKey)
-    val isSameRecordUpdateInBatch = if(recordData.nonEmpty){
-      if(addInBatch.contains(RecordData.fromString(recordData, change.inputChange.typ).get)) true else false
-    } else false
+    val isSameRecordUpdateInBatch = recordData.nonEmpty && addInBatch.contains(RecordData.fromString(recordData, change.inputChange.typ).get)
 
-    val validations =
-      groupedChanges.getExistingRecordSet(change.recordKey) match {
-        case Some(rs) =>
-          userCanDeleteRecordSet(change, auth, rs.ownerGroupId, rs.records) |+|
-            zoneDoesNotRequireManualReview(change, isApproved)
-        case None =>
-          if(isSameRecordUpdateInBatch) InvalidUpdateRequest(change.inputChange.inputName).invalidNel else ().validNel
-      }
-    validations.map(_ => change)
+    // Perform the system message update based on the condition
+    val updatedChange = if (groupedChanges.getExistingRecordSet(change.recordKey).isEmpty && !isSameRecordUpdateInBatch) {
+      val updatedChangeInput = updateSystemMessage(change.inputChange, nonExistentRecordDeleteMessage)
+      change.withUpdatedInputChange(updatedChangeInput)
+    } else if (!ensureRecordExists(change, groupedChanges)) {
+      val updatedChangeInput = updateSystemMessage(change.inputChange, nonExistentRecordDataDeleteMessage)
+      change.withUpdatedInputChange(updatedChangeInput)
+    } else {
+      change
+    }
+
+    val validations = groupedChanges.getExistingRecordSet(updatedChange.recordKey) match {
+      case Some(rs) =>
+        userCanDeleteRecordSet(updatedChange, auth, rs.ownerGroupId, rs.records) |+|
+          zoneDoesNotRequireManualReview(updatedChange, isApproved)
+      case None =>
+        if (isSameRecordUpdateInBatch) InvalidUpdateRequest(updatedChange.inputChange.inputName).invalidNel else ().validNel
+    }
+
+    validations.map(_ => updatedChange)
   }
 
   def validateAddUpdateWithContext(
@@ -397,28 +425,40 @@ class BatchChangeValidations(
       isApproved: Boolean
   ): SingleValidation[ChangeForValidation] = {
 
+    val nonExistentRecordDeleteMessage = "This record does not exist. No further action is required."
+    val nonExistentRecordDataDeleteMessage = "Record data entered does not exist. No further action is required."
+
     // To handle add and delete for the record with same record data is present in the batch
     val recordData = change match {
       case AddChangeForValidation(_, _, inputChange, _, _) => inputChange.record.toString
-      case DeleteRRSetChangeForValidation(_, _, inputChange) => if(inputChange.record.isDefined) inputChange.record.get.toString else ""
+      case DeleteRRSetChangeForValidation(_, _, inputChange) => inputChange.record.map(_.toString).getOrElse("")
     }
 
     val addInBatch = groupedChanges.getProposedAdds(change.recordKey)
-    val isSameRecordUpdateInBatch = if(recordData.nonEmpty){
-      if(addInBatch.contains(RecordData.fromString(recordData, change.inputChange.typ).get)) true else false
-    } else false
+    val isSameRecordUpdateInBatch = recordData.nonEmpty && addInBatch.contains(RecordData.fromString(recordData, change.inputChange.typ).get)
+
+    // Perform the system message update based on the condition
+    val updatedChange = if (groupedChanges.getExistingRecordSet(change.recordKey).isEmpty && !isSameRecordUpdateInBatch) {
+      val updatedChangeInput = updateSystemMessage(change.inputChange, nonExistentRecordDeleteMessage)
+      change.withUpdatedInputChange(updatedChangeInput)
+    } else if (!ensureRecordExists(change, groupedChanges)) {
+      val updatedChangeInput = updateSystemMessage(change.inputChange, nonExistentRecordDataDeleteMessage)
+      change.withUpdatedInputChange(updatedChangeInput)
+    } else {
+      change
+    }
 
     val validations =
-      groupedChanges.getExistingRecordSet(change.recordKey) match {
+      groupedChanges.getExistingRecordSet(updatedChange.recordKey) match {
         case Some(rs) =>
-          val adds = groupedChanges.getProposedAdds(change.recordKey).toList
-          userCanUpdateRecordSet(change, auth, rs.ownerGroupId, adds) |+|
-            zoneDoesNotRequireManualReview(change, isApproved)
+          val adds = groupedChanges.getProposedAdds(updatedChange.recordKey).toList
+          userCanUpdateRecordSet(updatedChange, auth, rs.ownerGroupId, adds) |+|
+            zoneDoesNotRequireManualReview(updatedChange, isApproved)
         case None =>
-          if(isSameRecordUpdateInBatch) InvalidUpdateRequest(change.inputChange.inputName).invalidNel else ().validNel
+          if(isSameRecordUpdateInBatch) InvalidUpdateRequest(updatedChange.inputChange.inputName).invalidNel else ().validNel
       }
 
-    validations.map(_ => change)
+    validations.map(_ => updatedChange)
   }
 
   def validateAddWithContext(
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 eb3953330..dbeafc2f6 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
@@ -16,7 +16,6 @@
 
 package vinyldns.api.domain.batch
 
-import java.net.InetAddress
 import java.util.UUID
 
 import vinyldns.api.domain.ReverseZoneHelpers
@@ -24,7 +23,7 @@ import vinyldns.api.domain.batch.BatchChangeInterfaces.ValidatedBatch
 import vinyldns.api.domain.batch.BatchTransformations.LogicalChangeType.LogicalChangeType
 import vinyldns.api.backend.dns.DnsConversions.getIPv6FullReverseName
 import vinyldns.core.domain.batch._
-import vinyldns.core.domain.record.{AAAAData, RecordData, RecordSet, RecordSetChange}
+import vinyldns.core.domain.record.{RecordData, RecordSet, RecordSetChange}
 import vinyldns.core.domain.record.RecordType._
 import vinyldns.core.domain.zone.Zone
 import vinyldns.core.domain.record.RecordType.RecordType
@@ -82,6 +81,7 @@ object BatchTransformations {
     val recordKey = RecordKey(zone.id, recordName, inputChange.typ)
     def asStoredChange(changeId: Option[String] = None): SingleChange
     def isAddChangeForValidation: Boolean
+    def withUpdatedInputChange(inputChange: ChangeInput): ChangeForValidation
   }
 
   object ChangeForValidation {
@@ -118,7 +118,7 @@ object BatchTransformations {
         ttl,
         inputChange.record,
         SingleChangeStatus.Pending,
-        None,
+        inputChange.systemMessage,
         None,
         None,
         List.empty,
@@ -127,6 +127,10 @@ object BatchTransformations {
     }
 
     def isAddChangeForValidation: Boolean = true
+
+    def withUpdatedInputChange(inputChange: ChangeInput): ChangeForValidation = {
+      this.copy(inputChange = inputChange.asInstanceOf[AddChangeInput])
+    }
   }
 
   final case class DeleteRRSetChangeForValidation(
@@ -143,7 +147,7 @@ object BatchTransformations {
         inputChange.typ,
         inputChange.record,
         SingleChangeStatus.Pending,
-        None,
+        inputChange.systemMessage,
         None,
         None,
         List.empty,
@@ -151,6 +155,10 @@ object BatchTransformations {
       )
 
     def isAddChangeForValidation: Boolean = false
+
+    def withUpdatedInputChange(inputChange: ChangeInput): ChangeForValidation = {
+      this.copy(inputChange = inputChange.asInstanceOf[DeleteRRSetChangeInput])
+    }
   }
 
   final case class BatchConversionOutput(
@@ -197,13 +205,6 @@ object BatchTransformations {
   }
 
   object ValidationChanges {
-    def matchRecordData(existingRecord: RecordData, recordData: String): Boolean =
-      existingRecord match {
-        case AAAAData(address) =>
-          InetAddress.getByName(address).getHostName ==
-            InetAddress.getByName(recordData).getHostName
-        case _ => false
-      }
 
     def apply(
         changes: List[ChangeForValidation],
@@ -223,16 +224,11 @@ object BatchTransformations {
           case DeleteRRSetChangeForValidation(
               _,
               _,
-              DeleteRRSetChangeInput(_, AAAA, Some(AAAAData(address)))
-              ) =>
-            existingRecords.filter(r => matchRecordData(r, address))
-          case DeleteRRSetChangeForValidation(
-              _,
-              _,
-              DeleteRRSetChangeInput(_, _, Some(recordData))
+              DeleteRRSetChangeInput(_, _, _, Some(recordData))
               ) =>
             Set(recordData)
-          case _: DeleteRRSetChangeForValidation => existingRecords
+          case _: DeleteRRSetChangeForValidation =>
+            existingRecords
         }
         .toSet
         .flatten
diff --git a/modules/api/src/main/scala/vinyldns/api/route/BatchChangeJsonProtocol.scala b/modules/api/src/main/scala/vinyldns/api/route/BatchChangeJsonProtocol.scala
index b2342dc53..d10885c13 100644
--- a/modules/api/src/main/scala/vinyldns/api/route/BatchChangeJsonProtocol.scala
+++ b/modules/api/src/main/scala/vinyldns/api/route/BatchChangeJsonProtocol.scala
@@ -88,6 +88,7 @@ trait BatchChangeJsonProtocol extends JsonValidation {
       (
         (js \ "inputName").required[String]("Missing BatchChangeInput.changes.inputName"),
         recordType,
+        (js \ "systemMessage").optional[String],
         (js \ "ttl").optional[Long],
         recordType.andThen(extractRecord(_, js \ "record"))
       ).mapN(AddChangeInput.apply)
@@ -114,6 +115,7 @@ trait BatchChangeJsonProtocol extends JsonValidation {
       (
         (js \ "inputName").required[String]("Missing BatchChangeInput.changes.inputName"),
         recordType,
+        (js \ "systemMessage").optional[String],
         recordData
       ).mapN(DeleteRRSetChangeInput.apply)
     }
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 0305d0830..3cdf0639c 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,8 +39,6 @@ import vinyldns.core.domain.zone.Zone
 class BatchChangeConverterSpec extends AnyWordSpec with Matchers {
   private val nonExistentRecordDeleteMessage: String = "This record does not exist. " +
     "No further action is required."
-  private val nonExistentRecordDataDeleteMessage: String = "Record data entered does not exist. " +
-    "No further action is required."
 
   private def makeSingleAddChange(
                                    name: String,
@@ -88,7 +86,7 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers {
     AddChangeForValidation(
       okZone,
       s"$recordName",
-      AddChangeInput(s"$recordName.ok.", typ, Some(123), recordData),
+      AddChangeInput(s"$recordName.ok.", typ, None, Some(123), recordData),
       7200L
     )
 
@@ -99,7 +97,7 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers {
     DeleteRRSetChangeForValidation(
       okZone,
       s"$recordName",
-      DeleteRRSetChangeInput(s"$recordName.ok.", typ)
+      DeleteRRSetChangeInput(s"$recordName.ok.", typ, None)
     )
 
   private val addSingleChangesGood = List(
@@ -621,45 +619,6 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers {
     }
   }
 
-  "updateBatchChange" should {
-    "update the batch change system message when there is a delete request with non-existent record data" in {
-      val batchWithBadChange =
-        BatchChange(
-          okUser.id,
-          okUser.userName,
-          None,
-          Instant.now.truncatedTo(ChronoUnit.MILLIS),
-          singleChangesOneDeleteGood,
-          approvalStatus = BatchChangeApprovalStatus.AutoApproved
-        )
-      val result =
-        underTest
-          .updateBatchChange(
-            batchWithBadChange,
-            ChangeForValidationMap(changeForValidationOneDeleteGood.map(_.validNel), existingRecordSets),
-          )
-
-      // validate the batch change returned
-      val receivedChange = result.changes(0)
-      receivedChange.systemMessage shouldBe Some(nonExistentRecordDataDeleteMessage)
-      result.changes(0) shouldBe singleChangesOneDeleteGood(0).copy(systemMessage = Some(nonExistentRecordDataDeleteMessage))
-    }
-  }
-
-  "matchRecordData" should {
-    "check if the record data given matches the record data present" in {
-      val recordData = List(AData("1.2.3.5"), AAAAData("caec:cec6:c4ef:bb7b:1a78:d055:216d:3a78"))
-      val result1 = underTest.matchRecordData(recordData, AData("1.2.3.5"))
-      result1 shouldBe true
-      val result2 = underTest.matchRecordData(recordData, AData("1.2.3.4"))
-      result2 shouldBe false
-      val result3 = underTest.matchRecordData(recordData, AAAAData("caec:cec6:c4ef:bb7b:1a78:d055:216d:3a78"))
-      result3 shouldBe true
-      val result4 = underTest.matchRecordData(recordData, AAAAData("abcd:cec6:c4ef:bb7b:1a78:d055:216d:3a78"))
-      result4 shouldBe false
-    }
-  }
-
   "generateAddChange" should {
     val singleAddChange = makeSingleAddChange("shared-rs", AData("1.2.3.4"), A, sharedZone)
     val ownerGroupId = Some("some-owner-group-id")
diff --git a/modules/api/src/universal/conf/logback.xml b/modules/api/src/universal/conf/logback.xml
index 688a07b6b..4f55b5431 100644
--- a/modules/api/src/universal/conf/logback.xml
+++ b/modules/api/src/universal/conf/logback.xml
@@ -7,10 +7,6 @@
         </encoder>
     </appender>
 
-    <logger name="com.zaxxer.hikari" level="TRACE">
-        <appender-ref ref="CONSOLE"/>
-    </logger>
-
     <root level="INFO">
         <appender-ref ref="CONSOLE"/>
     </root>
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 254246ebf..87cc761ed 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 withDoesNotExistMessage(error: String): SingleChange = this match {
+  def withDoesNotExistMessage: SingleChange = this match {
     case add: SingleAddChange =>
-      add.copy(status = SingleChangeStatus.Failed, systemMessage = Some(error))
+      add.copy(status = SingleChangeStatus.Failed)
     case delete: SingleDeleteRRSetChange =>
-      delete.copy(status = SingleChangeStatus.Complete, systemMessage = Some(error))
+      delete.copy(status = SingleChangeStatus.Complete)
   }
 
   def withProcessingError(message: Option[String], failedRecordChangeId: String): SingleChange =
diff --git a/modules/portal/conf/logback.xml b/modules/portal/conf/logback.xml
index 1eea934d5..f3c208628 100644
--- a/modules/portal/conf/logback.xml
+++ b/modules/portal/conf/logback.xml
@@ -15,10 +15,6 @@
   <logger name="play" level="INFO" />
   <logger name="application" level="DEBUG" />
 
-  <logger name="com.zaxxer.hikari" level="TRACE">
-    <appender-ref ref="CONSOLE"/>
-  </logger>
-
   <root level="INFO">
     <appender-ref ref="CONSOLE" />
   </root>
diff --git a/modules/portal/public/app.js b/modules/portal/public/app.js
index 8879d4af0..d201ef7cc 100644
--- a/modules/portal/public/app.js
+++ b/modules/portal/public/app.js
@@ -14,7 +14,7 @@ angular.module('vinyldns', [
         $animateProvider
             .classNameFilter(/toshow/);
         // turning off $log. Change to true for local development and testing
-        $logProvider.debugEnabled(false);
+        $logProvider.debugEnabled(true);
     })
     .controller('AppController', function ($scope, $timeout, profileService, utilityService) {
         document.body.style.cursor = 'default';
diff --git a/modules/portal/public/lib/dns-change/dns-change-new.controller.js b/modules/portal/public/lib/dns-change/dns-change-new.controller.js
index e5ab61659..0df8fa1fd 100644
--- a/modules/portal/public/lib/dns-change/dns-change-new.controller.js
+++ b/modules/portal/public/lib/dns-change/dns-change-new.controller.js
@@ -128,7 +128,15 @@
                         if(payload.scheduledTime) {
                          $scope.newBatch.scheduledTime = moment(payload.scheduledTime).local().format('LL hh:mm A')
                         }
-                        if(error.data.errors || error.status !== 400 || typeof error.data == "string"){
+                        // Handle timeout error (usually status code 503 or a specific message)
+                        if (error.status === 503 || (error.statusText && error.statusText.includes('timeout'))) {
+                            var alert = utilityService.success('Successfully created DNS Change. Processing the change.', error, 'createBatchChange: createBatchChange successful');
+                            $scope.alerts.push(alert);
+                            $timeout(function(){
+                               location.href = "/dnschanges";
+                            }, 2000);
+                        }
+                        else if(error.data.errors || error.status !== 400 || typeof error.data == "string"){
                             handleError(error, 'dnsChangesService::createBatchChange-failure');
                         } else {
                             $scope.newBatch.changes = error.data;

From 817898c63f704d18002c0c4c74bfcff6009bc31e Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 12 Jul 2024 16:43:16 +0530
Subject: [PATCH 25/49] remove unnecessary conditions

---
 .../portal/public/lib/dns-change/dns-change-new.controller.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/portal/public/lib/dns-change/dns-change-new.controller.js b/modules/portal/public/lib/dns-change/dns-change-new.controller.js
index 0df8fa1fd..88f11ef69 100644
--- a/modules/portal/public/lib/dns-change/dns-change-new.controller.js
+++ b/modules/portal/public/lib/dns-change/dns-change-new.controller.js
@@ -128,8 +128,8 @@
                         if(payload.scheduledTime) {
                          $scope.newBatch.scheduledTime = moment(payload.scheduledTime).local().format('LL hh:mm A')
                         }
-                        // Handle timeout error (usually status code 503 or a specific message)
-                        if (error.status === 503 || (error.statusText && error.statusText.includes('timeout'))) {
+                        // Handle timeout error (status code 503)
+                        if (error.status === 503) {
                             var alert = utilityService.success('Successfully created DNS Change. Processing the change.', error, 'createBatchChange: createBatchChange successful');
                             $scope.alerts.push(alert);
                             $timeout(function(){

From d5722f49618ed5e425592dc7d523d6f0e27033dc Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Sat, 13 Jul 2024 00:41:07 +0530
Subject: [PATCH 26/49] handle timeout in api

---
 build/docker/api/application.conf             |  9 +++++
 modules/api/src/it/resources/application.conf |  9 +++++
 .../api/src/main/resources/application.conf   |  9 +++++
 .../domain/batch/BatchChangeConverter.scala   |  1 -
 .../api/route/BatchChangeRouting.scala        | 38 +++++++++++++------
 .../api/src/test/resources/application.conf   |  9 +++++
 .../api/src/universal/conf/application.conf   |  9 +++++
 ...ecordChangeRepositoryIntegrationSpec.scala |  2 -
 .../dns-change/dns-change-new.controller.js   | 25 ++++++------
 test/api/functional/application.conf          |  9 +++++
 test/api/integration/application.conf         |  9 +++++
 11 files changed, 101 insertions(+), 28 deletions(-)

diff --git a/build/docker/api/application.conf b/build/docker/api/application.conf
index f3d2e8ef2..ddab15974 100644
--- a/build/docker/api/application.conf
+++ b/build/docker/api/application.conf
@@ -353,6 +353,15 @@ akka.http {
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
+
+    # timeout
+    request-timeout = 30s
+  }
+
+  custom {
+    timeout-response {
+      message = "Successfully submitted DNS changes. Please wait a while for the changes to get processed."
+    }
   }
 
   parsing {
diff --git a/modules/api/src/it/resources/application.conf b/modules/api/src/it/resources/application.conf
index dd3b7006e..2ce75a4ad 100644
--- a/modules/api/src/it/resources/application.conf
+++ b/modules/api/src/it/resources/application.conf
@@ -350,6 +350,15 @@ akka.http {
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
+
+    # timeout
+    request-timeout = 30s
+  }
+
+  custom {
+    timeout-response {
+      message = "Successfully submitted DNS changes. Please wait a while for the changes to get processed."
+    }
   }
 
   parsing {
diff --git a/modules/api/src/main/resources/application.conf b/modules/api/src/main/resources/application.conf
index c1ee28ca9..9f928bab6 100644
--- a/modules/api/src/main/resources/application.conf
+++ b/modules/api/src/main/resources/application.conf
@@ -369,6 +369,15 @@ akka.http {
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
+
+    # timeout
+    request-timeout = 30s
+  }
+
+  custom {
+    timeout-response {
+      message = "Successfully submitted DNS changes. Please wait a while for the changes to get processed."
+    }
   }
 
   parsing {
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 a4c238c0c..53e027384 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
@@ -58,7 +58,6 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
         batchChange.userId,
         ownerGroupId
       ).toRightBatchResult
-      _ = println("recordSetChanges: ", recordSetChanges)
       _ <- allChangesWereConverted(batchChange.changes, recordSetChanges)
       _ <- batchChangeRepo
         .save(batchChange)
diff --git a/modules/api/src/main/scala/vinyldns/api/route/BatchChangeRouting.scala b/modules/api/src/main/scala/vinyldns/api/route/BatchChangeRouting.scala
index 13ee7b65b..713cf3674 100644
--- a/modules/api/src/main/scala/vinyldns/api/route/BatchChangeRouting.scala
+++ b/modules/api/src/main/scala/vinyldns/api/route/BatchChangeRouting.scala
@@ -16,13 +16,15 @@
 
 package vinyldns.api.route
 
-import akka.http.scaladsl.model.StatusCodes
+import akka.http.scaladsl.model._
 import akka.http.scaladsl.server.{RejectionHandler, Route, ValidationRejection}
-import vinyldns.api.config.LimitsConfig
+import com.typesafe.config.ConfigFactory
 import org.slf4j.{Logger, LoggerFactory}
-import vinyldns.api.config.ManualReviewConfig
-import vinyldns.core.domain.batch._
+import vinyldns.api.config.{LimitsConfig, ManualReviewConfig}
 import vinyldns.api.domain.batch._
+import vinyldns.core.domain.batch._
+
+import scala.concurrent.duration.DurationLong
 
 class BatchChangeRoute(
     batchChangeService: BatchChangeServiceAlgebra,
@@ -58,16 +60,28 @@ class BatchChangeRoute(
 
   final private val MAX_ITEMS_LIMIT: Int = limitsConfig.BATCHCHANGE_ROUTING_MAX_ITEMS_LIMIT
 
+  val config = ConfigFactory.load()
+  val requestTimeout = config.getDuration("akka.http.server.request-timeout").toMillis.millis
+  val timeoutMessage = config.getString("akka.http.custom.timeout-response.message")
+  val customTimeoutResponse: HttpRequest => HttpResponse = { _ =>
+    HttpResponse(
+      status = StatusCodes.OK,
+      entity = HttpEntity(ContentTypes.`application/json`, s"""{"message": "$timeoutMessage"}""")
+    )
+  }
+
   val batchChangeRoute: Route = {
     val standardBatchChangeRoutes = path("zones" / "batchrecordchanges") {
-      (post & monitor("Endpoint.postBatchChange")) {
-        parameters("allowManualReview".as[Boolean].?(true)) { allowManualReview: Boolean =>
-          authenticateAndExecuteWithEntity[BatchChange, BatchChangeInput](
-            (authPrincipal, batchChangeInput) =>
-              batchChangeService
-                .applyBatchChange(batchChangeInput, authPrincipal, allowManualReview)
-          ) { chg =>
-            complete(StatusCodes.Accepted, chg)
+      withRequestTimeout(requestTimeout, request => customTimeoutResponse(request)) {
+        (post & monitor("Endpoint.postBatchChange")) {
+          parameters("allowManualReview".as[Boolean].?(true)) { allowManualReview: Boolean =>
+            authenticateAndExecuteWithEntity[BatchChange, BatchChangeInput](
+              (authPrincipal, batchChangeInput) =>
+                batchChangeService
+                  .applyBatchChange(batchChangeInput, authPrincipal, allowManualReview)
+            ) { chg =>
+              complete(StatusCodes.Accepted, chg)
+            }
           }
         }
       } ~
diff --git a/modules/api/src/test/resources/application.conf b/modules/api/src/test/resources/application.conf
index 93f88e24e..018fb9799 100644
--- a/modules/api/src/test/resources/application.conf
+++ b/modules/api/src/test/resources/application.conf
@@ -338,6 +338,15 @@ akka.http {
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
+
+    # timeout
+    request-timeout = 30s
+  }
+
+  custom {
+    timeout-response {
+      message = "Successfully submitted DNS changes. Please wait a while for the changes to get processed."
+    }
   }
 
   parsing {
diff --git a/modules/api/src/universal/conf/application.conf b/modules/api/src/universal/conf/application.conf
index ff70827df..e917880be 100644
--- a/modules/api/src/universal/conf/application.conf
+++ b/modules/api/src/universal/conf/application.conf
@@ -354,6 +354,15 @@ akka.http {
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
+
+    # timeout
+    request-timeout = 30s
+  }
+
+  custom {
+    timeout-response {
+      message = "Successfully submitted DNS changes. Please wait a while for the changes to get processed."
+    }
   }
 
   parsing {
diff --git a/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlRecordChangeRepositoryIntegrationSpec.scala b/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlRecordChangeRepositoryIntegrationSpec.scala
index 397db1674..c6636c7d2 100644
--- a/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlRecordChangeRepositoryIntegrationSpec.scala
+++ b/modules/mysql/src/it/scala/vinyldns/mysql/repository/MySqlRecordChangeRepositoryIntegrationSpec.scala
@@ -216,13 +216,11 @@ class MySqlRecordChangeRepositoryIntegrationSpec
       }
       saveRecChange.attempt.unsafeRunSync() shouldBe right
       val page1 = repo.listFailedRecordSetChanges(Some(okZone.id), 2, 0).unsafeRunSync()
-      println(page1.items)
       page1.nextId shouldBe 3
       page1.maxItems shouldBe 2
       (page1.items should contain).theSameElementsInOrderAs(expectedOrder.take(2))
 
       val page2 = repo.listFailedRecordSetChanges(Some(okZone.id), 2, page1.nextId).unsafeRunSync()
-      println(page2.items)
       page2.nextId shouldBe 6
       page2.maxItems shouldBe 2
       (page2.items should contain).theSameElementsInOrderAs(expectedOrder.slice(3, 5))
diff --git a/modules/portal/public/lib/dns-change/dns-change-new.controller.js b/modules/portal/public/lib/dns-change/dns-change-new.controller.js
index 88f11ef69..6b0e5c610 100644
--- a/modules/portal/public/lib/dns-change/dns-change-new.controller.js
+++ b/modules/portal/public/lib/dns-change/dns-change-new.controller.js
@@ -114,10 +114,17 @@
                 function success(response) {
                     var alert = utilityService.success('Successfully created DNS Change', response, 'createBatchChange: createBatchChange successful');
                     $scope.alerts.push(alert);
-                    $timeout(function(){
-                        location.href = "/dnschanges/" + response.data.id;
-                     }, 2000);
-                    $scope.batch = response.data;
+                    // This is the message we have in akka http config to handle timeout
+                    if(response.data.message === "Successfully submitted DNS changes. Please wait a while for the changes to get processed."){
+                        $timeout(function(){
+                            location.href = "/dnschanges";
+                         }, 2000);
+                    } else {
+                        $timeout(function(){
+                            location.href = "/dnschanges/" + response.data.id;
+                         }, 2000);
+                        $scope.batch = response.data;
+                    }
                 }
 
                 formatData(payload);
@@ -128,15 +135,7 @@
                         if(payload.scheduledTime) {
                          $scope.newBatch.scheduledTime = moment(payload.scheduledTime).local().format('LL hh:mm A')
                         }
-                        // Handle timeout error (status code 503)
-                        if (error.status === 503) {
-                            var alert = utilityService.success('Successfully created DNS Change. Processing the change.', error, 'createBatchChange: createBatchChange successful');
-                            $scope.alerts.push(alert);
-                            $timeout(function(){
-                               location.href = "/dnschanges";
-                            }, 2000);
-                        }
-                        else if(error.data.errors || error.status !== 400 || typeof error.data == "string"){
+                        if(error.data.errors || error.status !== 400 || typeof error.data == "string"){
                             handleError(error, 'dnsChangesService::createBatchChange-failure');
                         } else {
                             $scope.newBatch.changes = error.data;
diff --git a/test/api/functional/application.conf b/test/api/functional/application.conf
index e0f35df07..c498f3ec3 100644
--- a/test/api/functional/application.conf
+++ b/test/api/functional/application.conf
@@ -304,6 +304,15 @@ akka.http {
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
+
+    # timeout
+    request-timeout = 30s
+  }
+
+  custom {
+    timeout-response {
+      message = "Successfully submitted DNS changes. Please wait a while for the changes to get processed."
+    }
   }
 
   parsing {
diff --git a/test/api/integration/application.conf b/test/api/integration/application.conf
index c09038a85..6c57bf6e3 100644
--- a/test/api/integration/application.conf
+++ b/test/api/integration/application.conf
@@ -362,6 +362,15 @@ akka.http {
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
+
+    # timeout
+    request-timeout = 30s
+  }
+
+  custom {
+    timeout-response {
+      message = "Successfully submitted DNS changes. Please wait a while for the changes to get processed."
+    }
   }
 
   parsing {

From 2f63cdcf412d379af571a7d8bab29a57e2e22dda Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Tue, 16 Jul 2024 14:40:03 +0530
Subject: [PATCH 27/49] fix tests

---
 .../batch/BatchChangeConverterSpec.scala      |  21 +-
 .../domain/batch/BatchChangeInputSpec.scala   |  24 +-
 .../domain/batch/BatchChangeServiceSpec.scala |  66 ++--
 .../batch/BatchChangeValidationsSpec.scala    | 326 +++++++++---------
 .../route/BatchChangeJsonProtocolSpec.scala   |  14 +-
 5 files changed, 229 insertions(+), 222 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 3cdf0639c..43ab75ba9 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
@@ -62,7 +62,7 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers {
     )
   }
 
-  private def makeSingleDeleteRRSetChange(name: String, typ: RecordType, zone: Zone = okZone) = {
+  private def makeSingleDeleteRRSetChange(name: String, typ: RecordType, zone: Zone = okZone, systemMessage: Option[String] = None) = {
     val fqdn = s"$name.${zone.name}"
     SingleDeleteRRSetChange(
       Some(zone.id),
@@ -72,7 +72,7 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers {
       typ,
       None,
       SingleChangeStatus.Pending,
-      None,
+      systemMessage,
       None,
       None
     )
@@ -92,12 +92,13 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers {
 
   private def makeDeleteRRSetChangeForValidation(
                                                   recordName: String,
-                                                  typ: RecordType = RecordType.A
+                                                  typ: RecordType = RecordType.A,
+                                                  systemMessage: Option[String] = None
                                                 ): DeleteRRSetChangeForValidation =
     DeleteRRSetChangeForValidation(
       okZone,
       s"$recordName",
-      DeleteRRSetChangeInput(s"$recordName.ok.", typ, None)
+      DeleteRRSetChangeInput(s"$recordName.ok.", typ, systemMessage, None)
     )
 
   private val addSingleChangesGood = List(
@@ -163,19 +164,11 @@ class BatchChangeConverterSpec extends AnyWordSpec with Matchers {
   )
 
   private val singleChangesOneDelete = List(
-    makeSingleDeleteRRSetChange("DoesNotExistToDelete", A)
-  )
-
-  private val singleChangesOneDeleteGood = List(
-    makeSingleDeleteRRSetChange("aToDelete", A).copy(recordData = Some(AData("2.3.4.6"))),
+    makeSingleDeleteRRSetChange("DoesNotExistToDelete", A, okZone, Some(nonExistentRecordDeleteMessage))
   )
 
   private val changeForValidationOneDelete = List(
-    makeDeleteRRSetChangeForValidation("DoesNotExistToDelete", A)
-  )
-
-  private val changeForValidationOneDeleteGood = List(
-    makeDeleteRRSetChangeForValidation("aToDelete", A)
+    makeDeleteRRSetChangeForValidation("DoesNotExistToDelete", A, Some(nonExistentRecordDeleteMessage))
   )
 
   private val singleChangesOneBad = List(
diff --git a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeInputSpec.scala b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeInputSpec.scala
index fb614e387..b7d03b4fc 100644
--- a/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeInputSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/domain/batch/BatchChangeInputSpec.scala
@@ -31,16 +31,16 @@ class BatchChangeInputSpec extends AnyWordSpec with Matchers {
 
   "BatchChangeInput" should {
     "ensure trailing dot on A, AAAA, and CNAME fqdn" in {
-      val changeA = AddChangeInput("apex.test.com", A, Some(100), AData("1.1.1.1"))
+      val changeA = AddChangeInput("apex.test.com", A, None, Some(100), AData("1.1.1.1"))
       val changeAAAA =
-        AddChangeInput("aaaa.test.com", AAAA, Some(3600), AAAAData("1:2:3:4:5:6:7:8"))
+        AddChangeInput("aaaa.test.com", AAAA, None, Some(3600), AAAAData("1:2:3:4:5:6:7:8"))
       val changeCname =
-        AddChangeInput("cname.test.com", CNAME, Some(100), CNAMEData(Fqdn("testing.test.com")))
-      val changeADotted = AddChangeInput("adot.test.com.", A, Some(100), AData("1.1.1.1"))
+        AddChangeInput("cname.test.com", CNAME, None, Some(100), CNAMEData(Fqdn("testing.test.com")))
+      val changeADotted = AddChangeInput("adot.test.com.", A, None, Some(100), AData("1.1.1.1"))
       val changeAAAADotted =
-        AddChangeInput("aaaadot.test.com.", AAAA, Some(3600), AAAAData("1:2:3:4:5:6:7:8"))
+        AddChangeInput("aaaadot.test.com.", AAAA, None, Some(3600), AAAAData("1:2:3:4:5:6:7:8"))
       val changeCnameDotted =
-        AddChangeInput("cnamedot.test.com.", CNAME, Some(100), CNAMEData(Fqdn("testing.test.com.")))
+        AddChangeInput("cnamedot.test.com.", CNAME, None, Some(100), CNAMEData(Fqdn("testing.test.com.")))
 
       val input = BatchChangeInput(
         None,
@@ -58,7 +58,7 @@ class BatchChangeInputSpec extends AnyWordSpec with Matchers {
   }
   "asNewStoredChange" should {
     "Convert an AddChangeInput into SingleAddChange" in {
-      val changeA = AddChangeInput("some.test.com", A, None, AData("1.1.1.1"))
+      val changeA = AddChangeInput("some.test.com", A, None, None, AData("1.1.1.1"))
       val converted = changeA.asNewStoredChange(
         NonEmptyList.of(ZoneDiscoveryError("test")),
         VinylDNSTestHelpers.defaultTtl
@@ -80,7 +80,7 @@ class BatchChangeInputSpec extends AnyWordSpec with Matchers {
       asAdd.recordSetId shouldBe None
     }
     "Convert a DeleteChangeInput into SingleDeleteRRSetChange" in {
-      val changeA = DeleteRRSetChangeInput("some.test.com", A)
+      val changeA = DeleteRRSetChangeInput("some.test.com", A, None)
       val converted = changeA.asNewStoredChange(
         NonEmptyList.of(ZoneDiscoveryError("test")),
         VinylDNSTestHelpers.defaultTtl
@@ -111,14 +111,14 @@ class BatchChangeInputSpec extends AnyWordSpec with Matchers {
         1234,
         AData("1.2.3.4"),
         SingleChangeStatus.NeedsReview,
-        Some("msg"),
+        None,
         None,
         None,
         List(SingleChangeError(DomainValidationErrorType.ZoneDiscoveryError, "test err"))
       )
 
       val expectedAddChange =
-        AddChangeInput("testRname.testZoneName.", A, Some(1234), AData("1.2.3.4"))
+        AddChangeInput("testRname.testZoneName.", A, None, Some(1234), AData("1.2.3.4"))
 
       val singleDelChange = SingleDeleteRRSetChange(
         Some("testZoneId"),
@@ -128,14 +128,14 @@ class BatchChangeInputSpec extends AnyWordSpec with Matchers {
         A,
         None,
         SingleChangeStatus.NeedsReview,
-        Some("msg"),
+        None,
         None,
         None,
         List(SingleChangeError(DomainValidationErrorType.ZoneDiscoveryError, "test err"))
       )
 
       val expectedDelChange =
-        DeleteRRSetChangeInput("testRname.testZoneName.", A)
+        DeleteRRSetChangeInput("testRname.testZoneName.", A, None)
 
       val change = BatchChange(
         "userId",
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 843d9e28a..0cb423d64 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
@@ -81,34 +81,36 @@ class BatchChangeServiceSpec
   )
   private val ttl = Some(200L)
 
-  private val apexAddA = AddChangeInput("apex.test.com", RecordType.A, ttl, AData("1.1.1.1"))
+  private val apexAddA = AddChangeInput("apex.test.com", RecordType.A, None, ttl, AData("1.1.1.1"))
   private val nonApexAddA =
-    AddChangeInput("non-apex.test.com", RecordType.A, ttl, AData("1.1.1.1"))
+    AddChangeInput("non-apex.test.com", RecordType.A, None, ttl, AData("1.1.1.1"))
   private val onlyApexAddA =
-    AddChangeInput("only.apex.exists", RecordType.A, ttl, AData("1.1.1.1"))
+    AddChangeInput("only.apex.exists", RecordType.A, None, ttl, AData("1.1.1.1"))
   private val onlyBaseAddAAAA =
-    AddChangeInput("have.only.base", RecordType.AAAA, ttl, AAAAData("1:2:3:4:5:6:7:8"))
-  private val noZoneAddA = AddChangeInput("no.zone.match.", RecordType.A, ttl, AData("1.1.1.1"))
+    AddChangeInput("have.only.base", RecordType.AAAA, None, ttl, AAAAData("1:2:3:4:5:6:7:8"))
+  private val noZoneAddA = AddChangeInput("no.zone.match.", RecordType.A, None, ttl, AData("1.1.1.1"))
   private val dottedAddA =
-    AddChangeInput("dot.ted.apex.test.com", RecordType.A, ttl, AData("1.1.1.1"))
+    AddChangeInput("dot.ted.apex.test.com", RecordType.A, None, ttl, AData("1.1.1.1"))
   private val cnameAdd =
-    AddChangeInput("cname.test.com", RecordType.CNAME, ttl, CNAMEData(Fqdn("testing.test.com.")))
+    AddChangeInput("cname.test.com", RecordType.CNAME, None, ttl, CNAMEData(Fqdn("testing.test.com.")))
   private val cnameApexAdd =
-    AddChangeInput("apex.test.com", RecordType.CNAME, ttl, CNAMEData(Fqdn("testing.test.com.")))
+    AddChangeInput("apex.test.com", RecordType.CNAME, None, ttl, CNAMEData(Fqdn("testing.test.com.")))
   private val cnameReverseAdd = AddChangeInput(
     "cname.55.144.10.in-addr.arpa",
     RecordType.CNAME,
+    None,
     ttl,
     CNAMEData(Fqdn("testing.cname.com."))
   )
-  private val ptrAdd = AddChangeInput("10.144.55.11", RecordType.PTR, ttl, PTRData(Fqdn("ptr")))
-  private val ptrAdd2 = AddChangeInput("10.144.55.255", RecordType.PTR, ttl, PTRData(Fqdn("ptr")))
+  private val ptrAdd = AddChangeInput("10.144.55.11", RecordType.PTR, None, ttl, PTRData(Fqdn("ptr")))
+  private val ptrAdd2 = AddChangeInput("10.144.55.255", RecordType.PTR, None, ttl, PTRData(Fqdn("ptr")))
   private val ptrDelegatedAdd =
-    AddChangeInput("192.0.2.193", RecordType.PTR, ttl, PTRData(Fqdn("ptr")))
+    AddChangeInput("192.0.2.193", RecordType.PTR, None, ttl, PTRData(Fqdn("ptr")))
   private val ptrV6Add =
     AddChangeInput(
       "2001:0000:0000:0000:0000:ff00:0042:8329",
       RecordType.PTR,
+      None,
       ttl,
       PTRData(Fqdn("ptr"))
     )
@@ -489,6 +491,7 @@ class BatchChangeServiceSpec
       val ptr = AddChangeInput(
         "2001:0000:0000:0001:0000:ff00:0042:8329",
         RecordType.PTR,
+        None,
         ttl,
         PTRData(Fqdn("ptr"))
       )
@@ -520,6 +523,7 @@ class BatchChangeServiceSpec
       val ptr = AddChangeInput(
         "2001:0000:0000:0001:0000:ff00:0042:8329",
         RecordType.PTR,
+        None,
         ttl,
         PTRData(Fqdn("ptr"))
       )
@@ -577,12 +581,12 @@ class BatchChangeServiceSpec
     }
 
     "succeed with excluded TTL" in {
-      val noTtl = AddChangeInput("no-ttl-add.test.com", RecordType.A, None, AData("1.1.1.1"))
+      val noTtl = AddChangeInput("no-ttl-add.test.com", RecordType.A, None, None, AData("1.1.1.1"))
       val withTtl =
-        AddChangeInput("with-ttl-add-2.test.com", RecordType.A, Some(900), AData("1.1.1.1"))
-      val noTtlDel = DeleteRRSetChangeInput("non-apex.test.com.", RecordType.TXT)
+        AddChangeInput("with-ttl-add-2.test.com", RecordType.A, None, Some(900), AData("1.1.1.1"))
+      val noTtlDel = DeleteRRSetChangeInput("non-apex.test.com.", RecordType.TXT, None)
       val noTtlUpdate =
-        AddChangeInput("non-apex.test.com.", RecordType.TXT, None, TXTData("hello"))
+        AddChangeInput("non-apex.test.com.", RecordType.TXT, None, None, TXTData("hello"))
 
       val input = BatchChangeInput(None, List(noTtl, withTtl, noTtlDel, noTtlUpdate))
       val result = underTest.applyBatchChange(input, auth, true).value.unsafeRunSync().toOption.get
@@ -1172,7 +1176,7 @@ class BatchChangeServiceSpec
         "0.1.0.0.2.ip6.arpa."
       )
 
-      val ptr = AddChangeInput(ip, RecordType.PTR, ttl, PTRData(Fqdn("ptr."))).validNel
+      val ptr = AddChangeInput(ip, RecordType.PTR, None, ttl, PTRData(Fqdn("ptr."))).validNel
       val underTestPTRZonesList: ExistingZones = underTest.getZonesForRequest(List(ptr)).unsafeRunSync()
 
       val zoneNames = underTestPTRZonesList.zones.map(_.name)
@@ -1198,7 +1202,7 @@ class BatchChangeServiceSpec
       )
 
       val ip = "2001:0db8:0000:0000:0000:ff00:0042:8329"
-      val ptr = AddChangeInput(ip, RecordType.PTR, ttl, PTRData(Fqdn("ptr."))).validNel
+      val ptr = AddChangeInput(ip, RecordType.PTR, None, ttl, PTRData(Fqdn("ptr."))).validNel
       val underTestPTRZonesList: ExistingZones = underTest.getZonesForRequest(List(ptr)).unsafeRunSync()
 
       val zoneNames = underTestPTRZonesList.zones.map(_.name)
@@ -1245,7 +1249,7 @@ class BatchChangeServiceSpec
 
       val ips = ip1 :: ip2s
       val ptrs = ips.map { v6Name =>
-        AddChangeInput(v6Name, RecordType.PTR, ttl, PTRData(Fqdn("ptr."))).validNel
+        AddChangeInput(v6Name, RecordType.PTR, None, ttl, PTRData(Fqdn("ptr."))).validNel
       }
 
       val underTestPTRZonesList: ExistingZones = underTest.getZonesForRequest(ptrs).unsafeRunSync()
@@ -1300,10 +1304,10 @@ class BatchChangeServiceSpec
     "properly discover records in forward zones" in {
       val apex = apexZone.name
 
-      val aApex = AddChangeInput(apex, RecordType.A, ttl, AData("1.2.3.4"))
-      val aNormal = AddChangeInput(s"record.$apex", RecordType.A, ttl, AData("1.2.3.4"))
+      val aApex = AddChangeInput(apex, RecordType.A, None, ttl, AData("1.2.3.4"))
+      val aNormal = AddChangeInput(s"record.$apex", RecordType.A, None, ttl, AData("1.2.3.4"))
       val aDotted =
-        AddChangeInput(s"some.dotted.record.$apex", RecordType.A, ttl, AData("1.2.3.4"))
+        AddChangeInput(s"some.dotted.record.$apex", RecordType.A, None, ttl, AData("1.2.3.4"))
 
       val expected = List(
         AddChangeForValidation(apexZone, apex, aApex, 7200L),
@@ -1322,10 +1326,10 @@ class BatchChangeServiceSpec
     "properly discover TXT records" in {
       val apex = apexZone.name
 
-      val txtApex = AddChangeInput(apex, RecordType.TXT, ttl, TXTData("test"))
-      val txtNormal = AddChangeInput(s"record.$apex", RecordType.TXT, ttl, TXTData("test"))
+      val txtApex = AddChangeInput(apex, RecordType.TXT, None, ttl, TXTData("test"))
+      val txtNormal = AddChangeInput(s"record.$apex", RecordType.TXT, None, ttl, TXTData("test"))
       val txtDotted =
-        AddChangeInput(s"some.dotted.record.$apex", RecordType.TXT, ttl, TXTData("test"))
+        AddChangeInput(s"some.dotted.record.$apex", RecordType.TXT, None, ttl, TXTData("test"))
 
       val expected = List(
         AddChangeForValidation(apexZone, apex, txtApex, 7200L),
@@ -1419,20 +1423,22 @@ class BatchChangeServiceSpec
       val ptrv6ZoneBig = Zone("0.1.0.0.2.ip6.arpa.", "email", id = "ptrv6big")
 
       val smallZoneAdd =
-        AddChangeInput("2001:db8::ff00:42:8329", RecordType.PTR, ttl, PTRData(Fqdn("ptr")))
+        AddChangeInput("2001:db8::ff00:42:8329", RecordType.PTR, None, ttl, PTRData(Fqdn("ptr")))
       val medZoneAdd = AddChangeInput(
         "2001:0db8:0111:0000:0000:ff00:0042:8329",
         RecordType.PTR,
+        None,
         ttl,
         PTRData(Fqdn("ptr"))
       )
       val bigZoneAdd = AddChangeInput(
         "2001:0000:0000:0000:0000:ff00:0042:8329",
         RecordType.PTR,
+        None,
         ttl,
         PTRData(Fqdn("ptr"))
       )
-      val notFoundZoneAdd = AddChangeInput("::1", RecordType.PTR, ttl, PTRData(Fqdn("ptr")))
+      val notFoundZoneAdd = AddChangeInput("::1", RecordType.PTR, None, ttl, PTRData(Fqdn("ptr")))
 
       val ptripv6Adds = List(
         smallZoneAdd.validNel,
@@ -1678,7 +1684,7 @@ class BatchChangeServiceSpec
 
     "return a BatchChange if all data inputs are valid/soft failures and manual review is enabled and owner group ID " +
       "is provided" in {
-      val delete = DeleteRRSetChangeInput("some.test.delete.", RecordType.TXT)
+      val delete = DeleteRRSetChangeInput("some.test.delete.", RecordType.TXT, None)
       val result = underTestManualEnabled
         .buildResponse(
           BatchChangeInput(None, List(apexAddA, onlyBaseAddAAAA, delete), Some("owner-group-ID")),
@@ -1805,7 +1811,7 @@ class BatchChangeServiceSpec
     }
 
     "return a BatchChangeErrorList if all data inputs are valid/soft failures and manual review is disabled" in {
-      val delete = DeleteRRSetChangeInput("some.test.delete.", RecordType.TXT)
+      val delete = DeleteRRSetChangeInput("some.test.delete.", RecordType.TXT, None)
       val result = underTest
         .buildResponse(
           BatchChangeInput(None, List(apexAddA, onlyBaseAddAAAA, delete)),
@@ -1825,7 +1831,7 @@ class BatchChangeServiceSpec
 
     "return a BatchChangeErrorList if all data inputs are valid/soft failures, scheduled, " +
       "and manual review is disabled" in {
-      val delete = DeleteRRSetChangeInput("some.test.delete.", RecordType.TXT)
+      val delete = DeleteRRSetChangeInput("some.test.delete.", RecordType.TXT, None)
       val result = underTest
         .buildResponse(
           BatchChangeInput(
@@ -1872,7 +1878,7 @@ class BatchChangeServiceSpec
 
     "return a BatchChangeErrorList if all data inputs are valid/soft failures, manual review is enabled, " +
       "but batch change allowManualReview attribute is false" in {
-      val delete = DeleteRRSetChangeInput("some.test.delete.", RecordType.TXT)
+      val delete = DeleteRRSetChangeInput("some.test.delete.", RecordType.TXT, None)
       val result = underTestManualEnabled
         .buildResponse(
           BatchChangeInput(None, List(apexAddA, onlyBaseAddAAAA, delete)),
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 aef6bf2f8..bf940d4b0 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
@@ -92,12 +92,12 @@ class BatchChangeValidationsSpec
   private val validAChangeGen: Gen[AddChangeInput] = for {
     fqdn <- domainGenerator
     ip <- validIpv4Gen
-  } yield AddChangeInput(fqdn, RecordType.A, ttl, AData(ip))
+  } yield AddChangeInput(fqdn, RecordType.A, None, ttl, AData(ip))
 
   private val validAAAAChangeGen: Gen[AddChangeInput] = for {
     fqdn <- domainGenerator
     ip <- validIpv6Gen
-  } yield AddChangeInput(fqdn, RecordType.AAAA, ttl, AAAAData(ip))
+  } yield AddChangeInput(fqdn, RecordType.AAAA, None, ttl, AAAAData(ip))
 
   private val validAddChangeForValidationGen: Gen[AddChangeForValidation] = for {
     recordName <- domainComponentGenerator
@@ -107,7 +107,7 @@ class BatchChangeValidationsSpec
   private def generateValidAddChangeForValidation(rs: RecordSet): Gen[AddChangeForValidation] =
     for {
       recordName <- domainComponentGenerator
-      addChangeInput <- AddChangeInput(recordName, rs.typ, Some(rs.ttl), rs.records.head)
+      addChangeInput <- AddChangeInput(recordName, rs.typ, None, Some(rs.ttl), rs.records.head)
     } yield AddChangeForValidation(validZone, recordName, addChangeInput, defaultTtl)
 
   private val recordSetList = List(rsOk, aaaa, aaaaOrigin, abcRecord)
@@ -121,59 +121,59 @@ class BatchChangeValidationsSpec
   private val createPrivateAddChange = AddChangeForValidation(
     okZone,
     "private-create",
-    AddChangeInput("private-create", RecordType.A, ttl, AData("1.1.1.1")),
+    AddChangeInput("private-create", RecordType.A, None, ttl, AData("1.1.1.1")),
     defaultTtl
   )
 
   private val createSharedAddChange = AddChangeForValidation(
     sharedZone,
     "shared-create",
-    AddChangeInput("shared-create", RecordType.A, ttl, AData("1.1.1.1")),
+    AddChangeInput("shared-create", RecordType.A, None, ttl, AData("1.1.1.1")),
     defaultTtl
   )
 
   private val updatePrivateAddChange = AddChangeForValidation(
     okZone,
     "private-update",
-    AddChangeInput("private-update", RecordType.A, ttl, AAAAData("1.2.3.4")),
+    AddChangeInput("private-update", RecordType.A, None, ttl, AAAAData("1.2.3.4")),
     defaultTtl
   )
 
   private val updatePrivateDeleteChange = DeleteRRSetChangeForValidation(
     okZone,
     "private-update",
-    DeleteRRSetChangeInput("private-update", RecordType.A)
+    DeleteRRSetChangeInput("private-update", RecordType.A, None)
   )
 
   private val updateSharedAddChange = AddChangeForValidation(
     sharedZone,
     "shared-update",
-    AddChangeInput("shared-update", RecordType.AAAA, ttl, AAAAData("1:2:3:4:5:6:7:8")),
+    AddChangeInput("shared-update", RecordType.AAAA, None, ttl, AAAAData("1:2:3:4:5:6:7:8")),
     defaultTtl
   )
 
   private val updateSharedDeleteChange = DeleteRRSetChangeForValidation(
     sharedZone,
     "shared-update",
-    DeleteRRSetChangeInput("shared-update", RecordType.AAAA)
+    DeleteRRSetChangeInput("shared-update", RecordType.AAAA, None)
   )
 
   private val deleteSingleRecordChange = DeleteRRSetChangeForValidation(
     sharedZone,
     "shared-update",
-    DeleteRRSetChangeInput("shared-update", RecordType.AAAA, Some(AAAAData("1:0::1")))
+    DeleteRRSetChangeInput("shared-update", RecordType.AAAA, None, Some(AAAAData("1:0::1")))
   )
 
   private val deletePrivateChange = DeleteRRSetChangeForValidation(
     okZone,
     "private-delete",
-    DeleteRRSetChangeInput("private-delete", RecordType.A)
+    DeleteRRSetChangeInput("private-delete", RecordType.A, None)
   )
 
   private val deleteSharedChange = DeleteRRSetChangeForValidation(
     sharedZone,
     "shared-delete",
-    DeleteRRSetChangeInput("shared-delete", RecordType.AAAA)
+    DeleteRRSetChangeInput("shared-delete", RecordType.AAAA, None)
   )
 
   private val validPendingBatchChange = BatchChange(
@@ -201,7 +201,7 @@ class BatchChangeValidationsSpec
     AddChangeForValidation(
       okZone,
       s"$recordName",
-      AddChangeInput(s"$recordName.ok.", RecordType.A, ttl, aData),
+      AddChangeInput(s"$recordName.ok.", RecordType.A, None, ttl, aData),
       defaultTtl
     )
 
@@ -212,7 +212,7 @@ class BatchChangeValidationsSpec
     DeleteRRSetChangeForValidation(
       okZone,
       s"$recordName",
-      DeleteRRSetChangeInput(s"$recordName.ok.", RecordType.A, recordData)
+      DeleteRRSetChangeInput(s"$recordName.ok.", RecordType.A, None, recordData)
     )
 
   property("validateBatchChangeInputSize: should fail if batch has no changes") {
@@ -404,7 +404,7 @@ class BatchChangeValidationsSpec
   ) {
     val input = BatchChangeInput(
       None,
-      List(AddChangeInput("private-create", RecordType.A, ttl, AData("1.1.1.1"))),
+      List(AddChangeInput("private-create", RecordType.A, None, ttl, AData("1.1.1.1"))),
       scheduledTime = Some(Instant.now.truncatedTo(ChronoUnit.MILLIS))
     )
     val bcv =
@@ -426,7 +426,7 @@ class BatchChangeValidationsSpec
   ) {
     val input = BatchChangeInput(
       None,
-      List(AddChangeInput("private-create", RecordType.A, ttl, AData("1.1.1.1"))),
+      List(AddChangeInput("private-create", RecordType.A, None, ttl, AData("1.1.1.1"))),
       scheduledTime = Some(Instant.now.truncatedTo(ChronoUnit.MILLIS).minus(1, ChronoUnit.HOURS))
     )
     val bcv =
@@ -565,21 +565,21 @@ class BatchChangeValidationsSpec
   }
 
   property("validateInputChanges: should fail with mix of success and failure inputs") {
-    val goodNSInput = AddChangeInput("test-ns.example.com.", RecordType.NS, ttl, NSData(Fqdn("some.test.ns.")))
-    val goodNAPTRInput = AddChangeInput("test-naptr.example.com.", RecordType.NAPTR, ttl, NAPTRData(1, 2, "S", "E2U+sip", "!^.*$!sip:jd@corpxyz.com!", Fqdn("target")))
-    val goodSRVInput = AddChangeInput("test-srv.example.com.", RecordType.SRV, ttl, SRVData(1, 2, 3, Fqdn("target.vinyldns.")))
-    val badNSInput = AddChangeInput("test-bad-ns.example.com.", RecordType.NS, ttl, NSData(Fqdn("some.te$st.ns.")))
-    val badNAPTRInput = AddChangeInput("test-bad-naptr.example.com.", RecordType.NAPTR, ttl, NAPTRData(99999, 2, "S", "E2U+sip", "", Fqdn("target")))
-    val badNAPTRFlagInput = AddChangeInput("test-bad-flag-naptr.example.com.", RecordType.NAPTR, ttl, NAPTRData(1, 2, "t", "E2U+sip", "", Fqdn("target")))
-    val badNAPTRRegexpInput = AddChangeInput("test-bad-regexp-naptr.example.com.", RecordType.NAPTR, ttl, NAPTRData(1, 2, "S", "E2U+sip", "dummyregexp", Fqdn("target")))
-    val badSRVInput = AddChangeInput("test-bad-srv.example.com.", RecordType.SRV, ttl, SRVData(99999, 2, 3, Fqdn("target.vinyldns.")))
-    val goodInput = AddChangeInput("test.example.com.", RecordType.A, ttl, AData("1.1.1.1"))
+    val goodNSInput = AddChangeInput("test-ns.example.com.", RecordType.NS, None, ttl, NSData(Fqdn("some.test.ns.")))
+    val goodNAPTRInput = AddChangeInput("test-naptr.example.com.", RecordType.NAPTR, None, ttl, NAPTRData(1, 2, "S", "E2U+sip", "!^.*$!sip:jd@corpxyz.com!", Fqdn("target")))
+    val goodSRVInput = AddChangeInput("test-srv.example.com.", RecordType.SRV, None, ttl, SRVData(1, 2, 3, Fqdn("target.vinyldns.")))
+    val badNSInput = AddChangeInput("test-bad-ns.example.com.", RecordType.NS, None, ttl, NSData(Fqdn("some.te$st.ns.")))
+    val badNAPTRInput = AddChangeInput("test-bad-naptr.example.com.", RecordType.NAPTR, None, ttl, NAPTRData(99999, 2, "S", "E2U+sip", "", Fqdn("target")))
+    val badNAPTRFlagInput = AddChangeInput("test-bad-flag-naptr.example.com.", RecordType.NAPTR, None, ttl, NAPTRData(1, 2, "t", "E2U+sip", "", Fqdn("target")))
+    val badNAPTRRegexpInput = AddChangeInput("test-bad-regexp-naptr.example.com.", RecordType.NAPTR, None, ttl, NAPTRData(1, 2, "S", "E2U+sip", "dummyregexp", Fqdn("target")))
+    val badSRVInput = AddChangeInput("test-bad-srv.example.com.", RecordType.SRV, None, ttl, SRVData(99999, 2, 3, Fqdn("target.vinyldns.")))
+    val goodInput = AddChangeInput("test.example.com.", RecordType.A, None, ttl, AData("1.1.1.1"))
     val goodAAAAInput =
-      AddChangeInput("testAAAA.example.com.", RecordType.AAAA, ttl, AAAAData("1:2:3:4:5:6:7:8"))
+      AddChangeInput("testAAAA.example.com.", RecordType.AAAA, None, ttl, AAAAData("1:2:3:4:5:6:7:8"))
     val invalidDomainNameInput =
-      AddChangeInput("invalidDomainName$", RecordType.A, ttl, AAAAData("1:2:3:4:5:6:7:8"))
+      AddChangeInput("invalidDomainName$", RecordType.A, None, ttl, AAAAData("1:2:3:4:5:6:7:8"))
     val invalidIpv6Input =
-      AddChangeInput("testbad.example.com.", RecordType.AAAA, ttl, AAAAData("invalidIpv6:123"))
+      AddChangeInput("testbad.example.com.", RecordType.AAAA, None, ttl, AAAAData("invalidIpv6:123"))
     val result =
       validateInputChanges(
         List(goodNSInput, goodNAPTRInput, goodSRVInput, goodInput, goodAAAAInput, invalidDomainNameInput, invalidIpv6Input, badNSInput, badNAPTRInput, badNAPTRFlagInput, badNAPTRRegexpInput, badSRVInput),
@@ -601,10 +601,10 @@ class BatchChangeValidationsSpec
 
   property("""validateInputName: should fail with a HighValueDomainError
              |if inputName is a High Value Domain""".stripMargin) {
-    val changeA = AddChangeInput("high-value-domain.foo.", RecordType.A, ttl, AData("1.1.1.1"))
-    val changeIpV4 = AddChangeInput("192.0.2.252", RecordType.PTR, ttl, PTRData(Fqdn("test.")))
+    val changeA = AddChangeInput("high-value-domain.foo.", RecordType.A, None, ttl, AData("1.1.1.1"))
+    val changeIpV4 = AddChangeInput("192.0.2.252", RecordType.PTR, None, ttl, PTRData(Fqdn("test.")))
     val changeIpV6 =
-      AddChangeInput("fd69:27cc:fe91:0:0:0:0:ffff", RecordType.PTR, ttl, PTRData(Fqdn("test.")))
+      AddChangeInput("fd69:27cc:fe91:0:0:0:0:ffff", RecordType.PTR, None, ttl, PTRData(Fqdn("test.")))
 
     val resultA = validateInputName(changeA, false)
     val resultIpV4 = validateInputName(changeIpV4, false)
@@ -621,10 +621,10 @@ class BatchChangeValidationsSpec
 
   property("""validateInputName: should fail with a RecordRequiresManualReview
              |if inputName is matches domain requiring manual review""".stripMargin) {
-    val changeA = AddChangeInput("needs-review.foo.", RecordType.A, ttl, AData("1.1.1.1"))
-    val changeIpV4 = AddChangeInput("192.0.2.254", RecordType.PTR, ttl, PTRData(Fqdn("test.")))
+    val changeA = AddChangeInput("needs-review.foo.", RecordType.A, None, ttl, AData("1.1.1.1"))
+    val changeIpV4 = AddChangeInput("192.0.2.254", RecordType.PTR, None, ttl, PTRData(Fqdn("test.")))
     val changeIpV6 =
-      AddChangeInput("fd69:27cc:fe91:0:0:0:ffff:1", RecordType.PTR, ttl, PTRData(Fqdn("test.")))
+      AddChangeInput("fd69:27cc:fe91:0:0:0:ffff:1", RecordType.PTR, None, ttl, PTRData(Fqdn("test.")))
 
     val resultA = validateInputName(changeA, false)
     val resultIpV4 = validateInputName(changeIpV4, false)
@@ -640,14 +640,14 @@ class BatchChangeValidationsSpec
   }
 
   property("doesNotRequireManualReview: should succeed if user is reviewing") {
-    val changeA = AddChangeInput("needs-review.foo.", RecordType.A, ttl, AData("1.1.1.1"))
+    val changeA = AddChangeInput("needs-review.foo.", RecordType.A, None, ttl, AData("1.1.1.1"))
     validateInputName(changeA, true) should beValid(())
   }
 
   property("""zoneDoesNotRequireManualReview: should fail with RecordRequiresManualReview
              |if zone name matches domain requiring manual review""".stripMargin) {
     val addChangeInput =
-      AddChangeInput("not-allowed.zone.NEEDS.review", RecordType.A, ttl, AData("1.1.1.1"))
+      AddChangeInput("not-allowed.zone.NEEDS.review", RecordType.A, None, ttl, AData("1.1.1.1"))
     val addChangeForValidation = AddChangeForValidation(
       Zone("Zone.needs.review", "some@email.com"),
       "not-allowed",
@@ -662,7 +662,7 @@ class BatchChangeValidationsSpec
 
   property("""zoneDoesNotRequireManualReview: should succeed if user is reviewing""") {
     val addChangeInput =
-      AddChangeInput("not-allowed.zone.NEEDS.review", RecordType.A, ttl, AData("1.1.1.1"))
+      AddChangeInput("not-allowed.zone.NEEDS.review", RecordType.A, None, ttl, AData("1.1.1.1"))
     val addChangeForValidation = AddChangeForValidation(
       Zone("Zone.needs.review", "some@email.com"),
       "not-allowed",
@@ -674,7 +674,7 @@ class BatchChangeValidationsSpec
 
   property("""validateInputName: should fail with a DomainValidationError for deletes
              |if validateHostName fails for an invalid domain name""".stripMargin) {
-    val change = DeleteRRSetChangeInput("invalidDomainName$", RecordType.A)
+    val change = DeleteRRSetChangeInput("invalidDomainName$", RecordType.A, None)
     val result = validateInputName(change, false)
     result should haveInvalid[DomainValidationError](InvalidDomainName("invalidDomainName$."))
   }
@@ -682,7 +682,7 @@ class BatchChangeValidationsSpec
   property("""validateInputName: should fail with a DomainValidationError for deletes
              |if validateHostName fails for an invalid domain name length""".stripMargin) {
     val invalidDomainName = Random.alphanumeric.take(256).mkString
-    val change = DeleteRRSetChangeInput(invalidDomainName, RecordType.AAAA)
+    val change = DeleteRRSetChangeInput(invalidDomainName, RecordType.AAAA, None)
     val result = validateInputName(change, false)
     result should haveInvalid[DomainValidationError](InvalidDomainName(s"$invalidDomainName."))
       .and(haveInvalid[DomainValidationError](InvalidLength(s"$invalidDomainName.", 2, 255)))
@@ -691,7 +691,7 @@ class BatchChangeValidationsSpec
   property("""validateInputName: PTR should fail with InvalidIPAddress for deletes
              |if inputName is not a valid ipv4 or ipv6 address""".stripMargin) {
     val invalidIp = "invalidIp.111"
-    val change = DeleteRRSetChangeInput(invalidIp, RecordType.PTR)
+    val change = DeleteRRSetChangeInput(invalidIp, RecordType.PTR, None)
     val result = validateInputName(change, false)
     result should haveInvalid[DomainValidationError](InvalidIPAddress(invalidIp))
   }
@@ -714,7 +714,7 @@ class BatchChangeValidationsSpec
 
   property("""validateAddChangeInput: should fail with a DomainValidationError
              |if validateHostName fails for an invalid domain name""".stripMargin) {
-    val change = AddChangeInput("invalidDomainName$", RecordType.A, ttl, AData("1.1.1.1"))
+    val change = AddChangeInput("invalidDomainName$", RecordType.A, None, ttl, AData("1.1.1.1"))
     val result = validateAddChangeInput(change, false)
     result should haveInvalid[DomainValidationError](InvalidDomainName("invalidDomainName$."))
   }
@@ -722,7 +722,7 @@ class BatchChangeValidationsSpec
   property("""validateAddChangeInput: should fail with a DomainValidationError
              |if validateHostName fails for an invalid domain name length""".stripMargin) {
     val invalidDomainName = Random.alphanumeric.take(256).mkString
-    val change = AddChangeInput(invalidDomainName, RecordType.A, ttl, AData("1.1.1.1"))
+    val change = AddChangeInput(invalidDomainName, RecordType.A, None, ttl, AData("1.1.1.1"))
     val result = validateAddChangeInput(change, false)
     result should haveInvalid[DomainValidationError](InvalidDomainName(s"$invalidDomainName."))
       .and(haveInvalid[DomainValidationError](InvalidLength(s"$invalidDomainName.", 2, 255)))
@@ -733,7 +733,7 @@ class BatchChangeValidationsSpec
   ) {
     forAll(choose[Long](0, 29)) { invalidTTL: Long =>
       val change =
-        AddChangeInput("test.comcast.com.", RecordType.A, Some(invalidTTL), AData("1.1.1.1"))
+        AddChangeInput("test.comcast.com.", RecordType.A, None, Some(invalidTTL), AData("1.1.1.1"))
       val result = validateAddChangeInput(change, false)
       result should haveInvalid[DomainValidationError](
         InvalidTTL(invalidTTL, DomainValidations.TTL_MIN_LENGTH, DomainValidations.TTL_MAX_LENGTH)
@@ -744,7 +744,7 @@ class BatchChangeValidationsSpec
   property("""validateAddChangeInput: should fail with InvalidIpv4Address
              |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 change = AddChangeInput("test.comcast.com.", RecordType.A, None, ttl, AData(invalidIpv4))
     val result = validateAddChangeInput(change, false)
     result should haveInvalid[DomainValidationError](InvalidIpv4Address(invalidIpv4))
   }
@@ -752,14 +752,14 @@ class BatchChangeValidationsSpec
   property("""validateAddChangeInput: should fail with InvalidIpv6Address
              |if validateRecordData fails for an invalid ipv6 address""".stripMargin) {
     val invalidIpv6 = "invalidIpv6:123"
-    val change = AddChangeInput("test.comcast.com.", RecordType.AAAA, ttl, AAAAData(invalidIpv6))
+    val change = AddChangeInput("test.comcast.com.", RecordType.AAAA, None, ttl, AAAAData(invalidIpv6))
     val result = validateAddChangeInput(change, false)
     result should haveInvalid[DomainValidationError](InvalidIpv6Address(invalidIpv6))
   }
 
   property("validateAddChangeInput: should fail if A inputName includes a reverse zone address") {
     val invalidInputName = "test.1.2.3.in-addr.arpa."
-    val badAChange = AddChangeInput(invalidInputName, RecordType.A, ttl, AData("1.1.1.1"))
+    val badAChange = AddChangeInput(invalidInputName, RecordType.A, None, ttl, AData("1.1.1.1"))
     val result = validateAddChangeInput(badAChange, false)
     result should haveInvalid[DomainValidationError](
       RecordInReverseZoneError(invalidInputName, RecordType.A.toString)
@@ -769,7 +769,7 @@ class BatchChangeValidationsSpec
   property("validateAddChangeInput: should fail if AAAA inputName includes a reverse zone address") {
     val invalidInputName = "test.1.2.3.ip6.arpa."
     val badAAAAChange =
-      AddChangeInput(invalidInputName, RecordType.AAAA, ttl, AAAAData("1:2:3:4:5:6:7:8"))
+      AddChangeInput(invalidInputName, RecordType.AAAA, None, ttl, AAAAData("1:2:3:4:5:6:7:8"))
     val result = validateAddChangeInput(badAAAAChange, false)
     result should haveInvalid[DomainValidationError](
       RecordInReverseZoneError(invalidInputName, RecordType.AAAA.toString)
@@ -783,6 +783,7 @@ class BatchChangeValidationsSpec
       AddChangeInput(
         "test.comcast.com.",
         RecordType.CNAME,
+        None,
         ttl,
         CNAMEData(Fqdn(invalidCNAMERecordData))
       )
@@ -798,6 +799,7 @@ class BatchChangeValidationsSpec
       AddChangeInput(
         "test.comcast.com.",
         RecordType.CNAME,
+        None,
         ttl,
         CNAMEData(Fqdn(invalidCNAMERecordData))
       )
@@ -813,6 +815,7 @@ class BatchChangeValidationsSpec
       AddChangeInput(
         "test.comcast.com.",
         RecordType.CNAME,
+        None,
         ttl,
         CNAMEData(Fqdn(invalidCNAMERecordData))
       )
@@ -826,7 +829,7 @@ class BatchChangeValidationsSpec
   property("""validateAddChangeInput: PTR should fail with InvalidIPAddress
              |if inputName is not a valid ipv4 or ipv6 address""".stripMargin) {
     val invalidIp = "invalidip.111."
-    val change = AddChangeInput(invalidIp, RecordType.PTR, ttl, PTRData(Fqdn("test.comcast.com")))
+    val change = AddChangeInput(invalidIp, RecordType.PTR, None, ttl, PTRData(Fqdn("test.comcast.com")))
     val result = validateAddChangeInput(change, false)
 
     result should haveInvalid[DomainValidationError](InvalidIPAddress(invalidIp))
@@ -834,7 +837,7 @@ class BatchChangeValidationsSpec
 
   property("validateAddChangeInput: should fail with InvalidDomainName for invalid PTR record data") {
     val invalidPTRDname = "*invalidptrdname"
-    val change = AddChangeInput("4.5.6.7", RecordType.PTR, ttl, PTRData(Fqdn(invalidPTRDname)))
+    val change = AddChangeInput("4.5.6.7", RecordType.PTR, None, ttl, PTRData(Fqdn(invalidPTRDname)))
     val result = validateAddChangeInput(change, false)
 
     result should haveInvalid[DomainValidationError](InvalidDomainName(s"$invalidPTRDname."))
@@ -848,43 +851,43 @@ class BatchChangeValidationsSpec
     val addNsRecord = AddChangeForValidation(
       okZone,
       "ns-add",
-      AddChangeInput("ns-add.ok.", RecordType.NS, ttl, NSData(Fqdn("some.test.ns."))),
+      AddChangeInput("ns-add.ok.", RecordType.NS, None, ttl, NSData(Fqdn("some.test.ns."))),
       defaultTtl
     )
     val addNaptrRecord = AddChangeForValidation(
       okZone,
       "naptr-add",
-      AddChangeInput("naptr-add.ok.", RecordType.NAPTR, ttl, NAPTRData(1, 2, "S", "E2U+sip", "", Fqdn("target"))),
+      AddChangeInput("naptr-add.ok.", RecordType.NAPTR, None, ttl, NAPTRData(1, 2, "S", "E2U+sip", "", Fqdn("target"))),
       defaultTtl
     )
     val addSrvRecord = AddChangeForValidation(
       okZone,
       "srv-add",
-      AddChangeInput("srv-add.ok.", RecordType.SRV, ttl, SRVData(1, 2, 3, Fqdn("target.vinyldns."))),
+      AddChangeInput("srv-add.ok.", RecordType.SRV, None, ttl, SRVData(1, 2, 3, Fqdn("target.vinyldns."))),
       defaultTtl
     )
     val addA1 = AddChangeForValidation(
       authZone,
       "valid",
-      AddChangeInput("valid.ok.", RecordType.A, ttl, AData("1.1.1.1")),
+      AddChangeInput("valid.ok.", RecordType.A, None, ttl, AData("1.1.1.1")),
       defaultTtl
     )
     val existingA = AddChangeForValidation(
       authZone,
       "existingA",
-      AddChangeInput("existingA.ok.", RecordType.A, ttl, AData("1.1.1.1")),
+      AddChangeInput("existingA.ok.", RecordType.A, None, ttl, AData("1.1.1.1")),
       defaultTtl
     )
     val existingCname = AddChangeForValidation(
       authZone,
       "existingCname",
-      AddChangeInput("existingCname.ok.", RecordType.CNAME, ttl, CNAMEData(Fqdn("cname"))),
+      AddChangeInput("existingCname.ok.", RecordType.CNAME, None, ttl, CNAMEData(Fqdn("cname"))),
       defaultTtl
     )
     val addA2 = AddChangeForValidation(
       okZone,
       "valid2",
-      AddChangeInput("valid2.ok.", RecordType.A, ttl, AData("1.1.1.1")),
+      AddChangeInput("valid2.ok.", RecordType.A, None, ttl, AData("1.1.1.1")),
       defaultTtl
     )
     val duplicateNameCname = AddChangeForValidation(
@@ -893,6 +896,7 @@ class BatchChangeValidationsSpec
       AddChangeInput(
         "199.2.0.192.in-addr.arpa.",
         RecordType.CNAME,
+        None,
         ttl,
         CNAMEData(Fqdn("199.192/30.2.0.192.in-addr.arpa"))
       ),
@@ -901,7 +905,7 @@ class BatchChangeValidationsSpec
     val duplicateNamePTR = AddChangeForValidation(
       reverseZone,
       "199",
-      AddChangeInput("192.0.2.199", RecordType.PTR, ttl, PTRData(Fqdn("ptr.ok."))),
+      AddChangeInput("192.0.2.199", RecordType.PTR, None, ttl, PTRData(Fqdn("ptr.ok."))),
       defaultTtl
     )
 
@@ -1051,13 +1055,13 @@ class BatchChangeValidationsSpec
     val addUpdateA = AddChangeForValidation(
       okZone.addACLRule(writeAcl),
       "update",
-      AddChangeInput("update.ok.", RecordType.A, ttl, AData("1.2.3.4")),
+      AddChangeInput("update.ok.", RecordType.A, None, ttl, AData("1.2.3.4")),
       defaultTtl
     )
     val deleteUpdateA = DeleteRRSetChangeForValidation(
       okZone.addACLRule(writeAcl),
       "update",
-      DeleteRRSetChangeInput("update.ok.", RecordType.A)
+      DeleteRRSetChangeInput("update.ok.", RecordType.A, None)
     )
     val result = validateChangesWithContext(
       ChangeForValidationMap(
@@ -1082,13 +1086,13 @@ class BatchChangeValidationsSpec
     val addUpdateA = AddChangeForValidation(
       okZone.addACLRule(readAcl),
       "update",
-      AddChangeInput("update.ok.", RecordType.A, ttl, AData("1.2.3.4")),
+      AddChangeInput("update.ok.", RecordType.A, None, ttl, AData("1.2.3.4")),
       defaultTtl
     )
     val deleteUpdateA = DeleteRRSetChangeForValidation(
       okZone.addACLRule(readAcl),
       "update",
-      DeleteRRSetChangeInput("update.ok.", RecordType.A)
+      DeleteRRSetChangeInput("update.ok.", RecordType.A, None)
     )
     val result = validateChangesWithContext(
       ChangeForValidationMap(
@@ -1183,14 +1187,14 @@ class BatchChangeValidationsSpec
     val addUpdateA = AddChangeForValidation(
       sharedZone,
       "mx",
-      AddChangeInput("mx.shared.", RecordType.MX, ttl, MXData(200, Fqdn("mx"))),
+      AddChangeInput("mx.shared.", RecordType.MX, None, ttl, MXData(200, Fqdn("mx"))),
       defaultTtl
     )
     val deleteUpdateA =
       DeleteRRSetChangeForValidation(
         sharedZone,
         "mx",
-        DeleteRRSetChangeInput("mx.shared.", RecordType.MX)
+        DeleteRRSetChangeInput("mx.shared.", RecordType.MX, None)
       )
     val result = validateChangesWithContext(
       ChangeForValidationMap(
@@ -1214,7 +1218,7 @@ class BatchChangeValidationsSpec
     val deleteCnameRRSet = DeleteRRSetChangeForValidation(
       okZone,
       "deleteRRSet",
-      DeleteRRSetChangeInput("deleteRRSet.ok.", RecordType.CNAME)
+      DeleteRRSetChangeInput("deleteRRSet.ok.", RecordType.CNAME, None)
     )
     val deleteCnameEntry = DeleteRRSetChangeForValidation(
       okZone,
@@ -1222,6 +1226,7 @@ class BatchChangeValidationsSpec
       DeleteRRSetChangeInput(
         "deleteRecord.ok.",
         RecordType.CNAME,
+        None,
         Some(CNAMEData(Fqdn("cname.data.")))
       )
     )
@@ -1327,13 +1332,13 @@ class BatchChangeValidationsSpec
     val addCname = AddChangeForValidation(
       validZone,
       "existingCname",
-      AddChangeInput("existingCname.ok.", RecordType.CNAME, ttl, CNAMEData(Fqdn("cname"))),
+      AddChangeInput("existingCname.ok.", RecordType.CNAME, None, ttl, CNAMEData(Fqdn("cname"))),
       defaultTtl
     )
     val deleteA = DeleteRRSetChangeForValidation(
       validZone,
       "existingCname",
-      DeleteRRSetChangeInput("existingCname.ok.", RecordType.A)
+      DeleteRRSetChangeInput("existingCname.ok.", RecordType.A, None)
     )
     val existingA = rsOk.copy(zoneId = addCname.zone.id, name = addCname.recordName)
     val newRecordSetList = existingA :: recordSetList
@@ -1356,7 +1361,7 @@ class BatchChangeValidationsSpec
     val addCname = AddChangeForValidation(
       validZone,
       "existingCname",
-      AddChangeInput("existingCname.ok.", RecordType.CNAME, ttl, CNAMEData(Fqdn("cname"))),
+      AddChangeInput("existingCname.ok.", RecordType.CNAME, None, ttl, CNAMEData(Fqdn("cname"))),
       defaultTtl
     )
     val existingA = rsOk.copy(zoneId = addCname.zone.id, name = addCname.recordName)
@@ -1378,13 +1383,13 @@ class BatchChangeValidationsSpec
     val addCname = AddChangeForValidation(
       validIp4ReverseZone,
       "30",
-      AddChangeInput("30.2.0.192.in-addr.arpa.", RecordType.CNAME, ttl, CNAMEData(Fqdn("cname"))),
+      AddChangeInput("30.2.0.192.in-addr.arpa.", RecordType.CNAME, None, ttl, CNAMEData(Fqdn("cname"))),
       defaultTtl
     )
     val deletePtr = DeleteRRSetChangeForValidation(
       validIp4ReverseZone,
       "30",
-      DeleteRRSetChangeInput("192.0.2.30", RecordType.PTR)
+      DeleteRRSetChangeInput("192.0.2.30", RecordType.PTR, None)
     )
     val ptr4 = ptrIp4.copy(zoneId = validIp4ReverseZone.id)
     val result = validateChangesWithContext(
@@ -1409,6 +1414,7 @@ class BatchChangeValidationsSpec
       AddChangeInput(
         "0.6.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.9.e.f.c.c.7.2.9.6.d.f.ip6.arpa.",
         RecordType.CNAME,
+        None,
         ttl,
         CNAMEData(Fqdn("cname"))
       ),
@@ -1432,19 +1438,19 @@ class BatchChangeValidationsSpec
     val addA = AddChangeForValidation(
       okZone,
       "test",
-      AddChangeInput("test.ok.", RecordType.A, ttl, AData("1.1.1.1")),
+      AddChangeInput("test.ok.", RecordType.A, None, ttl, AData("1.1.1.1")),
       defaultTtl
     )
     val addAAAA = AddChangeForValidation(
       okZone,
       "testAAAA",
-      AddChangeInput("testAAAA.ok.", RecordType.AAAA, ttl, AAAAData("1:2:3:4:5:6:7:8")),
+      AddChangeInput("testAAAA.ok.", RecordType.AAAA, None, ttl, AAAAData("1:2:3:4:5:6:7:8")),
       defaultTtl
     )
     val addCname = AddChangeForValidation(
       okZone,
       "new",
-      AddChangeInput("new.ok.", RecordType.CNAME, ttl, CNAMEData(Fqdn("hey.ok.com."))),
+      AddChangeInput("new.ok.", RecordType.CNAME, None, ttl, CNAMEData(Fqdn("hey.ok.com."))),
       defaultTtl
     )
     val result = validateChangesWithContext(
@@ -1467,19 +1473,19 @@ class BatchChangeValidationsSpec
     val addA = AddChangeForValidation(
       okZone,
       "test",
-      AddChangeInput("test.ok.", RecordType.A, ttl, AData("1.1.1.1")),
+      AddChangeInput("test.ok.", RecordType.A, None, ttl, AData("1.1.1.1")),
       defaultTtl
     )
     val addDuplicateCname = AddChangeForValidation(
       okZone,
       "testAAAA",
-      AddChangeInput("testAAAA.ok.", RecordType.CNAME, ttl, CNAMEData(Fqdn("hey.ok.com."))),
+      AddChangeInput("testAAAA.ok.", RecordType.CNAME, None, ttl, CNAMEData(Fqdn("hey.ok.com."))),
       defaultTtl
     )
     val addAAAA = AddChangeForValidation(
       okZone,
       "testAAAA",
-      AddChangeInput("testAAAA.ok.", RecordType.AAAA, ttl, AAAAData("1:2:3:4:5:6:7:8")),
+      AddChangeInput("testAAAA.ok.", RecordType.AAAA, None, ttl, AAAAData("1:2:3:4:5:6:7:8")),
       defaultTtl
     )
     val result = validateChangesWithContext(
@@ -1507,19 +1513,19 @@ class BatchChangeValidationsSpec
     val addA = AddChangeForValidation(
       okZone,
       "test",
-      AddChangeInput("test.ok.", RecordType.A, ttl, AData("1.1.1.1")),
+      AddChangeInput("test.ok.", RecordType.A, None, ttl, AData("1.1.1.1")),
       defaultTtl
     )
     val addCname = AddChangeForValidation(
       okZone,
       "testAAAA",
-      AddChangeInput("testAAAA.ok.", RecordType.CNAME, ttl, CNAMEData(Fqdn("hey.ok.com."))),
+      AddChangeInput("testAAAA.ok.", RecordType.CNAME, None, ttl, CNAMEData(Fqdn("hey.ok.com."))),
       defaultTtl
     )
     val addDuplicateCname = AddChangeForValidation(
       okZone,
       "testAAAA",
-      AddChangeInput("testAAAA.ok.", RecordType.CNAME, ttl, CNAMEData(Fqdn("hey2.ok.com."))),
+      AddChangeInput("testAAAA.ok.", RecordType.CNAME, None, ttl, CNAMEData(Fqdn("hey2.ok.com."))),
       defaultTtl
     )
     val result = validateChangesWithContext(
@@ -1549,19 +1555,19 @@ class BatchChangeValidationsSpec
     val addA = AddChangeForValidation(
       okZone,
       "test",
-      AddChangeInput("test.ok.", RecordType.A, ttl, AData("1.1.1.1")),
+      AddChangeInput("test.ok.", RecordType.A, None, ttl, AData("1.1.1.1")),
       defaultTtl
     )
     val addPtr = AddChangeForValidation(
       okZone,
       "193",
-      AddChangeInput("192.0.2.193", RecordType.PTR, ttl, PTRData(Fqdn("test.ok."))),
+      AddChangeInput("192.0.2.193", RecordType.PTR, None, ttl, PTRData(Fqdn("test.ok."))),
       defaultTtl
     )
     val addDuplicatePtr = AddChangeForValidation(
       okZone,
       "193",
-      AddChangeInput("192.0.2.193", RecordType.PTR, ttl, PTRData(Fqdn("hey.ok.com."))),
+      AddChangeInput("192.0.2.193", RecordType.PTR, None, ttl, PTRData(Fqdn("hey.ok.com."))),
       defaultTtl
     )
     val result = validateChangesWithContext(
@@ -1582,7 +1588,7 @@ class BatchChangeValidationsSpec
     val addA = AddChangeForValidation(
       validZone,
       "valid",
-      AddChangeInput("valid.ok.", RecordType.A, ttl, AData("1.1.1.1")),
+      AddChangeInput("valid.ok.", RecordType.A, None, ttl, AData("1.1.1.1")),
       defaultTtl
     )
     val result =
@@ -1602,7 +1608,7 @@ class BatchChangeValidationsSpec
     val addA = AddChangeForValidation(
       validZone,
       "valid",
-      AddChangeInput("valid.ok.", RecordType.A, ttl, AData("1.1.1.1")),
+      AddChangeInput("valid.ok.", RecordType.A, None, ttl, AData("1.1.1.1")),
       defaultTtl
     )
     val result = validateChangesWithContext(
@@ -1628,7 +1634,7 @@ class BatchChangeValidationsSpec
     val addA = AddChangeForValidation(
       validZone.addACLRule(ACLRule(accessLevel = AccessLevel.Write, userId = Some(notAuth.userId))),
       "valid",
-      AddChangeInput("valid.ok.", RecordType.A, ttl, AData("1.1.1.1")),
+      AddChangeInput("valid.ok.", RecordType.A, None, ttl, AData("1.1.1.1")),
       defaultTtl
     )
     val result =
@@ -1671,13 +1677,13 @@ class BatchChangeValidationsSpec
     val addCname = AddChangeForValidation(
       validZone,
       "existing",
-      AddChangeInput("existing.ok.", RecordType.CNAME, ttl, PTRData(Fqdn("orders.vinyldns."))),
+      AddChangeInput("existing.ok.", RecordType.CNAME, None, ttl, PTRData(Fqdn("orders.vinyldns."))),
       defaultTtl
     )
     val addPtr = AddChangeForValidation(
       validZone,
       "existing",
-      AddChangeInput("existing.ok.", RecordType.PTR, ttl, CNAMEData(Fqdn("ptrdname."))),
+      AddChangeInput("existing.ok.", RecordType.PTR, None, ttl, CNAMEData(Fqdn("ptrdname."))),
       defaultTtl
     )
     val result = validateChangesWithContext(
@@ -1698,7 +1704,7 @@ class BatchChangeValidationsSpec
     val deleteA = DeleteRRSetChangeForValidation(
       validZone,
       "Record-exists",
-      DeleteRRSetChangeInput("record-exists.ok.", RecordType.A)
+      DeleteRRSetChangeInput("record-exists.ok.", RecordType.A, None)
     )
     val existingDeleteRecord =
       rsOk.copy(zoneId = deleteA.zone.id, name = deleteA.recordName.toLowerCase)
@@ -1742,7 +1748,7 @@ class BatchChangeValidationsSpec
     val deleteA = DeleteRRSetChangeForValidation(
       validZone,
       "Active-record-status",
-      DeleteRRSetChangeInput("active-record-status", RecordType.A)
+      DeleteRRSetChangeInput("active-record-status", RecordType.A, None)
     )
     val existingDeleteRecord = rsOk.copy(
       zoneId = deleteA.zone.id,
@@ -1768,7 +1774,7 @@ class BatchChangeValidationsSpec
       DeleteRRSetChangeForValidation(
         validZone,
         "valid",
-        DeleteRRSetChangeInput("valid.ok.", RecordType.A)
+        DeleteRRSetChangeInput("valid.ok.", RecordType.A, None)
       )
     val existingDeleteRecord = rsOk.copy(zoneId = deleteA.zone.id, name = deleteA.recordName)
     val result = validateChangesWithContext(
@@ -1790,7 +1796,7 @@ class BatchChangeValidationsSpec
       DeleteRRSetChangeForValidation(
         validZone,
         "valid",
-        DeleteRRSetChangeInput("valid.ok.", RecordType.A)
+        DeleteRRSetChangeInput("valid.ok.", RecordType.A, None)
       )
     val existingDeleteRecord = rsOk.copy(zoneId = deleteA.zone.id, name = deleteA.recordName)
     val result = validateChangesWithContext(
@@ -1821,7 +1827,7 @@ class BatchChangeValidationsSpec
         ACLRule(accessLevel = AccessLevel.Delete, userId = Some(notAuth.userId))
       ),
       "valid",
-      DeleteRRSetChangeInput("valid.ok.", RecordType.A)
+      DeleteRRSetChangeInput("valid.ok.", RecordType.A, None)
     )
     val existingDeleteRecord = rsOk.copy(zoneId = deleteA.zone.id, name = deleteA.recordName)
     val result = validateChangesWithContext(
@@ -1844,7 +1850,7 @@ class BatchChangeValidationsSpec
     val deleteA = DeleteRRSetChangeForValidation(
       validZone.addACLRule(ACLRule(accessLevel = AccessLevel.Write, userId = Some(notAuth.userId))),
       "valid",
-      DeleteRRSetChangeInput("valid.ok.", RecordType.A)
+      DeleteRRSetChangeInput("valid.ok.", RecordType.A, None)
     )
     val existingDeleteRecord = rsOk.copy(zoneId = deleteA.zone.id, name = deleteA.recordName)
     val result = validateChangesWithContext(
@@ -1872,13 +1878,13 @@ class BatchChangeValidationsSpec
     val addDuplicateA = AddChangeForValidation(
       okZone,
       "test",
-      AddChangeInput("test.com.", RecordType.A, ttl, AData("10.1.1.1")),
+      AddChangeInput("test.com.", RecordType.A, None, ttl, AData("10.1.1.1")),
       defaultTtl
     )
     val addDuplicateCname = AddChangeForValidation(
       okZone,
       "test",
-      AddChangeInput("test.com.", RecordType.CNAME, ttl, CNAMEData(Fqdn("thing.com."))),
+      AddChangeInput("test.com.", RecordType.CNAME, None, ttl, CNAMEData(Fqdn("thing.com."))),
       defaultTtl
     )
 
@@ -1886,24 +1892,24 @@ class BatchChangeValidationsSpec
       DeleteRRSetChangeForValidation(
         okZone,
         "delete",
-        DeleteRRSetChangeInput("delete.ok.", RecordType.A)
+        DeleteRRSetChangeInput("delete.ok.", RecordType.A, None)
       )
     val addCname = AddChangeForValidation(
       okZone,
       "delete",
-      AddChangeInput("delete.ok.", RecordType.CNAME, ttl, CNAMEData(Fqdn("thing.com."))),
+      AddChangeInput("delete.ok.", RecordType.CNAME, None, ttl, CNAMEData(Fqdn("thing.com."))),
       defaultTtl
     )
     val addA = AddChangeForValidation(
       okZone,
       "delete-this",
-      AddChangeInput("delete-this.ok.", RecordType.A, ttl, AData("10.1.1.1")),
+      AddChangeInput("delete-this.ok.", RecordType.A, None, ttl, AData("10.1.1.1")),
       defaultTtl
     )
     val deleteCname = DeleteRRSetChangeForValidation(
       okZone,
       "delete",
-      DeleteRRSetChangeInput("delete-this.ok.", RecordType.CNAME)
+      DeleteRRSetChangeInput("delete-this.ok.", RecordType.CNAME, None)
     )
     val existingA = rsOk.copy(zoneId = deleteA.zone.id, name = deleteA.recordName)
     val existingCname =
@@ -1939,29 +1945,29 @@ class BatchChangeValidationsSpec
     val existingA = rsOk.copy(name = "new")
 
     val deleteA =
-      DeleteRRSetChangeForValidation(okZone, "new", DeleteRRSetChangeInput("new.ok.", RecordType.A))
+      DeleteRRSetChangeForValidation(okZone, "new", DeleteRRSetChangeInput("new.ok.", RecordType.A, None))
     val addA = AddChangeForValidation(
       okZone,
       "test",
-      AddChangeInput("test.ok.", RecordType.A, ttl, AData("1.1.1.1")),
+      AddChangeInput("test.ok.", RecordType.A, None, ttl, AData("1.1.1.1")),
       defaultTtl
     )
     val addAAAA = AddChangeForValidation(
       okZone,
       "testAAAA",
-      AddChangeInput("testAAAA.ok.", RecordType.AAAA, ttl, AAAAData("1:2:3:4:5:6:7:8")),
+      AddChangeInput("testAAAA.ok.", RecordType.AAAA, None, ttl, AAAAData("1:2:3:4:5:6:7:8")),
       defaultTtl
     )
     val addCname = AddChangeForValidation(
       okZone,
       "new",
-      AddChangeInput("new.ok.", RecordType.CNAME, ttl, CNAMEData(Fqdn("hey.ok."))),
+      AddChangeInput("new.ok.", RecordType.CNAME, None, ttl, CNAMEData(Fqdn("hey.ok."))),
       defaultTtl
     )
     val addPtr = AddChangeForValidation(
       okZone,
       "193",
-      AddChangeInput("192.0.2.193", RecordType.PTR, ttl, PTRData(Fqdn("test.ok."))),
+      AddChangeInput("192.0.2.193", RecordType.PTR, None, ttl, PTRData(Fqdn("test.ok."))),
       defaultTtl
     )
     val result = validateChangesWithContext(
@@ -1986,24 +1992,24 @@ class BatchChangeValidationsSpec
       DeleteRRSetChangeForValidation(
         okZone,
         "new",
-        DeleteRRSetChangeInput("new.ok.", RecordType.CNAME)
+        DeleteRRSetChangeInput("new.ok.", RecordType.CNAME, None)
       )
     val addA = AddChangeForValidation(
       okZone,
       "test",
-      AddChangeInput("test.ok.", RecordType.A, ttl, AData("1.1.1.1")),
+      AddChangeInput("test.ok.", RecordType.A, None, ttl, AData("1.1.1.1")),
       defaultTtl
     )
     val addAAAA = AddChangeForValidation(
       okZone,
       "new",
-      AddChangeInput("new.ok.", RecordType.AAAA, ttl, AAAAData("1:2:3:4:5:6:7:8")),
+      AddChangeInput("new.ok.", RecordType.AAAA, None, ttl, AAAAData("1:2:3:4:5:6:7:8")),
       defaultTtl
     )
     val addPtr = AddChangeForValidation(
       okZone,
       "193",
-      AddChangeInput("192.0.2.193", RecordType.PTR, ttl, PTRData(Fqdn("test.ok."))),
+      AddChangeInput("192.0.2.193", RecordType.PTR, None, ttl, PTRData(Fqdn("test.ok."))),
       defaultTtl
     )
 
@@ -2029,12 +2035,12 @@ class BatchChangeValidationsSpec
       DeleteRRSetChangeForValidation(
         okZone,
         "new",
-        DeleteRRSetChangeInput("new.ok.", RecordType.CNAME)
+        DeleteRRSetChangeInput("new.ok.", RecordType.CNAME, None)
       )
     val addCname = AddChangeForValidation(
       okZone,
       "new",
-      AddChangeInput("new.ok.", RecordType.CNAME, ttl, CNAMEData(Fqdn("updateData.com"))),
+      AddChangeInput("new.ok.", RecordType.CNAME, None, ttl, CNAMEData(Fqdn("updateData.com"))),
       defaultTtl
     )
     val result = validateChangesWithContext(
@@ -2060,18 +2066,18 @@ class BatchChangeValidationsSpec
     val deleteUpdateCname = DeleteRRSetChangeForValidation(
       okZone,
       "name-conflict",
-      DeleteRRSetChangeInput("existing.ok.", RecordType.CNAME)
+      DeleteRRSetChangeInput("existing.ok.", RecordType.CNAME, None)
     )
     val addUpdateCname = AddChangeForValidation(
       okZone,
       "name-conflict",
-      AddChangeInput("add.ok.", RecordType.CNAME, ttl, CNAMEData(Fqdn("updated.cname."))),
+      AddChangeInput("add.ok.", RecordType.CNAME, None, ttl, CNAMEData(Fqdn("updated.cname."))),
       defaultTtl
     )
     val addCname = AddChangeForValidation(
       okZone,
       "name-conflict",
-      AddChangeInput("add.ok.", RecordType.CNAME, ttl, CNAMEData(Fqdn("new.add.cname."))),
+      AddChangeInput("add.ok.", RecordType.CNAME, None, ttl, CNAMEData(Fqdn("new.add.cname."))),
       defaultTtl
     )
 
@@ -2105,12 +2111,12 @@ class BatchChangeValidationsSpec
     val deletePtr = DeleteRRSetChangeForValidation(
       validIp4ReverseZone,
       "193",
-      DeleteRRSetChangeInput("192.0.2.193", RecordType.PTR)
+      DeleteRRSetChangeInput("192.0.2.193", RecordType.PTR, None)
     )
     val addCname = AddChangeForValidation(
       validIp4ReverseZone,
       "193",
-      AddChangeInput("test.ok.", RecordType.CNAME, ttl, CNAMEData(Fqdn("hey2.there."))),
+      AddChangeInput("test.ok.", RecordType.CNAME, None, ttl, CNAMEData(Fqdn("hey2.there."))),
       defaultTtl
     )
 
@@ -2139,12 +2145,12 @@ class BatchChangeValidationsSpec
     val deletePtr = DeleteRRSetChangeForValidation(
       validIp4ReverseZone,
       "193",
-      DeleteRRSetChangeInput("192.0.2.193", RecordType.PTR)
+      DeleteRRSetChangeInput("192.0.2.193", RecordType.PTR, None)
     )
     val addPtr = AddChangeForValidation(
       validIp4ReverseZone,
       "193",
-      AddChangeInput("192.0.2.193", RecordType.PTR, ttl, PTRData(Fqdn("updateData.com"))),
+      AddChangeInput("192.0.2.193", RecordType.PTR, None, ttl, PTRData(Fqdn("updateData.com"))),
       defaultTtl
     )
     val result = validateChangesWithContext(
@@ -2170,18 +2176,18 @@ class BatchChangeValidationsSpec
     val deleteUpdatePtr = DeleteRRSetChangeForValidation(
       validIp4ReverseZone,
       "193",
-      DeleteRRSetChangeInput("192.0.2.193", RecordType.PTR)
+      DeleteRRSetChangeInput("192.0.2.193", RecordType.PTR, None)
     )
     val addUpdatePtr = AddChangeForValidation(
       validIp4ReverseZone,
       "193",
-      AddChangeInput("192.0.2.193", RecordType.PTR, ttl, PTRData(Fqdn("updated.ptr."))),
+      AddChangeInput("192.0.2.193", RecordType.PTR, None, ttl, PTRData(Fqdn("updated.ptr."))),
       defaultTtl
     )
     val addPtr = AddChangeForValidation(
       validIp4ReverseZone,
       "193",
-      AddChangeInput("192.0.2.193", RecordType.PTR, ttl, PTRData(Fqdn("new.add.ptr."))),
+      AddChangeInput("192.0.2.193", RecordType.PTR, None, ttl, PTRData(Fqdn("new.add.ptr."))),
       defaultTtl
     )
 
@@ -2199,13 +2205,13 @@ class BatchChangeValidationsSpec
   }
 
   property("validateAddChangeInput: should succeed for a valid TXT addChangeInput") {
-    val input = AddChangeInput("txt.ok.", RecordType.TXT, ttl, TXTData("test"))
+    val input = AddChangeInput("txt.ok.", RecordType.TXT, None, ttl, TXTData("test"))
     val result = validateAddChangeInput(input, false)
     result shouldBe valid
   }
 
   property("validateAddChangeInput: should fail for a TXT addChangeInput with empty TXTData") {
-    val input = AddChangeInput("txt.ok.", RecordType.TXT, ttl, TXTData(""))
+    val input = AddChangeInput("txt.ok.", RecordType.TXT, None, ttl, TXTData(""))
     val result = validateAddChangeInput(input, false)
     result should haveInvalid[DomainValidationError](InvalidLength("", 1, 64764))
   }
@@ -2214,20 +2220,20 @@ class BatchChangeValidationsSpec
     "validateAddChangeInput: should fail for a TXT addChangeInput with TXTData that is too many characters"
   ) {
     val txtData = "x" * 64765
-    val input = AddChangeInput("txt.ok.", RecordType.TXT, ttl, TXTData(txtData))
+    val input = AddChangeInput("txt.ok.", RecordType.TXT, None, ttl, TXTData(txtData))
     val result = validateAddChangeInput(input, false)
     result should haveInvalid[DomainValidationError](InvalidLength(txtData, 1, 64764))
   }
 
   property("validateAddChangeInput: should succeed for a valid MX addChangeInput") {
-    val input = AddChangeInput("mx.ok.", RecordType.MX, ttl, MXData(1, Fqdn("foo.bar.")))
+    val input = AddChangeInput("mx.ok.", RecordType.MX, None, ttl, MXData(1, Fqdn("foo.bar.")))
     val result = validateAddChangeInput(input, false)
     result shouldBe valid
   }
 
   property("validateAddChangeInput: should fail for a MX addChangeInput with invalid preference") {
-    val inputSmall = AddChangeInput("mx.ok.", RecordType.MX, ttl, MXData(-1, Fqdn("foo.bar.")))
-    val inputLarge = AddChangeInput("mx.ok.", RecordType.MX, ttl, MXData(1000000, Fqdn("foo.bar.")))
+    val inputSmall = AddChangeInput("mx.ok.", RecordType.MX, None, ttl, MXData(-1, Fqdn("foo.bar.")))
+    val inputLarge = AddChangeInput("mx.ok.", RecordType.MX, None, ttl, MXData(1000000, Fqdn("foo.bar.")))
     val resultSmall = validateAddChangeInput(inputSmall, false)
     val resultLarge = validateAddChangeInput(inputLarge, false)
 
@@ -2252,7 +2258,7 @@ class BatchChangeValidationsSpec
   }
 
   property("validateAddChangeInput: should fail for a MX addChangeInput with invalid exchange") {
-    val input = AddChangeInput("mx.ok.", RecordType.MX, ttl, MXData(1, Fqdn("foo$.bar.")))
+    val input = AddChangeInput("mx.ok.", RecordType.MX, None, ttl, MXData(1, Fqdn("foo$.bar.")))
     val result = validateAddChangeInput(input, false)
     result should haveInvalid[DomainValidationError](InvalidDomainName("foo$.bar."))
   }
@@ -2260,7 +2266,7 @@ class BatchChangeValidationsSpec
   property(
     "validateAddChangeInput: should fail for a MX addChangeInput with invalid preference and exchange"
   ) {
-    val input = AddChangeInput("mx.ok.", RecordType.MX, ttl, MXData(-1, Fqdn("foo$.bar.")))
+    val input = AddChangeInput("mx.ok.", RecordType.MX, None, ttl, MXData(-1, Fqdn("foo$.bar.")))
     val result = validateAddChangeInput(input, false)
     result should haveInvalid[DomainValidationError](
       InvalidMX_NAPTR_SRVData(
@@ -2282,13 +2288,13 @@ class BatchChangeValidationsSpec
   }
 
   property("validateDeleteChangeInput: should succeed for valid data when record data is passed in") {
-    val input = DeleteRRSetChangeInput("a.ok.", RecordType.A, Some(AData("1.1.1.1")))
+    val input = DeleteRRSetChangeInput("a.ok.", RecordType.A, None, Some(AData("1.1.1.1")))
     validateDeleteRRSetChangeInput(input, false) shouldBe valid
   }
 
   property("validateDeleteChangeInput: should fail when invalid record data is passed in") {
     val invalidIp = "invalid IP address"
-    val input = DeleteRRSetChangeInput("a.ok.", RecordType.A, Some(AData(invalidIp)))
+    val input = DeleteRRSetChangeInput("a.ok.", RecordType.A, None, Some(AData(invalidIp)))
     val result = validateDeleteRRSetChangeInput(input, false)
     result should haveInvalid[DomainValidationError](InvalidIpv4Address(invalidIp))
   }
@@ -2303,7 +2309,7 @@ class BatchChangeValidationsSpec
     val addMX = AddChangeForValidation(
       okZone,
       "name-conflict",
-      AddChangeInput("name-conflict", RecordType.MX, ttl, MXData(1, Fqdn("foo.bar."))),
+      AddChangeInput("name-conflict", RecordType.MX, None, ttl, MXData(1, Fqdn("foo.bar."))),
       defaultTtl
     )
 
@@ -2321,13 +2327,13 @@ class BatchChangeValidationsSpec
     val addMx = AddChangeForValidation(
       okZone,
       "name-conflict",
-      AddChangeInput("name-conflict", RecordType.MX, ttl, MXData(1, Fqdn("foo.bar."))),
+      AddChangeInput("name-conflict", RecordType.MX, None, ttl, MXData(1, Fqdn("foo.bar."))),
       defaultTtl
     )
     val addMx2 = AddChangeForValidation(
       okZone,
       "name-conflict",
-      AddChangeInput("name-conflict", RecordType.MX, ttl, MXData(2, Fqdn("foo.bar."))),
+      AddChangeInput("name-conflict", RecordType.MX, None, ttl, MXData(2, Fqdn("foo.bar."))),
       defaultTtl
     )
 
@@ -2350,12 +2356,12 @@ class BatchChangeValidationsSpec
     val deleteMx = DeleteRRSetChangeForValidation(
       okZone,
       "name-conflict",
-      DeleteRRSetChangeInput("name-conflict", RecordType.MX)
+      DeleteRRSetChangeInput("name-conflict", RecordType.MX, None)
     )
     val addMx = AddChangeForValidation(
       okZone,
       "name-conflict",
-      AddChangeInput("name-conflict", RecordType.MX, ttl, MXData(1, Fqdn("foo.bar."))),
+      AddChangeInput("name-conflict", RecordType.MX, None, ttl, MXData(1, Fqdn("foo.bar."))),
       defaultTtl
     )
 
@@ -2545,16 +2551,16 @@ class BatchChangeValidationsSpec
 
     val update1 = updateSharedAddChange.copy(
       inputChange =
-        AddChangeInput("shared-update.shared", RecordType.AAAA, ttl, AAAAData("1:2:3:4:5:6:7:8"))
+        AddChangeInput("shared-update.shared", RecordType.AAAA, None, ttl, AAAAData("1:2:3:4:5:6:7:8"))
     )
     val update2 = updateSharedAddChange.copy(
-      inputChange = AddChangeInput("shared-update.shared", RecordType.AAAA, ttl, AAAAData("1::1"))
+      inputChange = AddChangeInput("shared-update.shared", RecordType.AAAA, None, ttl, AAAAData("1::1"))
     )
     val add1 = createSharedAddChange.copy(
-      inputChange = AddChangeInput("shared-add.shared", RecordType.A, ttl, AData("1.2.3.4"))
+      inputChange = AddChangeInput("shared-add.shared", RecordType.A, None, ttl, AData("1.2.3.4"))
     )
     val add2 = createSharedAddChange.copy(
-      inputChange = AddChangeInput("shared-add.shared", RecordType.A, ttl, AData("5.6.7.8"))
+      inputChange = AddChangeInput("shared-add.shared", RecordType.A, None, ttl, AData("5.6.7.8"))
     )
 
     val result = underTest.validateChangesWithContext(
@@ -2590,35 +2596,35 @@ class BatchChangeValidationsSpec
     val addA = AddChangeForValidation(
       okZone,
       "dotted.a",
-      AddChangeInput("dotted.a.ok.", RecordType.A, ttl, AData("1.1.1.1")),
+      AddChangeInput("dotted.a.ok.", RecordType.A, None, ttl, AData("1.1.1.1")),
       defaultTtl
     )
 
     val addAAAA = AddChangeForValidation(
       okZone,
       "dotted.aaaa",
-      AddChangeInput("dotted.aaaa.ok.", RecordType.AAAA, ttl, AAAAData("1:2:3:4:5:6:7:8")),
+      AddChangeInput("dotted.aaaa.ok.", RecordType.AAAA, None, ttl, AAAAData("1:2:3:4:5:6:7:8")),
       defaultTtl
     )
 
     val addCNAME = AddChangeForValidation(
       okZone,
       "dotted.cname",
-      AddChangeInput("dotted.cname.ok.", RecordType.CNAME, ttl, CNAMEData(Fqdn("foo.com"))),
+      AddChangeInput("dotted.cname.ok.", RecordType.CNAME, None, ttl, CNAMEData(Fqdn("foo.com"))),
       defaultTtl
     )
 
     val addMX = AddChangeForValidation(
       okZone,
       "dotted.mx",
-      AddChangeInput("dotted.mx.ok.", RecordType.MX, ttl, MXData(1, Fqdn("foo.bar."))),
+      AddChangeInput("dotted.mx.ok.", RecordType.MX, None, ttl, MXData(1, Fqdn("foo.bar."))),
       defaultTtl
     )
 
     val addTXT = AddChangeForValidation(
       okZone,
       "dotted.txt",
-      AddChangeInput("dotted.txt.ok.", RecordType.TXT, ttl, TXTData("test")),
+      AddChangeInput("dotted.txt.ok.", RecordType.TXT, None, ttl, TXTData("test")),
       defaultTtl
     )
 
@@ -2649,27 +2655,27 @@ class BatchChangeValidationsSpec
     val deleteA = DeleteRRSetChangeForValidation(
       okZone,
       "existing.dotted.a",
-      DeleteRRSetChangeInput("existing.dotted.a.ok.", RecordType.A)
+      DeleteRRSetChangeInput("existing.dotted.a.ok.", RecordType.A, None)
     )
     val deleteAAAA = DeleteRRSetChangeForValidation(
       okZone,
       "existing.dotted.aaaa",
-      DeleteRRSetChangeInput("existing.dotted.aaaa.ok.", RecordType.AAAA)
+      DeleteRRSetChangeInput("existing.dotted.aaaa.ok.", RecordType.AAAA, None)
     )
     val deleteCname = DeleteRRSetChangeForValidation(
       okZone,
       "existing.dotted.cname",
-      DeleteRRSetChangeInput("existing.dotted.cname.ok.", RecordType.CNAME)
+      DeleteRRSetChangeInput("existing.dotted.cname.ok.", RecordType.CNAME, None)
     )
     val deleteMX = DeleteRRSetChangeForValidation(
       okZone,
       "existing.dotted.mx",
-      DeleteRRSetChangeInput("existing.dotted.mx.ok.", RecordType.MX)
+      DeleteRRSetChangeInput("existing.dotted.mx.ok.", RecordType.MX, None)
     )
     val deleteTXT = DeleteRRSetChangeForValidation(
       okZone,
       "existing.dotted.txt",
-      DeleteRRSetChangeInput("existing.dotted.txt.ok.", RecordType.TXT)
+      DeleteRRSetChangeInput("existing.dotted.txt.ok.", RecordType.TXT, None)
     )
     val result = validateChangesWithContext(
       ChangeForValidationMap(
@@ -2704,33 +2710,33 @@ class BatchChangeValidationsSpec
     val deleteA = DeleteRRSetChangeForValidation(
       okZone,
       "existing.dotted.a",
-      DeleteRRSetChangeInput("existing.dotted.a.ok.", RecordType.A)
+      DeleteRRSetChangeInput("existing.dotted.a.ok.", RecordType.A, None)
     )
     val deleteAAAA = DeleteRRSetChangeForValidation(
       okZone,
       "existing.dotted.aaaa",
-      DeleteRRSetChangeInput("existing.dotted.aaaa.ok.", RecordType.AAAA)
+      DeleteRRSetChangeInput("existing.dotted.aaaa.ok.", RecordType.AAAA, None)
     )
     val deleteCname = DeleteRRSetChangeForValidation(
       okZone,
       "existing.dotted.cname",
-      DeleteRRSetChangeInput("existing.dotted.cname.ok.", RecordType.CNAME)
+      DeleteRRSetChangeInput("existing.dotted.cname.ok.", RecordType.CNAME, None)
     )
     val deleteMX = DeleteRRSetChangeForValidation(
       okZone,
       "existing.dotted.mx",
-      DeleteRRSetChangeInput("existing.dotted.mx.ok.", RecordType.MX)
+      DeleteRRSetChangeInput("existing.dotted.mx.ok.", RecordType.MX, None)
     )
     val deleteTXT = DeleteRRSetChangeForValidation(
       okZone,
       "existing.dotted.txt",
-      DeleteRRSetChangeInput("existing.dotted.txt.ok.", RecordType.TXT)
+      DeleteRRSetChangeInput("existing.dotted.txt.ok.", RecordType.TXT, None)
     )
 
     val addUpdateA = AddChangeForValidation(
       okZone,
       "existing.dotted.a",
-      AddChangeInput("existing.dotted.a.ok.", RecordType.A, ttl, AData("1.2.3.4")),
+      AddChangeInput("existing.dotted.a.ok.", RecordType.A, None, ttl, AData("1.2.3.4")),
       defaultTtl
     )
     val addUpdateAAAA = AddChangeForValidation(
@@ -2739,6 +2745,7 @@ class BatchChangeValidationsSpec
       AddChangeInput(
         "existing.dotted.aaaa.ok.",
         RecordType.AAAA,
+        None,
         Some(700),
         AAAAData("1:2:3:4:5:6:7:8")
       ),
@@ -2750,6 +2757,7 @@ class BatchChangeValidationsSpec
       AddChangeInput(
         "existing.dotted.cname.ok.",
         RecordType.CNAME,
+        None,
         Some(700),
         CNAMEData(Fqdn("test"))
       ),
@@ -2758,13 +2766,13 @@ class BatchChangeValidationsSpec
     val addUpdateMX = AddChangeForValidation(
       okZone,
       "existing.dotted.mx",
-      AddChangeInput("existing.dotted.mx.ok.", RecordType.MX, Some(700), MXData(3, Fqdn("mx"))),
+      AddChangeInput("existing.dotted.mx.ok.", RecordType.MX, None, Some(700), MXData(3, Fqdn("mx"))),
       defaultTtl
     )
     val addUpdateTXT = AddChangeForValidation(
       okZone,
       "existing.dotted.txt",
-      AddChangeInput("existing.dotted.txt.ok.", RecordType.TXT, Some(700), TXTData("testing")),
+      AddChangeInput("existing.dotted.txt.ok.", RecordType.TXT, None, Some(700), TXTData("testing")),
       defaultTtl
     )
 
@@ -2797,17 +2805,17 @@ 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 cnameWithForwardSlash = AddChangeInput("cname.ok.", RecordType.CNAME, None, ttl, CNAMEData(Fqdn("cname/")))
     val result = validateAddChangeInput(cnameWithForwardSlash, false)
     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")))
+    val cname = AddChangeInput("cname.ok.", RecordType.CNAME, None, 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 cnameWithForwardSlash = AddChangeInput("2.0.192.in-addr.arpa.", RecordType.CNAME, None, ttl, CNAMEData(Fqdn("cname/")))
     val result = validateAddChangeInput(cnameWithForwardSlash, true)
     result shouldBe valid
   }
diff --git a/modules/api/src/test/scala/vinyldns/api/route/BatchChangeJsonProtocolSpec.scala b/modules/api/src/test/scala/vinyldns/api/route/BatchChangeJsonProtocolSpec.scala
index 3935418bd..53ad40cb0 100644
--- a/modules/api/src/test/scala/vinyldns/api/route/BatchChangeJsonProtocolSpec.scala
+++ b/modules/api/src/test/scala/vinyldns/api/route/BatchChangeJsonProtocolSpec.scala
@@ -127,15 +127,15 @@ class BatchChangeJsonProtocolSpec
     addCNAMEChangeInputJson
   )
 
-  val addAChangeInput = AddChangeInput("foo.", A, Some(3600), AData("1.1.1.1"))
+  val addAChangeInput = AddChangeInput("foo.", A, None, Some(3600), AData("1.1.1.1"))
 
-  val deleteAChangeInput = DeleteRRSetChangeInput("foo.", A)
+  val deleteAChangeInput = DeleteRRSetChangeInput("foo.", A, None)
 
-  val addAAAAChangeInput = AddChangeInput("bar.", AAAA, Some(1200), AAAAData("1:2:3:4:5:6:7:8"))
+  val addAAAAChangeInput = AddChangeInput("bar.", AAAA, None, Some(1200), AAAAData("1:2:3:4:5:6:7:8"))
 
-  val addCNAMEChangeInput = AddChangeInput("bizz.baz.", CNAME, Some(200), CNAMEData(Fqdn("buzz.")))
+  val addCNAMEChangeInput = AddChangeInput("bizz.baz.", CNAME, None, Some(200), CNAMEData(Fqdn("buzz.")))
 
-  val addPTRChangeInput = AddChangeInput("4.5.6.7", PTR, Some(200), PTRData(Fqdn("test.com.")))
+  val addPTRChangeInput = AddChangeInput("4.5.6.7", PTR, None, Some(200), PTRData(Fqdn("test.com.")))
 
   val fooDiscoveryError = ZoneDiscoveryError("foo.")
 
@@ -211,7 +211,7 @@ class BatchChangeJsonProtocolSpec
       )
       val result = ChangeInputSerializer.fromJson(json).value
 
-      result shouldBe AddChangeInput("foo.", A, None, AData("1.1.1.1"))
+      result shouldBe AddChangeInput("foo.", A, None, None, AData("1.1.1.1"))
     }
 
     "return an error if the record is not specified for add" in {
@@ -250,7 +250,7 @@ class BatchChangeJsonProtocolSpec
 
   "serializing ChangeInputSerializer to JSON" should {
     "successfully serialize valid data for delete" in {
-      val deleteChangeInput = DeleteRRSetChangeInput("foo.", A, Some(AData("1.1.1.1")))
+      val deleteChangeInput = DeleteRRSetChangeInput("foo.", A, None, Some(AData("1.1.1.1")))
       val json: JObject = buildDeleteRRSetInputJson(Some("foo."), Some(A), Some(AData("1.1.1.1")))
       val result = ChangeInputSerializer.toJson(deleteChangeInput)
 

From 5ac0c82c3ddea537f60dd48c6b6fb4bbfb9b8d0c Mon Sep 17 00:00:00 2001
From: Nicholas Spadaccino <37352107+nspadaccino@users.noreply.github.com>
Date: Thu, 18 Jul 2024 12:47:47 -0400
Subject: [PATCH 28/49] Update requirements.txt

requests version 2.32.0 was yanked, 2.32.3 is the latest stable version
---
 modules/api/src/test/functional/requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/api/src/test/functional/requirements.txt b/modules/api/src/test/functional/requirements.txt
index a7336c3f5..1d71a609a 100644
--- a/modules/api/src/test/functional/requirements.txt
+++ b/modules/api/src/test/functional/requirements.txt
@@ -5,8 +5,8 @@ mock==4.0.3
 dnspython==2.6.1
 boto3==1.18.51
 botocore==1.21.51
-requests==2.32.0
+requests==2.32.3
 pytest-xdist==2.4.0
 python-dateutil==2.8.2
 filelock==3.2.0
-pytest-custom_exit_code==0.3.0
\ No newline at end of file
+pytest-custom_exit_code==0.3.0

From 6b832da233536f3eeeccb36f791a9712de60ca30 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Thu, 18 Jul 2024 23:53:48 +0530
Subject: [PATCH 29/49] fix for latency issue in batch change upload

---
 .../api/src/main/resources/application.conf   |  2 +-
 .../MySqlBatchChangeRepository.scala          | 25 +++++++++++--------
 modules/portal/app/models/Meta.scala          |  2 +-
 .../views/dnsChanges/dnsChangeNew.scala.html  |  5 +++-
 .../dns-change/dns-change-new.controller.js   | 16 ++++++++----
 .../lib/dns-change/dns-change.service.js      | 11 ++++++++
 6 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/modules/api/src/main/resources/application.conf b/modules/api/src/main/resources/application.conf
index c1ee28ca9..c87d4af83 100644
--- a/modules/api/src/main/resources/application.conf
+++ b/modules/api/src/main/resources/application.conf
@@ -19,7 +19,7 @@ vinyldns {
   shared-approved-types = ["A", "AAAA", "CNAME", "PTR", "TXT"]
 
   # Batch change settings
-  batch-change-limit = 1000
+  batch-change-limit = 100
   batch-change-limit = ${?BATCH_CHANGE_LIMIT}
   manual-batch-review-enabled = true
   manual-batch-review-enabled = ${?MANUAL_BATCH_REVIEW_ENABLED}
diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlBatchChangeRepository.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlBatchChangeRepository.scala
index f16053de2..7dc843401 100644
--- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlBatchChangeRepository.scala
+++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlBatchChangeRepository.scala
@@ -17,9 +17,9 @@
 package vinyldns.mysql.repository
 
 import java.sql.Timestamp
-
 import cats.data._
 import cats.effect._
+
 import java.time.Instant
 import org.slf4j.LoggerFactory
 import scalikejdbc._
@@ -29,6 +29,10 @@ import vinyldns.core.protobuf.{BatchChangeProtobufConversions, SingleChangeType}
 import vinyldns.core.route.Monitored
 import vinyldns.proto.VinylDNSProto
 
+import scala.concurrent.ExecutionContext.Implicits.global
+import scala.concurrent.duration.DurationInt
+import scala.concurrent.{Await, Future}
+
 /**
   * MySqlBatchChangeRepository implements the JDBC queries that support the APIs defined in BatchChangeRepository.scala
   * BatchChange and SingleChange are stored in RDS as two tables.
@@ -166,8 +170,8 @@ class MySqlBatchChangeRepository
       }
 
     def getBatchFromSingleChangeId(
-        singleChangeId: String
-    )(implicit s: DBSession): Option[BatchChange] =
+                                    singleChangeId: String
+                                  )(implicit s: DBSession): Option[BatchChange] =
       GET_BATCH_CHANGE_METADATA_FROM_SINGLE_CHANGE
         .bind(singleChangeId)
         .map(extractBatchChange(None))
@@ -182,11 +186,9 @@ class MySqlBatchChangeRepository
           batchMeta.copy(changes = changes)
         }
 
-    monitor("repo.BatchChangeJDBC.updateSingleChanges") {
-      IO {
-        logger.info(
-          s"Updating single change statuses: ${singleChanges.map(ch => (ch.id, ch.status))}"
-        )
+    def updateSingleChangeStatus(singleChanges: Seq[SingleChange]): Future[Option[BatchChange]] = {
+      logger.info(s"Updating single change status: ${singleChanges.map(ch => (ch.id, ch.status))}")
+      Future {
         DB.localTx { implicit s =>
           for {
             headChange <- singleChanges.headOption
@@ -194,11 +196,12 @@ class MySqlBatchChangeRepository
             _ = UPDATE_SINGLE_CHANGE.batchByName(batchParams: _*).apply()
             batchChange <- getBatchFromSingleChangeId(headChange.id)
           } yield batchChange
-        }
-      }
+        }}}
+
+    monitor("repo.BatchChangeJDBC.updateSingleChanges") {
+      IO {Await.result(updateSingleChangeStatus(singleChanges), 50.seconds)}
     }
   }
-
   def getSingleChanges(singleChangeIds: List[String]): IO[List[SingleChange]] =
     if (singleChangeIds.isEmpty) {
       IO.pure(List())
diff --git a/modules/portal/app/models/Meta.scala b/modules/portal/app/models/Meta.scala
index b04e18cf0..6bbf18eed 100644
--- a/modules/portal/app/models/Meta.scala
+++ b/modules/portal/app/models/Meta.scala
@@ -32,7 +32,7 @@ object Meta {
     Meta(
       config.getOptional[String]("vinyldns.version").getOrElse("unknown"),
       config.getOptional[Boolean]("shared-display-enabled").getOrElse(false),
-      config.getOptional[Int]("batch-change-limit").getOrElse(1000),
+      config.getOptional[Int]("api.limits.batchchange-routing-max-items-limit").getOrElse(100),
       config.getOptional[Long]("default-ttl").getOrElse(7200L),
       config.getOptional[Boolean]("manual-batch-review-enabled").getOrElse(false),
       config.getOptional[Boolean]("scheduled-changes-enabled").getOrElse(false),
diff --git a/modules/portal/app/views/dnsChanges/dnsChangeNew.scala.html b/modules/portal/app/views/dnsChanges/dnsChangeNew.scala.html
index 712de04c2..4ca86c4c9 100644
--- a/modules/portal/app/views/dnsChanges/dnsChangeNew.scala.html
+++ b/modules/portal/app/views/dnsChanges/dnsChangeNew.scala.html
@@ -326,7 +326,7 @@
                                 <label class="batch-change-csv-label btn btn-default" for="batchChangeCsv" id="batchChangeCsvImportLabel">
                                     <span><span class="glyphicon glyphicon-import"></span> Import CSV</span>
                                 </label>
-                                <input type="file" id="batchChangeCsv" ng-model="csvInput" name="batchChangeCsv" class="batchChangeCsv" ng-change="uploadCSV(createBatchChangeForm.batchChangeCsv.$viewValue)" batch-change-file>
+                                <input type="file" id="batchChangeCsv" ng-model="csvInput" name="batchChangeCsv" class="batchChangeCsv" ng-change="uploadCSV(createBatchChangeForm.batchChangeCsv.$viewValue, batchChangeLimit )" batch-change-file>
                                 <p><a href="https://www.vinyldns.io/portal/dns-changes#dns-change-csv-import" target="_blank" rel="noopener noreferrer">See documentation for sample CSV</a></p>
                             </div>
                             <p ng-if="newBatch.changes.length >= batchChangeLimit">Limit reached. Cannot add more than {{batchChangeLimit}} records per DNS change.</p>
@@ -336,6 +336,9 @@
                                 <button type="button" id="create-batch-changes-button" class="btn btn-primary" ng-click="submitChange(manualReviewEnabled)">Submit</button>
                             </div>
                             <div ng-if="formStatus=='pendingConfirm'" class="pull-right">
+                                <div class="modal fade" id="loader" tabindex="-1" role="dialog" >
+                                    <div class="spinner" ></div>
+                                </div>
                                 <span ng-if="!batchChangeErrors">{{ confirmationPrompt }}</span>
                                 <span ng-if="batchChangeErrors" class="batch-change-error-help">There were errors, please review the highlighted rows and then proceed.</span>
                                 <button class="btn btn-default" ng-click="cancelSubmit()">Cancel</button>
diff --git a/modules/portal/public/lib/dns-change/dns-change-new.controller.js b/modules/portal/public/lib/dns-change/dns-change-new.controller.js
index e5ab61659..5c9ef5b3b 100644
--- a/modules/portal/public/lib/dns-change/dns-change-new.controller.js
+++ b/modules/portal/public/lib/dns-change/dns-change-new.controller.js
@@ -44,6 +44,7 @@
             $scope.manualReviewEnabled;
             $scope.naptrFlags = ["U", "S", "A", "P"];
 
+
             $scope.addSingleChange = function() {
                 $scope.newBatch.changes.push({changeType: "Add", type: "A+PTR"});
                 var changesLength = $scope.newBatch.changes.length;
@@ -161,14 +162,16 @@
                 $scope.alerts.push(alert);
             }
 
-            $scope.uploadCSV = function(file) {
-                parseFile(file).then(function(dataLength){
+            $scope.uploadCSV = function(file, batchChangeLimit) {
+                parseFile(file, batchChangeLimit).then(function(dataLength){
+
                     $scope.alerts.push({type: 'success', content: 'Successfully imported ' + dataLength + ' changes.' });
+
                 }, function(error) {
                     $scope.alerts.push({type: 'danger', content: error});
                 });
 
-                function parseFile(file) {
+                function parseFile(file, batchChangeLimit) {
                   return $q(function(resolve, reject) {
                     if (!file.name.endsWith('.csv')) {
                       reject("Import failed. File should be of ‘.csv’ type.");
@@ -177,7 +180,10 @@
                       var reader = new FileReader();
                       reader.onload = function(e) {
                         var rows = e.target.result.split("\n");
-                        if (rows[0].trim() == "Change Type,Record Type,Input Name,TTL,Record Data") {
+                        $log.log(rows.length , batchChangeLimit)
+                        if(rows.length >= batchChangeLimit)
+                        {reject("Import failed. Cannot add more than " + batchChangeLimit + " records per DNS change.");
+                        } else if (rows[0].trim() == "Change Type,Record Type,Input Name,TTL,Record Data") {
                           $scope.newBatch.changes = [];
                           for(var i = 1; i < rows.length; i++) {
                             var lengthCheck = rows[i].replace(/,+/g, '').trim().length
@@ -186,7 +192,7 @@
                           }
                           $scope.$apply()
                           resolve($scope.newBatch.changes.length);
-                        } else {
+                        }  else {
                           reject("Import failed. CSV header must be: Change Type,Record Type,Input Name,TTL,Record Data");
                         }
                       }
diff --git a/modules/portal/public/lib/dns-change/dns-change.service.js b/modules/portal/public/lib/dns-change/dns-change.service.js
index 8103e1e2d..ea9ebde8f 100644
--- a/modules/portal/public/lib/dns-change/dns-change.service.js
+++ b/modules/portal/public/lib/dns-change/dns-change.service.js
@@ -31,6 +31,17 @@
                 }
                 var url = utilityService.urlBuilder('/api/dnschanges', params);
                 return $http.post(url, data, {headers: utilityService.getCsrfHeader()});
+                let loader = $("#loader");
+                             loader.modal({
+                                           backdrop: "static",
+                                           keyboard: false, //remove option to close with keyboard
+                                           show: true //Display loader!
+                                          })
+                let promis =  $http.post(url, data, {headers: utilityService.getCsrfHeader()});
+                    // Hide loader when api gets response
+                    promis.then(()=>loader.modal("hide"))
+                          .catch(()=>loader.modal("hide"))
+                return promis
             };
 
             this.getBatchChanges = function (maxItems, startFrom, ignoreAccess, approvalStatus, userName, dateTimeRangeStart, dateTimeRangeEnd) {

From 2ea7b0cbf39a03ba1119ecb20a9be1731e2d1e51 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Fri, 19 Jul 2024 10:40:09 +0530
Subject: [PATCH 30/49] resolved tests

---
 .../public/lib/dns-change/dns-change-new.controller.js | 10 +++++-----
 modules/portal/test/models/MetaSpec.scala              |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/portal/public/lib/dns-change/dns-change-new.controller.js b/modules/portal/public/lib/dns-change/dns-change-new.controller.js
index 5c9ef5b3b..11dd9be6a 100644
--- a/modules/portal/public/lib/dns-change/dns-change-new.controller.js
+++ b/modules/portal/public/lib/dns-change/dns-change-new.controller.js
@@ -165,7 +165,7 @@
             $scope.uploadCSV = function(file, batchChangeLimit) {
                 parseFile(file, batchChangeLimit).then(function(dataLength){
 
-                    $scope.alerts.push({type: 'success', content: 'Successfully imported ' + dataLength + ' changes.' });
+                    $scope.alerts.push({type: 'success', content: 'Successfully imported ' + dataLength + ' DNS changes.' });
 
                 }, function(error) {
                     $scope.alerts.push({type: 'danger', content: error});
@@ -180,10 +180,10 @@
                       var reader = new FileReader();
                       reader.onload = function(e) {
                         var rows = e.target.result.split("\n");
-                        $log.log(rows.length , batchChangeLimit)
-                        if(rows.length >= batchChangeLimit)
+                        if(rows.length - 1  > batchChangeLimit)
                         {reject("Import failed. Cannot add more than " + batchChangeLimit + " records per DNS change.");
-                        } else if (rows[0].trim() == "Change Type,Record Type,Input Name,TTL,Record Data") {
+                        } else {
+                        if (rows[0].trim() == "Change Type,Record Type,Input Name,TTL,Record Data") {
                           $scope.newBatch.changes = [];
                           for(var i = 1; i < rows.length; i++) {
                             var lengthCheck = rows[i].replace(/,+/g, '').trim().length
@@ -195,7 +195,7 @@
                         }  else {
                           reject("Import failed. CSV header must be: Change Type,Record Type,Input Name,TTL,Record Data");
                         }
-                      }
+                      }}
                       reader.readAsText(file);
                     }
                   });
diff --git a/modules/portal/test/models/MetaSpec.scala b/modules/portal/test/models/MetaSpec.scala
index 2bea1b3b3..90177278e 100644
--- a/modules/portal/test/models/MetaSpec.scala
+++ b/modules/portal/test/models/MetaSpec.scala
@@ -34,12 +34,12 @@ class MetaSpec extends Specification with Mockito {
       Meta(Configuration.from(config)).sharedDisplayEnabled must beTrue
     }
     "get the batch-change-limit value in config" in {
-      val config = Map("batch-change-limit" -> 21)
+      val config = Map("api.limits.batchchange-routing-max-items-limit" -> 21)
       Meta(Configuration.from(config)).batchChangeLimit must beEqualTo(21)
     }
     "default to 1000 if batch-change-limit is not found" in {
       val config = Map("vinyldns.version" -> "foo-bar")
-      Meta(Configuration.from(config)).batchChangeLimit must beEqualTo(1000)
+      Meta(Configuration.from(config)).batchChangeLimit must beEqualTo(100)
     }
     "get the default-ttl value in config" in {
       val config = Map("default-ttl" -> 7210)

From cb122b15068af8a5aa30f0952923df176af61817 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Fri, 19 Jul 2024 11:18:22 +0530
Subject: [PATCH 31/49] update

---
 modules/portal/app/views/dnsChanges/dnsChangeNew.scala.html     | 2 +-
 .../portal/public/lib/dns-change/dns-change-new.controller.js   | 2 --
 modules/portal/public/lib/dns-change/dns-change.service.js      | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/portal/app/views/dnsChanges/dnsChangeNew.scala.html b/modules/portal/app/views/dnsChanges/dnsChangeNew.scala.html
index 4ca86c4c9..651f707c2 100644
--- a/modules/portal/app/views/dnsChanges/dnsChangeNew.scala.html
+++ b/modules/portal/app/views/dnsChanges/dnsChangeNew.scala.html
@@ -329,7 +329,7 @@
                                 <input type="file" id="batchChangeCsv" ng-model="csvInput" name="batchChangeCsv" class="batchChangeCsv" ng-change="uploadCSV(createBatchChangeForm.batchChangeCsv.$viewValue, batchChangeLimit )" batch-change-file>
                                 <p><a href="https://www.vinyldns.io/portal/dns-changes#dns-change-csv-import" target="_blank" rel="noopener noreferrer">See documentation for sample CSV</a></p>
                             </div>
-                            <p ng-if="newBatch.changes.length >= batchChangeLimit">Limit reached. Cannot add more than {{batchChangeLimit}} records per DNS change.</p>
+                            <p ng-if="newBatch.changes.length > batchChangeLimit">Limit reached. Cannot add more than {{batchChangeLimit}} records per DNS change.</p>
                         </div>
                         <div class="panel-footer clearfix">
                             <div ng-if="formStatus=='pendingSubmit'" class="pull-right">
diff --git a/modules/portal/public/lib/dns-change/dns-change-new.controller.js b/modules/portal/public/lib/dns-change/dns-change-new.controller.js
index 11dd9be6a..2e867c71d 100644
--- a/modules/portal/public/lib/dns-change/dns-change-new.controller.js
+++ b/modules/portal/public/lib/dns-change/dns-change-new.controller.js
@@ -164,9 +164,7 @@
 
             $scope.uploadCSV = function(file, batchChangeLimit) {
                 parseFile(file, batchChangeLimit).then(function(dataLength){
-
                     $scope.alerts.push({type: 'success', content: 'Successfully imported ' + dataLength + ' DNS changes.' });
-
                 }, function(error) {
                     $scope.alerts.push({type: 'danger', content: error});
                 });
diff --git a/modules/portal/public/lib/dns-change/dns-change.service.js b/modules/portal/public/lib/dns-change/dns-change.service.js
index ea9ebde8f..5d84a6abf 100644
--- a/modules/portal/public/lib/dns-change/dns-change.service.js
+++ b/modules/portal/public/lib/dns-change/dns-change.service.js
@@ -30,7 +30,6 @@
                     "allowManualReview": allowManualReview
                 }
                 var url = utilityService.urlBuilder('/api/dnschanges', params);
-                return $http.post(url, data, {headers: utilityService.getCsrfHeader()});
                 let loader = $("#loader");
                              loader.modal({
                                            backdrop: "static",

From 59fd320a5a965b1b8a7db93c84b294ef0eede046 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Tue, 23 Jul 2024 16:54:30 +0530
Subject: [PATCH 32/49] removed future await and increased  akka http timeout
 limit

---
 build/docker/api/application.conf               |  1 +
 modules/api/src/it/resources/application.conf   |  1 +
 modules/api/src/main/resources/application.conf |  1 +
 modules/api/src/universal/conf/application.conf |  1 +
 .../docs/src/main/mdoc/operator/config-api.md   |  1 +
 .../repository/MySqlBatchChangeRepository.scala | 17 +++++------------
 test/api/functional/application.conf            |  1 +
 test/api/integration/application.conf           |  2 +-
 8 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/build/docker/api/application.conf b/build/docker/api/application.conf
index f3d2e8ef2..ae2ec8671 100644
--- a/build/docker/api/application.conf
+++ b/build/docker/api/application.conf
@@ -350,6 +350,7 @@ akka.http {
     # The time period within which the TCP binding process must be completed.
     # Set to `infinite` to disable.
     bind-timeout = 5s
+    request-timeout = 60s
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
diff --git a/modules/api/src/it/resources/application.conf b/modules/api/src/it/resources/application.conf
index dd3b7006e..9a15efdea 100644
--- a/modules/api/src/it/resources/application.conf
+++ b/modules/api/src/it/resources/application.conf
@@ -347,6 +347,7 @@ akka.http {
     # The time period within which the TCP binding process must be completed.
     # Set to `infinite` to disable.
     bind-timeout = 5s
+    request-timeout = 60s
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
diff --git a/modules/api/src/main/resources/application.conf b/modules/api/src/main/resources/application.conf
index c87d4af83..08b230b7d 100644
--- a/modules/api/src/main/resources/application.conf
+++ b/modules/api/src/main/resources/application.conf
@@ -366,6 +366,7 @@ akka.http {
     # The time period within which the TCP binding process must be completed.
     # Set to `infinite` to disable.
     bind-timeout = 5s
+    request-timeout = 60s
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
diff --git a/modules/api/src/universal/conf/application.conf b/modules/api/src/universal/conf/application.conf
index ff70827df..fefbd421a 100644
--- a/modules/api/src/universal/conf/application.conf
+++ b/modules/api/src/universal/conf/application.conf
@@ -351,6 +351,7 @@ akka.http {
     # The time period within which the TCP binding process must be completed.
     # Set to `infinite` to disable.
     bind-timeout = 5s
+    request-timeout = 60s
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
diff --git a/modules/docs/src/main/mdoc/operator/config-api.md b/modules/docs/src/main/mdoc/operator/config-api.md
index 37026de6c..31a77c291 100644
--- a/modules/docs/src/main/mdoc/operator/config-api.md
+++ b/modules/docs/src/main/mdoc/operator/config-api.md
@@ -990,6 +990,7 @@ dotted-hosts = {
         # The time period within which the TCP binding process must be completed.
         # Set to `infinite` to disable.
         bind-timeout = 5s
+        request-timeout = 60s
       
         # Show verbose error messages back to the client
         verbose-error-messages = on
diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlBatchChangeRepository.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlBatchChangeRepository.scala
index 7dc843401..b121be0f5 100644
--- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlBatchChangeRepository.scala
+++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlBatchChangeRepository.scala
@@ -29,10 +29,6 @@ import vinyldns.core.protobuf.{BatchChangeProtobufConversions, SingleChangeType}
 import vinyldns.core.route.Monitored
 import vinyldns.proto.VinylDNSProto
 
-import scala.concurrent.ExecutionContext.Implicits.global
-import scala.concurrent.duration.DurationInt
-import scala.concurrent.{Await, Future}
-
 /**
   * MySqlBatchChangeRepository implements the JDBC queries that support the APIs defined in BatchChangeRepository.scala
   * BatchChange and SingleChange are stored in RDS as two tables.
@@ -185,10 +181,9 @@ class MySqlBatchChangeRepository
             .apply()
           batchMeta.copy(changes = changes)
         }
-
-    def updateSingleChangeStatus(singleChanges: Seq[SingleChange]): Future[Option[BatchChange]] = {
-      logger.info(s"Updating single change status: ${singleChanges.map(ch => (ch.id, ch.status))}")
-      Future {
+    monitor("repo.BatchChangeJDBC.updateSingleChanges") {
+      IO {
+        logger.info(s"Updating single change status: ${singleChanges.map(ch => (ch.id, ch.status))}")
         DB.localTx { implicit s =>
           for {
             headChange <- singleChanges.headOption
@@ -196,12 +191,10 @@ class MySqlBatchChangeRepository
             _ = UPDATE_SINGLE_CHANGE.batchByName(batchParams: _*).apply()
             batchChange <- getBatchFromSingleChangeId(headChange.id)
           } yield batchChange
-        }}}
-
-    monitor("repo.BatchChangeJDBC.updateSingleChanges") {
-      IO {Await.result(updateSingleChangeStatus(singleChanges), 50.seconds)}
+        }}
     }
   }
+
   def getSingleChanges(singleChangeIds: List[String]): IO[List[SingleChange]] =
     if (singleChangeIds.isEmpty) {
       IO.pure(List())
diff --git a/test/api/functional/application.conf b/test/api/functional/application.conf
index e0f35df07..cfb05f9bd 100644
--- a/test/api/functional/application.conf
+++ b/test/api/functional/application.conf
@@ -301,6 +301,7 @@ akka.http {
     # The time period within which the TCP binding process must be completed.
     # Set to `infinite` to disable.
     bind-timeout = 5s
+    request-timeout = 60s
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
diff --git a/test/api/integration/application.conf b/test/api/integration/application.conf
index c09038a85..0434f5692 100644
--- a/test/api/integration/application.conf
+++ b/test/api/integration/application.conf
@@ -359,7 +359,7 @@ akka.http {
     # The time period within which the TCP binding process must be completed.
     # Set to `infinite` to disable.
     bind-timeout = 5s
-
+    request-timeout = 60s
     # Show verbose error messages back to the client
     verbose-error-messages = on
   }

From 393a2f550fbd2b84635114c10970fa07c63d6a10 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Tue, 6 Aug 2024 17:03:38 +0530
Subject: [PATCH 33/49] spinner for record data search

---
 .../app/views/zones/zoneTabs/manageRecords.scala.html |  4 ++++
 .../public/lib/services/records/service.records.js    | 11 ++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/portal/app/views/zones/zoneTabs/manageRecords.scala.html b/modules/portal/app/views/zones/zoneTabs/manageRecords.scala.html
index 450fd4ee9..55f186476 100644
--- a/modules/portal/app/views/zones/zoneTabs/manageRecords.scala.html
+++ b/modules/portal/app/views/zones/zoneTabs/manageRecords.scala.html
@@ -67,6 +67,7 @@
             <div class="col-md-2 pull-right">
                 <form class="input-group remove-bottom-margin" ng-submit="refreshRecords()">
                     <div class="input-group remove-bottom-margin">
+
                         <span class="input-group-btn">
                             <button id="record-search-button" type="submit" class="btn btn-primary"><span class="fa fa-search"></span></button>
                         </span>
@@ -86,6 +87,9 @@
     <div class="panel-body">
         <div class="vinyldns-panel-top">
             <div class="btn-group">
+                <span class="modal fade" id="loader" tabindex="-1" role="dialog" >
+                            <span class="spinner" ></span>
+                        </span>
                 <button id="refresh-records-button" class="btn btn-default" ng-click="refreshRecords()"><span class="fa fa-refresh"></span> Refresh</button>
                 <button id="create-record-button" class="btn btn-default" ng-if="canReadZone && (zoneInfo.accessLevel == 'Delete' || canCreateRecordsViaAcl())" ng-click="createRecord(defaultTtl)"><span class="fa fa-plus"></span> Create Record Set</button>
                 <button id="zone-sync-button" class="btn btn-default mb-control" ng-if="zoneInfo.accessLevel=='Delete'" data-toggle="modal" data-target="#mb-sync"><span class="fa fa-exchange"></span> Sync Zone</button>
diff --git a/modules/portal/public/lib/services/records/service.records.js b/modules/portal/public/lib/services/records/service.records.js
index 42e1d1f2c..8c8a17f75 100644
--- a/modules/portal/public/lib/services/records/service.records.js
+++ b/modules/portal/public/lib/services/records/service.records.js
@@ -77,7 +77,16 @@ angular.module('service.records', [])
                 "recordTypeSort": recordTypeSort
             };
             var url = utilityService.urlBuilder("/api/zones/"+id+"/recordsets", 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.getRecordSet = function (rsid) {

From 978b852df1030a17eb5c6b6a7105ce4e38153e7f Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Fri, 9 Aug 2024 10:01:59 +0530
Subject: [PATCH 34/49] add logs

---
 .../scala/vinyldns/api/backend/CommandHandler.scala    |  4 ++++
 .../scala/vinyldns/api/backend/dns/DnsBackend.scala    |  3 +++
 .../api/domain/batch/BatchChangeConverter.scala        | 10 ++++++++--
 .../vinyldns/api/engine/RecordSetChangeHandler.scala   |  4 +++-
 .../mysql/repository/MySqlBatchChangeRepository.scala  |  4 ++++
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/backend/CommandHandler.scala b/modules/api/src/main/scala/vinyldns/api/backend/CommandHandler.scala
index 797328494..7866da6a2 100644
--- a/modules/api/src/main/scala/vinyldns/api/backend/CommandHandler.scala
+++ b/modules/api/src/main/scala/vinyldns/api/backend/CommandHandler.scala
@@ -164,15 +164,19 @@ object CommandHandler {
       message.command match {
         case sync: ZoneChange
             if sync.changeType == ZoneChangeType.Sync || sync.changeType == ZoneChangeType.AutomatedSync || sync.changeType == ZoneChangeType.Create =>
+          logger.info("In case: ZoneChange sync")
           outcomeOf(message)(zoneSyncProcessor(sync))
 
         case zoneChange: ZoneChange =>
+          logger.info("In case: ZoneChange")
           outcomeOf(message)(zoneChangeProcessor(zoneChange))
 
         case rcr: RecordSetChange =>
+          logger.info("In case: RecordSetChange")
           outcomeOf(message)(recordChangeProcessor(backendResolver.resolve(rcr.zone), rcr))
 
         case bcc: BatchChangeCommand =>
+          logger.info("In case: BatchChangeCommand")
           outcomeOf(message)(batchChangeProcessor(bcc))
       }
     }
diff --git a/modules/api/src/main/scala/vinyldns/api/backend/dns/DnsBackend.scala b/modules/api/src/main/scala/vinyldns/api/backend/dns/DnsBackend.scala
index 8619dbb26..1bcb302af 100644
--- a/modules/api/src/main/scala/vinyldns/api/backend/dns/DnsBackend.scala
+++ b/modules/api/src/main/scala/vinyldns/api/backend/dns/DnsBackend.scala
@@ -181,6 +181,7 @@ class DnsBackend(val id: String, val resolver: DNS.SimpleResolver, val xfrInfo:
     }
 
   private[dns] def addRecord(change: RecordSetChange): IO[DnsResponse] = IO.fromEither {
+    logger.info("In addRecord")
     for {
       change <- recordsArePresent(change)
       addRecord <- toDnsRRset(change.recordSet, change.zone.name)
@@ -190,6 +191,7 @@ class DnsBackend(val id: String, val resolver: DNS.SimpleResolver, val xfrInfo:
   }
 
   private[dns] def updateRecord(change: RecordSetChange): IO[DnsResponse] = IO.fromEither {
+    logger.info("In updateRecord")
     for {
       change <- recordsArePresent(change)
       dnsRecord <- toDnsRRset(change.recordSet, change.zone.name)
@@ -200,6 +202,7 @@ class DnsBackend(val id: String, val resolver: DNS.SimpleResolver, val xfrInfo:
   }
 
   private[dns] def deleteRecord(change: RecordSetChange): IO[DnsResponse] = IO.fromEither {
+    logger.info("In deleteRecord")
     for {
       change <- recordsArePresent(change)
       dnsRecord <- toDnsRRset(change.recordSet, change.zone.name)
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 53e027384..cac4d9ba1 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
@@ -91,7 +91,8 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
   def putChangesOnQueue(
       recordSetChanges: List[RecordSetChange],
       batchChangeId: String
-  ): BatchResult[List[RecordSetChange]] =
+  ): BatchResult[List[RecordSetChange]] = {
+    logger.info("Putting changes to queue")
     recordSetChanges.toNel match {
       case None =>
         recordSetChanges.toRightBatchResult // If list is empty, return normally without queueing
@@ -106,6 +107,7 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
             .toBatchResult
         } yield rscResult
     }
+  }
 
   def updateWithQueueingFailures(
       batchChange: BatchChange,
@@ -142,7 +144,11 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
     val failedAndNotExistsChanges = batchChange.changes.collect {
       case change if change.status == SingleChangeStatus.Failed || change.systemMessage.contains(nonExistentRecordDeleteMessage) || change.systemMessage.contains(nonExistentRecordDataDeleteMessage) => change
     }
-    batchChangeRepo.updateSingleChanges(failedAndNotExistsChanges).as(())
+    logger.info("Storing Queuing failures")
+    val storeChanges = batchChangeRepo.updateSingleChanges(failedAndNotExistsChanges).as(())
+    logger.info("Done saving queuing failures")
+
+    storeChanges
   }.toBatchResult
 
   def createRecordSetChangesForBatch(
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 6fe54b1fb..f28280201 100644
--- a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
+++ b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
@@ -109,7 +109,8 @@ object RecordSetChangeHandler extends TransactionProvider {
   def updateBatchStatuses(
       singleChanges: List[SingleChange],
       recordSetChange: RecordSetChange
-  ): List[SingleChange] =
+  ): List[SingleChange] = {
+    logger.info("Updating Batch Status")
     recordSetChange.status match {
       case RecordSetChangeStatus.Complete =>
         singleChanges.map(_.complete(recordSetChange.id, recordSetChange.recordSet.id))
@@ -117,6 +118,7 @@ object RecordSetChangeHandler extends TransactionProvider {
         singleChanges.map(_.withProcessingError(recordSetChange.systemMessage, recordSetChange.id))
       case _ => singleChanges
     }
+  }
 
   private sealed trait ProcessorState {
     def change: RecordSetChange
diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlBatchChangeRepository.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlBatchChangeRepository.scala
index f16053de2..d79f8614f 100644
--- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlBatchChangeRepository.scala
+++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlBatchChangeRepository.scala
@@ -354,6 +354,7 @@ class MySqlBatchChangeRepository
   private def saveBatchChange(
       batchChange: BatchChange
   )(implicit session: DBSession): BatchChange = {
+    logger.info("Saving Batch Change")
     PUT_BATCH_CHANGE
       .bindByName(
         Seq(
@@ -373,6 +374,7 @@ class MySqlBatchChangeRepository
       )
       .update()
       .apply()
+    logger.info("Done saving Batch Change")
 
     val singleChangesParams = batchChange.changes.zipWithIndex.map {
       case (singleChange, seqNum) =>
@@ -395,7 +397,9 @@ class MySqlBatchChangeRepository
         }
     }
 
+    logger.info("Saving Single Changes")
     PUT_SINGLE_CHANGE.batchByName(singleChangesParams: _*).apply()
+    logger.info("Done saving Single Changes")
     batchChange
   }
 

From 3532c032bfecbf169718d36273b031f1291c2374 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Mon, 12 Aug 2024 17:07:12 +0530
Subject: [PATCH 35/49] add mysql props

---
 build/docker/api/application.conf             |  18 +--
 build/docker/portal/application.conf          |   9 ++
 modules/api/src/it/resources/application.conf |   9 --
 .../api/src/main/resources/application.conf   |  18 +--
 .../api/route/BatchChangeRouting.scala        | 113 ++++++++----------
 .../api/src/test/resources/application.conf   |   9 --
 .../api/src/universal/conf/application.conf   |  18 +--
 .../MySqlBatchChangeRepository.scala          |   4 +
 modules/portal/conf/application.conf          |   9 ++
 .../dns-change/dns-change-new.controller.js   |  15 +--
 test/api/functional/application.conf          |  18 +--
 test/api/integration/application.conf         |  18 +--
 12 files changed, 120 insertions(+), 138 deletions(-)

diff --git a/build/docker/api/application.conf b/build/docker/api/application.conf
index ddab15974..8fde27782 100644
--- a/build/docker/api/application.conf
+++ b/build/docker/api/application.conf
@@ -215,6 +215,15 @@ vinyldns {
       idle-timeout = 150000
       maximum-pool-size = 20
       minimum-idle = 5
+
+      my-sql-properties = {
+          cachePrepStmts=true
+          prepStmtCacheSize=250
+          prepStmtCacheSqlLimit=2048
+          rewriteBatchedStatements=true
+          useServerPrepStmts=true        # Use server-side prepared statements
+          useCompression=true            # Compress data to reduce network load
+      }
     }
 
     # TODO: Remove the need for these useless configuration blocks
@@ -353,15 +362,6 @@ akka.http {
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
-
-    # timeout
-    request-timeout = 30s
-  }
-
-  custom {
-    timeout-response {
-      message = "Successfully submitted DNS changes. Please wait a while for the changes to get processed."
-    }
   }
 
   parsing {
diff --git a/build/docker/portal/application.conf b/build/docker/portal/application.conf
index e691be760..ad76b290a 100644
--- a/build/docker/portal/application.conf
+++ b/build/docker/portal/application.conf
@@ -66,6 +66,15 @@ mysql {
     idle-timeout = 150000
     maximum-pool-size = 20
     minimum-idle = 5
+
+    my-sql-properties = {
+        cachePrepStmts=true
+        prepStmtCacheSize=250
+        prepStmtCacheSqlLimit=2048
+        rewriteBatchedStatements=true
+        useServerPrepStmts=true        # Use server-side prepared statements
+        useCompression=true            # Compress data to reduce network load
+    }
   }
 }
 
diff --git a/modules/api/src/it/resources/application.conf b/modules/api/src/it/resources/application.conf
index 2ce75a4ad..dd3b7006e 100644
--- a/modules/api/src/it/resources/application.conf
+++ b/modules/api/src/it/resources/application.conf
@@ -350,15 +350,6 @@ akka.http {
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
-
-    # timeout
-    request-timeout = 30s
-  }
-
-  custom {
-    timeout-response {
-      message = "Successfully submitted DNS changes. Please wait a while for the changes to get processed."
-    }
   }
 
   parsing {
diff --git a/modules/api/src/main/resources/application.conf b/modules/api/src/main/resources/application.conf
index 9f928bab6..ad8fc7774 100644
--- a/modules/api/src/main/resources/application.conf
+++ b/modules/api/src/main/resources/application.conf
@@ -231,6 +231,15 @@ vinyldns {
       idle-timeout = 150000
       maximum-pool-size = 20
       minimum-idle = 5
+
+      my-sql-properties = {
+          cachePrepStmts=true
+          prepStmtCacheSize=250
+          prepStmtCacheSqlLimit=2048
+          rewriteBatchedStatements=true
+          useServerPrepStmts=true        # Use server-side prepared statements
+          useCompression=true            # Compress data to reduce network load
+      }
     }
 
     # TODO: Remove the need for these useless configuration blocks
@@ -369,15 +378,6 @@ akka.http {
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
-
-    # timeout
-    request-timeout = 30s
-  }
-
-  custom {
-    timeout-response {
-      message = "Successfully submitted DNS changes. Please wait a while for the changes to get processed."
-    }
   }
 
   parsing {
diff --git a/modules/api/src/main/scala/vinyldns/api/route/BatchChangeRouting.scala b/modules/api/src/main/scala/vinyldns/api/route/BatchChangeRouting.scala
index 713cf3674..d4578dc0a 100644
--- a/modules/api/src/main/scala/vinyldns/api/route/BatchChangeRouting.scala
+++ b/modules/api/src/main/scala/vinyldns/api/route/BatchChangeRouting.scala
@@ -18,14 +18,11 @@ package vinyldns.api.route
 
 import akka.http.scaladsl.model._
 import akka.http.scaladsl.server.{RejectionHandler, Route, ValidationRejection}
-import com.typesafe.config.ConfigFactory
 import org.slf4j.{Logger, LoggerFactory}
 import vinyldns.api.config.{LimitsConfig, ManualReviewConfig}
 import vinyldns.api.domain.batch._
 import vinyldns.core.domain.batch._
 
-import scala.concurrent.duration.DurationLong
-
 class BatchChangeRoute(
     batchChangeService: BatchChangeServiceAlgebra,
     limitsConfig: LimitsConfig,
@@ -60,77 +57,65 @@ class BatchChangeRoute(
 
   final private val MAX_ITEMS_LIMIT: Int = limitsConfig.BATCHCHANGE_ROUTING_MAX_ITEMS_LIMIT
 
-  val config = ConfigFactory.load()
-  val requestTimeout = config.getDuration("akka.http.server.request-timeout").toMillis.millis
-  val timeoutMessage = config.getString("akka.http.custom.timeout-response.message")
-  val customTimeoutResponse: HttpRequest => HttpResponse = { _ =>
-    HttpResponse(
-      status = StatusCodes.OK,
-      entity = HttpEntity(ContentTypes.`application/json`, s"""{"message": "$timeoutMessage"}""")
-    )
-  }
-
   val batchChangeRoute: Route = {
     val standardBatchChangeRoutes = path("zones" / "batchrecordchanges") {
-      withRequestTimeout(requestTimeout, request => customTimeoutResponse(request)) {
-        (post & monitor("Endpoint.postBatchChange")) {
-          parameters("allowManualReview".as[Boolean].?(true)) { allowManualReview: Boolean =>
-            authenticateAndExecuteWithEntity[BatchChange, BatchChangeInput](
-              (authPrincipal, batchChangeInput) =>
-                batchChangeService
-                  .applyBatchChange(batchChangeInput, authPrincipal, allowManualReview)
-            ) { chg =>
-              complete(StatusCodes.Accepted, chg)
-            }
+      (post & monitor("Endpoint.postBatchChange")) {
+        parameters("allowManualReview".as[Boolean].?(true)) { allowManualReview: Boolean =>
+          authenticateAndExecuteWithEntity[BatchChange, BatchChangeInput](
+            (authPrincipal, batchChangeInput) =>
+              batchChangeService
+                .applyBatchChange(batchChangeInput, authPrincipal, allowManualReview)
+          ) { chg =>
+            complete(StatusCodes.Accepted, chg)
           }
         }
       } ~
-        (get & monitor("Endpoint.listBatchChangeSummaries")) {
-          parameters(
-            "userName".as[String].?,
-            "dateTimeRangeStart".as[String].?,
-            "dateTimeRangeEnd".as[String].?,
-            "startFrom".as[Int].?,
-            "maxItems".as[Int].?(MAX_ITEMS_LIMIT),
-            "ignoreAccess".as[Boolean].?(false),
-            "approvalStatus".as[String].?
-          ) {
-            (
-                userName: Option[String],
-                dateTimeRangeStart: Option[String],
-                dateTimeRangeEnd: Option[String],
-                startFrom: Option[Int],
-                maxItems: Int,
-                ignoreAccess: Boolean,
-                approvalStatus: Option[String]
-            ) =>
-              {
-                val convertApprovalStatus = approvalStatus.flatMap(BatchChangeApprovalStatus.find)
+      (get & monitor("Endpoint.listBatchChangeSummaries")) {
+        parameters(
+          "userName".as[String].?,
+          "dateTimeRangeStart".as[String].?,
+          "dateTimeRangeEnd".as[String].?,
+          "startFrom".as[Int].?,
+          "maxItems".as[Int].?(MAX_ITEMS_LIMIT),
+          "ignoreAccess".as[Boolean].?(false),
+          "approvalStatus".as[String].?
+        ) {
+          (
+              userName: Option[String],
+              dateTimeRangeStart: Option[String],
+              dateTimeRangeEnd: Option[String],
+              startFrom: Option[Int],
+              maxItems: Int,
+              ignoreAccess: Boolean,
+              approvalStatus: Option[String]
+          ) =>
+            {
+              val convertApprovalStatus = approvalStatus.flatMap(BatchChangeApprovalStatus.find)
 
-                handleRejections(invalidQueryHandler) {
-                  validate(
-                    0 < maxItems && maxItems <= MAX_ITEMS_LIMIT,
-                    s"maxItems was $maxItems, maxItems must be between 1 and $MAX_ITEMS_LIMIT, inclusive."
-                  ) {
-                    authenticateAndExecute(
-                      batchChangeService.listBatchChangeSummaries(
-                        _,
-                        userName,
-                        dateTimeRangeStart,
-                        dateTimeRangeEnd,
-                        startFrom,
-                        maxItems,
-                        ignoreAccess,
-                        convertApprovalStatus
-                      )
-                    ) { summaries =>
-                      complete(StatusCodes.OK, summaries)
-                    }
+              handleRejections(invalidQueryHandler) {
+                validate(
+                  0 < maxItems && maxItems <= MAX_ITEMS_LIMIT,
+                  s"maxItems was $maxItems, maxItems must be between 1 and $MAX_ITEMS_LIMIT, inclusive."
+                ) {
+                  authenticateAndExecute(
+                    batchChangeService.listBatchChangeSummaries(
+                      _,
+                      userName,
+                      dateTimeRangeStart,
+                      dateTimeRangeEnd,
+                      startFrom,
+                      maxItems,
+                      ignoreAccess,
+                      convertApprovalStatus
+                    )
+                  ) { summaries =>
+                    complete(StatusCodes.OK, summaries)
                   }
                 }
               }
-          }
+            }
         }
+      }
     } ~
       path("zones" / "batchrecordchanges" / Segment) { id =>
         (get & monitor("Endpoint.getBatchChange")) {
diff --git a/modules/api/src/test/resources/application.conf b/modules/api/src/test/resources/application.conf
index 018fb9799..93f88e24e 100644
--- a/modules/api/src/test/resources/application.conf
+++ b/modules/api/src/test/resources/application.conf
@@ -338,15 +338,6 @@ akka.http {
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
-
-    # timeout
-    request-timeout = 30s
-  }
-
-  custom {
-    timeout-response {
-      message = "Successfully submitted DNS changes. Please wait a while for the changes to get processed."
-    }
   }
 
   parsing {
diff --git a/modules/api/src/universal/conf/application.conf b/modules/api/src/universal/conf/application.conf
index e917880be..b08be9e2b 100644
--- a/modules/api/src/universal/conf/application.conf
+++ b/modules/api/src/universal/conf/application.conf
@@ -216,6 +216,15 @@ vinyldns {
       idle-timeout = 150000
       maximum-pool-size = 20
       minimum-idle = 5
+
+      my-sql-properties = {
+          cachePrepStmts=true
+          prepStmtCacheSize=250
+          prepStmtCacheSqlLimit=2048
+          rewriteBatchedStatements=true
+          useServerPrepStmts=true        # Use server-side prepared statements
+          useCompression=true            # Compress data to reduce network load
+      }
     }
 
     # TODO: Remove the need for these useless configuration blocks
@@ -354,15 +363,6 @@ akka.http {
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
-
-    # timeout
-    request-timeout = 30s
-  }
-
-  custom {
-    timeout-response {
-      message = "Successfully submitted DNS changes. Please wait a while for the changes to get processed."
-    }
   }
 
   parsing {
diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlBatchChangeRepository.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlBatchChangeRepository.scala
index d79f8614f..d06959ba6 100644
--- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlBatchChangeRepository.scala
+++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlBatchChangeRepository.scala
@@ -398,8 +398,12 @@ class MySqlBatchChangeRepository
     }
 
     logger.info("Saving Single Changes")
+    val startTime = System.nanoTime()
     PUT_SINGLE_CHANGE.batchByName(singleChangesParams: _*).apply()
+    val endTime = System.nanoTime()
+    val totalDuration = (endTime - startTime) / 1e6d // Convert to milliseconds
     logger.info("Done saving Single Changes")
+    logger.info(s"Total time taken for batch update: $totalDuration ms")
     batchChange
   }
 
diff --git a/modules/portal/conf/application.conf b/modules/portal/conf/application.conf
index fc77008b3..65daeb579 100644
--- a/modules/portal/conf/application.conf
+++ b/modules/portal/conf/application.conf
@@ -66,6 +66,15 @@ mysql {
     idle-timeout = 150000
     maximum-pool-size = 20
     minimum-idle = 5
+
+    my-sql-properties = {
+        cachePrepStmts=true
+        prepStmtCacheSize=250
+        prepStmtCacheSqlLimit=2048
+        rewriteBatchedStatements=true
+        useServerPrepStmts=true        # Use server-side prepared statements
+        useCompression=true            # Compress data to reduce network load
+    }
   }
 }
 
diff --git a/modules/portal/public/lib/dns-change/dns-change-new.controller.js b/modules/portal/public/lib/dns-change/dns-change-new.controller.js
index 6b0e5c610..1297d061a 100644
--- a/modules/portal/public/lib/dns-change/dns-change-new.controller.js
+++ b/modules/portal/public/lib/dns-change/dns-change-new.controller.js
@@ -114,17 +114,10 @@
                 function success(response) {
                     var alert = utilityService.success('Successfully created DNS Change', response, 'createBatchChange: createBatchChange successful');
                     $scope.alerts.push(alert);
-                    // This is the message we have in akka http config to handle timeout
-                    if(response.data.message === "Successfully submitted DNS changes. Please wait a while for the changes to get processed."){
-                        $timeout(function(){
-                            location.href = "/dnschanges";
-                         }, 2000);
-                    } else {
-                        $timeout(function(){
-                            location.href = "/dnschanges/" + response.data.id;
-                         }, 2000);
-                        $scope.batch = response.data;
-                    }
+                    $timeout(function(){
+                        location.href = "/dnschanges/" + response.data.id;
+                    }, 2000);
+                    $scope.batch = response.data;
                 }
 
                 formatData(payload);
diff --git a/test/api/functional/application.conf b/test/api/functional/application.conf
index c498f3ec3..83a6a6d95 100644
--- a/test/api/functional/application.conf
+++ b/test/api/functional/application.conf
@@ -141,6 +141,15 @@ vinyldns {
       maximum-pool-size = 20
       minimum-idle = 20
       register-mbeans = true
+
+      my-sql-properties = {
+          cachePrepStmts=true
+          prepStmtCacheSize=250
+          prepStmtCacheSqlLimit=2048
+          rewriteBatchedStatements=true
+          useServerPrepStmts=true        # Use server-side prepared statements
+          useCompression=true            # Compress data to reduce network load
+      }
     }
     # Repositories that use this data store are listed here
     repositories {
@@ -304,15 +313,6 @@ akka.http {
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
-
-    # timeout
-    request-timeout = 30s
-  }
-
-  custom {
-    timeout-response {
-      message = "Successfully submitted DNS changes. Please wait a while for the changes to get processed."
-    }
   }
 
   parsing {
diff --git a/test/api/integration/application.conf b/test/api/integration/application.conf
index 6c57bf6e3..f8c5d186a 100644
--- a/test/api/integration/application.conf
+++ b/test/api/integration/application.conf
@@ -206,6 +206,15 @@ vinyldns {
       maximum-pool-size = 20
       minimum-idle = 20
       register-mbeans = true
+
+      my-sql-properties = {
+          cachePrepStmts=true
+          prepStmtCacheSize=250
+          prepStmtCacheSqlLimit=2048
+          rewriteBatchedStatements=true
+          useServerPrepStmts=true        # Use server-side prepared statements
+          useCompression=true            # Compress data to reduce network load
+      }
     }
     # Repositories that use this data store are listed here
     repositories {
@@ -362,15 +371,6 @@ akka.http {
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
-
-    # timeout
-    request-timeout = 30s
-  }
-
-  custom {
-    timeout-response {
-      message = "Successfully submitted DNS changes. Please wait a while for the changes to get processed."
-    }
   }
 
   parsing {

From d90ab4c319945930274cc9a4bc1e2cad3111a050 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Mon, 12 Aug 2024 18:06:53 +0530
Subject: [PATCH 36/49] commented the request-timeout config

---
 build/docker/api/application.conf                          | 5 ++++-
 modules/api/src/it/resources/application.conf              | 4 +++-
 modules/api/src/main/resources/application.conf            | 7 +++++--
 modules/api/src/universal/conf/application.conf            | 5 ++++-
 modules/docs/src/main/mdoc/operator/config-api.md          | 6 ++++--
 modules/portal/app/models/Meta.scala                       | 2 +-
 .../portal/app/views/dnsChanges/dnsChangeNew.scala.html    | 2 +-
 modules/portal/test/models/MetaSpec.scala                  | 2 +-
 test/api/functional/application.conf                       | 5 ++++-
 test/api/integration/application.conf                      | 6 +++++-
 10 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/build/docker/api/application.conf b/build/docker/api/application.conf
index ae2ec8671..6a5dd8732 100644
--- a/build/docker/api/application.conf
+++ b/build/docker/api/application.conf
@@ -350,7 +350,10 @@ akka.http {
     # The time period within which the TCP binding process must be completed.
     # Set to `infinite` to disable.
     bind-timeout = 5s
-    request-timeout = 60s
+
+    # A default request timeout is applied globally to all routes and can be configured using the
+    # akka.http.server.request-timeout setting (which defaults to 20 seconds).
+    # request-timeout = 60s
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
diff --git a/modules/api/src/it/resources/application.conf b/modules/api/src/it/resources/application.conf
index 9a15efdea..aa1cf2367 100644
--- a/modules/api/src/it/resources/application.conf
+++ b/modules/api/src/it/resources/application.conf
@@ -347,7 +347,9 @@ akka.http {
     # The time period within which the TCP binding process must be completed.
     # Set to `infinite` to disable.
     bind-timeout = 5s
-    request-timeout = 60s
+    # A default request timeout is applied globally to all routes and can be configured using the
+    # akka.http.server.request-timeout setting (which defaults to 20 seconds).
+    # request-timeout = 60s
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
diff --git a/modules/api/src/main/resources/application.conf b/modules/api/src/main/resources/application.conf
index 08b230b7d..68b519c26 100644
--- a/modules/api/src/main/resources/application.conf
+++ b/modules/api/src/main/resources/application.conf
@@ -19,7 +19,7 @@ vinyldns {
   shared-approved-types = ["A", "AAAA", "CNAME", "PTR", "TXT"]
 
   # Batch change settings
-  batch-change-limit = 100
+  batch-change-limit = 1000
   batch-change-limit = ${?BATCH_CHANGE_LIMIT}
   manual-batch-review-enabled = true
   manual-batch-review-enabled = ${?MANUAL_BATCH_REVIEW_ENABLED}
@@ -366,7 +366,10 @@ akka.http {
     # The time period within which the TCP binding process must be completed.
     # Set to `infinite` to disable.
     bind-timeout = 5s
-    request-timeout = 60s
+
+    # A default request timeout is applied globally to all routes and can be configured using the
+    # akka.http.server.request-timeout setting (which defaults to 20 seconds).
+    # request-timeout = 60s
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
diff --git a/modules/api/src/universal/conf/application.conf b/modules/api/src/universal/conf/application.conf
index fefbd421a..56008f0a7 100644
--- a/modules/api/src/universal/conf/application.conf
+++ b/modules/api/src/universal/conf/application.conf
@@ -351,7 +351,10 @@ akka.http {
     # The time period within which the TCP binding process must be completed.
     # Set to `infinite` to disable.
     bind-timeout = 5s
-    request-timeout = 60s
+
+    # A default request timeout is applied globally to all routes and can be configured using the
+    # akka.http.server.request-timeout setting (which defaults to 20 seconds).
+    # request-timeout = 60s
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
diff --git a/modules/docs/src/main/mdoc/operator/config-api.md b/modules/docs/src/main/mdoc/operator/config-api.md
index 31a77c291..c25243e51 100644
--- a/modules/docs/src/main/mdoc/operator/config-api.md
+++ b/modules/docs/src/main/mdoc/operator/config-api.md
@@ -990,8 +990,10 @@ dotted-hosts = {
         # The time period within which the TCP binding process must be completed.
         # Set to `infinite` to disable.
         bind-timeout = 5s
-        request-timeout = 60s
-      
+        # A default request timeout is applied globally to all routes and can be configured using the 
+        # akka.http.server.request-timeout setting (which defaults to 20 seconds).
+        # request-timeout = 60s      
+  
         # Show verbose error messages back to the client
         verbose-error-messages = on
      }
diff --git a/modules/portal/app/models/Meta.scala b/modules/portal/app/models/Meta.scala
index 6bbf18eed..a5db1af77 100644
--- a/modules/portal/app/models/Meta.scala
+++ b/modules/portal/app/models/Meta.scala
@@ -32,7 +32,7 @@ object Meta {
     Meta(
       config.getOptional[String]("vinyldns.version").getOrElse("unknown"),
       config.getOptional[Boolean]("shared-display-enabled").getOrElse(false),
-      config.getOptional[Int]("api.limits.batchchange-routing-max-items-limit").getOrElse(100),
+      config.getOptional[Int]("api.limits.batchchange-routing-max-items-limit").getOrElse(1000),
       config.getOptional[Long]("default-ttl").getOrElse(7200L),
       config.getOptional[Boolean]("manual-batch-review-enabled").getOrElse(false),
       config.getOptional[Boolean]("scheduled-changes-enabled").getOrElse(false),
diff --git a/modules/portal/app/views/dnsChanges/dnsChangeNew.scala.html b/modules/portal/app/views/dnsChanges/dnsChangeNew.scala.html
index 651f707c2..4ca86c4c9 100644
--- a/modules/portal/app/views/dnsChanges/dnsChangeNew.scala.html
+++ b/modules/portal/app/views/dnsChanges/dnsChangeNew.scala.html
@@ -329,7 +329,7 @@
                                 <input type="file" id="batchChangeCsv" ng-model="csvInput" name="batchChangeCsv" class="batchChangeCsv" ng-change="uploadCSV(createBatchChangeForm.batchChangeCsv.$viewValue, batchChangeLimit )" batch-change-file>
                                 <p><a href="https://www.vinyldns.io/portal/dns-changes#dns-change-csv-import" target="_blank" rel="noopener noreferrer">See documentation for sample CSV</a></p>
                             </div>
-                            <p ng-if="newBatch.changes.length > batchChangeLimit">Limit reached. Cannot add more than {{batchChangeLimit}} records per DNS change.</p>
+                            <p ng-if="newBatch.changes.length >= batchChangeLimit">Limit reached. Cannot add more than {{batchChangeLimit}} records per DNS change.</p>
                         </div>
                         <div class="panel-footer clearfix">
                             <div ng-if="formStatus=='pendingSubmit'" class="pull-right">
diff --git a/modules/portal/test/models/MetaSpec.scala b/modules/portal/test/models/MetaSpec.scala
index 90177278e..cee972091 100644
--- a/modules/portal/test/models/MetaSpec.scala
+++ b/modules/portal/test/models/MetaSpec.scala
@@ -39,7 +39,7 @@ class MetaSpec extends Specification with Mockito {
     }
     "default to 1000 if batch-change-limit is not found" in {
       val config = Map("vinyldns.version" -> "foo-bar")
-      Meta(Configuration.from(config)).batchChangeLimit must beEqualTo(100)
+      Meta(Configuration.from(config)).batchChangeLimit must beEqualTo(1000)
     }
     "get the default-ttl value in config" in {
       val config = Map("default-ttl" -> 7210)
diff --git a/test/api/functional/application.conf b/test/api/functional/application.conf
index cfb05f9bd..5c7f48aa3 100644
--- a/test/api/functional/application.conf
+++ b/test/api/functional/application.conf
@@ -301,7 +301,10 @@ akka.http {
     # The time period within which the TCP binding process must be completed.
     # Set to `infinite` to disable.
     bind-timeout = 5s
-    request-timeout = 60s
+
+    # A default request timeout is applied globally to all routes and can be configured using the
+    # akka.http.server.request-timeout setting (which defaults to 20 seconds).
+    # request-timeout = 60s
 
     # Show verbose error messages back to the client
     verbose-error-messages = on
diff --git a/test/api/integration/application.conf b/test/api/integration/application.conf
index 0434f5692..e7c8c20e1 100644
--- a/test/api/integration/application.conf
+++ b/test/api/integration/application.conf
@@ -359,7 +359,11 @@ akka.http {
     # The time period within which the TCP binding process must be completed.
     # Set to `infinite` to disable.
     bind-timeout = 5s
-    request-timeout = 60s
+
+    # A default request timeout is applied globally to all routes and can be configured using the
+    # akka.http.server.request-timeout setting (which defaults to 20 seconds).
+    # request-timeout = 60s
+
     # Show verbose error messages back to the client
     verbose-error-messages = on
   }

From 5a6f761ec71c5b2494308c03bf33790392318f5f Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Mon, 12 Aug 2024 18:29:21 +0530
Subject: [PATCH 37/49] update

---
 modules/api/src/it/resources/application.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/api/src/it/resources/application.conf b/modules/api/src/it/resources/application.conf
index aa1cf2367..f96a2c5e5 100644
--- a/modules/api/src/it/resources/application.conf
+++ b/modules/api/src/it/resources/application.conf
@@ -347,6 +347,7 @@ akka.http {
     # The time period within which the TCP binding process must be completed.
     # Set to `infinite` to disable.
     bind-timeout = 5s
+
     # A default request timeout is applied globally to all routes and can be configured using the
     # akka.http.server.request-timeout setting (which defaults to 20 seconds).
     # request-timeout = 60s

From b1266bf36bb51ee34e3fcc862c8c0a6ef5dd09f5 Mon Sep 17 00:00:00 2001
From: nspadaccino <nicholas_spadaccino@comcast.com>
Date: Tue, 13 Aug 2024 13:44:10 -0400
Subject: [PATCH 38/49] add beta release script

---
 .github/workflows/release-beta.yml | 149 +++++++++++++++++++++++++++++
 1 file changed, 149 insertions(+)
 create mode 100644 .github/workflows/release-beta.yml

diff --git a/.github/workflows/release-beta.yml b/.github/workflows/release-beta.yml
new file mode 100644
index 000000000..56039ddcf
--- /dev/null
+++ b/.github/workflows/release-beta.yml
@@ -0,0 +1,149 @@
+name: VinylDNS Beta Release
+concurrency:
+  cancel-in-progress: true
+  group: "release"
+
+defaults:
+  run:
+    shell: bash
+
+on:
+  workflow_dispatch:
+    inputs:
+      verify-first:
+        description: 'Verify First?'
+        required: true
+        default: 'true'
+      create-gh-release:
+        description: 'Create a GitHub Release?'
+        required: true
+        default: 'true'
+      publish-images:
+        description: 'Publish Docker Images?'
+        required: true
+        default: 'true'
+      pre-release:
+        description: 'Is this a pre-release?'
+        required: true
+        default: 'true'
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  verify:
+    name: Verify Release
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout current branch
+        if: github.event.inputs.verify-first == 'true'
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Run Tests
+        id: verify
+        if: github.event.inputs.verify-first == 'true'
+        run: cd build/ && ./assemble_api.sh && ./run_all_tests.sh
+
+  create-gh-release:
+    name: Create GitHub Release
+    needs: verify
+    runs-on: ubuntu-latest
+    if: github.event.inputs.create-gh-release == 'true'
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout current branch
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Build Artifacts
+        id: build
+        run: cd build/ && ./assemble_api.sh && ./assemble_portal.sh
+
+      - name: Get Version
+        id: get-version
+        run: echo "::set-output name=vinyldns_version::$(awk -F'"' '{print $2}' ./version.sbt)"
+
+      - name: Create GitHub Release
+        id: create_release
+        uses: softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5 # v0.1.14
+        with:
+          tag_name: v${{ steps.get-version.outputs.vinyldns_version }}
+          generate_release_notes: true
+          files: artifacts/*
+          prerelease: ${{ github.event.inputs['pre-release'] == 'true' }}
+
+  docker-release-api:
+    name: Release API Docker Image
+    needs: [ verify, create-gh-release ]
+    runs-on: ubuntu-latest
+    if: github.event.inputs.publish-images == 'true'
+
+    steps:
+      - name: Get Version
+        id: get-version
+        run: echo "::set-output name=vinyldns_version::$(curl -s https://api.github.com/repos/vinyldns/vinyldns/releases | jq -rc '.[0].tag_name')"
+
+      - name: Checkout current branch (full)
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ steps.get-version.outputs.vinyldns_version }}
+          fetch-depth: 0
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Import Content Trust Key
+        run: docker trust key load <(echo "${SIGNING_KEY}") --name vinyldns_svc
+        env:
+          SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+          DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ secrets.DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE }}
+
+      # This will publish the latest release
+      - name: Publish API Docker Image
+        run: make -C build/docker/api publish
+        env:
+          DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ secrets.DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE }}
+
+  docker-release-portal:
+    name: Release Portal Docker Image
+    needs: [ verify, create-gh-release ]
+    runs-on: ubuntu-latest
+    if: github.event.inputs.publish-images == 'true'
+
+    steps:
+      - name: Get Version
+        id: get-version
+        run: echo "::set-output name=vinyldns_version::$(curl -s https://api.github.com/repos/vinyldns/vinyldns/releases | jq -rc '.[0].tag_name')"
+
+      - name: Checkout current branch (full)
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ steps.get-version.outputs.vinyldns_version }}
+          fetch-depth: 0
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Import Content Trust Key
+        run: docker trust key load <(echo "${SIGNING_KEY}") --name vinyldns_svc
+        env:
+          SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+          DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ secrets.DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE }}
+
+      # This will publish the latest release
+      - name: Publish Portal Docker Image
+        run: make -C build/docker/portal publish
+        env:
+          DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE: ${{ secrets.DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE }}

From 14300b3b15d76190f84f9e934fdc93d0ae6d9767 Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Wed, 14 Aug 2024 19:15:29 +0530
Subject: [PATCH 39/49] update hikari log level

---
 build/docker/api/logback.xml               | 2 +-
 build/docker/portal/logback.xml            | 2 +-
 modules/api/src/main/resources/logback.xml | 2 +-
 modules/api/src/universal/conf/logback.xml | 2 +-
 modules/portal/conf/logback.xml            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/docker/api/logback.xml b/build/docker/api/logback.xml
index 6b90f7dcb..656ee3ab1 100644
--- a/build/docker/api/logback.xml
+++ b/build/docker/api/logback.xml
@@ -14,7 +14,7 @@
 
     <logger name="scalikejdbc.StatementExecutor$$anon$1" level="OFF"/>
 
-    <logger name="com.zaxxer.hikari" level="TRACE">
+    <logger name="com.zaxxer.hikari" level="ERROR">
         <appender-ref ref="CONSOLE"/>
     </logger>
 
diff --git a/build/docker/portal/logback.xml b/build/docker/portal/logback.xml
index b7e61088c..42e9a8b80 100644
--- a/build/docker/portal/logback.xml
+++ b/build/docker/portal/logback.xml
@@ -15,7 +15,7 @@
   <logger name="play" level="INFO" />
   <logger name="application" level="DEBUG" />
 
-  <logger name="com.zaxxer.hikari" level="TRACE">
+  <logger name="com.zaxxer.hikari" level="ERROR">
     <appender-ref ref="CONSOLE"/>
   </logger>
 
diff --git a/modules/api/src/main/resources/logback.xml b/modules/api/src/main/resources/logback.xml
index 688a07b6b..4e4f1f6aa 100644
--- a/modules/api/src/main/resources/logback.xml
+++ b/modules/api/src/main/resources/logback.xml
@@ -7,7 +7,7 @@
         </encoder>
     </appender>
 
-    <logger name="com.zaxxer.hikari" level="TRACE">
+    <logger name="com.zaxxer.hikari" level="ERROR">
         <appender-ref ref="CONSOLE"/>
     </logger>
 
diff --git a/modules/api/src/universal/conf/logback.xml b/modules/api/src/universal/conf/logback.xml
index 688a07b6b..4e4f1f6aa 100644
--- a/modules/api/src/universal/conf/logback.xml
+++ b/modules/api/src/universal/conf/logback.xml
@@ -7,7 +7,7 @@
         </encoder>
     </appender>
 
-    <logger name="com.zaxxer.hikari" level="TRACE">
+    <logger name="com.zaxxer.hikari" level="ERROR">
         <appender-ref ref="CONSOLE"/>
     </logger>
 
diff --git a/modules/portal/conf/logback.xml b/modules/portal/conf/logback.xml
index 1eea934d5..415fe95b5 100644
--- a/modules/portal/conf/logback.xml
+++ b/modules/portal/conf/logback.xml
@@ -15,7 +15,7 @@
   <logger name="play" level="INFO" />
   <logger name="application" level="DEBUG" />
 
-  <logger name="com.zaxxer.hikari" level="TRACE">
+  <logger name="com.zaxxer.hikari" level="ERROR">
     <appender-ref ref="CONSOLE"/>
   </logger>
 

From 2787ce5904d2c6bd9da8d0b9ac3286ec3d0b670a Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Wed, 14 Aug 2024 19:44:17 +0530
Subject: [PATCH 40/49] update to conf and logback

---
 build/docker/api/application.conf               | 9 ---------
 build/docker/api/logback.xml                    | 4 ++++
 build/docker/portal/application.conf            | 9 ---------
 build/docker/portal/logback.xml                 | 4 ++++
 modules/api/src/main/resources/application.conf | 9 ---------
 modules/api/src/main/resources/logback.xml      | 4 ++++
 modules/api/src/universal/conf/application.conf | 9 ---------
 modules/api/src/universal/conf/logback.xml      | 4 ++++
 modules/portal/conf/application.conf            | 9 ---------
 modules/portal/conf/logback.xml                 | 4 ++++
 modules/portal/public/app.js                    | 2 +-
 test/api/functional/application.conf            | 9 ---------
 test/api/integration/application.conf           | 9 ---------
 13 files changed, 21 insertions(+), 64 deletions(-)

diff --git a/build/docker/api/application.conf b/build/docker/api/application.conf
index 8fde27782..f3d2e8ef2 100644
--- a/build/docker/api/application.conf
+++ b/build/docker/api/application.conf
@@ -215,15 +215,6 @@ vinyldns {
       idle-timeout = 150000
       maximum-pool-size = 20
       minimum-idle = 5
-
-      my-sql-properties = {
-          cachePrepStmts=true
-          prepStmtCacheSize=250
-          prepStmtCacheSqlLimit=2048
-          rewriteBatchedStatements=true
-          useServerPrepStmts=true        # Use server-side prepared statements
-          useCompression=true            # Compress data to reduce network load
-      }
     }
 
     # TODO: Remove the need for these useless configuration blocks
diff --git a/build/docker/api/logback.xml b/build/docker/api/logback.xml
index ac3c468e2..6b90f7dcb 100644
--- a/build/docker/api/logback.xml
+++ b/build/docker/api/logback.xml
@@ -14,6 +14,10 @@
 
     <logger name="scalikejdbc.StatementExecutor$$anon$1" level="OFF"/>
 
+    <logger name="com.zaxxer.hikari" level="TRACE">
+        <appender-ref ref="CONSOLE"/>
+    </logger>
+
     <root level="${VINYLDNS_LOG_LEVEL}">
         <appender-ref ref="CONSOLE"/>
     </root>
diff --git a/build/docker/portal/application.conf b/build/docker/portal/application.conf
index ad76b290a..e691be760 100644
--- a/build/docker/portal/application.conf
+++ b/build/docker/portal/application.conf
@@ -66,15 +66,6 @@ mysql {
     idle-timeout = 150000
     maximum-pool-size = 20
     minimum-idle = 5
-
-    my-sql-properties = {
-        cachePrepStmts=true
-        prepStmtCacheSize=250
-        prepStmtCacheSqlLimit=2048
-        rewriteBatchedStatements=true
-        useServerPrepStmts=true        # Use server-side prepared statements
-        useCompression=true            # Compress data to reduce network load
-    }
   }
 }
 
diff --git a/build/docker/portal/logback.xml b/build/docker/portal/logback.xml
index 86b11f6d7..b7e61088c 100644
--- a/build/docker/portal/logback.xml
+++ b/build/docker/portal/logback.xml
@@ -15,6 +15,10 @@
   <logger name="play" level="INFO" />
   <logger name="application" level="DEBUG" />
 
+  <logger name="com.zaxxer.hikari" level="TRACE">
+    <appender-ref ref="CONSOLE"/>
+  </logger>
+
   <root level="${VINYLDNS_LOG_LEVEL}">
     <appender-ref ref="CONSOLE" />
   </root>
diff --git a/modules/api/src/main/resources/application.conf b/modules/api/src/main/resources/application.conf
index ad8fc7774..c1ee28ca9 100644
--- a/modules/api/src/main/resources/application.conf
+++ b/modules/api/src/main/resources/application.conf
@@ -231,15 +231,6 @@ vinyldns {
       idle-timeout = 150000
       maximum-pool-size = 20
       minimum-idle = 5
-
-      my-sql-properties = {
-          cachePrepStmts=true
-          prepStmtCacheSize=250
-          prepStmtCacheSqlLimit=2048
-          rewriteBatchedStatements=true
-          useServerPrepStmts=true        # Use server-side prepared statements
-          useCompression=true            # Compress data to reduce network load
-      }
     }
 
     # TODO: Remove the need for these useless configuration blocks
diff --git a/modules/api/src/main/resources/logback.xml b/modules/api/src/main/resources/logback.xml
index 4f55b5431..688a07b6b 100644
--- a/modules/api/src/main/resources/logback.xml
+++ b/modules/api/src/main/resources/logback.xml
@@ -7,6 +7,10 @@
         </encoder>
     </appender>
 
+    <logger name="com.zaxxer.hikari" level="TRACE">
+        <appender-ref ref="CONSOLE"/>
+    </logger>
+
     <root level="INFO">
         <appender-ref ref="CONSOLE"/>
     </root>
diff --git a/modules/api/src/universal/conf/application.conf b/modules/api/src/universal/conf/application.conf
index b08be9e2b..ff70827df 100644
--- a/modules/api/src/universal/conf/application.conf
+++ b/modules/api/src/universal/conf/application.conf
@@ -216,15 +216,6 @@ vinyldns {
       idle-timeout = 150000
       maximum-pool-size = 20
       minimum-idle = 5
-
-      my-sql-properties = {
-          cachePrepStmts=true
-          prepStmtCacheSize=250
-          prepStmtCacheSqlLimit=2048
-          rewriteBatchedStatements=true
-          useServerPrepStmts=true        # Use server-side prepared statements
-          useCompression=true            # Compress data to reduce network load
-      }
     }
 
     # TODO: Remove the need for these useless configuration blocks
diff --git a/modules/api/src/universal/conf/logback.xml b/modules/api/src/universal/conf/logback.xml
index 4f55b5431..688a07b6b 100644
--- a/modules/api/src/universal/conf/logback.xml
+++ b/modules/api/src/universal/conf/logback.xml
@@ -7,6 +7,10 @@
         </encoder>
     </appender>
 
+    <logger name="com.zaxxer.hikari" level="TRACE">
+        <appender-ref ref="CONSOLE"/>
+    </logger>
+
     <root level="INFO">
         <appender-ref ref="CONSOLE"/>
     </root>
diff --git a/modules/portal/conf/application.conf b/modules/portal/conf/application.conf
index 65daeb579..fc77008b3 100644
--- a/modules/portal/conf/application.conf
+++ b/modules/portal/conf/application.conf
@@ -66,15 +66,6 @@ mysql {
     idle-timeout = 150000
     maximum-pool-size = 20
     minimum-idle = 5
-
-    my-sql-properties = {
-        cachePrepStmts=true
-        prepStmtCacheSize=250
-        prepStmtCacheSqlLimit=2048
-        rewriteBatchedStatements=true
-        useServerPrepStmts=true        # Use server-side prepared statements
-        useCompression=true            # Compress data to reduce network load
-    }
   }
 }
 
diff --git a/modules/portal/conf/logback.xml b/modules/portal/conf/logback.xml
index f3c208628..1eea934d5 100644
--- a/modules/portal/conf/logback.xml
+++ b/modules/portal/conf/logback.xml
@@ -15,6 +15,10 @@
   <logger name="play" level="INFO" />
   <logger name="application" level="DEBUG" />
 
+  <logger name="com.zaxxer.hikari" level="TRACE">
+    <appender-ref ref="CONSOLE"/>
+  </logger>
+
   <root level="INFO">
     <appender-ref ref="CONSOLE" />
   </root>
diff --git a/modules/portal/public/app.js b/modules/portal/public/app.js
index d201ef7cc..8879d4af0 100644
--- a/modules/portal/public/app.js
+++ b/modules/portal/public/app.js
@@ -14,7 +14,7 @@ angular.module('vinyldns', [
         $animateProvider
             .classNameFilter(/toshow/);
         // turning off $log. Change to true for local development and testing
-        $logProvider.debugEnabled(true);
+        $logProvider.debugEnabled(false);
     })
     .controller('AppController', function ($scope, $timeout, profileService, utilityService) {
         document.body.style.cursor = 'default';
diff --git a/test/api/functional/application.conf b/test/api/functional/application.conf
index 83a6a6d95..e0f35df07 100644
--- a/test/api/functional/application.conf
+++ b/test/api/functional/application.conf
@@ -141,15 +141,6 @@ vinyldns {
       maximum-pool-size = 20
       minimum-idle = 20
       register-mbeans = true
-
-      my-sql-properties = {
-          cachePrepStmts=true
-          prepStmtCacheSize=250
-          prepStmtCacheSqlLimit=2048
-          rewriteBatchedStatements=true
-          useServerPrepStmts=true        # Use server-side prepared statements
-          useCompression=true            # Compress data to reduce network load
-      }
     }
     # Repositories that use this data store are listed here
     repositories {
diff --git a/test/api/integration/application.conf b/test/api/integration/application.conf
index f8c5d186a..c09038a85 100644
--- a/test/api/integration/application.conf
+++ b/test/api/integration/application.conf
@@ -206,15 +206,6 @@ vinyldns {
       maximum-pool-size = 20
       minimum-idle = 20
       register-mbeans = true
-
-      my-sql-properties = {
-          cachePrepStmts=true
-          prepStmtCacheSize=250
-          prepStmtCacheSqlLimit=2048
-          rewriteBatchedStatements=true
-          useServerPrepStmts=true        # Use server-side prepared statements
-          useCompression=true            # Compress data to reduce network load
-      }
     }
     # Repositories that use this data store are listed here
     repositories {

From ab57f9f4a28f25a34774f6935a0b561d18234ca0 Mon Sep 17 00:00:00 2001
From: Nicholas Spadaccino <37352107+nspadaccino@users.noreply.github.com>
Date: Wed, 14 Aug 2024 21:55:54 -0400
Subject: [PATCH 41/49]  Bump version to v0.20.2-beta

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

diff --git a/version.sbt b/version.sbt
index 6681ab794..b1b15abf9 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.20.1"
+version in ThisBuild := "0.20.2-beta"

From 5e19bcab2d06c244ef9c6eeb5e1ef16e601d1f9f Mon Sep 17 00:00:00 2001
From: Aravindh-Raju <aravindhraju2000@gmail.com>
Date: Tue, 20 Aug 2024 11:41:39 +0530
Subject: [PATCH 42/49] remove logs

---
 .../main/scala/vinyldns/api/backend/CommandHandler.scala | 4 ----
 .../main/scala/vinyldns/api/backend/dns/DnsBackend.scala | 3 ---
 .../vinyldns/api/domain/batch/BatchChangeConverter.scala | 7 +------
 .../vinyldns/api/engine/RecordSetChangeHandler.scala     | 4 +---
 .../mysql/repository/MySqlBatchChangeRepository.scala    | 9 ---------
 5 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/modules/api/src/main/scala/vinyldns/api/backend/CommandHandler.scala b/modules/api/src/main/scala/vinyldns/api/backend/CommandHandler.scala
index 7866da6a2..797328494 100644
--- a/modules/api/src/main/scala/vinyldns/api/backend/CommandHandler.scala
+++ b/modules/api/src/main/scala/vinyldns/api/backend/CommandHandler.scala
@@ -164,19 +164,15 @@ object CommandHandler {
       message.command match {
         case sync: ZoneChange
             if sync.changeType == ZoneChangeType.Sync || sync.changeType == ZoneChangeType.AutomatedSync || sync.changeType == ZoneChangeType.Create =>
-          logger.info("In case: ZoneChange sync")
           outcomeOf(message)(zoneSyncProcessor(sync))
 
         case zoneChange: ZoneChange =>
-          logger.info("In case: ZoneChange")
           outcomeOf(message)(zoneChangeProcessor(zoneChange))
 
         case rcr: RecordSetChange =>
-          logger.info("In case: RecordSetChange")
           outcomeOf(message)(recordChangeProcessor(backendResolver.resolve(rcr.zone), rcr))
 
         case bcc: BatchChangeCommand =>
-          logger.info("In case: BatchChangeCommand")
           outcomeOf(message)(batchChangeProcessor(bcc))
       }
     }
diff --git a/modules/api/src/main/scala/vinyldns/api/backend/dns/DnsBackend.scala b/modules/api/src/main/scala/vinyldns/api/backend/dns/DnsBackend.scala
index 1bcb302af..8619dbb26 100644
--- a/modules/api/src/main/scala/vinyldns/api/backend/dns/DnsBackend.scala
+++ b/modules/api/src/main/scala/vinyldns/api/backend/dns/DnsBackend.scala
@@ -181,7 +181,6 @@ class DnsBackend(val id: String, val resolver: DNS.SimpleResolver, val xfrInfo:
     }
 
   private[dns] def addRecord(change: RecordSetChange): IO[DnsResponse] = IO.fromEither {
-    logger.info("In addRecord")
     for {
       change <- recordsArePresent(change)
       addRecord <- toDnsRRset(change.recordSet, change.zone.name)
@@ -191,7 +190,6 @@ class DnsBackend(val id: String, val resolver: DNS.SimpleResolver, val xfrInfo:
   }
 
   private[dns] def updateRecord(change: RecordSetChange): IO[DnsResponse] = IO.fromEither {
-    logger.info("In updateRecord")
     for {
       change <- recordsArePresent(change)
       dnsRecord <- toDnsRRset(change.recordSet, change.zone.name)
@@ -202,7 +200,6 @@ class DnsBackend(val id: String, val resolver: DNS.SimpleResolver, val xfrInfo:
   }
 
   private[dns] def deleteRecord(change: RecordSetChange): IO[DnsResponse] = IO.fromEither {
-    logger.info("In deleteRecord")
     for {
       change <- recordsArePresent(change)
       dnsRecord <- toDnsRRset(change.recordSet, change.zone.name)
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 cac4d9ba1..5ece82e5a 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
@@ -91,8 +91,7 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
   def putChangesOnQueue(
       recordSetChanges: List[RecordSetChange],
       batchChangeId: String
-  ): BatchResult[List[RecordSetChange]] = {
-    logger.info("Putting changes to queue")
+  ): BatchResult[List[RecordSetChange]] =
     recordSetChanges.toNel match {
       case None =>
         recordSetChanges.toRightBatchResult // If list is empty, return normally without queueing
@@ -107,7 +106,6 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
             .toBatchResult
         } yield rscResult
     }
-  }
 
   def updateWithQueueingFailures(
       batchChange: BatchChange,
@@ -144,10 +142,7 @@ class BatchChangeConverter(batchChangeRepo: BatchChangeRepository, messageQueue:
     val failedAndNotExistsChanges = batchChange.changes.collect {
       case change if change.status == SingleChangeStatus.Failed || change.systemMessage.contains(nonExistentRecordDeleteMessage) || change.systemMessage.contains(nonExistentRecordDataDeleteMessage) => change
     }
-    logger.info("Storing Queuing failures")
     val storeChanges = batchChangeRepo.updateSingleChanges(failedAndNotExistsChanges).as(())
-    logger.info("Done saving queuing failures")
-
     storeChanges
   }.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 f28280201..6fe54b1fb 100644
--- a/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
+++ b/modules/api/src/main/scala/vinyldns/api/engine/RecordSetChangeHandler.scala
@@ -109,8 +109,7 @@ object RecordSetChangeHandler extends TransactionProvider {
   def updateBatchStatuses(
       singleChanges: List[SingleChange],
       recordSetChange: RecordSetChange
-  ): List[SingleChange] = {
-    logger.info("Updating Batch Status")
+  ): List[SingleChange] =
     recordSetChange.status match {
       case RecordSetChangeStatus.Complete =>
         singleChanges.map(_.complete(recordSetChange.id, recordSetChange.recordSet.id))
@@ -118,7 +117,6 @@ object RecordSetChangeHandler extends TransactionProvider {
         singleChanges.map(_.withProcessingError(recordSetChange.systemMessage, recordSetChange.id))
       case _ => singleChanges
     }
-  }
 
   private sealed trait ProcessorState {
     def change: RecordSetChange
diff --git a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlBatchChangeRepository.scala b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlBatchChangeRepository.scala
index 48458d09a..74c029939 100644
--- a/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlBatchChangeRepository.scala
+++ b/modules/mysql/src/main/scala/vinyldns/mysql/repository/MySqlBatchChangeRepository.scala
@@ -350,7 +350,6 @@ class MySqlBatchChangeRepository
   private def saveBatchChange(
       batchChange: BatchChange
   )(implicit session: DBSession): BatchChange = {
-    logger.info("Saving Batch Change")
     PUT_BATCH_CHANGE
       .bindByName(
         Seq(
@@ -370,7 +369,6 @@ class MySqlBatchChangeRepository
       )
       .update()
       .apply()
-    logger.info("Done saving Batch Change")
 
     val singleChangesParams = batchChange.changes.zipWithIndex.map {
       case (singleChange, seqNum) =>
@@ -392,14 +390,7 @@ class MySqlBatchChangeRepository
           case Left(e) => throw e
         }
     }
-
-    logger.info("Saving Single Changes")
-    val startTime = System.nanoTime()
     PUT_SINGLE_CHANGE.batchByName(singleChangesParams: _*).apply()
-    val endTime = System.nanoTime()
-    val totalDuration = (endTime - startTime) / 1e6d // Convert to milliseconds
-    logger.info("Done saving Single Changes")
-    logger.info(s"Total time taken for batch update: $totalDuration ms")
     batchChange
   }
 

From ce887e0ffa4a7104672f0157a5910b3c79a2d2f0 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Wed, 21 Aug 2024 13:07:09 +0530
Subject: [PATCH 44/49] added batch-change-limit params in portal config

---
 modules/portal/app/models/Meta.scala      | 2 +-
 modules/portal/conf/application.conf      | 3 +++
 modules/portal/test/models/MetaSpec.scala | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/portal/app/models/Meta.scala b/modules/portal/app/models/Meta.scala
index a5db1af77..b04e18cf0 100644
--- a/modules/portal/app/models/Meta.scala
+++ b/modules/portal/app/models/Meta.scala
@@ -32,7 +32,7 @@ object Meta {
     Meta(
       config.getOptional[String]("vinyldns.version").getOrElse("unknown"),
       config.getOptional[Boolean]("shared-display-enabled").getOrElse(false),
-      config.getOptional[Int]("api.limits.batchchange-routing-max-items-limit").getOrElse(1000),
+      config.getOptional[Int]("batch-change-limit").getOrElse(1000),
       config.getOptional[Long]("default-ttl").getOrElse(7200L),
       config.getOptional[Boolean]("manual-batch-review-enabled").getOrElse(false),
       config.getOptional[Boolean]("scheduled-changes-enabled").getOrElse(false),
diff --git a/modules/portal/conf/application.conf b/modules/portal/conf/application.conf
index fc77008b3..fea91a5e8 100644
--- a/modules/portal/conf/application.conf
+++ b/modules/portal/conf/application.conf
@@ -88,6 +88,9 @@ api {
   }
 }
 
+# Batch change limit
+batch-change-limit = 1000
+
 http.port = 9001
 http.port = ${?PORTAL_PORT}
 
diff --git a/modules/portal/test/models/MetaSpec.scala b/modules/portal/test/models/MetaSpec.scala
index cee972091..2bea1b3b3 100644
--- a/modules/portal/test/models/MetaSpec.scala
+++ b/modules/portal/test/models/MetaSpec.scala
@@ -34,7 +34,7 @@ class MetaSpec extends Specification with Mockito {
       Meta(Configuration.from(config)).sharedDisplayEnabled must beTrue
     }
     "get the batch-change-limit value in config" in {
-      val config = Map("api.limits.batchchange-routing-max-items-limit" -> 21)
+      val config = Map("batch-change-limit" -> 21)
       Meta(Configuration.from(config)).batchChangeLimit must beEqualTo(21)
     }
     "default to 1000 if batch-change-limit is not found" in {

From 96bf137172c9630de9c11f82f147b0caddb982cf Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Thu, 22 Aug 2024 11:52:48 +0530
Subject: [PATCH 45/49] Fix for dns edit page after submit

---
 modules/portal/public/lib/dns-change/dns-change.service.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/portal/public/lib/dns-change/dns-change.service.js b/modules/portal/public/lib/dns-change/dns-change.service.js
index 5d84a6abf..4c07702d7 100644
--- a/modules/portal/public/lib/dns-change/dns-change.service.js
+++ b/modules/portal/public/lib/dns-change/dns-change.service.js
@@ -38,8 +38,8 @@
                                           })
                 let promis =  $http.post(url, data, {headers: utilityService.getCsrfHeader()});
                     // Hide loader when api gets response
-                    promis.then(()=>loader.modal("hide"))
-                          .catch(()=>loader.modal("hide"))
+                promis.then(()=>loader.modal("hide")
+                          ,()=>loader.modal("hide"))
                 return promis
             };
 

From 58fff9a03ba11d277c4ba546a9a88768dea205c2 Mon Sep 17 00:00:00 2001
From: Jay07GIT <jeyraj931@gmail.com>
Date: Fri, 23 Aug 2024 12:16:58 +0530
Subject: [PATCH 46/49] update

---
 .../public/lib/dns-change/dns-change.service.js       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/portal/public/lib/dns-change/dns-change.service.js b/modules/portal/public/lib/dns-change/dns-change.service.js
index 4c07702d7..448e9a3b2 100644
--- a/modules/portal/public/lib/dns-change/dns-change.service.js
+++ b/modules/portal/public/lib/dns-change/dns-change.service.js
@@ -37,9 +37,16 @@
                                            show: true //Display loader!
                                           })
                 let promis =  $http.post(url, data, {headers: utilityService.getCsrfHeader()});
+
+                function hideLoader() {
+                    loader.modal("hide");
+
+                    // Manually remove the backdrop after the modal is hidden
+                    $('.modal-backdrop').remove();
+                    $('body').removeClass('modal-open');  // Remove the class that prevents scrolling
+                }
                     // Hide loader when api gets response
-                promis.then(()=>loader.modal("hide")
-                          ,()=>loader.modal("hide"))
+                promis.then(hideLoader, hideLoader).catch(hideLoader).finally(hideLoader);
                 return promis
             };
 

From 3250c9571b678051a3bd68a095355ab22db43059 Mon Sep 17 00:00:00 2001
From: Nicholas Spadaccino <37352107+nspadaccino@users.noreply.github.com>
Date: Mon, 26 Aug 2024 14:41:20 -0400
Subject: [PATCH 47/49] Bump version to v0.20.2-beta.2

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

diff --git a/version.sbt b/version.sbt
index b1b15abf9..ab4d3e2e2 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.20.2-beta"
+version in ThisBuild := "0.20.2-beta.2"

From 0bb4c5813745a797bca7e1022724a3bc52c09cb0 Mon Sep 17 00:00:00 2001
From: nspadaccino <nicholas_spadaccino@comcast.com>
Date: Tue, 27 Aug 2024 13:36:15 -0400
Subject: [PATCH 48/49] updated various github actions plugins to latest
 version

---
 .github/workflows/release-beta.yml | 14 +++++++-------
 .github/workflows/release.yml      | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/release-beta.yml b/.github/workflows/release-beta.yml
index 56039ddcf..c7cf65200 100644
--- a/.github/workflows/release-beta.yml
+++ b/.github/workflows/release-beta.yml
@@ -38,7 +38,7 @@ jobs:
     steps:
       - name: Checkout current branch
         if: github.event.inputs.verify-first == 'true'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -57,7 +57,7 @@ jobs:
 
     steps:
       - name: Checkout current branch
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -71,7 +71,7 @@ jobs:
 
       - name: Create GitHub Release
         id: create_release
-        uses: softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5 # v0.1.14
+        uses: softprops/action-gh-release@v2
         with:
           tag_name: v${{ steps.get-version.outputs.vinyldns_version }}
           generate_release_notes: true
@@ -90,13 +90,13 @@ jobs:
         run: echo "::set-output name=vinyldns_version::$(curl -s https://api.github.com/repos/vinyldns/vinyldns/releases | jq -rc '.[0].tag_name')"
 
       - name: Checkout current branch (full)
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: ${{ steps.get-version.outputs.vinyldns_version }}
           fetch-depth: 0
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_TOKEN }}
@@ -125,13 +125,13 @@ jobs:
         run: echo "::set-output name=vinyldns_version::$(curl -s https://api.github.com/repos/vinyldns/vinyldns/releases | jq -rc '.[0].tag_name')"
 
       - name: Checkout current branch (full)
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: ${{ steps.get-version.outputs.vinyldns_version }}
           fetch-depth: 0
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d1ce26c22..4a4113686 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,7 +34,7 @@ jobs:
     steps:
       - name: Checkout current branch
         if: github.event.inputs.verify-first == 'true'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -53,7 +53,7 @@ jobs:
 
     steps:
       - name: Checkout current branch
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -67,7 +67,7 @@ jobs:
 
       - name: Create GitHub Release
         id: create_release
-        uses: softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5 # v0.1.14
+        uses: softprops/action-gh-release@v2
         with:
           tag_name: v${{ steps.get-version.outputs.vinyldns_version }}
           generate_release_notes: true
@@ -85,13 +85,13 @@ jobs:
         run: echo "::set-output name=vinyldns_version::$(curl -s https://api.github.com/repos/vinyldns/vinyldns/releases | jq -rc '.[0].tag_name')"
 
       - name: Checkout current branch (full)
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: ${{ steps.get-version.outputs.vinyldns_version }}
           fetch-depth: 0
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_TOKEN }}
@@ -120,13 +120,13 @@ jobs:
         run: echo "::set-output name=vinyldns_version::$(curl -s https://api.github.com/repos/vinyldns/vinyldns/releases | jq -rc '.[0].tag_name')"
 
       - name: Checkout current branch (full)
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: ${{ steps.get-version.outputs.vinyldns_version }}
           fetch-depth: 0
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_TOKEN }}

From d0aea448aef8a04b97b587da022f2c2dd58bad3d Mon Sep 17 00:00:00 2001
From: Nicholas Spadaccino <37352107+nspadaccino@users.noreply.github.com>
Date: Thu, 29 Aug 2024 15:40:33 -0400
Subject: [PATCH 49/49] Bump version to v0.20.2

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

diff --git a/version.sbt b/version.sbt
index ab4d3e2e2..f2566e80d 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.20.2-beta.2"
+version in ThisBuild := "0.20.2"