7031ff5b-e2d7-4285-af8b-e7b55adfc48a

Build # 7031ff5b-e2d7-4285-af8b-e7b55adfc48a

Build Type

circleci

Committed by mccalluc

Commit Message

Finish removal of explicit if-then in js

Pull Request Pull Request #899: Move messages up to sidebar on the right which can be toggled

Run Details

1623 of 1788 relevant lines covered (90.77%)

105.5 hits per line

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

89.19

/app/models/pdc_metadata/related_object.rb

# frozen_string_literal: true
# Class for storing a related object
module PDCMetadata
  # let(:related_identifier) { "https://www.biorxiv.org/content/10.1101/545517v1" }
  # let(:related_identifier_type) { "arXiv" }
  # let(:relation_type) { "IsCitedBy" }
  class RelatedObject
    attr_accessor :related_identifier, :related_identifier_type, :relation_type, :errors

    def initialize(related_identifier:, related_identifier_type:, relation_type:)
      @related_identifier = related_identifier
      @related_identifier_type = related_identifier_type
      @relation_type = relation_type

      # TODO: Older records have a different format.
      # When we migrate these, then this can be removed.
      unless related_identifier_type.blank? || valid_related_identifier_type?
        @related_identifier_type = ::Datacite::Mapping::RelatedIdentifierType.find do |obj|
          ::PDCMetadata.fuzzy_match(obj, related_identifier_type)
        end.value
      end
      unless relation_type.blank? || valid_relation_type?
        @relation_type = ::Datacite::Mapping::RelationType.find do |obj|
          ::PDCMetadata.fuzzy_match(obj, relation_type)
        end.value
      end

      @errors = []
    end

    def valid?
      valid = related_identifier.present? && valid_related_identifier_type? && valid_relation_type?
      return valid if valid
      if related_identifier.blank?
        errors << "Related identifier is missing"
      else
        errors << "Related Identifier Type is missing or invalid for #{related_identifier}" unless valid_related_identifier_type?
        errors << "Relationship Type is missing or invalid for #{related_identifier}" unless valid_relation_type?
      end
      false
    end

    def value
      @related_identifier
    end

    def compare_value
      "#{related_identifier} ('#{relation_type}' relation #{related_identifier_type})"
    end

    def self.new_related_object(related_identifier, related_identifier_type, relation_type)
      RelatedObject.new(related_identifier: related_identifier, related_identifier_type: related_identifier_type, relation_type: relation_type)
    end

    private

      def valid_related_identifier_type?
        @valid_related_identifier_type ||= valid_type_values.include?(related_identifier_type)
      end

      def valid_relation_type?
        @valid_relation_type ||= valid_relationship_types.include?(relation_type)
      end

      def valid_type_values
        @valid_type_values ||= Datacite::Mapping::RelatedIdentifierType.map(&:value)
      end

      def valid_relationship_types
        @valid_relationship_types ||= Datacite::Mapping::RelationType.map(&:value)
      end
  end
end

1	# frozen_string_literal: true
2	# Class for storing a related object
3	module PDCMetadata	1✔
4	# let(:related_identifier) { "https://www.biorxiv.org/content/10.1101/545517v1" }
5	# let(:related_identifier_type) { "arXiv" }
6	# let(:relation_type) { "IsCitedBy" }
7	class RelatedObject	1✔
8	attr_accessor :related_identifier, :related_identifier_type, :relation_type, :errors	1✔
9
10	def initialize(related_identifier:, related_identifier_type:, relation_type:)	1✔
11	@related_identifier = related_identifier	112✔
12	@related_identifier_type = related_identifier_type	112✔
13	@relation_type = relation_type	112✔
14
15	# TODO: Older records have a different format.
16	# When we migrate these, then this can be removed.
17	unless related_identifier_type.blank? \|\| valid_related_identifier_type?	112✔
18	@related_identifier_type = ::Datacite::Mapping::RelatedIdentifierType.find do \|obj\|	×
19	::PDCMetadata.fuzzy_match(obj, related_identifier_type)	×
20	end.value
21	end
22	unless relation_type.blank? \|\| valid_relation_type?	112✔
23	@relation_type = ::Datacite::Mapping::RelationType.find do \|obj\|	×
24	::PDCMetadata.fuzzy_match(obj, relation_type)	×
25	end.value
26	end
27
28	@errors = []	112✔
29	end
30
31	def valid?	1✔
32	valid = related_identifier.present? && valid_related_identifier_type? && valid_relation_type?	8✔
33	return valid if valid	8✔
34	if related_identifier.blank?	5✔
35	errors << "Related identifier is missing"	1✔
36	else
37	errors << "Related Identifier Type is missing or invalid for #{related_identifier}" unless valid_related_identifier_type?	4✔
38	errors << "Relationship Type is missing or invalid for #{related_identifier}" unless valid_relation_type?	4✔
39	end
40	false	5✔
41	end
42
43	def value	1✔
44	@related_identifier	1✔
45	end
46
47	def compare_value	1✔
48	"#{related_identifier} ('#{relation_type}' relation #{related_identifier_type})"	3✔
49	end
50
51	def self.new_related_object(related_identifier, related_identifier_type, relation_type)	1✔
52	RelatedObject.new(related_identifier: related_identifier, related_identifier_type: related_identifier_type, relation_type: relation_type)	5✔
53	end
54
55	private	1✔
56
57	def valid_related_identifier_type?	1✔
58	@valid_related_identifier_type \|\|= valid_type_values.include?(related_identifier_type)	109✔
59	end
60
61	def valid_relation_type?	1✔
62	@valid_relation_type \|\|= valid_relationship_types.include?(relation_type)	106✔
63	end
64
65	def valid_type_values	1✔
66	@valid_type_values \|\|= Datacite::Mapping::RelatedIdentifierType.map(&:value)	104✔
67	end
68
69	def valid_relationship_types	1✔
70	@valid_relationship_types \|\|= Datacite::Mapping::RelationType.map(&:value)	102✔
71	end
72	end
73	end

pulibrary / pdc_describe / 7031ff5b-e2d7-4285-af8b-e7b55adfc48a

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