#1 [chore] 멀티 모듈 의존성 분리

.gitignore

@@ -1,24 +1,41 @@
-# Compiled class file
-*.class
+HELP.md
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
 
-# Log file
-*.log
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
 
-# BlueJ files
-*.ctxt
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
 
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
 
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
+### VS Code ###
+.vscode/
 
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-replay_pid*
+### application.yml ###
+*.yml
+*.yaml

api/build.gradle

@@ -0,0 +1,24 @@
+bootWar {enabled = true}
+war {enabled = false}
+
+bootJar {enabled = true}
+jar {enabled = false}
+
+group = 'com.qdang'
+version = '1.0'
+
+dependencies {
+    implementation project(':core')
+    implementation project(':library')
+
+    providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+
+    // JPA & Database
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+
+    // Swagger
+    implementation 'org.springdoc:springdoc-openapi-ui:1.7.0'
+
+}

was/src/main/java/qdang/group/was/ServletInitializer.java → api/src/main/java/com/qdang/ServletInitializer.java

@@ -1,4 +1,4 @@
-package qdang.group.was;
+package com.qdang;
 
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@@ -9,5 +9,4 @@ public class ServletInitializer extends SpringBootServletInitializer {
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
 		return application.sources(WasApplication.class);
 	}
-
 }

was/src/main/java/qdang/group/was/WasApplication.java → api/src/main/java/com/qdang/WasApplication.java

@@ -1,15 +1,17 @@
-package qdang.group.was;
+package com.qdang;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
+@SpringBootApplication(scanBasePackageClasses = {
+	WasApplication.class,
+	CoreRoot.class
+})
 @EnableJpaAuditing
-@SpringBootApplication
 public class WasApplication {
 
 	public static void main(String[] args) {
 		SpringApplication.run(WasApplication.class, args);
 	}
-
 }

api/src/main/java/com/qdang/api/match/out/MatchRepository.java

@@ -0,0 +1,4 @@
+package com.qdang.api.match.out;
+
+public interface MatchRepository {
+}

was/src/main/java/qdang/group/was/domain/match/repository/MatchRepositoryImpl.java → api/src/main/java/com/qdang/api/match/out/MatchRepositoryImpl.java

@@ -1,10 +1,10 @@
-package qdang.group.was.domain.match.repository;
+package com.qdang.api.match.out;
 
+import com.qdang.core.match.Match;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
-import qdang.group.was.domain.match.domain.Match;
 
 public interface MatchRepositoryImpl extends JpaRepository<Match, Long> {
 
-	Optional<Match> findById(Long aLong);
+	Optional<Match> findById(Long Long);
 }

was/src/main/java/qdang/group/was/domain/user/controller/AuthController.java → api/src/main/java/com/qdang/api/user/adapter/in/AuthController.java

@@ -1,5 +1,11 @@
-package qdang.group.was.domain.user.controller;
+package com.qdang.api.user.adapter.in;
 
+import com.qdang.api.user.adapter.in.request.LoginRequest;
+import com.qdang.api.user.adapter.in.request.SignUpRequest;
+import com.qdang.api.user.service.dto.response.TokenCollection;
+import com.qdang.api.user.adapter.in.response.LoginResponse;
+import com.qdang.global.response.ApiResponse;
+import com.qdang.global.response.SuccessType;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -8,16 +14,10 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import qdang.group.was.domain.user.controller.dto.response.LoginResponse;
-import qdang.group.was.domain.user.service.AuthService;
-import qdang.group.was.domain.user.service.dto.response.TokenCollection;
-import qdang.group.was.global.response.ApiResponse;
-import qdang.group.was.global.response.SuccessType;
-import qdang.group.was.domain.user.controller.dto.request.LoginRequest;
-import qdang.group.was.domain.user.controller.dto.request.SignUpRequest;
+import com.qdang.api.user.service.AuthService;
 
-@RequestMapping("/api/v1/auth")
 @RestController
+@RequestMapping("/api/v1/auth")
 @RequiredArgsConstructor
 //@CrossOrigin
 @Tag(name = "Auth", description = "Auth API Document")

was/src/main/java/qdang/group/was/domain/user/controller/UserController.java → api/src/main/java/com/qdang/api/user/adapter/in/UserController.java

@@ -1,4 +1,4 @@
-package qdang.group.was.domain.user.controller;
+package com.qdang.api.user.adapter.in;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;

was/src/main/java/qdang/group/was/domain/user/controller/dto/request/LoginRequest.java → api/src/main/java/com/qdang/api/user/adapter/in/request/LoginRequest.java

