Skip to content

Commit f0c00bc

Browse files
EseasEseas
committed
Setting : modify Multi-Module
1 parent 90dc5c4 commit f0c00bc

File tree

207 files changed

+1756
-1107
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+1756
-1107
lines changed

‎.github/workflows/build_test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Java CI with Gradle
22

33
on:
44
push:
5-
branches: [ "dev", "main" ]
5+
branches: [ "dev", "main", "setting/multi-module" ]
66
pull_request:
7-
branches: [ "dev", "main" ]
7+
branches: [ "dev", "main", "setting/multi-module" ]
88

99
jobs:
1010
build:

‎Admin/build.gradle

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
plugins {
2+
id 'java'
3+
id 'org.springframework.boot' version '3.4.1'
4+
id 'io.spring.dependency-management' version '1.1.7'
5+
}
6+
7+
group = 'com.seveneleven'
8+
version = '0.0.1-SNAPSHOT'
9+
10+
repositories {
11+
mavenCentral()
12+
}
13+
14+
java {
15+
toolchain {
16+
languageVersion = JavaLanguageVersion.of(17)
17+
}
18+
}
19+
20+
configurations {
21+
compileOnly {
22+
extendsFrom annotationProcessor
23+
}
24+
}
25+
26+
repositories {
27+
mavenCentral()
28+
}
29+
30+
dependencies {
31+
implementation project(":Common")
32+
33+
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
34+
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
35+
implementation 'org.springframework.boot:spring-boot-starter-web'
36+
implementation 'org.springframework.boot:spring-boot-starter-security'
37+
// implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
38+
// https://mvnrepository.com/artifact/io.github.cdimascio/dotenv-java
39+
implementation group: 'io.github.cdimascio', name: 'dotenv-java', version: '3.0.0'
40+
// https://mvnrepository.com/artifact/org.springdoc/springdoc-openapi-starter-webmvc-ui
41+
implementation group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-ui', version: '2.7.0'
42+
// https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-starter-aws
43+
implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-aws', version: '2.2.6.RELEASE'
44+
implementation 'org.modelmapper:modelmapper:2.4.4'
45+
implementation 'javax.xml.bind:jaxb-api:2.3.1'
46+
implementation 'com.sun.xml.bind:jaxb-core:2.3.0.1'
47+
implementation 'com.sun.xml.bind:jaxb-impl:2.3.3'
48+
49+
// JSON Web Token (JWT) Core API
50+
implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
51+
52+
// Implementation and JSON support (runtime dependencies)
53+
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
54+
runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
55+
56+
compileOnly 'org.projectlombok:lombok'
57+
developmentOnly 'org.springframework.boot:spring-boot-devtools'
58+
testCompileOnly 'org.projectlombok:lombok'
59+
testAnnotationProcessor 'org.projectlombok:lombok'
60+
runtimeOnly 'com.mysql:mysql-connector-j'
61+
annotationProcessor 'org.projectlombok:lombok'
62+
63+
implementation 'com.h2database:h2'
64+
testImplementation 'org.springframework.boot:spring-boot-starter-test'
65+
//testImplementation 'org.springframework.security:spring-security-test'
66+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
67+
}
68+
69+
test {
70+
useJUnitPlatform()
71+
}

‎Admin/src/main/java/com/seveneleven/Main.java

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.seveneleven;
2+
3+
public class Main {
4+
public static void main(String[] args) {
5+
System.out.println("Hello, World!");
6+
}
7+
}

‎src/main/java/com/seveneleven/devlens/domain/member/MemberValidator.java ‎Admin/src/main/java/com/seveneleven/MemberValidator.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.seveneleven.devlens.domain.member;
1+
package com.seveneleven.member;
22

3-
import com.seveneleven.devlens.domain.admin.dto.MemberDto;
4-
import com.seveneleven.devlens.domain.member.repository.MemberRepository;
5-
import com.seveneleven.devlens.global.exception.BusinessException;
6-
import com.seveneleven.devlens.global.response.ErrorCode;
3+
import com.seveneleven.dto.MemberDto;
4+
import com.seveneleven.exception.BusinessException;
5+
import com.seveneleven.repository.AdminMemberRepository;
6+
import com.seveneleven.response.ErrorCode;
77

