Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: team-xquare/v1-service-git
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.0.6
Choose a base ref
...
head repository: team-xquare/v1-service-git
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Loading
Showing with 852 additions and 765 deletions.
  1. +0 −77 .github/workflows/prod-build.yaml
  2. +0 −70 .github/workflows/stag-build.yaml
  3. +46 −0 .github/workflows/xquare-deployment-prod.yaml
  4. +46 −0 .github/workflows/xquare-deployment-stag.yaml
  5. +5 −0 .xquare/config.yaml
  6. +3 −1 Dockerfile
  7. +17 −7 buildSrc/src/main/kotlin/Dependencies.kt
  8. +2 −1 buildSrc/src/main/kotlin/DependencyVersions.kt
  9. +1 −2 git-application/build.gradle.kts
  10. +0 −17 git-application/src/main/kotlin/com/xquare/git/git/dto/FindAllUserResponse.kt
  11. +0 −46 git-application/src/main/kotlin/com/xquare/git/git/facade/GitFacade.kt
  12. +0 −3 git-application/src/main/kotlin/com/xquare/git/git/spi/GitPort.kt
  13. +0 −16 git-application/src/main/kotlin/com/xquare/git/git/usecase/CheckUsernameUseCase.kt
  14. +0 −34 git-application/src/main/kotlin/com/xquare/git/git/usecase/FindAllGitUseCase.kt
  15. +0 −28 git-application/src/main/kotlin/com/xquare/git/git/usecase/FindGitByCurrentUserIdUseCase.kt
  16. +0 −26 git-application/src/main/kotlin/com/xquare/git/git/usecase/SaveUsernameUseCase.kt
  17. +0 −23 git-application/src/main/kotlin/com/xquare/git/git/usecase/UpdateGitUseCase.kt
  18. +0 −3 git-application/src/main/kotlin/com/xquare/git/github/spi/GithubPort.kt
  19. +0 −9 git-application/src/main/kotlin/com/xquare/git/github/spi/QueryGithubPort.kt
  20. +0 −15 git-application/src/main/kotlin/com/xquare/git/github/usecase/GetGithubAccessTokenUseCase.kt
  21. +0 −15 git-application/src/main/kotlin/com/xquare/git/github/usecase/GetGithubUserInfoUseCase.kt
  22. +0 −16 git-application/src/main/kotlin/com/xquare/git/user/dto/FindUserListResponse.kt
  23. +0 −11 git-application/src/main/kotlin/com/xquare/git/user/spi/QueryUserPort.kt
  24. +0 −3 git-application/src/main/kotlin/com/xquare/git/user/spi/UserPort.kt
  25. +0 −15 git-application/src/main/kotlin/com/xquare/git/user/usecase/GetUserIdUseCase.kt
  26. +5 −0 git-application/src/main/kotlin/com/xquare/v1servicegit/common/annotations/Aggregate.kt
  27. +5 −0 git-application/src/main/kotlin/com/xquare/v1servicegit/common/annotations/UseCase.kt
  28. +2 −3 ...git → git-application/src/main/kotlin/com/xquare/v1servicegit/common}/exceptions/BaseException.kt
  29. +2 −2 ... git-application/src/main/kotlin/com/xquare/v1servicegit/common}/exceptions/ExceptionAttribute.kt
  30. +3 −3 ...in/com/xquare/git/git/model → git-application/src/main/kotlin/com/xquare/v1servicegit/git}/Git.kt
  31. +1 −1 ...on/src/main/kotlin/com/xquare/{git/git/dto → v1servicegit/git/dto/request}/FindUserInfoRequest.kt
  32. +29 −0 git-application/src/main/kotlin/com/xquare/v1servicegit/git/dto/response/FindAllUserResponse.kt
  33. +5 −0 ...cation/src/main/kotlin/com/xquare/v1servicegit/git/dto/response/IsConnectedGithubOauthResponse.kt
  34. +6 −6 git-application/src/main/kotlin/com/xquare/{git → v1servicegit}/git/exceptions/GitExceptions.kt
  35. +2 −2 git-application/src/main/kotlin/com/xquare/{git/git/spi → v1servicegit/git/port}/CommandGitPort.kt
  36. +3 −0 git-application/src/main/kotlin/com/xquare/v1servicegit/git/port/GitPort.kt
  37. +4 −3 git-application/src/main/kotlin/com/xquare/{git/git/spi → v1servicegit/git/port}/QueryGitPort.kt
  38. +81 −0 git-application/src/main/kotlin/com/xquare/v1servicegit/git/usecase/GitUseCase.kt
  39. +1 −1 ...otlin/com/xquare/{git/github/dto → v1servicegit/github/dto/response}/GetGithubUserInfoResponse.kt
  40. +1 −1 ...n/src/main/kotlin/com/xquare/{git/github/dto → v1servicegit/github/dto/response}/TokenResponse.kt
  41. +3 −0 git-application/src/main/kotlin/com/xquare/v1servicegit/github/port/GithubPort.kt
  42. +9 −0 git-application/src/main/kotlin/com/xquare/v1servicegit/github/port/QueryGithubPort.kt
  43. +16 −0 git-application/src/main/kotlin/com/xquare/v1servicegit/user/dto/response/FindUserListResponse.kt
  44. +3 −3 git-application/src/main/kotlin/com/xquare/{git → v1servicegit}/user/exceptions/UserExceptions.kt
  45. +11 −0 git-application/src/main/kotlin/com/xquare/v1servicegit/user/port/QueryUserPort.kt
  46. +3 −0 git-application/src/main/kotlin/com/xquare/v1servicegit/user/port/UserPort.kt
  47. +5 −0 git-application/src/test/kotlin/com/xquare/git/BaseApplicationTest.kt
  48. +14 −0 git-application/src/test/kotlin/com/xquare/git/config/DefaultTestConfig.kt
  49. +16 −0 git-application/src/test/kotlin/com/xquare/git/git/GitFixtures.kt
  50. +68 −0 git-application/src/test/kotlin/com/xquare/git/git/usecase/FindAllGitTest.kt
  51. +67 −0 git-application/src/test/kotlin/com/xquare/git/git/usecase/FindGitByCurrentUserIdTest.kt
  52. +36 −0 git-application/src/test/kotlin/com/xquare/git/git/usecase/SaveUsernameTest.kt
  53. +53 −0 git-application/src/test/kotlin/com/xquare/git/git/usecase/UpdateGitTest.kt
  54. +0 −2 git-domain/build.gradle.kts
  55. +0 −5 git-domain/src/main/kotlin/com/xquare/git/annotations/Aggregate.kt
  56. +0 −5 git-domain/src/main/kotlin/com/xquare/git/annotations/UseCase.kt
  57. +0 −2 git-infrastructure/build.gradle.kts
  58. +0 −28 git-infrastructure/src/main/kotlin/com/xquare/git/global/exceptions/handler/ErrorResponse.kt
  59. +0 −30 git-infrastructure/src/main/kotlin/com/xquare/git/persistence/git/mapper/GitMapper.kt
  60. +0 −5 ...nfrastructure/src/main/kotlin/com/xquare/git/persistence/git/spi/dto/FindUserAvatarUrlResponse.kt
  61. +0 −52 git-infrastructure/src/main/kotlin/com/xquare/git/persistence/user/spi/UserPersistenceAdapter.kt
  62. +2 −2 git-infrastructure/src/main/kotlin/com/xquare/{git → v1servicegit}/GitApplication.kt
  63. +4 −4 ...re/src/main/kotlin/com/xquare/{git/global → v1servicegit/common}/config/ComponentConfiguration.kt
  64. +3 −3 ...kotlin/com/xquare/{git/global → v1servicegit/common}/config/ConfigurationPropertyConfiguration.kt
  65. +8 −0 git-infrastructure/src/main/kotlin/com/xquare/v1servicegit/common/config/SchedulerConfiguration.kt
  66. +11 −5 ...ure/src/main/kotlin/com/xquare/{git/global → v1servicegit/common}/config/SecurityConfiguration.kt
  67. +3 −3 ...re/src/main/kotlin/com/xquare/{git/global → v1servicegit/common}/config/WebClientConfiguration.kt
  68. +2 −2 .../src/main/kotlin/com/xquare/{git/global → v1servicegit/common}/datasource/DatasourceProperties.kt
  69. +2 −2 ...main/kotlin/com/xquare/{git/global → v1servicegit/common}/datasource/DatasourcePropertyBuilder.kt
  70. +2 −2 ...main/kotlin/com/xquare/{git/global → v1servicegit/common}/datasource/QueryBuilderConfiguration.kt
  71. +4 −6 ...ture/src/main/kotlin/com/xquare/{git/global → v1servicegit/common}/exceptions/GlobalExceptions.kt
  72. +20 −0 ...infrastructure/src/main/kotlin/com/xquare/v1servicegit/common/exceptions/handler/ErrorResponse.kt
  73. +9 −12 ...otlin/com/xquare/{git/global → v1servicegit/common}/exceptions/handler/ErrorWebExchangeHandler.kt
  74. +4 −6 ...ain/kotlin/com/xquare/{git/global → v1servicegit/common}/exceptions/handler/GlobalErrorHandler.kt
  75. +18 −0 git-infrastructure/src/main/kotlin/com/xquare/v1servicegit/common/scheduler/GitScheduler.kt
  76. +5 −0 git-infrastructure/src/main/kotlin/com/xquare/v1servicegit/common/util/Util.kt
  77. +5 −5 ...astructure/src/main/kotlin/com/xquare/{git/persistence/git/model → v1servicegit/git}/GitEntity.kt
  78. +15 −0 git-infrastructure/src/main/kotlin/com/xquare/v1servicegit/git/GitMapper.kt
  79. +37 −48 .../src/main/kotlin/com/xquare/{git/persistence/git/spi → v1servicegit/git}/GitPersistenceAdapter.kt
  80. +46 −0 git-infrastructure/src/main/kotlin/com/xquare/v1servicegit/git/router/GitHandler.kt
  81. +5 −4 .../xquare/git → git-infrastructure/src/main/kotlin/com/xquare/v1servicegit/git/router}/GitRouter.kt
  82. +8 −10 .../kotlin/com/xquare/{git/persistence/github/spi → v1servicegit/github}/GithubPersistenceAdapter.kt
  83. +46 −0 git-infrastructure/src/main/kotlin/com/xquare/v1servicegit/user/UserPersistenceAdapter.kt
  84. +17 −0 git-infrastructure/src/main/kotlin/com/xquare/v1servicegit/user/aop/RequestHeaderAspect.kt
  85. +1 −1 git-infrastructure/src/main/resources/META-INF/persistence.xml
  86. +1 −1 git-infrastructure/src/main/resources/application.yml
  87. +0 −15 git-presentation/build.gradle.kts
  88. +0 −40 git-presentation/src/main/kotlin/com/xquare/git/GitHandler.kt
  89. 0 gradlew
  90. +0 −2 settings.gradle
77 changes: 0 additions & 77 deletions .github/workflows/prod-build.yaml

This file was deleted.

70 changes: 0 additions & 70 deletions .github/workflows/stag-build.yaml

This file was deleted.

46 changes: 46 additions & 0 deletions .github/workflows/xquare-deployment-prod.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Xquare Deploy for Production
on:
push:
tags:
- v*.*.*

jobs:
build:
permissions:
id-token: write
contents: read
runs-on: ubuntu-latest
strategy:
matrix:
java-version: [ 17 ]
outputs:
version: ${{ steps.get_version.outputs.BRANCH_NAME }}

steps:
- name: Check Out The Repository
uses: actions/checkout@v3

- name: Set up Java
uses: actions/setup-java@v2
with:
java-version: ${{ matrix.java-version }}
distribution: 'zulu'

- name: Gradle Build
uses: gradle/gradle-build-action@v2
with:
arguments: |
build
--no-daemon
-x test
- name: Deploy to xquare
uses: team-xquare/xquare-deployment-action@master
with:
environment: prod
access_key: ${{ secrets.ACCESS_KEY }}
github_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
buildargs: |
CLOUD_CONFIG_PASSWORD=${{secrets.CLOUD_CONFIG_PASSWORD}}
CLOUD_CONFIG_USERNAME=${{secrets.CLOUD_CONFIG_USERNAME}}
PROFILE=prod
46 changes: 46 additions & 0 deletions .github/workflows/xquare-deployment-stag.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Xquare Deploy for Stage
on:
push:
branches:
- main

