Skip to content

Commit

Permalink
chore: infinity -> grow, changed package name
Browse files Browse the repository at this point in the history
  • Loading branch information
jombidev committed May 5, 2024
1 parent 7b63490 commit d0ddc75
Show file tree
Hide file tree
Showing 155 changed files with 535 additions and 551 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ jobs:

- name: make application.yml
run: |
mkdir -p ./infinity-api/src/main/resources
touch ./infinity-api/src/main/resources/application.yml
echo "${{ secrets.APPLICATION }}" > ./infinity-api/src/main/resources/application.yml
mkdir -p ./grow-api/src/main/resources
touch ./grow-api/src/main/resources/application.yml
echo "${{ secrets.APPLICATION }}" > ./grow-api/src/main/resources/application.yml
- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Build with Gradle
run: ./gradlew :infinity-api:build -x test --parallel
run: ./gradlew :grow-api:build -x test --parallel

- name: Docker build
run: |
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM openjdk:17
COPY infinity-api/build/libs/infinity-api-0.0.1-SNAPSHOT.jar infinity.jar
ENTRYPOINT ["java","-jar", "/infinity.jar"]
COPY grow-api/build/libs/grow-api-0.0.1-SNAPSHOT.jar grow.jar
ENTRYPOINT ["java","-jar", "/grow.jar"]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# infinity-server
# grow-server
Grow Server
6 changes: 3 additions & 3 deletions infinity-api/build.gradle.kts → grow-api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ dependencies {
implementation ("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2")
implementation ("org.springframework.boot:spring-boot-starter-validation")

implementation(project(":infinity-common"))
implementation(project(":infinity-core"))
implementation(project(":infinity-infra"))
implementation(project(":grow-common"))
implementation(project(":grow-core"))
implementation(project(":grow-infra"))

testImplementation ("org.springframework.boot:spring-boot-starter-test")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import java.util.TimeZone

@EnableScheduling
@SpringBootApplication
class InfinityApiApplication {
class GrowApplication {
@PostConstruct
fun init() {
// Timezone Fix
Expand All @@ -17,5 +17,5 @@ class InfinityApiApplication {
}

fun main(args: Array<String>) {
runApplication<InfinityApiApplication>(*args)
runApplication<GrowApplication>(*args)
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package com.molohala.infinityapi.auth
package com.molohala.grow.api.auth

import com.molohala.infinityapi.response.ResponseData
import com.molohala.infinitycore.auth.application.dto.req.ReissueTokenReq
import com.molohala.infinitycore.auth.application.service.AuthService
import com.molohala.infinitycore.auth.application.dto.res.ReissueTokenRes
import com.molohala.grow.api.response.ResponseData
import com.molohala.grow.core.auth.application.dto.req.ReissueTokenReq
import com.molohala.grow.core.auth.application.service.AuthService
import jakarta.validation.Valid
import org.springframework.web.bind.annotation.PostMapping
import org.springframework.web.bind.annotation.RequestBody
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.molohala.infinityapi.comment
package com.molohala.grow.api.comment

import com.molohala.infinityapi.response.Response
import com.molohala.infinityapi.response.ResponseData
import com.molohala.infinitycore.comment.application.dto.req.CommentModifyReq
import com.molohala.infinitycore.comment.application.dto.req.CommentReq
import com.molohala.infinitycore.comment.application.service.CommentService
import com.molohala.grow.api.response.Response
import com.molohala.grow.api.response.ResponseData
import com.molohala.grow.core.comment.application.dto.req.CommentModifyReq
import com.molohala.grow.core.comment.application.dto.req.CommentReq
import com.molohala.grow.core.comment.application.service.CommentService
import org.springframework.web.bind.annotation.*

@RestController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.molohala.infinityapi.community
package com.molohala.grow.api.community

import com.molohala.infinityapi.response.Response
import com.molohala.infinityapi.response.ResponseData
import com.molohala.infinitycore.common.PageRequest
import com.molohala.infinitycore.community.application.dto.req.CommunityModifyReq
import com.molohala.infinitycore.community.application.dto.req.CommunitySaveReq
import com.molohala.infinitycore.community.application.dto.res.CommunityRes
import com.molohala.infinitycore.community.application.service.CommunityService
import com.molohala.grow.api.response.Response
import com.molohala.grow.api.response.ResponseData
import com.molohala.grow.core.common.PageRequest
import com.molohala.grow.core.community.application.dto.req.CommunityModifyReq
import com.molohala.grow.core.community.application.dto.req.CommunitySaveReq
import com.molohala.grow.core.community.application.dto.res.CommunityRes
import com.molohala.grow.core.community.application.service.CommunityService
import org.springframework.web.bind.annotation.*

@RestController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.molohala.infinityapi.info
package com.molohala.grow.api.info

import com.molohala.infinityapi.response.Response
import com.molohala.infinityapi.response.ResponseData
import com.molohala.infinitycore.info.application.dto.req.NewSocialAccountReq
import com.molohala.infinitycore.info.application.service.InfoService
import com.molohala.grow.api.response.Response
import com.molohala.grow.api.response.ResponseData
import com.molohala.grow.core.info.application.dto.req.NewSocialAccountReq
import com.molohala.grow.core.info.application.service.InfoService
import jakarta.validation.Valid
import org.springframework.web.bind.annotation.*

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.molohala.infinityapi.like
package com.molohala.grow.api.like

import com.molohala.infinityapi.response.Response
import com.molohala.infinitycore.like.application.service.LikeService
import com.molohala.grow.api.response.Response
import com.molohala.grow.core.like.application.service.LikeService
import org.springframework.web.bind.annotation.*

@RestController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.molohala.infinityapi.rank
package com.molohala.grow.api.rank

import com.molohala.infinityapi.response.ResponseData
import com.molohala.infinitycore.rank.application.service.RankService
import com.molohala.grow.api.response.ResponseData
import com.molohala.grow.core.rank.application.service.RankService
import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.bind.annotation.RequestMapping
import org.springframework.web.bind.annotation.RestController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package com.molohala.infinityapi.response
package com.molohala.grow.api.response

import org.springframework.http.HttpStatus

@Suppress("unused")
open class Response(
val status: Int,
val message: String
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package com.molohala.infinityapi.response
package com.molohala.grow.api.response

import org.springframework.http.HttpStatus

@Suppress("unused")
class ResponseData<T>(
status: Int,
message: String,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.molohala.infinityapi
package com.molohala.grow.api

import org.junit.jupiter.api.Test
import org.springframework.boot.test.context.SpringBootTest

@SpringBootTest
class InfinityApiApplicationTests {
class GrowApplicationTests {

@Test
fun contextLoads() {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.molohala.infinitycommon.exception
package com.molohala.grow.common.exception

import org.springframework.http.ResponseEntity

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.molohala.infinitycommon.exception
package com.molohala.grow.common.exception

import org.springframework.http.HttpStatus

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package com.molohala.infinitycommon.exception
package com.molohala.grow.common.exception

import org.springframework.http.HttpStatus

@Suppress("unused")
enum class GlobalExceptionCode(
private val status: HttpStatus,
private val message: String
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.molohala.infinitycommon.exception.custom
package com.molohala.grow.common.exception.custom

import com.molohala.infinitycommon.exception.ExceptionCode
import com.molohala.grow.common.exception.ExceptionCode
import org.springframework.http.HttpStatus
import org.springframework.web.bind.annotation.ResponseStatus

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.molohala.infinitycommon.exception.custom
package com.molohala.grow.common.exception.custom

import com.molohala.infinitycommon.exception.GlobalExceptionCode
import com.molohala.grow.common.exception.GlobalExceptionCode
import org.springframework.http.HttpStatus
import org.springframework.web.bind.annotation.ResponseStatus

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.molohala.infinitycommon.exception.handler
package com.molohala.grow.common.exception.handler

import com.molohala.infinitycommon.exception.ErrorResponseEntity
import com.molohala.infinitycommon.exception.GlobalExceptionCode
import com.molohala.infinitycommon.exception.custom.CustomException
import com.molohala.grow.common.exception.ErrorResponseEntity
import com.molohala.grow.common.exception.GlobalExceptionCode
import com.molohala.grow.common.exception.custom.CustomException
import org.springframework.http.ResponseEntity
import org.springframework.validation.FieldError
import org.springframework.web.HttpMediaTypeNotSupportedException
Expand Down
1 change: 1 addition & 0 deletions grow-common/src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
spring.application.name=grow-common
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.molohala.infinitycommon
package com.molohala.grow.common

//import org.junit.jupiter.api.Test
//import org.springframework.boot.test.context.SpringBootTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
annotationProcessor("jakarta.persistence:jakarta.persistence-api")
annotationProcessor("jakarta.annotation:jakarta.annotation-api")

implementation(project(":infinity-common"))
implementation(project(":grow-common"))
}

tasks.bootJar {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.molohala.grow.core.auth

import com.molohala.grow.core.auth.application.dto.DodamUserData

interface DodamMemberClient {
suspend fun getMemberInfo(code: String): DodamUserData?
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.molohala.grow.core.auth

import com.molohala.grow.core.auth.application.dto.Token
import com.molohala.grow.core.auth.application.dto.res.ReissueTokenRes
import com.molohala.grow.core.member.domain.consts.MemberRole

interface IssueJwtToken {
fun issueToken(email: String, role: MemberRole) : Token
fun reissueToken(refreshToken : String) : ReissueTokenRes
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.molohala.infinitycore.auth.application.dto
package com.molohala.grow.core.auth.application.dto

data class DodamUserData(
val uniqueId: String,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.molohala.infinitycore.auth.application.dto
package com.molohala.grow.core.auth.application.dto

data class Token(
val accessToken: String,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.molohala.infinitycore.auth.application.dto.req
package com.molohala.grow.core.auth.application.dto.req

import com.fasterxml.jackson.annotation.JsonCreator
import com.fasterxml.jackson.databind.annotation.JsonDeserialize

data class ReissueTokenReq @JsonCreator constructor(
val refreshToken: String
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.molohala.grow.core.auth.application.dto.res

data class ReissueTokenRes(
val accessToken:String
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.molohala.grow.core.auth.application.service

import com.molohala.grow.core.auth.application.dto.Token
import com.molohala.grow.core.auth.application.dto.req.ReissueTokenReq
import com.molohala.grow.core.auth.application.dto.res.ReissueTokenRes

interface AuthService {
suspend fun signIn(code : String): Token
fun reissue(reissueTokenReq: ReissueTokenReq): ReissueTokenRes
fun test(email: String): Token
}
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
package com.molohala.infinitycore.auth.application.service
package com.molohala.grow.core.auth.application.service

import com.molohala.infinitycommon.exception.custom.InternalServerException
import com.molohala.infinitycore.auth.DodamMemberClient
import com.molohala.infinitycore.auth.IssueJwtToken
import com.molohala.infinitycore.auth.application.dto.DodamUserData
import com.molohala.infinitycore.auth.application.dto.Token
import com.molohala.infinitycore.auth.application.dto.req.ReissueTokenReq
import com.molohala.infinitycore.auth.application.dto.res.ReissueTokenRes
import com.molohala.infinitycore.member.domain.consts.MemberRole
import com.molohala.infinitycore.member.domain.consts.MemberState
import com.molohala.infinitycore.member.domain.entity.Member
import com.molohala.infinitycore.member.repository.MemberJpaRepository
import com.molohala.grow.common.exception.custom.InternalServerException
import com.molohala.grow.core.auth.DodamMemberClient
import com.molohala.grow.core.auth.IssueJwtToken
import com.molohala.grow.core.auth.application.dto.DodamUserData
import com.molohala.grow.core.auth.application.dto.Token
import com.molohala.grow.core.auth.application.dto.req.ReissueTokenReq
import com.molohala.grow.core.auth.application.dto.res.ReissueTokenRes
import com.molohala.grow.core.member.domain.consts.MemberRole
import com.molohala.grow.core.member.domain.consts.MemberState
import com.molohala.grow.core.member.domain.entity.Member
import com.molohala.grow.core.member.repository.MemberJpaRepository
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.springframework.data.repository.findByIdOrNull
import org.springframework.stereotype.Service
import org.springframework.transaction.annotation.Transactional

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.molohala.grow.core.auth.domain.consts

enum class JwtType(val jwtType: String) {
ACCESS_TOKEN("ACCESS"),
REFRESH_TOKEN("REFRESH")
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.molohala.infinitycore.comment.application.dto.req
package com.molohala.grow.core.comment.application.dto.req

data class CommentModifyReq(
val commentId: Long,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.molohala.infinitycore.comment.application.dto.req
package com.molohala.grow.core.comment.application.dto.req

data class CommentReq (
val content: String,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.molohala.infinitycore.comment.application.dto.res
package com.molohala.grow.core.comment.application.dto.res

import java.time.LocalDateTime

Expand All @@ -8,5 +8,4 @@ data class CommentRes(
val createdAt: LocalDateTime,
val memberId: Long,
val name: String
) {
}
)
Loading

0 comments on commit d0ddc75

Please sign in to comment.