From 33d8c78f866253231f630cf159b031724d0c2447 Mon Sep 17 00:00:00 2001 From: thalals Date: Wed, 24 Jul 2024 22:33:06 +0900 Subject: [PATCH] =?UTF-8?q?chore=20:=20git=20=EC=9B=8C=ED=81=AC=ED=94=8C?= =?UTF-8?q?=EB=A1=9C=EC=9A=B0=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20config=20?= =?UTF-8?q?=ED=8C=A8=ED=82=A4=EC=A7=80=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle-publish.yml | 2 +- .../java/com/tht/thtapis/exception/ErrorResponse.java | 1 - .../java/com/tht/thtapis/facade/user/UserJoinFacade.java | 2 +- .../com/tht/domain/{entity => }/config/JpaConfig.java | 2 +- .../com/tht/domain/{entity => }/config/MongoDBConfig.java | 2 +- .../{entity => }/config/MultiValueMapConverter.java | 2 +- .../tht/domain/{entity => }/config/QueryDslConfig.java | 2 +- .../tht/domain/{entity => }/config/ScheduledConfig.java | 4 +--- .../tht/domain/{entity => }/config/WebClientConfig.java | 2 +- .../tht/domain/{entity => }/config/aligo/AligoConst.java | 2 +- .../tht/domain/{entity => }/config/aligo/AligoUtils.java | 8 ++++---- .../config/aligo/request/SmsAuthNumberRequest.java | 4 ++-- 12 files changed, 15 insertions(+), 18 deletions(-) rename tht-core/domain/src/main/java/com/tht/domain/{entity => }/config/JpaConfig.java (83%) rename tht-core/domain/src/main/java/com/tht/domain/{entity => }/config/MongoDBConfig.java (96%) rename tht-core/domain/src/main/java/com/tht/domain/{entity => }/config/MultiValueMapConverter.java (96%) rename tht-core/domain/src/main/java/com/tht/domain/{entity => }/config/QueryDslConfig.java (93%) rename tht-core/domain/src/main/java/com/tht/domain/{entity => }/config/ScheduledConfig.java (69%) rename tht-core/domain/src/main/java/com/tht/domain/{entity => }/config/WebClientConfig.java (93%) rename tht-core/domain/src/main/java/com/tht/domain/{entity => }/config/aligo/AligoConst.java (92%) rename tht-core/domain/src/main/java/com/tht/domain/{entity => }/config/aligo/AligoUtils.java (90%) rename tht-core/domain/src/main/java/com/tht/domain/{entity => }/config/aligo/request/SmsAuthNumberRequest.java (79%) diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml index 39608214..2e11bbef 100644 --- a/.github/workflows/gradle-publish.yml +++ b/.github/workflows/gradle-publish.yml @@ -27,7 +27,7 @@ env: jobs: build: runs-on: ubuntu-latest - if: contains(github.event.label.name, 'app') + if: contains(github.event.pull_request.labels.*.name, 'app') permissions: contents: read diff --git a/tht-apis/src/main/java/com/tht/thtapis/exception/ErrorResponse.java b/tht-apis/src/main/java/com/tht/thtapis/exception/ErrorResponse.java index 8dd5ad7a..b9080d32 100644 --- a/tht-apis/src/main/java/com/tht/thtapis/exception/ErrorResponse.java +++ b/tht-apis/src/main/java/com/tht/thtapis/exception/ErrorResponse.java @@ -56,5 +56,4 @@ public static ErrorResponse of(final int httpStatus, final String reasonParse, public String convertToJson() throws JsonProcessingException { return objectMapper.writeValueAsString(this); } - } diff --git a/tht-apis/src/main/java/com/tht/thtapis/facade/user/UserJoinFacade.java b/tht-apis/src/main/java/com/tht/thtapis/facade/user/UserJoinFacade.java index 956af386..9044c1ae 100644 --- a/tht-apis/src/main/java/com/tht/thtapis/facade/user/UserJoinFacade.java +++ b/tht-apis/src/main/java/com/tht/thtapis/facade/user/UserJoinFacade.java @@ -1,6 +1,6 @@ package com.tht.thtapis.facade.user; -import com.tht.domain.entity.config.aligo.AligoUtils; +import com.tht.domain.config.aligo.AligoUtils; import com.tht.domain.entity.user.User; import com.tht.domain.entity.user.exception.UserCustomException; import com.tht.domain.entity.user.service.*; diff --git a/tht-core/domain/src/main/java/com/tht/domain/entity/config/JpaConfig.java b/tht-core/domain/src/main/java/com/tht/domain/config/JpaConfig.java similarity index 83% rename from tht-core/domain/src/main/java/com/tht/domain/entity/config/JpaConfig.java rename to tht-core/domain/src/main/java/com/tht/domain/config/JpaConfig.java index 953ac875..cbba6012 100644 --- a/tht-core/domain/src/main/java/com/tht/domain/entity/config/JpaConfig.java +++ b/tht-core/domain/src/main/java/com/tht/domain/config/JpaConfig.java @@ -1,4 +1,4 @@ -package com.tht.domain.entity.config; +package com.tht.domain.config; import org.springframework.context.annotation.Configuration; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; diff --git a/tht-core/domain/src/main/java/com/tht/domain/entity/config/MongoDBConfig.java b/tht-core/domain/src/main/java/com/tht/domain/config/MongoDBConfig.java similarity index 96% rename from tht-core/domain/src/main/java/com/tht/domain/entity/config/MongoDBConfig.java rename to tht-core/domain/src/main/java/com/tht/domain/config/MongoDBConfig.java index 23d79b14..68dc5d26 100644 --- a/tht-core/domain/src/main/java/com/tht/domain/entity/config/MongoDBConfig.java +++ b/tht-core/domain/src/main/java/com/tht/domain/config/MongoDBConfig.java @@ -1,4 +1,4 @@ -package com.tht.domain.entity.config; +package com.tht.domain.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/tht-core/domain/src/main/java/com/tht/domain/entity/config/MultiValueMapConverter.java b/tht-core/domain/src/main/java/com/tht/domain/config/MultiValueMapConverter.java similarity index 96% rename from tht-core/domain/src/main/java/com/tht/domain/entity/config/MultiValueMapConverter.java rename to tht-core/domain/src/main/java/com/tht/domain/config/MultiValueMapConverter.java index 35a2ac45..f06a1513 100644 --- a/tht-core/domain/src/main/java/com/tht/domain/entity/config/MultiValueMapConverter.java +++ b/tht-core/domain/src/main/java/com/tht/domain/config/MultiValueMapConverter.java @@ -1,4 +1,4 @@ -package com.tht.domain.entity.config; +package com.tht.domain.config; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/tht-core/domain/src/main/java/com/tht/domain/entity/config/QueryDslConfig.java b/tht-core/domain/src/main/java/com/tht/domain/config/QueryDslConfig.java similarity index 93% rename from tht-core/domain/src/main/java/com/tht/domain/entity/config/QueryDslConfig.java rename to tht-core/domain/src/main/java/com/tht/domain/config/QueryDslConfig.java index c0469bb8..af7b3c85 100644 --- a/tht-core/domain/src/main/java/com/tht/domain/entity/config/QueryDslConfig.java +++ b/tht-core/domain/src/main/java/com/tht/domain/config/QueryDslConfig.java @@ -1,4 +1,4 @@ -package com.tht.domain.entity.config; +package com.tht.domain.config; import com.querydsl.jpa.JPQLTemplates; import com.querydsl.jpa.impl.JPAQueryFactory; diff --git a/tht-core/domain/src/main/java/com/tht/domain/entity/config/ScheduledConfig.java b/tht-core/domain/src/main/java/com/tht/domain/config/ScheduledConfig.java similarity index 69% rename from tht-core/domain/src/main/java/com/tht/domain/entity/config/ScheduledConfig.java rename to tht-core/domain/src/main/java/com/tht/domain/config/ScheduledConfig.java index 911ab140..8f43434a 100644 --- a/tht-core/domain/src/main/java/com/tht/domain/entity/config/ScheduledConfig.java +++ b/tht-core/domain/src/main/java/com/tht/domain/config/ScheduledConfig.java @@ -1,10 +1,8 @@ -package com.tht.domain.entity.config; +package com.tht.domain.config; -import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.stereotype.Component; -@Slf4j @EnableScheduling @Component public class ScheduledConfig { diff --git a/tht-core/domain/src/main/java/com/tht/domain/entity/config/WebClientConfig.java b/tht-core/domain/src/main/java/com/tht/domain/config/WebClientConfig.java similarity index 93% rename from tht-core/domain/src/main/java/com/tht/domain/entity/config/WebClientConfig.java rename to tht-core/domain/src/main/java/com/tht/domain/config/WebClientConfig.java index 4ee27669..f50b6541 100644 --- a/tht-core/domain/src/main/java/com/tht/domain/entity/config/WebClientConfig.java +++ b/tht-core/domain/src/main/java/com/tht/domain/config/WebClientConfig.java @@ -1,4 +1,4 @@ -package com.tht.domain.entity.config; +package com.tht.domain.config; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; diff --git a/tht-core/domain/src/main/java/com/tht/domain/entity/config/aligo/AligoConst.java b/tht-core/domain/src/main/java/com/tht/domain/config/aligo/AligoConst.java similarity index 92% rename from tht-core/domain/src/main/java/com/tht/domain/entity/config/aligo/AligoConst.java rename to tht-core/domain/src/main/java/com/tht/domain/config/aligo/AligoConst.java index 0d7cec18..330384be 100644 --- a/tht-core/domain/src/main/java/com/tht/domain/entity/config/aligo/AligoConst.java +++ b/tht-core/domain/src/main/java/com/tht/domain/config/aligo/AligoConst.java @@ -1,4 +1,4 @@ -package com.tht.domain.entity.config.aligo; +package com.tht.domain.config.aligo; import org.springframework.context.annotation.Configuration; diff --git a/tht-core/domain/src/main/java/com/tht/domain/entity/config/aligo/AligoUtils.java b/tht-core/domain/src/main/java/com/tht/domain/config/aligo/AligoUtils.java similarity index 90% rename from tht-core/domain/src/main/java/com/tht/domain/entity/config/aligo/AligoUtils.java rename to tht-core/domain/src/main/java/com/tht/domain/config/aligo/AligoUtils.java index e7f638b6..8248dee9 100644 --- a/tht-core/domain/src/main/java/com/tht/domain/entity/config/aligo/AligoUtils.java +++ b/tht-core/domain/src/main/java/com/tht/domain/config/aligo/AligoUtils.java @@ -1,10 +1,10 @@ -package com.tht.domain.entity.config.aligo; +package com.tht.domain.config.aligo; import com.fasterxml.jackson.databind.ObjectMapper; -import com.tht.domain.entity.config.MultiValueMapConverter; -import com.tht.domain.entity.config.WebClientConfig; -import com.tht.domain.entity.config.aligo.request.SmsAuthNumberRequest; +import com.tht.domain.config.MultiValueMapConverter; +import com.tht.domain.config.WebClientConfig; +import com.tht.domain.config.aligo.request.SmsAuthNumberRequest; import com.tht.domain.exception.AligoException; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; diff --git a/tht-core/domain/src/main/java/com/tht/domain/entity/config/aligo/request/SmsAuthNumberRequest.java b/tht-core/domain/src/main/java/com/tht/domain/config/aligo/request/SmsAuthNumberRequest.java similarity index 79% rename from tht-core/domain/src/main/java/com/tht/domain/entity/config/aligo/request/SmsAuthNumberRequest.java rename to tht-core/domain/src/main/java/com/tht/domain/config/aligo/request/SmsAuthNumberRequest.java index 6fb96fc9..44bd7923 100644 --- a/tht-core/domain/src/main/java/com/tht/domain/entity/config/aligo/request/SmsAuthNumberRequest.java +++ b/tht-core/domain/src/main/java/com/tht/domain/config/aligo/request/SmsAuthNumberRequest.java @@ -1,7 +1,7 @@ -package com.tht.domain.entity.config.aligo.request; +package com.tht.domain.config.aligo.request; -import com.tht.domain.entity.config.aligo.AligoConst; +import com.tht.domain.config.aligo.AligoConst; public record SmsAuthNumberRequest(String key, String user_id, String sender, String receiver, String msg) {