jobs:
build:
permissions:
id-token: write
contents: read
runs-on: ubuntu-latest
strategy:
matrix:
java-version: [ 17 ]
outputs:
version: ${{ steps.get_version.outputs.BRANCH_NAME }}

steps:
- name: Check Out The Repository
uses: actions/checkout@v3

- name: Set up Java
uses: actions/setup-java@v2
with:
java-version: ${{ matrix.java-version }}
distribution: 'zulu'

- name: Gradle Build
uses: gradle/gradle-build-action@v2
with:
arguments: |
build
--no-daemon
-x test
- name: Deploy to xquare
uses: team-xquare/xquare-deployment-action@master
with:
environment: stag
access_key: ${{ secrets.ACCESS_KEY }}
github_token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
buildargs: |
CLOUD_CONFIG_PASSWORD=${{ secrets.CLOUD_CONFIG_PASSWORD }}
CLOUD_CONFIG_USERNAME=${{ secrets.CLOUD_CONFIG_USERNAME }}
PROFILE=stag
5 changes: 5 additions & 0 deletions .xquare/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config:
name: git
prefix: /gits
service_type: be
port: 8080
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -8,6 +8,8 @@ ARG CLOUD_CONFIG_USERNAME
ENV CLOUD_CONFIG_USERNAME ${CLOUD_CONFIG_USERNAME}
ARG CLOUD_CONFIG_PASSWORD
ENV CLOUD_CONFIG_PASSWORD ${CLOUD_CONFIG_PASSWORD}
ARG CLOUD_CONFIG_IMPORT_URL
ENV CLOUD_CONFIG_IMPORT_URL ${CLOUD_CONFIG_IMPORT_URL}