@@ -1,10 +1,10 @@
-package qdang.group.was.domain.user.controller.dto.request;
+package com.qdang.api.user.adapter.in.request;
 
 import javax.validation.constraints.NotNull;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import qdang.group.was.domain.user.service.dto.request.LoginInfo;
+import com.qdang.api.user.service.dto.request.LoginInfo;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PRIVATE)

was/src/main/java/qdang/group/was/domain/user/controller/dto/request/SignUpRequest.java → api/src/main/java/com/qdang/api/user/adapter/in/request/SignUpRequest.java

@@ -1,10 +1,10 @@
-package qdang.group.was.domain.user.controller.dto.request;
+package com.qdang.api.user.adapter.in.request;
 
+import com.qdang.api.user.service.dto.request.SignUpInfo;
 import java.time.LocalDate;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import qdang.group.was.domain.user.service.dto.request.SignUpInfo;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PRIVATE)

was/src/main/java/qdang/group/was/domain/user/controller/dto/response/LoginResponse.java → api/src/main/java/com/qdang/api/user/adapter/in/response/LoginResponse.java

@@ -1,9 +1,9 @@
-package qdang.group.was.domain.user.controller.dto.response;
+package com.qdang.api.user.adapter.in.response;
 
+import com.qdang.api.user.service.dto.response.TokenCollection;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import qdang.group.was.domain.user.service.dto.response.TokenCollection;
 
 @Getter
 @AllArgsConstructor(access = AccessLevel.PRIVATE)

was/src/main/java/qdang/group/was/domain/user/exception/ConflictUserNameException.java → api/src/main/java/com/qdang/api/user/exception/ConflictUserNameException.java

@@ -1,7 +1,7 @@
-package qdang.group.was.domain.user.exception;
+package com.qdang.api.user.exception;
 
