ensure order by id

GSA · Nov 22, 2024 · 5bdded4 · 5bdded4
1 parent 9092696
commit 5bdded4
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/app/controllers/api/v1/digital_products_controller.rb b/app/controllers/api/v1/digital_products_controller.rb
@@ -12,9 +12,9 @@ def index
 
             @total_count = DigitalProduct.active.count
             @digital_products = DigitalProduct.active
+              .order(:id)
               .limit(size)
               .offset(size * page)
-              .order(:id)
 
             render json: @digital_products,
               meta: {

diff --git a/app/controllers/api/v1/digital_service_accounts_controller.rb b/app/controllers/api/v1/digital_service_accounts_controller.rb
@@ -13,9 +13,9 @@ def index
             @total_count = DigitalServiceAccount.active.count
 
             @digital_service_accounts = DigitalServiceAccount.active
+              .order(:id)
               .limit(size)
               .offset(size * page)
-              .order(:id)
 
             render json: @digital_service_accounts,
               meta: {

diff --git a/app/controllers/api/v1/forms_controller.rb b/app/controllers/api/v1/forms_controller.rb
@@ -7,9 +7,13 @@ def index
         respond_to do |format|
           format.json do
             if current_user.organizational_admin?
-              render json: current_user.organization.forms.limit(100), each_serializer: FormSerializer
+              render json: current_user.organization.forms
+                .order(:id)
+                .limit(100), each_serializer: FormSerializer
             else
-              render json: current_user.forms.limit(100), each_serializer: FormSerializer
+              render json: current_user.forms
+                .order(:id)
+                .limit(100), each_serializer: FormSerializer
             end
           end
         end

diff --git a/app/controllers/api/v1/personas_controller.rb b/app/controllers/api/v1/personas_controller.rb
@@ -6,7 +6,7 @@ class PersonasController < ::ApiController
       def index
         respond_to do |format|
           format.json do
-            render json: Persona.all, each_serializer: PersonaSerializer
+            render json: Persona.order(:id), each_serializer: PersonaSerializer
           end
         end
       end

diff --git a/app/controllers/api/v1/service_providers_controller.rb b/app/controllers/api/v1/service_providers_controller.rb
@@ -6,7 +6,7 @@ class ServiceProvidersController < ::ApiController
       def index
         respond_to do |format|
           format.json do
-            render json: ServiceProvider.includes(:organization).order('organizations.name', :name), each_serializer: ServiceProviderSerializer
+            render json: ServiceProvider.includes(:organization).order(:id, 'organizations.name', :name), each_serializer: ServiceProviderSerializer
           end
         end
       end

diff --git a/app/controllers/api/v1/services_stages_controller.rb b/app/controllers/api/v1/services_stages_controller.rb
@@ -6,7 +6,7 @@ class ServicesStagesController < ::ApiController
       def index
         respond_to do |format|
           format.json do
-            render json: ServiceStage.order(:service_id, :position_id), each_serializer: ServiceStageSerializer
+            render json: ServiceStage.order(:id), each_serializer: ServiceStageSerializer
           end
         end
       end

diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb
@@ -6,7 +6,7 @@ class UsersController < ::ApiController
       def index
         respond_to do |format|
           format.json do
-            render json: User.active, each_serializer: UserSerializer
+            render json: User.active.order(:id), each_serializer: UserSerializer
           end
         end
       end