Recruit - User 기능 연동 테스트 위한 PR (#748)

.github/workflows/checkstyle-validation.yml

@@ -2,7 +2,7 @@ name: 👮Checkstyle validation
 
 on:
   pull_request:
-    branches: [ main, dev ]
+    branches: [ main, dev , recruit-dev]
 
 jobs:
   checkstyle:

.github/workflows/test-code-validation.yml

@@ -2,7 +2,7 @@ name: 💻 Test code validation
 
 on:
   pull_request:
-    branches: [ main, dev ]
+    branches: [ main, dev, recruit-dev]
 
 jobs:
   test:

.gitignore

@@ -4,7 +4,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
-**/application.yml
+gg-pingpong-api/src/main/resources/application.yml
 .DS_Store
 python
 /logs

build.gradle

@@ -56,6 +56,9 @@ subprojects {
         implementation 'org.springframework.boot:spring-boot-starter-data-redis'
         implementation 'org.redisson:redisson:3.17.3'
 
+        //devtools
+        implementation 'org.springframework.boot:spring-boot-devtools'
+
         /* spring doc */
         implementation 'org.springdoc:springdoc-openapi-ui:1.6.6'
 
@@ -238,6 +241,19 @@ subprojects {
 project(':gg-pingpong-api') {
     bootJar { enabled = true }
     jar { enabled = true }
+    dependencies {
+        implementation project(':gg-data')
+        implementation project(':gg-repo')
+        implementation project(':gg-admin-repo')
+        implementation project(':gg-utils')
+        implementation project(':gg-auth')
+        implementation project(':gg-recruit-api')
+    }
+}
+
+project(':gg-recruit-api') {
+    bootJar { enabled = false }
+    jar { enabled = true }
     dependencies {
         implementation project(':gg-data')
         implementation project(':gg-repo')

gg-admin-repo/src/main/java/gg/admin/repo/game/GameAdminRepository.java

@@ -10,10 +10,10 @@
 import org.springframework.data.repository.query.Param;
 
 import gg.admin.repo.game.out.GameTeamUser;
-import gg.data.game.Game;
-import gg.data.game.type.Mode;
-import gg.data.game.type.StatusType;
-import gg.data.season.Season;
+import gg.data.pingpong.game.Game;
+import gg.data.pingpong.game.type.Mode;
+import gg.data.pingpong.game.type.StatusType;
+import gg.data.pingpong.season.Season;
 
 public interface GameAdminRepository extends JpaRepository<Game, Long> {
 

gg-admin-repo/src/main/java/gg/admin/repo/game/PChangeAdminRepository.java

@@ -2,7 +2,7 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import gg.data.game.PChange;
+import gg.data.pingpong.game.PChange;
 
 public interface PChangeAdminRepository extends JpaRepository<PChange, Long>, PChangeAdminRepositoryCustom {
 }

gg-admin-repo/src/main/java/gg/admin/repo/game/PChangeAdminRepositoryCustom.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import gg.data.game.PChange;
+import gg.data.pingpong.game.PChange;
 
 public interface PChangeAdminRepositoryCustom {
 	List<PChange> findByTeamUser(Long userId);

gg-admin-repo/src/main/java/gg/admin/repo/game/PChangeAdminRepositoryCustomImpl.java

@@ -5,7 +5,7 @@
 import javax.persistence.EntityManager;
 import javax.persistence.LockModeType;
 
-import gg.data.game.PChange;
+import gg.data.pingpong.game.PChange;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor

gg-admin-repo/src/main/java/gg/admin/repo/game/TeamAdminRepository.java

@@ -4,8 +4,8 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import gg.data.game.Game;
-import gg.data.game.Team;
+import gg.data.pingpong.game.Game;
+import gg.data.pingpong.game.Team;
 
 public interface TeamAdminRepository extends JpaRepository<Team, Long> {
 	List<Team> findAllByGame(Game game);

gg-admin-repo/src/main/java/gg/admin/repo/game/TeamUserAdminRepository.java

@@ -6,7 +6,7 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-import gg.data.game.TeamUser;
+import gg.data.pingpong.game.TeamUser;
 import gg.data.user.User;
 
 public interface TeamUserAdminRepository extends JpaRepository<TeamUser, Long> {

gg-admin-repo/src/main/java/gg/admin/repo/game/out/GameTeamUser.java

@@ -2,8 +2,8 @@
 
 import java.time.LocalDateTime;
 
-import gg.data.game.type.Mode;
-import gg.data.game.type.StatusType;
+import gg.data.pingpong.game.type.Mode;
+import gg.data.pingpong.game.type.StatusType;
 
 public interface GameTeamUser {
 	Long getGameId();

gg-admin-repo/src/main/java/gg/admin/repo/manage/AdminSlotManagementsRepository.java

@@ -8,7 +8,7 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-import gg.data.manage.SlotManagement;
+import gg.data.pingpong.manage.SlotManagement;
 
 public interface AdminSlotManagementsRepository extends JpaRepository<SlotManagement, Long> {
 	@Query("select slot from SlotManagement slot "

gg-admin-repo/src/main/java/gg/admin/repo/match/RedisMatchTimeAdminRepository.java

@@ -9,8 +9,8 @@
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Repository;
 
-import gg.data.match.RedisMatchUser;
-import gg.data.match.type.MatchKey;
+import gg.data.pingpong.match.RedisMatchUser;
+import gg.data.pingpong.match.type.MatchKey;
 import lombok.RequiredArgsConstructor;
 
 @Repository

gg-admin-repo/src/main/java/gg/admin/repo/season/SeasonAdminRepository.java

@@ -9,7 +9,7 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-import gg.data.season.Season;
+import gg.data.pingpong.season.Season;
 
 public interface SeasonAdminRepository extends JpaRepository<Season, Long> {
 	/* 입력시간과 모드로 입력시간 이후 가장 가까운 시즌 가져오기 */

gg-admin-repo/src/main/java/gg/admin/repo/store/CoinPolicyAdminRepository.java

@@ -4,7 +4,7 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import gg.data.store.CoinPolicy;
+import gg.data.pingpong.store.CoinPolicy;
 
 public interface CoinPolicyAdminRepository extends JpaRepository<CoinPolicy, Long> {
 	Optional<CoinPolicy> findFirstByOrderByIdDesc();

gg-admin-repo/src/main/java/gg/admin/repo/store/ItemAdminRepository.java

@@ -4,7 +4,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import gg.data.store.Item;
+import gg.data.pingpong.store.Item;
 
 public interface ItemAdminRepository extends JpaRepository<Item, Long> {
 	Page<Item> findAll(Pageable pageable);

gg-admin-repo/src/main/java/gg/admin/repo/store/MegaphoneAdminRepository.java

@@ -4,7 +4,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import gg.data.store.Megaphone;
+import gg.data.pingpong.store.Megaphone;
 
 public interface MegaphoneAdminRepository extends JpaRepository<Megaphone, Long> {
 	Page<Megaphone> findMegaphonesByUserIntraId(String intraId, Pageable pageable);

gg-admin-repo/src/main/java/gg/admin/repo/store/ReceiptAdminRepository.java

@@ -4,7 +4,7 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import gg.data.store.Receipt;
+import gg.data.pingpong.store.Receipt;
 
 public interface ReceiptAdminRepository extends JpaRepository<Receipt, Long>, ReceiptAdminRepositorySearch {
 	Page<Receipt> findAll(Pageable pageable);

gg-admin-repo/src/main/java/gg/admin/repo/store/ReceiptAdminRepositorySearch.java

@@ -5,7 +5,7 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-import gg.data.store.Receipt;
+import gg.data.pingpong.store.Receipt;
 
 public interface ReceiptAdminRepositorySearch {
 	@Query(value = "select re from Receipt re where re.purchaserIntraId = :intraId or re.ownerIntraId = :intraId")

gg-data/src/main/java/gg/data/game/Game.java → gg-data/src/main/java/gg/data/pingpong/game/Game.java

@@ -1,4 +1,4 @@
-package gg.data.game;
+package gg.data.pingpong.game;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -20,9 +20,9 @@
 
 import org.hibernate.annotations.DynamicUpdate;
 
-import gg.data.game.type.Mode;
-import gg.data.game.type.StatusType;
-import gg.data.season.Season;
+import gg.data.pingpong.game.type.Mode;
+import gg.data.pingpong.game.type.StatusType;
+import gg.data.pingpong.season.Season;
 import gg.utils.exception.BusinessChecker;
 import gg.utils.exception.ErrorCode;
 import lombok.AllArgsConstructor;

gg-data/src/main/java/gg/data/game/PChange.java → gg-data/src/main/java/gg/data/pingpong/game/PChange.java

@@ -1,4 +1,4 @@
-package gg.data.game;
+package gg.data.pingpong.game;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

gg-data/src/main/java/gg/data/game/Team.java → gg-data/src/main/java/gg/data/pingpong/game/Team.java

@@ -1,4 +1,4 @@
-package gg.data.game;
+package gg.data.pingpong.game;
 
 import java.util.ArrayList;
 import java.util.List;

gg-data/src/main/java/gg/data/game/TeamUser.java → gg-data/src/main/java/gg/data/pingpong/game/TeamUser.java

@@ -1,4 +1,4 @@
-package gg.data.game;
+package gg.data.pingpong.game;
 
 import javax.persistence.Entity;
 import javax.persistence.FetchType;

gg-data/src/main/java/gg/data/game/type/Mode.java → gg-data/src/main/java/gg/data/pingpong/game/type/Mode.java

@@ -1,4 +1,4 @@
-package gg.data.game.type;
+package gg.data.pingpong.game.type;
 
 import java.util.Locale;
 

gg-data/src/main/java/gg/data/game/type/StatusType.java → gg-data/src/main/java/gg/data/pingpong/game/type/StatusType.java

@@ -1,4 +1,4 @@
-package gg.data.game.type;
+package gg.data.pingpong.game.type;
 
 import java.util.Locale;
 

gg-data/src/main/java/gg/data/manage/SlotManagement.java → gg-data/src/main/java/gg/data/pingpong/manage/SlotManagement.java

@@ -1,4 +1,4 @@
-package gg.data.manage;
+package gg.data.pingpong.manage;
 
 import java.time.LocalDateTime;
 

gg-data/src/main/java/gg/data/match/RedisMatchTime.java → gg-data/src/main/java/gg/data/pingpong/match/RedisMatchTime.java

@@ -1,4 +1,4 @@
-package gg.data.match;
+package gg.data.pingpong.match;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -12,7 +12,7 @@
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 
-import gg.data.match.type.Option;
+import gg.data.pingpong.match.type.Option;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

gg-data/src/main/java/gg/data/match/RedisMatchUser.java → gg-data/src/main/java/gg/data/pingpong/match/RedisMatchUser.java

@@ -1,12 +1,12 @@
-package gg.data.match;
+package gg.data.pingpong.match;
 
 import java.io.Serializable;
 
 import javax.persistence.Id;
 
 import org.springframework.data.redis.core.RedisHash;
 
-import gg.data.match.type.Option;
+import gg.data.pingpong.match.type.Option;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

gg-data/src/main/java/gg/data/match/type/MatchKey.java → gg-data/src/main/java/gg/data/pingpong/match/type/MatchKey.java

@@ -1,4 +1,4 @@
-package gg.data.match.type;
+package gg.data.pingpong.match.type;
 
 import java.time.LocalDateTime;
 

gg-data/src/main/java/gg/data/match/type/Option.java → gg-data/src/main/java/gg/data/pingpong/match/type/Option.java

@@ -1,4 +1,4 @@
-package gg.data.match.type;
+package gg.data.pingpong.match.type;
 
 import java.util.Locale;
 

gg-data/src/main/java/gg/data/match/type/SlotStatus.java → gg-data/src/main/java/gg/data/pingpong/match/type/SlotStatus.java

@@ -1,4 +1,4 @@
-package gg.data.match.type;
+package gg.data.pingpong.match.type;
 
 import java.util.Locale;
 

gg-data/src/main/java/gg/data/match/type/TournamentMatchStatus.java → gg-data/src/main/java/gg/data/pingpong/match/type/TournamentMatchStatus.java

@@ -1,4 +1,4 @@
-package gg.data.match.type;
+package gg.data.pingpong.match.type;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

gg-data/src/main/java/gg/data/rank/Rank.java → gg-data/src/main/java/gg/data/pingpong/rank/Rank.java

@@ -1,4 +1,4 @@
-package gg.data.rank;
+package gg.data.pingpong.rank;
 
 import java.io.Serializable;
 
@@ -16,7 +16,7 @@
 import org.hibernate.annotations.DynamicUpdate;
 
 import gg.data.BaseTimeEntity;
-import gg.data.season.Season;
+import gg.data.pingpong.season.Season;
 import gg.data.user.User;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

gg-data/src/main/java/gg/data/rank/Tier.java → gg-data/src/main/java/gg/data/pingpong/rank/Tier.java

@@ -1,4 +1,4 @@
-package gg.data.rank;
+package gg.data.pingpong.rank;
 
 import java.io.Serializable;
 

gg-data/src/main/java/gg/data/rank/redis/RankRedis.java → gg-data/src/main/java/gg/data/pingpong/rank/redis/RankRedis.java

@@ -1,10 +1,10 @@
-package gg.data.rank.redis;
+package gg.data.pingpong.rank.redis;
 
 import java.io.Serializable;
 
 import org.springframework.data.redis.core.RedisHash;
 
-import gg.data.rank.Rank;
+import gg.data.pingpong.rank.Rank;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

gg-data/src/main/java/gg/data/season/Season.java → gg-data/src/main/java/gg/data/pingpong/season/Season.java

@@ -1,4 +1,4 @@
-package gg.data.season;
+package gg.data.pingpong.season;
 
 import java.time.LocalDateTime;
 

gg-data/src/main/java/gg/data/store/CoinHistory.java → gg-data/src/main/java/gg/data/pingpong/store/CoinHistory.java

@@ -1,4 +1,4 @@
-package gg.data.store;
+package gg.data.pingpong.store;
 
 import java.time.LocalDateTime;
 

gg-data/src/main/java/gg/data/store/CoinPolicy.java → gg-data/src/main/java/gg/data/pingpong/store/CoinPolicy.java

@@ -1,4 +1,4 @@
-package gg.data.store;
+package gg.data.pingpong.store;
 
 import java.time.LocalDateTime;
 

gg-data/src/main/java/gg/data/store/Item.java → gg-data/src/main/java/gg/data/pingpong/store/Item.java

@@ -1,4 +1,4 @@
-package gg.data.store;
+package gg.data.pingpong.store;
 
 import java.time.LocalDateTime;
 
@@ -11,7 +11,7 @@
 import javax.persistence.Id;
 import javax.validation.constraints.NotNull;
 
-import gg.data.store.type.ItemType;
+import gg.data.pingpong.store.type.ItemType;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

gg-data/src/main/java/gg/data/store/Megaphone.java → gg-data/src/main/java/gg/data/pingpong/store/Megaphone.java

@@ -1,4 +1,4 @@
-package gg.data.store;
+package gg.data.pingpong.store;
 
 import java.time.LocalDate;