e70740c6-12b7-42e6-bab1-2069172c3569

Committed 21 Nov 2025 12:38PM UTC coverage: 87.606% (-3.7%) from 91.311%

Build # e70740c6-12b7-42e6-bab1-2069172c3569

Build Type

push

circleci

Committed by

web-flow

Commit Message

Improve logging when deleting asset.query.iterators (#2228)

When deleting an iterator we now ignore errors if the iterator is
missing. This is because Mediaflux automatically deletes iterators when
we have read all its contents which happens if the project has only a
handful of files and they are read all at once in the first iteration.
In that case we get the following error:

```
E, [2025-11-19T15:01:29.960006 #2438857] ERROR -- : [b6390527-4de0-4e5a-b5e3-f50585d45b5f]
Mediaflux error: arc.mf.server.Services$ExServiceError, call to service 'asset.query.iterator.destroy' failed:
The session does not have an iterator (id): 1
```

This is because Mediaflux automatically deletes the iterator as soon as
we read all the files from the query.

Run Details

2 of 2 new or added lines in 1 file covered. (100.0%)

165 existing lines in 9 files now uncovered.

2785 of 3179 relevant lines covered (87.61%)

358.67 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

93.33

/app/controllers/edit_requests_controller.rb

# frozen_string_literal: true
class EditRequestsController < ApplicationController
  layout "edit_request"
  before_action :set_breadcrumbs

  before_action :set_request_model, only: %i[edit update]
  before_action :check_access

  # GET /edit_requests/1/edit
  def edit
    add_breadcrumb(@request_model.project_title, request_path(@request_model))
    add_breadcrumb("Edit Submitted Request")
  end

  # PATCH/PUT /edit_requests/1 or /edit_requests/1.json
  def update
    respond_to do |format|
      if @request_model.update(request_params) && @request_model.valid_to_submit?
        format.html { redirect_to request_url(@request_model), notice: I18n.t(:successful_update) }
        format.json { render :show, status: :ok, location: @request_model }
      else
        format.html { render :edit, status: :unprocessable_entity }
        format.json { render json: @request_model.errors, status: :unprocessable_entity }
      end
    end
  end

  private

    # Use callbacks to share common setup or constraints between actions.
    def set_request_model
      @princeton_departments = Affiliation.all
      @request_model = Request.find(params[:id])
    end

    # Only allow a list of trusted parameters through.
    def request_params
      request_params = params.fetch(:request, {}).permit(:request_title, :project_title, :state, :data_sponsor, :data_manager,
                                        :description, :project_purpose, :parent_folder, :project_folder, :project_id, :quota,
                                        :requested_by, :storage_size, :storage_unit, :number_of_files, :hpc, :smb, :globus,
                                        user_roles: [], departments: [])

      if request_params[:departments].present?
        request_params[:departments] = request_params[:departments].compact_blank.map { |dep_str| JSON.parse(dep_str) }
      end
      if request_params[:user_roles].present?
        request_params[:user_roles] = request_params[:user_roles].compact_blank.map { |role_str| JSON.parse(role_str) }
      end
      move_approved_values(request_params)
    end

    def move_approved_values(request_params)
      if request_params[:quota].present?
        request_params[:approved_quota] = request_params.delete(:quota)
      end
      if request_params[:storage_size].present?
        request_params[:approved_storage_size] = request_params.delete(:storage_size)
      end
      if request_params[:storage_unit].present?
        request_params[:approved_storage_unit] = request_params.delete(:storage_unit)
      end
      request_params
    end

    def set_breadcrumbs
      add_breadcrumb("Dashboard", dashboard_path)
      add_breadcrumb("Requests", requests_path)
    end

    def check_access
      return if user_eligible_to_modify_request?

      # request can not be modified by this user, redirect to the request
      flash[:notice] = I18n.t(:no_modify_submitted)
      redirect_to request_path(@request_model)
    end

    def user_eligible_to_modify_request?
      # elevated privs for the current user
      if current_user.sysadmin || (current_user.developer && !Rails.env.production?)
        true
      else
        false
      end
    end
end

1	# frozen_string_literal: true
2	class EditRequestsController < ApplicationController	2✔
3	layout "edit_request"	2✔
4	before_action :set_breadcrumbs	2✔
5
6	before_action :set_request_model, only: %i[edit update]	2✔
7	before_action :check_access	2✔
8
9	# GET /edit_requests/1/edit
10	def edit	2✔
UNCOV 11	add_breadcrumb(@request_model.project_title, request_path(@request_model))	1✔
UNCOV 12	add_breadcrumb("Edit Submitted Request")	1✔
13	end
14
15	# PATCH/PUT /edit_requests/1 or /edit_requests/1.json
16	def update	2✔
UNCOV 17	respond_to do \|format\|	2✔
UNCOV 18	if @request_model.update(request_params) && @request_model.valid_to_submit?	2✔
UNCOV 19	format.html { redirect_to request_url(@request_model), notice: I18n.t(:successful_update) }	2✔
UNCOV 20	format.json { render :show, status: :ok, location: @request_model }	1✔
21	else
UNCOV 22	format.html { render :edit, status: :unprocessable_entity }	2✔
UNCOV 23	format.json { render json: @request_model.errors, status: :unprocessable_entity }	1✔
24	end
25	end
26	end
27
28	private	2✔
29
30	# Use callbacks to share common setup or constraints between actions.
31	def set_request_model	2✔
UNCOV 32	@princeton_departments = Affiliation.all	5✔
UNCOV 33	@request_model = Request.find(params[:id])	5✔
34	end
35
36	# Only allow a list of trusted parameters through.
37	def request_params	2✔
UNCOV 38	request_params = params.fetch(:request, {}).permit(:request_title, :project_title, :state, :data_sponsor, :data_manager,	2✔
39	:description, :project_purpose, :parent_folder, :project_folder, :project_id, :quota,
40	:requested_by, :storage_size, :storage_unit, :number_of_files, :hpc, :smb, :globus,
41	user_roles: [], departments: [])
42
UNCOV 43	if request_params[:departments].present?	2✔
UNCOV 44	request_params[:departments] = request_params[:departments].compact_blank.map { \|dep_str\| JSON.parse(dep_str) }	3✔
45	end
UNCOV 46	if request_params[:user_roles].present?	2✔
47	request_params[:user_roles] = request_params[:user_roles].compact_blank.map { \|role_str\| JSON.parse(role_str) }	×
48	end
UNCOV 49	move_approved_values(request_params)	2✔
50	end
51
52	def move_approved_values(request_params)	2✔
UNCOV 53	if request_params[:quota].present?	2✔
UNCOV 54	request_params[:approved_quota] = request_params.delete(:quota)	1✔
55	end
UNCOV 56	if request_params[:storage_size].present?	2✔
57	request_params[:approved_storage_size] = request_params.delete(:storage_size)	×
58	end
UNCOV 59	if request_params[:storage_unit].present?	2✔
60	request_params[:approved_storage_unit] = request_params.delete(:storage_unit)	×
61	end
UNCOV 62	request_params	2✔
63	end
64
65	def set_breadcrumbs	2✔
UNCOV 66	add_breadcrumb("Dashboard", dashboard_path)	5✔
UNCOV 67	add_breadcrumb("Requests", requests_path)	5✔
68	end
69
70	def check_access	2✔
UNCOV 71	return if user_eligible_to_modify_request?	5✔
72
73	# request can not be modified by this user, redirect to the request
UNCOV 74	flash[:notice] = I18n.t(:no_modify_submitted)	2✔
UNCOV 75	redirect_to request_path(@request_model)	2✔
76	end
77
78	def user_eligible_to_modify_request?	2✔
79	# elevated privs for the current user
UNCOV 80	if current_user.sysadmin \|\| (current_user.developer && !Rails.env.production?)	5✔
UNCOV 81	true	3✔
82	else
UNCOV 83	false	2✔
84	end
85	end
86	end

pulibrary / tigerdata-app / e70740c6-12b7-42e6-bab1-2069172c3569

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous