diff --git a/src/main/java/com/totopia/server/config/WebSecurityConfig.java b/src/main/java/com/totopia/server/config/WebSecurityConfig.java index 39b8793..715ae3c 100644 --- a/src/main/java/com/totopia/server/config/WebSecurityConfig.java +++ b/src/main/java/com/totopia/server/config/WebSecurityConfig.java @@ -72,6 +72,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/auth/**") .permitAll() .antMatchers("/users/**") + .permitAll() + .antMatchers("/league/**") .permitAll() .anyRequest() .authenticated(); diff --git a/src/main/java/com/totopia/server/init/DbInitializer.java b/src/main/java/com/totopia/server/init/DbInitializer.java index 05539e0..5813b98 100644 --- a/src/main/java/com/totopia/server/init/DbInitializer.java +++ b/src/main/java/com/totopia/server/init/DbInitializer.java @@ -148,8 +148,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("Germany") .korCountry("독일") - .eng_name("Germany Bundesliga I") - .kor_name("분데스리가") + .engName("Germany Bundesliga I") + .korName("분데스리가") .sevenMName("GER BI") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -157,8 +157,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("Germany") .korCountry("독일") - .eng_name("Germany Bundesliga II") - .kor_name("분데스리가 2") + .engName("Germany Bundesliga II") + .korName("분데스리가 2") .sevenMName("GER B2") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -167,8 +167,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("Germany") .korCountry("독일") - .eng_name("Germany 3.Liga") - .kor_name("3.리가") + .engName("Germany 3.Liga") + .korName("3.리가") .sevenMName("GER L3") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -176,8 +176,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("Germany") .korCountry("독일") - .eng_name("Germany Regionalliga West") - .kor_name("레기오날리가 웨스트") + .engName("Germany Regionalliga West") + .korName("레기오날리가 웨스트") .sevenMName("GER RL W") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -185,8 +185,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("Germany") .korCountry("독일") - .eng_name("Germany Regionalliga North") - .kor_name("레기오날리가 노스") + .engName("Germany Regionalliga North") + .korName("레기오날리가 노스") .sevenMName("GER RL N") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -195,8 +195,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("Germany") .korCountry("독일") - .eng_name("Germany Regionalliga North East") - .kor_name("레기오날리가 노스 이스트") + .engName("Germany Regionalliga North East") + .korName("레기오날리가 노스 이스트") .sevenMName("GER RL NE") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -205,8 +205,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("Germany") .korCountry("독일") - .eng_name("Germany Oberliga Rheinland-Pfalz/Saar") - .kor_name("오벨리가 Rheinland-Pfalz/Saar") + .engName("Germany Oberliga Rheinland-Pfalz/Saar") + .korName("오벨리가 Rheinland-Pfalz/Saar") .sevenMName("GER OL R") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -215,8 +215,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("Germany") .korCountry("독일") - .eng_name("Germany Regionalliga Bayern") - .kor_name("레기오날리가 바이에른") + .engName("Germany Regionalliga Bayern") + .korName("레기오날리가 바이에른") .sevenMName("GER RL B") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -225,8 +225,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("Germany") .korCountry("독일") - .eng_name("Germany Oberliga Hamburg") - .kor_name("오벨리가 함부르크") + .engName("Germany Oberliga Hamburg") + .korName("오벨리가 함부르크") .sevenMName("GER OL H") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -235,8 +235,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("Germany") .korCountry("독일") - .eng_name("Germany Oberliga Bayern North") - .kor_name("오벨리가 바이에른 노스") + .engName("Germany Oberliga Bayern North") + .korName("오벨리가 바이에른 노스") .sevenMName("GER OL BN") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -245,8 +245,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("Germany") .korCountry("독일") - .eng_name("Germany Oberliga Baden-Wuerttemberg") - .kor_name("오벨리가 Baden-Wuerttemberg") + .engName("Germany Oberliga Baden-Wuerttemberg") + .korName("오벨리가 Baden-Wuerttemberg") .sevenMName("GER OL BW") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -255,8 +255,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("Germany") .korCountry("독일") - .eng_name("Germany Oberliga Westfalen") - .kor_name("오벨리가 Westfalen") + .engName("Germany Oberliga Westfalen") + .korName("오벨리가 Westfalen") .sevenMName("GER OL W") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -265,8 +265,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("Germany") .korCountry("독일") - .eng_name("Germany Oberliga NOFV Sud") - .kor_name("오벨리가 NOFV Sud") + .engName("Germany Oberliga NOFV Sud") + .korName("오벨리가 NOFV Sud") .sevenMName("GER OL NS") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -275,8 +275,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("Germany") .korCountry("독일") - .eng_name("Germany Bundesliga Women") - .kor_name("우먼 분데스리가") + .engName("Germany Bundesliga Women") + .korName("우먼 분데스리가") .sevenMName("Germany BW") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -285,8 +285,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("England") .korCountry("잉글랜드") - .eng_name("Barclays Premier League") - .kor_name("프리미어 리그") + .engName("Barclays Premier League") + .korName("프리미어 리그") .sevenMName("Barclays PL") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -295,8 +295,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("England") .korCountry("잉글랜드") - .eng_name("England League 2") - .kor_name("리그 2") + .engName("England League 2") + .korName("리그 2") .sevenMName("UK L2") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -305,8 +305,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("England") .korCountry("잉글랜드") - .eng_name("England National League") - .kor_name("내셔널 리그") + .engName("England National League") + .korName("내셔널 리그") .sevenMName("UK NL") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -315,8 +315,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("England") .korCountry("잉글랜드") - .eng_name("England National League North") - .kor_name("내셔널 리그 노스") + .engName("England National League North") + .korName("내셔널 리그 노스") .sevenMName("UK NLN") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -325,8 +325,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("England") .korCountry("잉글랜드") - .eng_name("England National League South") - .kor_name("내셔널 리그 사우스") + .engName("England National League South") + .korName("내셔널 리그 사우스") .sevenMName("UK NLS") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -335,8 +335,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("England") .korCountry("잉글랜드") - .eng_name("England Isthmian Premier Division") - .kor_name("이스미안 프리미어 디비전") + .engName("England Isthmian Premier Division") + .korName("이스미안 프리미어 디비전") .sevenMName("Isthmian PD") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -345,8 +345,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("England") .korCountry("잉글랜드") - .eng_name("England Southern Premier League South") - .kor_name("사우던 프리미어 리그 사우스") + .engName("England Southern Premier League South") + .korName("사우던 프리미어 리그 사우스") .sevenMName("England SPL S") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -355,8 +355,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("England") .korCountry("잉글랜드") - .eng_name("England Southern Premier League Central") - .kor_name("사우던 프리미어 리그 센트럴") + .engName("England Southern Premier League Central") + .korName("사우던 프리미어 리그 센트럴") .sevenMName("England SPL C") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -365,8 +365,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("England") .korCountry("잉글랜드") - .eng_name("England Southern League Division One") - .kor_name("사우던 리그 디비전 1") + .engName("England Southern League Division One") + .korName("사우던 리그 디비전 1") .sevenMName("UK SLD1") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -375,8 +375,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("England") .korCountry("잉글랜드") - .eng_name("England U23 Development League") - .kor_name("유스 U23 디벨럽먼트 리그") + .engName("England U23 Development League") + .korName("유스 U23 디벨럽먼트 리그") .sevenMName("England U23 DL") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -385,8 +385,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("England") .korCountry("잉글랜드") - .eng_name("Lancashire Senior Cup") - .kor_name("랭커셔 시니어 컵") + .engName("Lancashire Senior Cup") + .korName("랭커셔 시니어 컵") .sevenMName("UK LS Cup") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); @@ -395,8 +395,8 @@ public class DbInitializer implements CommandLineRunner { leagueEntity = LeagueEntity.builder() .engCountry("England") .korCountry("잉글랜드") - .eng_name("England FA WSL") - .kor_name("우먼 FA 슈퍼리그") + .engName("England FA WSL") + .korName("우먼 FA 슈퍼리그") .sevenMName("FA WSL") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); diff --git a/src/main/java/com/totopia/server/modules/game/entity/LeagueEntity.java b/src/main/java/com/totopia/server/modules/game/entity/LeagueEntity.java index e19cf06..8c43ca1 100644 --- a/src/main/java/com/totopia/server/modules/game/entity/LeagueEntity.java +++ b/src/main/java/com/totopia/server/modules/game/entity/LeagueEntity.java @@ -22,10 +22,10 @@ public class LeagueEntity extends DateAuditEntity { private Long id; @Column(name = "eng_name", nullable = false, length = 200) - private String eng_name; + private String engName; @Column(name = "kor_name", nullable = true, length = 200) - private String kor_name; + private String korName; @Column(name = "seven_m_name", nullable = true, length = 50) private String sevenMName; diff --git a/src/test/java/com/totopia/server/modules/game/repository/LeagueRepositoryTest.java b/src/test/java/com/totopia/server/modules/game/repository/LeagueRepositoryTest.java index 30e2114..c8b9c23 100644 --- a/src/test/java/com/totopia/server/modules/game/repository/LeagueRepositoryTest.java +++ b/src/test/java/com/totopia/server/modules/game/repository/LeagueRepositoryTest.java @@ -33,8 +33,8 @@ public class LeagueRepositoryTest { LeagueEntity leagueEntity = LeagueEntity.builder() .engCountry("Germany") .korCountry("독알") - .eng_name("Germany Bundesliga I") - .kor_name("분데스리가") + .engName("Germany Bundesliga I") + .korName("분데스리가") .sevenMName("GER BI") .sportsEntities(Stream.of(SportsEntity.builder().id(Short.valueOf((short) 1)).build()).collect(Collectors.toCollection(HashSet::new))) .build(); diff --git a/src/test/java/com/totopia/server/modules/game/service/LeagueServiceTest.java b/src/test/java/com/totopia/server/modules/game/service/LeagueServiceTest.java index a4f90a4..649c921 100644 --- a/src/test/java/com/totopia/server/modules/game/service/LeagueServiceTest.java +++ b/src/test/java/com/totopia/server/modules/game/service/LeagueServiceTest.java @@ -14,7 +14,7 @@ import org.springframework.test.context.junit4.SpringRunner; import static org.junit.Assert.*; -@Ignore +//@Ignore @RunWith(SpringRunner.class) @SpringBootTest public class LeagueServiceTest {