Merge pull request #6950 from andrewpbrett/fix-nil-enterprise-category

Fix #6949: Add default icon value if enterprise.category is nil

app/serializers/api/cached_enterprise_serializer.rb

@@ -129,7 +129,7 @@ module Api
         producer_shop: "map_003-producer-shop.svg",
         producer: "map_001-producer-only.svg",
       }
-      "/map_icons/" + icons[enterprise.category]
+      "/map_icons/" + (icons[enterprise.category] || "map_001-producer-only.svg")
     end
 
     # Choose regular icon font for enterprises.

app/serializers/api/enterprise_shopfront_list_serializer.rb

@@ -19,7 +19,7 @@ module Api
         producer_shop: "map_003-producer-shop.svg",
         producer: "map_001-producer-only.svg",
       }
-      "/map_icons/" + icons[enterprise.category]
+      "/map_icons/" + (icons[enterprise.category] || "map_001-producer-only.svg")
     end
 
     def icon_font

spec/serializers/api/cached_enterprise_serializer_spec.rb

@@ -97,4 +97,26 @@ describe Api::CachedEnterpriseSerializer do
       end
     end
   end
+
+  describe '#icon' do
+    context "enterpise has a unrecognized category" do
+      before do
+        allow(enterprise).to receive(:category) { "unknown_category" }
+      end
+
+      it "returns the map producer icon" do
+        expect(cached_enterprise_serializer.icon).to eq("/map_icons/map_001-producer-only.svg")
+      end
+    end
+
+    context "enterpise has a nil category" do
+      before do
+        allow(enterprise).to receive(:category) { nil }
+      end
+
+      it "returns the map producer icon" do
+        expect(cached_enterprise_serializer.icon).to eq("/map_icons/map_001-producer-only.svg")
+      end
+    end
+  end
 end

spec/serializers/api/enterprise_shopfront_list_serializer_spec.rb

@@ -19,4 +19,26 @@ describe Api::EnterpriseShopfrontListSerializer do
   it "serializes icons" do
     expect(serializer.to_json).to match "map_005-hub.svg"
   end
+
+  describe '#icon' do
+    context "enterpise has a unrecognized category" do
+      before do
+        allow(enterprise).to receive(:category) { "unknown_category" }
+      end
+
+      it "returns the map producer icon" do
+        expect(serializer.icon).to eq("/map_icons/map_001-producer-only.svg")
+      end
+    end
+
+    context "enterpise has a nil category" do
+      before do
+        allow(enterprise).to receive(:category) { nil }
+      end
+
+      it "returns the map producer icon" do
+        expect(serializer.icon).to eq("/map_icons/map_001-producer-only.svg")
+      end
+    end
+  end
 end