-import qdang.group.was.global.exception.BusinessException;
-import qdang.group.was.global.exception.ErrorType;
+import com.qdang.global.exception.ErrorType;
+import com.qdang.global.exception.BusinessException;
 
 public class ConflictUserNameException extends BusinessException {
 

was/src/main/java/qdang/group/was/domain/user/exception/InvalidPasswordException.java → api/src/main/java/com/qdang/api/user/exception/InvalidPasswordException.java

@@ -1,7 +1,7 @@
-package qdang.group.was.domain.user.exception;
+package com.qdang.api.user.exception;
 
-import qdang.group.was.global.exception.BusinessException;
-import qdang.group.was.global.exception.ErrorType;
+import com.qdang.global.exception.ErrorType;
+import com.qdang.global.exception.BusinessException;
 
 public class InvalidPasswordException extends BusinessException {
 

api/src/main/java/com/qdang/api/user/exception/NotFoundUserException.java

@@ -0,0 +1,11 @@
+package com.qdang.api.user.exception;
+
+import com.qdang.global.exception.ErrorType;
+import com.qdang.global.exception.BusinessException;
+
+public class NotFoundUserException extends BusinessException {
+
+	public NotFoundUserException() {
+		super(ErrorType.NOT_FOUND_USER_EXCEPTION);
+	}
+}

was/src/main/java/qdang/group/was/domain/user/repository/UserRepository.java → api/src/main/java/com/qdang/api/user/repository/UserRepository.java

@@ -1,7 +1,8 @@
-package qdang.group.was.domain.user.repository;
+package com.qdang.api.user.repository;
 
+
+import com.qdang.core.user.User;
 import java.util.Optional;
-import qdang.group.was.domain.user.domain.User;
 
 public interface UserRepository {
 

was/src/main/java/qdang/group/was/domain/user/repository/UserRepositoryImpl.java → api/src/main/java/com/qdang/api/user/repository/UserRepositoryImpl.java

@@ -1,7 +1,8 @@
-package qdang.group.was.domain.user.repository;
+package com.qdang.api.user.repository;
 
+
+import com.qdang.core.user.User;
 import org.springframework.data.repository.Repository;
-import qdang.group.was.domain.user.domain.User;
 
 public interface UserRepositoryImpl extends Repository<User, Long>, UserRepository {
 }

api/src/main/java/com/qdang/api/user/service/AuthService.java

@@ -0,0 +1,19 @@
+package com.qdang.api.user.service;
+
+import com.qdang.api.user.service.dto.request.SignUpInfo;
+import com.qdang.api.user.service.dto.response.TokenCollection;
+import com.qdang.api.user.service.dto.request.LoginInfo;
+import com.qdang.global.jwt.TokenInfo;
+
+public interface AuthService {
+
+	void signUp(SignUpInfo request);
+
+	TokenCollection login(LoginInfo request);
+
+	TokenCollection generateTokenCollection(TokenInfo tokenInfo);
+
+	boolean isPresentUserId(String userId);
+
+	boolean isWrongPassword(String rawPassword, String encodedPassword);
+}

was/src/main/java/qdang/group/was/domain/user/service/AuthServiceImpl.java → api/src/main/java/com/qdang/api/user/service/AuthServiceImpl.java

@@ -1,18 +1,18 @@
-package qdang.group.was.domain.user.service;
-
+package com.qdang.api.user.service;
+
+import com.qdang.api.user.exception.ConflictUserNameException;
+import com.qdang.api.user.exception.InvalidPasswordException;
+import com.qdang.api.user.exception.NotFoundUserException;
+import com.qdang.api.user.service.dto.request.LoginInfo;
+import com.qdang.api.user.service.dto.request.SignUpInfo;
+import com.qdang.api.user.service.dto.response.TokenCollection;
+import com.qdang.core.user.User;
+import com.qdang.global.jwt.JwtService;
+import com.qdang.global.jwt.TokenInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
-import qdang.group.was.global.jwt.JwtService;
-import qdang.group.was.global.jwt.TokenInfo;
-import qdang.group.was.domain.user.domain.User;
-import qdang.group.was.domain.user.exception.ConflictUserNameException;
-import qdang.group.was.domain.user.exception.InvalidPasswordException;
-import qdang.group.was.domain.user.exception.NotFoundUserException;
-import qdang.group.was.domain.user.repository.UserRepository;
-import qdang.group.was.domain.user.service.dto.request.LoginInfo;
-import qdang.group.was.domain.user.service.dto.request.SignUpInfo;
-import qdang.group.was.domain.user.service.dto.response.TokenCollection;
+import com.qdang.api.user.repository.UserRepository;
 
 @Service
 @RequiredArgsConstructor

api/src/main/java/com/qdang/api/user/service/UserService.java

@@ -0,0 +1,5 @@
+package com.qdang.api.user.service;
+
+
+public interface UserService {
+}

was/src/main/java/qdang/group/was/domain/user/service/UserServiceImpl.java → api/src/main/java/com/qdang/api/user/service/UserServiceImpl.java

@@ -1,4 +1,4 @@
-package qdang.group.was.domain.user.service;
+package com.qdang.api.user.service;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

was/src/main/java/qdang/group/was/domain/user/service/dto/request/LoginInfo.java → api/src/main/java/com/qdang/api/user/service/dto/request/LoginInfo.java

@@ -1,4 +1,4 @@
-package qdang.group.was.domain.user.service.dto.request;
+package com.qdang.api.user.service.dto.request;
 
 import lombok.AccessLevel;
 import lombok.Builder;

was/src/main/java/qdang/group/was/domain/user/service/dto/request/SignUpInfo.java → api/src/main/java/com/qdang/api/user/service/dto/request/SignUpInfo.java

@@ -1,11 +1,11 @@
-package qdang.group.was.domain.user.service.dto.request;
+package com.qdang.api.user.service.dto.request;
 
+import com.qdang.core.user.User;
 import java.time.LocalDate;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import qdang.group.was.domain.user.domain.User;
 
 @Getter
 @Builder(access = AccessLevel.PRIVATE)

was/src/main/java/qdang/group/was/domain/user/service/dto/response/TokenCollection.java → api/src/main/java/com/qdang/api/user/service/dto/response/TokenCollection.java

@@ -1,4 +1,4 @@
-package qdang.group.was.domain.user.service.dto.response;
+package com.qdang.api.user.service.dto.response;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

was/src/main/java/qdang/group/was/global/config/SecurityConfig.java → api/src/main/java/com/qdang/global/config/SecurityConfig.java

@@ -1,4 +1,4 @@
-package qdang.group.was.global.config;
+package com.qdang.global.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;

was/src/main/java/qdang/group/was/global/config/SwaggerConfig.java → api/src/main/java/com/qdang/global/config/SwaggerConfig.java

@@ -1,5 +1,7 @@
-package qdang.group.was.global.config;
+package com.qdang.global.config;
 
+import io.swagger.v3.oas.annotations.enums.SecuritySchemeType;
+import io.swagger.v3.oas.annotations.security.SecurityScheme;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
@@ -14,7 +16,7 @@ public OpenAPI openAPI() {
 		Info info = new Info()
 			.title("API Document")
 			.description("Q-Dang API Document")
-			.version("v1");
+			.version("v1.0.0");
 		return new OpenAPI()
 			.components(new Components())
 			.info(info);

was/src/main/java/qdang/group/was/global/exception/BusinessException.java → api/src/main/java/com/qdang/global/exception/BusinessException.java

@@ -1,4 +1,4 @@
-package qdang.group.was.global.exception;
+package com.qdang.global.exception;
 
 public class BusinessException extends RuntimeException {