From f7ca48b097c6ef86bfef303d69b489b14f4b57fb Mon Sep 17 00:00:00 2001 From: Naz Davoudi Date: Sun, 18 Apr 2021 22:35:25 +1200 Subject: [PATCH 01/10] Update Circle.cs --- Order.Management/Circle.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Order.Management/Circle.cs b/Order.Management/Circle.cs index 9824ecc..4bd817e 100644 --- a/Order.Management/Circle.cs +++ b/Order.Management/Circle.cs @@ -6,30 +6,30 @@ namespace Order.Management { class Circle : Shape { - public int circlePrice = 3; + private const int circlePrice = 3; public Circle(int red, int blue, int yellow) { Name = "Circle"; - base.Price = circlePrice; + Price = circlePrice; AdditionalCharge = 1; - base.NumberOfRedShape = red; - base.NumberOfBlueShape = blue; - base.NumberOfYellowShape = yellow; + NumberOfRedShape = red; + NumberOfBlueShape = blue; + NumberOfYellowShape = yellow; } public override int Total() { return RedCirclesTotal() + BlueCirclesTotal() + YellowCirclesTotal(); } - public int RedCirclesTotal() + private int RedCirclesTotal() { return (base.NumberOfRedShape * Price); } - public int BlueCirclesTotal() + private int BlueCirclesTotal() { return (base.NumberOfBlueShape * Price); } - public int YellowCirclesTotal() + private int YellowCirclesTotal() { return (base.NumberOfYellowShape * Price); } From 48b5d2607b08d4224c3f644c65c315b3b767f296 Mon Sep 17 00:00:00 2001 From: Naz Davoudi Date: Sun, 18 Apr 2021 22:37:34 +1200 Subject: [PATCH 02/10] Update Circle.cs --- Order.Management/Circle.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Order.Management/Circle.cs b/Order.Management/Circle.cs index 4bd817e..c9e764b 100644 --- a/Order.Management/Circle.cs +++ b/Order.Management/Circle.cs @@ -20,6 +20,7 @@ public override int Total() { return RedCirclesTotal() + BlueCirclesTotal() + YellowCirclesTotal(); } + private int RedCirclesTotal() { From 4bc130948e252aebb20c9aaa7f34ea2edb4db639 Mon Sep 17 00:00:00 2001 From: Naz Davoudi Date: Sun, 18 Apr 2021 22:41:57 +1200 Subject: [PATCH 03/10] Update CuttingListReport.cs --- Order.Management/CuttingListReport.cs | 42 ++++++++++++--------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/Order.Management/CuttingListReport.cs b/Order.Management/CuttingListReport.cs index 125d45f..21101b1 100644 --- a/Order.Management/CuttingListReport.cs +++ b/Order.Management/CuttingListReport.cs @@ -6,50 +6,47 @@ namespace Order.Management { class CuttingListReport : Order { - public int tableWidth = 20; + private readonly int TableWidth = 20; public CuttingListReport(string customerName, string customerAddress, string dueDate, List shapes) { - base.CustomerName = customerName; - base.Address = customerAddress; - base.DueDate = dueDate; - base.OrderedBlocks = shapes; + CustomerName = customerName; + Address = customerAddress; + DueDate = dueDate; + OrderedBlocks = shapes; } public override void GenerateReport() { Console.WriteLine("\nYour cutting list has been generated: "); - Console.WriteLine(base.ToString()); - generateTable(); + Console.WriteLine(ToString()); + GenerateTable(); } - public void generateTable() + + private void GenerateTable() { PrintLine(); PrintRow(" ", " Qty "); PrintLine(); - PrintRow("Square",base.OrderedBlocks[0].TotalQuantityOfShape().ToString()); - PrintRow("Triangle", base.OrderedBlocks[1].TotalQuantityOfShape().ToString()); - PrintRow("Circle", base.OrderedBlocks[2].TotalQuantityOfShape().ToString()); + PrintRow("Square",OrderedBlocks[0].TotalQuantityOfShape().ToString()); + PrintRow("Triangle", OrderedBlocks[1].TotalQuantityOfShape().ToString()); + PrintRow("Circle", OrderedBlocks[2].TotalQuantityOfShape().ToString()); PrintLine(); } - public void PrintLine() + + private void PrintLine() { - Console.WriteLine(new string('-', tableWidth)); + Console.WriteLine(new string('-', TableWidth)); } - public void PrintRow(params string[] columns) + private void PrintRow(params string[] columns) { - int width = (tableWidth - columns.Length) / columns.Length; - string row = "|"; - - foreach (string column in columns) - { - row += AlignCentre(column, width) + "|"; - } + var width = (TableWidth - columns.Length) / columns.Length; + var row = columns.Aggregate("|", (current, column) => current + (AlignCentre(column, width) + "|")); Console.WriteLine(row); } - public string AlignCentre(string text, int width) + private static string AlignCentre(string text, int width) { text = text.Length > width ? text.Substring(0, width - 3) + "..." : text; @@ -63,6 +60,5 @@ public string AlignCentre(string text, int width) } } - } } From c74525bd05522a001bb3266581e915b0d9dea969 Mon Sep 17 00:00:00 2001 From: Naz Davoudi Date: Sun, 18 Apr 2021 22:47:02 +1200 Subject: [PATCH 04/10] Update InvoiceReport.cs --- Order.Management/InvoiceReport.cs | 63 ++++++++++++++----------------- 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/Order.Management/InvoiceReport.cs b/Order.Management/InvoiceReport.cs index 78443c3..2338384 100644 --- a/Order.Management/InvoiceReport.cs +++ b/Order.Management/InvoiceReport.cs @@ -6,19 +6,19 @@ namespace Order.Management { class InvoiceReport : Order { - public int tableWidth = 73; + private const int TableWidth = 73; public InvoiceReport(string customerName, string customerAddress, string dueDate, List shapes) { - base.CustomerName = customerName; - base.Address = customerAddress; - base.DueDate = dueDate; - base.OrderedBlocks = shapes; + CustomerName = customerName; + Address = customerAddress; + DueDate = dueDate; + OrderedBlocks = shapes; } public override void GenerateReport() { Console.WriteLine("\nYour invoice report has been generated: "); - Console.WriteLine(base.ToString()); + Console.WriteLine(ToString()); GenerateTable(); OrderSquareDetails(); OrderTriangleDetails(); @@ -26,62 +26,57 @@ public override void GenerateReport() RedPaintSurcharge(); } - public void RedPaintSurcharge() + private void RedPaintSurcharge() { - Console.WriteLine("Red Color Surcharge " + TotalAmountOfRedShapes() + " @ $" + base.OrderedBlocks[0].AdditionalCharge + " ppi = $" + TotalPriceRedPaintSurcharge()); + Console.WriteLine("Red Color Surcharge " + TotalAmountOfRedShapes() + " @ $" + OrderedBlocks[0].AdditionalCharge + " ppi = $" + TotalPriceRedPaintSurcharge()); } - public int TotalAmountOfRedShapes() + private int TotalAmountOfRedShapes() { - return base.OrderedBlocks[0].NumberOfRedShape + base.OrderedBlocks[1].NumberOfRedShape + - base.OrderedBlocks[2].NumberOfRedShape; + return OrderedBlocks[0].NumberOfRedShape + OrderedBlocks[1].NumberOfRedShape + + OrderedBlocks[2].NumberOfRedShape; } - public int TotalPriceRedPaintSurcharge() + private int TotalPriceRedPaintSurcharge() { - return TotalAmountOfRedShapes() * base.OrderedBlocks[0].AdditionalCharge; + return TotalAmountOfRedShapes() * OrderedBlocks[0].AdditionalCharge; } - public void GenerateTable() + private void GenerateTable() { PrintLine(); PrintRow(" ", " Red ", " Blue ", " Yellow "); PrintLine(); - PrintRow("Square", base.OrderedBlocks[0].NumberOfRedShape.ToString(), base.OrderedBlocks[0].NumberOfBlueShape.ToString(), base.OrderedBlocks[0].NumberOfYellowShape.ToString()); - PrintRow("Triangle", base.OrderedBlocks[1].NumberOfRedShape.ToString(), base.OrderedBlocks[1].NumberOfBlueShape.ToString(), base.OrderedBlocks[1].NumberOfYellowShape.ToString()); - PrintRow("Circle", base.OrderedBlocks[2].NumberOfRedShape.ToString(), base.OrderedBlocks[2].NumberOfBlueShape.ToString(), base.OrderedBlocks[2].NumberOfYellowShape.ToString()); + PrintRow("Square", OrderedBlocks[0].NumberOfRedShape.ToString(), OrderedBlocks[0].NumberOfBlueShape.ToString(), OrderedBlocks[0].NumberOfYellowShape.ToString()); + PrintRow("Triangle", OrderedBlocks[1].NumberOfRedShape.ToString(), OrderedBlocks[1].NumberOfBlueShape.ToString(), OrderedBlocks[1].NumberOfYellowShape.ToString()); + PrintRow("Circle", OrderedBlocks[2].NumberOfRedShape.ToString(), OrderedBlocks[2].NumberOfBlueShape.ToString(), OrderedBlocks[2].NumberOfYellowShape.ToString()); PrintLine(); } - public void OrderSquareDetails() + private void OrderSquareDetails() { - Console.WriteLine("\nSquares " + base.OrderedBlocks[0].TotalQuantityOfShape() + " @ $" + base.OrderedBlocks[0].Price + " ppi = $" + base.OrderedBlocks[0].Total()); + Console.WriteLine("\nSquares " + OrderedBlocks[0].TotalQuantityOfShape() + " @ $" + OrderedBlocks[0].Price + " ppi = $" + OrderedBlocks[0].Total()); } - public void OrderTriangleDetails() + private void OrderTriangleDetails() { - Console.WriteLine("Triangles " + base.OrderedBlocks[1].TotalQuantityOfShape() + " @ $" + base.OrderedBlocks[1].Price + " ppi = $" + base.OrderedBlocks[1].Total()); + Console.WriteLine("Triangles " + OrderedBlocks[1].TotalQuantityOfShape() + " @ $" + OrderedBlocks[1].Price + " ppi = $" + OrderedBlocks[1].Total()); } - public void OrderCircleDetails() + private void OrderCircleDetails() { - Console.WriteLine("Circles " + base.OrderedBlocks[2].TotalQuantityOfShape() + " @ $" + base.OrderedBlocks[2].Price + " ppi = $" + base.OrderedBlocks[2].Total()); + Console.WriteLine("Circles " + OrderedBlocks[2].TotalQuantityOfShape() + " @ $" + OrderedBlocks[2].Price + " ppi = $" + OrderedBlocks[2].Total()); } - public void PrintLine() + private void PrintLine() { - Console.WriteLine(new string('-', tableWidth)); + Console.WriteLine(new string('-', TableWidth)); } - public void PrintRow(params string[] columns) + private void PrintRow(params string[] columns) { - int width = (tableWidth - columns.Length) / columns.Length; - string row = "|"; - - foreach (string column in columns) - { - row += AlignCentre(column, width) + "|"; - } + var width = (TableWidth - columns.Length) / columns.Length; + var row = columns.Aggregate("|", (current, column) => current + (AlignCentre(column, width) + "|")); Console.WriteLine(row); } - public string AlignCentre(string text, int width) + private static string AlignCentre(string text, int width) { text = text.Length > width ? text.Substring(0, width - 3) + "..." : text; From 664c45182cbb7d2e41bc4fdbc4207e2b07cccea8 Mon Sep 17 00:00:00 2001 From: Naz Davoudi Date: Sun, 18 Apr 2021 22:54:15 +1200 Subject: [PATCH 05/10] Update Order.cs --- Order.Management/Order.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Order.Management/Order.cs b/Order.Management/Order.cs index 235c789..ac7d604 100644 --- a/Order.Management/Order.cs +++ b/Order.Management/Order.cs @@ -6,15 +6,15 @@ namespace Order.Management { abstract class Order { - public string CustomerName { get; set; } - public string Address { get; set; } - public string DueDate { get; set; } - public int OrderNumber { get; set; } - public List OrderedBlocks { get; set; } + protected string CustomerName { get; set; } + protected string Address { get; set; } + protected string DueDate { get; set; } + private int OrderNumber { get; set; } + protected List OrderedBlocks { get; set; } public abstract void GenerateReport(); - public string ToString() + public override string ToString() { return "\nName: " + CustomerName + " Address: " + Address + " Due Date: " + DueDate + " Order #: " + OrderNumber; } From 2e70ee7074ba9faddcd17ee70572c5216b211fe6 Mon Sep 17 00:00:00 2001 From: Naz Davoudi Date: Sun, 18 Apr 2021 23:02:01 +1200 Subject: [PATCH 06/10] Update PaintingReport.cs --- Order.Management/PaintingReport.cs | 39 +++++++++++++----------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/Order.Management/PaintingReport.cs b/Order.Management/PaintingReport.cs index 9b61c83..9ef32e7 100644 --- a/Order.Management/PaintingReport.cs +++ b/Order.Management/PaintingReport.cs @@ -6,51 +6,46 @@ namespace Order.Management { class PaintingReport : Order { - public int tableWidth = 73; + private const int TableWidth = 73; public PaintingReport(string customerName, string customerAddress, string dueDate, List shapes) { - base.CustomerName = customerName; - base.Address = customerAddress; - base.DueDate = dueDate; - base.OrderedBlocks = shapes; + CustomerName = customerName; + Address = customerAddress; + DueDate = dueDate; + OrderedBlocks = shapes; } public override void GenerateReport() { Console.WriteLine("\nYour painting report has been generated: "); - Console.WriteLine(base.ToString()); - generateTable(); + Console.WriteLine(ToString()); + GenerateTable(); } - public void generateTable() + private void GenerateTable() { PrintLine(); PrintRow(" ", " Red ", " Blue ", " Yellow "); PrintLine(); - PrintRow("Square", base.OrderedBlocks[0].NumberOfRedShape.ToString(), base.OrderedBlocks[0].NumberOfBlueShape.ToString(), base.OrderedBlocks[0].NumberOfYellowShape.ToString()); - PrintRow("Triangle", base.OrderedBlocks[1].NumberOfRedShape.ToString(), base.OrderedBlocks[1].NumberOfBlueShape.ToString(), base.OrderedBlocks[1].NumberOfYellowShape.ToString()); - PrintRow("Circle", base.OrderedBlocks[2].NumberOfRedShape.ToString(), base.OrderedBlocks[2].NumberOfBlueShape.ToString(), base.OrderedBlocks[2].NumberOfYellowShape.ToString()); + PrintRow("Square", OrderedBlocks[0].NumberOfRedShape.ToString(), OrderedBlocks[0].NumberOfBlueShape.ToString(), OrderedBlocks[0].NumberOfYellowShape.ToString()); + PrintRow("Triangle", OrderedBlocks[1].NumberOfRedShape.ToString(), OrderedBlocks[1].NumberOfBlueShape.ToString(), OrderedBlocks[1].NumberOfYellowShape.ToString()); + PrintRow("Circle", OrderedBlocks[2].NumberOfRedShape.ToString(), OrderedBlocks[2].NumberOfBlueShape.ToString(), OrderedBlocks[2].NumberOfYellowShape.ToString()); PrintLine(); } - public void PrintLine() + private static void PrintLine() { - Console.WriteLine(new string('-', tableWidth)); + Console.WriteLine(new string('-', TableWidth)); } - public void PrintRow(params string[] columns) + private static void PrintRow(params string[] columns) { - int width = (tableWidth - columns.Length) / columns.Length; - string row = "|"; - - foreach (string column in columns) - { - row += AlignCentre(column, width) + "|"; - } + var width = (TableWidth - columns.Length) / columns.Length; + var row = columns.Aggregate("|", (current, column) => current + (AlignCentre(column, width) + "|")); Console.WriteLine(row); } - public string AlignCentre(string text, int width) + private static string AlignCentre(string text, int width) { text = text.Length > width ? text.Substring(0, width - 3) + "..." : text; From eb234b4196aa149ac162596c26a6a1ea1f5b4589 Mon Sep 17 00:00:00 2001 From: Naz Davoudi Date: Sun, 18 Apr 2021 23:08:41 +1200 Subject: [PATCH 07/10] Update Program.cs --- Order.Management/Program.cs | 61 ++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/Order.Management/Program.cs b/Order.Management/Program.cs index 1422f85..509a77b 100644 --- a/Order.Management/Program.cs +++ b/Order.Management/Program.cs @@ -6,7 +6,7 @@ namespace Order.Management class Program { // Main entry - static void Main(string[] args) + private static void Main() { var (customerName, address, dueDate) = CustomerInfoInput(); @@ -20,51 +20,51 @@ static void Main(string[] args) } // Order Circle Input - public static Circle OrderCirclesInput() + private static Circle OrderCirclesInput() { Console.Write("\nPlease input the number of Red Circle: "); - int redCircle = Convert.ToInt32(userInput()); + var redCircle = Convert.ToInt32(UserInput()); Console.Write("Please input the number of Blue Circle: "); - int blueCircle = Convert.ToInt32(userInput()); + var blueCircle = Convert.ToInt32(UserInput()); Console.Write("Please input the number of Yellow Circle: "); - int yellowCircle = Convert.ToInt32(userInput()); + var yellowCircle = Convert.ToInt32(UserInput()); - Circle circle = new Circle(redCircle, blueCircle, yellowCircle); + var circle = new Circle(redCircle, blueCircle, yellowCircle); return circle; } // Order Squares Input - public static Square OrderSquaresInput() + private static Square OrderSquaresInput() { Console.Write("\nPlease input the number of Red Squares: "); - int redSquare = Convert.ToInt32(userInput()); + var redSquare = Convert.ToInt32(UserInput()); Console.Write("Please input the number of Blue Squares: "); - int blueSquare = Convert.ToInt32(userInput()); + var blueSquare = Convert.ToInt32(UserInput()); Console.Write("Please input the number of Yellow Squares: "); - int yellowSquare = Convert.ToInt32(userInput()); + var yellowSquare = Convert.ToInt32(UserInput()); - Square square = new Square(redSquare, blueSquare, yellowSquare); + var square = new Square(redSquare, blueSquare, yellowSquare); return square; } // Order Triangles Input - public static Triangle OrderTrianglesInput() + private static Triangle OrderTrianglesInput() { Console.Write("\nPlease input the number of Red Triangles: "); - int redTriangle = Convert.ToInt32(userInput()); + var redTriangle = Convert.ToInt32(UserInput()); Console.Write("Please input the number of Blue Triangles: "); - int blueTriangle = Convert.ToInt32(userInput()); + var blueTriangle = Convert.ToInt32(UserInput()); Console.Write("Please input the number of Yellow Triangles: "); - int yellowTriangle = Convert.ToInt32(userInput()); + var yellowTriangle = Convert.ToInt32(UserInput()); - Triangle triangle = new Triangle(redTriangle, blueTriangle, yellowTriangle); + var triangle = new Triangle(redTriangle, blueTriangle, yellowTriangle); return triangle; } // User Console Input - public static string userInput() + private static string UserInput() { - string input = Console.ReadLine(); + var input = Console.ReadLine(); while (string.IsNullOrEmpty(input)) { Console.WriteLine("please enter valid details"); @@ -77,21 +77,21 @@ public static string userInput() // Generate Painting Report private static void PaintingReport(string customerName, string address, string dueDate, List orderedShapes) { - PaintingReport paintingReport = new PaintingReport(customerName, address, dueDate, orderedShapes); + var paintingReport = new PaintingReport(customerName, address, dueDate, orderedShapes); paintingReport.GenerateReport(); } // Generate Painting Report private static void CuttingListReport(string customerName, string address, string dueDate, List orderedShapes) { - CuttingListReport cuttingListReport = new CuttingListReport(customerName, address, dueDate, orderedShapes); + var cuttingListReport = new CuttingListReport(customerName, address, dueDate, orderedShapes); cuttingListReport.GenerateReport(); } // Generate Invoice Report private static void InvoiceReport(string customerName, string address, string dueDate, List orderedShapes) { - InvoiceReport invoiceReport = new InvoiceReport(customerName, address, dueDate, orderedShapes); + var invoiceReport = new InvoiceReport(customerName, address, dueDate, orderedShapes); invoiceReport.GenerateReport(); } @@ -99,25 +99,22 @@ private static void InvoiceReport(string customerName, string address, string du private static (string customerName, string address, string dueDate) CustomerInfoInput() { Console.Write("Please input your Name: "); - string customerName = userInput(); + var customerName = UserInput(); Console.Write("Please input your Address: "); - string address = userInput(); + var address = UserInput(); Console.Write("Please input your Due Date: "); - string dueDate = userInput(); + var dueDate = UserInput(); return (customerName, address, dueDate); } // Get order input private static List CustomerOrderInput() { - Square square = OrderSquaresInput(); - Triangle triangle = OrderTrianglesInput(); - Circle circle = OrderCirclesInput(); - - var orderedShapes = new List(); - orderedShapes.Add(square); - orderedShapes.Add(triangle); - orderedShapes.Add(circle); + var square = OrderSquaresInput(); + var triangle = OrderTrianglesInput(); + var circle = OrderCirclesInput(); + + var orderedShapes = new List {square, triangle, circle}; return orderedShapes; } } From 9278a85cd66f4093cf78695e992049c0afcc5759 Mon Sep 17 00:00:00 2001 From: Naz Davoudi Date: Sun, 18 Apr 2021 23:15:07 +1200 Subject: [PATCH 08/10] Update Shape.cs --- Order.Management/Shape.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Order.Management/Shape.cs b/Order.Management/Shape.cs index 7f5c61c..8ee70bd 100644 --- a/Order.Management/Shape.cs +++ b/Order.Management/Shape.cs @@ -6,7 +6,7 @@ namespace Order.Management { abstract class Shape { - public string Name { get; set; } + protected string Name { get; set; } public int Price { get; set; } public int AdditionalCharge { get; set; } public int NumberOfRedShape { get; set; } @@ -17,10 +17,10 @@ public int TotalQuantityOfShape() return NumberOfRedShape + NumberOfBlueShape + NumberOfYellowShape; } - public int AdditionalChargeTotal() - { - return NumberOfRedShape * AdditionalCharge; - } + // public int AdditionalChargeTotal() + // { + // return NumberOfRedShape * AdditionalCharge; + // } public abstract int Total(); } From cd7bc78930bd35ce0338b3b86b9473716a979000 Mon Sep 17 00:00:00 2001 From: Naz Davoudi Date: Sun, 18 Apr 2021 23:18:20 +1200 Subject: [PATCH 09/10] Update Square.cs --- Order.Management/Square.cs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Order.Management/Square.cs b/Order.Management/Square.cs index 017601e..7990f24 100644 --- a/Order.Management/Square.cs +++ b/Order.Management/Square.cs @@ -7,16 +7,16 @@ namespace Order.Management class Square : Shape { - public int SquarePrice = 1; + private const int SquarePrice = 1; public Square(int numberOfRedSquares, int numberOfBlueSquares, int numberOfYellowSquares) { Name = "Square"; - base.Price = SquarePrice; + Price = SquarePrice; AdditionalCharge = 1; - base.NumberOfRedShape = numberOfRedSquares; - base.NumberOfBlueShape = numberOfBlueSquares; - base.NumberOfYellowShape = numberOfYellowSquares; + NumberOfRedShape = numberOfRedSquares; + NumberOfBlueShape = numberOfBlueSquares; + NumberOfYellowShape = numberOfYellowSquares; } public override int Total() @@ -24,17 +24,17 @@ public override int Total() return RedSquaresTotal() + BlueSquaresTotal() + YellowSquaresTotal(); } - public int RedSquaresTotal() + private int RedSquaresTotal() { - return (base.NumberOfRedShape * Price); + return (NumberOfRedShape * Price); } - public int BlueSquaresTotal() + private int BlueSquaresTotal() { - return (base.NumberOfBlueShape * Price); + return (NumberOfBlueShape * Price); } - public int YellowSquaresTotal() + private int YellowSquaresTotal() { - return (base.NumberOfYellowShape * Price); + return (NumberOfYellowShape * Price); } } } From d0f4fb31d970e3285b997446616e3ecada563a40 Mon Sep 17 00:00:00 2001 From: Naz Davoudi Date: Sun, 18 Apr 2021 23:22:11 +1200 Subject: [PATCH 10/10] Update Triangle.cs --- Order.Management/Triangle.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Order.Management/Triangle.cs b/Order.Management/Triangle.cs index dbf48ff..cab24f1 100644 --- a/Order.Management/Triangle.cs +++ b/Order.Management/Triangle.cs @@ -6,15 +6,15 @@ namespace Order.Management { class Triangle : Shape { - public int TrianglePrice = 2; + private const int TrianglePrice = 2; public Triangle(int numberOfRedTriangles, int numberOfBlueTriangles, int numberOfYellowTriangles) { Name = "Triangle"; - base.Price = TrianglePrice; + Price = TrianglePrice; AdditionalCharge = 1; - base.NumberOfRedShape = numberOfRedTriangles; - base.NumberOfBlueShape = numberOfBlueTriangles; - base.NumberOfYellowShape = numberOfYellowTriangles; + NumberOfRedShape = numberOfRedTriangles; + NumberOfBlueShape = numberOfBlueTriangles; + NumberOfYellowShape = numberOfYellowTriangles; } public override int Total() @@ -22,15 +22,15 @@ public override int Total() return RedTrianglesTotal() + BlueTrianglesTotal() + YellowTrianglesTotal(); } - public int RedTrianglesTotal() + private int RedTrianglesTotal() { return (base.NumberOfRedShape * Price); } - public int BlueTrianglesTotal() + private int BlueTrianglesTotal() { return (base.NumberOfBlueShape * Price); } - public int YellowTrianglesTotal() + private int YellowTrianglesTotal() { return (base.NumberOfYellowShape * Price); }