From a82ab01d70d115ced811fb62536f10ec921e001d Mon Sep 17 00:00:00 2001 From: young970 Date: Mon, 2 Oct 2023 23:49:59 +0900 Subject: [PATCH 01/29] =?UTF-8?q?Feat:=20Base62=20encoding=20Url=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20API,=20index=20=ED=8E=98=EC=9D=B4=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 37 +++ build.gradle | 36 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 63375 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 248 ++++++++++++++++++ gradlew.bat | 92 +++++++ settings.gradle | 1 + .../shortenerurl/ShortenerUrlApplication.java | 13 + .../shortenerurl/application/UrlService.java | 32 +++ .../application/dto/UrlCreateRequest.java | 6 + .../infrastructures/UrlJpaRepository.java | 7 + .../infrastructures/UrlRepository.java | 7 + .../infrastructures/UrlRepositoryImpl.java | 20 ++ .../shortenerurl/model/Base62Encoder.java | 32 +++ .../shortenerurl/model/EncodedUrl.java | 26 ++ .../youngurl/shortenerurl/model/Encoder.java | 7 + .../shortenerurl/model/EncodingType.java | 18 ++ .../com/youngurl/shortenerurl/model/Url.java | 60 +++++ .../presentation/UrlRestController.java | 54 ++++ .../presentation/UrlViewController.java | 14 + .../presentation/dto/UrlCreateApiRequest.java | 6 + .../dto/UrlCreateApiResponse.java | 8 + .../presentation/mapper/UrlApiMapper.java | 16 ++ src/main/resources/application.yml | 12 + src/main/resources/templates/index.html | 87 ++++++ .../ShortenerUrlApplicationTests.java | 13 + .../application/UrlServiceTest.java | 31 +++ src/test/resources/application-test.yml | 12 + 28 files changed, 902 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 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/com/youngurl/shortenerurl/ShortenerUrlApplication.java create mode 100644 src/main/java/com/youngurl/shortenerurl/application/UrlService.java create mode 100644 src/main/java/com/youngurl/shortenerurl/application/dto/UrlCreateRequest.java create mode 100644 src/main/java/com/youngurl/shortenerurl/infrastructures/UrlJpaRepository.java create mode 100644 src/main/java/com/youngurl/shortenerurl/infrastructures/UrlRepository.java create mode 100644 src/main/java/com/youngurl/shortenerurl/infrastructures/UrlRepositoryImpl.java create mode 100644 src/main/java/com/youngurl/shortenerurl/model/Base62Encoder.java create mode 100644 src/main/java/com/youngurl/shortenerurl/model/EncodedUrl.java create mode 100644 src/main/java/com/youngurl/shortenerurl/model/Encoder.java create mode 100644 src/main/java/com/youngurl/shortenerurl/model/EncodingType.java create mode 100644 src/main/java/com/youngurl/shortenerurl/model/Url.java create mode 100644 src/main/java/com/youngurl/shortenerurl/presentation/UrlRestController.java create mode 100644 src/main/java/com/youngurl/shortenerurl/presentation/UrlViewController.java create mode 100644 src/main/java/com/youngurl/shortenerurl/presentation/dto/UrlCreateApiRequest.java create mode 100644 src/main/java/com/youngurl/shortenerurl/presentation/dto/UrlCreateApiResponse.java create mode 100644 src/main/java/com/youngurl/shortenerurl/presentation/mapper/UrlApiMapper.java create mode 100644 src/main/resources/application.yml create mode 100644 src/main/resources/templates/index.html create mode 100644 src/test/java/com/youngurl/shortenerurl/ShortenerUrlApplicationTests.java create mode 100644 src/test/java/com/youngurl/shortenerurl/application/UrlServiceTest.java create mode 100644 src/test/resources/application-test.yml diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..c2065bc2 --- /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 00000000..8a887164 --- /dev/null +++ b/build.gradle @@ -0,0 +1,36 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.1.4' + id 'io.spring.dependency-management' version '1.1.3' +} + +group = 'com.young-url' +version = '0.0.1-SNAPSHOT' + +java { + sourceCompatibility = '17' +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + 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..033e24c4cdf41af1ab109bc7f253b2b887023340 GIT binary patch literal 63375 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≫L+crb^Bz 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + 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 + + +# 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"' + +# 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 00000000..93e3f59f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@rem This is normally unused +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 00000000..136770f8 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'shortenerURL' diff --git a/src/main/java/com/youngurl/shortenerurl/ShortenerUrlApplication.java b/src/main/java/com/youngurl/shortenerurl/ShortenerUrlApplication.java new file mode 100644 index 00000000..ac3e4035 --- /dev/null +++ b/src/main/java/com/youngurl/shortenerurl/ShortenerUrlApplication.java @@ -0,0 +1,13 @@ +package com.youngurl.shortenerurl; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ShortenerUrlApplication { + + public static void main(String[] args) { + SpringApplication.run(ShortenerUrlApplication.class, args); + } + +} diff --git a/src/main/java/com/youngurl/shortenerurl/application/UrlService.java b/src/main/java/com/youngurl/shortenerurl/application/UrlService.java new file mode 100644 index 00000000..2626921e --- /dev/null +++ b/src/main/java/com/youngurl/shortenerurl/application/UrlService.java @@ -0,0 +1,32 @@ +package com.youngurl.shortenerurl.application; + +import com.youngurl.shortenerurl.application.dto.UrlCreateRequest; +import com.youngurl.shortenerurl.infrastructures.UrlRepository; +import com.youngurl.shortenerurl.model.Url; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +public class UrlService { + + private final UrlRepository urlRepository; + + public UrlService(UrlRepository urlRepository) { + this.urlRepository = urlRepository; + } + + @Transactional + public String createUrl(UrlCreateRequest request) { + Url url = urlRepository.save( + new Url(request.originUrl(), request.encodingType()) + ); + + url.encode(); + return url.getEncodedUrl(); + } + + public String findOriginUrl(String encodedUrl) { + + + } +} diff --git a/src/main/java/com/youngurl/shortenerurl/application/dto/UrlCreateRequest.java b/src/main/java/com/youngurl/shortenerurl/application/dto/UrlCreateRequest.java new file mode 100644 index 00000000..43b1e805 --- /dev/null +++ b/src/main/java/com/youngurl/shortenerurl/application/dto/UrlCreateRequest.java @@ -0,0 +1,6 @@ +package com.youngurl.shortenerurl.application.dto; + +import com.youngurl.shortenerurl.model.EncodingType; + +public record UrlCreateRequest(String originUrl, EncodingType encodingType) { +} diff --git a/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlJpaRepository.java b/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlJpaRepository.java new file mode 100644 index 00000000..694ed4c2 --- /dev/null +++ b/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlJpaRepository.java @@ -0,0 +1,7 @@ +package com.youngurl.shortenerurl.infrastructures; + +import com.youngurl.shortenerurl.model.Url; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface UrlJpaRepository extends JpaRepository { +} diff --git a/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlRepository.java b/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlRepository.java new file mode 100644 index 00000000..80500157 --- /dev/null +++ b/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlRepository.java @@ -0,0 +1,7 @@ +package com.youngurl.shortenerurl.infrastructures; + +import com.youngurl.shortenerurl.model.Url; + +public interface UrlRepository { + Url save(Url url); +} diff --git a/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlRepositoryImpl.java b/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlRepositoryImpl.java new file mode 100644 index 00000000..3e81f12b --- /dev/null +++ b/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlRepositoryImpl.java @@ -0,0 +1,20 @@ +package com.youngurl.shortenerurl.infrastructures; + +import com.youngurl.shortenerurl.model.Url; +import org.springframework.stereotype.Repository; + +@Repository +public class UrlRepositoryImpl implements UrlRepository{ + + private final UrlJpaRepository urlJpaRepository; + + public UrlRepositoryImpl(UrlJpaRepository urlJpaRepository) { + this.urlJpaRepository = urlJpaRepository; + } + + @Override + public Url save(Url url) { + return urlJpaRepository.save(url); + } + +} diff --git a/src/main/java/com/youngurl/shortenerurl/model/Base62Encoder.java b/src/main/java/com/youngurl/shortenerurl/model/Base62Encoder.java new file mode 100644 index 00000000..80489385 --- /dev/null +++ b/src/main/java/com/youngurl/shortenerurl/model/Base62Encoder.java @@ -0,0 +1,32 @@ +package com.youngurl.shortenerurl.model; + +import com.youngurl.shortenerurl.model.Encoder; +import org.springframework.stereotype.Component; + +@Component +public class Base62Encoder implements Encoder { + private static final int BASE62 = 62; + private static final String BASE62_CHAR = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; + + @Override + public String encode(long index) { + StringBuffer sb = new StringBuffer(); + while(index > 0) { + sb.append(BASE62_CHAR.charAt((int) (index % BASE62))); + index /= BASE62; + } + return sb.toString(); + } + + @Override + public long decode(String param) { + long sum = 0; + long power = 1; + for (int i = 0; i < param.length(); i++) { + sum += BASE62_CHAR.indexOf(param.charAt(i)) * power; + power *= BASE62; + } + return sum; + } + +} diff --git a/src/main/java/com/youngurl/shortenerurl/model/EncodedUrl.java b/src/main/java/com/youngurl/shortenerurl/model/EncodedUrl.java new file mode 100644 index 00000000..760d75ac --- /dev/null +++ b/src/main/java/com/youngurl/shortenerurl/model/EncodedUrl.java @@ -0,0 +1,26 @@ +package com.youngurl.shortenerurl.model; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.springframework.util.Assert; + +@Getter +@Embeddable +@NoArgsConstructor +public class EncodedUrl { + private static final int MAX_URL_LENGTH = 8; + + @Column + private String encodedUrl; + + public EncodedUrl(String encodedUrl) { + Assert.notNull(encodedUrl, "변환된 url은 null이 될 수 없습니다."); + if (encodedUrl.length() > MAX_URL_LENGTH){ + throw new IllegalArgumentException("변환된 url의 길이는 8이상 될 수 없습니다."); + } + + this.encodedUrl = encodedUrl; + } +} diff --git a/src/main/java/com/youngurl/shortenerurl/model/Encoder.java b/src/main/java/com/youngurl/shortenerurl/model/Encoder.java new file mode 100644 index 00000000..7f52f639 --- /dev/null +++ b/src/main/java/com/youngurl/shortenerurl/model/Encoder.java @@ -0,0 +1,7 @@ +package com.youngurl.shortenerurl.model; + +public interface Encoder { + String encode(long index); + + long decode(String param); +} diff --git a/src/main/java/com/youngurl/shortenerurl/model/EncodingType.java b/src/main/java/com/youngurl/shortenerurl/model/EncodingType.java new file mode 100644 index 00000000..153fa3d8 --- /dev/null +++ b/src/main/java/com/youngurl/shortenerurl/model/EncodingType.java @@ -0,0 +1,18 @@ +package com.youngurl.shortenerurl.model; + +import java.util.function.Supplier; + +public enum EncodingType { + BASE_62(Base62Encoder::new); + + private final Supplier supplier; + + EncodingType(Supplier supplier) { + this.supplier = supplier; + } + + public Encoder getEncoder(){ + return supplier.get(); + } + +} diff --git a/src/main/java/com/youngurl/shortenerurl/model/Url.java b/src/main/java/com/youngurl/shortenerurl/model/Url.java new file mode 100644 index 00000000..58b7ee8c --- /dev/null +++ b/src/main/java/com/youngurl/shortenerurl/model/Url.java @@ -0,0 +1,60 @@ +package com.youngurl.shortenerurl.model; + +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.springframework.util.Assert; + +@Entity +@Table(name = "urls") +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Url { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, updatable = false) + private String originUrl; + + @Embedded + private EncodedUrl encodedUrl; + + @Enumerated + @Column(nullable = false) + private EncodingType encodingType; + + @Transient + private Encoder encoder; + + public Url(String originUrl, EncodingType encodingType) { + Assert.notNull(originUrl, "originUrl은 null값이 들어올 수 없습니다."); + Assert.notNull(encodingType, "encodingType은 null값이 들어올 수 없습니다."); + + this.originUrl = originUrl; + this.encodingType = encodingType; + this.encoder = encodingType.getEncoder(); + } + + public String encode(){ + String encoded = encoder.encode(this.id); + this.encodedUrl = new EncodedUrl(encoded); + + return encoded; + } + + public String getEncodedUrl() { + return encodedUrl.getEncodedUrl(); + } + +} diff --git a/src/main/java/com/youngurl/shortenerurl/presentation/UrlRestController.java b/src/main/java/com/youngurl/shortenerurl/presentation/UrlRestController.java new file mode 100644 index 00000000..34415736 --- /dev/null +++ b/src/main/java/com/youngurl/shortenerurl/presentation/UrlRestController.java @@ -0,0 +1,54 @@ +package com.youngurl.shortenerurl.presentation; + +import com.youngurl.shortenerurl.application.UrlService; +import com.youngurl.shortenerurl.presentation.dto.UrlCreateApiRequest; +import com.youngurl.shortenerurl.presentation.dto.UrlCreateApiResponse; +import com.youngurl.shortenerurl.presentation.mapper.UrlApiMapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import java.net.URI; + +@RestController +@RequestMapping("/api/urls") +public class UrlRestController { + private final String URL_PRE_FIX = "http://localhost:8080/"; + + private final UrlService urlService; + private final UrlApiMapper mapper; + + public UrlRestController(UrlService urlService, UrlApiMapper mapper) { + this.urlService = urlService; + this.mapper = mapper; + } + + @PostMapping + public ResponseEntity createUrl(@RequestBody UrlCreateApiRequest request){ + String encodedUrl = urlService.createUrl(mapper.toUrlCreateRequest(request)); + URI uri = createURI(encodedUrl); + + UrlCreateApiResponse apiResponse = UrlCreateApiResponse.from(URL_PRE_FIX + encodedUrl); + + return ResponseEntity.created(uri).body(apiResponse); + } + + @GetMapping("/{encodedUrl}") + public ResponseEntity redirectUrl(@PathVariable String encodedUrl){ + String originUrl = urlService.findOriginUrl(encodedUrl); + } + + private URI createURI(String url) { + return ServletUriComponentsBuilder + .fromCurrentRequest() + .path("/{id}") + .buildAndExpand(url) + .toUri(); + } + +} diff --git a/src/main/java/com/youngurl/shortenerurl/presentation/UrlViewController.java b/src/main/java/com/youngurl/shortenerurl/presentation/UrlViewController.java new file mode 100644 index 00000000..751e26f9 --- /dev/null +++ b/src/main/java/com/youngurl/shortenerurl/presentation/UrlViewController.java @@ -0,0 +1,14 @@ +package com.youngurl.shortenerurl.presentation; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +public class UrlViewController { + + @GetMapping + public String getIndexPage(){ + return "index"; + } + +} diff --git a/src/main/java/com/youngurl/shortenerurl/presentation/dto/UrlCreateApiRequest.java b/src/main/java/com/youngurl/shortenerurl/presentation/dto/UrlCreateApiRequest.java new file mode 100644 index 00000000..4091e2b6 --- /dev/null +++ b/src/main/java/com/youngurl/shortenerurl/presentation/dto/UrlCreateApiRequest.java @@ -0,0 +1,6 @@ +package com.youngurl.shortenerurl.presentation.dto; + +import com.youngurl.shortenerurl.model.EncodingType; + +public record UrlCreateApiRequest(String originUrl, EncodingType encodingType) { +} diff --git a/src/main/java/com/youngurl/shortenerurl/presentation/dto/UrlCreateApiResponse.java b/src/main/java/com/youngurl/shortenerurl/presentation/dto/UrlCreateApiResponse.java new file mode 100644 index 00000000..0c844316 --- /dev/null +++ b/src/main/java/com/youngurl/shortenerurl/presentation/dto/UrlCreateApiResponse.java @@ -0,0 +1,8 @@ +package com.youngurl.shortenerurl.presentation.dto; + +public record UrlCreateApiResponse(String encodedUrl) { + + public static UrlCreateApiResponse from(String encodedUrl){ + return new UrlCreateApiResponse(encodedUrl); + } +} diff --git a/src/main/java/com/youngurl/shortenerurl/presentation/mapper/UrlApiMapper.java b/src/main/java/com/youngurl/shortenerurl/presentation/mapper/UrlApiMapper.java new file mode 100644 index 00000000..3975ddce --- /dev/null +++ b/src/main/java/com/youngurl/shortenerurl/presentation/mapper/UrlApiMapper.java @@ -0,0 +1,16 @@ +package com.youngurl.shortenerurl.presentation.mapper; + +import com.youngurl.shortenerurl.application.dto.UrlCreateRequest; +import com.youngurl.shortenerurl.presentation.dto.UrlCreateApiRequest; +import org.springframework.stereotype.Component; + +@Component +public class UrlApiMapper { + + public UrlCreateRequest toUrlCreateRequest(UrlCreateApiRequest request){ + return new UrlCreateRequest( + request.originUrl(), + request.encodingType()); + } + +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 00000000..9cc33c38 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,12 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/shortener_url?serverTimezone=Asia/Seoul + username: root + password: 12345! + + jpa: + open-in-view: false + hibernate: + ddl-auto: update + show-sql: true \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html new file mode 100644 index 00000000..b3a20f46 --- /dev/null +++ b/src/main/resources/templates/index.html @@ -0,0 +1,87 @@ + + + + + + + + + + + URL-SHORTENER + + + + +

+
+

Shortener URL

