From e10c42b48ee25a1167b0f1a1dc860716c7f69c5e Mon Sep 17 00:00:00 2001 From: KimBeomJin Date: Mon, 22 Aug 2022 22:16:58 +0900 Subject: [PATCH 1/4] =?UTF-8?q?refactor:=20(#13)=20ISSUE=20TEMPLATE=20?= =?UTF-8?q?=EC=98=88=EC=8B=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/do.yml | 4 ++-- .github/ISSUE_TEMPLATE/fix.yml | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/do.yml b/.github/ISSUE_TEMPLATE/do.yml index f8c8d045..985ce4b2 100644 --- a/.github/ISSUE_TEMPLATE/do.yml +++ b/.github/ISSUE_TEMPLATE/do.yml @@ -17,5 +17,5 @@ body: description: | [추가사항] 별도로 알려줘야 할 사항이나 추가사항을 작성해주세요. placeholder: | - - [ ] - - [ ] \ No newline at end of file + - + - \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/fix.yml b/.github/ISSUE_TEMPLATE/fix.yml index c9cdd0f4..3277d17b 100644 --- a/.github/ISSUE_TEMPLATE/fix.yml +++ b/.github/ISSUE_TEMPLATE/fix.yml @@ -8,8 +8,14 @@ body: label: Describe description: | [설명] 버그에 관한 설명을 간단하게 작성해주세요. + placeholder: | + - [ ] + - [ ] - type: textarea attributes: label: Additional description: | - [추가사항] 별도로 알려줘야 할 사항이나 추가사항을 작성해주세요. \ No newline at end of file + [추가사항] 별도로 알려줘야 할 사항이나 추가사항을 작성해주세요. + placeholder: | + - + - \ No newline at end of file From 0fa88ed89a0b98c4484b74d530a20948cc448dc5 Mon Sep 17 00:00:00 2001 From: KimBeomJin Date: Mon, 22 Aug 2022 22:17:17 +0900 Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20(#13)=20PULL=5FREQUEST=20TEMPLA?= =?UTF-8?q?TE=20=ED=98=95=EC=8B=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/PULL_REQUEST_TEMPLATE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 88d3b739..a828f219 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -3,8 +3,8 @@ - [ ] ## 주요 변경 사항 -- [ ] -- [ ] +- +- ## 체크리스트 - [ ] 어플리케이션 구동(혹은 테스트)시 오류는 없나요? From e12323c8c33296bf5398ed5986b8659a220a0bc3 Mon Sep 17 00:00:00 2001 From: KimBeomJin Date: Mon, 22 Aug 2022 22:21:43 +0900 Subject: [PATCH 3/4] =?UTF-8?q?chore:=20(#13)=20@version=20=EC=A3=BC?= =?UTF-8?q?=EC=84=9D=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../team/comit/simtong/domain/user/model/Authority.kt | 11 ++++++----- .../team/comit/simtong/persistence/BaseEntity.kt | 11 ++++++----- .../team/comit/simtong/persistence/BaseTimeEntity.kt | 11 ++++++----- .../team/comit/simtong/persistence/BaseUUIDEntity.kt | 11 ++++++----- .../simtong/persistence/spot/SpotJpaRepository.kt | 11 ++++++----- .../simtong/persistence/spot/entity/SpotJpaEntity.kt | 11 ++++++----- .../simtong/persistence/team/TeamJpaRepository.kt | 11 ++++++----- .../simtong/persistence/team/entity/TeamJpaEntity.kt | 11 ++++++----- .../persistence/user/DeviceTokenJpaRepository.kt | 11 ++++++----- .../simtong/persistence/user/UserJpaRepository.kt | 11 ++++++----- .../persistence/user/entity/DeviceTokenJpaEntity.kt | 11 ++++++----- .../simtong/persistence/user/entity/UserJpaEntity.kt | 11 ++++++----- 12 files changed, 72 insertions(+), 60 deletions(-) diff --git a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/user/model/Authority.kt b/simtong-domain/src/main/kotlin/team/comit/simtong/domain/user/model/Authority.kt index 2f0d3f92..c43db945 100644 --- a/simtong-domain/src/main/kotlin/team/comit/simtong/domain/user/model/Authority.kt +++ b/simtong-domain/src/main/kotlin/team/comit/simtong/domain/user/model/Authority.kt @@ -1,11 +1,12 @@ package team.comit.simtong.domain.user.model /** - * - * 유저(직원, 관리자)의 권한을 관리하는 enum Authority - * - * @author kimbeomjin - * @date 2022/08/21 + * + * 유저(직원, 관리자)의 권한을 관리하는 enum Authority + * + * @author kimbeomjin + * @date 2022/08/21 + * @version 1.0.0 **/ enum class Authority { ROLE_COMMON, ROLE_ADMIN diff --git a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/BaseEntity.kt b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/BaseEntity.kt index cba12aba..df649864 100644 --- a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/BaseEntity.kt +++ b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/BaseEntity.kt @@ -6,11 +6,12 @@ import javax.persistence.Id import javax.persistence.MappedSuperclass /** - * - * pk의 타입이 UUID 이고 created_at 컬럼이 필요한 경우 상속받는 BaseEntity - * - * @author kimbeomjin - * @date 2022/08/21 + * + * pk의 타입이 UUID 이고 created_at 컬럼이 필요한 경우 상속받는 BaseEntity + * + * @author kimbeomjin + * @date 2022/08/21 + * @version 1.0.0 **/ @MappedSuperclass abstract class BaseEntity( diff --git a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/BaseTimeEntity.kt b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/BaseTimeEntity.kt index 5f29ff34..4df5950c 100644 --- a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/BaseTimeEntity.kt +++ b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/BaseTimeEntity.kt @@ -5,11 +5,12 @@ import javax.persistence.MappedSuperclass import javax.validation.constraints.NotNull /** - * - * createdAt 컬럼이 필요한 경우 상속받는 BaseTimeEntity - * - * @author kimbeomjin - * @date 2022/08/21 + * + * createdAt 컬럼이 필요한 경우 상속받는 BaseTimeEntity + * + * @author kimbeomjin + * @date 2022/08/22 + * @version 1.0.0 **/ @MappedSuperclass abstract class BaseTimeEntity( diff --git a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/BaseUUIDEntity.kt b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/BaseUUIDEntity.kt index 69975c87..45d065bb 100644 --- a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/BaseUUIDEntity.kt +++ b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/BaseUUIDEntity.kt @@ -6,11 +6,12 @@ import javax.persistence.Id import javax.persistence.MappedSuperclass /** - * - * pk의 타입이 UUID 일 경우 상속받는 BaseUUIDEntity - * - * @author kimbeomjin - * @date 2022/08/21 + * + * pk의 타입이 UUID 일 경우 상속받는 BaseUUIDEntity + * + * @author kimbeomjin + * @date 2022/08/21 + * @version 1.0.0 **/ @MappedSuperclass abstract class BaseUUIDEntity( diff --git a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/spot/SpotJpaRepository.kt b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/spot/SpotJpaRepository.kt index 19316818..3ae66728 100644 --- a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/spot/SpotJpaRepository.kt +++ b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/spot/SpotJpaRepository.kt @@ -6,11 +6,12 @@ import team.comit.simtong.persistence.spot.entity.SpotJpaEntity import java.util.* /** - * - * Spring Repository의 기능을 이용하는 SpotJpaRepository - * - * @author kimbeomjin - * @date 2022/08/21 + * + * Spring Repository의 기능을 이용하는 SpotJpaRepository + * + * @author kimbeomjin + * @date 2022/08/21 + * @version 1.0.0 **/ @Repository interface SpotJpaRepository : CrudRepository { diff --git a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/spot/entity/SpotJpaEntity.kt b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/spot/entity/SpotJpaEntity.kt index dc37ce62..7ab282bb 100644 --- a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/spot/entity/SpotJpaEntity.kt +++ b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/spot/entity/SpotJpaEntity.kt @@ -7,11 +7,12 @@ import javax.persistence.Table import javax.validation.constraints.NotNull /** - * - * 지점에 대해 관리하는 SpotJpaEntity - * - * @author kimbeomjin - * @date 2022/08/21 + * + * 지점에 대해 관리하는 SpotJpaEntity + * + * @author kimbeomjin + * @date 2022/08/21 + * @version 1.0.0 **/ @Entity @Table(name = "tbl_spot") diff --git a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/team/TeamJpaRepository.kt b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/team/TeamJpaRepository.kt index 2f5d3ac0..c67fc605 100644 --- a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/team/TeamJpaRepository.kt +++ b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/team/TeamJpaRepository.kt @@ -6,11 +6,12 @@ import team.comit.simtong.persistence.team.entity.TeamJpaEntity import java.util.* /** - * - * Spring Repository의 기능을 이용하는 TeamJpaRepository - * - * @author kimbeomjin - * @date 2022/08/21 + * + * Spring Repository의 기능을 이용하는 TeamJpaRepository + * + * @author kimbeomjin + * @date 2022/08/21 + * @version 1.0.0 **/ @Repository interface TeamJpaRepository : CrudRepository { diff --git a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/team/entity/TeamJpaEntity.kt b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/team/entity/TeamJpaEntity.kt index 76a2fb17..fdb90119 100644 --- a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/team/entity/TeamJpaEntity.kt +++ b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/team/entity/TeamJpaEntity.kt @@ -11,11 +11,12 @@ import javax.persistence.Table import javax.validation.constraints.NotNull /** - * - * 지점에 속한 팀을 관리하는 TeamJpaEntity - * - * @author kimbeomjin - * @date 2022/08/21 + * + * 지점에 속한 팀을 관리하는 TeamJpaEntity + * + * @author kimbeomjin + * @date 2022/08/21 + * @version 1.0.0 **/ @Entity @Table(name = "tbl_team") diff --git a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/user/DeviceTokenJpaRepository.kt b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/user/DeviceTokenJpaRepository.kt index 70dbfa55..5e5ece72 100644 --- a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/user/DeviceTokenJpaRepository.kt +++ b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/user/DeviceTokenJpaRepository.kt @@ -6,11 +6,12 @@ import team.comit.simtong.persistence.user.entity.DeviceTokenJpaEntity import java.util.* /** - * - * Spring Repository의 기능을 이용하는 DeviceTokenJpaRepository - * - * @author kimbeomjin - * @date 2022/08/21 + * + * Spring Repository의 기능을 이용하는 DeviceTokenJpaRepository + * + * @author kimbeomjin + * @date 2022/08/21 + * @version 1.0.0 **/ @Repository interface DeviceTokenJpaRepository : CrudRepository { diff --git a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/user/UserJpaRepository.kt b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/user/UserJpaRepository.kt index 840c3bf3..89123982 100644 --- a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/user/UserJpaRepository.kt +++ b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/user/UserJpaRepository.kt @@ -6,11 +6,12 @@ import team.comit.simtong.persistence.user.entity.UserJpaEntity import java.util.* /** - * - * Spring Repository의 기능을 이용하는 UserJpaRepository - * - * @author kimbeomjin - * @date 2022/08/21 + * + * Spring Repository의 기능을 이용하는 UserJpaRepository + * + * @author kimbeomjin + * @date 2022/08/21 + * @version 1.0.0 **/ @Repository interface UserJpaRepository : CrudRepository { diff --git a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/user/entity/DeviceTokenJpaEntity.kt b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/user/entity/DeviceTokenJpaEntity.kt index 38218dc3..0b691450 100644 --- a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/user/entity/DeviceTokenJpaEntity.kt +++ b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/user/entity/DeviceTokenJpaEntity.kt @@ -11,11 +11,12 @@ import javax.persistence.Table import javax.validation.constraints.NotNull /** - * - * 유저(직원, 관리자)의 디바이스 토큰을 관리하는 DeviceTokenJpaEntity - * - * @author kimbeomjin - * @date 2022/08/21 + * + * 유저(직원, 관리자)의 디바이스 토큰을 관리하는 DeviceTokenJpaEntity + * + * @author kimbeomjin + * @date 2022/08/21 + * @version 1.0.0 **/ @Entity @Table(name = "tbl_device") diff --git a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/user/entity/UserJpaEntity.kt b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/user/entity/UserJpaEntity.kt index 2bea9574..8d4e6de3 100644 --- a/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/user/entity/UserJpaEntity.kt +++ b/simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/user/entity/UserJpaEntity.kt @@ -13,11 +13,12 @@ import javax.persistence.Table import javax.validation.constraints.NotNull /** - * - * 유저(직원, 관리자) 정보를 관리하는 UserJpaEntity - * - * @author kimbeomjin - * @date 2022/08/21 + * + * 유저(직원, 관리자) 정보를 관리하는 UserJpaEntity + * + * @author kimbeomjin + * @date 2022/08/21 + * @version 1.0.0 **/ @Entity @Table(name = "tbl_user") From ef5b7f7c964ea6341040590708731eb6df696ccc Mon Sep 17 00:00:00 2001 From: Beom Jin <80632060+softpeanut@users.noreply.github.com> Date: Tue, 23 Aug 2022 12:00:52 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20(#13)=20build=20option=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 799f3061..ebc5829e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: uses: actions/setup-java@v1 with: java-version: '17' - distribution: 'adopt' + distribution: 'zulu' - name: Grant execute permission for gradlew run: chmod +x gradlew