v3-remove service plans cost when currency not set

Author: FelisiaM

app/presenters/v3/service_plan_presenter.rb

@@ -63,11 +63,13 @@ def costs
             metadata[:costs].each do |cost|
               unit = cost[:unit].to_s
               cost[:amount].each do |currency, amount|
-                cost_result << {
-                  currency: currency.to_s.upcase,
-                  amount: amount.to_f,
-                  unit: unit || ''
-                }
+                unless currency.empty?
+                  cost_result << {
+                    currency: currency.to_s.upcase,
+                    amount: amount.to_f,
+                    unit: unit
+                  }
+                end
               end
             end
           end

spec/unit/presenters/v3/service_plan_presenter_spec.rb

@@ -162,9 +162,16 @@
           {
             "amount": {
               "usd": 649.0,
-              "gbp": 600.015454
+              "gbp": 500
             },
             "unit": "MONTHLY"
+          },
+          {
+            "amount": {
+              "usd": 6.00,
+              "gbp": 5.05
+            },
+            "unit": "daily"
           }
         ]}')
 
@@ -174,9 +181,17 @@
         expect(result[:costs][0][:currency]).to eq('USD')
         expect(result[:costs][0][:unit]).to eq('MONTHLY')
 
-        expect(result[:costs][1][:amount]).to eq(600.015454)
+        expect(result[:costs][1][:amount]).to eq(500.0)
         expect(result[:costs][1][:currency]).to eq('GBP')
         expect(result[:costs][1][:unit]).to eq('MONTHLY')
+
+        expect(result[:costs][2][:amount]).to eq(6.00)
+        expect(result[:costs][2][:currency]).to eq('USD')
+        expect(result[:costs][2][:unit]).to eq('daily')
+
+        expect(result[:costs][3][:amount]).to eq(5.05)
+        expect(result[:costs][3][:currency]).to eq('GBP')
+        expect(result[:costs][3][:unit]).to eq('daily')
       end
 
       it 'handles currency symbols' do
@@ -196,6 +211,35 @@
         expect(result[:costs][0][:currency]).to eq('$')
         expect(result[:costs][0][:unit]).to eq('Daily')
       end
+
+      it 'skips when currency is empty string' do
+        service_plan =
+          VCAP::CloudController::ServicePlan.make(extra: '{"costs": [
+          {
+            "amount": {
+              "gpb": 0.06
+            },
+            "unit": "Daily"
+          },
+          {
+            "amount": {
+              "": 0.06,
+              "usd": 0.10
+            },
+            "unit": "Daily"
+          }
+        ]}')
+
+        result = described_class.new(service_plan).to_hash.deep_symbolize_keys
+
+        expect(result[:costs][0][:amount]).to eq(0.06)
+        expect(result[:costs][0][:currency]).to eq('GPB')
+        expect(result[:costs][0][:unit]).to eq('Daily')
+
+        expect(result[:costs][1][:amount]).to eq(0.10)
+        expect(result[:costs][1][:currency]).to eq('USD')
+        expect(result[:costs][1][:unit]).to eq('Daily')
+      end
     end
 
     context 'when plan has no cost' do