5a32c078-c8e0-4482-8351-5851f2d73aae

Committed 24 May 2024 02:36PM UTC coverage: 95.836% (-0.07%) from 95.909%

Build # 5a32c078-c8e0-4482-8351-5851f2d73aae

Build Type

Pull #1813

circleci

Committed by

jrgriffiniii

Commit Message

Removing the unnecessary WorksWizardController#rescue_aasm_error

Pull Request Pull Request #1813: Ensures that one and only one README file is uploaded and that there is one or more files uploaded for any given Work

Run Details

16 of 18 new or added lines in 5 files covered. (88.89%)

1 existing line in 1 file now uncovered.

3268 of 3410 relevant lines covered (95.84%)

221.18 hits per line

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

88.57

/app/controllers/works_wizard_controller.rb

# frozen_string_literal: true

require "nokogiri"
require "open-uri"

# Controller to handle wizard Mode when editing an work
#
# The wizard flow is shown in the [mermaid diagram here](https://github.com/pulibrary/pdc_describe/blob/main/docs/wizard_flow.md).

class WorksWizardController < ApplicationController
  include ERB::Util
  around_action :rescue_aasm_error, only: [:validate, :new_submission_save]

  before_action :load_work, only: [:edit_wizard, :update_wizard, :attachment_select, :attachment_selected,
                                   :file_upload, :file_uploaded, :file_other, :review, :validate,
                                   :readme_select, :readme_uploaded, :readme_uploaded_payload]

  # GET /works/1/edit-wizard
  def edit_wizard
    @wizard_mode = true
    if validate_modification_permissions(work: @work,
                                         uneditable_message: "Can not edit work: #{@work.id} is not editable by #{current_user.uid}",
                                         current_state_message: "Can not edit work: #{@work.id} is not editable in current state by #{current_user.uid}")

      prepare_decorators_for_work_form(@work)
    end
  end

  # PATCH /works/1/update-wizard
  def update_wizard
    edit_helper(:edit_wizard, work_update_additional_path(@work))
  end

  # Prompt to select how to submit their files
  # GET /works/1/attachment_select
  def attachment_select; end

  # User selected a specific way to submit their files
  # POST /works/1/attachment_selected
  def attachment_selected
    @work.files_location = params["attachment_type"]
    @work.save!

    # create a directory for the work if the curator will need to move files by hand
    @work.s3_query_service.create_directory if @work.files_location != "file_upload"

    if params[:save_only] == "true"
      render :attachment_select
    else
      redirect_to file_location_url
    end
  end

  # Allow user to upload files directly
  # GET /works/1/file_upload
  def file_upload
    @work_decorator = WorkDecorator.new(@work, current_user)
  end

  # POST /works/1/upload-files-wizard (called via Uppy)
  def upload_files
    @work = Work.find(params[:id])
    upload_service = WorkUploadsEditService.new(@work, current_user)
    upload_service.update_precurated_file_list(params["files"], [])
  end

  # POST /works/1/file_upload
  def file_uploaded
    upload_service = WorkUploadsEditService.new(@work, current_user)
    # By the time we hit this endpoint files have been uploaded by Uppy submmitting POST requests
    # to /works/1/upload-files-wizard therefore we only need to delete files here and update the upload snapshot.
    @work = upload_service.snapshot_uppy_and_delete_files(deleted_files_param)

    prepare_decorators_for_work_form(@work)
    if params[:save_only] == "true"
      render :file_upload
    else
      redirect_to(work_review_path)
    end
  rescue => ex
    # Notice that we log the URL (rather than @work.doi) because sometimes we are getting a nil @work.
    # The URL will include the ID and might help us troubleshoot the issue further if it happens again.
    # See https://github.com/pulibrary/pdc_describe/issues/1801
    error_message = "Failed to update work snapshot, URL: #{request.url}: #{ex}"
    Rails.logger.error(error_message)
    Honeybadger.notify(error_message)
    flash[:notice] = "Failed to update work snapshot, work: #{@work&.doi}: #{ex}. Please contact rdss@princeton.edu for assistance."

    redirect_to work_file_upload_path(@work)
  end

  # Allow user to indicate where their files are located in the WWW
  # GET /works/1/file_other
  def file_other; end

  # GET /works/1/review
  # POST /works/1/review
  def review
    if request.method == "POST" || request.method == "PATCH"
      @work.location_notes = params["location_notes"]
      @work.save!
      if params[:save_only] == "true"
        render :file_other
      end
    end
  end

  # Validates that the work is ready to be approved
  # POST /works/1/validate-wizard
  # PATCH /works/1/validate-wizard
  def validate
    @work.submission_notes = params["submission_notes"]

    if params[:save_only] == "true"
      @work.save
      render :review
    else
      @work.complete_submission!(current_user)
      redirect_to work_complete_path(@work.id)
    end
  end

  # Show the user the form to select a readme
  # GET /works/1/readme_select
  def readme_select
    readme = Readme.new(@work, current_user)
    @readme = readme.file_name
  end

  # Hit when the user clicks "Save" or "Next" on the README upload process.
  # Notice that this does not really uploads the file, that happens in readme_uploaded_payload.
  # PATCH /works/1/readme_uploaded
  def readme_uploaded
    readme = Readme.new(@work, current_user)
    if params[:save_only] == "true"
      @readme = readme.file_name
      render :readme_select
    else
      redirect_to work_attachment_select_url(@work)
    end
  end

  def files_param
    params["files"]
  end

  # Uploads the README file, called by Uppy.
  # POST /works/1/readme-uploaded-payload
  def readme_uploaded_payload
    raise StandardError("Only one README file can be uploaded.") if files_param.empty?
    raise StandardError("Only one README file can be uploaded.") if files_param.length > 1

    readme_file = files_param.first
    readme = Readme.new(@work, current_user)

    readme_error = readme.attach(readme_file)
    if readme_error.nil?
      render plain: readme.file_name
    else
      # Tell Uppy there was an error uploading the README
      render plain: readme.file_name, status: :internal_server_error
    end
  end

  def file_location_url
    WorkMetadataService.file_location_url(@work)
  end
  helper_method :file_location_url

  private

    def edit_helper(view_name, redirect_url)
      if validate_modification_permissions(work: @work,
                                           uneditable_message: "Can not update work: #{@work.id} is not editable by #{current_user.uid}",
                                           current_state_message: "Can not update work: #{@work.id} is not editable in current state by #{current_user.uid}")
        prepare_decorators_for_work_form(@work)
        if WorkCompareService.update_work(work: @work, update_params:, current_user:)
          if params[:save_only] == "true"
            render view_name
          else
            redirect_to redirect_url
          end
        else
          render view_name, status: :unprocessable_entity
        end
      end
    end

    def load_work
      @work = Work.find(params[:id])
    end

    def patch_params
      return {} unless params.key?(:patch)

      params[:patch]
    end

    def pre_curation_uploads_param
      return if patch_params.nil?

      patch_params[:pre_curation_uploads]
    end

    def deleted_files_param
      deleted_count = (params.dig("work", "deleted_files_count") || "0").to_i
      (1..deleted_count).map { |i| params.dig("work", "deleted_file_#{i}") }.select(&:present?)
    end

    def readme_file_param
      return if patch_params.nil?

      patch_params[:readme_file]
    end

    def rescue_aasm_error_dis
      super
    rescue StandardError => generic_error
      redirect_to root_url, notice: "We apologize, an error was encountered: #{generic_error.message}. Please contact the PDC Describe administrators."
    end

    def redirect_aasm_error(transition_error_message)
      if @work.persisted?
        redirect_to edit_work_wizard_path(id: @work.id), notice: transition_error_message, params:
      else
        redirect_to work_create_new_submission_path(@work), notice: transition_error_message, params:
      end
    end
