From fcf65c08e389c76c7cb028cfb92a0d1f90f2723e Mon Sep 17 00:00:00 2001 From: JhayDarko Date: Fri, 13 Sep 2024 13:56:03 -0500 Subject: [PATCH 1/5] Refactor complete for quiz --- README.md | 8 ++++++++ src/AgeValidation.java | 27 +++++++++++++++++++++------ src/Store.java | 26 +++++++++++++++++--------- 3 files changed, 46 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 697a0cd..426ff2b 100644 --- a/README.md +++ b/README.md @@ -56,3 +56,11 @@ You must follow the **SDLC process** to refactor the code: - Once you complete the refactorization, push your changes to your forked repository. - Create a pull request (PR) to the original repository, explaining the improvements you made and how you followed the **SDLC** approach. +## Documentation + +En el ejercicio 1 se modificaron los valores mágicos y se estableció un límite para el estado de las ventas +Además se usaron arreglos para guardar los precios y las cantidades de los productos + +En el ejercicio 2 se estableció un límite de edad válida para verificar que se ingrese un valor positivo +Y otro límite para verificar si se es mayor de edad luego con loa estructura if-else + diff --git a/src/AgeValidation.java b/src/AgeValidation.java index 40e0198..d2fef32 100644 --- a/src/AgeValidation.java +++ b/src/AgeValidation.java @@ -1,13 +1,28 @@ +import java.util.Scanner; + public class AgeValidation { public static void main(String[] args) { - int age = 18; - - if (age >= 18) { + + //Definición de constantes + final int AGE_LIMIT = 18; + final int VALID_AGE = 0; + + //Inicialización del escaner para pedir datos al ususario + try (Scanner scan = new Scanner(System.in)) { + System.out.println("Ingresa tu edad"); + int age = scan.nextInt(); + + //Validación de la edad + if (age < VALID_AGE) { + System.out.println("Invalid Age"); + } + //Comprobar el caso correspondiente y salida de texto + else if (age >= AGE_LIMIT) { System.out.println("Access granted"); - } - - if (age < 18) { + } + else { System.out.println("Access denied"); + } } } } diff --git a/src/Store.java b/src/Store.java index 2a4729a..43288d9 100644 --- a/src/Store.java +++ b/src/Store.java @@ -1,19 +1,27 @@ public class Store { public static void main(String[] args) { - int p1 = 15; - int p2 = 10; - int p3 = 5; - int total1 = p1 * 2; - int total2 = p2 * 3; - int total3 = p3 * 4; + //Definición de constantes + final int SALES_TRESHOLD = 50; + final int MAX_PRODUCTS = 3; - int totalSales = total1 + total2 + total3; + //Definición de los arrelos con precios y cantitades + int[] prices = {15, 10, 5}; + int[] quantities = {2, 3, 4}; - if (totalSales > 50) { + //Inicialización del contador con el total de ventas + int totalSales = 0; + + //Ciclo para realizar las operaciones entre arreglos + for (int i = 0; i < MAX_PRODUCTS; i++) { + totalSales += prices[i] * quantities[i]; + } + + //Verificación y salida de texto + if (totalSales >= SALES_TRESHOLD) { System.out.println("Good sales performance"); } else { System.out.println("Low sales performance"); } } -} +} \ No newline at end of file From 9e719b1a59e9627f631425d5636b69c031b2a10e Mon Sep 17 00:00:00 2001 From: JhayDarko Date: Fri, 13 Sep 2024 19:45:52 -0500 Subject: [PATCH 2/5] Commit2 --- src/AgeValidation.java | 10 +++++----- src/Store.java | 36 ++++++++++++++++++++++++------------ src/TaxCalculation.java | 27 ++++++++++++++++++--------- 3 files changed, 47 insertions(+), 26 deletions(-) diff --git a/src/AgeValidation.java b/src/AgeValidation.java index d2fef32..460f683 100644 --- a/src/AgeValidation.java +++ b/src/AgeValidation.java @@ -4,20 +4,20 @@ public class AgeValidation { public static void main(String[] args) { //Definición de constantes - final int AGE_LIMIT = 18; - final int VALID_AGE = 0; + final int LEGAL_AGE = 18; + final int AGE_LIMIT = 0; //Inicialización del escaner para pedir datos al ususario try (Scanner scan = new Scanner(System.in)) { - System.out.println("Ingresa tu edad"); + System.out.println("Type your age"); int age = scan.nextInt(); //Validación de la edad - if (age < VALID_AGE) { + if (age < AGE_LIMIT) { System.out.println("Invalid Age"); } //Comprobar el caso correspondiente y salida de texto - else if (age >= AGE_LIMIT) { + else if (age >= LEGAL_AGE) { System.out.println("Access granted"); } else { diff --git a/src/Store.java b/src/Store.java index 43288d9..a785198 100644 --- a/src/Store.java +++ b/src/Store.java @@ -1,27 +1,39 @@ +import java.util.Scanner; + public class Store { public static void main(String[] args) { //Definición de constantes - final int SALES_TRESHOLD = 50; + final int SALES_TRESHOLD = 100; final int MAX_PRODUCTS = 3; //Definición de los arrelos con precios y cantitades int[] prices = {15, 10, 5}; - int[] quantities = {2, 3, 4}; + int[] quantities = new int[3]; - //Inicialización del contador con el total de ventas - int totalSales = 0; + //Se pide la cantidad de cada producto y se almacena en una matriz + try (Scanner scan = new Scanner(System.in)) { + for (int i = 0; i < MAX_PRODUCTS; i++) { + System.out.printf("Ingresa la cantidad del producto %s con valor de: $%s%n", i+1, prices[i]); + quantities[i] = scan.nextInt(); + } + //Inicialización del contador con el total de ventas + int totalSales = 0; - //Ciclo para realizar las operaciones entre arreglos - for (int i = 0; i < MAX_PRODUCTS; i++) { + //Ciclo para realizar las operaciones entre arreglos + for (int i = 0; i < MAX_PRODUCTS; i++) { totalSales += prices[i] * quantities[i]; - } + } - //Verificación y salida de texto - if (totalSales >= SALES_TRESHOLD) { - System.out.println("Good sales performance"); - } else { - System.out.println("Low sales performance"); + System.out.println("\nEl total de las ventas fué de: $" + totalSales); + //Verificación y salida de texto + if (totalSales >= SALES_TRESHOLD) { + System.out.println("Buen desempeño de ventas"); + } + else { + System.out.println("Mal desempeño de ventas"); + } } + } } \ No newline at end of file diff --git a/src/TaxCalculation.java b/src/TaxCalculation.java index 3417866..b324c13 100644 --- a/src/TaxCalculation.java +++ b/src/TaxCalculation.java @@ -1,15 +1,24 @@ +import java.util.Scanner; + public class TaxCalculation { public static void main(String[] args) { - double productPrice1 = 100; - double productPrice2 = 200; - double tax1 = productPrice1 * 0.15; - double tax2 = productPrice2 * 0.10; - double totalTax = tax1 + tax2; + + final int HIG_TAX = 50; - if (totalTax > 50) { - System.out.println("High total tax: " + totalTax); - } else { - System.out.println("Low tax"); + try (Scanner scan = new Scanner(System.in)) { + + System.out.println("Ingresa el valor del primer producto"); + int productPrice1 = scan.nextInt(); + + System.out.println("Ingresa el porcentaje de impuesto"); + int taxPercentage1 = scan.nextInt(); + + System.out.println("Ingresa el valor del segundo producto"); + int productPrice2 = scan.nextInt(); + + System.out.println("Ingresa el porcentaje de impuesto"); + int taxPercentage2 = scan.nextInt(); + } } } From faaa2681075af498e4ac8efc0ac98998a776a836 Mon Sep 17 00:00:00 2001 From: tatiana Date: Fri, 13 Sep 2024 21:37:53 -0500 Subject: [PATCH 3/5] commit --- src/TaxCalculation.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/TaxCalculation.java b/src/TaxCalculation.java index b324c13..a80a135 100644 --- a/src/TaxCalculation.java +++ b/src/TaxCalculation.java @@ -3,10 +3,13 @@ public class TaxCalculation { public static void main(String[] args) { + //Definición de constantes final int HIG_TAX = 50; + final double percentageConverter = 0.01; try (Scanner scan = new Scanner(System.in)) { + //Se le pide al usuario ingresar los datos System.out.println("Ingresa el valor del primer producto"); int productPrice1 = scan.nextInt(); @@ -19,6 +22,21 @@ public static void main(String[] args) { System.out.println("Ingresa el porcentaje de impuesto"); int taxPercentage2 = scan.nextInt(); + //Se hacen las operaciones para conocer el valor del impuesto + double tax1 = productPrice1 * taxPercentage1 * percentageConverter; + double tax2 = productPrice2 * taxPercentage2 * percentageConverter; + double totalTax = tax1 + tax2; + + //Se hace un informe del impuesto + System.out.println("\nTax value: $" + totalTax); + + //Se verifica si es alto o bajo según la constante + if (totalTax >= HIG_TAX) { + System.out.println("Hig tax"); + } + else { + System.out.println("Low tax"); + } } } } From d9530eb1cb72ec207ddcdf26b83415910e08f18e Mon Sep 17 00:00:00 2001 From: JhayDarko Date: Tue, 17 Sep 2024 21:04:17 -0500 Subject: [PATCH 4/5] Commit3 --- Git2/code-optimization-test | 1 + src/TaxCalculation.java | 72 ++++++++++++++++++++++--------------- 2 files changed, 44 insertions(+), 29 deletions(-) create mode 160000 Git2/code-optimization-test diff --git a/Git2/code-optimization-test b/Git2/code-optimization-test new file mode 160000 index 0000000..faaa268 --- /dev/null +++ b/Git2/code-optimization-test @@ -0,0 +1 @@ +Subproject commit faaa2681075af498e4ac8efc0ac98998a776a836 diff --git a/src/TaxCalculation.java b/src/TaxCalculation.java index a80a135..4f80336 100644 --- a/src/TaxCalculation.java +++ b/src/TaxCalculation.java @@ -3,39 +3,53 @@ public class TaxCalculation { public static void main(String[] args) { - //Definición de constantes - final int HIG_TAX = 50; - final double percentageConverter = 0.01; + final int TAX_THRESHOLD = 50; + final double TAX_RATE_HIGH = 0.10; + final double TAX_RATE_LOW = 0.15; + + int[] products; + double[] taxes; + double taxesSum = 0; try (Scanner scan = new Scanner(System.in)) { - - //Se le pide al usuario ingresar los datos - System.out.println("Ingresa el valor del primer producto"); - int productPrice1 = scan.nextInt(); - - System.out.println("Ingresa el porcentaje de impuesto"); - int taxPercentage1 = scan.nextInt(); - - System.out.println("Ingresa el valor del segundo producto"); - int productPrice2 = scan.nextInt(); - - System.out.println("Ingresa el porcentaje de impuesto"); - int taxPercentage2 = scan.nextInt(); - - //Se hacen las operaciones para conocer el valor del impuesto - double tax1 = productPrice1 * taxPercentage1 * percentageConverter; - double tax2 = productPrice2 * taxPercentage2 * percentageConverter; - double totalTax = tax1 + tax2; - - //Se hace un informe del impuesto - System.out.println("\nTax value: $" + totalTax); - - //Se verifica si es alto o bajo según la constante - if (totalTax >= HIG_TAX) { - System.out.println("Hig tax"); + + System.out.println("Ingresa la cantidad de productos"); + int productsAmount = scan.nextInt(); + products = new int[productsAmount]; + taxes = new double[productsAmount]; + + for (int i = 0; i < products.length; i++) { + System.out.println("Ingresa el precio del producto " + (i+1)); + products[i] = scan.nextInt(); + + int taxOption; + + do { + System.out.println("\n1 = impuesto es alto (15%)"); + System.out.println("2 = impuesto es bajo (10%)"); + taxOption = scan.nextInt(); + + switch (taxOption) { + case 1: + taxes[i] = TAX_RATE_HIGH; + break; + case 2: + taxes[i] = TAX_RATE_LOW; + break; + default: + System.out.println("Opción inválida"); + break; + } + } while ((taxOption != 1) && (taxOption != 2)); + + taxesSum += products[i] * taxes[i]; + } + System.out.println("El valor de los impuestos es de: $" + taxesSum); + if (taxesSum > TAX_THRESHOLD){ + System.out.println("El impuesto sobrepasa el umbral"); } else { - System.out.println("Low tax"); + System.out.println("El impuesto no sobrepasa el umbral"); } } } From b408b5c51cc4aa5d367252700354e640de773ddb Mon Sep 17 00:00:00 2001 From: JhayDarko Date: Tue, 17 Sep 2024 21:06:08 -0500 Subject: [PATCH 5/5] Commit4 --- Git2/code-optimization-test | 1 - 1 file changed, 1 deletion(-) delete mode 160000 Git2/code-optimization-test diff --git a/Git2/code-optimization-test b/Git2/code-optimization-test deleted file mode 160000 index faaa268..0000000 --- a/Git2/code-optimization-test +++ /dev/null @@ -1 +0,0 @@ -Subproject commit faaa2681075af498e4ac8efc0ac98998a776a836