Skip to content

Commit 3259651

Browse files
author
youngjun-p
committed
♻️Refactor: ktlint 적용
1 parent 2906df1 commit 3259651

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+750
-613
lines changed

‎.gitignore‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,62 @@
11
docker-compose.yml
2+
# Compiled class file
3+
*.class
24

5+
# Log file
6+
*.log
7+
8+
# Package Files
9+
*.jar
10+
*.war
11+
*.nar
12+
*.ear
13+
*.zip
14+
*.tar.gz
15+
*.rar
16+
17+
# IDE files
18+
.idea/
19+
*.iml
20+
.vscode/
21+
.classpath
22+
.project
23+
.settings/
24+
25+
# Build output
26+
/target/
27+
/build/
28+
/out/
29+
/bin/
30+
31+
# Spring Boot
32+
.spring-boot-devtools
33+
34+
# Gradle
35+
.gradle/
36+
build/
37+
38+
# Maven
39+
target/
40+
pom.xml.tag
41+
pom.xml.releaseBackup
42+
pom.xml.versionsBackup
43+
pom.xml.next
44+
release.properties
45+
dependency-reduced-pom.xml
46+
buildNumber.properties
47+
.mvn/timing.properties
48+
49+
# 환경 변수 및 비밀 파일
50+
.env
51+
.env.*
52+
!.env.example
53+
54+
# OS Files
55+
.DS_Store
56+
Thumbs.db
57+
58+
# Application properties with secrets
59+
src/main/resources/application-secrets.yml
360
HELP.md
461
.gradle
562
build/

‎Dockerfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ EXPOSE 8080
1010
ARG JAR_FILE=build/libs/*.jar
1111
COPY ${JAR_FILE} weski-app.jar
1212

13-
CMD java -Dserver.port=8080 \
14-
-Dspring.datasource.username=master \
15-
-Dspring.datasource.password=master \
13+
CMD java -Dserver.port=${PORT:-8080} \
14+
-Dspring.profiles.active=${SPRING_PROFILES_ACTIVE:-prod} \
1615
-jar /weski-app.jar

‎build.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ repositories {
2222
dependencies {
2323
implementation("org.springframework.boot:spring-boot-starter")
2424
implementation("org.springframework.boot:spring-boot-starter-web")
25+
implementation("org.springframework.boot:spring-boot-starter-actuator")
26+
implementation("org.springframework.boot:spring-boot-starter-validation")
2527
implementation("org.jetbrains.kotlin:kotlin-reflect")
2628
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
2729
implementation("org.springframework.boot:spring-boot-starter-data-jpa")

src/main/kotlin/nexters/weski/app_version/AppVersionCheckController.kt renamed to src/main/kotlin/nexters/weski/app/version/AppVersionCheckController.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
package nexters.weski.app_version
1+
package nexters.weski.app.version
22

33
import io.swagger.v3.oas.annotations.Operation
44
import io.swagger.v3.oas.annotations.Parameter
55
import io.swagger.v3.oas.annotations.tags.Tag
6-
import org.springframework.web.bind.annotation.*
6+
import org.springframework.web.bind.annotation.GetMapping
7+
import org.springframework.web.bind.annotation.RequestParam
8+
import org.springframework.web.bind.annotation.RestController
79

810
@Tag(name = "App 최소 버전 check API", description = "App 최소 버전 check API")
911
@RestController

src/main/kotlin/nexters/weski/app_version/AppVersionCheckService.kt renamed to src/main/kotlin/nexters/weski/app/version/AppVersionCheckService.kt

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package nexters.weski.app_version
1+
package nexters.weski.app.version
22

33
import org.springframework.stereotype.Service
44

@@ -8,15 +8,17 @@ class AppVersionCheckService {
88
const val IOS_MIN_VERSION = "3.0.2"
99
const val ANDROID_MIN_VERSION = "3.0.1"
1010
}
11+
1112
fun getAppVersion(
1213
platform: Platform,
1314
version: String,
1415
): AppVersionResponseDto {
15-
val minVersion = when (platform) {
16-
Platform.IOS -> IOS_MIN_VERSION
17-
Platform.ANDROID -> ANDROID_MIN_VERSION
18-
else -> throw IllegalArgumentException("Unsupported platform: $platform")
19-
}
16+
val minVersion =
17+
when (platform) {
18+
Platform.IOS -> IOS_MIN_VERSION
19+
Platform.ANDROID -> ANDROID_MIN_VERSION
20+
else -> throw IllegalArgumentException("Unsupported platform: $platform")
21+
}
2022
return AppVersionResponseDto(
2123
platform = platform,
2224
minVersion = minVersion,
@@ -27,19 +29,14 @@ class AppVersionCheckService {
2729
private fun isForceUpdate(
2830
platform: Platform,
2931
version: String,
30-
): Boolean {
31-
return when (platform) {
32+
): Boolean =
33+
when (platform) {
3234
Platform.IOS -> isForceUpdateForIOS(version)
3335
Platform.ANDROID -> isForceUpdateForAndroid(version)
3436
else -> throw IllegalArgumentException("Unsupported platform: $platform")
3537
}
36-
}
3738

38-
private fun isForceUpdateForIOS(version: String): Boolean {
39-
return version < IOS_MIN_VERSION
40-
}
39+
private fun isForceUpdateForIOS(version: String): Boolean = version < IOS_MIN_VERSION
4140

42-
private fun isForceUpdateForAndroid(version: String): Boolean {
43-
return version < ANDROID_MIN_VERSION
44-
}
45-
}
41+
private fun isForceUpdateForAndroid(version: String): Boolean = version < ANDROID_MIN_VERSION
42+
}

src/main/kotlin/nexters/weski/app_version/AppVersionResponseDto.kt renamed to src/main/kotlin/nexters/weski/app/version/AppVersionResponseDto.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package nexters.weski.app_version
1+
package nexters.weski.app.version
22

33
import io.swagger.v3.oas.annotations.media.Schema
44

@@ -10,4 +10,4 @@ data class AppVersionResponseDto(
1010
val minVersion: String,
1111
// true = App 강제 업데이트 대상임을 의미
1212
val isForceUpdate: Boolean = false,
13-
)
13+
)

src/main/kotlin/nexters/weski/app_version/Platform.kt renamed to src/main/kotlin/nexters/weski/app/version/Platform.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package nexters.weski.app_version
1+
package nexters.weski.app.version
22

33
enum class Platform {
44
IOS,
55
ANDROID,
66
WEB,
77
UNKNOWN,
8-
}
8+
}

0 commit comments

Comments
 (0)