+
+
+ +
+
+ + + +
+ +
+
+
+
+ + + + + + + + + + + + + + + diff --git a/src/test/java/com/youngurl/shortenerurl/ShortenerUrlApplicationTests.java b/src/test/java/com/youngurl/shortenerurl/ShortenerUrlApplicationTests.java new file mode 100644 index 00000000..ec5533e2 --- /dev/null +++ b/src/test/java/com/youngurl/shortenerurl/ShortenerUrlApplicationTests.java @@ -0,0 +1,13 @@ +package com.youngurl.shortenerurl; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class ShortenerUrlApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/src/test/java/com/youngurl/shortenerurl/application/UrlServiceTest.java b/src/test/java/com/youngurl/shortenerurl/application/UrlServiceTest.java new file mode 100644 index 00000000..56cb920e --- /dev/null +++ b/src/test/java/com/youngurl/shortenerurl/application/UrlServiceTest.java @@ -0,0 +1,31 @@ +package com.youngurl.shortenerurl.application; + +import com.youngurl.shortenerurl.application.dto.UrlCreateRequest; +import com.youngurl.shortenerurl.model.EncodingType; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.transaction.annotation.Transactional; + +import static org.junit.jupiter.api.Assertions.*; + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) +@Transactional +class UrlServiceTest { + + @Autowired + private UrlService urlService; + + @Test + void createUrl() { + //given + UrlCreateRequest request = new UrlCreateRequest("test-orgin-url", EncodingType.BASE_62); + + //when + String response = urlService.createUrl(request); + + //then + + } + +} \ No newline at end of file diff --git a/src/test/resources/application-test.yml b/src/test/resources/application-test.yml new file mode 100644 index 00000000..d2c095b9 --- /dev/null +++ b/src/test/resources/application-test.yml @@ -0,0 +1,12 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/shortener_url_test?serverTimezone=Asia/Seoul + username: root + password: 12345! + + jpa: + open-in-view: false + hibernate: + ddl-auto: create-drop + show-sql: true \ No newline at end of file From 47a3237d0e2b4cf37a384a69f1b10a96b1a41c13 Mon Sep 17 00:00:00 2001 From: young970 Date: Tue, 3 Oct 2023 00:35:00 +0900 Subject: [PATCH 02/29] Feat: redirectUrl API --- .../com/youngurl/shortenerurl/application/UrlService.java | 5 ++++- .../shortenerurl/infrastructures/UrlJpaRepository.java | 3 +++ .../shortenerurl/infrastructures/UrlRepository.java | 4 ++++ .../shortenerurl/infrastructures/UrlRepositoryImpl.java | 7 +++++++ src/main/java/com/youngurl/shortenerurl/model/Url.java | 2 ++ .../shortenerurl/presentation/UrlRestController.java | 5 +++++ 6 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/youngurl/shortenerurl/application/UrlService.java b/src/main/java/com/youngurl/shortenerurl/application/UrlService.java index 2626921e..19ae11a2 100644 --- a/src/main/java/com/youngurl/shortenerurl/application/UrlService.java +++ b/src/main/java/com/youngurl/shortenerurl/application/UrlService.java @@ -3,6 +3,7 @@ import com.youngurl.shortenerurl.application.dto.UrlCreateRequest; import com.youngurl.shortenerurl.infrastructures.UrlRepository; import com.youngurl.shortenerurl.model.Url; +import jakarta.persistence.EntityNotFoundException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -26,7 +27,9 @@ public String createUrl(UrlCreateRequest request) { } public String findOriginUrl(String encodedUrl) { + Url url = urlRepository.findByEncodedUrl(encodedUrl) + .orElseThrow(() -> new EntityNotFoundException("해당 encodedUrl를 가진 url을 찾을 수 없습니다.")); - + return url.getOriginUrl(); } } diff --git a/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlJpaRepository.java b/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlJpaRepository.java index 694ed4c2..7e154666 100644 --- a/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlJpaRepository.java +++ b/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlJpaRepository.java @@ -3,5 +3,8 @@ import com.youngurl.shortenerurl.model.Url; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.Optional; + public interface UrlJpaRepository extends JpaRepository { + Optional findByEncodedUrl(String encodedUrl); } diff --git a/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlRepository.java b/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlRepository.java index 80500157..9d0c25da 100644 --- a/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlRepository.java +++ b/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlRepository.java @@ -2,6 +2,10 @@ import com.youngurl.shortenerurl.model.Url; +import java.util.Optional; + public interface UrlRepository { Url save(Url url); + + Optional findByEncodedUrl(String encodedUrl); } diff --git a/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlRepositoryImpl.java b/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlRepositoryImpl.java index 3e81f12b..c31f8c57 100644 --- a/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlRepositoryImpl.java +++ b/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlRepositoryImpl.java @@ -3,6 +3,8 @@ import com.youngurl.shortenerurl.model.Url; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository public class UrlRepositoryImpl implements UrlRepository{ @@ -17,4 +19,9 @@ public Url save(Url url) { return urlJpaRepository.save(url); } + @Override + public Optional findByEncodedUrl(String encodedUrl) { + return urlJpaRepository.findByEncodedUrl(encodedUrl); + } + } diff --git a/src/main/java/com/youngurl/shortenerurl/model/Url.java b/src/main/java/com/youngurl/shortenerurl/model/Url.java index 58b7ee8c..0ecf08d1 100644 --- a/src/main/java/com/youngurl/shortenerurl/model/Url.java +++ b/src/main/java/com/youngurl/shortenerurl/model/Url.java @@ -47,6 +47,8 @@ public Url(String originUrl, EncodingType encodingType) { } public String encode(){ + Assert.notNull(this.id, "인코딩은 id값이 null이 아니여야 가능합니다. save를 먼저 하여 id값을 생성해주세요."); + String encoded = encoder.encode(this.id); this.encodedUrl = new EncodedUrl(encoded); diff --git a/src/main/java/com/youngurl/shortenerurl/presentation/UrlRestController.java b/src/main/java/com/youngurl/shortenerurl/presentation/UrlRestController.java index 34415736..5f230edb 100644 --- a/src/main/java/com/youngurl/shortenerurl/presentation/UrlRestController.java +++ b/src/main/java/com/youngurl/shortenerurl/presentation/UrlRestController.java @@ -4,6 +4,7 @@ import com.youngurl.shortenerurl.presentation.dto.UrlCreateApiRequest; import com.youngurl.shortenerurl.presentation.dto.UrlCreateApiResponse; import com.youngurl.shortenerurl.presentation.mapper.UrlApiMapper; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -41,6 +42,10 @@ public ResponseEntity createUrl(@RequestBody UrlCreateApiR @GetMapping("/{encodedUrl}") public ResponseEntity redirectUrl(@PathVariable String encodedUrl){ String originUrl = urlService.findOriginUrl(encodedUrl); + + return ResponseEntity.status(HttpStatus.MOVED_PERMANENTLY) + .location(URI.create(originUrl)) + .build(); } private URI createURI(String url) { From a62d50de4ced829006686bb5cec0988a08a03d34 Mon Sep 17 00:00:00 2001 From: young970 Date: Tue, 3 Oct 2023 01:44:28 +0900 Subject: [PATCH 03/29] =?UTF-8?q?Test,=20Fix:=20createUrl=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=9E=91=EC=84=B1,?= =?UTF-8?q?=20Urls=20=ED=85=8C=EC=9D=B4=EB=B8=94=EC=9D=98=20encoding=5Ftyp?= =?UTF-8?q?e=20=ED=95=84=EB=93=9C=20=EA=B0=92=200=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=93=A4=EC=96=B4=EA=B0=80=EB=8A=94=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=ED=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 1 + .../infrastructures/UrlJpaRepository.java | 7 ++++- .../com/youngurl/shortenerurl/model/Url.java | 3 +- .../presentation/UrlRestController.java | 29 ++++++++----------- .../presentation/dto/UrlCreateApiRequest.java | 6 +++- src/main/resources/templates/index.html | 2 +- .../application/UrlServiceTest.java | 22 ++++++++++++-- 7 files changed, 47 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index 8a887164..8e64df2f 100644 --- a/build.gradle +++ b/build.gradle @@ -25,6 +25,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-validation' compileOnly 'org.projectlombok:lombok' runtimeOnly 'com.mysql:mysql-connector-j' annotationProcessor 'org.projectlombok:lombok' diff --git a/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlJpaRepository.java b/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlJpaRepository.java index 7e154666..76b8baaa 100644 --- a/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlJpaRepository.java +++ b/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlJpaRepository.java @@ -2,9 +2,14 @@ import com.youngurl.shortenerurl.model.Url; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import java.util.Optional; public interface UrlJpaRepository extends JpaRepository { - Optional findByEncodedUrl(String encodedUrl); + + @Query("SELECT u FROM Url u WHERE u.encodedUrl.encodedUrl = :encodedUrl") + Optional findByEncodedUrl(@Param(value = "encodedUrl") String encodedUrl); + } diff --git a/src/main/java/com/youngurl/shortenerurl/model/Url.java b/src/main/java/com/youngurl/shortenerurl/model/Url.java index 0ecf08d1..a05d92c0 100644 --- a/src/main/java/com/youngurl/shortenerurl/model/Url.java +++ b/src/main/java/com/youngurl/shortenerurl/model/Url.java @@ -3,6 +3,7 @@ import jakarta.persistence.Column; import jakarta.persistence.Embedded; import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; @@ -30,7 +31,7 @@ public class Url { @Embedded private EncodedUrl encodedUrl; - @Enumerated + @Enumerated(EnumType.STRING) @Column(nullable = false) private EncodingType encodingType; diff --git a/src/main/java/com/youngurl/shortenerurl/presentation/UrlRestController.java b/src/main/java/com/youngurl/shortenerurl/presentation/UrlRestController.java index 5f230edb..3489a5e2 100644 --- a/src/main/java/com/youngurl/shortenerurl/presentation/UrlRestController.java +++ b/src/main/java/com/youngurl/shortenerurl/presentation/UrlRestController.java @@ -4,20 +4,22 @@ import com.youngurl.shortenerurl.presentation.dto.UrlCreateApiRequest; import com.youngurl.shortenerurl.presentation.dto.UrlCreateApiResponse; import com.youngurl.shortenerurl.presentation.mapper.UrlApiMapper; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; + import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import java.net.URI; @RestController -@RequestMapping("/api/urls") public class UrlRestController { private final String URL_PRE_FIX = "http://localhost:8080/"; @@ -29,18 +31,19 @@ public UrlRestController(UrlService urlService, UrlApiMapper mapper) { this.mapper = mapper; } - @PostMapping - public ResponseEntity createUrl(@RequestBody UrlCreateApiRequest request){ + @PostMapping(value = "/api/urls", + consumes = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity createUrl(@RequestBody @Valid UrlCreateApiRequest request) { String encodedUrl = urlService.createUrl(mapper.toUrlCreateRequest(request)); - URI uri = createURI(encodedUrl); - UrlCreateApiResponse apiResponse = UrlCreateApiResponse.from(URL_PRE_FIX + encodedUrl); - return ResponseEntity.created(uri).body(apiResponse); + return ResponseEntity + .created(URI.create(URL_PRE_FIX + encodedUrl)) + .body(apiResponse); } @GetMapping("/{encodedUrl}") - public ResponseEntity redirectUrl(@PathVariable String encodedUrl){ + public ResponseEntity redirectUrl(@PathVariable @NotBlank String encodedUrl) { String originUrl = urlService.findOriginUrl(encodedUrl); return ResponseEntity.status(HttpStatus.MOVED_PERMANENTLY) @@ -48,12 +51,4 @@ public ResponseEntity redirectUrl(@PathVariable String encodedUrl){ .build(); } - private URI createURI(String url) { - return ServletUriComponentsBuilder - .fromCurrentRequest() - .path("/{id}") - .buildAndExpand(url) - .toUri(); - } - } diff --git a/src/main/java/com/youngurl/shortenerurl/presentation/dto/UrlCreateApiRequest.java b/src/main/java/com/youngurl/shortenerurl/presentation/dto/UrlCreateApiRequest.java index 4091e2b6..811519e3 100644 --- a/src/main/java/com/youngurl/shortenerurl/presentation/dto/UrlCreateApiRequest.java +++ b/src/main/java/com/youngurl/shortenerurl/presentation/dto/UrlCreateApiRequest.java @@ -1,6 +1,10 @@ package com.youngurl.shortenerurl.presentation.dto; import com.youngurl.shortenerurl.model.EncodingType; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; -public record UrlCreateApiRequest(String originUrl, EncodingType encodingType) { +public record UrlCreateApiRequest( + @NotBlank(message = "originUrl은 빈값이 들어올 수 없습니다.") String originUrl, + @NotNull(message = "encodingType은 null이 들어올 수 없습니다.") EncodingType encodingType) { } diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index b3a20f46..8826ba63 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -76,7 +76,7 @@

Shortener URL

success: function(data) { // On successful post, reload data to get the added one as well console.log(data); - $('#result').html('

Shortened URL is : ' + data.encodedUrl + '

'); + $('#result').html('

Shortened URL is : ' + data.encodedUrl + '

'); } }); }); diff --git a/src/test/java/com/youngurl/shortenerurl/application/UrlServiceTest.java b/src/test/java/com/youngurl/shortenerurl/application/UrlServiceTest.java index 56cb920e..887f58d6 100644 --- a/src/test/java/com/youngurl/shortenerurl/application/UrlServiceTest.java +++ b/src/test/java/com/youngurl/shortenerurl/application/UrlServiceTest.java @@ -1,30 +1,48 @@ package com.youngurl.shortenerurl.application; import com.youngurl.shortenerurl.application.dto.UrlCreateRequest; +import com.youngurl.shortenerurl.infrastructures.UrlJpaRepository; import com.youngurl.shortenerurl.model.EncodingType; +import com.youngurl.shortenerurl.model.Url; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; import org.springframework.transaction.annotation.Transactional; -import static org.junit.jupiter.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) +@ActiveProfiles("test") @Transactional class UrlServiceTest { @Autowired private UrlService urlService; + @Autowired + private UrlJpaRepository urlJpaRepository; + @Test + @DisplayName("originUrl과 EncodingType을 통해 인코딩된 url을 생성할 수 있다.") void createUrl() { //given UrlCreateRequest request = new UrlCreateRequest("test-orgin-url", EncodingType.BASE_62); //when - String response = urlService.createUrl(request); + String encodedUrl = urlService.createUrl(request); //then + Url url = urlJpaRepository.findByEncodedUrl(encodedUrl).get(); + assertThat(url.getOriginUrl()).isEqualTo("test-orgin-url"); + } + + @Test + @DisplayName("") + void findOriginUrl() { + //given } From f3474c285937e2cff998775e2ed726af577f65bc Mon Sep 17 00:00:00 2001 From: young970 Date: Tue, 3 Oct 2023 01:58:56 +0900 Subject: [PATCH 04/29] =?UTF-8?q?Test:=20UrlService.findOriginUrl=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shortenerurl/model/EncodedUrl.java | 1 + .../application/UrlServiceTest.java | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/youngurl/shortenerurl/model/EncodedUrl.java b/src/main/java/com/youngurl/shortenerurl/model/EncodedUrl.java index 760d75ac..af198a7d 100644 --- a/src/main/java/com/youngurl/shortenerurl/model/EncodedUrl.java +++ b/src/main/java/com/youngurl/shortenerurl/model/EncodedUrl.java @@ -23,4 +23,5 @@ public EncodedUrl(String encodedUrl) { this.encodedUrl = encodedUrl; } + } diff --git a/src/test/java/com/youngurl/shortenerurl/application/UrlServiceTest.java b/src/test/java/com/youngurl/shortenerurl/application/UrlServiceTest.java index 887f58d6..6fcefd10 100644 --- a/src/test/java/com/youngurl/shortenerurl/application/UrlServiceTest.java +++ b/src/test/java/com/youngurl/shortenerurl/application/UrlServiceTest.java @@ -5,6 +5,7 @@ import com.youngurl.shortenerurl.model.EncodingType; import com.youngurl.shortenerurl.model.Url; import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -25,6 +26,15 @@ class UrlServiceTest { @Autowired private UrlJpaRepository urlJpaRepository; + private Url setupUrl; + + @BeforeEach + void setup(){ + Url url = new Url("setup-url1", EncodingType.BASE_62); + setupUrl = urlJpaRepository.save(url); + setupUrl.encode(); + } + @Test @DisplayName("originUrl과 EncodingType을 통해 인코딩된 url을 생성할 수 있다.") void createUrl() { @@ -40,10 +50,17 @@ void createUrl() { } @Test - @DisplayName("") + @DisplayName("인코딩된 단축 URL을 통해 원본 URL을 조회할 수 있다.") void findOriginUrl() { //given + String savedEncodedUrl = setupUrl.getEncodedUrl(); + String savedOriginUrl = setupUrl.getOriginUrl(); + //when + String originUrl = urlService.findOriginUrl(savedEncodedUrl); + + //then + assertThat(originUrl).isEqualTo(savedOriginUrl); } } \ No newline at end of file From 1bfd4ddeda6c02a55c465178c30996920d492942 Mon Sep 17 00:00:00 2001 From: young970 Date: Tue, 3 Oct 2023 02:24:32 +0900 Subject: [PATCH 05/29] =?UTF-8?q?Feat:=20Url.getEncodedUrl()=20=EB=A9=94?= =?UTF-8?q?=EC=84=9C=EB=93=9C=20=EA=B0=80=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shortenerurl/ShortenerUrlApplication.java | 2 +- .../shortenerurl/application/UrlService.java | 8 ++++---- .../application/dto/UrlCreateRequest.java | 6 ++++++ .../infrastructures/UrlJpaRepository.java | 4 ++-- .../shortenerurl/infrastructures/UrlRepository.java | 4 ++-- .../infrastructures/UrlRepositoryImpl.java | 4 ++-- .../shortenerurl/model/Base62Encoder.java | 3 +-- .../shortenerurl/model/EncodedUrl.java | 2 +- .../shortenerurl/model/Encoder.java | 2 +- .../shortenerurl/model/EncodingType.java | 2 +- .../{youngurl => young}/shortenerurl/model/Url.java | 8 +++++++- .../shortenerurl/presentation/UrlRestController.java | 10 +++++----- .../shortenerurl/presentation/UrlViewController.java | 2 +- .../presentation/dto/UrlCreateApiRequest.java | 4 ++-- .../presentation/dto/UrlCreateApiResponse.java | 2 +- .../presentation/mapper/UrlApiMapper.java | 6 +++--- .../application/dto/UrlCreateRequest.java | 6 ------ .../shortenerurl/ShortenerUrlApplicationTests.java | 2 +- .../shortenerurl/application/UrlServiceTest.java | 11 +++++------ 19 files changed, 46 insertions(+), 42 deletions(-) rename src/main/java/com/{youngurl => young}/shortenerurl/ShortenerUrlApplication.java (89%) rename src/main/java/com/{youngurl => young}/shortenerurl/application/UrlService.java (80%) create mode 100644 src/main/java/com/young/shortenerurl/application/dto/UrlCreateRequest.java rename src/main/java/com/{youngurl => young}/shortenerurl/infrastructures/UrlJpaRepository.java (82%) rename src/main/java/com/{youngurl => young}/shortenerurl/infrastructures/UrlRepository.java (60%) rename src/main/java/com/{youngurl => young}/shortenerurl/infrastructures/UrlRepositoryImpl.java (85%) rename src/main/java/com/{youngurl => young}/shortenerurl/model/Base62Encoder.java (90%) rename src/main/java/com/{youngurl => young}/shortenerurl/model/EncodedUrl.java (94%) rename src/main/java/com/{youngurl => young}/shortenerurl/model/Encoder.java (69%) rename src/main/java/com/{youngurl => young}/shortenerurl/model/EncodingType.java (88%) rename src/main/java/com/{youngurl => young}/shortenerurl/model/Url.java (88%) rename src/main/java/com/{youngurl => young}/shortenerurl/presentation/UrlRestController.java (84%) rename src/main/java/com/{youngurl => young}/shortenerurl/presentation/UrlViewController.java (83%) rename src/main/java/com/{youngurl => young}/shortenerurl/presentation/dto/UrlCreateApiRequest.java (76%) rename src/main/java/com/{youngurl => young}/shortenerurl/presentation/dto/UrlCreateApiResponse.java (77%) rename src/main/java/com/{youngurl => young}/shortenerurl/presentation/mapper/UrlApiMapper.java (60%) delete mode 100644 src/main/java/com/youngurl/shortenerurl/application/dto/UrlCreateRequest.java rename src/test/java/com/{youngurl => young}/shortenerurl/ShortenerUrlApplicationTests.java (84%) rename src/test/java/com/{youngurl => young}/shortenerurl/application/UrlServiceTest.java (84%) diff --git a/src/main/java/com/youngurl/shortenerurl/ShortenerUrlApplication.java b/src/main/java/com/young/shortenerurl/ShortenerUrlApplication.java similarity index 89% rename from src/main/java/com/youngurl/shortenerurl/ShortenerUrlApplication.java rename to src/main/java/com/young/shortenerurl/ShortenerUrlApplication.java index ac3e4035..fa32d465 100644 --- a/src/main/java/com/youngurl/shortenerurl/ShortenerUrlApplication.java +++ b/src/main/java/com/young/shortenerurl/ShortenerUrlApplication.java @@ -1,4 +1,4 @@ -package com.youngurl.shortenerurl; +package com.young.shortenerurl; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/com/youngurl/shortenerurl/application/UrlService.java b/src/main/java/com/young/shortenerurl/application/UrlService.java similarity index 80% rename from src/main/java/com/youngurl/shortenerurl/application/UrlService.java rename to src/main/java/com/young/shortenerurl/application/UrlService.java index 19ae11a2..a16d0e26 100644 --- a/src/main/java/com/youngurl/shortenerurl/application/UrlService.java +++ b/src/main/java/com/young/shortenerurl/application/UrlService.java @@ -1,8 +1,8 @@ -package com.youngurl.shortenerurl.application; +package com.young.shortenerurl.application; -import com.youngurl.shortenerurl.application.dto.UrlCreateRequest; -import com.youngurl.shortenerurl.infrastructures.UrlRepository; -import com.youngurl.shortenerurl.model.Url; +import com.young.shortenerurl.application.dto.UrlCreateRequest; +import com.young.shortenerurl.infrastructures.UrlRepository; +import com.young.shortenerurl.model.Url; import jakarta.persistence.EntityNotFoundException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/young/shortenerurl/application/dto/UrlCreateRequest.java b/src/main/java/com/young/shortenerurl/application/dto/UrlCreateRequest.java new file mode 100644 index 00000000..8ceccaa8 --- /dev/null +++ b/src/main/java/com/young/shortenerurl/application/dto/UrlCreateRequest.java @@ -0,0 +1,6 @@ +package com.young.shortenerurl.application.dto; + +import com.young.shortenerurl.model.EncodingType; + +public record UrlCreateRequest(String originUrl, EncodingType encodingType) { +} diff --git a/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlJpaRepository.java b/src/main/java/com/young/shortenerurl/infrastructures/UrlJpaRepository.java similarity index 82% rename from src/main/java/com/youngurl/shortenerurl/infrastructures/UrlJpaRepository.java rename to src/main/java/com/young/shortenerurl/infrastructures/UrlJpaRepository.java index 76b8baaa..4f04dc98 100644 --- a/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlJpaRepository.java +++ b/src/main/java/com/young/shortenerurl/infrastructures/UrlJpaRepository.java @@ -1,6 +1,6 @@ -package com.youngurl.shortenerurl.infrastructures; +package com.young.shortenerurl.infrastructures; -import com.youngurl.shortenerurl.model.Url; +import com.young.shortenerurl.model.Url; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlRepository.java b/src/main/java/com/young/shortenerurl/infrastructures/UrlRepository.java similarity index 60% rename from src/main/java/com/youngurl/shortenerurl/infrastructures/UrlRepository.java rename to src/main/java/com/young/shortenerurl/infrastructures/UrlRepository.java index 9d0c25da..a3f51c28 100644 --- a/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlRepository.java +++ b/src/main/java/com/young/shortenerurl/infrastructures/UrlRepository.java @@ -1,6 +1,6 @@ -package com.youngurl.shortenerurl.infrastructures; +package com.young.shortenerurl.infrastructures; -import com.youngurl.shortenerurl.model.Url; +import com.young.shortenerurl.model.Url; import java.util.Optional; diff --git a/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlRepositoryImpl.java b/src/main/java/com/young/shortenerurl/infrastructures/UrlRepositoryImpl.java similarity index 85% rename from src/main/java/com/youngurl/shortenerurl/infrastructures/UrlRepositoryImpl.java rename to src/main/java/com/young/shortenerurl/infrastructures/UrlRepositoryImpl.java index c31f8c57..33343639 100644 --- a/src/main/java/com/youngurl/shortenerurl/infrastructures/UrlRepositoryImpl.java +++ b/src/main/java/com/young/shortenerurl/infrastructures/UrlRepositoryImpl.java @@ -1,6 +1,6 @@ -package com.youngurl.shortenerurl.infrastructures; +package com.young.shortenerurl.infrastructures; -import com.youngurl.shortenerurl.model.Url; +import com.young.shortenerurl.model.Url; import org.springframework.stereotype.Repository; import java.util.Optional; diff --git a/src/main/java/com/youngurl/shortenerurl/model/Base62Encoder.java b/src/main/java/com/young/shortenerurl/model/Base62Encoder.java similarity index 90% rename from src/main/java/com/youngurl/shortenerurl/model/Base62Encoder.java rename to src/main/java/com/young/shortenerurl/model/Base62Encoder.java index 80489385..1affba0c 100644 --- a/src/main/java/com/youngurl/shortenerurl/model/Base62Encoder.java +++ b/src/main/java/com/young/shortenerurl/model/Base62Encoder.java @@ -1,6 +1,5 @@ -package com.youngurl.shortenerurl.model; +package com.young.shortenerurl.model; -import com.youngurl.shortenerurl.model.Encoder; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/com/youngurl/shortenerurl/model/EncodedUrl.java b/src/main/java/com/young/shortenerurl/model/EncodedUrl.java similarity index 94% rename from src/main/java/com/youngurl/shortenerurl/model/EncodedUrl.java rename to src/main/java/com/young/shortenerurl/model/EncodedUrl.java index af198a7d..d9d23697 100644 --- a/src/main/java/com/youngurl/shortenerurl/model/EncodedUrl.java +++ b/src/main/java/com/young/shortenerurl/model/EncodedUrl.java @@ -1,4 +1,4 @@ -package com.youngurl.shortenerurl.model; +package com.young.shortenerurl.model; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; diff --git a/src/main/java/com/youngurl/shortenerurl/model/Encoder.java b/src/main/java/com/young/shortenerurl/model/Encoder.java similarity index 69% rename from src/main/java/com/youngurl/shortenerurl/model/Encoder.java rename to src/main/java/com/young/shortenerurl/model/Encoder.java index 7f52f639..73ad015f 100644 --- a/src/main/java/com/youngurl/shortenerurl/model/Encoder.java +++ b/src/main/java/com/young/shortenerurl/model/Encoder.java @@ -1,4 +1,4 @@ -package com.youngurl.shortenerurl.model; +package com.young.shortenerurl.model; public interface Encoder { String encode(long index); diff --git a/src/main/java/com/youngurl/shortenerurl/model/EncodingType.java b/src/main/java/com/young/shortenerurl/model/EncodingType.java similarity index 88% rename from src/main/java/com/youngurl/shortenerurl/model/EncodingType.java rename to src/main/java/com/young/shortenerurl/model/EncodingType.java index 153fa3d8..9ab88df3 100644 --- a/src/main/java/com/youngurl/shortenerurl/model/EncodingType.java +++ b/src/main/java/com/young/shortenerurl/model/EncodingType.java @@ -1,4 +1,4 @@ -package com.youngurl.shortenerurl.model; +package com.young.shortenerurl.model; import java.util.function.Supplier; diff --git a/src/main/java/com/youngurl/shortenerurl/model/Url.java b/src/main/java/com/young/shortenerurl/model/Url.java similarity index 88% rename from src/main/java/com/youngurl/shortenerurl/model/Url.java rename to src/main/java/com/young/shortenerurl/model/Url.java index a05d92c0..3129caff 100644 --- a/src/main/java/com/youngurl/shortenerurl/model/Url.java +++ b/src/main/java/com/young/shortenerurl/model/Url.java @@ -1,4 +1,4 @@ -package com.youngurl.shortenerurl.model; +package com.young.shortenerurl.model; import jakarta.persistence.Column; import jakarta.persistence.Embedded; @@ -15,6 +15,8 @@ import lombok.NoArgsConstructor; import org.springframework.util.Assert; +import java.util.NoSuchElementException; + @Entity @Table(name = "urls") @Getter @@ -57,6 +59,10 @@ public String encode(){ } public String getEncodedUrl() { + if (encodedUrl == null){ + throw new NoSuchElementException("encodedUrl이 초기화 되어있지 않습니다."); + } + return encodedUrl.getEncodedUrl(); } diff --git a/src/main/java/com/youngurl/shortenerurl/presentation/UrlRestController.java b/src/main/java/com/young/shortenerurl/presentation/UrlRestController.java similarity index 84% rename from src/main/java/com/youngurl/shortenerurl/presentation/UrlRestController.java rename to src/main/java/com/young/shortenerurl/presentation/UrlRestController.java index 3489a5e2..4d842424 100644 --- a/src/main/java/com/youngurl/shortenerurl/presentation/UrlRestController.java +++ b/src/main/java/com/young/shortenerurl/presentation/UrlRestController.java @@ -1,9 +1,9 @@ -package com.youngurl.shortenerurl.presentation; +package com.young.shortenerurl.presentation; -import com.youngurl.shortenerurl.application.UrlService; -import com.youngurl.shortenerurl.presentation.dto.UrlCreateApiRequest; -import com.youngurl.shortenerurl.presentation.dto.UrlCreateApiResponse; -import com.youngurl.shortenerurl.presentation.mapper.UrlApiMapper; +import com.young.shortenerurl.application.UrlService; +import com.young.shortenerurl.presentation.dto.UrlCreateApiRequest; +import com.young.shortenerurl.presentation.dto.UrlCreateApiResponse; +import com.young.shortenerurl.presentation.mapper.UrlApiMapper; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/youngurl/shortenerurl/presentation/UrlViewController.java b/src/main/java/com/young/shortenerurl/presentation/UrlViewController.java similarity index 83% rename from src/main/java/com/youngurl/shortenerurl/presentation/UrlViewController.java rename to src/main/java/com/young/shortenerurl/presentation/UrlViewController.java index 751e26f9..ed2bd8cc 100644 --- a/src/main/java/com/youngurl/shortenerurl/presentation/UrlViewController.java +++ b/src/main/java/com/young/shortenerurl/presentation/UrlViewController.java @@ -1,4 +1,4 @@ -package com.youngurl.shortenerurl.presentation; +package com.young.shortenerurl.presentation; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/youngurl/shortenerurl/presentation/dto/UrlCreateApiRequest.java b/src/main/java/com/young/shortenerurl/presentation/dto/UrlCreateApiRequest.java similarity index 76% rename from src/main/java/com/youngurl/shortenerurl/presentation/dto/UrlCreateApiRequest.java rename to src/main/java/com/young/shortenerurl/presentation/dto/UrlCreateApiRequest.java index 811519e3..d67f45e5 100644 --- a/src/main/java/com/youngurl/shortenerurl/presentation/dto/UrlCreateApiRequest.java +++ b/src/main/java/com/young/shortenerurl/presentation/dto/UrlCreateApiRequest.java @@ -1,6 +1,6 @@ -package com.youngurl.shortenerurl.presentation.dto; +package com.young.shortenerurl.presentation.dto; -import com.youngurl.shortenerurl.model.EncodingType; +import com.young.shortenerurl.model.EncodingType; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/youngurl/shortenerurl/presentation/dto/UrlCreateApiResponse.java b/src/main/java/com/young/shortenerurl/presentation/dto/UrlCreateApiResponse.java similarity index 77% rename from src/main/java/com/youngurl/shortenerurl/presentation/dto/UrlCreateApiResponse.java rename to src/main/java/com/young/shortenerurl/presentation/dto/UrlCreateApiResponse.java index 0c844316..e2e2b813 100644 --- a/src/main/java/com/youngurl/shortenerurl/presentation/dto/UrlCreateApiResponse.java +++ b/src/main/java/com/young/shortenerurl/presentation/dto/UrlCreateApiResponse.java @@ -1,4 +1,4 @@ -package com.youngurl.shortenerurl.presentation.dto; +package com.young.shortenerurl.presentation.dto; public record UrlCreateApiResponse(String encodedUrl) { diff --git a/src/main/java/com/youngurl/shortenerurl/presentation/mapper/UrlApiMapper.java b/src/main/java/com/young/shortenerurl/presentation/mapper/UrlApiMapper.java similarity index 60% rename from src/main/java/com/youngurl/shortenerurl/presentation/mapper/UrlApiMapper.java rename to src/main/java/com/young/shortenerurl/presentation/mapper/UrlApiMapper.java index 3975ddce..adcd708d 100644 --- a/src/main/java/com/youngurl/shortenerurl/presentation/mapper/UrlApiMapper.java +++ b/src/main/java/com/young/shortenerurl/presentation/mapper/UrlApiMapper.java @@ -1,7 +1,7 @@ -package com.youngurl.shortenerurl.presentation.mapper; +package com.young.shortenerurl.presentation.mapper; -import com.youngurl.shortenerurl.application.dto.UrlCreateRequest; -import com.youngurl.shortenerurl.presentation.dto.UrlCreateApiRequest; +import com.young.shortenerurl.application.dto.UrlCreateRequest; +import com.young.shortenerurl.presentation.dto.UrlCreateApiRequest; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/com/youngurl/shortenerurl/application/dto/UrlCreateRequest.java b/src/main/java/com/youngurl/shortenerurl/application/dto/UrlCreateRequest.java deleted file mode 100644 index 43b1e805..00000000 --- a/src/main/java/com/youngurl/shortenerurl/application/dto/UrlCreateRequest.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.youngurl.shortenerurl.application.dto; - -import com.youngurl.shortenerurl.model.EncodingType; - -public record UrlCreateRequest(String originUrl, EncodingType encodingType) { -} diff --git a/src/test/java/com/youngurl/shortenerurl/ShortenerUrlApplicationTests.java b/src/test/java/com/young/shortenerurl/ShortenerUrlApplicationTests.java similarity index 84% rename from src/test/java/com/youngurl/shortenerurl/ShortenerUrlApplicationTests.java rename to src/test/java/com/young/shortenerurl/ShortenerUrlApplicationTests.java index ec5533e2..6be55f62 100644 --- a/src/test/java/com/youngurl/shortenerurl/ShortenerUrlApplicationTests.java +++ b/src/test/java/com/young/shortenerurl/ShortenerUrlApplicationTests.java @@ -1,4 +1,4 @@ -package com.youngurl.shortenerurl; +package com.young.shortenerurl; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/src/test/java/com/youngurl/shortenerurl/application/UrlServiceTest.java b/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java similarity index 84% rename from src/test/java/com/youngurl/shortenerurl/application/UrlServiceTest.java rename to src/test/java/com/young/shortenerurl/application/UrlServiceTest.java index 6fcefd10..dbb7b1b6 100644 --- a/src/test/java/com/youngurl/shortenerurl/application/UrlServiceTest.java +++ b/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java @@ -1,10 +1,9 @@ -package com.youngurl.shortenerurl.application; +package com.young.shortenerurl.application; -import com.youngurl.shortenerurl.application.dto.UrlCreateRequest; -import com.youngurl.shortenerurl.infrastructures.UrlJpaRepository; -import com.youngurl.shortenerurl.model.EncodingType; -import com.youngurl.shortenerurl.model.Url; -import org.assertj.core.api.Assertions; +import com.young.shortenerurl.application.dto.UrlCreateRequest; +import com.young.shortenerurl.infrastructures.UrlJpaRepository; +import com.young.shortenerurl.model.EncodingType; +import com.young.shortenerurl.model.Url; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; From b6e927fa2af4387105ce066839eb42fcd4d6bb6d Mon Sep 17 00:00:00 2001 From: young970 Date: Tue, 3 Oct 2023 02:28:20 +0900 Subject: [PATCH 06/29] =?UTF-8?q?Refactor:=20Url.encode()=20=EB=A9=94?= =?UTF-8?q?=EC=84=9C=EB=93=9C=20=EB=82=B4=EC=9D=98=20=EC=98=88=EC=99=B8=20?= =?UTF-8?q?=EC=A2=85=EB=A5=98=20NoSuchElementException=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/young/shortenerurl/model/Url.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/young/shortenerurl/model/Url.java b/src/main/java/com/young/shortenerurl/model/Url.java index 3129caff..ad905b9b 100644 --- a/src/main/java/com/young/shortenerurl/model/Url.java +++ b/src/main/java/com/young/shortenerurl/model/Url.java @@ -50,7 +50,9 @@ public Url(String originUrl, EncodingType encodingType) { } public String encode(){ - Assert.notNull(this.id, "인코딩은 id값이 null이 아니여야 가능합니다. save를 먼저 하여 id값을 생성해주세요."); + if (id == null){ + throw new NoSuchElementException("인코딩할 id값이 초기화 되어있지 않습니다. save를 먼저 하여 id값을 생성해주세요."); + } String encoded = encoder.encode(this.id); this.encodedUrl = new EncodedUrl(encoded); From 0a99233f357efcedc095691a16334201989e5665 Mon Sep 17 00:00:00 2001 From: young970 Date: Thu, 5 Oct 2023 03:34:53 +0900 Subject: [PATCH 07/29] =?UTF-8?q?Feat=20:=20Url=20=EC=97=94=ED=8B=B0?= =?UTF-8?q?=ED=8B=B0=EC=97=90=20visitCount=EC=BB=AC=EB=9F=BC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/young/shortenerurl/application/UrlService.java | 2 +- src/main/java/com/young/shortenerurl/model/Url.java | 7 ++++++- .../com/young/shortenerurl/application/UrlServiceTest.java | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/young/shortenerurl/application/UrlService.java b/src/main/java/com/young/shortenerurl/application/UrlService.java index a16d0e26..f4e56526 100644 --- a/src/main/java/com/young/shortenerurl/application/UrlService.java +++ b/src/main/java/com/young/shortenerurl/application/UrlService.java @@ -19,7 +19,7 @@ public UrlService(UrlRepository urlRepository) { @Transactional public String createUrl(UrlCreateRequest request) { Url url = urlRepository.save( - new Url(request.originUrl(), request.encodingType()) + new Url(request.originUrl(), request.encodingType(), 0L) ); url.encode(); diff --git a/src/main/java/com/young/shortenerurl/model/Url.java b/src/main/java/com/young/shortenerurl/model/Url.java index ad905b9b..35edff1a 100644 --- a/src/main/java/com/young/shortenerurl/model/Url.java +++ b/src/main/java/com/young/shortenerurl/model/Url.java @@ -33,6 +33,9 @@ public class Url { @Embedded private EncodedUrl encodedUrl; + @Column(nullable = false) + private Long visitCount; + @Enumerated(EnumType.STRING) @Column(nullable = false) private EncodingType encodingType; @@ -40,13 +43,15 @@ public class Url { @Transient private Encoder encoder; - public Url(String originUrl, EncodingType encodingType) { + public Url(String originUrl, EncodingType encodingType, Long visitCount) { Assert.notNull(originUrl, "originUrl은 null값이 들어올 수 없습니다."); Assert.notNull(encodingType, "encodingType은 null값이 들어올 수 없습니다."); + Assert.notNull(visitCount, "visitCount는 null값이 들어올 수 없습니다."); this.originUrl = originUrl; this.encodingType = encodingType; this.encoder = encodingType.getEncoder(); + this.visitCount = visitCount; } public String encode(){ diff --git a/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java b/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java index dbb7b1b6..e755af1a 100644 --- a/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java +++ b/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java @@ -29,7 +29,7 @@ class UrlServiceTest { @BeforeEach void setup(){ - Url url = new Url("setup-url1", EncodingType.BASE_62); + Url url = new Url("setup-url1", EncodingType.BASE_62, 0L); setupUrl = urlJpaRepository.save(url); setupUrl.encode(); } From 154066f0aaea22304e323e36db61adc9f2e435c7 Mon Sep 17 00:00:00 2001 From: young970 Date: Fri, 6 Oct 2023 16:56:33 +0900 Subject: [PATCH 08/29] =?UTF-8?q?Feat:=20url=20=EB=B3=80=ED=99=98=20?= =?UTF-8?q?=EC=95=8C=EA=B3=A0=EB=A6=AC=EC=A6=98=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../young/shortenerurl/model/EncodedUrl.java | 1 + .../com/young/shortenerurl/model/Encoder.java | 7 ------ .../shortenerurl/model/EncodingType.java | 7 +++++- .../com/young/shortenerurl/model/Url.java | 1 + .../model/{ => encoder}/Base62Encoder.java | 19 +++++---------- .../shortenerurl/model/encoder/Encoder.java | 10 ++++++++ .../model/encoder/UrlSafeBase64Encoder.java | 23 +++++++++++++++++++ .../presentation/UrlRestController.java | 12 ++++------ 8 files changed, 51 insertions(+), 29 deletions(-) delete mode 100644 src/main/java/com/young/shortenerurl/model/Encoder.java rename src/main/java/com/young/shortenerurl/model/{ => encoder}/Base62Encoder.java (52%) create mode 100644 src/main/java/com/young/shortenerurl/model/encoder/Encoder.java create mode 100644 src/main/java/com/young/shortenerurl/model/encoder/UrlSafeBase64Encoder.java diff --git a/src/main/java/com/young/shortenerurl/model/EncodedUrl.java b/src/main/java/com/young/shortenerurl/model/EncodedUrl.java index d9d23697..99eff0e7 100644 --- a/src/main/java/com/young/shortenerurl/model/EncodedUrl.java +++ b/src/main/java/com/young/shortenerurl/model/EncodedUrl.java @@ -17,6 +17,7 @@ public class EncodedUrl { public EncodedUrl(String encodedUrl) { Assert.notNull(encodedUrl, "변환된 url은 null이 될 수 없습니다."); + if (encodedUrl.length() > MAX_URL_LENGTH){ throw new IllegalArgumentException("변환된 url의 길이는 8이상 될 수 없습니다."); } diff --git a/src/main/java/com/young/shortenerurl/model/Encoder.java b/src/main/java/com/young/shortenerurl/model/Encoder.java deleted file mode 100644 index 73ad015f..00000000 --- a/src/main/java/com/young/shortenerurl/model/Encoder.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.young.shortenerurl.model; - -public interface Encoder { - String encode(long index); - - long decode(String param); -} diff --git a/src/main/java/com/young/shortenerurl/model/EncodingType.java b/src/main/java/com/young/shortenerurl/model/EncodingType.java index 9ab88df3..72a01f8e 100644 --- a/src/main/java/com/young/shortenerurl/model/EncodingType.java +++ b/src/main/java/com/young/shortenerurl/model/EncodingType.java @@ -1,9 +1,14 @@ package com.young.shortenerurl.model; +import com.young.shortenerurl.model.encoder.Base62Encoder; +import com.young.shortenerurl.model.encoder.Encoder; +import com.young.shortenerurl.model.encoder.UrlSafeBase64Encoder; + import java.util.function.Supplier; public enum EncodingType { - BASE_62(Base62Encoder::new); + BASE_62(Base62Encoder::new), + URL_SAFE_BASE_64(UrlSafeBase64Encoder::new); private final Supplier supplier; diff --git a/src/main/java/com/young/shortenerurl/model/Url.java b/src/main/java/com/young/shortenerurl/model/Url.java index 35edff1a..af617cf7 100644 --- a/src/main/java/com/young/shortenerurl/model/Url.java +++ b/src/main/java/com/young/shortenerurl/model/Url.java @@ -1,5 +1,6 @@ package com.young.shortenerurl.model; +import com.young.shortenerurl.model.encoder.Encoder; import jakarta.persistence.Column; import jakarta.persistence.Embedded; import jakarta.persistence.Entity; diff --git a/src/main/java/com/young/shortenerurl/model/Base62Encoder.java b/src/main/java/com/young/shortenerurl/model/encoder/Base62Encoder.java similarity index 52% rename from src/main/java/com/young/shortenerurl/model/Base62Encoder.java rename to src/main/java/com/young/shortenerurl/model/encoder/Base62Encoder.java index 1affba0c..3841de65 100644 --- a/src/main/java/com/young/shortenerurl/model/Base62Encoder.java +++ b/src/main/java/com/young/shortenerurl/model/encoder/Base62Encoder.java @@ -1,31 +1,24 @@ -package com.young.shortenerurl.model; +package com.young.shortenerurl.model.encoder; import org.springframework.stereotype.Component; @Component -public class Base62Encoder implements Encoder { +public class Base62Encoder extends Encoder { private static final int BASE62 = 62; private static final String BASE62_CHAR = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; @Override public String encode(long index) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); while(index > 0) { sb.append(BASE62_CHAR.charAt((int) (index % BASE62))); index /= BASE62; } - return sb.toString(); - } - @Override - public long decode(String param) { - long sum = 0; - long power = 1; - for (int i = 0; i < param.length(); i++) { - sum += BASE62_CHAR.indexOf(param.charAt(i)) * power; - power *= BASE62; + if (sb.length() > MAX_LENGTH){ + throw new IllegalArgumentException("변환된 url은 8자리를 넘어갈 수 없습니다."); } - return sum; + return sb.toString(); } } diff --git a/src/main/java/com/young/shortenerurl/model/encoder/Encoder.java b/src/main/java/com/young/shortenerurl/model/encoder/Encoder.java new file mode 100644 index 00000000..1e7eb1ab --- /dev/null +++ b/src/main/java/com/young/shortenerurl/model/encoder/Encoder.java @@ -0,0 +1,10 @@ +package com.young.shortenerurl.model.encoder; + +public abstract class Encoder { + protected final Integer MAX_LENGTH = 8; + + protected Encoder() { + } + + public abstract String encode(long index); +} diff --git a/src/main/java/com/young/shortenerurl/model/encoder/UrlSafeBase64Encoder.java b/src/main/java/com/young/shortenerurl/model/encoder/UrlSafeBase64Encoder.java new file mode 100644 index 00000000..4bd451d1 --- /dev/null +++ b/src/main/java/com/young/shortenerurl/model/encoder/UrlSafeBase64Encoder.java @@ -0,0 +1,23 @@ +package com.young.shortenerurl.model.encoder; + +import org.springframework.stereotype.Component; + +@Component +public class UrlSafeBase64Encoder extends Encoder{ + private static final int BASE64 = 64; + private static final String BASE64_CHAR = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-"; + + @Override + public String encode(long index) { + StringBuilder sb = new StringBuilder(); + while(index > 0) { + sb.append(BASE64_CHAR.charAt((int) (index % BASE64))); + index /= BASE64; + } + + if (sb.length() > MAX_LENGTH){ + throw new IllegalArgumentException("변환된 url은 8자리를 넘어갈 수 없습니다."); + } + return sb.toString(); + } +} diff --git a/src/main/java/com/young/shortenerurl/presentation/UrlRestController.java b/src/main/java/com/young/shortenerurl/presentation/UrlRestController.java index 4d842424..2a283477 100644 --- a/src/main/java/com/young/shortenerurl/presentation/UrlRestController.java +++ b/src/main/java/com/young/shortenerurl/presentation/UrlRestController.java @@ -11,17 +11,14 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.net.URI; @RestController +@RequestMapping("/api/urls") public class UrlRestController { - private final String URL_PRE_FIX = "http://localhost:8080/"; + private final String URL_PRE_FIX = "http://localhost:8080/api/urls/"; private final UrlService urlService; private final UrlApiMapper mapper; @@ -31,8 +28,7 @@ public UrlRestController(UrlService urlService, UrlApiMapper mapper) { this.mapper = mapper; } - @PostMapping(value = "/api/urls", - consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity createUrl(@RequestBody @Valid UrlCreateApiRequest request) { String encodedUrl = urlService.createUrl(mapper.toUrlCreateRequest(request)); UrlCreateApiResponse apiResponse = UrlCreateApiResponse.from(URL_PRE_FIX + encodedUrl); From 8bad96ebc09776198d78030b49d0eceb1974920f Mon Sep 17 00:00:00 2001 From: young970 Date: Fri, 6 Oct 2023 18:12:28 +0900 Subject: [PATCH 09/29] =?UTF-8?q?Feat/=20Test:=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EC=8B=9C=20=EB=B0=A9=EB=AC=B8=20=EC=88=98=20=EC=A6=9D=EA=B0=80?= =?UTF-8?q?,=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shortenerurl/application/UrlService.java | 3 ++ .../com/young/shortenerurl/model/Url.java | 4 ++ .../presentation/UrlRestController.java | 2 +- src/main/resources/templates/index.html | 44 ++++++++++++------- .../application/UrlServiceTest.java | 23 ++++++++-- 5 files changed, 57 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/young/shortenerurl/application/UrlService.java b/src/main/java/com/young/shortenerurl/application/UrlService.java index f4e56526..f3ee30c8 100644 --- a/src/main/java/com/young/shortenerurl/application/UrlService.java +++ b/src/main/java/com/young/shortenerurl/application/UrlService.java @@ -26,10 +26,13 @@ public String createUrl(UrlCreateRequest request) { return url.getEncodedUrl(); } + @Transactional public String findOriginUrl(String encodedUrl) { Url url = urlRepository.findByEncodedUrl(encodedUrl) .orElseThrow(() -> new EntityNotFoundException("해당 encodedUrl를 가진 url을 찾을 수 없습니다.")); + url.increaseVisitCount(); + return url.getOriginUrl(); } } diff --git a/src/main/java/com/young/shortenerurl/model/Url.java b/src/main/java/com/young/shortenerurl/model/Url.java index af617cf7..913e595d 100644 --- a/src/main/java/com/young/shortenerurl/model/Url.java +++ b/src/main/java/com/young/shortenerurl/model/Url.java @@ -74,4 +74,8 @@ public String getEncodedUrl() { return encodedUrl.getEncodedUrl(); } + public void increaseVisitCount(){ + visitCount++; + } + } diff --git a/src/main/java/com/young/shortenerurl/presentation/UrlRestController.java b/src/main/java/com/young/shortenerurl/presentation/UrlRestController.java index 2a283477..4d39c348 100644 --- a/src/main/java/com/young/shortenerurl/presentation/UrlRestController.java +++ b/src/main/java/com/young/shortenerurl/presentation/UrlRestController.java @@ -39,7 +39,7 @@ public ResponseEntity createUrl(@RequestBody @Valid UrlCre } @GetMapping("/{encodedUrl}") - public ResponseEntity redirectUrl(@PathVariable @NotBlank String encodedUrl) { + public ResponseEntity redirectUrl(@PathVariable String encodedUrl) { String originUrl = urlService.findOriginUrl(encodedUrl); return ResponseEntity.status(HttpStatus.MOVED_PERMANENTLY) diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 8826ba63..0f6f2db2 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -13,15 +13,15 @@ display: flex; justify-content: center; align-items: center; - height: 100vh; /* vh = viewport height */ + height: 100vh; } .form-container { - width: 50%; /* adjust as needed */ + width: 50%; } .form-container h1 { - margin-bottom: 20px; /* adjust as needed */ + margin-bottom: 20px; } @@ -37,6 +37,7 @@

Shortener URL

@@ -46,19 +47,12 @@

Shortener URL

-
+
+

Shortened URL is :

+ +
- - - - - - - - - - diff --git a/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java b/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java index e755af1a..230cdc81 100644 --- a/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java +++ b/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java @@ -35,8 +35,8 @@ void setup(){ } @Test - @DisplayName("originUrl과 EncodingType을 통해 인코딩된 url을 생성할 수 있다.") - void createUrl() { + @DisplayName("originUrl과 Base62을 통해 인코딩된 url을 생성할 수 있다.") + void createUrl_Base62() { //given UrlCreateRequest request = new UrlCreateRequest("test-orgin-url", EncodingType.BASE_62); @@ -49,7 +49,21 @@ void createUrl() { } @Test - @DisplayName("인코딩된 단축 URL을 통해 원본 URL을 조회할 수 있다.") + @DisplayName("originUrl과 UrlSafeBase64을 통해 인코딩된 url을 생성할 수 있다.") + void createUrl_Base64() { + //given + UrlCreateRequest request = new UrlCreateRequest("test-orgin-url", EncodingType.URL_SAFE_BASE_64); + + //when + String encodedUrl = urlService.createUrl(request); + + //then + Url url = urlJpaRepository.findByEncodedUrl(encodedUrl).get(); + assertThat(url.getOriginUrl()).isEqualTo("test-orgin-url"); + } + + @Test + @DisplayName("인코딩된 단축 URL을 통해 원본 URL을 조회할 수 있으며 조회수는 1씩 증가한다.") void findOriginUrl() { //given String savedEncodedUrl = setupUrl.getEncodedUrl(); @@ -59,7 +73,10 @@ void findOriginUrl() { String originUrl = urlService.findOriginUrl(savedEncodedUrl); //then + Url url = urlJpaRepository.findByEncodedUrl(savedEncodedUrl).get(); + assertThat(originUrl).isEqualTo(savedOriginUrl); + assertThat(url.getVisitCount()).isEqualTo(1); } } \ No newline at end of file From f5e88a446f0edc9ea122177ea2e68c9c6339a910 Mon Sep 17 00:00:00 2001 From: young970 Date: Fri, 6 Oct 2023 23:39:25 +0900 Subject: [PATCH 10/29] =?UTF-8?q?Feat:=20ExceptionHandler=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shortenerurl/application/UrlService.java | 11 ++- .../dto/UrlVisitCountFindResponse.java | 15 ++++ .../shortenerurl/global/ErrorResponse.java | 17 +++++ .../global/GlobalApiExceptionHandler.java | 68 +++++++++++++++++++ .../infrastructures/UrlRepository.java | 6 ++ .../presentation/UrlRestController.java | 18 ++++- .../dto/UrlVisitCountFindApiResponse.java | 15 ++++ .../application/UrlServiceTest.java | 17 +++++ 8 files changed, 162 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/young/shortenerurl/application/dto/UrlVisitCountFindResponse.java create mode 100644 src/main/java/com/young/shortenerurl/global/ErrorResponse.java create mode 100644 src/main/java/com/young/shortenerurl/global/GlobalApiExceptionHandler.java create mode 100644 src/main/java/com/young/shortenerurl/presentation/dto/UrlVisitCountFindApiResponse.java diff --git a/src/main/java/com/young/shortenerurl/application/UrlService.java b/src/main/java/com/young/shortenerurl/application/UrlService.java index f3ee30c8..81b3cab7 100644 --- a/src/main/java/com/young/shortenerurl/application/UrlService.java +++ b/src/main/java/com/young/shortenerurl/application/UrlService.java @@ -1,6 +1,7 @@ package com.young.shortenerurl.application; import com.young.shortenerurl.application.dto.UrlCreateRequest; +import com.young.shortenerurl.application.dto.UrlVisitCountFindResponse; import com.young.shortenerurl.infrastructures.UrlRepository; import com.young.shortenerurl.model.Url; import jakarta.persistence.EntityNotFoundException; @@ -28,11 +29,17 @@ public String createUrl(UrlCreateRequest request) { @Transactional public String findOriginUrl(String encodedUrl) { - Url url = urlRepository.findByEncodedUrl(encodedUrl) - .orElseThrow(() -> new EntityNotFoundException("해당 encodedUrl를 가진 url을 찾을 수 없습니다.")); + Url url = urlRepository.getByEncodedUrl(encodedUrl); url.increaseVisitCount(); return url.getOriginUrl(); } + + @Transactional(readOnly = true) + public UrlVisitCountFindResponse findUrlVisitCount(String encodedUrl) { + Url findUrl = urlRepository.getByEncodedUrl(encodedUrl); + + return UrlVisitCountFindResponse.from(findUrl); + } } diff --git a/src/main/java/com/young/shortenerurl/application/dto/UrlVisitCountFindResponse.java b/src/main/java/com/young/shortenerurl/application/dto/UrlVisitCountFindResponse.java new file mode 100644 index 00000000..9cbd851e --- /dev/null +++ b/src/main/java/com/young/shortenerurl/application/dto/UrlVisitCountFindResponse.java @@ -0,0 +1,15 @@ +package com.young.shortenerurl.application.dto; + +import com.young.shortenerurl.model.Url; + +public record UrlVisitCountFindResponse( + String originUrl, + String encodedUrl, + Long visitCount) { + public static UrlVisitCountFindResponse from(Url url) { + return new UrlVisitCountFindResponse( + url.getOriginUrl(), + url.getEncodedUrl(), + url.getVisitCount()); + } +} diff --git a/src/main/java/com/young/shortenerurl/global/ErrorResponse.java b/src/main/java/com/young/shortenerurl/global/ErrorResponse.java new file mode 100644 index 00000000..6d389139 --- /dev/null +++ b/src/main/java/com/young/shortenerurl/global/ErrorResponse.java @@ -0,0 +1,17 @@ +package com.young.shortenerurl.global; + +import java.time.LocalDateTime; + +public record ErrorResponse( + String detail, + String instance, + String time) { + public static ErrorResponse of( + String detail, + String instance) { + return new ErrorResponse( + detail, + instance, + LocalDateTime.now().toString()); + } +} diff --git a/src/main/java/com/young/shortenerurl/global/GlobalApiExceptionHandler.java b/src/main/java/com/young/shortenerurl/global/GlobalApiExceptionHandler.java new file mode 100644 index 00000000..d5c735dc --- /dev/null +++ b/src/main/java/com/young/shortenerurl/global/GlobalApiExceptionHandler.java @@ -0,0 +1,68 @@ +package com.young.shortenerurl.global; + +import jakarta.persistence.EntityNotFoundException; +import jakarta.servlet.http.HttpServletRequest; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindException; +import org.springframework.validation.BindingResult; +import org.springframework.validation.FieldError; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +import java.util.NoSuchElementException; + +@RestControllerAdvice +@Slf4j +public class GlobalApiExceptionHandler { + + @ExceptionHandler(BindException.class) + public ResponseEntity handleBindException(HttpServletRequest request, BindException e) { + StringBuilder detailMessage = getDetailMessage(e); + ErrorResponse errorResponse = ErrorResponse.of(detailMessage.toString(), request.getRequestURI()); + + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(errorResponse); + } + + @ExceptionHandler(IllegalArgumentException.class) + public ResponseEntity handleIllegalArgumentException(HttpServletRequest request, IllegalArgumentException e){ + ErrorResponse errorResponse = ErrorResponse.of(e.getMessage(), request.getRequestURI()); + + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(errorResponse); + } + + @ExceptionHandler(EntityNotFoundException.class) + public ResponseEntity handleEntityNotFoundException(HttpServletRequest request, EntityNotFoundException e){ + ErrorResponse errorResponse = ErrorResponse.of(e.getMessage(), request.getRequestURI()); + + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(errorResponse); + } + + @ExceptionHandler(NoSuchElementException.class) + public ResponseEntity handleNoSuchElementException(HttpServletRequest request, NoSuchElementException e){ + log.error("Sever Exception Request URI {}: ", request.getRequestURI(), e); + + return ResponseEntity.internalServerError().build(); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity handleException(HttpServletRequest request, Exception e){ + log.error("Sever Exception Request URI {}: ", request.getRequestURI(), e); + + return ResponseEntity.internalServerError().build(); + } + + private static StringBuilder getDetailMessage(BindException e) { + BindingResult bindingResult = e.getBindingResult(); + StringBuilder stringBuilder = new StringBuilder(); + + for (FieldError fieldError : bindingResult.getFieldErrors()) { + stringBuilder.append(fieldError.getField()).append(":"); + stringBuilder.append(fieldError.getDefaultMessage()); + stringBuilder.append(", "); + } + return stringBuilder; + } + +} diff --git a/src/main/java/com/young/shortenerurl/infrastructures/UrlRepository.java b/src/main/java/com/young/shortenerurl/infrastructures/UrlRepository.java index a3f51c28..2305f998 100644 --- a/src/main/java/com/young/shortenerurl/infrastructures/UrlRepository.java +++ b/src/main/java/com/young/shortenerurl/infrastructures/UrlRepository.java @@ -1,6 +1,7 @@ package com.young.shortenerurl.infrastructures; import com.young.shortenerurl.model.Url; +import jakarta.persistence.EntityNotFoundException; import java.util.Optional; @@ -8,4 +9,9 @@ public interface UrlRepository { Url save(Url url); Optional findByEncodedUrl(String encodedUrl); + + default Url getByEncodedUrl(String encodedUrl){ + return findByEncodedUrl(encodedUrl) + .orElseThrow(() -> new EntityNotFoundException("해당 encodedUrl를 가진 url을 찾을 수 없습니다.")); + } } diff --git a/src/main/java/com/young/shortenerurl/presentation/UrlRestController.java b/src/main/java/com/young/shortenerurl/presentation/UrlRestController.java index 4d39c348..cf771a61 100644 --- a/src/main/java/com/young/shortenerurl/presentation/UrlRestController.java +++ b/src/main/java/com/young/shortenerurl/presentation/UrlRestController.java @@ -1,12 +1,13 @@ package com.young.shortenerurl.presentation; import com.young.shortenerurl.application.UrlService; +import com.young.shortenerurl.application.dto.UrlVisitCountFindResponse; import com.young.shortenerurl.presentation.dto.UrlCreateApiRequest; import com.young.shortenerurl.presentation.dto.UrlCreateApiResponse; +import com.young.shortenerurl.presentation.dto.UrlVisitCountFindApiResponse; import com.young.shortenerurl.presentation.mapper.UrlApiMapper; import jakarta.validation.Valid; -import jakarta.validation.constraints.NotBlank; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -18,7 +19,7 @@ @RestController @RequestMapping("/api/urls") public class UrlRestController { - private final String URL_PRE_FIX = "http://localhost:8080/api/urls/"; + private static final String URL_PRE_FIX = "http://localhost:8080/api/urls/"; private final UrlService urlService; private final UrlApiMapper mapper; @@ -38,7 +39,7 @@ public ResponseEntity createUrl(@RequestBody @Valid UrlCre .body(apiResponse); } - @GetMapping("/{encodedUrl}") + @GetMapping(value = "/{encodedUrl}") public ResponseEntity redirectUrl(@PathVariable String encodedUrl) { String originUrl = urlService.findOriginUrl(encodedUrl); @@ -47,4 +48,15 @@ public ResponseEntity redirectUrl(@PathVariable String encodedUrl) { .build(); } + @GetMapping( + value = "/visitCount/{encodedUrl}", + produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity findUrlVisitCount(@PathVariable String encodedUrl) { + UrlVisitCountFindResponse response = urlService.findUrlVisitCount(encodedUrl); + + UrlVisitCountFindApiResponse apiResponse = UrlVisitCountFindApiResponse.of(response, URL_PRE_FIX); + + return ResponseEntity.ok(apiResponse); + } + } diff --git a/src/main/java/com/young/shortenerurl/presentation/dto/UrlVisitCountFindApiResponse.java b/src/main/java/com/young/shortenerurl/presentation/dto/UrlVisitCountFindApiResponse.java new file mode 100644 index 00000000..f33dc2fd --- /dev/null +++ b/src/main/java/com/young/shortenerurl/presentation/dto/UrlVisitCountFindApiResponse.java @@ -0,0 +1,15 @@ +package com.young.shortenerurl.presentation.dto; + +import com.young.shortenerurl.application.dto.UrlVisitCountFindResponse; + +public record UrlVisitCountFindApiResponse( + String originUrl, + String encodedUrl, + Long visitCount) { + public static UrlVisitCountFindApiResponse of(UrlVisitCountFindResponse response, String urlPreFix) { + return new UrlVisitCountFindApiResponse( + response.originUrl(), + urlPreFix + response.encodedUrl(), + response.visitCount()); + } +} diff --git a/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java b/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java index 230cdc81..c15a47ee 100644 --- a/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java +++ b/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java @@ -1,6 +1,7 @@ package com.young.shortenerurl.application; import com.young.shortenerurl.application.dto.UrlCreateRequest; +import com.young.shortenerurl.application.dto.UrlVisitCountFindResponse; import com.young.shortenerurl.infrastructures.UrlJpaRepository; import com.young.shortenerurl.model.EncodingType; import com.young.shortenerurl.model.Url; @@ -79,4 +80,20 @@ void findOriginUrl() { assertThat(url.getVisitCount()).isEqualTo(1); } + @Test + @DisplayName("인코딩된 단축 URL을 통해 해당 URL의 방문 수를 확인할 수 있다.") + void findUrlVisitCount(){ + //given + urlService.findOriginUrl(setupUrl.getEncodedUrl()); + urlService.findOriginUrl(setupUrl.getEncodedUrl()); + + //when + UrlVisitCountFindResponse response = urlService.findUrlVisitCount(setupUrl.getEncodedUrl()); + + //then + assertThat(response.originUrl()).isEqualTo(setupUrl.getOriginUrl()); + assertThat(response.encodedUrl()).isEqualTo(setupUrl.getEncodedUrl()); + assertThat(response.visitCount()).isEqualTo(2); + } + } \ No newline at end of file From 5078133debaa1ddf2599f2572dc0d87086bab6b6 Mon Sep 17 00:00:00 2001 From: young970 Date: Sat, 7 Oct 2023 00:35:29 +0900 Subject: [PATCH 11/29] =?UTF-8?q?Feat:=20Url=20=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20HTML=20=EC=BD=94=EB=93=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/index.html | 30 +++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 0f6f2db2..51382058 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -50,8 +50,21 @@

Shortener URL

Shortened URL is :

+ +
+

Find Shortened URL INFO

+
+
+ + + +
+

Original URL is :

+

Encoded URL is :

+

Visit count is :

+ From 498ebfc178b10b946a58b5840cec7f7a01552768 Mon Sep 17 00:00:00 2001 From: young970 Date: Sat, 7 Oct 2023 00:39:58 +0900 Subject: [PATCH 12/29] =?UTF-8?q?Refactor:=20Url=20=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EB=84=A4?= =?UTF-8?q?=EC=9D=B4=EB=B0=8D=20findUrlInfo=EC=9C=BC=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shortenerurl/application/UrlService.java | 7 +++---- ...FindResponse.java => UrlInfoFindResponse.java} | 6 +++--- .../presentation/UrlRestController.java | 10 +++++----- .../presentation/dto/UrlInfoFindApiResponse.java | 15 +++++++++++++++ .../dto/UrlVisitCountFindApiResponse.java | 15 --------------- .../shortenerurl/application/UrlServiceTest.java | 4 ++-- 6 files changed, 28 insertions(+), 29 deletions(-) rename src/main/java/com/young/shortenerurl/application/dto/{UrlVisitCountFindResponse.java => UrlInfoFindResponse.java} (66%) create mode 100644 src/main/java/com/young/shortenerurl/presentation/dto/UrlInfoFindApiResponse.java delete mode 100644 src/main/java/com/young/shortenerurl/presentation/dto/UrlVisitCountFindApiResponse.java diff --git a/src/main/java/com/young/shortenerurl/application/UrlService.java b/src/main/java/com/young/shortenerurl/application/UrlService.java index 81b3cab7..a09c63a5 100644 --- a/src/main/java/com/young/shortenerurl/application/UrlService.java +++ b/src/main/java/com/young/shortenerurl/application/UrlService.java @@ -1,10 +1,9 @@ package com.young.shortenerurl.application; import com.young.shortenerurl.application.dto.UrlCreateRequest; -import com.young.shortenerurl.application.dto.UrlVisitCountFindResponse; +import com.young.shortenerurl.application.dto.UrlInfoFindResponse; import com.young.shortenerurl.infrastructures.UrlRepository; import com.young.shortenerurl.model.Url; -import jakarta.persistence.EntityNotFoundException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -37,9 +36,9 @@ public String findOriginUrl(String encodedUrl) { } @Transactional(readOnly = true) - public UrlVisitCountFindResponse findUrlVisitCount(String encodedUrl) { + public UrlInfoFindResponse findUrlInfo(String encodedUrl) { Url findUrl = urlRepository.getByEncodedUrl(encodedUrl); - return UrlVisitCountFindResponse.from(findUrl); + return UrlInfoFindResponse.from(findUrl); } } diff --git a/src/main/java/com/young/shortenerurl/application/dto/UrlVisitCountFindResponse.java b/src/main/java/com/young/shortenerurl/application/dto/UrlInfoFindResponse.java similarity index 66% rename from src/main/java/com/young/shortenerurl/application/dto/UrlVisitCountFindResponse.java rename to src/main/java/com/young/shortenerurl/application/dto/UrlInfoFindResponse.java index 9cbd851e..2ab98dd2 100644 --- a/src/main/java/com/young/shortenerurl/application/dto/UrlVisitCountFindResponse.java +++ b/src/main/java/com/young/shortenerurl/application/dto/UrlInfoFindResponse.java @@ -2,12 +2,12 @@ import com.young.shortenerurl.model.Url; -public record UrlVisitCountFindResponse( +public record UrlInfoFindResponse( String originUrl, String encodedUrl, Long visitCount) { - public static UrlVisitCountFindResponse from(Url url) { - return new UrlVisitCountFindResponse( + public static UrlInfoFindResponse from(Url url) { + return new UrlInfoFindResponse( url.getOriginUrl(), url.getEncodedUrl(), url.getVisitCount()); diff --git a/src/main/java/com/young/shortenerurl/presentation/UrlRestController.java b/src/main/java/com/young/shortenerurl/presentation/UrlRestController.java index cf771a61..c7d9125f 100644 --- a/src/main/java/com/young/shortenerurl/presentation/UrlRestController.java +++ b/src/main/java/com/young/shortenerurl/presentation/UrlRestController.java @@ -1,10 +1,10 @@ package com.young.shortenerurl.presentation; import com.young.shortenerurl.application.UrlService; -import com.young.shortenerurl.application.dto.UrlVisitCountFindResponse; +import com.young.shortenerurl.application.dto.UrlInfoFindResponse; import com.young.shortenerurl.presentation.dto.UrlCreateApiRequest; import com.young.shortenerurl.presentation.dto.UrlCreateApiResponse; -import com.young.shortenerurl.presentation.dto.UrlVisitCountFindApiResponse; +import com.young.shortenerurl.presentation.dto.UrlInfoFindApiResponse; import com.young.shortenerurl.presentation.mapper.UrlApiMapper; import jakarta.validation.Valid; @@ -51,10 +51,10 @@ public ResponseEntity redirectUrl(@PathVariable String encodedUrl) { @GetMapping( value = "/visitCount/{encodedUrl}", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity findUrlVisitCount(@PathVariable String encodedUrl) { - UrlVisitCountFindResponse response = urlService.findUrlVisitCount(encodedUrl); + public ResponseEntity findUrlInfo(@PathVariable String encodedUrl) { + UrlInfoFindResponse response = urlService.findUrlInfo(encodedUrl); - UrlVisitCountFindApiResponse apiResponse = UrlVisitCountFindApiResponse.of(response, URL_PRE_FIX); + UrlInfoFindApiResponse apiResponse = UrlInfoFindApiResponse.of(response, URL_PRE_FIX); return ResponseEntity.ok(apiResponse); } diff --git a/src/main/java/com/young/shortenerurl/presentation/dto/UrlInfoFindApiResponse.java b/src/main/java/com/young/shortenerurl/presentation/dto/UrlInfoFindApiResponse.java new file mode 100644 index 00000000..c2b1b048 --- /dev/null +++ b/src/main/java/com/young/shortenerurl/presentation/dto/UrlInfoFindApiResponse.java @@ -0,0 +1,15 @@ +package com.young.shortenerurl.presentation.dto; + +import com.young.shortenerurl.application.dto.UrlInfoFindResponse; + +public record UrlInfoFindApiResponse( + String originUrl, + String encodedUrl, + Long visitCount) { + public static UrlInfoFindApiResponse of(UrlInfoFindResponse response, String urlPreFix) { + return new UrlInfoFindApiResponse( + response.originUrl(), + urlPreFix + response.encodedUrl(), + response.visitCount()); + } +} diff --git a/src/main/java/com/young/shortenerurl/presentation/dto/UrlVisitCountFindApiResponse.java b/src/main/java/com/young/shortenerurl/presentation/dto/UrlVisitCountFindApiResponse.java deleted file mode 100644 index f33dc2fd..00000000 --- a/src/main/java/com/young/shortenerurl/presentation/dto/UrlVisitCountFindApiResponse.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.young.shortenerurl.presentation.dto; - -import com.young.shortenerurl.application.dto.UrlVisitCountFindResponse; - -public record UrlVisitCountFindApiResponse( - String originUrl, - String encodedUrl, - Long visitCount) { - public static UrlVisitCountFindApiResponse of(UrlVisitCountFindResponse response, String urlPreFix) { - return new UrlVisitCountFindApiResponse( - response.originUrl(), - urlPreFix + response.encodedUrl(), - response.visitCount()); - } -} diff --git a/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java b/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java index c15a47ee..5d04fa83 100644 --- a/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java +++ b/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java @@ -1,7 +1,7 @@ package com.young.shortenerurl.application; import com.young.shortenerurl.application.dto.UrlCreateRequest; -import com.young.shortenerurl.application.dto.UrlVisitCountFindResponse; +import com.young.shortenerurl.application.dto.UrlInfoFindResponse; import com.young.shortenerurl.infrastructures.UrlJpaRepository; import com.young.shortenerurl.model.EncodingType; import com.young.shortenerurl.model.Url; @@ -88,7 +88,7 @@ void findUrlVisitCount(){ urlService.findOriginUrl(setupUrl.getEncodedUrl()); //when - UrlVisitCountFindResponse response = urlService.findUrlVisitCount(setupUrl.getEncodedUrl()); + UrlInfoFindResponse response = urlService.findUrlInfo(setupUrl.getEncodedUrl()); //then assertThat(response.originUrl()).isEqualTo(setupUrl.getOriginUrl()); From 48d976545050e75a26244aa45778b84f1b790714 Mon Sep 17 00:00:00 2001 From: young970 Date: Sat, 7 Oct 2023 18:14:36 +0900 Subject: [PATCH 13/29] =?UTF-8?q?Refactor:=20encodedUrl=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20=EC=8B=9C=20PK=EB=A5=BC=20=EC=9D=B4=EC=9A=A9?= =?UTF-8?q?=ED=95=9C=20=EB=B0=A9=EC=8B=9D=EC=97=90=EC=84=9C=20=EC=99=B8?= =?UTF-8?q?=EB=B6=80=EC=9D=98=20=EC=9C=A0=EB=8B=88=ED=81=AC=20=ED=82=A4?= =?UTF-8?q?=EA=B0=92=EC=9D=84=20=EB=B0=9B=EC=95=84=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=B0=A9=EC=8B=9D=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + 인코딩 로직 도메인에서 애플리케이션 레이어로 이동 --- .../shortenerurl/application/UrlService.java | 44 ---------- .../application/dto/UrlCreateRequest.java | 6 -- .../global/generator/Sequence.java | 21 +++++ .../global/generator/SequenceRepository.java | 6 ++ .../generator/SequenceUniqueKeyGenerator.java | 20 +++++ .../global/generator/UniqueKeyGenerator.java | 6 ++ .../young/shortenerurl/model/EncodedUrl.java | 28 ------- .../shortenerurl/model/EncodingType.java | 23 ------ .../com/young/shortenerurl/model/Url.java | 81 ------------------- .../url/application/UrlService.java | 57 +++++++++++++ .../url/application/dto/UrlCreateRequest.java | 6 ++ .../application/dto/UrlInfoFindResponse.java | 4 +- .../infrastructures/UrlJpaRepository.java | 5 +- .../infrastructures/UrlRepository.java | 6 +- .../infrastructures/UrlRepositoryImpl.java | 9 ++- .../shortenerurl/url/model/EncodedUrl.java | 47 +++++++++++ .../shortenerurl/url/model/EncodingType.java | 23 ++++++ .../com/young/shortenerurl/url/model/Url.java | 51 ++++++++++++ .../presentation/UrlRestController.java | 16 ++-- .../presentation/UrlViewController.java | 2 +- .../presentation/dto/UrlCreateApiRequest.java | 4 +- .../dto/UrlCreateApiResponse.java | 2 +- .../dto/UrlInfoFindApiResponse.java | 4 +- .../presentation/mapper/UrlApiMapper.java | 6 +- .../util/Base64EncoderV1.java} | 4 +- .../util/Base64EncoderV2.java} | 8 +- .../{model/encoder => url/util}/Encoder.java | 2 +- src/main/resources/templates/index.html | 4 +- .../application/UrlServiceTest.java | 27 ++++--- 29 files changed, 297 insertions(+), 225 deletions(-) delete mode 100644 src/main/java/com/young/shortenerurl/application/UrlService.java delete mode 100644 src/main/java/com/young/shortenerurl/application/dto/UrlCreateRequest.java create mode 100644 src/main/java/com/young/shortenerurl/global/generator/Sequence.java create mode 100644 src/main/java/com/young/shortenerurl/global/generator/SequenceRepository.java create mode 100644 src/main/java/com/young/shortenerurl/global/generator/SequenceUniqueKeyGenerator.java create mode 100644 src/main/java/com/young/shortenerurl/global/generator/UniqueKeyGenerator.java delete mode 100644 src/main/java/com/young/shortenerurl/model/EncodedUrl.java delete mode 100644 src/main/java/com/young/shortenerurl/model/EncodingType.java delete mode 100644 src/main/java/com/young/shortenerurl/model/Url.java create mode 100644 src/main/java/com/young/shortenerurl/url/application/UrlService.java create mode 100644 src/main/java/com/young/shortenerurl/url/application/dto/UrlCreateRequest.java rename src/main/java/com/young/shortenerurl/{ => url}/application/dto/UrlInfoFindResponse.java (77%) rename src/main/java/com/young/shortenerurl/{ => url}/infrastructures/UrlJpaRepository.java (74%) rename src/main/java/com/young/shortenerurl/{ => url}/infrastructures/UrlRepository.java (73%) rename src/main/java/com/young/shortenerurl/{ => url}/infrastructures/UrlRepositoryImpl.java (70%) create mode 100644 src/main/java/com/young/shortenerurl/url/model/EncodedUrl.java create mode 100644 src/main/java/com/young/shortenerurl/url/model/EncodingType.java create mode 100644 src/main/java/com/young/shortenerurl/url/model/Url.java rename src/main/java/com/young/shortenerurl/{ => url}/presentation/UrlRestController.java (80%) rename src/main/java/com/young/shortenerurl/{ => url}/presentation/UrlViewController.java (83%) rename src/main/java/com/young/shortenerurl/{ => url}/presentation/dto/UrlCreateApiRequest.java (76%) rename src/main/java/com/young/shortenerurl/{ => url}/presentation/dto/UrlCreateApiResponse.java (77%) rename src/main/java/com/young/shortenerurl/{ => url}/presentation/dto/UrlInfoFindApiResponse.java (76%) rename src/main/java/com/young/shortenerurl/{ => url}/presentation/mapper/UrlApiMapper.java (60%) rename src/main/java/com/young/shortenerurl/{model/encoder/UrlSafeBase64Encoder.java => url/util/Base64EncoderV1.java} (86%) rename src/main/java/com/young/shortenerurl/{model/encoder/Base62Encoder.java => url/util/Base64EncoderV2.java} (75%) rename src/main/java/com/young/shortenerurl/{model/encoder => url/util}/Encoder.java (77%) diff --git a/src/main/java/com/young/shortenerurl/application/UrlService.java b/src/main/java/com/young/shortenerurl/application/UrlService.java deleted file mode 100644 index a09c63a5..00000000 --- a/src/main/java/com/young/shortenerurl/application/UrlService.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.young.shortenerurl.application; - -import com.young.shortenerurl.application.dto.UrlCreateRequest; -import com.young.shortenerurl.application.dto.UrlInfoFindResponse; -import com.young.shortenerurl.infrastructures.UrlRepository; -import com.young.shortenerurl.model.Url; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -public class UrlService { - - private final UrlRepository urlRepository; - - public UrlService(UrlRepository urlRepository) { - this.urlRepository = urlRepository; - } - - @Transactional - public String createUrl(UrlCreateRequest request) { - Url url = urlRepository.save( - new Url(request.originUrl(), request.encodingType(), 0L) - ); - - url.encode(); - return url.getEncodedUrl(); - } - - @Transactional - public String findOriginUrl(String encodedUrl) { - Url url = urlRepository.getByEncodedUrl(encodedUrl); - - url.increaseVisitCount(); - - return url.getOriginUrl(); - } - - @Transactional(readOnly = true) - public UrlInfoFindResponse findUrlInfo(String encodedUrl) { - Url findUrl = urlRepository.getByEncodedUrl(encodedUrl); - - return UrlInfoFindResponse.from(findUrl); - } -} diff --git a/src/main/java/com/young/shortenerurl/application/dto/UrlCreateRequest.java b/src/main/java/com/young/shortenerurl/application/dto/UrlCreateRequest.java deleted file mode 100644 index 8ceccaa8..00000000 --- a/src/main/java/com/young/shortenerurl/application/dto/UrlCreateRequest.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.young.shortenerurl.application.dto; - -import com.young.shortenerurl.model.EncodingType; - -public record UrlCreateRequest(String originUrl, EncodingType encodingType) { -} diff --git a/src/main/java/com/young/shortenerurl/global/generator/Sequence.java b/src/main/java/com/young/shortenerurl/global/generator/Sequence.java new file mode 100644 index 00000000..79f6fd87 --- /dev/null +++ b/src/main/java/com/young/shortenerurl/global/generator/Sequence.java @@ -0,0 +1,21 @@ +package com.young.shortenerurl.global.generator; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Table(name = "sequence") +@Getter +@NoArgsConstructor +public class Sequence { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + +} diff --git a/src/main/java/com/young/shortenerurl/global/generator/SequenceRepository.java b/src/main/java/com/young/shortenerurl/global/generator/SequenceRepository.java new file mode 100644 index 00000000..2ddb5e52 --- /dev/null +++ b/src/main/java/com/young/shortenerurl/global/generator/SequenceRepository.java @@ -0,0 +1,6 @@ +package com.young.shortenerurl.global.generator; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface SequenceRepository extends JpaRepository { +} diff --git a/src/main/java/com/young/shortenerurl/global/generator/SequenceUniqueKeyGenerator.java b/src/main/java/com/young/shortenerurl/global/generator/SequenceUniqueKeyGenerator.java new file mode 100644 index 00000000..c39c23cc --- /dev/null +++ b/src/main/java/com/young/shortenerurl/global/generator/SequenceUniqueKeyGenerator.java @@ -0,0 +1,20 @@ +package com.young.shortenerurl.global.generator; + +import org.springframework.stereotype.Component; + +@Component +public class SequenceUniqueKeyGenerator implements UniqueKeyGenerator{ + + private final SequenceRepository sequenceRepository; + + public SequenceUniqueKeyGenerator(SequenceRepository sequenceRepository) { + this.sequenceRepository = sequenceRepository; + } + + @Override + public Long generateKey() { + return sequenceRepository.save(new Sequence()) + .getId(); + } + +} diff --git a/src/main/java/com/young/shortenerurl/global/generator/UniqueKeyGenerator.java b/src/main/java/com/young/shortenerurl/global/generator/UniqueKeyGenerator.java new file mode 100644 index 00000000..bf9d29fa --- /dev/null +++ b/src/main/java/com/young/shortenerurl/global/generator/UniqueKeyGenerator.java @@ -0,0 +1,6 @@ +package com.young.shortenerurl.global.generator; + +public interface UniqueKeyGenerator { + + Long generateKey(); +} diff --git a/src/main/java/com/young/shortenerurl/model/EncodedUrl.java b/src/main/java/com/young/shortenerurl/model/EncodedUrl.java deleted file mode 100644 index 99eff0e7..00000000 --- a/src/main/java/com/young/shortenerurl/model/EncodedUrl.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.young.shortenerurl.model; - -import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; -import lombok.Getter; -import lombok.NoArgsConstructor; -import org.springframework.util.Assert; - -@Getter -@Embeddable -@NoArgsConstructor -public class EncodedUrl { - private static final int MAX_URL_LENGTH = 8; - - @Column - private String encodedUrl; - - public EncodedUrl(String encodedUrl) { - Assert.notNull(encodedUrl, "변환된 url은 null이 될 수 없습니다."); - - if (encodedUrl.length() > MAX_URL_LENGTH){ - throw new IllegalArgumentException("변환된 url의 길이는 8이상 될 수 없습니다."); - } - - this.encodedUrl = encodedUrl; - } - -} diff --git a/src/main/java/com/young/shortenerurl/model/EncodingType.java b/src/main/java/com/young/shortenerurl/model/EncodingType.java deleted file mode 100644 index 72a01f8e..00000000 --- a/src/main/java/com/young/shortenerurl/model/EncodingType.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.young.shortenerurl.model; - -import com.young.shortenerurl.model.encoder.Base62Encoder; -import com.young.shortenerurl.model.encoder.Encoder; -import com.young.shortenerurl.model.encoder.UrlSafeBase64Encoder; - -import java.util.function.Supplier; - -public enum EncodingType { - BASE_62(Base62Encoder::new), - URL_SAFE_BASE_64(UrlSafeBase64Encoder::new); - - private final Supplier supplier; - - EncodingType(Supplier supplier) { - this.supplier = supplier; - } - - public Encoder getEncoder(){ - return supplier.get(); - } - -} diff --git a/src/main/java/com/young/shortenerurl/model/Url.java b/src/main/java/com/young/shortenerurl/model/Url.java deleted file mode 100644 index 913e595d..00000000 --- a/src/main/java/com/young/shortenerurl/model/Url.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.young.shortenerurl.model; - -import com.young.shortenerurl.model.encoder.Encoder; -import jakarta.persistence.Column; -import jakarta.persistence.Embedded; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import jakarta.persistence.Transient; -import lombok.AccessLevel; -import lombok.Getter; -import lombok.NoArgsConstructor; -import org.springframework.util.Assert; - -import java.util.NoSuchElementException; - -@Entity -@Table(name = "urls") -@Getter -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class Url { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @Column(nullable = false, updatable = false) - private String originUrl; - - @Embedded - private EncodedUrl encodedUrl; - - @Column(nullable = false) - private Long visitCount; - - @Enumerated(EnumType.STRING) - @Column(nullable = false) - private EncodingType encodingType; - - @Transient - private Encoder encoder; - - public Url(String originUrl, EncodingType encodingType, Long visitCount) { - Assert.notNull(originUrl, "originUrl은 null값이 들어올 수 없습니다."); - Assert.notNull(encodingType, "encodingType은 null값이 들어올 수 없습니다."); - Assert.notNull(visitCount, "visitCount는 null값이 들어올 수 없습니다."); - - this.originUrl = originUrl; - this.encodingType = encodingType; - this.encoder = encodingType.getEncoder(); - this.visitCount = visitCount; - } - - public String encode(){ - if (id == null){ - throw new NoSuchElementException("인코딩할 id값이 초기화 되어있지 않습니다. save를 먼저 하여 id값을 생성해주세요."); - } - - String encoded = encoder.encode(this.id); - this.encodedUrl = new EncodedUrl(encoded); - - return encoded; - } - - public String getEncodedUrl() { - if (encodedUrl == null){ - throw new NoSuchElementException("encodedUrl이 초기화 되어있지 않습니다."); - } - - return encodedUrl.getEncodedUrl(); - } - - public void increaseVisitCount(){ - visitCount++; - } - -} diff --git a/src/main/java/com/young/shortenerurl/url/application/UrlService.java b/src/main/java/com/young/shortenerurl/url/application/UrlService.java new file mode 100644 index 00000000..b8a1ce11 --- /dev/null +++ b/src/main/java/com/young/shortenerurl/url/application/UrlService.java @@ -0,0 +1,57 @@ +package com.young.shortenerurl.url.application; + +import com.young.shortenerurl.url.application.dto.UrlCreateRequest; +import com.young.shortenerurl.url.application.dto.UrlInfoFindResponse; +import com.young.shortenerurl.global.generator.UniqueKeyGenerator; +import com.young.shortenerurl.url.infrastructures.UrlRepository; +import com.young.shortenerurl.url.model.EncodedUrl; +import com.young.shortenerurl.url.model.Url; +import com.young.shortenerurl.url.util.Encoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +public class UrlService { + + private final UrlRepository urlRepository; + private final UniqueKeyGenerator uniqueKeyGenerator; + + public UrlService(UrlRepository urlRepository, UniqueKeyGenerator uniqueKeyGenerator) { + this.urlRepository = urlRepository; + this.uniqueKeyGenerator = uniqueKeyGenerator; + } + + @Transactional + public String createUrl(UrlCreateRequest request) { + Encoder encoder = request.encodingType().getEncoder(); + String encodedUrl = encoder.encode(uniqueKeyGenerator.generateKey()); + + Url savedUrl = urlRepository.findByOriginUrl(request.originUrl()).orElseGet(() -> { + Url url = new Url( + request.originUrl(), + new EncodedUrl(encodedUrl, request.encodingType()) + ); + + return urlRepository.save(url); + }); + + return savedUrl.getEncodedUrl(); + } + + @Transactional + public String findOriginUrl(String encodedUrl) { + Url url = urlRepository.getByEncodedUrl(encodedUrl); + + url.increaseVisitCount(); + + return url.getOriginUrl(); + } + + @Transactional(readOnly = true) + public UrlInfoFindResponse findUrlInfo(String encodedUrl) { + Url findUrl = urlRepository.getByEncodedUrl(encodedUrl); + + return UrlInfoFindResponse.from(findUrl); + } + +} diff --git a/src/main/java/com/young/shortenerurl/url/application/dto/UrlCreateRequest.java b/src/main/java/com/young/shortenerurl/url/application/dto/UrlCreateRequest.java new file mode 100644 index 00000000..1863efa0 --- /dev/null +++ b/src/main/java/com/young/shortenerurl/url/application/dto/UrlCreateRequest.java @@ -0,0 +1,6 @@ +package com.young.shortenerurl.url.application.dto; + +import com.young.shortenerurl.url.model.EncodingType; + +public record UrlCreateRequest(String originUrl, EncodingType encodingType) { +} diff --git a/src/main/java/com/young/shortenerurl/application/dto/UrlInfoFindResponse.java b/src/main/java/com/young/shortenerurl/url/application/dto/UrlInfoFindResponse.java similarity index 77% rename from src/main/java/com/young/shortenerurl/application/dto/UrlInfoFindResponse.java rename to src/main/java/com/young/shortenerurl/url/application/dto/UrlInfoFindResponse.java index 2ab98dd2..579f43bc 100644 --- a/src/main/java/com/young/shortenerurl/application/dto/UrlInfoFindResponse.java +++ b/src/main/java/com/young/shortenerurl/url/application/dto/UrlInfoFindResponse.java @@ -1,6 +1,6 @@ -package com.young.shortenerurl.application.dto; +package com.young.shortenerurl.url.application.dto; -import com.young.shortenerurl.model.Url; +import com.young.shortenerurl.url.model.Url; public record UrlInfoFindResponse( String originUrl, diff --git a/src/main/java/com/young/shortenerurl/infrastructures/UrlJpaRepository.java b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlJpaRepository.java similarity index 74% rename from src/main/java/com/young/shortenerurl/infrastructures/UrlJpaRepository.java rename to src/main/java/com/young/shortenerurl/url/infrastructures/UrlJpaRepository.java index 4f04dc98..03e8e57e 100644 --- a/src/main/java/com/young/shortenerurl/infrastructures/UrlJpaRepository.java +++ b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlJpaRepository.java @@ -1,6 +1,6 @@ -package com.young.shortenerurl.infrastructures; +package com.young.shortenerurl.url.infrastructures; -import com.young.shortenerurl.model.Url; +import com.young.shortenerurl.url.model.Url; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -12,4 +12,5 @@ public interface UrlJpaRepository extends JpaRepository { @Query("SELECT u FROM Url u WHERE u.encodedUrl.encodedUrl = :encodedUrl") Optional findByEncodedUrl(@Param(value = "encodedUrl") String encodedUrl); + Optional findUrlByOriginUrl(String originUrl); } diff --git a/src/main/java/com/young/shortenerurl/infrastructures/UrlRepository.java b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepository.java similarity index 73% rename from src/main/java/com/young/shortenerurl/infrastructures/UrlRepository.java rename to src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepository.java index 2305f998..77924398 100644 --- a/src/main/java/com/young/shortenerurl/infrastructures/UrlRepository.java +++ b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepository.java @@ -1,6 +1,6 @@ -package com.young.shortenerurl.infrastructures; +package com.young.shortenerurl.url.infrastructures; -import com.young.shortenerurl.model.Url; +import com.young.shortenerurl.url.model.Url; import jakarta.persistence.EntityNotFoundException; import java.util.Optional; @@ -14,4 +14,6 @@ default Url getByEncodedUrl(String encodedUrl){ return findByEncodedUrl(encodedUrl) .orElseThrow(() -> new EntityNotFoundException("해당 encodedUrl를 가진 url을 찾을 수 없습니다.")); } + + Optional findByOriginUrl(String originUrl); } diff --git a/src/main/java/com/young/shortenerurl/infrastructures/UrlRepositoryImpl.java b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepositoryImpl.java similarity index 70% rename from src/main/java/com/young/shortenerurl/infrastructures/UrlRepositoryImpl.java rename to src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepositoryImpl.java index 33343639..58d5eba6 100644 --- a/src/main/java/com/young/shortenerurl/infrastructures/UrlRepositoryImpl.java +++ b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepositoryImpl.java @@ -1,6 +1,6 @@ -package com.young.shortenerurl.infrastructures; +package com.young.shortenerurl.url.infrastructures; -import com.young.shortenerurl.model.Url; +import com.young.shortenerurl.url.model.Url; import org.springframework.stereotype.Repository; import java.util.Optional; @@ -24,4 +24,9 @@ public Optional findByEncodedUrl(String encodedUrl) { return urlJpaRepository.findByEncodedUrl(encodedUrl); } + @Override + public Optional findByOriginUrl(String originUrl) { + return urlJpaRepository.findUrlByOriginUrl(originUrl); + } + } diff --git a/src/main/java/com/young/shortenerurl/url/model/EncodedUrl.java b/src/main/java/com/young/shortenerurl/url/model/EncodedUrl.java new file mode 100644 index 00000000..17148955 --- /dev/null +++ b/src/main/java/com/young/shortenerurl/url/model/EncodedUrl.java @@ -0,0 +1,47 @@ +package com.young.shortenerurl.url.model; + +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.springframework.util.Assert; + +@Getter +@Embeddable +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class EncodedUrl { + private static final int MAX_URL_LENGTH = 8; + + @Column(nullable = false, unique = true) + private String encodedUrl; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private EncodingType encodingType; + + public EncodedUrl(String encodedUrl, EncodingType encodingType) { + Assert.notNull(encodedUrl, "변환된 url은 null이 될 수 없습니다."); + Assert.notNull(encodingType, "encodingType은 null이 될 수 없습니다."); + + if (encodedUrl.length() > MAX_URL_LENGTH){ + throw new IllegalArgumentException("변환된 url의 길이는 8이상 될 수 없습니다."); + } + + this.encodedUrl = encodedUrl; + this.encodingType = encodingType; + } + + // public EncodedUrl(String encodedUrl) { +// Assert.notNull(encodedUrl, "변환된 url은 null이 될 수 없습니다."); +// +// if (encodedUrl.length() > MAX_URL_LENGTH){ +// throw new IllegalArgumentException("변환된 url의 길이는 8이상 될 수 없습니다."); +// } +// +// this.encodedUrl = encodedUrl; +// } + +} diff --git a/src/main/java/com/young/shortenerurl/url/model/EncodingType.java b/src/main/java/com/young/shortenerurl/url/model/EncodingType.java new file mode 100644 index 00000000..3d9721a7 --- /dev/null +++ b/src/main/java/com/young/shortenerurl/url/model/EncodingType.java @@ -0,0 +1,23 @@ +package com.young.shortenerurl.url.model; + +import com.young.shortenerurl.url.util.Base64EncoderV2; +import com.young.shortenerurl.url.util.Encoder; +import com.young.shortenerurl.url.util.Base64EncoderV1; + +import java.util.function.Supplier; + +public enum EncodingType { + BASE_64_V1(Base64EncoderV1::new), + BASE_62_V2(Base64EncoderV2::new); + + private final Supplier supplier; + + EncodingType(Supplier supplier) { + this.supplier = supplier; + } + + public Encoder getEncoder(){ + return supplier.get(); + } + +} diff --git a/src/main/java/com/young/shortenerurl/url/model/Url.java b/src/main/java/com/young/shortenerurl/url/model/Url.java new file mode 100644 index 00000000..97bf6827 --- /dev/null +++ b/src/main/java/com/young/shortenerurl/url/model/Url.java @@ -0,0 +1,51 @@ +package com.young.shortenerurl.url.model; + +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.springframework.util.Assert; + +@Entity +@Table(name = "urls") +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Url { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, updatable = false) + private String originUrl; + + @Embedded + private EncodedUrl encodedUrl; + + @Column(nullable = false) + private Long visitCount; + + public Url(String originUrl, EncodedUrl encodedUrl) { + Assert.notNull(originUrl, "originUrl은 null값이 들어올 수 없습니다."); + Assert.notNull(encodedUrl, "encodedUrl은 null값이 들어올 수 없습니다."); + + this.originUrl = originUrl; + this.encodedUrl = encodedUrl; + this.visitCount = 0L; + } + + public String getEncodedUrl() { + return encodedUrl.getEncodedUrl(); + } + + public void increaseVisitCount(){ + visitCount++; + } + +} diff --git a/src/main/java/com/young/shortenerurl/presentation/UrlRestController.java b/src/main/java/com/young/shortenerurl/url/presentation/UrlRestController.java similarity index 80% rename from src/main/java/com/young/shortenerurl/presentation/UrlRestController.java rename to src/main/java/com/young/shortenerurl/url/presentation/UrlRestController.java index c7d9125f..3ab57ecb 100644 --- a/src/main/java/com/young/shortenerurl/presentation/UrlRestController.java +++ b/src/main/java/com/young/shortenerurl/url/presentation/UrlRestController.java @@ -1,11 +1,11 @@ -package com.young.shortenerurl.presentation; - -import com.young.shortenerurl.application.UrlService; -import com.young.shortenerurl.application.dto.UrlInfoFindResponse; -import com.young.shortenerurl.presentation.dto.UrlCreateApiRequest; -import com.young.shortenerurl.presentation.dto.UrlCreateApiResponse; -import com.young.shortenerurl.presentation.dto.UrlInfoFindApiResponse; -import com.young.shortenerurl.presentation.mapper.UrlApiMapper; +package com.young.shortenerurl.url.presentation; + +import com.young.shortenerurl.url.application.UrlService; +import com.young.shortenerurl.url.application.dto.UrlInfoFindResponse; +import com.young.shortenerurl.url.presentation.dto.UrlCreateApiRequest; +import com.young.shortenerurl.url.presentation.dto.UrlCreateApiResponse; +import com.young.shortenerurl.url.presentation.dto.UrlInfoFindApiResponse; +import com.young.shortenerurl.url.presentation.mapper.UrlApiMapper; import jakarta.validation.Valid; diff --git a/src/main/java/com/young/shortenerurl/presentation/UrlViewController.java b/src/main/java/com/young/shortenerurl/url/presentation/UrlViewController.java similarity index 83% rename from src/main/java/com/young/shortenerurl/presentation/UrlViewController.java rename to src/main/java/com/young/shortenerurl/url/presentation/UrlViewController.java index ed2bd8cc..411b8e94 100644 --- a/src/main/java/com/young/shortenerurl/presentation/UrlViewController.java +++ b/src/main/java/com/young/shortenerurl/url/presentation/UrlViewController.java @@ -1,4 +1,4 @@ -package com.young.shortenerurl.presentation; +package com.young.shortenerurl.url.presentation; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/young/shortenerurl/presentation/dto/UrlCreateApiRequest.java b/src/main/java/com/young/shortenerurl/url/presentation/dto/UrlCreateApiRequest.java similarity index 76% rename from src/main/java/com/young/shortenerurl/presentation/dto/UrlCreateApiRequest.java rename to src/main/java/com/young/shortenerurl/url/presentation/dto/UrlCreateApiRequest.java index d67f45e5..e7b57fd5 100644 --- a/src/main/java/com/young/shortenerurl/presentation/dto/UrlCreateApiRequest.java +++ b/src/main/java/com/young/shortenerurl/url/presentation/dto/UrlCreateApiRequest.java @@ -1,6 +1,6 @@ -package com.young.shortenerurl.presentation.dto; +package com.young.shortenerurl.url.presentation.dto; -import com.young.shortenerurl.model.EncodingType; +import com.young.shortenerurl.url.model.EncodingType; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/young/shortenerurl/presentation/dto/UrlCreateApiResponse.java b/src/main/java/com/young/shortenerurl/url/presentation/dto/UrlCreateApiResponse.java similarity index 77% rename from src/main/java/com/young/shortenerurl/presentation/dto/UrlCreateApiResponse.java rename to src/main/java/com/young/shortenerurl/url/presentation/dto/UrlCreateApiResponse.java index e2e2b813..0de28f74 100644 --- a/src/main/java/com/young/shortenerurl/presentation/dto/UrlCreateApiResponse.java +++ b/src/main/java/com/young/shortenerurl/url/presentation/dto/UrlCreateApiResponse.java @@ -1,4 +1,4 @@ -package com.young.shortenerurl.presentation.dto; +package com.young.shortenerurl.url.presentation.dto; public record UrlCreateApiResponse(String encodedUrl) { diff --git a/src/main/java/com/young/shortenerurl/presentation/dto/UrlInfoFindApiResponse.java b/src/main/java/com/young/shortenerurl/url/presentation/dto/UrlInfoFindApiResponse.java similarity index 76% rename from src/main/java/com/young/shortenerurl/presentation/dto/UrlInfoFindApiResponse.java rename to src/main/java/com/young/shortenerurl/url/presentation/dto/UrlInfoFindApiResponse.java index c2b1b048..ade22066 100644 --- a/src/main/java/com/young/shortenerurl/presentation/dto/UrlInfoFindApiResponse.java +++ b/src/main/java/com/young/shortenerurl/url/presentation/dto/UrlInfoFindApiResponse.java @@ -1,6 +1,6 @@ -package com.young.shortenerurl.presentation.dto; +package com.young.shortenerurl.url.presentation.dto; -import com.young.shortenerurl.application.dto.UrlInfoFindResponse; +import com.young.shortenerurl.url.application.dto.UrlInfoFindResponse; public record UrlInfoFindApiResponse( String originUrl, diff --git a/src/main/java/com/young/shortenerurl/presentation/mapper/UrlApiMapper.java b/src/main/java/com/young/shortenerurl/url/presentation/mapper/UrlApiMapper.java similarity index 60% rename from src/main/java/com/young/shortenerurl/presentation/mapper/UrlApiMapper.java rename to src/main/java/com/young/shortenerurl/url/presentation/mapper/UrlApiMapper.java index adcd708d..5aeec63e 100644 --- a/src/main/java/com/young/shortenerurl/presentation/mapper/UrlApiMapper.java +++ b/src/main/java/com/young/shortenerurl/url/presentation/mapper/UrlApiMapper.java @@ -1,7 +1,7 @@ -package com.young.shortenerurl.presentation.mapper; +package com.young.shortenerurl.url.presentation.mapper; -import com.young.shortenerurl.application.dto.UrlCreateRequest; -import com.young.shortenerurl.presentation.dto.UrlCreateApiRequest; +import com.young.shortenerurl.url.application.dto.UrlCreateRequest; +import com.young.shortenerurl.url.presentation.dto.UrlCreateApiRequest; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/com/young/shortenerurl/model/encoder/UrlSafeBase64Encoder.java b/src/main/java/com/young/shortenerurl/url/util/Base64EncoderV1.java similarity index 86% rename from src/main/java/com/young/shortenerurl/model/encoder/UrlSafeBase64Encoder.java rename to src/main/java/com/young/shortenerurl/url/util/Base64EncoderV1.java index 4bd451d1..8e638018 100644 --- a/src/main/java/com/young/shortenerurl/model/encoder/UrlSafeBase64Encoder.java +++ b/src/main/java/com/young/shortenerurl/url/util/Base64EncoderV1.java @@ -1,9 +1,9 @@ -package com.young.shortenerurl.model.encoder; +package com.young.shortenerurl.url.util; import org.springframework.stereotype.Component; @Component -public class UrlSafeBase64Encoder extends Encoder{ +public class Base64EncoderV1 extends Encoder{ private static final int BASE64 = 64; private static final String BASE64_CHAR = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-"; diff --git a/src/main/java/com/young/shortenerurl/model/encoder/Base62Encoder.java b/src/main/java/com/young/shortenerurl/url/util/Base64EncoderV2.java similarity index 75% rename from src/main/java/com/young/shortenerurl/model/encoder/Base62Encoder.java rename to src/main/java/com/young/shortenerurl/url/util/Base64EncoderV2.java index 3841de65..e279fcbe 100644 --- a/src/main/java/com/young/shortenerurl/model/encoder/Base62Encoder.java +++ b/src/main/java/com/young/shortenerurl/url/util/Base64EncoderV2.java @@ -1,11 +1,11 @@ -package com.young.shortenerurl.model.encoder; +package com.young.shortenerurl.url.util; import org.springframework.stereotype.Component; @Component -public class Base62Encoder extends Encoder { - private static final int BASE62 = 62; - private static final String BASE62_CHAR = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; +public class Base64EncoderV2 extends Encoder { + private static final int BASE62 = 64; + private static final String BASE62_CHAR = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789~."; @Override public String encode(long index) { diff --git a/src/main/java/com/young/shortenerurl/model/encoder/Encoder.java b/src/main/java/com/young/shortenerurl/url/util/Encoder.java similarity index 77% rename from src/main/java/com/young/shortenerurl/model/encoder/Encoder.java rename to src/main/java/com/young/shortenerurl/url/util/Encoder.java index 1e7eb1ab..666b2c8c 100644 --- a/src/main/java/com/young/shortenerurl/model/encoder/Encoder.java +++ b/src/main/java/com/young/shortenerurl/url/util/Encoder.java @@ -1,4 +1,4 @@ -package com.young.shortenerurl.model.encoder; +package com.young.shortenerurl.url.util; public abstract class Encoder { protected final Integer MAX_LENGTH = 8; diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 51382058..f4acf216 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -36,8 +36,8 @@

Shortener URL

diff --git a/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java b/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java index 5d04fa83..2806ca21 100644 --- a/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java +++ b/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java @@ -1,10 +1,13 @@ package com.young.shortenerurl.application; -import com.young.shortenerurl.application.dto.UrlCreateRequest; -import com.young.shortenerurl.application.dto.UrlInfoFindResponse; -import com.young.shortenerurl.infrastructures.UrlJpaRepository; -import com.young.shortenerurl.model.EncodingType; -import com.young.shortenerurl.model.Url; +import com.young.shortenerurl.url.application.UrlService; +import com.young.shortenerurl.url.application.dto.UrlCreateRequest; +import com.young.shortenerurl.url.application.dto.UrlInfoFindResponse; +import com.young.shortenerurl.url.infrastructures.UrlJpaRepository; +import com.young.shortenerurl.url.model.EncodedUrl; +import com.young.shortenerurl.url.model.EncodingType; +import com.young.shortenerurl.url.model.Url; +import com.young.shortenerurl.url.util.Encoder; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -30,16 +33,22 @@ class UrlServiceTest { @BeforeEach void setup(){ - Url url = new Url("setup-url1", EncodingType.BASE_62, 0L); + Encoder encoder = EncodingType.BASE_62_V2.getEncoder(); + String originUrl = "setup-url1"; + + Url url = new Url( + originUrl, + new EncodedUrl(encoder.encode(5), EncodingType.BASE_62_V2) + ); + setupUrl = urlJpaRepository.save(url); - setupUrl.encode(); } @Test @DisplayName("originUrl과 Base62을 통해 인코딩된 url을 생성할 수 있다.") void createUrl_Base62() { //given - UrlCreateRequest request = new UrlCreateRequest("test-orgin-url", EncodingType.BASE_62); + UrlCreateRequest request = new UrlCreateRequest("test-orgin-url", EncodingType.BASE_62_V2); //when String encodedUrl = urlService.createUrl(request); @@ -53,7 +62,7 @@ void createUrl_Base62() { @DisplayName("originUrl과 UrlSafeBase64을 통해 인코딩된 url을 생성할 수 있다.") void createUrl_Base64() { //given - UrlCreateRequest request = new UrlCreateRequest("test-orgin-url", EncodingType.URL_SAFE_BASE_64); + UrlCreateRequest request = new UrlCreateRequest("test-orgin-url", EncodingType.BASE_64_V1); //when String encodedUrl = urlService.createUrl(request); From cb169f8b2229cf9eed25fee8c40268423413a850 Mon Sep 17 00:00:00 2001 From: young970 Date: Sat, 7 Oct 2023 18:25:15 +0900 Subject: [PATCH 14/29] =?UTF-8?q?Test:=20=EC=9D=B4=EB=AF=B8=20=EC=A1=B4?= =?UTF-8?q?=EC=9E=AC=ED=95=98=EB=8A=94=20originUrl=EC=9D=84=20=ED=86=B5?= =?UTF-8?q?=ED=95=B4=20=EC=83=9D=EC=84=B1=20=EC=9A=94=EC=B2=AD=20Test=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shortenerurl/url/model/EncodedUrl.java | 10 --------- .../application/UrlServiceTest.java | 21 +++++++++++++++---- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/young/shortenerurl/url/model/EncodedUrl.java b/src/main/java/com/young/shortenerurl/url/model/EncodedUrl.java index 17148955..ae800407 100644 --- a/src/main/java/com/young/shortenerurl/url/model/EncodedUrl.java +++ b/src/main/java/com/young/shortenerurl/url/model/EncodedUrl.java @@ -34,14 +34,4 @@ public EncodedUrl(String encodedUrl, EncodingType encodingType) { this.encodingType = encodingType; } - // public EncodedUrl(String encodedUrl) { -// Assert.notNull(encodedUrl, "변환된 url은 null이 될 수 없습니다."); -// -// if (encodedUrl.length() > MAX_URL_LENGTH){ -// throw new IllegalArgumentException("변환된 url의 길이는 8이상 될 수 없습니다."); -// } -// -// this.encodedUrl = encodedUrl; -// } - } diff --git a/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java b/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java index 2806ca21..a9ceae0a 100644 --- a/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java +++ b/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java @@ -45,8 +45,8 @@ void setup(){ } @Test - @DisplayName("originUrl과 Base62을 통해 인코딩된 url을 생성할 수 있다.") - void createUrl_Base62() { + @DisplayName("originUrl과 Base64V2을 통해 인코딩된 url을 생성할 수 있다.") + void createUrl_Base64V2() { //given UrlCreateRequest request = new UrlCreateRequest("test-orgin-url", EncodingType.BASE_62_V2); @@ -59,8 +59,8 @@ void createUrl_Base62() { } @Test - @DisplayName("originUrl과 UrlSafeBase64을 통해 인코딩된 url을 생성할 수 있다.") - void createUrl_Base64() { + @DisplayName("originUrl과 Base64V1을 통해 인코딩된 url을 생성할 수 있다.") + void createUrl_Base64V1() { //given UrlCreateRequest request = new UrlCreateRequest("test-orgin-url", EncodingType.BASE_64_V1); @@ -72,6 +72,19 @@ void createUrl_Base64() { assertThat(url.getOriginUrl()).isEqualTo("test-orgin-url"); } + @Test + @DisplayName("url 저장 시 동일한 originUrl이 이미 존재한다면 존재하는 Url의 인코딩 url을 반환한다.") + void createUrl_alreadyExistUrl(){ + //given + UrlCreateRequest request = new UrlCreateRequest("setup-url1", EncodingType.BASE_62_V2); + + //when + String encodedUrl = urlService.createUrl(request); + + //then + assertThat(encodedUrl).isEqualTo(setupUrl.getEncodedUrl()); + } + @Test @DisplayName("인코딩된 단축 URL을 통해 원본 URL을 조회할 수 있으며 조회수는 1씩 증가한다.") void findOriginUrl() { From 49827bcfa91fa53a8e570ec5ed1b001274f0f672 Mon Sep 17 00:00:00 2001 From: young970 Date: Sat, 7 Oct 2023 19:15:00 +0900 Subject: [PATCH 15/29] =?UTF-8?q?Refactor:=20url=20=EC=9D=B8=EC=BD=94?= =?UTF-8?q?=EB=94=A9=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../global/GlobalApiExceptionHandler.java | 9 ----- .../url/application/EncodingExecutor.java | 34 +++++++++++++++++++ .../url/application/UrlService.java | 11 +++--- 3 files changed, 38 insertions(+), 16 deletions(-) create mode 100644 src/main/java/com/young/shortenerurl/url/application/EncodingExecutor.java diff --git a/src/main/java/com/young/shortenerurl/global/GlobalApiExceptionHandler.java b/src/main/java/com/young/shortenerurl/global/GlobalApiExceptionHandler.java index d5c735dc..98588f22 100644 --- a/src/main/java/com/young/shortenerurl/global/GlobalApiExceptionHandler.java +++ b/src/main/java/com/young/shortenerurl/global/GlobalApiExceptionHandler.java @@ -11,8 +11,6 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; -import java.util.NoSuchElementException; - @RestControllerAdvice @Slf4j public class GlobalApiExceptionHandler { @@ -39,13 +37,6 @@ public ResponseEntity handleEntityNotFoundException(HttpServletRe return ResponseEntity.status(HttpStatus.NOT_FOUND).body(errorResponse); } - @ExceptionHandler(NoSuchElementException.class) - public ResponseEntity handleNoSuchElementException(HttpServletRequest request, NoSuchElementException e){ - log.error("Sever Exception Request URI {}: ", request.getRequestURI(), e); - - return ResponseEntity.internalServerError().build(); - } - @ExceptionHandler(Exception.class) public ResponseEntity handleException(HttpServletRequest request, Exception e){ log.error("Sever Exception Request URI {}: ", request.getRequestURI(), e); diff --git a/src/main/java/com/young/shortenerurl/url/application/EncodingExecutor.java b/src/main/java/com/young/shortenerurl/url/application/EncodingExecutor.java new file mode 100644 index 00000000..cd9e9216 --- /dev/null +++ b/src/main/java/com/young/shortenerurl/url/application/EncodingExecutor.java @@ -0,0 +1,34 @@ +package com.young.shortenerurl.url.application; + +import com.young.shortenerurl.global.generator.UniqueKeyGenerator; +import com.young.shortenerurl.url.model.EncodingType; +import com.young.shortenerurl.url.util.Encoder; +import org.springframework.stereotype.Component; +import org.springframework.util.Assert; + +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +@Component +public class EncodingExecutor { + + private final Map encoders; + private final UniqueKeyGenerator uniqueKeyGenerator; + + public EncodingExecutor(UniqueKeyGenerator uniqueKeyGenerator) { + this.encoders = Stream.of(EncodingType.values()) + .collect(Collectors.toMap(Enum::name, EncodingType::getEncoder)); + + this.uniqueKeyGenerator = uniqueKeyGenerator; + } + + public String encode(EncodingType encodingType){ + Assert.notNull(encodingType, "encodingType은 null이 들어오면 안됩니다."); + + Encoder encoder = encoders.get(encodingType.name()); + + return encoder.encode(uniqueKeyGenerator.generateKey()); + } + +} diff --git a/src/main/java/com/young/shortenerurl/url/application/UrlService.java b/src/main/java/com/young/shortenerurl/url/application/UrlService.java index b8a1ce11..c568910a 100644 --- a/src/main/java/com/young/shortenerurl/url/application/UrlService.java +++ b/src/main/java/com/young/shortenerurl/url/application/UrlService.java @@ -2,11 +2,9 @@ import com.young.shortenerurl.url.application.dto.UrlCreateRequest; import com.young.shortenerurl.url.application.dto.UrlInfoFindResponse; -import com.young.shortenerurl.global.generator.UniqueKeyGenerator; import com.young.shortenerurl.url.infrastructures.UrlRepository; import com.young.shortenerurl.url.model.EncodedUrl; import com.young.shortenerurl.url.model.Url; -import com.young.shortenerurl.url.util.Encoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -14,17 +12,16 @@ public class UrlService { private final UrlRepository urlRepository; - private final UniqueKeyGenerator uniqueKeyGenerator; + private final EncodingExecutor encodingExecutor; - public UrlService(UrlRepository urlRepository, UniqueKeyGenerator uniqueKeyGenerator) { + public UrlService(UrlRepository urlRepository, EncodingExecutor encodingExecutor) { this.urlRepository = urlRepository; - this.uniqueKeyGenerator = uniqueKeyGenerator; + this.encodingExecutor = encodingExecutor; } @Transactional public String createUrl(UrlCreateRequest request) { - Encoder encoder = request.encodingType().getEncoder(); - String encodedUrl = encoder.encode(uniqueKeyGenerator.generateKey()); + String encodedUrl = encodingExecutor.encode(request.encodingType()); Url savedUrl = urlRepository.findByOriginUrl(request.originUrl()).orElseGet(() -> { Url url = new Url( From fcbb58ea037731cc4ec65c01ef2fafd561ee338b Mon Sep 17 00:00:00 2001 From: young970 Date: Sat, 7 Oct 2023 19:38:17 +0900 Subject: [PATCH 16/29] =?UTF-8?q?Test:=20EncodingExecutorTest=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../url/util/Base64EncoderV2.java | 2 +- .../url/application/EncodingExecutorTest.java | 50 +++++++++++++++++++ .../{ => url}/application/UrlServiceTest.java | 2 +- 3 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 src/test/java/com/young/shortenerurl/url/application/EncodingExecutorTest.java rename src/test/java/com/young/shortenerurl/{ => url}/application/UrlServiceTest.java (98%) diff --git a/src/main/java/com/young/shortenerurl/url/util/Base64EncoderV2.java b/src/main/java/com/young/shortenerurl/url/util/Base64EncoderV2.java index e279fcbe..6be21cd4 100644 --- a/src/main/java/com/young/shortenerurl/url/util/Base64EncoderV2.java +++ b/src/main/java/com/young/shortenerurl/url/util/Base64EncoderV2.java @@ -5,7 +5,7 @@ @Component public class Base64EncoderV2 extends Encoder { private static final int BASE62 = 64; - private static final String BASE62_CHAR = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789~."; + private static final String BASE62_CHAR = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789.~"; @Override public String encode(long index) { diff --git a/src/test/java/com/young/shortenerurl/url/application/EncodingExecutorTest.java b/src/test/java/com/young/shortenerurl/url/application/EncodingExecutorTest.java new file mode 100644 index 00000000..fbe61526 --- /dev/null +++ b/src/test/java/com/young/shortenerurl/url/application/EncodingExecutorTest.java @@ -0,0 +1,50 @@ +package com.young.shortenerurl.url.application; + +import com.young.shortenerurl.global.generator.UniqueKeyGenerator; +import com.young.shortenerurl.url.model.EncodingType; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.BDDMockito.given; + +@ExtendWith(MockitoExtension.class) +class EncodingExecutorTest { + + @InjectMocks + private EncodingExecutor encodingExecutor; + + @Mock + private UniqueKeyGenerator uniqueKeyGenerator; + + @Test + @DisplayName("파라미터로 받은 base64V1 인코딩 알고리즘에 맞는 인코딩 값을 반환 한다.") + void encode_base64V1() { + //given + given(uniqueKeyGenerator.generateKey()).willReturn(63L); + + //when + String encodedUrl = encodingExecutor.encode(EncodingType.BASE_64_V1); + + //then + assertThat(encodedUrl).isEqualTo("-"); + } + + @Test + @DisplayName("파라미터로 받은 base64V2 인코딩 알고리즘에 맞는 인코딩 값을 반환 한다.") + void encode_base64V2() { + //given + given(uniqueKeyGenerator.generateKey()).willReturn(63L); + + //when + String encodedUrl = encodingExecutor.encode(EncodingType.BASE_62_V2); + + //then + assertThat(encodedUrl).isEqualTo("~"); + } + +} \ No newline at end of file diff --git a/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java b/src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java similarity index 98% rename from src/test/java/com/young/shortenerurl/application/UrlServiceTest.java rename to src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java index a9ceae0a..559448d5 100644 --- a/src/test/java/com/young/shortenerurl/application/UrlServiceTest.java +++ b/src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java @@ -1,4 +1,4 @@ -package com.young.shortenerurl.application; +package com.young.shortenerurl.url.application; import com.young.shortenerurl.url.application.UrlService; import com.young.shortenerurl.url.application.dto.UrlCreateRequest; From 1d6871a183e995730dcd5c8d6f45faf9eff95ea9 Mon Sep 17 00:00:00 2001 From: young970 Date: Sat, 7 Oct 2023 20:01:05 +0900 Subject: [PATCH 17/29] =?UTF-8?q?Fix:=20EncodingType=20=ED=94=84=EB=A1=A0?= =?UTF-8?q?=ED=8A=B8=EB=9E=91=20=EB=A7=9E=EC=A7=80=20=EC=95=8A=EC=95=98?= =?UTF-8?q?=EB=8D=98=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0,=20originUr?= =?UTF-8?q?l=20=EA=B8=B8=EC=9D=B4=20=EC=A0=9C=ED=95=9C=201000=EC=9E=90?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/young/shortenerurl/url/model/EncodingType.java | 2 +- src/main/java/com/young/shortenerurl/url/model/Url.java | 2 +- .../url/application/EncodingExecutorTest.java | 2 +- .../shortenerurl/url/application/UrlServiceTest.java | 9 ++++----- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/young/shortenerurl/url/model/EncodingType.java b/src/main/java/com/young/shortenerurl/url/model/EncodingType.java index 3d9721a7..b732d5c5 100644 --- a/src/main/java/com/young/shortenerurl/url/model/EncodingType.java +++ b/src/main/java/com/young/shortenerurl/url/model/EncodingType.java @@ -8,7 +8,7 @@ public enum EncodingType { BASE_64_V1(Base64EncoderV1::new), - BASE_62_V2(Base64EncoderV2::new); + BASE_64_V2(Base64EncoderV2::new); private final Supplier supplier; diff --git a/src/main/java/com/young/shortenerurl/url/model/Url.java b/src/main/java/com/young/shortenerurl/url/model/Url.java index 97bf6827..7cc5f9ec 100644 --- a/src/main/java/com/young/shortenerurl/url/model/Url.java +++ b/src/main/java/com/young/shortenerurl/url/model/Url.java @@ -22,7 +22,7 @@ public class Url { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(nullable = false, updatable = false) + @Column(length = 1000, nullable = false, updatable = false) private String originUrl; @Embedded diff --git a/src/test/java/com/young/shortenerurl/url/application/EncodingExecutorTest.java b/src/test/java/com/young/shortenerurl/url/application/EncodingExecutorTest.java index fbe61526..10fd6922 100644 --- a/src/test/java/com/young/shortenerurl/url/application/EncodingExecutorTest.java +++ b/src/test/java/com/young/shortenerurl/url/application/EncodingExecutorTest.java @@ -41,7 +41,7 @@ void encode_base64V2() { given(uniqueKeyGenerator.generateKey()).willReturn(63L); //when - String encodedUrl = encodingExecutor.encode(EncodingType.BASE_62_V2); + String encodedUrl = encodingExecutor.encode(EncodingType.BASE_64_V2); //then assertThat(encodedUrl).isEqualTo("~"); diff --git a/src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java b/src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java index 559448d5..2d5df7c7 100644 --- a/src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java +++ b/src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java @@ -1,6 +1,5 @@ package com.young.shortenerurl.url.application; -import com.young.shortenerurl.url.application.UrlService; import com.young.shortenerurl.url.application.dto.UrlCreateRequest; import com.young.shortenerurl.url.application.dto.UrlInfoFindResponse; import com.young.shortenerurl.url.infrastructures.UrlJpaRepository; @@ -33,12 +32,12 @@ class UrlServiceTest { @BeforeEach void setup(){ - Encoder encoder = EncodingType.BASE_62_V2.getEncoder(); + Encoder encoder = EncodingType.BASE_64_V2.getEncoder(); String originUrl = "setup-url1"; Url url = new Url( originUrl, - new EncodedUrl(encoder.encode(5), EncodingType.BASE_62_V2) + new EncodedUrl(encoder.encode(5), EncodingType.BASE_64_V2) ); setupUrl = urlJpaRepository.save(url); @@ -48,7 +47,7 @@ void setup(){ @DisplayName("originUrl과 Base64V2을 통해 인코딩된 url을 생성할 수 있다.") void createUrl_Base64V2() { //given - UrlCreateRequest request = new UrlCreateRequest("test-orgin-url", EncodingType.BASE_62_V2); + UrlCreateRequest request = new UrlCreateRequest("test-orgin-url", EncodingType.BASE_64_V2); //when String encodedUrl = urlService.createUrl(request); @@ -76,7 +75,7 @@ void createUrl_Base64V1() { @DisplayName("url 저장 시 동일한 originUrl이 이미 존재한다면 존재하는 Url의 인코딩 url을 반환한다.") void createUrl_alreadyExistUrl(){ //given - UrlCreateRequest request = new UrlCreateRequest("setup-url1", EncodingType.BASE_62_V2); + UrlCreateRequest request = new UrlCreateRequest("setup-url1", EncodingType.BASE_64_V2); //when String encodedUrl = urlService.createUrl(request); From 5bb14aa25f6558d5c247dee4f902f0b967e3f478 Mon Sep 17 00:00:00 2001 From: young970 Date: Sat, 7 Oct 2023 20:07:20 +0900 Subject: [PATCH 18/29] =?UTF-8?q?Style:=20=EC=BD=94=EB=93=9C=20=ED=8F=AC?= =?UTF-8?q?=EB=A7=A4=ED=8C=85=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shortenerurl/global/GlobalApiExceptionHandler.java | 6 +++--- .../global/generator/SequenceUniqueKeyGenerator.java | 2 +- .../shortenerurl/url/application/EncodingExecutor.java | 2 +- .../shortenerurl/url/infrastructures/UrlRepository.java | 2 +- .../url/infrastructures/UrlRepositoryImpl.java | 2 +- .../java/com/young/shortenerurl/url/model/EncodedUrl.java | 2 +- .../com/young/shortenerurl/url/model/EncodingType.java | 2 +- src/main/java/com/young/shortenerurl/url/model/Url.java | 2 +- .../shortenerurl/url/presentation/UrlViewController.java | 2 +- .../url/presentation/dto/UrlCreateApiResponse.java | 2 +- .../url/presentation/dto/UrlInfoFindApiResponse.java | 1 + .../shortenerurl/url/presentation/mapper/UrlApiMapper.java | 2 +- .../com/young/shortenerurl/url/util/Base64EncoderV1.java | 7 ++++--- .../com/young/shortenerurl/url/util/Base64EncoderV2.java | 4 ++-- .../young/shortenerurl/url/application/UrlServiceTest.java | 6 +++--- 15 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/young/shortenerurl/global/GlobalApiExceptionHandler.java b/src/main/java/com/young/shortenerurl/global/GlobalApiExceptionHandler.java index 98588f22..a567ca0f 100644 --- a/src/main/java/com/young/shortenerurl/global/GlobalApiExceptionHandler.java +++ b/src/main/java/com/young/shortenerurl/global/GlobalApiExceptionHandler.java @@ -24,21 +24,21 @@ public ResponseEntity handleBindException(HttpServletRequest requ } @ExceptionHandler(IllegalArgumentException.class) - public ResponseEntity handleIllegalArgumentException(HttpServletRequest request, IllegalArgumentException e){ + public ResponseEntity handleIllegalArgumentException(HttpServletRequest request, IllegalArgumentException e) { ErrorResponse errorResponse = ErrorResponse.of(e.getMessage(), request.getRequestURI()); return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(errorResponse); } @ExceptionHandler(EntityNotFoundException.class) - public ResponseEntity handleEntityNotFoundException(HttpServletRequest request, EntityNotFoundException e){ + public ResponseEntity handleEntityNotFoundException(HttpServletRequest request, EntityNotFoundException e) { ErrorResponse errorResponse = ErrorResponse.of(e.getMessage(), request.getRequestURI()); return ResponseEntity.status(HttpStatus.NOT_FOUND).body(errorResponse); } @ExceptionHandler(Exception.class) - public ResponseEntity handleException(HttpServletRequest request, Exception e){ + public ResponseEntity handleException(HttpServletRequest request, Exception e) { log.error("Sever Exception Request URI {}: ", request.getRequestURI(), e); return ResponseEntity.internalServerError().build(); diff --git a/src/main/java/com/young/shortenerurl/global/generator/SequenceUniqueKeyGenerator.java b/src/main/java/com/young/shortenerurl/global/generator/SequenceUniqueKeyGenerator.java index c39c23cc..af56318c 100644 --- a/src/main/java/com/young/shortenerurl/global/generator/SequenceUniqueKeyGenerator.java +++ b/src/main/java/com/young/shortenerurl/global/generator/SequenceUniqueKeyGenerator.java @@ -3,7 +3,7 @@ import org.springframework.stereotype.Component; @Component -public class SequenceUniqueKeyGenerator implements UniqueKeyGenerator{ +public class SequenceUniqueKeyGenerator implements UniqueKeyGenerator { private final SequenceRepository sequenceRepository; diff --git a/src/main/java/com/young/shortenerurl/url/application/EncodingExecutor.java b/src/main/java/com/young/shortenerurl/url/application/EncodingExecutor.java index cd9e9216..1943e83d 100644 --- a/src/main/java/com/young/shortenerurl/url/application/EncodingExecutor.java +++ b/src/main/java/com/young/shortenerurl/url/application/EncodingExecutor.java @@ -23,7 +23,7 @@ public EncodingExecutor(UniqueKeyGenerator uniqueKeyGenerator) { this.uniqueKeyGenerator = uniqueKeyGenerator; } - public String encode(EncodingType encodingType){ + public String encode(EncodingType encodingType) { Assert.notNull(encodingType, "encodingType은 null이 들어오면 안됩니다."); Encoder encoder = encoders.get(encodingType.name()); diff --git a/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepository.java b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepository.java index 77924398..37ba29e7 100644 --- a/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepository.java +++ b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepository.java @@ -10,7 +10,7 @@ public interface UrlRepository { Optional findByEncodedUrl(String encodedUrl); - default Url getByEncodedUrl(String encodedUrl){ + default Url getByEncodedUrl(String encodedUrl) { return findByEncodedUrl(encodedUrl) .orElseThrow(() -> new EntityNotFoundException("해당 encodedUrl를 가진 url을 찾을 수 없습니다.")); } diff --git a/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepositoryImpl.java b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepositoryImpl.java index 58d5eba6..3e0e92f7 100644 --- a/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepositoryImpl.java +++ b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepositoryImpl.java @@ -6,7 +6,7 @@ import java.util.Optional; @Repository -public class UrlRepositoryImpl implements UrlRepository{ +public class UrlRepositoryImpl implements UrlRepository { private final UrlJpaRepository urlJpaRepository; diff --git a/src/main/java/com/young/shortenerurl/url/model/EncodedUrl.java b/src/main/java/com/young/shortenerurl/url/model/EncodedUrl.java index ae800407..d1bd4253 100644 --- a/src/main/java/com/young/shortenerurl/url/model/EncodedUrl.java +++ b/src/main/java/com/young/shortenerurl/url/model/EncodedUrl.java @@ -26,7 +26,7 @@ public EncodedUrl(String encodedUrl, EncodingType encodingType) { Assert.notNull(encodedUrl, "변환된 url은 null이 될 수 없습니다."); Assert.notNull(encodingType, "encodingType은 null이 될 수 없습니다."); - if (encodedUrl.length() > MAX_URL_LENGTH){ + if (encodedUrl.length() > MAX_URL_LENGTH) { throw new IllegalArgumentException("변환된 url의 길이는 8이상 될 수 없습니다."); } diff --git a/src/main/java/com/young/shortenerurl/url/model/EncodingType.java b/src/main/java/com/young/shortenerurl/url/model/EncodingType.java index b732d5c5..66713515 100644 --- a/src/main/java/com/young/shortenerurl/url/model/EncodingType.java +++ b/src/main/java/com/young/shortenerurl/url/model/EncodingType.java @@ -16,7 +16,7 @@ public enum EncodingType { this.supplier = supplier; } - public Encoder getEncoder(){ + public Encoder getEncoder() { return supplier.get(); } diff --git a/src/main/java/com/young/shortenerurl/url/model/Url.java b/src/main/java/com/young/shortenerurl/url/model/Url.java index 7cc5f9ec..2637e131 100644 --- a/src/main/java/com/young/shortenerurl/url/model/Url.java +++ b/src/main/java/com/young/shortenerurl/url/model/Url.java @@ -44,7 +44,7 @@ public String getEncodedUrl() { return encodedUrl.getEncodedUrl(); } - public void increaseVisitCount(){ + public void increaseVisitCount() { visitCount++; } diff --git a/src/main/java/com/young/shortenerurl/url/presentation/UrlViewController.java b/src/main/java/com/young/shortenerurl/url/presentation/UrlViewController.java index 411b8e94..caa6989b 100644 --- a/src/main/java/com/young/shortenerurl/url/presentation/UrlViewController.java +++ b/src/main/java/com/young/shortenerurl/url/presentation/UrlViewController.java @@ -7,7 +7,7 @@ public class UrlViewController { @GetMapping - public String getIndexPage(){ + public String getIndexPage() { return "index"; } diff --git a/src/main/java/com/young/shortenerurl/url/presentation/dto/UrlCreateApiResponse.java b/src/main/java/com/young/shortenerurl/url/presentation/dto/UrlCreateApiResponse.java index 0de28f74..f6c830ae 100644 --- a/src/main/java/com/young/shortenerurl/url/presentation/dto/UrlCreateApiResponse.java +++ b/src/main/java/com/young/shortenerurl/url/presentation/dto/UrlCreateApiResponse.java @@ -2,7 +2,7 @@ public record UrlCreateApiResponse(String encodedUrl) { - public static UrlCreateApiResponse from(String encodedUrl){ + public static UrlCreateApiResponse from(String encodedUrl) { return new UrlCreateApiResponse(encodedUrl); } } diff --git a/src/main/java/com/young/shortenerurl/url/presentation/dto/UrlInfoFindApiResponse.java b/src/main/java/com/young/shortenerurl/url/presentation/dto/UrlInfoFindApiResponse.java index ade22066..48247366 100644 --- a/src/main/java/com/young/shortenerurl/url/presentation/dto/UrlInfoFindApiResponse.java +++ b/src/main/java/com/young/shortenerurl/url/presentation/dto/UrlInfoFindApiResponse.java @@ -12,4 +12,5 @@ public static UrlInfoFindApiResponse of(UrlInfoFindResponse response, String url urlPreFix + response.encodedUrl(), response.visitCount()); } + } diff --git a/src/main/java/com/young/shortenerurl/url/presentation/mapper/UrlApiMapper.java b/src/main/java/com/young/shortenerurl/url/presentation/mapper/UrlApiMapper.java index 5aeec63e..ab25202b 100644 --- a/src/main/java/com/young/shortenerurl/url/presentation/mapper/UrlApiMapper.java +++ b/src/main/java/com/young/shortenerurl/url/presentation/mapper/UrlApiMapper.java @@ -7,7 +7,7 @@ @Component public class UrlApiMapper { - public UrlCreateRequest toUrlCreateRequest(UrlCreateApiRequest request){ + public UrlCreateRequest toUrlCreateRequest(UrlCreateApiRequest request) { return new UrlCreateRequest( request.originUrl(), request.encodingType()); diff --git a/src/main/java/com/young/shortenerurl/url/util/Base64EncoderV1.java b/src/main/java/com/young/shortenerurl/url/util/Base64EncoderV1.java index 8e638018..f0de5682 100644 --- a/src/main/java/com/young/shortenerurl/url/util/Base64EncoderV1.java +++ b/src/main/java/com/young/shortenerurl/url/util/Base64EncoderV1.java @@ -3,21 +3,22 @@ import org.springframework.stereotype.Component; @Component -public class Base64EncoderV1 extends Encoder{ +public class Base64EncoderV1 extends Encoder { private static final int BASE64 = 64; private static final String BASE64_CHAR = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-"; @Override public String encode(long index) { StringBuilder sb = new StringBuilder(); - while(index > 0) { + while (index > 0) { sb.append(BASE64_CHAR.charAt((int) (index % BASE64))); index /= BASE64; } - if (sb.length() > MAX_LENGTH){ + if (sb.length() > MAX_LENGTH) { throw new IllegalArgumentException("변환된 url은 8자리를 넘어갈 수 없습니다."); } return sb.toString(); } + } diff --git a/src/main/java/com/young/shortenerurl/url/util/Base64EncoderV2.java b/src/main/java/com/young/shortenerurl/url/util/Base64EncoderV2.java index 6be21cd4..8ccb1262 100644 --- a/src/main/java/com/young/shortenerurl/url/util/Base64EncoderV2.java +++ b/src/main/java/com/young/shortenerurl/url/util/Base64EncoderV2.java @@ -10,12 +10,12 @@ public class Base64EncoderV2 extends Encoder { @Override public String encode(long index) { StringBuilder sb = new StringBuilder(); - while(index > 0) { + while (index > 0) { sb.append(BASE62_CHAR.charAt((int) (index % BASE62))); index /= BASE62; } - if (sb.length() > MAX_LENGTH){ + if (sb.length() > MAX_LENGTH) { throw new IllegalArgumentException("변환된 url은 8자리를 넘어갈 수 없습니다."); } return sb.toString(); diff --git a/src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java b/src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java index 2d5df7c7..c003c014 100644 --- a/src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java +++ b/src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java @@ -31,7 +31,7 @@ class UrlServiceTest { private Url setupUrl; @BeforeEach - void setup(){ + void setup() { Encoder encoder = EncodingType.BASE_64_V2.getEncoder(); String originUrl = "setup-url1"; @@ -73,7 +73,7 @@ void createUrl_Base64V1() { @Test @DisplayName("url 저장 시 동일한 originUrl이 이미 존재한다면 존재하는 Url의 인코딩 url을 반환한다.") - void createUrl_alreadyExistUrl(){ + void createUrl_alreadyExistUrl() { //given UrlCreateRequest request = new UrlCreateRequest("setup-url1", EncodingType.BASE_64_V2); @@ -103,7 +103,7 @@ void findOriginUrl() { @Test @DisplayName("인코딩된 단축 URL을 통해 해당 URL의 방문 수를 확인할 수 있다.") - void findUrlVisitCount(){ + void findUrlVisitCount() { //given urlService.findOriginUrl(setupUrl.getEncodedUrl()); urlService.findOriginUrl(setupUrl.getEncodedUrl()); From b554ab0db2ac01ffe97a6eac8ae4e0a6e0f601a7 Mon Sep 17 00:00:00 2001 From: young970 Date: Sat, 7 Oct 2023 23:12:12 +0900 Subject: [PATCH 19/29] =?UTF-8?q?Refactor:findUrlInfo()=20URI=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/young/shortenerurl/url/application/UrlService.java | 2 +- .../shortenerurl/url/presentation/UrlRestController.java | 4 ++-- src/main/resources/templates/index.html | 2 +- .../young/shortenerurl/url/application/UrlServiceTest.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/young/shortenerurl/url/application/UrlService.java b/src/main/java/com/young/shortenerurl/url/application/UrlService.java index c568910a..9684e21c 100644 --- a/src/main/java/com/young/shortenerurl/url/application/UrlService.java +++ b/src/main/java/com/young/shortenerurl/url/application/UrlService.java @@ -45,7 +45,7 @@ public String findOriginUrl(String encodedUrl) { } @Transactional(readOnly = true) - public UrlInfoFindResponse findUrlInfo(String encodedUrl) { + public UrlInfoFindResponse findUrlInfoByEncodedUrl(String encodedUrl) { Url findUrl = urlRepository.getByEncodedUrl(encodedUrl); return UrlInfoFindResponse.from(findUrl); diff --git a/src/main/java/com/young/shortenerurl/url/presentation/UrlRestController.java b/src/main/java/com/young/shortenerurl/url/presentation/UrlRestController.java index 3ab57ecb..c7bad297 100644 --- a/src/main/java/com/young/shortenerurl/url/presentation/UrlRestController.java +++ b/src/main/java/com/young/shortenerurl/url/presentation/UrlRestController.java @@ -49,10 +49,10 @@ public ResponseEntity redirectUrl(@PathVariable String encodedUrl) { } @GetMapping( - value = "/visitCount/{encodedUrl}", + value = "/encodedUrl/{encodedUrl}", produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity findUrlInfo(@PathVariable String encodedUrl) { - UrlInfoFindResponse response = urlService.findUrlInfo(encodedUrl); + UrlInfoFindResponse response = urlService.findUrlInfoByEncodedUrl(encodedUrl); UrlInfoFindApiResponse apiResponse = UrlInfoFindApiResponse.of(response, URL_PRE_FIX); diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index f4acf216..8ea84a22 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -113,7 +113,7 @@

Find Shortened URL INFO

var encodedUrl = fullUrl.split('/').pop(); $.ajax({ - url: '/api/urls/visitCount/' + encodedUrl, + url: '/api/urls/encodedUrl/' + encodedUrl, type: 'GET', success: function(data) { console.log(data); diff --git a/src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java b/src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java index c003c014..538e4866 100644 --- a/src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java +++ b/src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java @@ -109,7 +109,7 @@ void findUrlVisitCount() { urlService.findOriginUrl(setupUrl.getEncodedUrl()); //when - UrlInfoFindResponse response = urlService.findUrlInfo(setupUrl.getEncodedUrl()); + UrlInfoFindResponse response = urlService.findUrlInfoByEncodedUrl(setupUrl.getEncodedUrl()); //then assertThat(response.originUrl()).isEqualTo(setupUrl.getOriginUrl()); From 8ec6441c877c2c4bb1c1caab47befdefa3f3e472 Mon Sep 17 00:00:00 2001 From: young970 Date: Sun, 8 Oct 2023 17:05:25 +0900 Subject: [PATCH 20/29] =?UTF-8?q?Refactor:=20originUrl=20=EA=B8=B8?= =?UTF-8?q?=EC=9D=B4=20=EC=A0=9C=ED=95=9C=202083=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Refactor: UrlRestController createUrl()에서 responseUrl에 관련된 중복 제거 --- src/main/java/com/young/shortenerurl/url/model/Url.java | 2 +- .../shortenerurl/url/presentation/UrlRestController.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/young/shortenerurl/url/model/Url.java b/src/main/java/com/young/shortenerurl/url/model/Url.java index 2637e131..2fa299e3 100644 --- a/src/main/java/com/young/shortenerurl/url/model/Url.java +++ b/src/main/java/com/young/shortenerurl/url/model/Url.java @@ -22,7 +22,7 @@ public class Url { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(length = 1000, nullable = false, updatable = false) + @Column(length = 2083, nullable = false, updatable = false) private String originUrl; @Embedded diff --git a/src/main/java/com/young/shortenerurl/url/presentation/UrlRestController.java b/src/main/java/com/young/shortenerurl/url/presentation/UrlRestController.java index c7bad297..c13c7b59 100644 --- a/src/main/java/com/young/shortenerurl/url/presentation/UrlRestController.java +++ b/src/main/java/com/young/shortenerurl/url/presentation/UrlRestController.java @@ -32,10 +32,12 @@ public UrlRestController(UrlService urlService, UrlApiMapper mapper) { @PostMapping(consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity createUrl(@RequestBody @Valid UrlCreateApiRequest request) { String encodedUrl = urlService.createUrl(mapper.toUrlCreateRequest(request)); - UrlCreateApiResponse apiResponse = UrlCreateApiResponse.from(URL_PRE_FIX + encodedUrl); + String apiResponseUrl = URL_PRE_FIX + encodedUrl; + + UrlCreateApiResponse apiResponse = UrlCreateApiResponse.from(apiResponseUrl); return ResponseEntity - .created(URI.create(URL_PRE_FIX + encodedUrl)) + .created(URI.create(apiResponseUrl)) .body(apiResponse); } From 66ec1eeadd4e5ff766ee29989f2fbb9a439e2123 Mon Sep 17 00:00:00 2001 From: young970 Date: Wed, 11 Oct 2023 22:56:14 +0900 Subject: [PATCH 21/29] =?UTF-8?q?Refactor:=20encodedUrl=20=EC=9C=A0?= =?UTF-8?q?=EB=8B=88=ED=81=AC=20=ED=82=A4=20=EB=84=A4=EC=9E=84=20=EC=A7=80?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/young/shortenerurl/global/ErrorResponse.java | 3 +++ .../java/com/young/shortenerurl/url/model/EncodedUrl.java | 2 +- src/main/java/com/young/shortenerurl/url/model/Url.java | 8 +++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/young/shortenerurl/global/ErrorResponse.java b/src/main/java/com/young/shortenerurl/global/ErrorResponse.java index 6d389139..13100c36 100644 --- a/src/main/java/com/young/shortenerurl/global/ErrorResponse.java +++ b/src/main/java/com/young/shortenerurl/global/ErrorResponse.java @@ -6,12 +6,15 @@ public record ErrorResponse( String detail, String instance, String time) { + public static ErrorResponse of( String detail, String instance) { + return new ErrorResponse( detail, instance, LocalDateTime.now().toString()); } + } diff --git a/src/main/java/com/young/shortenerurl/url/model/EncodedUrl.java b/src/main/java/com/young/shortenerurl/url/model/EncodedUrl.java index d1bd4253..73d2415c 100644 --- a/src/main/java/com/young/shortenerurl/url/model/EncodedUrl.java +++ b/src/main/java/com/young/shortenerurl/url/model/EncodedUrl.java @@ -15,7 +15,7 @@ public class EncodedUrl { private static final int MAX_URL_LENGTH = 8; - @Column(nullable = false, unique = true) + @Column(nullable = false, name = "encoded_url") private String encodedUrl; @Enumerated(EnumType.STRING) diff --git a/src/main/java/com/young/shortenerurl/url/model/Url.java b/src/main/java/com/young/shortenerurl/url/model/Url.java index 2fa299e3..367cfaf4 100644 --- a/src/main/java/com/young/shortenerurl/url/model/Url.java +++ b/src/main/java/com/young/shortenerurl/url/model/Url.java @@ -7,13 +7,19 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; import org.springframework.util.Assert; @Entity -@Table(name = "urls") +@Table(name = "urls", uniqueConstraints = { + @UniqueConstraint( + name = "encoded_url_unique", + columnNames = {"encoded_url"} + ) +}) @Getter @NoArgsConstructor(access = AccessLevel.PROTECTED) public class Url { From 71d0c4a21a04eb4cc9b8f3b72b2ead61bdd8b485 Mon Sep 17 00:00:00 2001 From: young970 Date: Wed, 11 Oct 2023 23:50:14 +0900 Subject: [PATCH 22/29] =?UTF-8?q?Fix:=20=EC=A1=B0=ED=9A=8C=EC=88=98=20?= =?UTF-8?q?=EC=A6=9D=EA=B0=80=20=EB=A1=9C=EC=A7=81=EC=97=90=20=EB=8C=80?= =?UTF-8?q?=ED=95=9C=20=EB=8F=99=EC=8B=9C=EC=84=B1=20=EC=9D=B4=EC=8A=88=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../url/application/UrlService.java | 2 +- .../url/infrastructures/UrlJpaRepository.java | 6 +++ .../url/infrastructures/UrlRepository.java | 8 +--- .../infrastructures/UrlRepositoryImpl.java | 12 ++++- src/main/resources/application.yml | 2 + .../url/application/UrlServiceTest.java | 45 ++++++++++++++++++- src/test/resources/application-test.yml | 2 + 7 files changed, 66 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/young/shortenerurl/url/application/UrlService.java b/src/main/java/com/young/shortenerurl/url/application/UrlService.java index 9684e21c..f2751f39 100644 --- a/src/main/java/com/young/shortenerurl/url/application/UrlService.java +++ b/src/main/java/com/young/shortenerurl/url/application/UrlService.java @@ -37,7 +37,7 @@ public String createUrl(UrlCreateRequest request) { @Transactional public String findOriginUrl(String encodedUrl) { - Url url = urlRepository.getByEncodedUrl(encodedUrl); + Url url = urlRepository.findByEncodedUrlWithPessimisticLock(encodedUrl); url.increaseVisitCount(); diff --git a/src/main/java/com/young/shortenerurl/url/infrastructures/UrlJpaRepository.java b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlJpaRepository.java index 03e8e57e..1226a66f 100644 --- a/src/main/java/com/young/shortenerurl/url/infrastructures/UrlJpaRepository.java +++ b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlJpaRepository.java @@ -1,7 +1,9 @@ package com.young.shortenerurl.url.infrastructures; import com.young.shortenerurl.url.model.Url; +import jakarta.persistence.LockModeType; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Lock; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -12,5 +14,9 @@ public interface UrlJpaRepository extends JpaRepository { @Query("SELECT u FROM Url u WHERE u.encodedUrl.encodedUrl = :encodedUrl") Optional findByEncodedUrl(@Param(value = "encodedUrl") String encodedUrl); + @Lock(LockModeType.PESSIMISTIC_WRITE) + @Query("SELECT u FROM Url u WHERE u.encodedUrl.encodedUrl = :encodedUrl") + Optional findByEncodedUrlWithPessimisticLock(@Param(value = "encodedUrl") String encodedUrl); + Optional findUrlByOriginUrl(String originUrl); } diff --git a/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepository.java b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepository.java index 37ba29e7..41609a75 100644 --- a/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepository.java +++ b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepository.java @@ -1,19 +1,15 @@ package com.young.shortenerurl.url.infrastructures; import com.young.shortenerurl.url.model.Url; -import jakarta.persistence.EntityNotFoundException; import java.util.Optional; public interface UrlRepository { Url save(Url url); - Optional findByEncodedUrl(String encodedUrl); + Url getByEncodedUrl(String encodedUrl); - default Url getByEncodedUrl(String encodedUrl) { - return findByEncodedUrl(encodedUrl) - .orElseThrow(() -> new EntityNotFoundException("해당 encodedUrl를 가진 url을 찾을 수 없습니다.")); - } + Url findByEncodedUrlWithPessimisticLock(String encodedUrl); Optional findByOriginUrl(String originUrl); } diff --git a/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepositoryImpl.java b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepositoryImpl.java index 3e0e92f7..cb6ea068 100644 --- a/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepositoryImpl.java +++ b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepositoryImpl.java @@ -1,6 +1,7 @@ package com.young.shortenerurl.url.infrastructures; import com.young.shortenerurl.url.model.Url; +import jakarta.persistence.EntityNotFoundException; import org.springframework.stereotype.Repository; import java.util.Optional; @@ -20,8 +21,15 @@ public Url save(Url url) { } @Override - public Optional findByEncodedUrl(String encodedUrl) { - return urlJpaRepository.findByEncodedUrl(encodedUrl); + public Url getByEncodedUrl(String encodedUrl) { + return urlJpaRepository.findByEncodedUrl(encodedUrl) + .orElseThrow(() -> new EntityNotFoundException("해당 encodedUrl를 가진 url을 찾을 수 없습니다.")); + } + + @Override + public Url findByEncodedUrlWithPessimisticLock(String encodedUrl) { + return urlJpaRepository.findByEncodedUrlWithPessimisticLock(encodedUrl) + .orElseThrow(() -> new EntityNotFoundException("해당 encodedUrl를 가진 url을 찾을 수 없습니다.")); } @Override diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 9cc33c38..a3654b42 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,6 +4,8 @@ spring: url: jdbc:mysql://localhost:3306/shortener_url?serverTimezone=Asia/Seoul username: root password: 12345! + hikari: + maximum-pool-size: 40 jpa: open-in-view: false diff --git a/src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java b/src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java index 538e4866..64ba64a7 100644 --- a/src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java +++ b/src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java @@ -1,5 +1,6 @@ package com.young.shortenerurl.url.application; +import com.young.shortenerurl.global.generator.SequenceRepository; import com.young.shortenerurl.url.application.dto.UrlCreateRequest; import com.young.shortenerurl.url.application.dto.UrlInfoFindResponse; import com.young.shortenerurl.url.infrastructures.UrlJpaRepository; @@ -7,19 +8,22 @@ import com.young.shortenerurl.url.model.EncodingType; import com.young.shortenerurl.url.model.Url; import com.young.shortenerurl.url.util.Encoder; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; -import org.springframework.transaction.annotation.Transactional; + +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) @ActiveProfiles("test") -@Transactional class UrlServiceTest { @Autowired @@ -28,6 +32,9 @@ class UrlServiceTest { @Autowired private UrlJpaRepository urlJpaRepository; + @Autowired + private SequenceRepository sequenceRepository; + private Url setupUrl; @BeforeEach @@ -43,6 +50,12 @@ void setup() { setupUrl = urlJpaRepository.save(url); } + @AfterEach + void tearDown(){ + urlJpaRepository.deleteAll(); + sequenceRepository.deleteAll(); + } + @Test @DisplayName("originUrl과 Base64V2을 통해 인코딩된 url을 생성할 수 있다.") void createUrl_Base64V2() { @@ -117,4 +130,32 @@ void findUrlVisitCount() { assertThat(response.visitCount()).isEqualTo(2); } + @Test + @DisplayName("originUrl 조회 시 조회수 동시성 테스트") + void findOriginUrl_concurrencyTest() throws InterruptedException { + //given + int threadCount = 100; + ExecutorService executorService = Executors.newFixedThreadPool(32); + CountDownLatch latch = new CountDownLatch(threadCount); + + //when + for (int i = 0; i < threadCount; i++){ + executorService.submit(() -> { + try { + urlService.findOriginUrl(setupUrl.getEncodedUrl()); + } finally { + latch.countDown(); + } + }); + } + + latch.await(); + + //then + Url url = urlJpaRepository.findById(setupUrl.getId()) + .orElseThrow(); + + assertThat(url.getVisitCount()).isEqualTo(100L); + } + } \ No newline at end of file diff --git a/src/test/resources/application-test.yml b/src/test/resources/application-test.yml index d2c095b9..4b75b1e1 100644 --- a/src/test/resources/application-test.yml +++ b/src/test/resources/application-test.yml @@ -4,6 +4,8 @@ spring: url: jdbc:mysql://localhost:3306/shortener_url_test?serverTimezone=Asia/Seoul username: root password: 12345! + hikari: + maximum-pool-size: 40 jpa: open-in-view: false From 3751162be59d103c3ca6d71f6cc17bc1fcbb0a30 Mon Sep 17 00:00:00 2001 From: young970 Date: Mon, 25 Mar 2024 22:22:16 +0900 Subject: [PATCH 23/29] =?UTF-8?q?Refactor:=20Url=20=EC=97=94=ED=8B=B0?= =?UTF-8?q?=ED=8B=B0=20=EB=A7=A4=EC=A7=81=EB=84=98=EB=B2=84=20=EC=83=81?= =?UTF-8?q?=EC=88=98=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/young/shortenerurl/url/model/Url.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/young/shortenerurl/url/model/Url.java b/src/main/java/com/young/shortenerurl/url/model/Url.java index 367cfaf4..83d7859d 100644 --- a/src/main/java/com/young/shortenerurl/url/model/Url.java +++ b/src/main/java/com/young/shortenerurl/url/model/Url.java @@ -23,12 +23,13 @@ @Getter @NoArgsConstructor(access = AccessLevel.PROTECTED) public class Url { + private static final int MAX_ORIGIN_URL_LENGTH = 2083; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(length = 2083, nullable = false, updatable = false) + @Column(length = MAX_ORIGIN_URL_LENGTH, nullable = false, updatable = false) private String originUrl; @Embedded From 5f9d6f9dfbb913356cd71a70ca9d0000044472cb Mon Sep 17 00:00:00 2001 From: young970 Date: Mon, 25 Mar 2024 22:51:20 +0900 Subject: [PATCH 24/29] =?UTF-8?q?Refactor:=20url=20=EC=83=9D=EC=84=B1=20AP?= =?UTF-8?q?I=20=EC=97=90=EC=84=9C=20orElseGet()=EC=9D=84=20=EC=9D=B4?= =?UTF-8?q?=EC=9A=A9=ED=95=98=EB=8A=94=20=EB=B0=A9=EC=8B=9D=20=EB=8C=80?= =?UTF-8?q?=EC=8B=A0=20exists=EB=A5=BC=20=EC=9D=B4=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EB=8A=94=20=EB=B0=A9=EC=8B=9D=EC=9C=BC=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Optional의 orElseGet()메서드는 디폴트 값을 반환하는 용도가 알맞다고 생각하기에 방식 변경함. --- .../shortenerurl/url/application/UrlService.java | 15 +++++++-------- .../url/application/dto/UrlCreateRequest.java | 12 +++++++++++- .../url/infrastructures/UrlJpaRepository.java | 2 ++ .../url/infrastructures/UrlRepository.java | 4 +++- .../url/infrastructures/UrlRepositoryImpl.java | 10 ++++++++-- 5 files changed, 31 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/young/shortenerurl/url/application/UrlService.java b/src/main/java/com/young/shortenerurl/url/application/UrlService.java index f2751f39..fe828037 100644 --- a/src/main/java/com/young/shortenerurl/url/application/UrlService.java +++ b/src/main/java/com/young/shortenerurl/url/application/UrlService.java @@ -23,16 +23,15 @@ public UrlService(UrlRepository urlRepository, EncodingExecutor encodingExecutor public String createUrl(UrlCreateRequest request) { String encodedUrl = encodingExecutor.encode(request.encodingType()); - Url savedUrl = urlRepository.findByOriginUrl(request.originUrl()).orElseGet(() -> { - Url url = new Url( - request.originUrl(), - new EncodedUrl(encodedUrl, request.encodingType()) - ); + if (urlRepository.existsByOriginUrl(request.originUrl())) { + Url url = urlRepository.getByOriginUrl(request.originUrl()); - return urlRepository.save(url); - }); + return url.getEncodedUrl(); + } + + Url savedUrl = request.toUrl(encodedUrl); + return urlRepository.save(savedUrl).getEncodedUrl(); - return savedUrl.getEncodedUrl(); } @Transactional diff --git a/src/main/java/com/young/shortenerurl/url/application/dto/UrlCreateRequest.java b/src/main/java/com/young/shortenerurl/url/application/dto/UrlCreateRequest.java index 1863efa0..5f517590 100644 --- a/src/main/java/com/young/shortenerurl/url/application/dto/UrlCreateRequest.java +++ b/src/main/java/com/young/shortenerurl/url/application/dto/UrlCreateRequest.java @@ -1,6 +1,16 @@ package com.young.shortenerurl.url.application.dto; +import com.young.shortenerurl.url.model.EncodedUrl; import com.young.shortenerurl.url.model.EncodingType; +import com.young.shortenerurl.url.model.Url; -public record UrlCreateRequest(String originUrl, EncodingType encodingType) { +public record UrlCreateRequest( + String originUrl, + EncodingType encodingType +) { + public Url toUrl(String encodedUrl) { + return new Url( + originUrl, + new EncodedUrl(encodedUrl, encodingType)); + } } diff --git a/src/main/java/com/young/shortenerurl/url/infrastructures/UrlJpaRepository.java b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlJpaRepository.java index 1226a66f..2e164a53 100644 --- a/src/main/java/com/young/shortenerurl/url/infrastructures/UrlJpaRepository.java +++ b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlJpaRepository.java @@ -19,4 +19,6 @@ public interface UrlJpaRepository extends JpaRepository { Optional findByEncodedUrlWithPessimisticLock(@Param(value = "encodedUrl") String encodedUrl); Optional findUrlByOriginUrl(String originUrl); + + Boolean existsByOriginUrl(String originUrl); } diff --git a/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepository.java b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepository.java index 41609a75..cfd3a4db 100644 --- a/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepository.java +++ b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepository.java @@ -11,5 +11,7 @@ public interface UrlRepository { Url findByEncodedUrlWithPessimisticLock(String encodedUrl); - Optional findByOriginUrl(String originUrl); + Boolean existsByOriginUrl(String originUrl); + + Url getByOriginUrl(String originUrl); } diff --git a/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepositoryImpl.java b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepositoryImpl.java index cb6ea068..aa81d4b4 100644 --- a/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepositoryImpl.java +++ b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepositoryImpl.java @@ -33,8 +33,14 @@ public Url findByEncodedUrlWithPessimisticLock(String encodedUrl) { } @Override - public Optional findByOriginUrl(String originUrl) { - return urlJpaRepository.findUrlByOriginUrl(originUrl); + public Url getByOriginUrl(String originUrl) { + return urlJpaRepository.findUrlByOriginUrl(originUrl) + .orElseThrow(() -> new EntityNotFoundException("해당 originUrl를 가진 url을 찾을 수 없습니다.")); + } + + @Override + public Boolean existsByOriginUrl(String originUrl) { + return urlJpaRepository.existsByOriginUrl(originUrl); } } From 2f5855af113c9f55673ca0b1659bc5d04ff3f480 Mon Sep 17 00:00:00 2001 From: young970 Date: Mon, 25 Mar 2024 23:22:50 +0900 Subject: [PATCH 25/29] =?UTF-8?q?Refactor:=20=EC=A1=B0=ED=9A=8C=EC=88=98?= =?UTF-8?q?=20=EC=A6=9D=EA=B0=80=20=EB=A1=9C=EC=A7=81=20=EC=9D=B4=EB=B2=A4?= =?UTF-8?q?=ED=8A=B8=EB=A1=9C=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../global/config/AsyncConfig.java | 9 +++++++ .../url/application/UrlService.java | 19 +++++++------- .../url/handler/UrlEventHandler.java | 25 +++++++++++++++++++ .../url/handler/dto/OriginUrlFindEvent.java | 9 +++++++ .../url/infrastructures/UrlJpaRepository.java | 9 ++++--- .../url/infrastructures/UrlRepository.java | 4 +-- .../infrastructures/UrlRepositoryImpl.java | 11 ++++---- 7 files changed, 65 insertions(+), 21 deletions(-) create mode 100644 src/main/java/com/young/shortenerurl/global/config/AsyncConfig.java create mode 100644 src/main/java/com/young/shortenerurl/url/handler/UrlEventHandler.java create mode 100644 src/main/java/com/young/shortenerurl/url/handler/dto/OriginUrlFindEvent.java diff --git a/src/main/java/com/young/shortenerurl/global/config/AsyncConfig.java b/src/main/java/com/young/shortenerurl/global/config/AsyncConfig.java new file mode 100644 index 00000000..592b492c --- /dev/null +++ b/src/main/java/com/young/shortenerurl/global/config/AsyncConfig.java @@ -0,0 +1,9 @@ +package com.young.shortenerurl.global.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.EnableAsync; + +@EnableAsync +@Configuration +public class AsyncConfig { +} diff --git a/src/main/java/com/young/shortenerurl/url/application/UrlService.java b/src/main/java/com/young/shortenerurl/url/application/UrlService.java index fe828037..36645952 100644 --- a/src/main/java/com/young/shortenerurl/url/application/UrlService.java +++ b/src/main/java/com/young/shortenerurl/url/application/UrlService.java @@ -2,22 +2,22 @@ import com.young.shortenerurl.url.application.dto.UrlCreateRequest; import com.young.shortenerurl.url.application.dto.UrlInfoFindResponse; +import com.young.shortenerurl.url.handler.dto.OriginUrlFindEvent; import com.young.shortenerurl.url.infrastructures.UrlRepository; import com.young.shortenerurl.url.model.EncodedUrl; import com.young.shortenerurl.url.model.Url; +import lombok.RequiredArgsConstructor; +import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +@RequiredArgsConstructor @Service public class UrlService { private final UrlRepository urlRepository; private final EncodingExecutor encodingExecutor; - - public UrlService(UrlRepository urlRepository, EncodingExecutor encodingExecutor) { - this.urlRepository = urlRepository; - this.encodingExecutor = encodingExecutor; - } + private final ApplicationEventPublisher eventPublisher; @Transactional public String createUrl(UrlCreateRequest request) { @@ -31,14 +31,15 @@ public String createUrl(UrlCreateRequest request) { Url savedUrl = request.toUrl(encodedUrl); return urlRepository.save(savedUrl).getEncodedUrl(); - } - @Transactional + @Transactional(readOnly = true) public String findOriginUrl(String encodedUrl) { - Url url = urlRepository.findByEncodedUrlWithPessimisticLock(encodedUrl); + Url url = urlRepository.getByEncodedUrl(encodedUrl); - url.increaseVisitCount(); + eventPublisher.publishEvent( + OriginUrlFindEvent.from(url.getId()) + ); return url.getOriginUrl(); } diff --git a/src/main/java/com/young/shortenerurl/url/handler/UrlEventHandler.java b/src/main/java/com/young/shortenerurl/url/handler/UrlEventHandler.java new file mode 100644 index 00000000..c3088d8b --- /dev/null +++ b/src/main/java/com/young/shortenerurl/url/handler/UrlEventHandler.java @@ -0,0 +1,25 @@ +package com.young.shortenerurl.url.handler; + +import com.young.shortenerurl.url.handler.dto.OriginUrlFindEvent; +import com.young.shortenerurl.url.infrastructures.UrlRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.event.TransactionPhase; +import org.springframework.transaction.event.TransactionalEventListener; + +@RequiredArgsConstructor +@Component +public class UrlEventHandler { + + private final UrlRepository urlRepository; + + @Async + @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT) + @Transactional(propagation = Propagation.REQUIRES_NEW) + public void handleFindOriginUrlEvent(OriginUrlFindEvent event) { + urlRepository.increaseVisitCount(event.urlId()); + } +} diff --git a/src/main/java/com/young/shortenerurl/url/handler/dto/OriginUrlFindEvent.java b/src/main/java/com/young/shortenerurl/url/handler/dto/OriginUrlFindEvent.java new file mode 100644 index 00000000..8ae440fa --- /dev/null +++ b/src/main/java/com/young/shortenerurl/url/handler/dto/OriginUrlFindEvent.java @@ -0,0 +1,9 @@ +package com.young.shortenerurl.url.handler.dto; + +public record OriginUrlFindEvent( + Long urlId +) { + public static OriginUrlFindEvent from(Long urlId) { + return new OriginUrlFindEvent(urlId); + } +} diff --git a/src/main/java/com/young/shortenerurl/url/infrastructures/UrlJpaRepository.java b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlJpaRepository.java index 2e164a53..0068589c 100644 --- a/src/main/java/com/young/shortenerurl/url/infrastructures/UrlJpaRepository.java +++ b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlJpaRepository.java @@ -4,6 +4,7 @@ import jakarta.persistence.LockModeType; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Lock; +import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -14,11 +15,11 @@ public interface UrlJpaRepository extends JpaRepository { @Query("SELECT u FROM Url u WHERE u.encodedUrl.encodedUrl = :encodedUrl") Optional findByEncodedUrl(@Param(value = "encodedUrl") String encodedUrl); - @Lock(LockModeType.PESSIMISTIC_WRITE) - @Query("SELECT u FROM Url u WHERE u.encodedUrl.encodedUrl = :encodedUrl") - Optional findByEncodedUrlWithPessimisticLock(@Param(value = "encodedUrl") String encodedUrl); - Optional findUrlByOriginUrl(String originUrl); Boolean existsByOriginUrl(String originUrl); + + @Modifying(clearAutomatically = true) + @Query(value = "UPDATE urls SET visit_count = visit_count + 1 WHERE id = :urlId", nativeQuery = true) + void increaseVisitCount(Long urlId); } diff --git a/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepository.java b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepository.java index cfd3a4db..e96e507e 100644 --- a/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepository.java +++ b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepository.java @@ -9,9 +9,9 @@ public interface UrlRepository { Url getByEncodedUrl(String encodedUrl); - Url findByEncodedUrlWithPessimisticLock(String encodedUrl); - Boolean existsByOriginUrl(String originUrl); Url getByOriginUrl(String originUrl); + + void increaseVisitCount(Long urlId); } diff --git a/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepositoryImpl.java b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepositoryImpl.java index aa81d4b4..20fc111c 100644 --- a/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepositoryImpl.java +++ b/src/main/java/com/young/shortenerurl/url/infrastructures/UrlRepositoryImpl.java @@ -26,18 +26,17 @@ public Url getByEncodedUrl(String encodedUrl) { .orElseThrow(() -> new EntityNotFoundException("해당 encodedUrl를 가진 url을 찾을 수 없습니다.")); } - @Override - public Url findByEncodedUrlWithPessimisticLock(String encodedUrl) { - return urlJpaRepository.findByEncodedUrlWithPessimisticLock(encodedUrl) - .orElseThrow(() -> new EntityNotFoundException("해당 encodedUrl를 가진 url을 찾을 수 없습니다.")); - } - @Override public Url getByOriginUrl(String originUrl) { return urlJpaRepository.findUrlByOriginUrl(originUrl) .orElseThrow(() -> new EntityNotFoundException("해당 originUrl를 가진 url을 찾을 수 없습니다.")); } + @Override + public void increaseVisitCount(Long urlId) { + urlJpaRepository.increaseVisitCount(urlId); + } + @Override public Boolean existsByOriginUrl(String originUrl) { return urlJpaRepository.existsByOriginUrl(originUrl); From 0fe105f872343c29b6ad2f4d38d0c97d3e25b81c Mon Sep 17 00:00:00 2001 From: young970 Date: Mon, 25 Mar 2024 23:53:14 +0900 Subject: [PATCH 26/29] =?UTF-8?q?Test:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=ED=99=98=EA=B2=BD=EC=97=90=EC=84=9C=20=EB=B9=84=EB=8F=99?= =?UTF-8?q?=EA=B8=B0=20=EB=A1=9C=EC=A7=81=20=EB=8F=99=EA=B8=B0=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 1 + .../global/CustomAsyncExceptionHandler.java | 16 +++++++++++ .../global/config/AsyncConfig.java | 27 ++++++++++++++++++- .../shortenerurl/support/AsyncTestConfig.java | 27 +++++++++++++++++++ .../shortenerurl/support/IntegrationTest.java | 11 ++++++++ .../url/application/UrlServiceTest.java | 5 ++-- 6 files changed, 83 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/young/shortenerurl/global/CustomAsyncExceptionHandler.java create mode 100644 src/test/java/com/young/shortenerurl/support/AsyncTestConfig.java create mode 100644 src/test/java/com/young/shortenerurl/support/IntegrationTest.java diff --git a/build.gradle b/build.gradle index 8e64df2f..0f2c2763 100644 --- a/build.gradle +++ b/build.gradle @@ -28,6 +28,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-validation' compileOnly 'org.projectlombok:lombok' runtimeOnly 'com.mysql:mysql-connector-j' + runtimeOnly 'com.h2database:h2' annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' } diff --git a/src/main/java/com/young/shortenerurl/global/CustomAsyncExceptionHandler.java b/src/main/java/com/young/shortenerurl/global/CustomAsyncExceptionHandler.java new file mode 100644 index 00000000..93feba14 --- /dev/null +++ b/src/main/java/com/young/shortenerurl/global/CustomAsyncExceptionHandler.java @@ -0,0 +1,16 @@ +package com.young.shortenerurl.global; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; + +import java.lang.reflect.Method; + +@Slf4j +public class CustomAsyncExceptionHandler implements AsyncUncaughtExceptionHandler { + + @Override + public void handleUncaughtException(Throwable ex, Method method, Object... params) { + log.warn("Async Exception: ", ex.fillInStackTrace()); + } + +} diff --git a/src/main/java/com/young/shortenerurl/global/config/AsyncConfig.java b/src/main/java/com/young/shortenerurl/global/config/AsyncConfig.java index 592b492c..53814504 100644 --- a/src/main/java/com/young/shortenerurl/global/config/AsyncConfig.java +++ b/src/main/java/com/young/shortenerurl/global/config/AsyncConfig.java @@ -1,9 +1,34 @@ package com.young.shortenerurl.global.config; +import com.young.shortenerurl.global.CustomAsyncExceptionHandler; +import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.AsyncConfigurer; import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +import java.util.concurrent.Executor; @EnableAsync @Configuration -public class AsyncConfig { +public class AsyncConfig implements AsyncConfigurer { + + @Override + @Bean(name = "asyncExecutor") + public Executor getAsyncExecutor() { + ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); + executor.setCorePoolSize(8); + executor.setMaxPoolSize(8); + executor.setQueueCapacity(500); + executor.setThreadNamePrefix("url-shortener-async"); + executor.initialize(); + return executor; + } + + @Override + public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() { + return new CustomAsyncExceptionHandler(); + } + } diff --git a/src/test/java/com/young/shortenerurl/support/AsyncTestConfig.java b/src/test/java/com/young/shortenerurl/support/AsyncTestConfig.java new file mode 100644 index 00000000..b296c115 --- /dev/null +++ b/src/test/java/com/young/shortenerurl/support/AsyncTestConfig.java @@ -0,0 +1,27 @@ +package com.young.shortenerurl.support; + +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.config.BeanPostProcessor; +import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.core.task.SyncTaskExecutor; + +@TestConfiguration +public class AsyncTestConfig { + + @Bean + public AsyncExecutorPostProcessor asyncExecutorPostProcessor() { + return new AsyncExecutorPostProcessor(); + } + + static class AsyncExecutorPostProcessor implements BeanPostProcessor { + + @Override + public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { + if (beanName.equals("asyncExecutor")) { + return new SyncTaskExecutor(); + } + return bean; + } + } +} diff --git a/src/test/java/com/young/shortenerurl/support/IntegrationTest.java b/src/test/java/com/young/shortenerurl/support/IntegrationTest.java new file mode 100644 index 00000000..e2b8f2de --- /dev/null +++ b/src/test/java/com/young/shortenerurl/support/IntegrationTest.java @@ -0,0 +1,11 @@ +package com.young.shortenerurl.support; + +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Import; +import org.springframework.test.context.ActiveProfiles; + +@ActiveProfiles("test") +@SpringBootTest +@Import({AsyncTestConfig.class}) +public class IntegrationTest { +} diff --git a/src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java b/src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java index 64ba64a7..ace91a25 100644 --- a/src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java +++ b/src/test/java/com/young/shortenerurl/url/application/UrlServiceTest.java @@ -1,6 +1,7 @@ package com.young.shortenerurl.url.application; import com.young.shortenerurl.global.generator.SequenceRepository; +import com.young.shortenerurl.support.IntegrationTest; import com.young.shortenerurl.url.application.dto.UrlCreateRequest; import com.young.shortenerurl.url.application.dto.UrlInfoFindResponse; import com.young.shortenerurl.url.infrastructures.UrlJpaRepository; @@ -22,9 +23,7 @@ import static org.assertj.core.api.Assertions.assertThat; -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) -@ActiveProfiles("test") -class UrlServiceTest { +class UrlServiceTest extends IntegrationTest { @Autowired private UrlService urlService; From 06a0493c4e50cbb2c329adf9a470aa7b419a8560 Mon Sep 17 00:00:00 2001 From: young970 Date: Mon, 25 Mar 2024 23:55:24 +0900 Subject: [PATCH 27/29] =?UTF-8?q?Chore:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=ED=99=98=EA=B2=BD=20DB=20=EC=8A=A4=ED=94=84=EB=A7=81=20?= =?UTF-8?q?=EC=9E=84=EB=B2=A0=EB=94=94=EB=93=9C=20=EB=94=94=EB=B9=84(H2)?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/resources/application-test.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/test/resources/application-test.yml b/src/test/resources/application-test.yml index 4b75b1e1..1081ad80 100644 --- a/src/test/resources/application-test.yml +++ b/src/test/resources/application-test.yml @@ -1,11 +1,9 @@ spring: datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/shortener_url_test?serverTimezone=Asia/Seoul - username: root - password: 12345! - hikari: - maximum-pool-size: 40 + url: jdbc:h2:mem:refund_helper + driverClassName: org.h2.Driver + username: sa + password: jpa: open-in-view: false From 3f8dcdc3143352f3914b0f902b2c77f239dfcc78 Mon Sep 17 00:00:00 2001 From: young970 Date: Wed, 3 Apr 2024 00:32:27 +0900 Subject: [PATCH 28/29] =?UTF-8?q?Refactor:=20JavaScript=20var=20->=20let?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/index.html | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 8ea84a22..b7315e1a 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -26,7 +26,6 @@ URL-SHORTENER - @@ -67,13 +66,15 @@

Find Shortened URL INFO

+ +