Format wheel types with optional suffixes

Author: nebhale

lib/teslamate/mqtt/pubsub/home_assistant.ex

@@ -185,9 +185,17 @@ defmodule TeslaMate.Mqtt.PubSub.HomeAssistant do
   defp format_model(model), do: model
 
   defp format_wheel_type(wheel_type) do
-    case Regex.named_captures(~r/^(?<name>[A-Za-z]+)(?<size>\d+)$/, wheel_type) do
-      %{"name" => name, "size" => size} -> "#{split_camel_case(name)} #{size}\""
-      nil -> split_camel_case(wheel_type)
+    case Regex.named_captures(
+           ~r/^(?<name>[A-Za-z]+)(?<size>\d+)(?<suffix>[A-Za-z]*)$/,
+           wheel_type
+         ) do
+      %{"name" => name, "size" => size, "suffix" => suffix} ->
+        [split_camel_case(name), "#{size}\"", split_camel_case(suffix)]
+        |> Enum.reject(&(&1 == ""))
+        |> Enum.join(" ")
+
+      nil ->
+        split_camel_case(wheel_type)
     end
   end
 

test/teslamate/mqtt/pubsub/home_assistant_test.exs

@@ -135,6 +135,19 @@ defmodule TeslaMate.Mqtt.PubSub.HomeAssistantTest do
     assert decoded["device"]["model"] == "Model 3 Long Range (Induction Wheels)"
   end
 
+  test "formats wheel types with optional suffixes" do
+    wheel_types = [
+      {"AeroTurbine19", ~s|Aero Turbine 19" Wheels|},
+      {"Pinwheel18", ~s|Pinwheel 18" Wheels|},
+      {"Slipstream19Carbon", ~s|Slipstream 19" Carbon Wheels|}
+    ]
+
+    for {wheel_type, expected} <- wheel_types do
+      device = HomeAssistant.device(%{@summary | wheel_type: wheel_type}, car_id: 0)
+      assert device.model == "Model 3 (#{expected})"
+    end
+  end
+
   test "device name falls back to car.name when display_name is nil", %{test: name} do
     publisher_name = start_publisher(name)