end

1	# frozen_string_literal: true
2
3	require "nokogiri"	1✔
4	require "open-uri"	1✔
5
6	# Controller to handle wizard Mode when editing an work
7	#
8	# The wizard flow is shown in the [mermaid diagram here](https://github.com/pulibrary/pdc_describe/blob/main/docs/wizard_flow.md).
9
10	class WorksWizardController < ApplicationController	1✔
11	include ERB::Util	1✔
12	around_action :rescue_aasm_error, only: [:validate, :new_submission_save]	1✔
13
14	before_action :load_work, only: [:edit_wizard, :update_wizard, :attachment_select, :attachment_selected,	1✔
15	:file_upload, :file_uploaded, :file_other, :review, :validate,
16	:readme_select, :readme_uploaded, :readme_uploaded_payload]
17
18	# GET /works/1/edit-wizard
19	def edit_wizard	1✔
20	@wizard_mode = true	14✔
21	if validate_modification_permissions(work: @work,	14✔
22	uneditable_message: "Can not edit work: #{@work.id} is not editable by #{current_user.uid}",
23	current_state_message: "Can not edit work: #{@work.id} is not editable in current state by #{current_user.uid}")
24
25	prepare_decorators_for_work_form(@work)	13✔
26	end
27	end
28
29	# PATCH /works/1/update-wizard
30	def update_wizard	1✔
31	edit_helper(:edit_wizard, work_update_additional_path(@work))	12✔
32	end
33
34	# Prompt to select how to submit their files
35	# GET /works/1/attachment_select
36	def attachment_select; end	1✔
37
38	# User selected a specific way to submit their files
39	# POST /works/1/attachment_selected
40	def attachment_selected	1✔
41	@work.files_location = params["attachment_type"]	15✔
42	@work.save!	15✔
43
44	# create a directory for the work if the curator will need to move files by hand
45	@work.s3_query_service.create_directory if @work.files_location != "file_upload"	15✔
46
47	if params[:save_only] == "true"	15✔
48	render :attachment_select	4✔
49	else
50	redirect_to file_location_url	11✔
51	end
52	end
53
54	# Allow user to upload files directly
55	# GET /works/1/file_upload
56	def file_upload	1✔
57	@work_decorator = WorkDecorator.new(@work, current_user)	8✔
58	end
59
60	# POST /works/1/upload-files-wizard (called via Uppy)
61	def upload_files	1✔
62	@work = Work.find(params[:id])	×
63	upload_service = WorkUploadsEditService.new(@work, current_user)	×
64	upload_service.update_precurated_file_list(params["files"], [])	×
65	end
66
67	# POST /works/1/file_upload
68	def file_uploaded	1✔
69	upload_service = WorkUploadsEditService.new(@work, current_user)	10✔
70	# By the time we hit this endpoint files have been uploaded by Uppy submmitting POST requests
71	# to /works/1/upload-files-wizard therefore we only need to delete files here and update the upload snapshot.
72	@work = upload_service.snapshot_uppy_and_delete_files(deleted_files_param)	10✔
73
74	prepare_decorators_for_work_form(@work)	9✔
75	if params[:save_only] == "true"	9✔
76	render :file_upload	2✔
77	else
78	redirect_to(work_review_path)	7✔
79	end
80	rescue => ex
81	# Notice that we log the URL (rather than @work.doi) because sometimes we are getting a nil @work.
82	# The URL will include the ID and might help us troubleshoot the issue further if it happens again.
83	# See https://github.com/pulibrary/pdc_describe/issues/1801
84	error_message = "Failed to update work snapshot, URL: #{request.url}: #{ex}"	1✔
85	Rails.logger.error(error_message)	1✔
86	Honeybadger.notify(error_message)	1✔
87	flash[:notice] = "Failed to update work snapshot, work: #{@work&.doi}: #{ex}. Please contact rdss@princeton.edu for assistance."	1✔
88
89	redirect_to work_file_upload_path(@work)	1✔
90	end
91
92	# Allow user to indicate where their files are located in the WWW
93	# GET /works/1/file_other
94	def file_other; end	1✔
95
96	# GET /works/1/review
97	# POST /works/1/review
98	def review	1✔
99	if request.method == "POST" \|\| request.method == "PATCH"	15✔
100	@work.location_notes = params["location_notes"]	7✔
101	@work.save!	7✔
102	if params[:save_only] == "true"	7✔
103	render :file_other	2✔
104	end
105	end
106	end
107
108	# Validates that the work is ready to be approved
109	# POST /works/1/validate-wizard
110	# PATCH /works/1/validate-wizard
111	def validate	1✔
112	@work.submission_notes = params["submission_notes"]	12✔
113
114	if params[:save_only] == "true"	12✔
115	@work.save	2✔
116	render :review	2✔
117	else
118	@work.complete_submission!(current_user)	10✔
119	redirect_to work_complete_path(@work.id)	7✔
120	end
121	end
122
123	# Show the user the form to select a readme
124	# GET /works/1/readme_select
125	def readme_select	1✔
126	readme = Readme.new(@work, current_user)	14✔
127	@readme = readme.file_name	14✔
128	end
129
130	# Hit when the user clicks "Save" or "Next" on the README upload process.
131	# Notice that this does not really uploads the file, that happens in readme_uploaded_payload.
132	# PATCH /works/1/readme_uploaded
133	def readme_uploaded	1✔
134	readme = Readme.new(@work, current_user)	12✔
135	if params[:save_only] == "true"	12✔
136	@readme = readme.file_name	2✔
137	render :readme_select	2✔
138	else
139	redirect_to work_attachment_select_url(@work)	10✔
140	end
141	end
142
143	def files_param	1✔
144	params["files"]	6✔
145	end
146
147	# Uploads the README file, called by Uppy.
148	# POST /works/1/readme-uploaded-payload
149	def readme_uploaded_payload	1✔
150	raise StandardError("Only one README file can be uploaded.") if files_param.empty?	2✔
151	raise StandardError("Only one README file can be uploaded.") if files_param.length > 1	2✔
152
153	readme_file = files_param.first	2✔
154	readme = Readme.new(@work, current_user)	2✔
155
156	readme_error = readme.attach(readme_file)	2✔
157	if readme_error.nil?	2✔
158	render plain: readme.file_name	1✔
159	else
160	# Tell Uppy there was an error uploading the README
161	render plain: readme.file_name, status: :internal_server_error	1✔
162	end
163	end
164
165	def file_location_url	1✔
166	WorkMetadataService.file_location_url(@work)	24✔
167	end
168	helper_method :file_location_url	1✔
169
170	private	1✔
171
172	def edit_helper(view_name, redirect_url)	1✔
173	if validate_modification_permissions(work: @work,	22✔
174	uneditable_message: "Can not update work: #{@work.id} is not editable by #{current_user.uid}",
175	current_state_message: "Can not update work: #{@work.id} is not editable in current state by #{current_user.uid}")
176	prepare_decorators_for_work_form(@work)	22✔
177	if WorkCompareService.update_work(work: @work, update_params:, current_user:)	22✔
178	if params[:save_only] == "true"	21✔
179	render view_name	3✔
180	else
181	redirect_to redirect_url	18✔
182	end
183	else
184	render view_name, status: :unprocessable_entity	1✔
185	end
186	end
187	end
188
189	def load_work	1✔
190	@work = Work.find(params[:id])	154✔
191	end
192
193	def patch_params	1✔
194	return {} unless params.key?(:patch)	×
195
196	params[:patch]	×
197	end
198
199	def pre_curation_uploads_param	1✔
200	return if patch_params.nil?	×
201
202	patch_params[:pre_curation_uploads]	×
203	end
204
205	def deleted_files_param	1✔
206	deleted_count = (params.dig("work", "deleted_files_count") \|\| "0").to_i	10✔
207	(1..deleted_count).map { \|i\| params.dig("work", "deleted_file_#{i}") }.select(&:present?)	13✔
208	end
209
210	def readme_file_param	1✔
211	return if patch_params.nil?	×
212
213	patch_params[:readme_file]	×
214	end
215
216	def rescue_aasm_error_dis	1✔
UNCOV 217	super	×
218	rescue StandardError => generic_error
219	redirect_to root_url, notice: "We apologize, an error was encountered: #{generic_error.message}. Please contact the PDC Describe administrators."	×
220	end
221
222	def redirect_aasm_error(transition_error_message)	1✔
223	if @work.persisted?	3✔
224	redirect_to edit_work_wizard_path(id: @work.id), notice: transition_error_message, params:	3✔
225	else
226	redirect_to work_create_new_submission_path(@work), notice: transition_error_message, params:	×
227	end
228	end
229	end

pulibrary / pdc_describe / 5a32c078-c8e0-4482-8351-5851f2d73aae

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