Address credo complaints

test/support/generators/trip_update.ex

@@ -5,6 +5,7 @@ defmodule TransitData.GlidesReport.Generators.TripUpdate do
 
   import StreamData
   import ExUnitProperties, only: [gen: 2]
+  alias TransitData.GlidesReport.Terminals
 
   # (Ignore first item, it keeps the formatter from moving the first comment)
   @type trip_update_gen_opt ::
@@ -35,19 +36,12 @@ defmodule TransitData.GlidesReport.Generators.TripUpdate do
         canceled? -> constant(canceled?)
       end
 
-    make_revenue_gen = fn canceled? ->
-      case opts[:revenue?] do
-        nil -> map(boolean(), &if(canceled?, do: &1, else: true))
-        revenue? -> constant(revenue?)
-      end
-    end
-
     gen all(
           trip_id <- map(positive_integer(), &Integer.to_string/1),
           canceled? <- canceled_gen,
           # Revenue can be false only if canceled is true.
           # (There are some exceptions to this, but let's not complicate things even more.)
-          revenue? <- make_revenue_gen.(canceled?),
+          revenue? <- revenue_generator(canceled?, opts[:revenue?]),
           timestamp <- timestamp_generator_(canceled?, revenue?, opts[:define_timestamp]),
           stop_time_update <-
             stop_time_update_generator_(
@@ -271,15 +265,15 @@ defmodule TransitData.GlidesReport.Generators.TripUpdate do
   end
 
   defp terminal_stop_id_generator do
-    member_of(TransitData.GlidesReport.Terminals.all_first_stops())
+    member_of(Terminals.all_first_stops())
   end
 
   # Never produces Glides terminal stop IDs.
   defp non_terminal_stop_id_generator do
     gen all(
           i <- integer(70_000..79_999//1),
           id = Integer.to_string(i),
-          id not in TransitData.GlidesReport.Terminals.all_first_stops()
+          id not in Terminals.all_first_stops()
         ) do
       id
     end
@@ -309,6 +303,16 @@ defmodule TransitData.GlidesReport.Generators.TripUpdate do
     end
   end
 
+  defp revenue_generator(canceled?, force_value)
+
+  defp revenue_generator(canceled?, nil) do
+    map(boolean(), &if(canceled?, do: &1, else: true))
+  end
+
+  defp revenue_generator(_, force_value) do
+    constant(force_value)
+  end
+
   defp time_generator do
     tuple({integer(0..23), integer(0..59), integer(0..59)})
     |> map(fn parts ->

test/support/generators/vehicle_position.ex

@@ -5,6 +5,7 @@ defmodule TransitData.GlidesReport.Generators.VehiclePosition do
 
   import StreamData
   import ExUnitProperties, only: [gen: 2]
+  alias TransitData.GlidesReport.Terminals
 
   def valid_vehicle_position_generator(opts \\ []) do
     current_status_members =
@@ -186,14 +187,14 @@ defmodule TransitData.GlidesReport.Generators.VehiclePosition do
   end
 
   defp second_stop_id_generator do
-    member_of(TransitData.GlidesReport.Terminals.all_next_stops())
+    member_of(Terminals.all_next_stops())
   end
 
   defp non_second_stop_id_generator do
     gen all(
           i <- integer(70_000..79_999//1),
           id = Integer.to_string(i),
-          id not in TransitData.GlidesReport.Terminals.all_next_stops()
+          id not in Terminals.all_next_stops()
         ) do
       id
     end

test/transit_data/glides_report/util_test.exs

@@ -24,7 +24,7 @@ defmodule TransitData.GlidesReport.UtilTest do
     end
 
     test "doesn't add padding when n is already long enough" do
-      assert "12345" == Util.zero_pad(12345, 3)
+      assert "12345" == Util.zero_pad(12_345, 3)
       assert "15" == Util.zero_pad(15, 2)
     end
 
@@ -72,12 +72,13 @@ defmodule TransitData.GlidesReport.UtilTest do
   describe "build_csv_name/3" do
     test "creates a descriptive filename for the table download" do
       alias TransitData.GlidesReport.Settings.{Filter, Load}
+      alias TransitData.GlidesReport.Terminals
 
       table_name = "The Results"
       loader_settings = Load.new("", ~D[2024-08-05], 1, nil)
 
       filter_settings =
-        Filter.new(TransitData.GlidesReport.Terminals.by_tags([:glides, :green]), true, nil)
+        Filter.new(Terminals.by_tags([:glides, :green]), true, nil)
 
       expected =
         "Glides report - The Results - " <>