5cde93f4-daa3-4f98-bc15-0daddc4f2a00

Committed 30 Jul 2025 06:39PM UTC coverage: 74.099% (-1.5%) from 75.625%

Build # 5cde93f4-daa3-4f98-bc15-0daddc4f2a00

Build Type

Pull #1657

circleci

Committed by

web-flow

Commit Message

Merge branch 'main' into i1632-save-data-users

Pull Request Pull Request #1657: Add data users to a project after it is created in mediaflux

Run Details

0 of 62 new or added lines in 3 files covered. (0.0%)

1 existing line in 1 file now uncovered.

2240 of 3023 relevant lines covered (74.1%)

309.56 hits per line

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

98.44

/app/models/request.rb

# frozen_string_literal: true
class Request < ApplicationRecord
  DRAFT = "draft" # default state set by database
  SUBMITTED = "submitted" # Ready to be approved

  def valid_to_submit?
    errors.clear
    # run all validations and then check for errors otherwise ruby stops at the first error
    valid_title?
    valid_data_sponsor?
    valid_data_manager?
    valid_departments?
    valid_quota?
    valid_description?
    # Is parent folder really required?  For Skeletor let's skip it.
    # valid_parent_folder?
    valid_project_folder?
    # For Skeletor we are setting the requestor to the data sponsor
    # valid_requested_by?
    errors.count == 0
  end

  def valid_title?
    field_present?(project_title, :project_title)
  end

  def valid_data_sponsor?
    valid_uid?(data_sponsor, :data_sponsor)
  end

  def valid_data_manager?
    valid_uid?(data_manager, :data_manager)
  end

  def valid_departments?
    field_present?(departments, :departments)
  end

  def valid_description?
    field_present?(description, :description)
  end

  def valid_parent_folder?
    field_present?(parent_folder, :parent_folder)
  end

  def valid_project_folder?
    field_present?(project_folder, :project_folder)
  end

  def valid_quota?
    if ((quota == "500 GB") || (quota == "2 TB") || (quota == "10 TB") || (quota == "25 TB")) ||
       (custom_quota? && (storage_size.present? && (storage_size > 0)) && ((storage_unit == "GB") || (storage_unit == "TB")))
      true
    else
      errors.add(:quota, :invalid, message: "must be one of '500 GB', '2 TB', '10 TB', '25 TB', or 'custom'")
      false
    end
  end

  def custom_quota?
    quota == "custom"
  end

  def valid_requested_by?
    field_present?(requested_by, :requested_by)
  end

  def approve(approver)
    project_metadata_json = RequestProjectMetadata.convert(self)
    # Create the project in the Rails database
    project = Project.create!({ metadata_json: project_metadata_json })
    project.draft_doi
    project.save!
    create_in_mediaflux(project:, approver:)
    project
  end

  private

    def field_present?(value, name)
      if value.present?
        true
      else
        errors.add(name, :invalid, message: "cannot be empty")
        false
      end
    end

    def valid_uid?(uid, field)
      if uid.blank?
        errors.add(field, :blank, message: "cannot be empty")
        false
      elsif User.where(uid: uid).count == 0
        errors.add(field, :invalid, message: "must be a valid user")
        false
      else
        true
      end
    end

    def create_in_mediaflux(project:, approver:)
      # Create the project in Mediaflux
      project.approve!(current_user: approver)
    rescue Project::ProjectCreateError => ex
      # Save the error within the Request object
      self.error_message = { message: ex.message }
      save!
      # ..and get rid of the Rails project
      project.destroy!
      raise "Error approving request #{id}"
    end
end

1	# frozen_string_literal: true
2	class Request < ApplicationRecord	1✔
3	DRAFT = "draft" # default state set by database	1✔
4	SUBMITTED = "submitted" # Ready to be approved	1✔
5
6	def valid_to_submit?	1✔
7	errors.clear	22✔
8	# run all validations and then check for errors otherwise ruby stops at the first error
9	valid_title?	22✔
10	valid_data_sponsor?	22✔
11	valid_data_manager?	22✔
12	valid_departments?	22✔
13	valid_quota?	22✔
14	valid_description?	22✔
15	# Is parent folder really required? For Skeletor let's skip it.
16	# valid_parent_folder?
17	valid_project_folder?	22✔
18	# For Skeletor we are setting the requestor to the data sponsor
19	# valid_requested_by?
20	errors.count == 0	22✔
21	end
22
23	def valid_title?	1✔
24	field_present?(project_title, :project_title)	24✔
25	end
26
27	def valid_data_sponsor?	1✔
28	valid_uid?(data_sponsor, :data_sponsor)	25✔
29	end
30
31	def valid_data_manager?	1✔
32	valid_uid?(data_manager, :data_manager)	25✔
33	end
34
35	def valid_departments?	1✔
36	field_present?(departments, :departments)	24✔
37	end
38
39	def valid_description?	1✔
40	field_present?(description, :description)	24✔
41	end
42
43	def valid_parent_folder?	1✔
44	field_present?(parent_folder, :parent_folder)	2✔
45	end
46
47	def valid_project_folder?	1✔
48	field_present?(project_folder, :project_folder)	24✔
49	end
50
51	def valid_quota?	1✔
52	if ((quota == "500 GB") \|\| (quota == "2 TB") \|\| (quota == "10 TB") \|\| (quota == "25 TB")) \|\|	30✔
53	(custom_quota? && (storage_size.present? && (storage_size > 0)) && ((storage_unit == "GB") \|\| (storage_unit == "TB")))	4✔
54	true	27✔
55	else
56	errors.add(:quota, :invalid, message: "must be one of '500 GB', '2 TB', '10 TB', '25 TB', or 'custom'")	3✔
57	false	3✔
58	end
59	end
60
61	def custom_quota?	1✔
62	quota == "custom"	7✔
63	end
64
65	def valid_requested_by?	1✔
66	field_present?(requested_by, :requested_by)	2✔
67	end
68
69	def approve(approver)	1✔
70	project_metadata_json = RequestProjectMetadata.convert(self)	1✔
71	# Create the project in the Rails database
72	project = Project.create!({ metadata_json: project_metadata_json })	1✔
73	project.draft_doi	1✔
74	project.save!	1✔
75	create_in_mediaflux(project:, approver:)	1✔
UNCOV 76	project	×
77	end
78
79	private	1✔
80
81	def field_present?(value, name)	1✔
82	if value.present?	100✔
83	true	38✔
84	else
85	errors.add(name, :invalid, message: "cannot be empty")	62✔
86	false	62✔
87	end
88	end
89
90	def valid_uid?(uid, field)	1✔
91	if uid.blank?	50✔
92	errors.add(field, :blank, message: "cannot be empty")	25✔
93	false	25✔
94	elsif User.where(uid: uid).count == 0	25✔
95	errors.add(field, :invalid, message: "must be a valid user")	2✔
96	false	2✔
97	else
98	true	23✔
99	end
100	end
101
102	def create_in_mediaflux(project:, approver:)	1✔
103	# Create the project in Mediaflux
104	project.approve!(current_user: approver)	1✔
105	rescue Project::ProjectCreateError => ex
106	# Save the error within the Request object
107	self.error_message = { message: ex.message }	1✔
108	save!	1✔
109	# ..and get rid of the Rails project
110	project.destroy!	1✔
111	raise "Error approving request #{id}"	1✔
112	end
113	end

pulibrary / tigerdata-app / 5cde93f4-daa3-4f98-bc15-0daddc4f2a00

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