2acb579e-26b6-42c4-b006-ae86d3956b5f

Committed 31 Mar 2025 06:47PM UTC coverage: 95.864% (+0.09%) from 95.771%

Build # 2acb579e-26b6-42c4-b006-ae86d3956b5f

Build Type

push

circleci

Committed by

web-flow

Commit Message

Improving messges for curators/moderators (#2066)

* Adding new submission and review message for curators

* refactoring how aasm states are accessed & adding from_state checks in the work spec

* Pulling out common logic into its own method

* accessing the from state in the work activity notification

* adding a todo note

* fixing reject message bug

* cleaning up leftover comments

* adding comment

* refactor the check from state method
adding work state spec tests

Run Details

39 of 41 new or added lines in 3 files covered. (95.12%)

3430 of 3578 relevant lines covered (95.86%)

403.14 hits per line

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

95.35

/app/mailers/notification_mailer.rb

# frozen_string_literal: true
class NotificationMailer < ApplicationMailer
  include Rails.application.routes.url_helpers

  def build_message
    @user = params[:user]
    @work_activity = params[:work_activity]

    @subject = "[pdc-describe] New Notification"
    @message = @work_activity.message
    @message_html = @work_activity.to_html
    @url = work_url(@work_activity.work)

    @url = check_url(@url)
    mail(to: @user.email, subject: @subject)
  end

  def new_submission_message
    @user = params[:user]
    @work_activity = params[:work_activity]

    @subject = "[pdc-describe] New Submission Created"
    @message = @work_activity.message
    @message_html = @work_activity.to_html
    @url = work_url(@work_activity.work)

    @url = check_url(@url)
    mail(to: @user.email, subject: @subject)
  end

  def review_message
    @user = params[:user]
    @work_activity = params[:work_activity]

    @subject = "[pdc-describe] Submission Ready for Review"
    @message = @work_activity.message
    @message_html = @work_activity.to_html
    @url = work_url(@work_activity.work)

    @url = check_url(@url)
    mail(to: @user.email, subject: @subject)
  end

  def reject_message
    @user = params[:user]
    @work_activity = params[:work_activity]

    @subject = "[pdc-describe] Submission Returned"
    @message = @work_activity.message
    @message_html = @work_activity.to_html
    @url = work_url(@work_activity.work)

    @url = check_url(@url)
    mail(to: @user.email, subject: @subject)
  end

  def check_url(url)
    # Troubleshooting https://github.com/pulibrary/pdc_describe/issues/1783
    if url.include?("/describe/describe/")
      Rails.logger.error("URL #{url} included /describe/describe/ and was fixed. See https://github.com/pulibrary/pdc_describe/issues/1783")
      url = url.gsub("/describe/describe/", "/describe/")
    end
    url
  end
end

1	# frozen_string_literal: true
2	class NotificationMailer < ApplicationMailer	2✔
3	include Rails.application.routes.url_helpers	2✔
4
5	def build_message	2✔
6	@user = params[:user]	4✔
7	@work_activity = params[:work_activity]	4✔
8
9	@subject = "[pdc-describe] New Notification"	4✔
10	@message = @work_activity.message	4✔
11	@message_html = @work_activity.to_html	4✔
12	@url = work_url(@work_activity.work)	4✔
13
14	@url = check_url(@url)	4✔
15	mail(to: @user.email, subject: @subject)	4✔
16	end
17
18	def new_submission_message	2✔
19	@user = params[:user]	10✔
20	@work_activity = params[:work_activity]	10✔
21
22	@subject = "[pdc-describe] New Submission Created"	10✔
23	@message = @work_activity.message	10✔
24	@message_html = @work_activity.to_html	10✔
25	@url = work_url(@work_activity.work)	10✔
26
27	@url = check_url(@url)	10✔
28	mail(to: @user.email, subject: @subject)	10✔
29	end
30
31	def review_message	2✔
32	@user = params[:user]	4✔
33	@work_activity = params[:work_activity]	4✔
34
35	@subject = "[pdc-describe] Submission Ready for Review"	4✔
36	@message = @work_activity.message	4✔
37	@message_html = @work_activity.to_html	4✔
38	@url = work_url(@work_activity.work)	4✔
39
40	@url = check_url(@url)	4✔
41	mail(to: @user.email, subject: @subject)	4✔
42	end
43
44	def reject_message	2✔
45	@user = params[:user]	4✔
46	@work_activity = params[:work_activity]	4✔
47
48	@subject = "[pdc-describe] Submission Returned"	4✔
49	@message = @work_activity.message	4✔
50	@message_html = @work_activity.to_html	4✔
51	@url = work_url(@work_activity.work)	4✔
52
53	@url = check_url(@url)	4✔
54	mail(to: @user.email, subject: @subject)	4✔
55	end
56
57	def check_url(url)	2✔
58	# Troubleshooting https://github.com/pulibrary/pdc_describe/issues/1783
59	if url.include?("/describe/describe/")	22✔
NEW 60	Rails.logger.error("URL #{url} included /describe/describe/ and was fixed. See https://github.com/pulibrary/pdc_describe/issues/1783")	×
NEW 61	url = url.gsub("/describe/describe/", "/describe/")	×
62	end
63	url	22✔
64	end
65	end

pulibrary / pdc_describe / 2acb579e-26b6-42c4-b006-ae86d3956b5f

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