Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FEAT] #688 api module add #689

Merged
merged 3 commits into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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')
wken5577 marked this conversation as resolved.
Show resolved Hide resolved
}
}

project(':gg-recruit-api') {
bootJar { enabled = false }
jar { enabled = true }
dependencies {
implementation project(':gg-data')
implementation project(':gg-repo')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;

@SpringBootApplication(scanBasePackages = {"gg.admin.repo", "gg.data", "gg.repo",
"gg.pingpong.api", "gg.utils", "gg.party.api", "gg.auth"})
"gg.pingpong.api", "gg.utils", "gg.party.api", "gg.auth", "gg.recruit.api"})
public class PingpongApiApplication {

public static void main(String[] args) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,8 @@
import com.fasterxml.jackson.databind.ObjectMapper;

import gg.admin.repo.store.CoinPolicyAdminRepository;

import gg.data.pingpong.store.CoinPolicy;

import gg.auth.utils.AuthTokenProvider;

import gg.data.pingpong.store.CoinPolicy;
import gg.data.user.User;
import gg.pingpong.api.admin.store.controller.response.CoinPolicyAdminListResponseDto;
import gg.pingpong.api.admin.store.dto.CoinPolicyAdminAddDto;
Expand All @@ -38,18 +35,14 @@
class CoinPolicyAdminControllerTest {
@Autowired
TestDataUtils testDataUtils;

@Autowired
private MockMvc mockMvc;

@Autowired
ObjectMapper objectMapper;

@Autowired
AuthTokenProvider tokenProvider;

@Autowired
CoinPolicyAdminRepository coinPolicyAdminRepository;
@Autowired
private MockMvc mockMvc;

@Test
@DisplayName("[Get]/pingpong/admin/coinpolicy")
Expand Down
31 changes: 31 additions & 0 deletions gg-recruit-api/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
plugins {
id 'java'
}

group 'gg.api'
version '42gg'

repositories {
mavenCentral()
}

dependencies {
/* spring */
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-mail'
annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'

/* StringUtils */
implementation 'org.apache.commons:commons-lang3:3.12.0'

testImplementation 'org.springframework.security:spring-security-test'

testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
testImplementation testFixtures(project(':gg-utils'))
}

test {
useJUnitPlatform()
}
22 changes: 22 additions & 0 deletions gg-recruit-api/src/main/java/gg/recruit/api/TestController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package gg.recruit.api;

import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;

import gg.auth.UserDto;
import gg.auth.argumentresolver.Login;

@RestController
public class TestController {

@GetMapping("/test")
public String test() {
return "test";
}

@GetMapping("/login")
public String login(@Login UserDto user) {
System.out.println("user = " + user);
return "login";
}
}
2 changes: 2 additions & 0 deletions gg-utils/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,14 @@ dependencies {
testFixturesImplementation project(":gg-repo")
testFixturesImplementation project(":gg-admin-repo")
testFixturesImplementation project(":gg-pingpong-api")
testFixturesImplementation project(":gg-recruit-api")

jacocoAggregation(project(':gg-data'))
jacocoAggregation(project(':gg-auth'))
jacocoAggregation(project(':gg-repo'))
jacocoAggregation(project(':gg-admin-repo'))
jacocoAggregation(project(':gg-pingpong-api'))
jacocoAggregation(project(':gg-recruit-api'))
}

test {
Expand Down
2 changes: 1 addition & 1 deletion gg-utils/src/testFixtures/java/gg/utils/TestDataUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import org.springframework.stereotype.Component;

import gg.auth.utils.AuthTokenProvider;
import gg.data.manage.Announcement;
import gg.data.noti.Noti;
import gg.data.noti.type.NotiType;
Expand Down Expand Up @@ -37,7 +38,6 @@
import gg.data.user.type.SnsType;
import gg.pingpong.api.admin.tournament.controller.request.TournamentAdminCreateRequestDto;
import gg.pingpong.api.admin.tournament.controller.request.TournamentAdminUpdateRequestDto;
import gg.auth.utils.AuthTokenProvider;
import gg.pingpong.api.user.tournament.controller.response.TournamentResponseDto;
import gg.pingpong.api.user.user.dto.UserImageDto;
import gg.repo.game.GameRepository;
Expand Down
1 change: 1 addition & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ include 'gg-repo'
include 'gg-pingpong-api'
include 'gg-utils'
include 'gg-auth'
include 'gg-recruit-api'

Loading