COPY ./git-infrastructure/build/libs/*.jar app.jar
ENTRYPOINT ["java", "-jar", "-Duser.timezone=Asia/Seoul", "/app.jar"]
ENTRYPOINT ["java", "-jar", "-Duser.timezone=Asia/Seoul", "/app.jar"]
24 changes: 17 additions & 7 deletions buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ interface Libraries {

override fun dependencies() = listOf(
KOTLIN_REFLECT to ImplementationType.IMPLEMENTATION,
KOTLIN_STDLIB to ImplementationType.IMPLEMENTATION
KOTLIN_STDLIB to ImplementationType.IMPLEMENTATION,
)
}

@@ -34,7 +34,7 @@ interface Libraries {
KOTLIN_JDSL to ImplementationType.IMPLEMENTATION,
REACTIVE_MYSQL to ImplementationType.IMPLEMENTATION,
REACTIVE_HIBERNATE to ImplementationType.IMPLEMENTATION,
SPRING_DATA_COMMON to ImplementationType.IMPLEMENTATION
SPRING_DATA_COMMON to ImplementationType.IMPLEMENTATION,
)
}

@@ -43,23 +43,23 @@ interface Libraries {
"com.fasterxml.jackson.module:jackson-module-kotlin:${DependencyVersions.JACKSON_VERSION}"

override fun dependencies() = listOf(
MODULE_KOTLIN to ImplementationType.IMPLEMENTATION
MODULE_KOTLIN to ImplementationType.IMPLEMENTATION,
)
}

object Transaction : Libraries {
private const val SPRING_TRANSACTION = "org.springframework:spring-tx:${DependencyVersions.SPRING_TRANSACTION}"

override fun dependencies() = listOf(
SPRING_TRANSACTION to ImplementationType.IMPLEMENTATION
SPRING_TRANSACTION to ImplementationType.IMPLEMENTATION,
)
}

object Component : Libraries {
private const val SPRING_COMPONENT = "org.springframework:spring-context:${DependencyVersions.SPRING_COMPONENT}"

override fun dependencies() = listOf(
SPRING_COMPONENT to ImplementationType.IMPLEMENTATION
SPRING_COMPONENT to ImplementationType.IMPLEMENTATION,
)
}

@@ -79,7 +79,7 @@ interface Libraries {
private const val CLOUD_CONFIG = "org.springframework.cloud:spring-cloud-config-client"

override fun dependencies() = listOf(
CLOUD_CONFIG to ImplementationType.IMPLEMENTATION
CLOUD_CONFIG to ImplementationType.IMPLEMENTATION,
)
}

@@ -104,7 +104,17 @@ interface Libraries {
REACTOR_COROUTINE_EXTENSION to ImplementationType.IMPLEMENTATION,
COROUTINE_REACTOR to ImplementationType.IMPLEMENTATION,
COROUTINE_JDK to ImplementationType.RUNTIME_ONLY,
KOTLINX_COROUTINE to ImplementationType.IMPLEMENTATION
KOTLINX_COROUTINE to ImplementationType.IMPLEMENTATION,
)
}

object Test : Libraries {
private const val KOTEST = "io.kotest:kotest-runner-junit5:${DependencyVersions.KOTEST_VERSION}"
private const val MOCKK = "io.mockk:mockk:${DependencyVersions.MOCKK_VERSION}"

override fun dependencies() = listOf(
KOTEST to ImplementationType.TEST_IMPLEMENTATION,
MOCKK to ImplementationType.TEST_IMPLEMENTATION,
)
}
}
3 changes: 2 additions & 1 deletion buildSrc/src/main/kotlin/DependencyVersions.kt
Original file line number Diff line number Diff line change
@@ -3,11 +3,12 @@ object DependencyVersions {
const val SPRING_TRANSACTION = "6.0.6"
const val SPRING_CLOUD_VERSION = "2021.0.1"
const val SPRING_COMPONENT = "6.0.6"
const val OPENFEIGN = "3.1.4"
const val JSOUP_VERSION = "1.15.2"
const val COROUTINE_VERSION = "1.6.1"
const val REACTIVE_MYSQL_VERSION = "4.2.5"
const val HIBERNATE_REACTIVE_VERSION = "1.1.3.Final"
const val JDSL_VERSION = "2.0.3.RELEASE"
const val MUTINY_VERSION = "1.4.0"
const val KOTEST_VERSION = "5.5.4"
const val MOCKK_VERSION = "1.13.2"
}
3 changes: 1 addition & 2 deletions git-application/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -3,8 +3,7 @@ plugins {
}

dependencies {
implementation(project(":git-domain"))

implementationDependencies(Libraries.Transaction)
implementationDependencies(Libraries.Component)
implementationDependencies(Libraries.Test)
}

This file was deleted.

Loading