Media type not required

app/forms/hyrax/physical_instantiation_form.rb

@@ -13,7 +13,7 @@ class PhysicalInstantiationForm < Hyrax::Forms::WorkForm
                    :keyword, :license, :rights_statement, :publisher, :subject, :identifier, :based_near, :related_url,
                    :bibliographic_citation, :source]
     self.required_fields -= [:creator, :keyword, :rights_statement]
-    self.required_fields += [:format, :location, :media_type, :holding_organization]
+    self.required_fields += [:format, :location, :holding_organization]
 
     self.single_valued_fields = [:title]
 

app/forms/physical_instantiation_resource_form.rb

@@ -16,7 +16,7 @@ class PhysicalInstantiationResourceForm < Hyrax::Forms::ResourceForm(PhysicalIns
 
   attr_accessor :controller, :current_ability
 
-  self.required_fields += [:format, :location, :media_type, :holding_organization]
+  self.required_fields += [:format, :location, :holding_organization]
 
   self.single_valued_fields = [:title]
 

app/models/digital_instantiation.rb

@@ -27,7 +27,6 @@ class DigitalInstantiation < ActiveFedora::Base
 
   validates :location, presence: { message: 'Your work must have a Location.' }
   validates :digital_format, presence: { message: 'Your work must have a Digital Format.' }
-  validates :media_type, presence: { message: 'Your work must have a Media Type.' }
   validates :duration, format: { with: AMS::TimeCodeService.regex, allow_blank: true, message: "Invalid format for duration. Use HH:MM:SS, H:MM:SS, MM:SS, or M:SS" }
   validates :time_start, format: { with: AMS::TimeCodeService.regex, allow_blank: true, message: "Invalid format for time start. Use HH:MM:SS, H:MM:SS, MM:SS, or M:SS" }
 

app/models/digital_instantiation_resource.rb

@@ -61,7 +61,6 @@ def aapb_invalid_message
     msg = []
     msg << "#{self.id} title is required" unless title.present?
     msg << "#{self.id} location is required" unless location.present?
-    msg << "#{self.id} media_type is required" unless media_type.present?
     msg << "#{self.id} holding_organization is required" unless holding_organization.present?
     msg.to_sentence if msg.present?
   end

app/models/physical_instantiation.rb

@@ -14,7 +14,6 @@ class PhysicalInstantiation < ActiveFedora::Base
 
   validates :format, presence: { message: 'Your work must have a format.' }
   validates :location, presence: { message: 'Your work must have a location.' }
-  validates :media_type, presence: { message: 'Your work must have a media type.' }
   validates :duration, format: { with: AMS::TimeCodeService.regex, allow_blank: true, message: "Invalid format for duration. Use HH:MM:SS, H:MM:SS, MM:SS, or M:SS" }
   # Custom validation block for time_start multi-valued field.
   validate do |physical_instantiation|

app/models/physical_instantiation_resource.rb

@@ -42,7 +42,6 @@ def aapb_invalid_message
     msg = []
     msg << "#{self.id} format is required" unless format.present?
     msg << "#{self.id} location is required" unless location.present?
-    msg << "#{self.id} media_type is required" unless media_type.present?
     msg << "#{self.id} holding_organization is required" unless holding_organization.present?
     msg.to_sentence if msg.present?
   end

spec/factories/digital_instantiation.rb

@@ -29,6 +29,10 @@
       media_type { "Sound" }
     end
 
+    trait :without_media_type do
+      media_type { nil }
+    end
+
     transient do
       # Pass in InstantiationAdminData.gid or it will create one for you!
       with_instantiation_admin_data { false }

spec/factories/physical_instantiation.rb

@@ -8,6 +8,10 @@
     local_instantiation_identifier { [ "1234" ] }
     location { "Test location" }
     media_type { "Test media_type" }
+
+    trait :without_media_type do
+      media_type { nil }
+    end
   end
 
   factory :minimal_physical_instantiation, class: PhysicalInstantiation do
@@ -16,5 +20,9 @@
     annotation { ["Minimal annotation"] }
     location { "Minimal location" }
     media_type { "Minimal media_type" }
+
+    trait :without_media_type do
+      media_type { nil }
+    end
   end
 end

spec/models/digital_instantiation_spec.rb

@@ -63,8 +63,14 @@
         expect(digital_instantiation.resource.dump(:ttl)).to match(/terms\/type/)
         expect(digital_instantiation.media_type.include?("Test media_type")).to be true
       end
+
+      it "handles absence of media_type gracefully" do
+      digital_instantiation.media_type = nil
+      expect(digital_instantiation.resource.dump(:ttl)).not_to match(/terms\/type/)
+      expect(digital_instantiation.media_type).to be_nil
+      end
     end
-
+        
     context "generations" do
       let(:digital_instantiation) { FactoryBot.build(:digital_instantiation) }
       it "has generations" do

spec/models/physical_instantiation_spec.rb

@@ -72,6 +72,12 @@
         expect(physical_instantiation.resource.dump(:ttl)).to match(/terms\/type/)
         expect(physical_instantiation.media_type.include?("Test media_type")).to be true
       end
+
+      it "handles absence of media_type gracefully" do
+      physical_instantiation.media_type = nil
+      expect(physical_instantiation.resource.dump(:ttl)).not_to match(/terms\/type/)
+      expect(physical_instantiation.media_type).to be_nil
+      end
     end
 
     context "generations" do