♻️ Use Amount transformers instead of 1m<dd>

sleepyfran · Jan 16, 2024 · 64954ee · 64954ee
1 parent 672a30b
commit 64954ee
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 10 deletions.
diff --git a/src/Duets.Cli/Components/Commands/Concert/SetupMerchStand.Command.fs b/src/Duets.Cli/Components/Commands/Concert/SetupMerchStand.Command.fs
@@ -26,7 +26,7 @@ module SetupMerchStandCommand =
             let price =
                 $"How much do you want to charge for {Generic.itemDetailedName item |> Styles.item}? (Recommended: {Styles.money recommendedPrice})"
                 |> showDecimalPrompt
-                |> (*) 1m<dd>
+                |> Amount.fromDecimal
 
             let result = setPrice band item price
 

diff --git a/src/Duets.Cli/Scenes/Phone/Apps/Bank/DistributeBandFunds.fs b/src/Duets.Cli/Scenes/Phone/Apps/Bank/DistributeBandFunds.fs
@@ -18,7 +18,7 @@ let distributeFunds bankApp =
 
     let result =
         showDecimalPrompt "How much would you like to distribute?"
-        |> (*) 1m<dd>
+        |> Amount.fromDecimal
         |> FundDistribution.distribute state
 
     match result with

diff --git a/src/Duets.Cli/Text/Phone.fs b/src/Duets.Cli/Text/Phone.fs
@@ -124,9 +124,10 @@ let concertAssistantAppShowCityPrompt = "In which city?"
 
 let concertAssistantAppShowVenuePrompt = "In which venue?"
 
-let concertAssistantAppTicketPricePrompt =
-    $"""What will the price of each ticket be? {Styles.danger
-                                                    "Keep in mind that putting high prices might affect how many people will go"}"""
+let concertAssistantAppTicketPricePrompt recommendedPrice =
+    $"""What will the price of each ticket be? (Recommended: {recommendedPrice |> Styles.money})
+{Styles.danger
+     "Keep in mind that putting high prices might affect how many people will go"}"""
 
 let concertAssistantAppDateAlreadyBooked date =
     Styles.error $"You already have a concert on {Date.simple date}!"

diff --git a/src/Duets.Entities/Amount.fs b/src/Duets.Entities/Amount.fs
@@ -2,3 +2,9 @@ module Duets.Entities.Amount
 
 /// Creates an amount from a decimal value.
 let fromDecimal (amount: decimal) : Amount = amount * 1m<dd>
+
+/// Creates an amount from a float value.
+let fromFloat (amount: float) : Amount = amount |> decimal |> fromDecimal
+
+/// Concerts an amount to a decimal value.
+let toDecimal (amount: Amount) : decimal = amount / 1m<dd>
diff --git a/src/Duets.Simulation/Albums/Revenue.fs b/src/Duets.Simulation/Albums/Revenue.fs
@@ -9,4 +9,4 @@ let albumRevenue (previousDayStreams: int) =
     float previousDayStreams
     * Config.Revenue.revenuePerStream
     |> decimal
-    |> (*) 1m<dd>
+    |> Amount.fromDecimal
diff --git a/src/Duets.Simulation/Concerts/DailyUpdate.fs b/src/Duets.Simulation/Concerts/DailyUpdate.fs
@@ -6,7 +6,7 @@ open Duets.Entities
 open Duets.Simulation
 
 let private ticketPriceModifier state bandId concert =
-    let ticketPrice = concert.TicketPrice / 1m<dd> |> float
+    let ticketPrice = concert.TicketPrice |> Amount.toDecimal |> float
 
     let ticketPriceCap = Queries.Concerts.fairTicketPrice state bandId |> float
 

diff --git a/src/Duets.Simulation/Flights/TicketGeneration.fs b/src/Duets.Simulation/Flights/TicketGeneration.fs
@@ -14,6 +14,6 @@ let private createTicket origin destination date dayMoment =
         Queries.World.distanceBetween origin destination
         |> decimal
         |> (*) Config.Travel.pricePerKm
-        |> (*) 1m<dd>
+        |> Amount.fromDecimal
 
     Flight.create origin destination ticketPrice date dayMoment
diff --git a/src/Duets.Simulation/Queries/Albums.fs b/src/Duets.Simulation/Queries/Albums.fs
@@ -76,5 +76,4 @@ module Albums =
     /// Calculates the generated revenue of the album.
     let revenue album =
         float album.Streams * Config.Revenue.revenuePerStream
-        |> decimal
-        |> (*) 1m<dd>
+        |> Amount.fromFloat