also include the short name, but with addition of department, and also fixed the address #2379

Author: stuzart

lib/seek/bio_schema/resource_decorators/institution.rb

@@ -5,12 +5,22 @@ module ResourceDecorators
       class Institution < Thing
         schema_mappings full_address: :address,
                         image: :logo,
-                        ror_url: :identifier
+                        ror_url: :identifier,
+                        base_title: :name,
+                        department_organization: :department
 
         def schema_type
           'ResearchOrganization'
         end
 
+        def department_organization
+          return nil if department.blank?
+          {
+            '@type': 'Organization',
+            name: department
+          }
+        end
+
         def url
           web_page.blank? ? identifier : web_page
         end
@@ -21,9 +31,10 @@ def conformance
 
         def full_address
           full = {}
-          full[:address_country] = country
-          full[:address_locality] = city unless city.blank?
-          full[:street_address] = address unless address.blank?
+          full[:@type]='PostalAddress'
+          full[:addressCountry] = country
+          full[:addressLocality] = city unless city.blank?
+          full[:streetAddress] = address unless address.blank?
           full
         end
       end

test/unit/bio_schema/schema_ld_generation_test.rb

@@ -696,14 +696,22 @@ def setup
       '@type' => 'ResearchOrganization',
       'dct:conformsTo' => 'https://schema.org/ResearchOrganization',
       '@id' => "http://localhost:3000/institutions/#{institution.id}",
-      "name"=>"Manchester Institute of Biotechnology, University of Manchester",
+      "name"=>"University of Manchester",
+      "department"=>{"@type"=>"Organization", "name"=>"Manchester Institute of Biotechnology"},
       'url' => 'http://www.manchester.ac.uk/',
       'identifier' => 'https://ror.org/027m9bs27',
-      "address"=>{"address_country"=>"GB", "address_locality"=>"Manchester", "street_address"=>"Manchester Centre for Integrative Systems Biology, MIB/CEAS, The University of Manchester Faraday Building, Sackville Street, Manchester M60 1QD United Kingdom"}
+      "address"=>{"@type"=>"PostalAddress","addressCountry"=>"GB", "addressLocality"=>"Manchester", "streetAddress"=>"Manchester Centre for Integrative Systems Biology, MIB/CEAS, The University of Manchester Faraday Building, Sackville Street, Manchester M60 1QD United Kingdom"}
     }
 
     json = JSON.parse(institution.to_schema_ld)
     assert_equal expected, json
+
+    # check without ror_id and department
+    institution.update_columns(department:'', ror_id:nil)
+    json = JSON.parse(institution.to_schema_ld)
+    expected.delete('department')
+    expected.delete('identifier')
+    assert_equal expected, json
   end
 
   test 'organism' do