From 5aa40b265009f4968b24f24a88ad3e42ff110bf4 Mon Sep 17 00:00:00 2001 From: bona Date: Thu, 8 Jun 2023 16:15:03 +0900 Subject: [PATCH 01/13] project initial setting [ADD] CalMemoryRepository save() test --- .gitignore | 37 +++ build.gradle | 24 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 240 ++++++++++++++++++ gradlew.bat | 91 +++++++ settings.gradle | 1 + .../com/bona/javacalculator/Calculator.java | 36 +++ .../JavaCalculatorApplication.java | 16 ++ .../com/bona/javacalculator/io/Console.java | 30 +++ .../com/bona/javacalculator/io/Input.java | 8 + .../com/bona/javacalculator/io/Output.java | 7 + .../javacalculator/model/InputAndAnswer.java | 20 ++ .../repository/CalMemoryRepository.java | 43 ++++ .../repository/MemoryRepository.java | 25 ++ .../javacalculator/service/CalService.java | 25 ++ src/main/resources/application.properties | 1 + .../JavaCalculatorApplicationTests.java | 13 + .../repository/CalMemoryRepositoryTest.java | 31 +++ 19 files changed, 653 insertions(+) create mode 100644 .gitignore create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/com/bona/javacalculator/Calculator.java create mode 100644 src/main/java/com/bona/javacalculator/JavaCalculatorApplication.java create mode 100644 src/main/java/com/bona/javacalculator/io/Console.java create mode 100644 src/main/java/com/bona/javacalculator/io/Input.java create mode 100644 src/main/java/com/bona/javacalculator/io/Output.java create mode 100644 src/main/java/com/bona/javacalculator/model/InputAndAnswer.java create mode 100644 src/main/java/com/bona/javacalculator/repository/CalMemoryRepository.java create mode 100644 src/main/java/com/bona/javacalculator/repository/MemoryRepository.java create mode 100644 src/main/java/com/bona/javacalculator/service/CalService.java create mode 100644 src/main/resources/application.properties create mode 100644 src/test/java/com/bona/javacalculator/JavaCalculatorApplicationTests.java create mode 100644 src/test/java/com/bona/javacalculator/repository/CalMemoryRepositoryTest.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..c2065bc26 --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..e62a0b31e --- /dev/null +++ b/build.gradle @@ -0,0 +1,24 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.1.0' + id 'io.spring.dependency-management' version '1.1.0' +} + +group = 'com.bona' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '17' + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter' + compileOnly 'org.projectlombok:lombok:1.18.26' + annotationProcessor 'org.projectlombok:lombok:1.18.26' + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..249e5832f090a2944b7473328c07c9755baa3196 GIT binary patch literal 60756 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..53a6b238d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,91 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 000000000..3cbb6cb5f --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'java-calculator' diff --git a/src/main/java/com/bona/javacalculator/Calculator.java b/src/main/java/com/bona/javacalculator/Calculator.java new file mode 100644 index 000000000..ff012f34a --- /dev/null +++ b/src/main/java/com/bona/javacalculator/Calculator.java @@ -0,0 +1,36 @@ +package com.bona.javacalculator; + +import com.bona.javacalculator.io.Console; +import com.bona.javacalculator.service.CalService; + +public class Calculator implements Runnable{ + + @Override + public void run() { + boolean isRun = true; + Console console = new Console(); + CalService calService = new CalService(); + + while(isRun){ + String input = console.input("1. 조회 2. 계산"); + int number = parse(input); + + switch (number) { + case 1: + calService.inquiry(); + break; + case 2: + calService.calculate(); + break; + default: + isRun = false; + break; + } + + } + } + + private int parse(String input) { + return Integer.parseInt(input); + } +} diff --git a/src/main/java/com/bona/javacalculator/JavaCalculatorApplication.java b/src/main/java/com/bona/javacalculator/JavaCalculatorApplication.java new file mode 100644 index 000000000..1abae90f9 --- /dev/null +++ b/src/main/java/com/bona/javacalculator/JavaCalculatorApplication.java @@ -0,0 +1,16 @@ +package com.bona.javacalculator; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class JavaCalculatorApplication { + + public static void main(String[] args) { + SpringApplication.run(JavaCalculatorApplication.class, args); + + Calculator calculator = new Calculator(); + calculator.run(); + } + +} diff --git a/src/main/java/com/bona/javacalculator/io/Console.java b/src/main/java/com/bona/javacalculator/io/Console.java new file mode 100644 index 000000000..4f5583cfe --- /dev/null +++ b/src/main/java/com/bona/javacalculator/io/Console.java @@ -0,0 +1,30 @@ +package com.bona.javacalculator.io; + +import java.util.Scanner; + +public class Console implements Input, Output{ + + private static final Scanner scanner = new Scanner(System.in); + + + @Override + public String input(String input) { + System.out.println(input); + return scanner.nextLine(); + } + + @Override + public void inputError() { + System.out.println("입력을 잘못하셨습니다."); + } + + @Override + public void outFormula() { + System.out.println(); + } + + @Override + public void outAnswer() { + + } +} diff --git a/src/main/java/com/bona/javacalculator/io/Input.java b/src/main/java/com/bona/javacalculator/io/Input.java new file mode 100644 index 000000000..4cb0943c8 --- /dev/null +++ b/src/main/java/com/bona/javacalculator/io/Input.java @@ -0,0 +1,8 @@ +package com.bona.javacalculator.io; + +public interface Input { + String input(String S); + + void inputError(); + +} diff --git a/src/main/java/com/bona/javacalculator/io/Output.java b/src/main/java/com/bona/javacalculator/io/Output.java new file mode 100644 index 000000000..cfb1edc5f --- /dev/null +++ b/src/main/java/com/bona/javacalculator/io/Output.java @@ -0,0 +1,7 @@ +package com.bona.javacalculator.io; + +public interface Output { + void outFormula(); + + void outAnswer(); +} diff --git a/src/main/java/com/bona/javacalculator/model/InputAndAnswer.java b/src/main/java/com/bona/javacalculator/model/InputAndAnswer.java new file mode 100644 index 000000000..d572aeeed --- /dev/null +++ b/src/main/java/com/bona/javacalculator/model/InputAndAnswer.java @@ -0,0 +1,20 @@ +package com.bona.javacalculator.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter @Setter +public class InputAndAnswer { + private Long id; + private String input; + private Integer answer; + + public InputAndAnswer() { + } + + public InputAndAnswer(String input, Integer answer) { + this.input = input; + this.answer = answer; + } +} diff --git a/src/main/java/com/bona/javacalculator/repository/CalMemoryRepository.java b/src/main/java/com/bona/javacalculator/repository/CalMemoryRepository.java new file mode 100644 index 000000000..3442f33e0 --- /dev/null +++ b/src/main/java/com/bona/javacalculator/repository/CalMemoryRepository.java @@ -0,0 +1,43 @@ +package com.bona.javacalculator.repository; + +import com.bona.javacalculator.model.InputAndAnswer; +import org.springframework.stereotype.Repository; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Repository +public class CalMemoryRepository implements MemoryRepository{ + + private static final Map store = new HashMap<>(); + private static long sequence = 0L; + + @Override + public InputAndAnswer save(InputAndAnswer inputAndAnswer) { + inputAndAnswer.setId(++sequence); + store.put(inputAndAnswer.getId(),inputAndAnswer); + return inputAndAnswer; + } + + @Override + public InputAndAnswer findById(Long id) { + return store.get(id); + } + + @Override + public List findAll() { + return new ArrayList<>(store.values()); + } + + @Override + public void clearStore() { + store.clear(); + } + + @Override + public int size() { + return store.size(); + } +} diff --git a/src/main/java/com/bona/javacalculator/repository/MemoryRepository.java b/src/main/java/com/bona/javacalculator/repository/MemoryRepository.java new file mode 100644 index 000000000..450e9ea20 --- /dev/null +++ b/src/main/java/com/bona/javacalculator/repository/MemoryRepository.java @@ -0,0 +1,25 @@ +package com.bona.javacalculator.repository; + +import com.bona.javacalculator.model.InputAndAnswer; +import org.springframework.stereotype.Repository; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Repository +public interface MemoryRepository{ + + InputAndAnswer save(InputAndAnswer inputAndAnswer); + + InputAndAnswer findById(Long id); + + List findAll(); + + void clearStore(); + + + + int size(); + +} diff --git a/src/main/java/com/bona/javacalculator/service/CalService.java b/src/main/java/com/bona/javacalculator/service/CalService.java new file mode 100644 index 000000000..d64a1ce2f --- /dev/null +++ b/src/main/java/com/bona/javacalculator/service/CalService.java @@ -0,0 +1,25 @@ +package com.bona.javacalculator.service; + +import com.bona.javacalculator.model.InputAndAnswer; +import com.bona.javacalculator.repository.CalMemoryRepository; +import com.bona.javacalculator.repository.MemoryRepository; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class CalService { + + MemoryRepository memoryRepository = new CalMemoryRepository(); + public List inquiry() { + List all = memoryRepository.findAll(); + if (all.isEmpty()) { + System.out.println("조회한 결과, 기록이 존재하지 않습니다."); + } + return all; + + } + + public void calculate() { + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/src/test/java/com/bona/javacalculator/JavaCalculatorApplicationTests.java b/src/test/java/com/bona/javacalculator/JavaCalculatorApplicationTests.java new file mode 100644 index 000000000..525269307 --- /dev/null +++ b/src/test/java/com/bona/javacalculator/JavaCalculatorApplicationTests.java @@ -0,0 +1,13 @@ +package com.bona.javacalculator; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class JavaCalculatorApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/src/test/java/com/bona/javacalculator/repository/CalMemoryRepositoryTest.java b/src/test/java/com/bona/javacalculator/repository/CalMemoryRepositoryTest.java new file mode 100644 index 000000000..4558be1f8 --- /dev/null +++ b/src/test/java/com/bona/javacalculator/repository/CalMemoryRepositoryTest.java @@ -0,0 +1,31 @@ +package com.bona.javacalculator.repository; + +import com.bona.javacalculator.model.InputAndAnswer; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.*; + +class CalMemoryRepositoryTest { + MemoryRepository memoryRepository = new CalMemoryRepository(); + + @AfterEach + void afterEach() { + memoryRepository.clearStore(); + } + + @Test + void save() { + //given + InputAndAnswer inputAndAnswer = new InputAndAnswer("1+2",3); + + //when + InputAndAnswer savedInputAndAnswer = memoryRepository.save(inputAndAnswer); + + //then + InputAndAnswer findInputAndAnswer = memoryRepository.findById(inputAndAnswer.getId()); + assertThat(findInputAndAnswer).isEqualTo(savedInputAndAnswer); + } + +} \ No newline at end of file From 02bdc1701fc8651d4f048fd0c9f8df312f07dac4 Mon Sep 17 00:00:00 2001 From: bona Date: Fri, 9 Jun 2023 00:43:29 +0900 Subject: [PATCH 02/13] =?UTF-8?q?[Update]=EC=9A=B0=EC=84=A0=EC=88=9C?= =?UTF-8?q?=EC=9C=84,=20=EC=82=AC=EC=B9=99=EC=97=B0=EC=84=A0=20=EC=84=9C?= =?UTF-8?q?=EB=B9=84=EC=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bona/javacalculator/Calculator.java | 38 +++++++- .../com/bona/javacalculator/io/Console.java | 16 +++- .../com/bona/javacalculator/io/Output.java | 10 +- .../javacalculator/model/InputAndAnswer.java | 4 +- .../javacalculator/service/CalService.java | 92 +++++++++++++++++-- .../repository/CalMemoryRepositoryTest.java | 2 +- 6 files changed, 144 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/bona/javacalculator/Calculator.java b/src/main/java/com/bona/javacalculator/Calculator.java index ff012f34a..702a2bf5d 100644 --- a/src/main/java/com/bona/javacalculator/Calculator.java +++ b/src/main/java/com/bona/javacalculator/Calculator.java @@ -1,15 +1,23 @@ package com.bona.javacalculator; import com.bona.javacalculator.io.Console; +import com.bona.javacalculator.io.Input; +import com.bona.javacalculator.io.Output; +import com.bona.javacalculator.model.InputAndAnswer; +import com.bona.javacalculator.repository.CalMemoryRepository; import com.bona.javacalculator.service.CalService; +import java.util.List; +import java.util.Optional; + public class Calculator implements Runnable{ + private static final CalService calService = new CalService(); + private static final CalMemoryRepository calMemoryRepo = new CalMemoryRepository(); + private final Console console = new Console(); @Override public void run() { boolean isRun = true; - Console console = new Console(); - CalService calService = new CalService(); while(isRun){ String input = console.input("1. 조회 2. 계산"); @@ -17,10 +25,10 @@ public void run() { switch (number) { case 1: - calService.inquiry(); + inquiry(); break; case 2: - calService.calculate(); + calculate(); break; default: isRun = false; @@ -30,6 +38,28 @@ public void run() { } } + private void calculate() { + String input = console.input("식을 입력해주세요 : "); + if (input.isEmpty()) { + return; + } + String postfix = calService.convPostfix(input); + double result = calService.calculateStr(postfix); + calMemoryRepo.save(new InputAndAnswer(input, result)); + + console.outAnswer(result); + } + + private void inquiry() { + List all = calMemoryRepo.findAll(); + if (all.isEmpty()) { + console.printMessage("조회 결과 기록이 존재하지 않습니다"); + return; + } + console.printAll(all); + + } + private int parse(String input) { return Integer.parseInt(input); } diff --git a/src/main/java/com/bona/javacalculator/io/Console.java b/src/main/java/com/bona/javacalculator/io/Console.java index 4f5583cfe..3f643676c 100644 --- a/src/main/java/com/bona/javacalculator/io/Console.java +++ b/src/main/java/com/bona/javacalculator/io/Console.java @@ -1,5 +1,8 @@ package com.bona.javacalculator.io; +import com.bona.javacalculator.model.InputAndAnswer; + +import java.util.List; import java.util.Scanner; public class Console implements Input, Output{ @@ -19,12 +22,19 @@ public void inputError() { } @Override - public void outFormula() { - System.out.println(); + public void outAnswer(Double answer) { + System.out.println(answer); } @Override - public void outAnswer() { + public void printAll(List inputAndAnswerList) { + for (Object history : inputAndAnswerList) { + System.out.println(history); + } + } + @Override + public void printMessage(String message) { + System.out.println(message); } } diff --git a/src/main/java/com/bona/javacalculator/io/Output.java b/src/main/java/com/bona/javacalculator/io/Output.java index cfb1edc5f..9693aa899 100644 --- a/src/main/java/com/bona/javacalculator/io/Output.java +++ b/src/main/java/com/bona/javacalculator/io/Output.java @@ -1,7 +1,13 @@ package com.bona.javacalculator.io; +import com.bona.javacalculator.model.InputAndAnswer; + +import java.util.List; + public interface Output { - void outFormula(); + void outAnswer(Double answer); + + void printAll(List inputAndAnswerList); - void outAnswer(); + void printMessage(String message); } diff --git a/src/main/java/com/bona/javacalculator/model/InputAndAnswer.java b/src/main/java/com/bona/javacalculator/model/InputAndAnswer.java index d572aeeed..8b824e5f4 100644 --- a/src/main/java/com/bona/javacalculator/model/InputAndAnswer.java +++ b/src/main/java/com/bona/javacalculator/model/InputAndAnswer.java @@ -8,12 +8,12 @@ public class InputAndAnswer { private Long id; private String input; - private Integer answer; + private Double answer; public InputAndAnswer() { } - public InputAndAnswer(String input, Integer answer) { + public InputAndAnswer(String input, Double answer) { this.input = input; this.answer = answer; } diff --git a/src/main/java/com/bona/javacalculator/service/CalService.java b/src/main/java/com/bona/javacalculator/service/CalService.java index d64a1ce2f..21a6d1ffb 100644 --- a/src/main/java/com/bona/javacalculator/service/CalService.java +++ b/src/main/java/com/bona/javacalculator/service/CalService.java @@ -6,20 +6,100 @@ import org.springframework.stereotype.Service; import java.util.List; +import java.util.Stack; @Service public class CalService { MemoryRepository memoryRepository = new CalMemoryRepository(); - public List inquiry() { - List all = memoryRepository.findAll(); - if (all.isEmpty()) { - System.out.println("조회한 결과, 기록이 존재하지 않습니다."); + + public double calculateStr(String input) { + //숫자만 저장 + Stack numbers = new Stack<>(); + char arr[] = input.toCharArray(); + for (int i = 0; i < arr.length; i++) { + if(Character.isDigit(arr[i]) == true){ + numbers.push(Integer.parseInt(String.valueOf(arr[i]))); + }else{ + Integer num1 = numbers.pop(); + Integer num2 = numbers.pop(); + calculateReal(num1, num2, String.valueOf(arr[i]),numbers); + } } - return all; + InputAndAnswer inputAndAnswer = new InputAndAnswer(input, Double.valueOf(numbers.pop().toString())); + memoryRepository.save(inputAndAnswer); + return Double.valueOf(numbers.pop().toString()); + } + public String convPostfix(String input) { + String c = String.valueOf(' '); + Stack operationStack = new Stack<>(); //연산자 스택 + StringBuilder sb = new StringBuilder(); + char inputarr[] = input.toCharArray(); + for (int i = 0; i < inputarr.length; i++) { + if(Character.isDigit(inputarr[i]) == true){//숫자면 표현 + sb.append(inputarr[i]); + }else if(operationStack.isEmpty()){//연산자 스택이 비어있을 경우 값 push + operationStack.push(inputarr[i]); + }else{// 연산자가 스택에 있는 경우 + if (compareOperation(String.valueOf(operationStack.peek()), c) > 0) { //현재 연산자가 우선순위 더 높을 때 + operationStack.push(inputarr[i]); // 연산자 + } + while(!operationStack.isEmpty()) { + if (compareOperation(String.valueOf(operationStack.peek()), c) <= 0) { + sb.append(operationStack.pop()); + } else { + break; + } + } + operationStack.push(inputarr[i]); + } + } + return sb.toString(); } - public void calculate() { + public void calculateReal(Integer num1, Integer num2, String operation, Stack stack){ + switch (operation) { + case "+": + stack.push(num1 + num2); + case "-": + stack.push(num1 - num2); + case "*": + stack.push(num1 * num2); + case "/": + stack.push(num1 / num2); + + } } + + + //연산자 우선순위 반환 + public static int getOperationPriority(String op) { + switch (op) { + case "*": + case "/": + return 3; + case "+": + case "-": + return 2; + default: + return -1; + } + } + + //연산자 우선순위 비교 + public static int compareOperation(String op, String opNow) { + int operationPriority = getOperationPriority(op); + int operationPriorityNow = getOperationPriority(opNow); + + if (operationPriorityNow > operationPriority) { + return 1; + } else if (operationPriorityNow == operationPriority) { + return 0; + } else{ + return -1; + } + + } + } diff --git a/src/test/java/com/bona/javacalculator/repository/CalMemoryRepositoryTest.java b/src/test/java/com/bona/javacalculator/repository/CalMemoryRepositoryTest.java index 4558be1f8..f04f4ec54 100644 --- a/src/test/java/com/bona/javacalculator/repository/CalMemoryRepositoryTest.java +++ b/src/test/java/com/bona/javacalculator/repository/CalMemoryRepositoryTest.java @@ -18,7 +18,7 @@ void afterEach() { @Test void save() { //given - InputAndAnswer inputAndAnswer = new InputAndAnswer("1+2",3); + InputAndAnswer inputAndAnswer = new InputAndAnswer("1+2",3.0); //when InputAndAnswer savedInputAndAnswer = memoryRepository.save(inputAndAnswer); From 30aee8880b5d348ea1ed1627b6cc7cb309d08753 Mon Sep 17 00:00:00 2001 From: bona Date: Fri, 9 Jun 2023 14:40:18 +0900 Subject: [PATCH 03/13] =?UTF-8?q?[Update]=EC=9A=B0=EC=84=A0=EC=88=9C?= =?UTF-8?q?=EC=9C=84=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bona/javacalculator/Calculator.java | 6 +- .../com/bona/javacalculator/io/Console.java | 6 +- .../javacalculator/service/CalService.java | 109 +++++++++--------- 3 files changed, 62 insertions(+), 59 deletions(-) diff --git a/src/main/java/com/bona/javacalculator/Calculator.java b/src/main/java/com/bona/javacalculator/Calculator.java index 702a2bf5d..e6c39f375 100644 --- a/src/main/java/com/bona/javacalculator/Calculator.java +++ b/src/main/java/com/bona/javacalculator/Calculator.java @@ -1,8 +1,7 @@ package com.bona.javacalculator; import com.bona.javacalculator.io.Console; -import com.bona.javacalculator.io.Input; -import com.bona.javacalculator.io.Output; + import com.bona.javacalculator.model.InputAndAnswer; import com.bona.javacalculator.repository.CalMemoryRepository; import com.bona.javacalculator.service.CalService; @@ -44,7 +43,8 @@ private void calculate() { return; } String postfix = calService.convPostfix(input); - double result = calService.calculateStr(postfix); + System.out.println("postfix = " + postfix); + Double result = calService.calculateStr(postfix); calMemoryRepo.save(new InputAndAnswer(input, result)); console.outAnswer(result); diff --git a/src/main/java/com/bona/javacalculator/io/Console.java b/src/main/java/com/bona/javacalculator/io/Console.java index 3f643676c..53f4b498d 100644 --- a/src/main/java/com/bona/javacalculator/io/Console.java +++ b/src/main/java/com/bona/javacalculator/io/Console.java @@ -28,8 +28,10 @@ public void outAnswer(Double answer) { @Override public void printAll(List inputAndAnswerList) { - for (Object history : inputAndAnswerList) { - System.out.println(history); + for (InputAndAnswer history : inputAndAnswerList) { + String input = history.getInput(); + Double answer = history.getAnswer(); + System.out.println(input + "="+ answer); } } diff --git a/src/main/java/com/bona/javacalculator/service/CalService.java b/src/main/java/com/bona/javacalculator/service/CalService.java index 21a6d1ffb..84a54a258 100644 --- a/src/main/java/com/bona/javacalculator/service/CalService.java +++ b/src/main/java/com/bona/javacalculator/service/CalService.java @@ -1,94 +1,95 @@ package com.bona.javacalculator.service; -import com.bona.javacalculator.model.InputAndAnswer; -import com.bona.javacalculator.repository.CalMemoryRepository; -import com.bona.javacalculator.repository.MemoryRepository; import org.springframework.stereotype.Service; -import java.util.List; + import java.util.Stack; @Service public class CalService { - MemoryRepository memoryRepository = new CalMemoryRepository(); - - public double calculateStr(String input) { + //숫자,연산자 구분 + public Double calculateStr(String input) { //숫자만 저장 - Stack numbers = new Stack<>(); - char arr[] = input.toCharArray(); - for (int i = 0; i < arr.length; i++) { - if(Character.isDigit(arr[i]) == true){ - numbers.push(Integer.parseInt(String.valueOf(arr[i]))); + Stack numbers = new Stack<>(); + char c = ' '; + double num1 = 0; + double num2 = 0; + for (int i = 0; i < input.length(); i++) { + c = input.charAt(i); + if(Character.isDigit(c)){ + numbers.push(c); }else{ - Integer num1 = numbers.pop(); - Integer num2 = numbers.pop(); - calculateReal(num1, num2, String.valueOf(arr[i]),numbers); + num2 = Double.parseDouble(numbers.pop().toString()); + num1 = Double.parseDouble(numbers.pop().toString()); + //연산자면 계산 후 스택에 저장 +// calculateReal(num1, num2, c,numbers); + switch (c) { + case '+' -> numbers.push(num1 + num2); + case '-' -> numbers.push(num1 - num2); + case '*' -> numbers.push(num1 * num2); + case '/' -> numbers.push(num1 / num2); + } } } - InputAndAnswer inputAndAnswer = new InputAndAnswer(input, Double.valueOf(numbers.pop().toString())); - memoryRepository.save(inputAndAnswer); return Double.valueOf(numbers.pop().toString()); } + //후위 표기로 변환 public String convPostfix(String input) { - String c = String.valueOf(' '); - Stack operationStack = new Stack<>(); //연산자 스택 + char c = ' '; + Stack operationStack = new Stack<>(); //연산자 스택 StringBuilder sb = new StringBuilder(); - char inputarr[] = input.toCharArray(); - for (int i = 0; i < inputarr.length; i++) { - if(Character.isDigit(inputarr[i]) == true){//숫자면 표현 - sb.append(inputarr[i]); - }else if(operationStack.isEmpty()){//연산자 스택이 비어있을 경우 값 push - operationStack.push(inputarr[i]); - }else{// 연산자가 스택에 있는 경우 - if (compareOperation(String.valueOf(operationStack.peek()), c) > 0) { //현재 연산자가 우선순위 더 높을 때 - operationStack.push(inputarr[i]); // 연산자 - } - while(!operationStack.isEmpty()) { - if (compareOperation(String.valueOf(operationStack.peek()), c) <= 0) { - sb.append(operationStack.pop()); - } else { - break; + for (int i = 0; i < input.length(); i++) { + c = input.charAt(i); + if (Character.isDigit(c)) {//숫자면 표현 + sb.append(c); + } else if (operationStack.isEmpty()) {//연산자 스택이 비어있을 경우 값 push + operationStack.push(c); + } else {// 연산자가 스택에 있는 경우 + if (compareOperation((char)operationStack.peek(), c) > 0) { //현재 연산자가 우선순위 더 높을 때 + operationStack.push(c); // 연산자 저장 + } else { + while (!operationStack.isEmpty()) { + //현재 연산자가 우선순위 더 낮거나 같은 경우 + if (compareOperation((char)operationStack.peek(), c) <= 0) { + sb.append(operationStack.pop()); // 스택에 있는 우선순위 높은 연산자 pop + } else { + break; + } } + operationStack.push(c); } - operationStack.push(inputarr[i]); } } + char check = ' '; + while (!operationStack.isEmpty()) { + check = (char) operationStack.pop(); + sb.append(check); + } return sb.toString(); } - public void calculateReal(Integer num1, Integer num2, String operation, Stack stack){ - switch (operation) { - case "+": - stack.push(num1 + num2); - case "-": - stack.push(num1 - num2); - case "*": - stack.push(num1 * num2); - case "/": - stack.push(num1 / num2); - - } - } //연산자 우선순위 반환 - public static int getOperationPriority(String op) { + public static int getOperationPriority(char op) { switch (op) { - case "*": - case "/": + case '*': + case '/': return 3; - case "+": - case "-": + case '+': + case '-': return 2; + case '(': + return 1; default: return -1; } } //연산자 우선순위 비교 - public static int compareOperation(String op, String opNow) { + public static int compareOperation(char op, char opNow) { int operationPriority = getOperationPriority(op); int operationPriorityNow = getOperationPriority(opNow); From 2003310c6b5a19e747300462421699944631e250 Mon Sep 17 00:00:00 2001 From: bona Date: Fri, 9 Jun 2023 15:49:39 +0900 Subject: [PATCH 04/13] [ADD]ValidateService --- .../java/com/bona/javacalculator/Calculator.java | 12 ++++++++++++ .../java/com/bona/javacalculator/io/Console.java | 12 +++++++++++- .../javacalculator/service/ValidateService.java | 13 +++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/bona/javacalculator/service/ValidateService.java diff --git a/src/main/java/com/bona/javacalculator/Calculator.java b/src/main/java/com/bona/javacalculator/Calculator.java index e6c39f375..e1850fea3 100644 --- a/src/main/java/com/bona/javacalculator/Calculator.java +++ b/src/main/java/com/bona/javacalculator/Calculator.java @@ -5,6 +5,7 @@ import com.bona.javacalculator.model.InputAndAnswer; import com.bona.javacalculator.repository.CalMemoryRepository; import com.bona.javacalculator.service.CalService; +import com.bona.javacalculator.service.ValidateService; import java.util.List; import java.util.Optional; @@ -12,6 +13,7 @@ public class Calculator implements Runnable{ private static final CalService calService = new CalService(); + private static final ValidateService validateService = new ValidateService(); private static final CalMemoryRepository calMemoryRepo = new CalMemoryRepository(); private final Console console = new Console(); @Override @@ -60,7 +62,17 @@ private void inquiry() { } + private Optional checkValidate(String input) { + Optional testInput = validateService.validate(input); + if (testInput.isEmpty()) { + console.inputError(); + return Optional.empty(); + } + return testInput; + } + private int parse(String input) { return Integer.parseInt(input); } + } diff --git a/src/main/java/com/bona/javacalculator/io/Console.java b/src/main/java/com/bona/javacalculator/io/Console.java index 53f4b498d..877bd9118 100644 --- a/src/main/java/com/bona/javacalculator/io/Console.java +++ b/src/main/java/com/bona/javacalculator/io/Console.java @@ -9,6 +9,10 @@ public class Console implements Input, Output{ private static final Scanner scanner = new Scanner(System.in); + //정수인지 + public boolean isLong(double num) { + return num == (long) num; + } @Override public String input(String input) { @@ -23,7 +27,13 @@ public void inputError() { @Override public void outAnswer(Double answer) { - System.out.println(answer); + boolean isLong = isLong(answer); + if(isLong){ + Long changeAnswer = answer.longValue(); + System.out.println(changeAnswer); + }else { + System.out.println(answer); + } } @Override diff --git a/src/main/java/com/bona/javacalculator/service/ValidateService.java b/src/main/java/com/bona/javacalculator/service/ValidateService.java new file mode 100644 index 000000000..29057a07a --- /dev/null +++ b/src/main/java/com/bona/javacalculator/service/ValidateService.java @@ -0,0 +1,13 @@ +package com.bona.javacalculator.service; + +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@Service +public class ValidateService { + + public Optional validate(String input) { + return null; + } +} From 7e074e56335d9b2d780b109a3539fa564b4b8be8 Mon Sep 17 00:00:00 2001 From: bona Date: Mon, 12 Jun 2023 13:43:05 +0900 Subject: [PATCH 05/13] [UPDATE]ValidateService --- .../com/bona/javacalculator/Calculator.java | 8 ++- .../javacalculator/service/CalService.java | 18 +++--- .../service/ValidateService.java | 63 +++++++++++++++++-- .../repository/CalMemoryRepositoryTest.java | 1 + 4 files changed, 76 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/bona/javacalculator/Calculator.java b/src/main/java/com/bona/javacalculator/Calculator.java index e1850fea3..de43eb562 100644 --- a/src/main/java/com/bona/javacalculator/Calculator.java +++ b/src/main/java/com/bona/javacalculator/Calculator.java @@ -41,10 +41,11 @@ public void run() { private void calculate() { String input = console.input("식을 입력해주세요 : "); + Optional validateInput = checkValidate(input); if (input.isEmpty()) { return; } - String postfix = calService.convPostfix(input); + String postfix = calService.convPostfix(validateInput.get()); System.out.println("postfix = " + postfix); Double result = calService.calculateStr(postfix); calMemoryRepo.save(new InputAndAnswer(input, result)); @@ -72,6 +73,11 @@ private Optional checkValidate(String input) { } private int parse(String input) { +// if (input.isBlank()) { +// return BYE; +// } +// if() + return Integer.parseInt(input); } diff --git a/src/main/java/com/bona/javacalculator/service/CalService.java b/src/main/java/com/bona/javacalculator/service/CalService.java index 84a54a258..0c13b592f 100644 --- a/src/main/java/com/bona/javacalculator/service/CalService.java +++ b/src/main/java/com/bona/javacalculator/service/CalService.java @@ -1,13 +1,14 @@ package com.bona.javacalculator.service; import org.springframework.stereotype.Service; - - import java.util.Stack; -@Service + public class CalService { + + private static final char WHITE_SPACE = ' '; + //숫자,연산자 구분 public Double calculateStr(String input) { //숫자만 저장 @@ -17,9 +18,9 @@ public Double calculateStr(String input) { double num2 = 0; for (int i = 0; i < input.length(); i++) { c = input.charAt(i); - if(Character.isDigit(c)){ + if (Character.isDigit(c)) { numbers.push(c); - }else{ + } else { num2 = Double.parseDouble(numbers.pop().toString()); num1 = Double.parseDouble(numbers.pop().toString()); //연산자면 계산 후 스택에 저장 @@ -47,12 +48,12 @@ public String convPostfix(String input) { } else if (operationStack.isEmpty()) {//연산자 스택이 비어있을 경우 값 push operationStack.push(c); } else {// 연산자가 스택에 있는 경우 - if (compareOperation((char)operationStack.peek(), c) > 0) { //현재 연산자가 우선순위 더 높을 때 + if (compareOperation((char) operationStack.peek(), c) > 0) { //현재 연산자가 우선순위 더 높을 때 operationStack.push(c); // 연산자 저장 } else { while (!operationStack.isEmpty()) { //현재 연산자가 우선순위 더 낮거나 같은 경우 - if (compareOperation((char)operationStack.peek(), c) <= 0) { + if (compareOperation((char) operationStack.peek(), c) <= 0) { sb.append(operationStack.pop()); // 스택에 있는 우선순위 높은 연산자 pop } else { break; @@ -71,7 +72,6 @@ public String convPostfix(String input) { } - //연산자 우선순위 반환 public static int getOperationPriority(char op) { switch (op) { @@ -97,7 +97,7 @@ public static int compareOperation(char op, char opNow) { return 1; } else if (operationPriorityNow == operationPriority) { return 0; - } else{ + } else { return -1; } diff --git a/src/main/java/com/bona/javacalculator/service/ValidateService.java b/src/main/java/com/bona/javacalculator/service/ValidateService.java index 29057a07a..95421688e 100644 --- a/src/main/java/com/bona/javacalculator/service/ValidateService.java +++ b/src/main/java/com/bona/javacalculator/service/ValidateService.java @@ -1,13 +1,68 @@ package com.bona.javacalculator.service; -import org.springframework.stereotype.Service; - import java.util.Optional; -@Service + public class ValidateService { public Optional validate(String input) { - return null; + String[] inputString = input.split(" "); + + if (inputString.length < 3) { + return Optional.empty(); + } + + boolean isDivision = false; + + for (int i = 0; i < inputString.length; i++) { + if (1 % 2 == 1) { // 홀수 자리일 경우 연산자여야 함. + if(!isOperator(inputString[i])){ + return Optional.empty(); + } + // / 일 경우 0 나누는경울 처리 + if(inputString[i].equals("/")){ + isDivision = true; + } + // 숫자 validate + } else if (!isVaildNumber(inputString[i], isDivision)) { + return Optional.empty(); + } + isDivision = false; + } + //마지막 자리가 숫자인지 + if(!isNumber(inputString[inputString.length-1])){ + return Optional.empty(); + } + return Optional.of(input); + } + + private boolean isVaildNumber(String s, boolean isDivision) { + //숫자 인지 + if(!isNumber(s)){ + return false; + } + // 0이고 앞서 나온 연산자가 / 라면 false + if(s.equals("0") && isDivision){ + return false; + } + return true; + } + + + + + + private boolean isOperator(String s) { + if(s.equals("+") || s.equals("-") || s.equals("*") || s.equals("/")){ + return true; + } + return false; + } + + private boolean isNumber(String s) { + if(!Character.isDigit(Integer.parseInt(s))){ + return false; + } + return true; } } diff --git a/src/test/java/com/bona/javacalculator/repository/CalMemoryRepositoryTest.java b/src/test/java/com/bona/javacalculator/repository/CalMemoryRepositoryTest.java index f04f4ec54..f96a7f648 100644 --- a/src/test/java/com/bona/javacalculator/repository/CalMemoryRepositoryTest.java +++ b/src/test/java/com/bona/javacalculator/repository/CalMemoryRepositoryTest.java @@ -15,6 +15,7 @@ void afterEach() { memoryRepository.clearStore(); } + // @DisplayName("저장을 테스트한다.") @Test void save() { //given From 067ffa576e902051a6719dc8051a8f8837ed5797 Mon Sep 17 00:00:00 2001 From: bona Date: Mon, 12 Jun 2023 15:18:34 +0900 Subject: [PATCH 06/13] [UPDATE]ValidateService --- .../com/bona/javacalculator/Calculator.java | 25 ++++++++------ .../java/com/bona/javacalculator/Option.java | 34 +++++++++++++++++++ .../com/bona/javacalculator/io/Console.java | 10 +++++- .../javacalculator/service/CalService.java | 4 +-- .../bona/javacalculator/service/Check.java | 25 ++++++++++++++ .../service/ValidateService.java | 26 ++++---------- 6 files changed, 90 insertions(+), 34 deletions(-) create mode 100644 src/main/java/com/bona/javacalculator/Option.java create mode 100644 src/main/java/com/bona/javacalculator/service/Check.java diff --git a/src/main/java/com/bona/javacalculator/Calculator.java b/src/main/java/com/bona/javacalculator/Calculator.java index de43eb562..da9d4d8f7 100644 --- a/src/main/java/com/bona/javacalculator/Calculator.java +++ b/src/main/java/com/bona/javacalculator/Calculator.java @@ -5,6 +5,7 @@ import com.bona.javacalculator.model.InputAndAnswer; import com.bona.javacalculator.repository.CalMemoryRepository; import com.bona.javacalculator.service.CalService; +import com.bona.javacalculator.service.Check; import com.bona.javacalculator.service.ValidateService; import java.util.List; @@ -23,17 +24,24 @@ public void run() { while(isRun){ String input = console.input("1. 조회 2. 계산"); int number = parse(input); + Option option = Option.valueOf(number); - switch (number) { - case 1: + if (option == null) { + continue; + } + + switch (option) { + case INQUIRY: inquiry(); break; - case 2: + case CALCULATE: calculate(); break; - default: + case EXIT: isRun = false; break; + default: + break; } } @@ -42,11 +50,11 @@ public void run() { private void calculate() { String input = console.input("식을 입력해주세요 : "); Optional validateInput = checkValidate(input); - if (input.isEmpty()) { + if (validateInput.isEmpty()) { return; } String postfix = calService.convPostfix(validateInput.get()); - System.out.println("postfix = " + postfix); +// System.out.println("postfix = " + postfix); Double result = calService.calculateStr(postfix); calMemoryRepo.save(new InputAndAnswer(input, result)); @@ -73,11 +81,6 @@ private Optional checkValidate(String input) { } private int parse(String input) { -// if (input.isBlank()) { -// return BYE; -// } -// if() - return Integer.parseInt(input); } diff --git a/src/main/java/com/bona/javacalculator/Option.java b/src/main/java/com/bona/javacalculator/Option.java new file mode 100644 index 000000000..fe2ade2cb --- /dev/null +++ b/src/main/java/com/bona/javacalculator/Option.java @@ -0,0 +1,34 @@ +package com.bona.javacalculator; + +public enum Option { + EXIT(-1), + INVALID_INPUT(0), + INQUIRY(1), + CALCULATE(2); + + private int matchNum; + + Option(int matchNum) { + this.matchNum = matchNum; + } + + public static Option valueOf(int matchNum) { + Option option = null; + switch (matchNum) { + case -1: + option = Option.EXIT; + return option; + case 1: + option = Option.INQUIRY; + return option; + case 2: + option = Option.CALCULATE; + return option; + default: + option = Option.INVALID_INPUT; + return option; + + } + + } +} diff --git a/src/main/java/com/bona/javacalculator/io/Console.java b/src/main/java/com/bona/javacalculator/io/Console.java index 877bd9118..2c4ec918e 100644 --- a/src/main/java/com/bona/javacalculator/io/Console.java +++ b/src/main/java/com/bona/javacalculator/io/Console.java @@ -41,7 +41,15 @@ public void printAll(List inputAndAnswerList) { for (InputAndAnswer history : inputAndAnswerList) { String input = history.getInput(); Double answer = history.getAnswer(); - System.out.println(input + "="+ answer); + + System.out.print(input + "="); + boolean isLong = isLong(answer); + if(isLong){ + Long changeAnswer = answer.longValue(); + System.out.println(changeAnswer); + }else { + System.out.println(answer); + } } } diff --git a/src/main/java/com/bona/javacalculator/service/CalService.java b/src/main/java/com/bona/javacalculator/service/CalService.java index 0c13b592f..b5624e518 100644 --- a/src/main/java/com/bona/javacalculator/service/CalService.java +++ b/src/main/java/com/bona/javacalculator/service/CalService.java @@ -77,11 +77,9 @@ public static int getOperationPriority(char op) { switch (op) { case '*': case '/': - return 3; + return 2; case '+': case '-': - return 2; - case '(': return 1; default: return -1; diff --git a/src/main/java/com/bona/javacalculator/service/Check.java b/src/main/java/com/bona/javacalculator/service/Check.java new file mode 100644 index 000000000..679419f8c --- /dev/null +++ b/src/main/java/com/bona/javacalculator/service/Check.java @@ -0,0 +1,25 @@ +package com.bona.javacalculator.service; + +public class Check { + static boolean isOperator(String s) { + if (s.length() > 1) { + return false; + } + if(s.equals("+") || s.equals("-") || s.equals("*") || s.equals("/")){ + return true; + } + return false; + } + + public static boolean isNumber(String s) { + for (int i = 0; i < s.length(); i++) { + if (s.length() == 1 && s.charAt(0) == '-') { + return false; + } + if(i > 0 && !Character.isDigit(s.charAt(i))){ + return false; + } + } + return true; + } +} diff --git a/src/main/java/com/bona/javacalculator/service/ValidateService.java b/src/main/java/com/bona/javacalculator/service/ValidateService.java index 95421688e..a3059d0bc 100644 --- a/src/main/java/com/bona/javacalculator/service/ValidateService.java +++ b/src/main/java/com/bona/javacalculator/service/ValidateService.java @@ -6,7 +6,7 @@ public class ValidateService { public Optional validate(String input) { - String[] inputString = input.split(" "); + String[] inputString = input.split(""); if (inputString.length < 3) { return Optional.empty(); @@ -15,8 +15,8 @@ public Optional validate(String input) { boolean isDivision = false; for (int i = 0; i < inputString.length; i++) { - if (1 % 2 == 1) { // 홀수 자리일 경우 연산자여야 함. - if(!isOperator(inputString[i])){ + if (i % 2 == 1) { // 홀수 자리일 경우 연산자여야 함. + if(!Check.isOperator(inputString[i])){ return Optional.empty(); } // / 일 경우 0 나누는경울 처리 @@ -24,21 +24,21 @@ public Optional validate(String input) { isDivision = true; } // 숫자 validate - } else if (!isVaildNumber(inputString[i], isDivision)) { + } else if (!isValidNumber(inputString[i], isDivision)) { return Optional.empty(); } isDivision = false; } //마지막 자리가 숫자인지 - if(!isNumber(inputString[inputString.length-1])){ + if(!Check.isNumber((inputString[inputString.length-1]))){ return Optional.empty(); } return Optional.of(input); } - private boolean isVaildNumber(String s, boolean isDivision) { + private boolean isValidNumber(String s, boolean isDivision) { //숫자 인지 - if(!isNumber(s)){ + if(!Check.isNumber(s)){ return false; } // 0이고 앞서 나온 연산자가 / 라면 false @@ -52,17 +52,5 @@ private boolean isVaildNumber(String s, boolean isDivision) { - private boolean isOperator(String s) { - if(s.equals("+") || s.equals("-") || s.equals("*") || s.equals("/")){ - return true; - } - return false; - } - private boolean isNumber(String s) { - if(!Character.isDigit(Integer.parseInt(s))){ - return false; - } - return true; - } } From 1a670722cd3ccf2e406a829ecf5ba6d7e0cf3263 Mon Sep 17 00:00:00 2001 From: bona Date: Mon, 12 Jun 2023 16:06:42 +0900 Subject: [PATCH 07/13] [ADD]ValidateServiceTest --- .../com/bona/javacalculator/Calculator.java | 4 - .../javacalculator/service/CalService.java | 2 +- .../service/{Check.java => CheckService.java} | 4 +- .../service/ValidateService.java | 9 +-- .../repository/CalMemoryRepositoryTest.java | 3 +- .../service/ValidateServiceTest.java | 74 +++++++++++++++++++ 6 files changed, 83 insertions(+), 13 deletions(-) rename src/main/java/com/bona/javacalculator/service/{Check.java => CheckService.java} (87%) create mode 100644 src/test/java/com/bona/javacalculator/service/ValidateServiceTest.java diff --git a/src/main/java/com/bona/javacalculator/Calculator.java b/src/main/java/com/bona/javacalculator/Calculator.java index da9d4d8f7..34c2373cc 100644 --- a/src/main/java/com/bona/javacalculator/Calculator.java +++ b/src/main/java/com/bona/javacalculator/Calculator.java @@ -5,7 +5,6 @@ import com.bona.javacalculator.model.InputAndAnswer; import com.bona.javacalculator.repository.CalMemoryRepository; import com.bona.javacalculator.service.CalService; -import com.bona.javacalculator.service.Check; import com.bona.javacalculator.service.ValidateService; import java.util.List; @@ -37,9 +36,6 @@ public void run() { case CALCULATE: calculate(); break; - case EXIT: - isRun = false; - break; default: break; } diff --git a/src/main/java/com/bona/javacalculator/service/CalService.java b/src/main/java/com/bona/javacalculator/service/CalService.java index b5624e518..4e968a2b5 100644 --- a/src/main/java/com/bona/javacalculator/service/CalService.java +++ b/src/main/java/com/bona/javacalculator/service/CalService.java @@ -7,7 +7,7 @@ public class CalService { - private static final char WHITE_SPACE = ' '; +// private static final char WHITE_SPACE = ' '; //숫자,연산자 구분 public Double calculateStr(String input) { diff --git a/src/main/java/com/bona/javacalculator/service/Check.java b/src/main/java/com/bona/javacalculator/service/CheckService.java similarity index 87% rename from src/main/java/com/bona/javacalculator/service/Check.java rename to src/main/java/com/bona/javacalculator/service/CheckService.java index 679419f8c..8b10f834b 100644 --- a/src/main/java/com/bona/javacalculator/service/Check.java +++ b/src/main/java/com/bona/javacalculator/service/CheckService.java @@ -1,6 +1,6 @@ package com.bona.javacalculator.service; -public class Check { +public class CheckService { static boolean isOperator(String s) { if (s.length() > 1) { return false; @@ -16,7 +16,7 @@ public static boolean isNumber(String s) { if (s.length() == 1 && s.charAt(0) == '-') { return false; } - if(i > 0 && !Character.isDigit(s.charAt(i))){ + if(!Character.isDigit(s.charAt(i))){ return false; } } diff --git a/src/main/java/com/bona/javacalculator/service/ValidateService.java b/src/main/java/com/bona/javacalculator/service/ValidateService.java index a3059d0bc..07e951be4 100644 --- a/src/main/java/com/bona/javacalculator/service/ValidateService.java +++ b/src/main/java/com/bona/javacalculator/service/ValidateService.java @@ -12,11 +12,11 @@ public Optional validate(String input) { return Optional.empty(); } - boolean isDivision = false; + boolean isDivision = false; for (int i = 0; i < inputString.length; i++) { if (i % 2 == 1) { // 홀수 자리일 경우 연산자여야 함. - if(!Check.isOperator(inputString[i])){ + if(!CheckService.isOperator(inputString[i])){ return Optional.empty(); } // / 일 경우 0 나누는경울 처리 @@ -27,10 +27,9 @@ public Optional validate(String input) { } else if (!isValidNumber(inputString[i], isDivision)) { return Optional.empty(); } - isDivision = false; } //마지막 자리가 숫자인지 - if(!Check.isNumber((inputString[inputString.length-1]))){ + if(!CheckService.isNumber(inputString[inputString.length-1])){ return Optional.empty(); } return Optional.of(input); @@ -38,7 +37,7 @@ public Optional validate(String input) { private boolean isValidNumber(String s, boolean isDivision) { //숫자 인지 - if(!Check.isNumber(s)){ + if(!CheckService.isNumber(s)){ return false; } // 0이고 앞서 나온 연산자가 / 라면 false diff --git a/src/test/java/com/bona/javacalculator/repository/CalMemoryRepositoryTest.java b/src/test/java/com/bona/javacalculator/repository/CalMemoryRepositoryTest.java index f96a7f648..35f76a43a 100644 --- a/src/test/java/com/bona/javacalculator/repository/CalMemoryRepositoryTest.java +++ b/src/test/java/com/bona/javacalculator/repository/CalMemoryRepositoryTest.java @@ -2,6 +2,7 @@ import com.bona.javacalculator.model.InputAndAnswer; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -15,7 +16,7 @@ void afterEach() { memoryRepository.clearStore(); } - // @DisplayName("저장을 테스트한다.") + @DisplayName("저장 테스트") @Test void save() { //given diff --git a/src/test/java/com/bona/javacalculator/service/ValidateServiceTest.java b/src/test/java/com/bona/javacalculator/service/ValidateServiceTest.java new file mode 100644 index 000000000..c70a671a6 --- /dev/null +++ b/src/test/java/com/bona/javacalculator/service/ValidateServiceTest.java @@ -0,0 +1,74 @@ +package com.bona.javacalculator.service; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import java.util.Optional; + + +class ValidateServiceTest { + + ValidateService validateService = new ValidateService(); + + @Test + @DisplayName("0으로 나눌때 Optional 반환 테스트") + public void divisionByZero() { + //given + String input = "1/0"; + //when + Optional validateInput = validateService.validate(input); + //then + Assertions.assertTrue(validateInput.isEmpty()); + + } + + @Test + @DisplayName("공백이 있는 연산식 테스트") + public void whiteSpaceInput() { + //given + String input = "1+ 3"; + //when + Optional validateInput = validateService.validate(input); + //then + Assertions.assertTrue(validateInput.isEmpty()); + + } + + @Test + @DisplayName("문자가 있는 연산식 테스트") + public void otherStringInput() { + //given + String input = "1+a+3"; + //when + Optional validateInput = validateService.validate(input); + //then + Assertions.assertTrue(validateInput.isEmpty()); + + } + + @Test + @DisplayName("올바른 format이 아닌 연산식 테스트") + public void invalidFormatInput() { + //given + String input = "1+3-"; + //when + Optional validateInput = validateService.validate(input); + //then + Assertions.assertTrue(validateInput.isEmpty()); + + } + + @Test + @DisplayName("연산자 자리에 다른 문자가 있는 연산식 테스트") + public void notOperatorInput() { + //given + String input = "1+3=1"; + //when + Optional validateInput = validateService.validate(input); + //then + Assertions.assertTrue(validateInput.isEmpty()); + + } + +} \ No newline at end of file From b8c9bd0f011f5babdbee9f575c160b89bb6dcaf1 Mon Sep 17 00:00:00 2001 From: bona Date: Mon, 12 Jun 2023 16:31:05 +0900 Subject: [PATCH 08/13] =?UTF-8?q?[ADD]Calculator=20-=20InquiryService,=20C?= =?UTF-8?q?alculateService=20=EC=B6=94=EC=B6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bona/javacalculator/Calculator.java | 53 ++----------------- .../service/AnalyzeService.java | 34 ++++++++++++ .../service/CalculateService.java | 37 +++++++++++++ .../service/InquiryService.java | 22 ++++++++ ...alService.java => MakePostfixService.java} | 35 +----------- 5 files changed, 99 insertions(+), 82 deletions(-) create mode 100644 src/main/java/com/bona/javacalculator/service/AnalyzeService.java create mode 100644 src/main/java/com/bona/javacalculator/service/CalculateService.java create mode 100644 src/main/java/com/bona/javacalculator/service/InquiryService.java rename src/main/java/com/bona/javacalculator/service/{CalService.java => MakePostfixService.java} (67%) diff --git a/src/main/java/com/bona/javacalculator/Calculator.java b/src/main/java/com/bona/javacalculator/Calculator.java index 34c2373cc..d77c4e933 100644 --- a/src/main/java/com/bona/javacalculator/Calculator.java +++ b/src/main/java/com/bona/javacalculator/Calculator.java @@ -1,20 +1,11 @@ package com.bona.javacalculator; import com.bona.javacalculator.io.Console; - -import com.bona.javacalculator.model.InputAndAnswer; -import com.bona.javacalculator.repository.CalMemoryRepository; -import com.bona.javacalculator.service.CalService; -import com.bona.javacalculator.service.ValidateService; - -import java.util.List; -import java.util.Optional; +import com.bona.javacalculator.service.*; public class Calculator implements Runnable{ - - private static final CalService calService = new CalService(); - private static final ValidateService validateService = new ValidateService(); - private static final CalMemoryRepository calMemoryRepo = new CalMemoryRepository(); + CalculateService calculateService = new CalculateService(); + InquiryService inquiryService = new InquiryService(); private final Console console = new Console(); @Override public void run() { @@ -31,49 +22,15 @@ public void run() { switch (option) { case INQUIRY: - inquiry(); + inquiryService.inquiry(); break; case CALCULATE: - calculate(); + calculateService.calculate(); break; default: break; } - - } - } - - private void calculate() { - String input = console.input("식을 입력해주세요 : "); - Optional validateInput = checkValidate(input); - if (validateInput.isEmpty()) { - return; - } - String postfix = calService.convPostfix(validateInput.get()); -// System.out.println("postfix = " + postfix); - Double result = calService.calculateStr(postfix); - calMemoryRepo.save(new InputAndAnswer(input, result)); - - console.outAnswer(result); - } - - private void inquiry() { - List all = calMemoryRepo.findAll(); - if (all.isEmpty()) { - console.printMessage("조회 결과 기록이 존재하지 않습니다"); - return; - } - console.printAll(all); - - } - - private Optional checkValidate(String input) { - Optional testInput = validateService.validate(input); - if (testInput.isEmpty()) { - console.inputError(); - return Optional.empty(); } - return testInput; } private int parse(String input) { diff --git a/src/main/java/com/bona/javacalculator/service/AnalyzeService.java b/src/main/java/com/bona/javacalculator/service/AnalyzeService.java new file mode 100644 index 000000000..b0dc9940e --- /dev/null +++ b/src/main/java/com/bona/javacalculator/service/AnalyzeService.java @@ -0,0 +1,34 @@ +package com.bona.javacalculator.service; + +import java.util.Stack; + +public class AnalyzeService { +// private static final char WHITE_SPACE = ' '; + + //숫자,연산자 구분 + public Double analyzeStr(String input) { + //숫자만 저장 + Stack numbers = new Stack<>(); + char c = ' '; + double num1 = 0; + double num2 = 0; + for (int i = 0; i < input.length(); i++) { + c = input.charAt(i); + if (Character.isDigit(c)) { + numbers.push(c); + } else { + num2 = Double.parseDouble(numbers.pop().toString()); + num1 = Double.parseDouble(numbers.pop().toString()); + //연산자면 계산 후 스택에 저장 +// calculateReal(num1, num2, c,numbers); + switch (c) { + case '+' -> numbers.push(num1 + num2); + case '-' -> numbers.push(num1 - num2); + case '*' -> numbers.push(num1 * num2); + case '/' -> numbers.push(num1 / num2); + } + } + } + return Double.valueOf(numbers.pop().toString()); + } +} diff --git a/src/main/java/com/bona/javacalculator/service/CalculateService.java b/src/main/java/com/bona/javacalculator/service/CalculateService.java new file mode 100644 index 000000000..91be8fa03 --- /dev/null +++ b/src/main/java/com/bona/javacalculator/service/CalculateService.java @@ -0,0 +1,37 @@ +package com.bona.javacalculator.service; + +import com.bona.javacalculator.io.Console; +import com.bona.javacalculator.model.InputAndAnswer; +import com.bona.javacalculator.repository.CalMemoryRepository; + +import java.util.Optional; + +public class CalculateService { + private final AnalyzeService analyzeService = new AnalyzeService(); + private final MakePostfixService makePostfixService = new MakePostfixService(); + private final ValidateService validateService = new ValidateService(); + private final CalMemoryRepository calMemoryRepo = new CalMemoryRepository(); + private final Console console = new Console(); + + public void calculate() { + String input = console.input("식을 입력해주세요 : "); + Optional validateInput = checkValidate(input); + if (validateInput.isEmpty()) { + return; + } + String postfix = makePostfixService.convPostfix(validateInput.get()); +// System.out.println("postfix = " + postfix); + Double result = analyzeService.analyzeStr(postfix); + calMemoryRepo.save(new InputAndAnswer(input, result)); + + console.outAnswer(result); + } + private Optional checkValidate(String input) { + Optional testInput = validateService.validate(input); + if (testInput.isEmpty()) { + console.inputError(); + return Optional.empty(); + } + return testInput; + } +} diff --git a/src/main/java/com/bona/javacalculator/service/InquiryService.java b/src/main/java/com/bona/javacalculator/service/InquiryService.java new file mode 100644 index 000000000..ce1a95e37 --- /dev/null +++ b/src/main/java/com/bona/javacalculator/service/InquiryService.java @@ -0,0 +1,22 @@ +package com.bona.javacalculator.service; + +import com.bona.javacalculator.io.Console; +import com.bona.javacalculator.model.InputAndAnswer; +import com.bona.javacalculator.repository.CalMemoryRepository; + +import java.util.List; + +public class InquiryService { + private final CalMemoryRepository calMemoryRepo = new CalMemoryRepository(); + private final Console console = new Console(); + + public void inquiry() { + List all = calMemoryRepo.findAll(); + if (all.isEmpty()) { + console.printMessage("조회 결과 기록이 존재하지 않습니다"); + return; + } + console.printAll(all); + + } +} diff --git a/src/main/java/com/bona/javacalculator/service/CalService.java b/src/main/java/com/bona/javacalculator/service/MakePostfixService.java similarity index 67% rename from src/main/java/com/bona/javacalculator/service/CalService.java rename to src/main/java/com/bona/javacalculator/service/MakePostfixService.java index 4e968a2b5..69d6fa5ee 100644 --- a/src/main/java/com/bona/javacalculator/service/CalService.java +++ b/src/main/java/com/bona/javacalculator/service/MakePostfixService.java @@ -1,41 +1,8 @@ package com.bona.javacalculator.service; -import org.springframework.stereotype.Service; import java.util.Stack; - -public class CalService { - - -// private static final char WHITE_SPACE = ' '; - - //숫자,연산자 구분 - public Double calculateStr(String input) { - //숫자만 저장 - Stack numbers = new Stack<>(); - char c = ' '; - double num1 = 0; - double num2 = 0; - for (int i = 0; i < input.length(); i++) { - c = input.charAt(i); - if (Character.isDigit(c)) { - numbers.push(c); - } else { - num2 = Double.parseDouble(numbers.pop().toString()); - num1 = Double.parseDouble(numbers.pop().toString()); - //연산자면 계산 후 스택에 저장 -// calculateReal(num1, num2, c,numbers); - switch (c) { - case '+' -> numbers.push(num1 + num2); - case '-' -> numbers.push(num1 - num2); - case '*' -> numbers.push(num1 * num2); - case '/' -> numbers.push(num1 / num2); - } - } - } - return Double.valueOf(numbers.pop().toString()); - } - +public class MakePostfixService { //후위 표기로 변환 public String convPostfix(String input) { char c = ' '; From c12ed5503950eba90724d99f47aee0a971eab6d4 Mon Sep 17 00:00:00 2001 From: bona Date: Mon, 12 Jun 2023 16:47:07 +0900 Subject: [PATCH 09/13] [ADD] AnalyzeServiceTest, MakePostfixServiceTest --- .../service/AnalyzeServiceTest.java | 28 +++++++++++++++++++ .../service/MakePostfixServiceTest.java | 25 +++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 src/test/java/com/bona/javacalculator/service/AnalyzeServiceTest.java create mode 100644 src/test/java/com/bona/javacalculator/service/MakePostfixServiceTest.java diff --git a/src/test/java/com/bona/javacalculator/service/AnalyzeServiceTest.java b/src/test/java/com/bona/javacalculator/service/AnalyzeServiceTest.java new file mode 100644 index 000000000..a48d20bc9 --- /dev/null +++ b/src/test/java/com/bona/javacalculator/service/AnalyzeServiceTest.java @@ -0,0 +1,28 @@ +package com.bona.javacalculator.service; + +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class AnalyzeServiceTest { + + AnalyzeService analyzeService = new AnalyzeService(); + MakePostfixService makePostfixService = new MakePostfixService(); + + @Test + @DisplayName("결과값 반환 테스트") + public void resultTest() { + //given + String input = "1+2*3"; + + //when + String postfix = makePostfixService.convPostfix(input); + Double result = analyzeService.analyzeStr(postfix); + + //then + Assertions.assertThat(result).isEqualTo(7); + } + +} \ No newline at end of file diff --git a/src/test/java/com/bona/javacalculator/service/MakePostfixServiceTest.java b/src/test/java/com/bona/javacalculator/service/MakePostfixServiceTest.java new file mode 100644 index 000000000..5e5dc262c --- /dev/null +++ b/src/test/java/com/bona/javacalculator/service/MakePostfixServiceTest.java @@ -0,0 +1,25 @@ +package com.bona.javacalculator.service; + +import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class MakePostfixServiceTest { + + MakePostfixService makePostfixService = new MakePostfixService(); + + @Test + @DisplayName("후위표기식 출력 테스트") + public void makePostfixTest() { + //given + String input = "1+2*3"; + String wantInput = "123*+"; + //when + String postfixInput = makePostfixService.convPostfix(input); + //then + assertThat(postfixInput).isEqualTo(wantInput); + } + +} \ No newline at end of file From 95e32c19a506f2b65cd2501ef075caf916a53304 Mon Sep 17 00:00:00 2001 From: bona Date: Tue, 13 Jun 2023 19:41:27 +0900 Subject: [PATCH 10/13] =?UTF-8?q?[UPDATE]=20=EC=A2=85=EB=A3=8C=20=EC=84=A0?= =?UTF-8?q?=ED=83=9D,=20=EC=98=88=EC=99=B8=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bona/javacalculator/Calculator.java | 12 ++++++++- .../com/bona/javacalculator/Operator.java | 25 +++++++++++++++++++ .../java/com/bona/javacalculator/Option.java | 4 +-- .../service/AnalyzeService.java | 2 +- .../service/CalulatorMapping.java | 22 ++++++++++++++++ .../service/MakePostfixService.java | 2 +- 6 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/bona/javacalculator/Operator.java create mode 100644 src/main/java/com/bona/javacalculator/service/CalulatorMapping.java diff --git a/src/main/java/com/bona/javacalculator/Calculator.java b/src/main/java/com/bona/javacalculator/Calculator.java index d77c4e933..6c6864c7f 100644 --- a/src/main/java/com/bona/javacalculator/Calculator.java +++ b/src/main/java/com/bona/javacalculator/Calculator.java @@ -12,7 +12,7 @@ public void run() { boolean isRun = true; while(isRun){ - String input = console.input("1. 조회 2. 계산"); + String input = console.input("1. 조회 2. 계산 3.종료"); int number = parse(input); Option option = Option.valueOf(number); @@ -27,13 +27,23 @@ public void run() { case CALCULATE: calculateService.calculate(); break; + case EXIT: + isRun = false; + break; default: + console.printMessage("잘못된 입력입니다"); break; } } } private int parse(String input) { + if (input.isBlank()) { + return 3; // EXIT + } + if (!CheckService.isNumber(input)) { + return 0; //INVALID_INPUT + } return Integer.parseInt(input); } diff --git a/src/main/java/com/bona/javacalculator/Operator.java b/src/main/java/com/bona/javacalculator/Operator.java new file mode 100644 index 000000000..c7c903e09 --- /dev/null +++ b/src/main/java/com/bona/javacalculator/Operator.java @@ -0,0 +1,25 @@ +package com.bona.javacalculator; + +import java.util.Arrays; +import java.util.function.BiFunction; + +import static com.bona.javacalculator.service.CalulatorMapping.getOperator; + +public enum Operator { + PLUS((num1, num2) -> num1 + num2), + MINUS((num1,num2) -> num1 - num2), + MULTIPLY((num1, num2) -> num1 * num2), + DIVIDE((num1,num2) -> num1 / num2); + + private BiFunction expression; + + Operator(BiFunction expression){ + this.expression = expression; + } + + public static double calculate(Character operator, double num1, double num2) { + return getOperator(operator).expression.apply(num1, num2); + } + + +} diff --git a/src/main/java/com/bona/javacalculator/Option.java b/src/main/java/com/bona/javacalculator/Option.java index fe2ade2cb..64e16eac2 100644 --- a/src/main/java/com/bona/javacalculator/Option.java +++ b/src/main/java/com/bona/javacalculator/Option.java @@ -1,7 +1,7 @@ package com.bona.javacalculator; public enum Option { - EXIT(-1), + EXIT(3), INVALID_INPUT(0), INQUIRY(1), CALCULATE(2); @@ -15,7 +15,7 @@ public enum Option { public static Option valueOf(int matchNum) { Option option = null; switch (matchNum) { - case -1: + case 3: option = Option.EXIT; return option; case 1: diff --git a/src/main/java/com/bona/javacalculator/service/AnalyzeService.java b/src/main/java/com/bona/javacalculator/service/AnalyzeService.java index b0dc9940e..3a56f3488 100644 --- a/src/main/java/com/bona/javacalculator/service/AnalyzeService.java +++ b/src/main/java/com/bona/javacalculator/service/AnalyzeService.java @@ -31,4 +31,4 @@ public Double analyzeStr(String input) { } return Double.valueOf(numbers.pop().toString()); } -} +} \ No newline at end of file diff --git a/src/main/java/com/bona/javacalculator/service/CalulatorMapping.java b/src/main/java/com/bona/javacalculator/service/CalulatorMapping.java new file mode 100644 index 000000000..710524fea --- /dev/null +++ b/src/main/java/com/bona/javacalculator/service/CalulatorMapping.java @@ -0,0 +1,22 @@ +package com.bona.javacalculator.service; + +import com.bona.javacalculator.Operator; + +import java.util.HashMap; +import java.util.Map; + +public class CalulatorMapping { + private static Map operatorMapping = new HashMap<>(); + + static{ + operatorMapping.put('+', Operator.PLUS); + operatorMapping.put('-', Operator.MINUS); + operatorMapping.put('*', Operator.MULTIPLY); + operatorMapping.put('/', Operator.DIVIDE); + } + + public static Operator getOperator(Character operator) { + return operatorMapping.get(operator); + } + +} diff --git a/src/main/java/com/bona/javacalculator/service/MakePostfixService.java b/src/main/java/com/bona/javacalculator/service/MakePostfixService.java index 69d6fa5ee..ec01969e6 100644 --- a/src/main/java/com/bona/javacalculator/service/MakePostfixService.java +++ b/src/main/java/com/bona/javacalculator/service/MakePostfixService.java @@ -49,7 +49,7 @@ public static int getOperationPriority(char op) { case '-': return 1; default: - return -1; + throw new IllegalStateException("유효하지 않은 연산자 입니다" + op); } } From 1c13f9aecf51e8c6133292255eed69be975b264d Mon Sep 17 00:00:00 2001 From: bona Date: Fri, 16 Jun 2023 01:01:27 +0900 Subject: [PATCH 11/13] =?UTF-8?q?[UPDATE]=ED=8C=A8=EB=9F=AC=EB=8B=A4?= =?UTF-8?q?=EC=9E=84=20=EC=88=98=EC=A0=95,=20Calculator->srp,=20Validator-?= =?UTF-8?q?>validateFormula=20=ED=86=B5=ED=95=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bona/javacalculator/Calculator.java | 50 ----------- .../JavaCalculatorApplication.java | 27 ++++-- .../com/bona/javacalculator/Operator.java | 25 ------ .../java/com/bona/javacalculator/Option.java | 34 -------- .../core/CalculatorManager.java | 78 +++++++++++++++++ .../bona/javacalculator/core/Operator.java | 36 ++++++++ .../com/bona/javacalculator/core/Option.java | 55 ++++++++++++ .../bona/javacalculator/core/Priority.java | 29 +++++++ .../core/calculator/AbstractCalculator.java | 9 ++ .../core/calculator/Calculator.java | 39 +++++++++ .../core/converter/Converter.java | 7 ++ .../core/converter/PostfixConverter.java | 59 +++++++++++++ .../com/bona/javacalculator/io/Console.java | 27 +++--- .../com/bona/javacalculator/io/Output.java | 4 +- .../model/ExpressionResult.java | 36 ++++++++ .../javacalculator/model/InputAndAnswer.java | 20 ----- .../repository/CalMemoryRepository.java | 31 +++---- .../repository/MemoryRepository.java | 17 ++-- .../service/AnalyzeService.java | 34 -------- .../service/CalculateService.java | 37 -------- .../service/CalulatorMapping.java | 22 ----- .../javacalculator/service/CheckService.java | 25 ------ .../service/InquiryService.java | 22 ----- .../service/MakePostfixService.java | 71 --------------- .../service/ValidateService.java | 55 ------------ .../bona/javacalculator/util/Validator.java | 87 +++++++++++++++++++ src/main/resources/application.properties | 1 - .../javacalculator/core/CalculateTest.java | 30 +++++++ .../PostfixTest.java} | 14 +-- .../javacalculator/core/ValidatorTest.java | 70 +++++++++++++++ .../repository/CalMemoryRepositoryTest.java | 16 ++-- .../service/AnalyzeServiceTest.java | 28 ------ .../service/ValidateServiceTest.java | 74 ---------------- 33 files changed, 599 insertions(+), 570 deletions(-) delete mode 100644 src/main/java/com/bona/javacalculator/Calculator.java delete mode 100644 src/main/java/com/bona/javacalculator/Operator.java delete mode 100644 src/main/java/com/bona/javacalculator/Option.java create mode 100644 src/main/java/com/bona/javacalculator/core/CalculatorManager.java create mode 100644 src/main/java/com/bona/javacalculator/core/Operator.java create mode 100644 src/main/java/com/bona/javacalculator/core/Option.java create mode 100644 src/main/java/com/bona/javacalculator/core/Priority.java create mode 100644 src/main/java/com/bona/javacalculator/core/calculator/AbstractCalculator.java create mode 100644 src/main/java/com/bona/javacalculator/core/calculator/Calculator.java create mode 100644 src/main/java/com/bona/javacalculator/core/converter/Converter.java create mode 100644 src/main/java/com/bona/javacalculator/core/converter/PostfixConverter.java create mode 100644 src/main/java/com/bona/javacalculator/model/ExpressionResult.java delete mode 100644 src/main/java/com/bona/javacalculator/model/InputAndAnswer.java delete mode 100644 src/main/java/com/bona/javacalculator/service/AnalyzeService.java delete mode 100644 src/main/java/com/bona/javacalculator/service/CalculateService.java delete mode 100644 src/main/java/com/bona/javacalculator/service/CalulatorMapping.java delete mode 100644 src/main/java/com/bona/javacalculator/service/CheckService.java delete mode 100644 src/main/java/com/bona/javacalculator/service/InquiryService.java delete mode 100644 src/main/java/com/bona/javacalculator/service/MakePostfixService.java delete mode 100644 src/main/java/com/bona/javacalculator/service/ValidateService.java create mode 100644 src/main/java/com/bona/javacalculator/util/Validator.java delete mode 100644 src/main/resources/application.properties create mode 100644 src/test/java/com/bona/javacalculator/core/CalculateTest.java rename src/test/java/com/bona/javacalculator/{service/MakePostfixServiceTest.java => core/PostfixTest.java} (53%) create mode 100644 src/test/java/com/bona/javacalculator/core/ValidatorTest.java delete mode 100644 src/test/java/com/bona/javacalculator/service/AnalyzeServiceTest.java delete mode 100644 src/test/java/com/bona/javacalculator/service/ValidateServiceTest.java diff --git a/src/main/java/com/bona/javacalculator/Calculator.java b/src/main/java/com/bona/javacalculator/Calculator.java deleted file mode 100644 index 6c6864c7f..000000000 --- a/src/main/java/com/bona/javacalculator/Calculator.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.bona.javacalculator; - -import com.bona.javacalculator.io.Console; -import com.bona.javacalculator.service.*; - -public class Calculator implements Runnable{ - CalculateService calculateService = new CalculateService(); - InquiryService inquiryService = new InquiryService(); - private final Console console = new Console(); - @Override - public void run() { - boolean isRun = true; - - while(isRun){ - String input = console.input("1. 조회 2. 계산 3.종료"); - int number = parse(input); - Option option = Option.valueOf(number); - - if (option == null) { - continue; - } - - switch (option) { - case INQUIRY: - inquiryService.inquiry(); - break; - case CALCULATE: - calculateService.calculate(); - break; - case EXIT: - isRun = false; - break; - default: - console.printMessage("잘못된 입력입니다"); - break; - } - } - } - - private int parse(String input) { - if (input.isBlank()) { - return 3; // EXIT - } - if (!CheckService.isNumber(input)) { - return 0; //INVALID_INPUT - } - return Integer.parseInt(input); - } - -} diff --git a/src/main/java/com/bona/javacalculator/JavaCalculatorApplication.java b/src/main/java/com/bona/javacalculator/JavaCalculatorApplication.java index 1abae90f9..8e9ac97cc 100644 --- a/src/main/java/com/bona/javacalculator/JavaCalculatorApplication.java +++ b/src/main/java/com/bona/javacalculator/JavaCalculatorApplication.java @@ -1,16 +1,27 @@ package com.bona.javacalculator; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; +import com.bona.javacalculator.core.calculator.Calculator; +import com.bona.javacalculator.io.Console; +import com.bona.javacalculator.core.CalculatorManager; +import com.bona.javacalculator.core.converter.Converter; +import com.bona.javacalculator.core.converter.PostfixConverter; +import com.bona.javacalculator.repository.CalMemoryRepository; +import com.bona.javacalculator.repository.MemoryRepository; +import com.bona.javacalculator.util.Validator; -@SpringBootApplication public class JavaCalculatorApplication { - public static void main(String[] args) { - SpringApplication.run(JavaCalculatorApplication.class, args); + public static void main(String[] args) { + MemoryRepository repository = new CalMemoryRepository(); + Console console = new Console(); + Converter converter = new PostfixConverter(); + Validator validator = new Validator(); + Calculator calculator = new Calculator(); - Calculator calculator = new Calculator(); - calculator.run(); - } + CalculatorManager calculatorManager = new CalculatorManager(calculator, repository, console, converter, validator); + + + calculatorManager.run(); + } } diff --git a/src/main/java/com/bona/javacalculator/Operator.java b/src/main/java/com/bona/javacalculator/Operator.java deleted file mode 100644 index c7c903e09..000000000 --- a/src/main/java/com/bona/javacalculator/Operator.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.bona.javacalculator; - -import java.util.Arrays; -import java.util.function.BiFunction; - -import static com.bona.javacalculator.service.CalulatorMapping.getOperator; - -public enum Operator { - PLUS((num1, num2) -> num1 + num2), - MINUS((num1,num2) -> num1 - num2), - MULTIPLY((num1, num2) -> num1 * num2), - DIVIDE((num1,num2) -> num1 / num2); - - private BiFunction expression; - - Operator(BiFunction expression){ - this.expression = expression; - } - - public static double calculate(Character operator, double num1, double num2) { - return getOperator(operator).expression.apply(num1, num2); - } - - -} diff --git a/src/main/java/com/bona/javacalculator/Option.java b/src/main/java/com/bona/javacalculator/Option.java deleted file mode 100644 index 64e16eac2..000000000 --- a/src/main/java/com/bona/javacalculator/Option.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.bona.javacalculator; - -public enum Option { - EXIT(3), - INVALID_INPUT(0), - INQUIRY(1), - CALCULATE(2); - - private int matchNum; - - Option(int matchNum) { - this.matchNum = matchNum; - } - - public static Option valueOf(int matchNum) { - Option option = null; - switch (matchNum) { - case 3: - option = Option.EXIT; - return option; - case 1: - option = Option.INQUIRY; - return option; - case 2: - option = Option.CALCULATE; - return option; - default: - option = Option.INVALID_INPUT; - return option; - - } - - } -} diff --git a/src/main/java/com/bona/javacalculator/core/CalculatorManager.java b/src/main/java/com/bona/javacalculator/core/CalculatorManager.java new file mode 100644 index 000000000..cc0e4075d --- /dev/null +++ b/src/main/java/com/bona/javacalculator/core/CalculatorManager.java @@ -0,0 +1,78 @@ +package com.bona.javacalculator.core; + +import com.bona.javacalculator.core.calculator.Calculator; +import com.bona.javacalculator.core.converter.Converter; +import com.bona.javacalculator.io.Console; +import com.bona.javacalculator.model.ExpressionResult; +import com.bona.javacalculator.repository.MemoryRepository; +import com.bona.javacalculator.util.Validator; + +import java.util.List; + +public class CalculatorManager { + private final Converter converter; + private final Validator validator; + private final MemoryRepository repository; + private final Console console; + private final Calculator calculator; + + public CalculatorManager( Calculator calculator,MemoryRepository repository,Console console, Converter converter, Validator validator) { + this.repository = repository; + this.console = console; + this.converter = converter; + this.validator = validator; + this.calculator = calculator; + } + + public void run() { + boolean isRun = true; + + while (isRun) { + String input = console.input("1. 조회 2. 계산 3.종료"); + + Option option = Option.of(input); + + + switch (option) { + case INQUIRY: + inquiry(); + break; + case CALCULATE: + calculate(); + break; + case EXIT: + isRun = false; + break; + default: + console.printMessage("잘못된 입력입니다"); + break; + } + } + } + + + public void calculate() { + String formula = console.input("식을 입력해주세요 : "); + + validator.validateFormula(formula); + + List postfix = converter.convert(formula); + double result = calculator.calculate(postfix); + + repository.save(new ExpressionResult(formula, result)); + + console.outAnswer(result); + } + + public void inquiry() { + List all = repository.findAll(); + + if (all.isEmpty()) { + console.printMessage("조회 결과 기록이 존재하지 않습니다"); + return; + } + + console.printAll(all); + } + +} diff --git a/src/main/java/com/bona/javacalculator/core/Operator.java b/src/main/java/com/bona/javacalculator/core/Operator.java new file mode 100644 index 000000000..9b0268091 --- /dev/null +++ b/src/main/java/com/bona/javacalculator/core/Operator.java @@ -0,0 +1,36 @@ +package com.bona.javacalculator.core; + +import java.util.Arrays; +import java.util.function.BiFunction; + +public enum Operator { + PLUS("+", (num1, num2) -> num1 + num2), + MINUS("-", (num1, num2) -> num1 - num2), + MULTIPLY("*", (num1, num2) -> num1 * num2), + DIVIDE("/", (num1, num2) -> num1 / num2); + + private final String operator; + private final BiFunction expression; + + Operator(String operator, BiFunction expression) { + this.operator = operator; + this.expression = expression; + } + + public static double calculate(String operator, double num1, double num2) { + return getOperator(operator).expression.apply(num1, num2); + } + + private static Operator getOperator(String operator) { + return Arrays.stream(values()) + .filter(o -> o.operator.equals(operator)) + .findFirst().orElseThrow(() -> new IllegalArgumentException("올바른 연산자가 아닙니다.")); + } + + public static boolean isOperator(String unCheckedOperator) { + return Arrays.stream(Operator.values()) + .anyMatch(operators -> operators.operator.equals(unCheckedOperator)); + } + + +} diff --git a/src/main/java/com/bona/javacalculator/core/Option.java b/src/main/java/com/bona/javacalculator/core/Option.java new file mode 100644 index 000000000..f5ef85f4d --- /dev/null +++ b/src/main/java/com/bona/javacalculator/core/Option.java @@ -0,0 +1,55 @@ +package com.bona.javacalculator.core; + +import com.bona.javacalculator.util.Validator; + +public enum Option { + EXIT(3), INVALID_INPUT(0), INQUIRY(1), CALCULATE(2); + + private int matchNum; + + Option(int matchNum) { + this.matchNum = matchNum; + } + + public static Option valueOf(int matchNum) { + Option option; + switch (matchNum) { + case 3: + option = Option.EXIT; + return option; + case 1: + option = Option.INQUIRY; + return option; + case 2: + option = Option.CALCULATE; + return option; + default: + option = Option.INVALID_INPUT; + return option; + + } + + } + + public static Option of(String input) { + + for (Option value : values()) { + if (value.matchNum == Integer.parseInt(input)) { + return value; + } + } + + throw new RuntimeException("wrong input"); + } + + private int parse(String input) { + if (input.isBlank()) { + return 3; // EXIT + } + if (!Validator.isNumber(input)) { + return 0; //INVALID_INPUT + } + return Integer.parseInt(input); + } + +} diff --git a/src/main/java/com/bona/javacalculator/core/Priority.java b/src/main/java/com/bona/javacalculator/core/Priority.java new file mode 100644 index 000000000..488d846a7 --- /dev/null +++ b/src/main/java/com/bona/javacalculator/core/Priority.java @@ -0,0 +1,29 @@ +package com.bona.javacalculator.core; + +public class Priority { + + public static int getOperationPriority(String operator) { + + switch (operator) { + case "*": + case "/": + return 2; + case "+": + case "-": + return 1; + default: + throw new IllegalStateException("유효하지 않은 연산자 입니다" + operator); + } + } + + //연산자 우선순위 비교 + public static int compareOperation(String operator, String NowOperator) { + int operationPriority = getOperationPriority(operator); + + int operationPriorityNow = getOperationPriority(NowOperator); + + return Integer.compare(operationPriorityNow, operationPriority); + + } + +} diff --git a/src/main/java/com/bona/javacalculator/core/calculator/AbstractCalculator.java b/src/main/java/com/bona/javacalculator/core/calculator/AbstractCalculator.java new file mode 100644 index 000000000..60839a75e --- /dev/null +++ b/src/main/java/com/bona/javacalculator/core/calculator/AbstractCalculator.java @@ -0,0 +1,9 @@ +package com.bona.javacalculator.core.calculator; + +import java.util.List; + +public interface AbstractCalculator { + + double calculate(List formula); + +} diff --git a/src/main/java/com/bona/javacalculator/core/calculator/Calculator.java b/src/main/java/com/bona/javacalculator/core/calculator/Calculator.java new file mode 100644 index 000000000..1ad8d9476 --- /dev/null +++ b/src/main/java/com/bona/javacalculator/core/calculator/Calculator.java @@ -0,0 +1,39 @@ +package com.bona.javacalculator.core.calculator; + +import com.bona.javacalculator.io.Console; +import com.bona.javacalculator.core.*; +import com.bona.javacalculator.util.Validator; + +import java.util.List; +import java.util.Stack; + +// only calculate S R P +public class Calculator implements AbstractCalculator{ + + @Override + public double calculate(List formula) { + + Stack numbers = new Stack<>(); + + String split; + + double num1 = 0; + double num2 = 0; + + for (int i = 0; i < formula.size(); i++) { + + split = formula.get(i); + + if (Validator.isNumber(split)) { + numbers.push(Double.valueOf(split)); + } else { + num2 = numbers.pop(); + num1 = numbers.pop(); + + numbers.push(Operator.calculate(split, num1, num2)); + } + } + return numbers.pop(); + } + +} diff --git a/src/main/java/com/bona/javacalculator/core/converter/Converter.java b/src/main/java/com/bona/javacalculator/core/converter/Converter.java new file mode 100644 index 000000000..a567ade8b --- /dev/null +++ b/src/main/java/com/bona/javacalculator/core/converter/Converter.java @@ -0,0 +1,7 @@ +package com.bona.javacalculator.core.converter; + +import java.util.List; + +public interface Converter { + List convert(String input); +} diff --git a/src/main/java/com/bona/javacalculator/core/converter/PostfixConverter.java b/src/main/java/com/bona/javacalculator/core/converter/PostfixConverter.java new file mode 100644 index 000000000..f742889ff --- /dev/null +++ b/src/main/java/com/bona/javacalculator/core/converter/PostfixConverter.java @@ -0,0 +1,59 @@ +package com.bona.javacalculator.core.converter; + +import com.bona.javacalculator.core.Operator; +import com.bona.javacalculator.core.Priority; +import com.bona.javacalculator.util.Validator; + +import java.util.ArrayList; +import java.util.List; +import java.util.Stack; + +public class PostfixConverter implements Converter { + private final String WHITE_SPACE = ""; + private final Priority priorityFind = new Priority(); + + //후위 표기로 변환 + @Override + public List convert(String input) { + List postfix = new ArrayList<>(); + String[] splitInput = input.split(WHITE_SPACE); + + Stack stack = new Stack<>(); + + for (int index = 0; index < splitInput.length; index++) { + String pieceInput = splitInput[index]; + if (Operator.isOperator(pieceInput)) { + pushOperator(pieceInput, postfix, stack); + } else { + pushNumber(pieceInput, postfix); + } + } + while (!stack.isEmpty()) { + postfix.add(stack.pop()); + } + return postfix; + + } + + public void pushOperator(String operator, List postfix, Stack operatorStack) { + if (operatorStack.isEmpty() || priorityFind.compareOperation(operatorStack.peek(), operator) > 0) { + operatorStack.push(operator); + return; + } + while (!operatorStack.isEmpty() && priorityFind.compareOperation(operatorStack.peek(), operator) <= 0) { + postfix.add(operatorStack.pop()); + } + operatorStack.push(operator); + } + + + public void pushNumber(String number, List postfix) { + if (!Validator.isNumber(number)) { + throw new NumberFormatException(); + } + postfix.add(number); + } + + +} + diff --git a/src/main/java/com/bona/javacalculator/io/Console.java b/src/main/java/com/bona/javacalculator/io/Console.java index 2c4ec918e..b9c34520d 100644 --- a/src/main/java/com/bona/javacalculator/io/Console.java +++ b/src/main/java/com/bona/javacalculator/io/Console.java @@ -1,18 +1,15 @@ package com.bona.javacalculator.io; -import com.bona.javacalculator.model.InputAndAnswer; +import com.bona.javacalculator.model.ExpressionResult; +import com.bona.javacalculator.util.Validator; import java.util.List; import java.util.Scanner; -public class Console implements Input, Output{ +public class Console implements Input, Output { - private static final Scanner scanner = new Scanner(System.in); + private final Scanner scanner = new Scanner(System.in); - //정수인지 - public boolean isLong(double num) { - return num == (long) num; - } @Override public String input(String input) { @@ -27,27 +24,27 @@ public void inputError() { @Override public void outAnswer(Double answer) { - boolean isLong = isLong(answer); - if(isLong){ + boolean isLong = Validator.isLong(answer); + if (isLong) { Long changeAnswer = answer.longValue(); System.out.println(changeAnswer); - }else { + } else { System.out.println(answer); } } @Override - public void printAll(List inputAndAnswerList) { - for (InputAndAnswer history : inputAndAnswerList) { + public void printAll(List expressionResultList) { + for (ExpressionResult history : expressionResultList) { String input = history.getInput(); Double answer = history.getAnswer(); System.out.print(input + "="); - boolean isLong = isLong(answer); - if(isLong){ + boolean isLong = Validator.isLong(answer); + if (isLong) { Long changeAnswer = answer.longValue(); System.out.println(changeAnswer); - }else { + } else { System.out.println(answer); } } diff --git a/src/main/java/com/bona/javacalculator/io/Output.java b/src/main/java/com/bona/javacalculator/io/Output.java index 9693aa899..1b9d6ad3a 100644 --- a/src/main/java/com/bona/javacalculator/io/Output.java +++ b/src/main/java/com/bona/javacalculator/io/Output.java @@ -1,13 +1,13 @@ package com.bona.javacalculator.io; -import com.bona.javacalculator.model.InputAndAnswer; +import com.bona.javacalculator.model.ExpressionResult; import java.util.List; public interface Output { void outAnswer(Double answer); - void printAll(List inputAndAnswerList); + void printAll(List expressionResultList); void printMessage(String message); } diff --git a/src/main/java/com/bona/javacalculator/model/ExpressionResult.java b/src/main/java/com/bona/javacalculator/model/ExpressionResult.java new file mode 100644 index 000000000..42725bb7b --- /dev/null +++ b/src/main/java/com/bona/javacalculator/model/ExpressionResult.java @@ -0,0 +1,36 @@ +package com.bona.javacalculator.model; + +public class ExpressionResult { + private Long id; + private String input; + private Double answer; + + public ExpressionResult(String input, Double answer) { + this.input = input; + this.answer = answer; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getInput() { + return input; + } + + public void setInput(String input) { + this.input = input; + } + + public Double getAnswer() { + return answer; + } + + public void setAnswer(Double answer) { + this.answer = answer; + } +} diff --git a/src/main/java/com/bona/javacalculator/model/InputAndAnswer.java b/src/main/java/com/bona/javacalculator/model/InputAndAnswer.java deleted file mode 100644 index 8b824e5f4..000000000 --- a/src/main/java/com/bona/javacalculator/model/InputAndAnswer.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.bona.javacalculator.model; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -@Getter @Setter -public class InputAndAnswer { - private Long id; - private String input; - private Double answer; - - public InputAndAnswer() { - } - - public InputAndAnswer(String input, Double answer) { - this.input = input; - this.answer = answer; - } -} diff --git a/src/main/java/com/bona/javacalculator/repository/CalMemoryRepository.java b/src/main/java/com/bona/javacalculator/repository/CalMemoryRepository.java index 3442f33e0..a5303378f 100644 --- a/src/main/java/com/bona/javacalculator/repository/CalMemoryRepository.java +++ b/src/main/java/com/bona/javacalculator/repository/CalMemoryRepository.java @@ -1,6 +1,6 @@ package com.bona.javacalculator.repository; -import com.bona.javacalculator.model.InputAndAnswer; +import com.bona.javacalculator.model.ExpressionResult; import org.springframework.stereotype.Repository; import java.util.ArrayList; @@ -9,35 +9,30 @@ import java.util.Map; @Repository -public class CalMemoryRepository implements MemoryRepository{ +public class CalMemoryRepository implements MemoryRepository { + + private static final Map store = new HashMap<>(); - private static final Map store = new HashMap<>(); private static long sequence = 0L; @Override - public InputAndAnswer save(InputAndAnswer inputAndAnswer) { - inputAndAnswer.setId(++sequence); - store.put(inputAndAnswer.getId(),inputAndAnswer); - return inputAndAnswer; + public ExpressionResult save(ExpressionResult expressionResult) { + + expressionResult.setId(++sequence); + + store.put(expressionResult.getId(), expressionResult); + + return expressionResult; } @Override - public InputAndAnswer findById(Long id) { + public ExpressionResult findById(Long id) { return store.get(id); } @Override - public List findAll() { + public List findAll() { return new ArrayList<>(store.values()); } - @Override - public void clearStore() { - store.clear(); - } - - @Override - public int size() { - return store.size(); - } } diff --git a/src/main/java/com/bona/javacalculator/repository/MemoryRepository.java b/src/main/java/com/bona/javacalculator/repository/MemoryRepository.java index 450e9ea20..dc6ad21f1 100644 --- a/src/main/java/com/bona/javacalculator/repository/MemoryRepository.java +++ b/src/main/java/com/bona/javacalculator/repository/MemoryRepository.java @@ -1,25 +1,18 @@ package com.bona.javacalculator.repository; -import com.bona.javacalculator.model.InputAndAnswer; +import com.bona.javacalculator.model.ExpressionResult; import org.springframework.stereotype.Repository; -import java.util.HashMap; import java.util.List; -import java.util.Map; @Repository -public interface MemoryRepository{ +public interface MemoryRepository { - InputAndAnswer save(InputAndAnswer inputAndAnswer); + ExpressionResult save(ExpressionResult expressionResult); - InputAndAnswer findById(Long id); + ExpressionResult findById(Long id); - List findAll(); + List findAll(); - void clearStore(); - - - - int size(); } diff --git a/src/main/java/com/bona/javacalculator/service/AnalyzeService.java b/src/main/java/com/bona/javacalculator/service/AnalyzeService.java deleted file mode 100644 index 3a56f3488..000000000 --- a/src/main/java/com/bona/javacalculator/service/AnalyzeService.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.bona.javacalculator.service; - -import java.util.Stack; - -public class AnalyzeService { -// private static final char WHITE_SPACE = ' '; - - //숫자,연산자 구분 - public Double analyzeStr(String input) { - //숫자만 저장 - Stack numbers = new Stack<>(); - char c = ' '; - double num1 = 0; - double num2 = 0; - for (int i = 0; i < input.length(); i++) { - c = input.charAt(i); - if (Character.isDigit(c)) { - numbers.push(c); - } else { - num2 = Double.parseDouble(numbers.pop().toString()); - num1 = Double.parseDouble(numbers.pop().toString()); - //연산자면 계산 후 스택에 저장 -// calculateReal(num1, num2, c,numbers); - switch (c) { - case '+' -> numbers.push(num1 + num2); - case '-' -> numbers.push(num1 - num2); - case '*' -> numbers.push(num1 * num2); - case '/' -> numbers.push(num1 / num2); - } - } - } - return Double.valueOf(numbers.pop().toString()); - } -} \ No newline at end of file diff --git a/src/main/java/com/bona/javacalculator/service/CalculateService.java b/src/main/java/com/bona/javacalculator/service/CalculateService.java deleted file mode 100644 index 91be8fa03..000000000 --- a/src/main/java/com/bona/javacalculator/service/CalculateService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.bona.javacalculator.service; - -import com.bona.javacalculator.io.Console; -import com.bona.javacalculator.model.InputAndAnswer; -import com.bona.javacalculator.repository.CalMemoryRepository; - -import java.util.Optional; - -public class CalculateService { - private final AnalyzeService analyzeService = new AnalyzeService(); - private final MakePostfixService makePostfixService = new MakePostfixService(); - private final ValidateService validateService = new ValidateService(); - private final CalMemoryRepository calMemoryRepo = new CalMemoryRepository(); - private final Console console = new Console(); - - public void calculate() { - String input = console.input("식을 입력해주세요 : "); - Optional validateInput = checkValidate(input); - if (validateInput.isEmpty()) { - return; - } - String postfix = makePostfixService.convPostfix(validateInput.get()); -// System.out.println("postfix = " + postfix); - Double result = analyzeService.analyzeStr(postfix); - calMemoryRepo.save(new InputAndAnswer(input, result)); - - console.outAnswer(result); - } - private Optional checkValidate(String input) { - Optional testInput = validateService.validate(input); - if (testInput.isEmpty()) { - console.inputError(); - return Optional.empty(); - } - return testInput; - } -} diff --git a/src/main/java/com/bona/javacalculator/service/CalulatorMapping.java b/src/main/java/com/bona/javacalculator/service/CalulatorMapping.java deleted file mode 100644 index 710524fea..000000000 --- a/src/main/java/com/bona/javacalculator/service/CalulatorMapping.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.bona.javacalculator.service; - -import com.bona.javacalculator.Operator; - -import java.util.HashMap; -import java.util.Map; - -public class CalulatorMapping { - private static Map operatorMapping = new HashMap<>(); - - static{ - operatorMapping.put('+', Operator.PLUS); - operatorMapping.put('-', Operator.MINUS); - operatorMapping.put('*', Operator.MULTIPLY); - operatorMapping.put('/', Operator.DIVIDE); - } - - public static Operator getOperator(Character operator) { - return operatorMapping.get(operator); - } - -} diff --git a/src/main/java/com/bona/javacalculator/service/CheckService.java b/src/main/java/com/bona/javacalculator/service/CheckService.java deleted file mode 100644 index 8b10f834b..000000000 --- a/src/main/java/com/bona/javacalculator/service/CheckService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.bona.javacalculator.service; - -public class CheckService { - static boolean isOperator(String s) { - if (s.length() > 1) { - return false; - } - if(s.equals("+") || s.equals("-") || s.equals("*") || s.equals("/")){ - return true; - } - return false; - } - - public static boolean isNumber(String s) { - for (int i = 0; i < s.length(); i++) { - if (s.length() == 1 && s.charAt(0) == '-') { - return false; - } - if(!Character.isDigit(s.charAt(i))){ - return false; - } - } - return true; - } -} diff --git a/src/main/java/com/bona/javacalculator/service/InquiryService.java b/src/main/java/com/bona/javacalculator/service/InquiryService.java deleted file mode 100644 index ce1a95e37..000000000 --- a/src/main/java/com/bona/javacalculator/service/InquiryService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.bona.javacalculator.service; - -import com.bona.javacalculator.io.Console; -import com.bona.javacalculator.model.InputAndAnswer; -import com.bona.javacalculator.repository.CalMemoryRepository; - -import java.util.List; - -public class InquiryService { - private final CalMemoryRepository calMemoryRepo = new CalMemoryRepository(); - private final Console console = new Console(); - - public void inquiry() { - List all = calMemoryRepo.findAll(); - if (all.isEmpty()) { - console.printMessage("조회 결과 기록이 존재하지 않습니다"); - return; - } - console.printAll(all); - - } -} diff --git a/src/main/java/com/bona/javacalculator/service/MakePostfixService.java b/src/main/java/com/bona/javacalculator/service/MakePostfixService.java deleted file mode 100644 index ec01969e6..000000000 --- a/src/main/java/com/bona/javacalculator/service/MakePostfixService.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.bona.javacalculator.service; - -import java.util.Stack; - -public class MakePostfixService { - //후위 표기로 변환 - public String convPostfix(String input) { - char c = ' '; - Stack operationStack = new Stack<>(); //연산자 스택 - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < input.length(); i++) { - c = input.charAt(i); - if (Character.isDigit(c)) {//숫자면 표현 - sb.append(c); - } else if (operationStack.isEmpty()) {//연산자 스택이 비어있을 경우 값 push - operationStack.push(c); - } else {// 연산자가 스택에 있는 경우 - if (compareOperation((char) operationStack.peek(), c) > 0) { //현재 연산자가 우선순위 더 높을 때 - operationStack.push(c); // 연산자 저장 - } else { - while (!operationStack.isEmpty()) { - //현재 연산자가 우선순위 더 낮거나 같은 경우 - if (compareOperation((char) operationStack.peek(), c) <= 0) { - sb.append(operationStack.pop()); // 스택에 있는 우선순위 높은 연산자 pop - } else { - break; - } - } - operationStack.push(c); - } - } - } - char check = ' '; - while (!operationStack.isEmpty()) { - check = (char) operationStack.pop(); - sb.append(check); - } - return sb.toString(); - } - - - //연산자 우선순위 반환 - public static int getOperationPriority(char op) { - switch (op) { - case '*': - case '/': - return 2; - case '+': - case '-': - return 1; - default: - throw new IllegalStateException("유효하지 않은 연산자 입니다" + op); - } - } - - //연산자 우선순위 비교 - public static int compareOperation(char op, char opNow) { - int operationPriority = getOperationPriority(op); - int operationPriorityNow = getOperationPriority(opNow); - - if (operationPriorityNow > operationPriority) { - return 1; - } else if (operationPriorityNow == operationPriority) { - return 0; - } else { - return -1; - } - - } - -} diff --git a/src/main/java/com/bona/javacalculator/service/ValidateService.java b/src/main/java/com/bona/javacalculator/service/ValidateService.java deleted file mode 100644 index 07e951be4..000000000 --- a/src/main/java/com/bona/javacalculator/service/ValidateService.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.bona.javacalculator.service; - -import java.util.Optional; - - -public class ValidateService { - - public Optional validate(String input) { - String[] inputString = input.split(""); - - if (inputString.length < 3) { - return Optional.empty(); - } - - - boolean isDivision = false; - for (int i = 0; i < inputString.length; i++) { - if (i % 2 == 1) { // 홀수 자리일 경우 연산자여야 함. - if(!CheckService.isOperator(inputString[i])){ - return Optional.empty(); - } - // / 일 경우 0 나누는경울 처리 - if(inputString[i].equals("/")){ - isDivision = true; - } - // 숫자 validate - } else if (!isValidNumber(inputString[i], isDivision)) { - return Optional.empty(); - } - } - //마지막 자리가 숫자인지 - if(!CheckService.isNumber(inputString[inputString.length-1])){ - return Optional.empty(); - } - return Optional.of(input); - } - - private boolean isValidNumber(String s, boolean isDivision) { - //숫자 인지 - if(!CheckService.isNumber(s)){ - return false; - } - // 0이고 앞서 나온 연산자가 / 라면 false - if(s.equals("0") && isDivision){ - return false; - } - return true; - } - - - - - - -} diff --git a/src/main/java/com/bona/javacalculator/util/Validator.java b/src/main/java/com/bona/javacalculator/util/Validator.java new file mode 100644 index 000000000..759801fdf --- /dev/null +++ b/src/main/java/com/bona/javacalculator/util/Validator.java @@ -0,0 +1,87 @@ +package com.bona.javacalculator.util; + +import com.bona.javacalculator.io.Console; +import com.bona.javacalculator.core.Operator; + + +public class Validator { + + private final Console console = new Console(); + + public void validateFormula(String input) { + validateIsEmpty(input); + validateWithDivideZero(input); + validateFomat(input); + } + + private void validateFomat(String input) { + String[] inputString = input.split(""); + + if (inputString.length < 3) { + throw new RuntimeException("입력식이 포맷에 맞지 않습니다."); + } + //마지막 자리가 숫자인지 + if (!isNumber(inputString[inputString.length - 1])) { + throw new RuntimeException("입력식이 포맷에 맞지 않습니다."); + } + for (int i = 0; i < inputString.length; i++) { + if (i % 2 == 1) { // 홀수 자리일 경우 연산자여야 함. + if (!Operator.isOperator(inputString[i])) { + throw new RuntimeException("입력식이 포맷에 맞지 않습니다."); + } + } + } + } + + private void validateWithDivideZero(String input) { + String[] inputString = input.split(""); + + boolean isDivision = false; + for (int i = 0; i < inputString.length; i++) { + + if (i % 2 == 1) { + if (inputString[i].equals("/")) { + isDivision = true; + } + + } else if (!isValidNumber(inputString[i], isDivision)) { + throw new RuntimeException("0으로 나눌 수 없습니다."); + } + } + } + + private void validateIsEmpty(String input) { + if (input.isEmpty()) { + console.inputError(); + throw new RuntimeException("입력 값이 비어있습니다."); + } + } + + + private boolean isValidNumber(String split, boolean isDivision) { + + if (!isNumber(split)) { + return false; + } + + if (split.equals("0") && isDivision) { + return false; + } + return true; + } + + public static boolean isNumber(String split) { + for (int i = 0; i < split.length(); i++) { + if (!Character.isDigit(split.charAt(i))) { + return false; + } + } + return true; + } + + + public static boolean isLong(double num) { + return num == (long) num; + } + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index 8b1378917..000000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/test/java/com/bona/javacalculator/core/CalculateTest.java b/src/test/java/com/bona/javacalculator/core/CalculateTest.java new file mode 100644 index 000000000..6c602330e --- /dev/null +++ b/src/test/java/com/bona/javacalculator/core/CalculateTest.java @@ -0,0 +1,30 @@ +package com.bona.javacalculator.kernel; + +import com.bona.javacalculator.core.calculator.Calculator; +import com.bona.javacalculator.core.converter.PostfixConverter; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import java.util.List; + +class CalculateTest { + + Calculator calculator = new Calculator(); + PostfixConverter makePostfix = new PostfixConverter(); + + @Test + @DisplayName("결과값 반환 테스트") + public void resultTest() { + //given + String input = "1+2*3"; + + //when + List convert = makePostfix.convert(input); + Double result = calculator.calculate(convert); + + //then + Assertions.assertThat(result).isEqualTo(7); + } + +} \ No newline at end of file diff --git a/src/test/java/com/bona/javacalculator/service/MakePostfixServiceTest.java b/src/test/java/com/bona/javacalculator/core/PostfixTest.java similarity index 53% rename from src/test/java/com/bona/javacalculator/service/MakePostfixServiceTest.java rename to src/test/java/com/bona/javacalculator/core/PostfixTest.java index 5e5dc262c..3b18243fe 100644 --- a/src/test/java/com/bona/javacalculator/service/MakePostfixServiceTest.java +++ b/src/test/java/com/bona/javacalculator/core/PostfixTest.java @@ -1,14 +1,16 @@ -package com.bona.javacalculator.service; +package com.bona.javacalculator.core; import static org.assertj.core.api.Assertions.assertThat; + +import com.bona.javacalculator.core.converter.PostfixConverter; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import java.util.List; -class MakePostfixServiceTest { +class PostfixTest { - MakePostfixService makePostfixService = new MakePostfixService(); + PostfixConverter makePostfix = new PostfixConverter(); @Test @DisplayName("후위표기식 출력 테스트") @@ -17,9 +19,9 @@ public void makePostfixTest() { String input = "1+2*3"; String wantInput = "123*+"; //when - String postfixInput = makePostfixService.convPostfix(input); + List convert = makePostfix.convert(input); //then - assertThat(postfixInput).isEqualTo(wantInput); + assertThat(convert).isEqualTo(wantInput); } } \ No newline at end of file diff --git a/src/test/java/com/bona/javacalculator/core/ValidatorTest.java b/src/test/java/com/bona/javacalculator/core/ValidatorTest.java new file mode 100644 index 000000000..863e95f7c --- /dev/null +++ b/src/test/java/com/bona/javacalculator/core/ValidatorTest.java @@ -0,0 +1,70 @@ +package com.bona.javacalculator.core; + +import com.bona.javacalculator.util.Validator; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + + +class ValidatorTest { + + Validator validator = new Validator(); + + @Test + @DisplayName("0으로 나눌때 runtime exception 반환 테스트") + public void divisionByZero() { + //given + String input = "1/0"; + //when + Throwable exception = assertThrows(RuntimeException.class, () -> { + validator.validateFormula(input); + }); + //then + assertEquals("0으로 나눌 수 없습니다.", exception.getMessage()); + + } + + @Test + @DisplayName("공백이 있는 연산식 테스트") + public void whiteSpaceInput() { + //given + String input = ""; + //when + Throwable exception = assertThrows(RuntimeException.class, () -> { + validator.validateFormula(input); + }); + //then + assertEquals("입력 값이 비어있습니다.", exception.getMessage()); + + } + + @Test + @DisplayName("올바른 format이 아닌 연산식 테스트") + public void invalidFormatInput() { + //given + String input = "1+3-"; + //when + Throwable exception = assertThrows(RuntimeException.class, () -> { + validator.validateFormula(input); + }); + //then + assertEquals("입력식이 포맷에 맞지 않습니다.", exception.getMessage()); + + } + + @Test + @DisplayName("연산자 자리에 다른 문자가 있는 연산식 테스트") + public void notOperatorInput() { + //given + String input = "1+3=1"; + //when + Throwable exception = assertThrows(RuntimeException.class, () -> { + validator.validateFormula(input); + }); + //then + assertEquals("입력식이 포맷에 맞지 않습니다.", exception.getMessage()); + } + +} \ No newline at end of file diff --git a/src/test/java/com/bona/javacalculator/repository/CalMemoryRepositoryTest.java b/src/test/java/com/bona/javacalculator/repository/CalMemoryRepositoryTest.java index 35f76a43a..80085c25a 100644 --- a/src/test/java/com/bona/javacalculator/repository/CalMemoryRepositoryTest.java +++ b/src/test/java/com/bona/javacalculator/repository/CalMemoryRepositoryTest.java @@ -1,33 +1,27 @@ package com.bona.javacalculator.repository; -import com.bona.javacalculator.model.InputAndAnswer; +import com.bona.javacalculator.model.ExpressionResult; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; class CalMemoryRepositoryTest { MemoryRepository memoryRepository = new CalMemoryRepository(); - @AfterEach - void afterEach() { - memoryRepository.clearStore(); - } - @DisplayName("저장 테스트") @Test void save() { //given - InputAndAnswer inputAndAnswer = new InputAndAnswer("1+2",3.0); + ExpressionResult expressionResult = new ExpressionResult("1+2",3.0); //when - InputAndAnswer savedInputAndAnswer = memoryRepository.save(inputAndAnswer); + ExpressionResult savedExpressionResult = memoryRepository.save(expressionResult); //then - InputAndAnswer findInputAndAnswer = memoryRepository.findById(inputAndAnswer.getId()); - assertThat(findInputAndAnswer).isEqualTo(savedInputAndAnswer); + ExpressionResult findExpressionResult = memoryRepository.findById(expressionResult.getId()); + assertThat(findExpressionResult).isEqualTo(savedExpressionResult); } } \ No newline at end of file diff --git a/src/test/java/com/bona/javacalculator/service/AnalyzeServiceTest.java b/src/test/java/com/bona/javacalculator/service/AnalyzeServiceTest.java deleted file mode 100644 index a48d20bc9..000000000 --- a/src/test/java/com/bona/javacalculator/service/AnalyzeServiceTest.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.bona.javacalculator.service; - -import org.assertj.core.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.*; - -class AnalyzeServiceTest { - - AnalyzeService analyzeService = new AnalyzeService(); - MakePostfixService makePostfixService = new MakePostfixService(); - - @Test - @DisplayName("결과값 반환 테스트") - public void resultTest() { - //given - String input = "1+2*3"; - - //when - String postfix = makePostfixService.convPostfix(input); - Double result = analyzeService.analyzeStr(postfix); - - //then - Assertions.assertThat(result).isEqualTo(7); - } - -} \ No newline at end of file diff --git a/src/test/java/com/bona/javacalculator/service/ValidateServiceTest.java b/src/test/java/com/bona/javacalculator/service/ValidateServiceTest.java deleted file mode 100644 index c70a671a6..000000000 --- a/src/test/java/com/bona/javacalculator/service/ValidateServiceTest.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.bona.javacalculator.service; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import java.util.Optional; - - -class ValidateServiceTest { - - ValidateService validateService = new ValidateService(); - - @Test - @DisplayName("0으로 나눌때 Optional 반환 테스트") - public void divisionByZero() { - //given - String input = "1/0"; - //when - Optional validateInput = validateService.validate(input); - //then - Assertions.assertTrue(validateInput.isEmpty()); - - } - - @Test - @DisplayName("공백이 있는 연산식 테스트") - public void whiteSpaceInput() { - //given - String input = "1+ 3"; - //when - Optional validateInput = validateService.validate(input); - //then - Assertions.assertTrue(validateInput.isEmpty()); - - } - - @Test - @DisplayName("문자가 있는 연산식 테스트") - public void otherStringInput() { - //given - String input = "1+a+3"; - //when - Optional validateInput = validateService.validate(input); - //then - Assertions.assertTrue(validateInput.isEmpty()); - - } - - @Test - @DisplayName("올바른 format이 아닌 연산식 테스트") - public void invalidFormatInput() { - //given - String input = "1+3-"; - //when - Optional validateInput = validateService.validate(input); - //then - Assertions.assertTrue(validateInput.isEmpty()); - - } - - @Test - @DisplayName("연산자 자리에 다른 문자가 있는 연산식 테스트") - public void notOperatorInput() { - //given - String input = "1+3=1"; - //when - Optional validateInput = validateService.validate(input); - //then - Assertions.assertTrue(validateInput.isEmpty()); - - } - -} \ No newline at end of file From 55ee76d2fac982962256e2ef17c6fad424028c3e Mon Sep 17 00:00:00 2001 From: bona Date: Fri, 16 Jun 2023 02:54:55 +0900 Subject: [PATCH 12/13] =?UTF-8?q?[UPDATE]=20exception=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...vaCalculatorApplication.java => Main.java} | 3 +- .../core/CalculatorManager.java | 36 +++++++++---------- .../com/bona/javacalculator/core/Option.java | 34 ++---------------- .../core/calculator/Calculator.java | 3 +- .../core/converter/PostfixConverter.java | 5 ++- .../com/bona/javacalculator/io/Console.java | 4 --- .../com/bona/javacalculator/io/Input.java | 2 -- .../model/ExpressionResult.java | 3 -- .../bona/javacalculator/util/Validator.java | 15 ++++---- 9 files changed, 31 insertions(+), 74 deletions(-) rename src/main/java/com/bona/javacalculator/{JavaCalculatorApplication.java => Main.java} (95%) diff --git a/src/main/java/com/bona/javacalculator/JavaCalculatorApplication.java b/src/main/java/com/bona/javacalculator/Main.java similarity index 95% rename from src/main/java/com/bona/javacalculator/JavaCalculatorApplication.java rename to src/main/java/com/bona/javacalculator/Main.java index 8e9ac97cc..fd46af675 100644 --- a/src/main/java/com/bona/javacalculator/JavaCalculatorApplication.java +++ b/src/main/java/com/bona/javacalculator/Main.java @@ -9,7 +9,7 @@ import com.bona.javacalculator.repository.MemoryRepository; import com.bona.javacalculator.util.Validator; -public class JavaCalculatorApplication { +public class Main { public static void main(String[] args) { MemoryRepository repository = new CalMemoryRepository(); @@ -22,6 +22,7 @@ public static void main(String[] args) { calculatorManager.run(); + } } diff --git a/src/main/java/com/bona/javacalculator/core/CalculatorManager.java b/src/main/java/com/bona/javacalculator/core/CalculatorManager.java index cc0e4075d..015987c08 100644 --- a/src/main/java/com/bona/javacalculator/core/CalculatorManager.java +++ b/src/main/java/com/bona/javacalculator/core/CalculatorManager.java @@ -10,13 +10,14 @@ import java.util.List; public class CalculatorManager { + private final Converter converter; private final Validator validator; private final MemoryRepository repository; private final Console console; private final Calculator calculator; - public CalculatorManager( Calculator calculator,MemoryRepository repository,Console console, Converter converter, Validator validator) { + public CalculatorManager(Calculator calculator, MemoryRepository repository, Console console,Converter converter, Validator validator) { this.repository = repository; this.console = console; this.converter = converter; @@ -28,24 +29,20 @@ public void run() { boolean isRun = true; while (isRun) { - String input = console.input("1. 조회 2. 계산 3.종료"); - - Option option = Option.of(input); - - - switch (option) { - case INQUIRY: - inquiry(); - break; - case CALCULATE: - calculate(); - break; - case EXIT: - isRun = false; - break; - default: - console.printMessage("잘못된 입력입니다"); - break; + try { + String input = console.input("1. 조회 2. 계산 3.종료"); + + Option option = Option.of(input); + + switch (option) { + case INQUIRY -> inquiry(); + case CALCULATE -> calculate(); + case EXIT -> isRun = false; + default -> { + } + } + } catch (RuntimeException e) { + console.printMessage(e.getMessage()); } } } @@ -64,6 +61,7 @@ public void calculate() { console.outAnswer(result); } + public void inquiry() { List all = repository.findAll(); diff --git a/src/main/java/com/bona/javacalculator/core/Option.java b/src/main/java/com/bona/javacalculator/core/Option.java index f5ef85f4d..007838dab 100644 --- a/src/main/java/com/bona/javacalculator/core/Option.java +++ b/src/main/java/com/bona/javacalculator/core/Option.java @@ -1,9 +1,8 @@ package com.bona.javacalculator.core; -import com.bona.javacalculator.util.Validator; public enum Option { - EXIT(3), INVALID_INPUT(0), INQUIRY(1), CALCULATE(2); + EXIT(3), INQUIRY(1), CALCULATE(2); private int matchNum; @@ -11,25 +10,6 @@ public enum Option { this.matchNum = matchNum; } - public static Option valueOf(int matchNum) { - Option option; - switch (matchNum) { - case 3: - option = Option.EXIT; - return option; - case 1: - option = Option.INQUIRY; - return option; - case 2: - option = Option.CALCULATE; - return option; - default: - option = Option.INVALID_INPUT; - return option; - - } - - } public static Option of(String input) { @@ -39,17 +19,7 @@ public static Option of(String input) { } } - throw new RuntimeException("wrong input"); - } - - private int parse(String input) { - if (input.isBlank()) { - return 3; // EXIT - } - if (!Validator.isNumber(input)) { - return 0; //INVALID_INPUT - } - return Integer.parseInt(input); + throw new RuntimeException("입력이 잘못되었습니다."); } } diff --git a/src/main/java/com/bona/javacalculator/core/calculator/Calculator.java b/src/main/java/com/bona/javacalculator/core/calculator/Calculator.java index 1ad8d9476..2ff1c49e6 100644 --- a/src/main/java/com/bona/javacalculator/core/calculator/Calculator.java +++ b/src/main/java/com/bona/javacalculator/core/calculator/Calculator.java @@ -1,15 +1,14 @@ package com.bona.javacalculator.core.calculator; -import com.bona.javacalculator.io.Console; import com.bona.javacalculator.core.*; import com.bona.javacalculator.util.Validator; import java.util.List; import java.util.Stack; -// only calculate S R P public class Calculator implements AbstractCalculator{ + @Override public double calculate(List formula) { diff --git a/src/main/java/com/bona/javacalculator/core/converter/PostfixConverter.java b/src/main/java/com/bona/javacalculator/core/converter/PostfixConverter.java index f742889ff..927f5e553 100644 --- a/src/main/java/com/bona/javacalculator/core/converter/PostfixConverter.java +++ b/src/main/java/com/bona/javacalculator/core/converter/PostfixConverter.java @@ -12,7 +12,6 @@ public class PostfixConverter implements Converter { private final String WHITE_SPACE = ""; private final Priority priorityFind = new Priority(); - //후위 표기로 변환 @Override public List convert(String input) { List postfix = new ArrayList<>(); @@ -36,11 +35,11 @@ public List convert(String input) { } public void pushOperator(String operator, List postfix, Stack operatorStack) { - if (operatorStack.isEmpty() || priorityFind.compareOperation(operatorStack.peek(), operator) > 0) { + if (operatorStack.isEmpty() || Priority.compareOperation(operatorStack.peek(), operator) > 0) { operatorStack.push(operator); return; } - while (!operatorStack.isEmpty() && priorityFind.compareOperation(operatorStack.peek(), operator) <= 0) { + while (!operatorStack.isEmpty() && Priority.compareOperation(operatorStack.peek(), operator) <= 0) { postfix.add(operatorStack.pop()); } operatorStack.push(operator); diff --git a/src/main/java/com/bona/javacalculator/io/Console.java b/src/main/java/com/bona/javacalculator/io/Console.java index b9c34520d..d0bfb757b 100644 --- a/src/main/java/com/bona/javacalculator/io/Console.java +++ b/src/main/java/com/bona/javacalculator/io/Console.java @@ -17,10 +17,6 @@ public String input(String input) { return scanner.nextLine(); } - @Override - public void inputError() { - System.out.println("입력을 잘못하셨습니다."); - } @Override public void outAnswer(Double answer) { diff --git a/src/main/java/com/bona/javacalculator/io/Input.java b/src/main/java/com/bona/javacalculator/io/Input.java index 4cb0943c8..33b8ac069 100644 --- a/src/main/java/com/bona/javacalculator/io/Input.java +++ b/src/main/java/com/bona/javacalculator/io/Input.java @@ -3,6 +3,4 @@ public interface Input { String input(String S); - void inputError(); - } diff --git a/src/main/java/com/bona/javacalculator/model/ExpressionResult.java b/src/main/java/com/bona/javacalculator/model/ExpressionResult.java index 42725bb7b..e8cfbb393 100644 --- a/src/main/java/com/bona/javacalculator/model/ExpressionResult.java +++ b/src/main/java/com/bona/javacalculator/model/ExpressionResult.java @@ -30,7 +30,4 @@ public Double getAnswer() { return answer; } - public void setAnswer(Double answer) { - this.answer = answer; - } } diff --git a/src/main/java/com/bona/javacalculator/util/Validator.java b/src/main/java/com/bona/javacalculator/util/Validator.java index 759801fdf..ec30f92f8 100644 --- a/src/main/java/com/bona/javacalculator/util/Validator.java +++ b/src/main/java/com/bona/javacalculator/util/Validator.java @@ -45,34 +45,33 @@ private void validateWithDivideZero(String input) { } } else if (!isValidNumber(inputString[i], isDivision)) { - throw new RuntimeException("0으로 나눌 수 없습니다."); + throw new ArithmeticException("0으로 나눌 수 없습니다."); } } } private void validateIsEmpty(String input) { if (input.isEmpty()) { - console.inputError(); throw new RuntimeException("입력 값이 비어있습니다."); } } - private boolean isValidNumber(String split, boolean isDivision) { + private boolean isValidNumber(String input, boolean isDivision) { - if (!isNumber(split)) { + if (!isNumber(input)) { return false; } - if (split.equals("0") && isDivision) { + if (input.equals("0") && isDivision) { return false; } return true; } - public static boolean isNumber(String split) { - for (int i = 0; i < split.length(); i++) { - if (!Character.isDigit(split.charAt(i))) { + public static boolean isNumber(String input) { + for (int i = 0; i < input.length(); i++) { + if (!Character.isDigit(input.charAt(i))) { return false; } } From a54696af29f2bb2090f19dbfd5806a714cf4dee7 Mon Sep 17 00:00:00 2001 From: bona Date: Fri, 16 Jun 2023 02:56:14 +0900 Subject: [PATCH 13/13] =?UTF-8?q?[UPDATE]=20=EC=A3=BC=EC=84=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/bona/javacalculator/util/Validator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bona/javacalculator/util/Validator.java b/src/main/java/com/bona/javacalculator/util/Validator.java index ec30f92f8..e0301e48e 100644 --- a/src/main/java/com/bona/javacalculator/util/Validator.java +++ b/src/main/java/com/bona/javacalculator/util/Validator.java @@ -20,12 +20,12 @@ private void validateFomat(String input) { if (inputString.length < 3) { throw new RuntimeException("입력식이 포맷에 맞지 않습니다."); } - //마지막 자리가 숫자인지 + if (!isNumber(inputString[inputString.length - 1])) { throw new RuntimeException("입력식이 포맷에 맞지 않습니다."); } for (int i = 0; i < inputString.length; i++) { - if (i % 2 == 1) { // 홀수 자리일 경우 연산자여야 함. + if (i % 2 == 1) { if (!Operator.isOperator(inputString[i])) { throw new RuntimeException("입력식이 포맷에 맞지 않습니다."); }