Changes availability output to 5 states

umich_catalog_indexing/lib/umich_traject/availability.rb

@@ -39,6 +39,14 @@ def electronic_holding?
         @hol.select { |x| ALMA_ELECTRONIC_LIBRARIES.any?(x["library"]) }.any?
       end
 
+      def hathi_trust_or_electronic_holding?
+        hathi_trust? || electronic_holding?
+      end
+
+      def hathi_trust_full_text_or_electronic_holding?
+        hathi_trust_full_text? || electronic_holding?
+      end
+
       # Returns an array of availabilies for the holding structure. This is the
       # method that's called by the application.
       # @return [Array<String>]
@@ -47,7 +55,8 @@ def to_a
           "physical",
           "hathi_trust",
           "hathi_trust_full_text",
-          "electronic_holding"
+          "hathi_trust_or_electronic_holding",
+          "hathi_trust_full_text_or_electronic_holding"
         ].select { |x| send(:"#{x}?") }
       end
 

umich_catalog_indexing/spec/traject/umich/availability_spec.rb

@@ -53,10 +53,38 @@
     end
   end
 
+  context "hathi_trust_or_electronic_holding?" do
+    it "returns true when hathitrust item" do
+      expect(subject.hathi_trust_or_electronic_holding?).to eq(true)
+    end
+    it "returns true when there's an electronic holding" do
+      @hol[1]["library"] = "ELEC"
+      expect(subject.hathi_trust_or_electronic_holding?).to eq(true)
+    end
+    it "returns false when there's no electronic or HT record" do
+      @hol.delete_at(1)
+      expect(subject.hathi_trust_or_electronic_holding?).to eq(false)
+    end
+  end
+
+  context "hathi_trust_full_text_or_electronic_holding?" do
+    it "returns false when neither ht full text or electronic holding" do
+      expect(subject.hathi_trust_full_text_or_electronic_holding?).to eq(false)
+    end
+    it "returns true when hathitrust full text" do
+      @hol[1]["items"].push({"rights" => "pd"})
+      expect(subject.hathi_trust_full_text_or_electronic_holding?).to eq(true)
+    end
+    it "returns true when there's an electronic holding" do
+      @hol[1]["library"] = "ELEC"
+      expect(subject.hathi_trust_full_text_or_electronic_holding?).to eq(true)
+    end
+  end
+
   context "#to_a" do
     it "returns an array of availability values" do
       expect(subject.to_a).to contain_exactly(
-        "physical", "hathi_trust"
+        "physical", "hathi_trust", "hathi_trust_or_electronic_holding"
       )
     end
   end