Typescript solution

README.md

@@ -132,9 +132,44 @@ Find a more complete list on [Wikipedia](https://en.wikipedia.org/wiki/List_of_p
 - Provide a level 2 challenge for creating an HTML report besides the Plain Text report.
 
 ## Solutions
-To see solutions, switch to the [solutions branch](https://github.com/christianhujer/expensereport/tree/solutions#solutions).
+**Warning** The solutions branch will be rebased and force-pushed!
 
-**Warning** The solutions branch will be rebased!
+Currently, solutions exist in the following languages:
+- [Ada](expensereport-ada/)
+- [Assembler](expensereport-asm-68k-masm/) (Motorola 68020, Amiga OS, MaxonASM)
+- [Assembler](expensereport-asm-aarch64-linux-gasm/) (AArch64, Linux, GNU Assembler)
+- [BASIC](expensereport-basic-amiga/) (Amiga BASIC, Commodore Amiga) ⇐ Quite amazing! First BASIC without line numbers!
+- [C](expensereport-c/)
+- [C#](expensereport-csharp/)
+- [C++](expensereport-cxx/)
+- [Fortran](expensereport-fortran/)
+- [Go](expensereport-go/) (with BDD)
+- [Groovy](expensereport-groovy-script/)
+- [Haskell](expensereport-haskell/)
+- [Java](expensereport-java/) (with BDD)
+- [Kotlin](expensereport-kotlin/) (with BDD)
+- [Pascal](expensereport-pascal/)
+- [PostScript](expensereport-postscript/)
+- [Python](expensereport-python/) (with BDD)
+- [Rexx](expensereport-rexx/) (tested with Regina Rexx and ARexx)
+- [Rust](expensereport-rust/)
+- [SQL](expensereport-sql/)
+- [XML/XSLT](expensereport-xslt/)
+
+### Solution Rationale
+- Make adding the new requirement (lunch with an expense limit 2000) as easy and simple and error-free as possible. That means solving the OCP-violations of `printReport()`.
+- Small ("atomic") functions. Extract until you can no longer reasonably extract further methods.
+- A balance between a language independent design expressed idiomatic in the target language.
+
+Currently, soltuions exist in the following languages:
+- [Java](expensereport-java/)
+- [Kotlin](expensereport-kotlin/)
+- [Rust](expensereport-rust/)
+
+### Solution Rationale
+- Make adding the new requirement (lunch with an expense limit 2000) as easy and simple and error-free as possible. That means solving the OCP-violations of `printReport()`.
+- Small ("atomic") functions. Extract until you can no longer reasonably extract further methods.
+- A balance between a language independent design expressed idiomatic in the target language.
 
 ## Credits and License
 I first encountered the ExpenseReport example during a bootcamp at Equal Experts.

expensereport-ada/Makefile

@@ -1,9 +1,9 @@
 SHELL:=/bin/bash
-
 CPPFLAGS:=-W -Wall -pedantic -Werror
 
 .PHONY: all
 all: expensereport
+	diff expected.txt <(./expensereport)
 
 .PHONY: clean
 clean::

expensereport-ada/expected.txt

@@ -0,0 +1,10 @@
+Expenses:
+Dinner	5000	 
+Dinner	5001	X
+Breakfast	1000	 
+Breakfast	1001	X
+Car Rental	4	 
+Lunch	2000	 
+Lunch	2001	X
+Meal expenses: 16003
+Total expenses: 16007

expensereport-ada/expensereport.adb

@@ -2,56 +2,108 @@ with Text_IO, Text_IO.Unbounded_IO, Ada.Command_Line, Ada.Strings.Unbounded, Ada
 use Text_IO, Text_IO.Unbounded_IO, Ada.Command_Line, Ada.Strings.Unbounded;
 
 procedure expensereport is
-    type ExpenseType is (Breakfast, Dinner, CarRental);
+    type ExpenseType is tagged record
+        name: Unbounded_String;
+        limit: Integer;
+        isMeal: Boolean;
+    end record;
 
     type Expense is tagged record
         eType: ExpenseType;
         amount: Integer;
     end record;
 
+    Dinner:    constant ExpenseType := (To_Unbounded_String("Dinner"),     5000, true);
+    Breakfast: constant ExpenseType := (To_Unbounded_String("Breakfast"),  1000, true);
+    CarRental: constant ExpenseType := (To_Unbounded_String("Car Rental"), 2147483647, false);
+    Lunch:     constant ExpenseType := (To_Unbounded_String("Lunch"),      2000, true);
+
     type ExpenseList is array(Positive range <>) of Expense;
 
-    procedure printReport(expenses: in ExpenseList) is
-        total : Integer := 0;
-        mealExpenses : Integer := 0;
-        expenseName : Unbounded_String;
-        mealOverExpensesMarker : Character := ' ';
+    function isMeal(exp: Expense) return Boolean is
     begin
-        Put_Line("Expenses:");
+        return exp.eType.isMeal;
+    end;
+
+    function getName(exp: Expense) return Unbounded_String is
+    begin
+        return exp.eType.name;
+    end;
 
+    function isOverLimit(exp: Expense) return Boolean is
+    begin
+        return exp.amount > exp.eType.limit;
+    end;
+
+    function sumMeals(expenses: in ExpenseList) return Integer is
+        meals : Integer := 0;
+    begin
+        meals := 0;
         for i in expenses'Range loop
-            if (expenses(i).eType = Breakfast or expenses(i).eType = Dinner) then
-                mealExpenses := mealExpenses + expenses(i).amount;
+            if (isMeal(expenses(i))) then
+                meals := meals + expenses(i).amount;
             end if;
+        end loop;
+        return meals;
+    end;
 
-            expenseName := To_Unbounded_String("Foo" & "Foo");
-            case expenses(i).eType is
-                when Breakfast =>
-                    expenseName := To_Unbounded_String("Breakfast");
-                when Dinner =>
-                    expenseName := To_Unbounded_String("Dinner");
-                when CarRental =>
-                    expenseName := To_Unbounded_String("Car Rental");
-            end case;
-
-            if ((expenses(i).eType = Breakfast and expenses(i).amount > 1000) or (expenses(i).eType = Dinner and expenses(i).amount > 5000)) then
-                mealOverExpensesMarker := 'X';
-            else
-                mealOverExpensesMarker := ' ';
-            end if;
+    function sumTotal(expenses: in ExpenseList) return Integer is
+        total : Integer := 0;
+    begin
+        total := 0;
+        for i in expenses'Range loop
+            total := total + expenses(i).amount;
+        end loop;
+        return total;
+    end;
+
+    procedure printHeader is
+    begin
+        Put_Line("Expenses:");
+    end printHeader;
 
-            Put_Line(expenseName & Ada.Characters.Latin_1.HT & Ada.Strings.Fixed.Trim(Integer'Image(expenses(i).amount), Ada.Strings.Left) & Ada.Characters.Latin_1.HT & mealOverExpensesMarker);
+    function overLimitMarker(exp: Expense) return Character is
+    begin
+        if (isOverLimit(exp)) then
+            return 'X';
+        else
+            return ' ';
+        end if;
+    end;
 
-            total := total + expenses(i).amount;
+    procedure printDetail(exp: Expense) is
+    begin
+        Put_Line(getName(exp) & Ada.Characters.Latin_1.HT & Ada.Strings.Fixed.Trim(Integer'Image(exp.amount), Ada.Strings.Left) & Ada.Characters.Latin_1.HT & overLimitMarker(exp));
+    end printDetail;
+
+    procedure printDetails(expenses: in ExpenseList) is
+    begin
+        for i in expenses'Range loop
+            printDetail(expenses(i));
         end loop;
+    end printDetails;
 
-        Put_Line("Meal expenses:" & Integer'Image(mealExpenses));
-        Put_Line("Total expenses:" & Integer'Image(total));
+    procedure printSummary(expenses: in ExpenseList) is
+    begin
+        Put_Line("Meal expenses:" & Integer'Image(sumMeals(expenses)));
+        Put_Line("Total expenses:" & Integer'Image(sumTotal(expenses)));
+    end printSummary;
+
+    procedure printReport(expenses: in ExpenseList) is
+    begin
+        printHeader;
+        printDetails(expenses);
+        printSummary(expenses);
     end printReport;
 
     expenses : ExpenseList := (
-        (Breakfast, 1),
-        (Breakfast, 1)
+        (Dinner, 5000),
+        (Dinner, 5001),
+        (Breakfast, 1000),
+        (Breakfast, 1001),
+        (CarRental, 4),
+        (Lunch, 2000),
+        (Lunch, 2001)
     );
 begin
     printReport(expenses);