88
public class MemberValidator {
99

@@ -13,7 +13,7 @@ public class MemberValidator {
1313
*
1414
* @param memberDto 검증할 회원 요청 데이터.
1515
*/
16-
public static void validateMember(MemberRepository memberRepository, MemberDto.Request memberDto) {
16+
public static void validateMember(AdminMemberRepository memberRepository, MemberDto.Request memberDto) {
1717
// 로그인 ID 중복 확인
1818
if (memberRepository.existsByLoginId(memberDto.getLoginId())) {
1919
throw new BusinessException(ErrorCode.DUPLICATE_USER_ID);

‎src/main/java/com/seveneleven/devlens/domain/admin/common/CheckCompanyValidity.java ‎Admin/src/main/java/com/seveneleven/common/CheckCompanyValidity.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
package com.seveneleven.devlens.domain.admin.common;
1+
package com.seveneleven.common;
22

3-
import com.seveneleven.devlens.domain.admin.exception.CompanyDuplicatedException;
4-
import com.seveneleven.devlens.domain.admin.exception.CompanyNotFoundException;
5-
import com.seveneleven.devlens.domain.admin.repository.CompanyRepository;
6-
import com.seveneleven.devlens.domain.member.constant.YN;
7-
import com.seveneleven.devlens.domain.member.entity.Company;
3+
import com.seveneleven.entity.member.Company;
4+
import com.seveneleven.entity.member.constant.YN;
5+
import com.seveneleven.exception.CompanyDuplicatedException;
6+
import com.seveneleven.repository.CompanyRepository;
87
import lombok.RequiredArgsConstructor;
98
import org.springframework.stereotype.Component;
109

‎src/main/java/com/seveneleven/devlens/domain/admin/common/CheckProjectValidity.java ‎Admin/src/main/java/com/seveneleven/common/CheckProjectValidity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.seveneleven.devlens.domain.admin.common;
1+
package com.seveneleven.common;
22

3-
import com.seveneleven.devlens.domain.admin.exception.ProjectNameDuplicatedException;
4-
import com.seveneleven.devlens.domain.admin.repository.AdminProjectRepository;
3+
import com.seveneleven.exception.ProjectNameDuplicatedException;
4+
import com.seveneleven.repository.AdminProjectRepository;
55
import lombok.RequiredArgsConstructor;
66
import org.springframework.stereotype.Component;
77

‎src/main/java/com/seveneleven/devlens/domain/admin/common/EntityConverter.java ‎Admin/src/main/java/com/seveneleven/common/EntityConverter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.seveneleven.devlens.domain.admin.common;
1+
package com.seveneleven.common;
22

33
public interface EntityConverter <DTO,ENTITY>{
44
DTO toDTO(ENTITY entity);

‎src/main/java/com/seveneleven/devlens/domain/admin/controller/AdminProjectController.java ‎Admin/src/main/java/com/seveneleven/controller/AdminProjectController.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.seveneleven.devlens.domain.admin.controller;
1+
package com.seveneleven.controller;
22

3-
import com.seveneleven.devlens.domain.admin.dto.*;
4-
import com.seveneleven.devlens.domain.admin.service.ProjectCreateService;
5-
import com.seveneleven.devlens.domain.admin.service.ProjectHistoryService;
6-
import com.seveneleven.devlens.domain.admin.service.ProjectReadService;
7-
import com.seveneleven.devlens.domain.admin.service.ProjectUpdateService;
8-
import com.seveneleven.devlens.global.response.APIResponse;
9-
import com.seveneleven.devlens.global.response.SuccessCode;
3+
import com.seveneleven.dto.*;
4+
import com.seveneleven.response.APIResponse;
5+
import com.seveneleven.response.SuccessCode;
6+
import com.seveneleven.service.ProjectCreateService;
7+
import com.seveneleven.service.ProjectHistoryService;
8+
import com.seveneleven.service.ProjectReadService;
9+
import com.seveneleven.service.ProjectUpdateService;
1010
import lombok.RequiredArgsConstructor;
1111
import org.springframework.http.ResponseEntity;
1212
import org.springframework.web.bind.annotation.*;

‎src/main/java/com/seveneleven/devlens/domain/admin/controller/CompanyController.java ‎Admin/src/main/java/com/seveneleven/controller/CompanyController.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package com.seveneleven.devlens.domain.admin.controller;
1+
package com.seveneleven.controller;
22

3-
import com.seveneleven.devlens.domain.admin.dto.CompanyDto;
4-
import com.seveneleven.devlens.domain.admin.dto.GetCompany;
5-
import com.seveneleven.devlens.domain.admin.dto.PaginatedResponse;
6-
import com.seveneleven.devlens.domain.admin.service.CompanyCreateService;
7-
import com.seveneleven.devlens.domain.admin.service.CompanyReadService;
8-
import com.seveneleven.devlens.domain.admin.service.CompanyUpdateService;
9-
import com.seveneleven.devlens.global.response.APIResponse;
10-
import com.seveneleven.devlens.global.response.SuccessCode;
3+
import com.seveneleven.dto.CompanyDto;
4+
import com.seveneleven.dto.GetCompany;
5+
import com.seveneleven.dto.PaginatedResponse;
6+
import com.seveneleven.response.APIResponse;
7+
import com.seveneleven.response.SuccessCode;
8+
import com.seveneleven.service.CompanyCreateService;
9+
import com.seveneleven.service.CompanyReadService;
10+
import com.seveneleven.service.CompanyUpdateService;
1111
import jakarta.validation.Valid;
1212
import lombok.RequiredArgsConstructor;
1313
import org.springframework.http.ResponseEntity;

‎src/main/java/com/seveneleven/devlens/global/util/file/controller/CompanyFileController.java ‎Admin/src/main/java/com/seveneleven/controller/CompanyFileController.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.seveneleven.devlens.global.util.file.controller;
1+
package com.seveneleven.util.file.controller;
22

3-
import com.seveneleven.devlens.global.response.APIResponse;
4-
import com.seveneleven.devlens.global.util.file.Service.CompanyFileService;
3+
import com.seveneleven.util.file.Service.CompanyFileService;
4+
import com.seveneleven.response.APIResponse;
55
import io.swagger.v3.oas.annotations.Operation;
66
import io.swagger.v3.oas.annotations.media.Schema;
77
import io.swagger.v3.oas.annotations.responses.ApiResponse;

‎src/main/java/com/seveneleven/devlens/domain/admin/controller/MemberMgmtController.java ‎Admin/src/main/java/com/seveneleven/controller/MemberMgmtController.java

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
package com.seveneleven.devlens.domain.admin.controller;
2-
3-
import com.seveneleven.devlens.domain.admin.dto.MemberDto;
4-
import com.seveneleven.devlens.domain.admin.dto.MemberUpdate;
5-
import com.seveneleven.devlens.domain.admin.service.MemberMgmtService;
6-
import com.seveneleven.devlens.domain.member.constant.MemberStatus;
7-
import com.seveneleven.devlens.domain.member.constant.Role;
8-
import com.seveneleven.devlens.global.response.APIResponse;
9-
import com.seveneleven.devlens.global.response.SuccessCode;
1+
package com.seveneleven.controller;
2+
3+
import com.seveneleven.dto.MemberDto;
4+
import com.seveneleven.dto.MemberUpdate;
5+
import com.seveneleven.entity.member.constant.MemberStatus;
6+
import com.seveneleven.entity.member.constant.Role;
7+
import com.seveneleven.response.APIResponse;
8+
import com.seveneleven.response.SuccessCode;
9+
import com.seveneleven.service.MemberMgmtService;
1010
import lombok.RequiredArgsConstructor;
11-
import org.hibernate.annotations.Fetch;
1211
import org.springframework.data.domain.Page;
1312
import org.springframework.data.domain.Pageable;
1413
import org.springframework.data.domain.Sort;

‎src/main/java/com/seveneleven/devlens/domain/admin/dto/CompanyDto.java ‎Admin/src/main/java/com/seveneleven/dto/CompanyDto.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.seveneleven.devlens.domain.admin.dto;
1+
package com.seveneleven.dto;
22

3-
import com.seveneleven.devlens.domain.member.constant.BusinessType;
4-
import com.seveneleven.devlens.domain.member.constant.YN;
3+
import com.seveneleven.entity.member.constant.BusinessType;
4+
import com.seveneleven.entity.member.constant.YN;
55
import lombok.AccessLevel;
66
import lombok.Getter;
77
import lombok.NoArgsConstructor;

‎src/main/java/com/seveneleven/devlens/domain/admin/dto/GetCompany.java ‎Admin/src/main/java/com/seveneleven/dto/GetCompany.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.seveneleven.devlens.domain.admin.dto;
1+
package com.seveneleven.dto;
22

3-
import com.seveneleven.devlens.domain.member.constant.BusinessType;
4-
import com.seveneleven.devlens.domain.member.constant.YN;
3+
import com.seveneleven.entity.member.constant.BusinessType;
4+
import com.seveneleven.entity.member.constant.YN;
55
import lombok.AccessLevel;
66
import lombok.Getter;
77
import lombok.NoArgsConstructor;

‎src/main/java/com/seveneleven/devlens/domain/admin/dto/GetProject.java ‎Admin/src/main/java/com/seveneleven/dto/GetProject.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
package com.seveneleven.devlens.domain.admin.dto;
1+
package com.seveneleven.dto;
22

3-
import com.seveneleven.devlens.domain.project.entity.Project;
4-
import com.seveneleven.devlens.global.entity.YesNo;
3+
import com.seveneleven.entity.project.Project;
54
import lombok.AccessLevel;
65
import lombok.Getter;
76
import lombok.NoArgsConstructor;

‎src/main/java/com/seveneleven/devlens/domain/admin/dto/MemberDto.java ‎Admin/src/main/java/com/seveneleven/dto/MemberDto.java

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
package com.seveneleven.devlens.domain.admin.dto;
1+
package com.seveneleven.dto;
22

3-
import com.seveneleven.devlens.domain.member.constant.MemberStatus;
4-
import com.seveneleven.devlens.domain.member.constant.Role;
5-
import com.seveneleven.devlens.domain.member.entity.Member;
3+
import com.seveneleven.entity.member.Member;
4+
import com.seveneleven.entity.member.constant.MemberStatus;
5+
import com.seveneleven.entity.member.constant.Role;
66
import lombok.Getter;
77
import lombok.Setter;
88
import org.modelmapper.ModelMapper;
99
import org.modelmapper.config.Configuration;
1010

1111
import java.time.LocalDate;
1212

13-
1413
public class MemberDto {
1514

1615
// **Member로 변환하는 메서드**
@@ -23,8 +22,8 @@ public Member toEntity() {
2322
return modelMapper.map(this, Member.class);
2423
}
2524

26-
public static MemberDto.Response fromEntity(Member member) {
27-
return modelMapper.map(member, MemberDto.Response.class);
25+
public static Response fromEntity(Member member) {
26+
return modelMapper.map(member, Response.class);
2827
}
2928

3029
@Getter

‎src/main/java/com/seveneleven/devlens/domain/member/dto/MemberSpecification.java ‎Admin/src/main/java/com/seveneleven/dto/MemberSpecification.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.seveneleven.devlens.domain.member.dto;
1+
package com.seveneleven.dto;
22

3-
import com.seveneleven.devlens.domain.member.constant.MemberStatus;
4-
import com.seveneleven.devlens.domain.member.constant.Role;
5-
import com.seveneleven.devlens.domain.member.entity.Member;
3+
import com.seveneleven.entity.member.Member;
4+
import com.seveneleven.entity.member.constant.MemberStatus;
5+
import com.seveneleven.entity.member.constant.Role;
66
import org.springframework.data.jpa.domain.Specification;
77

88
/**

‎src/main/java/com/seveneleven/devlens/domain/admin/dto/MemberUpdate.java ‎Admin/src/main/java/com/seveneleven/dto/MemberUpdate.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.seveneleven.devlens.domain.admin.dto;
1+
package com.seveneleven.dto;
22

3-
import com.seveneleven.devlens.domain.member.constant.Role;
4-
import com.seveneleven.devlens.domain.member.entity.Member;
3+
import com.seveneleven.entity.member.Member;
4+
import com.seveneleven.entity.member.constant.Role;
55
import lombok.AllArgsConstructor;
66
import lombok.Getter;
77
import lombok.Setter;
@@ -22,8 +22,8 @@ public Member toEntity() {
2222
return modelMapper.map(this, Member.class);
2323
}
2424

25-
public static MemberUpdate.PatchResponse fromEntity(Member member) {
26-
return modelMapper.map(member, MemberUpdate.PatchResponse.class);
25+
public static PatchResponse fromEntity(Member member) {
26+
return modelMapper.map(member, PatchResponse.class);
2727
}
2828

2929
@Getter

‎src/main/java/com/seveneleven/devlens/domain/admin/dto/PaginatedResponse.java ‎Admin/src/main/java/com/seveneleven/dto/PaginatedResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.seveneleven.devlens.domain.admin.dto;
1+
package com.seveneleven.dto;
22

33
import lombok.AccessLevel;
44
import lombok.Getter;

‎src/main/java/com/seveneleven/devlens/domain/admin/dto/PostProject.java ‎Admin/src/main/java/com/seveneleven/dto/PostProject.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
package com.seveneleven.devlens.domain.admin.dto;
1+
package com.seveneleven.dto;
22

3-
import com.seveneleven.devlens.domain.project.entity.Project;
4-
import com.seveneleven.devlens.global.entity.YesNo;
3+
import com.seveneleven.entity.project.Project;
54
import lombok.AccessLevel;
65
import lombok.Getter;
76
import lombok.NoArgsConstructor;

0 commit comments

Comments
 (0)