Skip to content

Commit 61268a9

Browse files
shine-17shine-17
committed
헥사고날 아키텍처의 패키지 구조로 패키지 레이어링
1 parent 533be1b commit 61268a9

Some content is hidden

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

41 files changed

+130
-157
lines changed

‎src/main/java/com/study/bookcafe/service/BookService.java renamed to ‎src/main/java/com/study/bookcafe/application/book/BookService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.study.bookcafe.service;
1+
package com.study.bookcafe.application.book;
22

3-
import com.study.bookcafe.domain.Book;
3+
import com.study.bookcafe.domain.book.Book;
44

55
import java.util.Collection;
66
import java.util.List;

‎src/main/java/com/study/bookcafe/service/BookServiceImpl.java renamed to ‎src/main/java/com/study/bookcafe/application/book/BookServiceImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.study.bookcafe.service;
1+
package com.study.bookcafe.application.book;
22

3-
import com.study.bookcafe.repository.BookRepository;
4-
import com.study.bookcafe.domain.Book;
3+
import com.study.bookcafe.domain.book.BookRepository;
4+
import com.study.bookcafe.domain.book.Book;
55
import org.springframework.stereotype.Service;
66

77
import java.util.Collection;

‎src/main/java/com/study/bookcafe/service/BorrowService.java renamed to ‎src/main/java/com/study/bookcafe/application/borrow/BorrowService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.study.bookcafe.service;
1+
package com.study.bookcafe.application.borrow;
22

3-
import com.study.bookcafe.domain.Borrow;
3+
import com.study.bookcafe.domain.borrow.Borrow;
44

55
import java.util.Collection;
66
import java.util.List;

‎src/main/java/com/study/bookcafe/service/BorrowServiceImpl.java renamed to ‎src/main/java/com/study/bookcafe/application/borrow/BorrowServiceImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.study.bookcafe.service;
1+
package com.study.bookcafe.application.borrow;
22

3-
import com.study.bookcafe.repository.BorrowRepository;
4-
import com.study.bookcafe.domain.Borrow;
3+
import com.study.bookcafe.domain.borrow.BorrowRepository;
4+
import com.study.bookcafe.domain.borrow.Borrow;
55
import org.springframework.stereotype.Service;
66

77
import java.util.Collection;

‎src/main/java/com/study/bookcafe/service/MemberService.java renamed to ‎src/main/java/com/study/bookcafe/application/member/MemberService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.study.bookcafe.service;
1+
package com.study.bookcafe.application.member;
22

3-
import com.study.bookcafe.domain.Borrow;
4-
import com.study.bookcafe.domain.Member;
3+
import com.study.bookcafe.domain.borrow.Borrow;
4+
import com.study.bookcafe.domain.member.Member;
55

66
import java.util.Collection;
77
import java.util.List;

‎src/main/java/com/study/bookcafe/service/MemberServiceImpl.java renamed to ‎src/main/java/com/study/bookcafe/application/member/MemberServiceImpl.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
package com.study.bookcafe.service;
2-
3-
import com.study.bookcafe.repository.MemberRepository;
4-
import com.study.bookcafe.domain.Book;
5-
import com.study.bookcafe.domain.Borrow;
6-
import com.study.bookcafe.domain.Member;
1+
package com.study.bookcafe.application.member;
2+
3+
import com.study.bookcafe.application.book.BookService;
4+
import com.study.bookcafe.application.borrow.BorrowService;
5+
import com.study.bookcafe.domain.member.MemberRepository;
6+
import com.study.bookcafe.domain.book.Book;
7+
import com.study.bookcafe.domain.borrow.Borrow;
8+
import com.study.bookcafe.domain.member.Member;
79
import org.springframework.stereotype.Service;
810

911
import java.util.Collection;

‎src/main/java/com/study/bookcafe/common/ApiResult.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎src/main/java/com/study/bookcafe/domain/Book.java renamed to ‎src/main/java/com/study/bookcafe/domain/book/Book.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.study.bookcafe.domain;
1+
package com.study.bookcafe.domain.book;
22

33
import lombok.Builder;
44
import lombok.Getter;

‎src/main/java/com/study/bookcafe/entity/BookEntity.java renamed to ‎src/main/java/com/study/bookcafe/domain/book/BookEntity.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package com.study.bookcafe.entity;
1+
package com.study.bookcafe.domain.book;
22

3-
import com.study.bookcafe.domain.Inventory;
43
import lombok.Builder;
54
import lombok.Getter;
65

‎src/main/java/com/study/bookcafe/repository/BookRepository.java renamed to ‎src/main/java/com/study/bookcafe/domain/book/BookRepository.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
package com.study.bookcafe.repository;
2-
3-
import com.study.bookcafe.domain.Book;
1+
package com.study.bookcafe.domain.book;
42

53
import java.util.Collection;
64
import java.util.List;

‎src/main/java/com/study/bookcafe/domain/Inventory.java renamed to ‎src/main/java/com/study/bookcafe/domain/book/Inventory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.study.bookcafe.domain;
1+
package com.study.bookcafe.domain.book;
22

33
import lombok.Getter;
44

‎src/main/java/com/study/bookcafe/repository/TestBookRepository.java renamed to ‎src/main/java/com/study/bookcafe/domain/book/TestBookRepository.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
package com.study.bookcafe.repository;
1+
package com.study.bookcafe.domain.book;
22

3-
import com.study.bookcafe.domain.Book;
4-
import com.study.bookcafe.domain.Inventory;
5-
import com.study.bookcafe.entity.BookEntity;
6-
import com.study.bookcafe.mapper.BookMapper;
3+
import com.study.bookcafe.interfaces.book.BookMapper;
74
import org.springframework.stereotype.Repository;
85

96
import java.sql.Date;

‎src/main/java/com/study/bookcafe/domain/Borrow.java renamed to ‎src/main/java/com/study/bookcafe/domain/borrow/Borrow.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package com.study.bookcafe.domain;
1+
package com.study.bookcafe.domain.borrow;
22

3-
import com.study.bookcafe.vo.Period;
3+
import com.study.bookcafe.domain.member.Member;
4+
import com.study.bookcafe.domain.book.Book;
45
import lombok.*;
56
import java.time.LocalDateTime;
67

‎src/main/java/com/study/bookcafe/entity/BorrowEntity.java renamed to ‎src/main/java/com/study/bookcafe/domain/borrow/BorrowEntity.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package com.study.bookcafe.entity;
1+
package com.study.bookcafe.domain.borrow;
22

3-
import com.study.bookcafe.vo.Period;
3+
import com.study.bookcafe.domain.book.BookEntity;
4+
import com.study.bookcafe.domain.member.MemberEntity;
45
import lombok.Builder;
56
import lombok.Getter;
67
import lombok.NonNull;

‎src/main/java/com/study/bookcafe/repository/BorrowRepository.java renamed to ‎src/main/java/com/study/bookcafe/domain/borrow/BorrowRepository.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
package com.study.bookcafe.repository;
2-
3-
import com.study.bookcafe.domain.Borrow;
1+
package com.study.bookcafe.domain.borrow;
42

53
import java.util.Collection;
64
import java.util.List;

‎src/main/java/com/study/bookcafe/vo/Period.java renamed to ‎src/main/java/com/study/bookcafe/domain/borrow/Period.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.study.bookcafe.vo;
1+
package com.study.bookcafe.domain.borrow;
22

3-
import com.study.bookcafe.domain.Level;
3+
import com.study.bookcafe.domain.member.Level;
44
import lombok.EqualsAndHashCode;
55
import lombok.NonNull;
66
import java.time.LocalDate;

‎src/main/java/com/study/bookcafe/repository/TestBorrowRepository.java renamed to ‎src/main/java/com/study/bookcafe/domain/borrow/TestBorrowRepository.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
package com.study.bookcafe.repository;
1+
package com.study.bookcafe.domain.borrow;
22

3-
import com.study.bookcafe.domain.Borrow;
4-
import com.study.bookcafe.entity.BookEntity;
5-
import com.study.bookcafe.entity.BorrowEntity;
6-
import com.study.bookcafe.entity.MemberEntity;
7-
import com.study.bookcafe.mapper.BorrowMapper;
3+
import com.study.bookcafe.domain.book.BookEntity;
4+
import com.study.bookcafe.domain.member.MemberEntity;
5+
import com.study.bookcafe.interfaces.borrow.BorrowMapper;
86
import org.springframework.stereotype.Repository;
97

8+
import java.time.LocalDateTime;
109
import java.util.Collection;
1110
import java.util.HashMap;
1211
import java.util.List;
@@ -24,10 +23,14 @@ public TestBorrowRepository(BorrowMapper borrowMapper) {
2423
Map<Long, BorrowEntity> borrows = new HashMap<>(){{
2524
put(1L, BorrowEntity.builder()
2625
.member(MemberEntity.builder().id(1).build())
27-
.book(BookEntity.builder().id(1).ISBN(9788936433598L).build()).build());
26+
.book(BookEntity.builder().id(1).ISBN(9788936433598L).build())
27+
.time(LocalDateTime.now())
28+
.build());
2829
put(2L, BorrowEntity.builder()
2930
.member(MemberEntity.builder().id(1).build())
30-
.book(BookEntity.builder().id(2).ISBN(9788936433598L).build()).build());
31+
.book(BookEntity.builder().id(2).ISBN(9788936433598L).build())
32+
.time(LocalDateTime.now())
33+
.build());
3134
put(3L, null);
3235
}};
3336

‎src/main/java/com/study/bookcafe/repository/GeneralMemberRepository.java renamed to ‎src/main/java/com/study/bookcafe/domain/member/GeneralMemberRepository.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
package com.study.bookcafe.repository;
1+
package com.study.bookcafe.domain.member;
22

3-
import com.study.bookcafe.domain.Level;
4-
import com.study.bookcafe.domain.Member;
5-
import com.study.bookcafe.entity.MemberEntity;
6-
import com.study.bookcafe.mapper.MemberMapper;
3+
import com.study.bookcafe.interfaces.member.MemberMapper;
74
import org.springframework.stereotype.Repository;
85

96
import java.util.HashMap;

‎src/main/java/com/study/bookcafe/domain/Level.java renamed to ‎src/main/java/com/study/bookcafe/domain/member/Level.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.study.bookcafe.domain;
1+
package com.study.bookcafe.domain.member;
22

33
import lombok.Getter;
44

‎src/main/java/com/study/bookcafe/domain/Member.java renamed to ‎src/main/java/com/study/bookcafe/domain/member/Member.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
package com.study.bookcafe.domain;
1+
package com.study.bookcafe.domain.member;
22

3+
import com.study.bookcafe.domain.book.Book;
4+
import com.study.bookcafe.domain.borrow.Borrow;
35
import lombok.Builder;
46
import lombok.Getter;
57
import java.time.LocalDateTime;

‎src/main/java/com/study/bookcafe/entity/MemberEntity.java renamed to ‎src/main/java/com/study/bookcafe/domain/member/MemberEntity.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package com.study.bookcafe.entity;
1+
package com.study.bookcafe.domain.member;
22

3-
import com.study.bookcafe.domain.Level;
43
import lombok.Builder;
54
import lombok.Getter;
65

‎src/main/java/com/study/bookcafe/domain/member/MemberRepository.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package com.study.bookcafe.domain.member;
2+
3+
public interface MemberRepository {
4+
Member findById(long memberId);
5+
}

‎src/main/java/com/study/bookcafe/dto/BookDto.java renamed to ‎src/main/java/com/study/bookcafe/interfaces/book/BookDto.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.study.bookcafe.dto;
1+
package com.study.bookcafe.interfaces.book;
22

3-
import com.study.bookcafe.domain.Inventory;
3+
import com.study.bookcafe.domain.book.Inventory;
44
import lombok.*;
55

66
import java.sql.Date;

‎src/main/java/com/study/bookcafe/mapper/BookMapper.java renamed to ‎src/main/java/com/study/bookcafe/interfaces/book/BookMapper.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package com.study.bookcafe.mapper;
1+
package com.study.bookcafe.interfaces.book;
22

3-
import com.study.bookcafe.domain.Book;
4-
import com.study.bookcafe.dto.BookDto;
5-
import com.study.bookcafe.entity.BookEntity;
3+
import com.study.bookcafe.domain.book.Book;
4+
import com.study.bookcafe.domain.book.BookEntity;
65
import org.mapstruct.*;
76

87
import java.util.List;

‎src/main/java/com/study/bookcafe/dto/BorrowDto.java renamed to ‎src/main/java/com/study/bookcafe/interfaces/borrow/BorrowDto.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
package com.study.bookcafe.dto;
1+
package com.study.bookcafe.interfaces.borrow;
22

3-
import com.study.bookcafe.vo.Period;
3+
import com.study.bookcafe.domain.borrow.Period;
4+
import com.study.bookcafe.interfaces.member.MemberDto;
5+
import com.study.bookcafe.interfaces.book.BookDto;
46
import lombok.*;
57
import java.time.LocalDateTime;
68

‎src/main/java/com/study/bookcafe/mapper/BorrowMapper.java renamed to ‎src/main/java/com/study/bookcafe/interfaces/borrow/BorrowMapper.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
package com.study.bookcafe.mapper;
1+
package com.study.bookcafe.interfaces.borrow;
22

3-
import com.study.bookcafe.domain.Borrow;
4-
import com.study.bookcafe.dto.BorrowDto;
5-
import com.study.bookcafe.entity.BorrowEntity;
3+
import com.study.bookcafe.domain.borrow.Borrow;
4+
import com.study.bookcafe.interfaces.book.BookMapper;
5+
import com.study.bookcafe.domain.borrow.BorrowEntity;
6+
import com.study.bookcafe.interfaces.member.MemberMapper;
67
import jdk.jfr.Name;
78
import org.mapstruct.*;
89

‎src/main/java/com/study/bookcafe/dto/RequestBorrowDto.java renamed to ‎src/main/java/com/study/bookcafe/interfaces/borrow/RequestBorrowDto.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.study.bookcafe.dto;
1+
package com.study.bookcafe.interfaces.borrow;
22

33
import lombok.Getter;
44

‎src/main/java/com/study/bookcafe/common/JsonHelper.java renamed to ‎src/main/java/com/study/bookcafe/interfaces/common/JsonHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.study.bookcafe.common;
1+
package com.study.bookcafe.interfaces.common;
22

33
import com.google.gson.Gson;
44
import com.google.gson.GsonBuilder;

‎src/main/java/com/study/bookcafe/common/LocalDateAdapter.java renamed to ‎src/main/java/com/study/bookcafe/interfaces/common/LocalDateAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.study.bookcafe.common;
1+
package com.study.bookcafe.interfaces.common;
22

33
import com.google.gson.*;
44

‎src/main/java/com/study/bookcafe/common/LocalDateTimeAdapter.java renamed to ‎src/main/java/com/study/bookcafe/interfaces/common/LocalDateTimeAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.study.bookcafe.common;
1+
package com.study.bookcafe.interfaces.common;
22

33
import com.google.gson.*;
44

‎src/main/java/com/study/bookcafe/controller/MemberController.java renamed to ‎src/main/java/com/study/bookcafe/interfaces/member/MemberController.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
package com.study.bookcafe.controller;
2-
3-
import com.study.bookcafe.domain.Borrow;
4-
import com.study.bookcafe.domain.Member;
5-
import com.study.bookcafe.dto.BorrowDto;
6-
import com.study.bookcafe.dto.MemberDto;
7-
import com.study.bookcafe.dto.RequestBorrowDto;
8-
import com.study.bookcafe.mapper.BorrowMapper;
9-
import com.study.bookcafe.mapper.MemberMapper;
10-
import com.study.bookcafe.service.MemberService;
1+
package com.study.bookcafe.interfaces.member;
2+
3+
import com.study.bookcafe.domain.borrow.Borrow;
4+
import com.study.bookcafe.domain.member.Member;
5+
import com.study.bookcafe.interfaces.borrow.BorrowDto;
6+
import com.study.bookcafe.interfaces.borrow.RequestBorrowDto;
7+
import com.study.bookcafe.interfaces.borrow.BorrowMapper;
8+
import com.study.bookcafe.application.member.MemberService;
119
import org.springframework.http.ResponseEntity;
1210
import org.springframework.web.bind.annotation.*;
1311

‎src/main/java/com/study/bookcafe/dto/MemberDto.java renamed to ‎src/main/java/com/study/bookcafe/interfaces/member/MemberDto.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.study.bookcafe.dto;
1+
package com.study.bookcafe.interfaces.member;
22

3-
import com.study.bookcafe.domain.Level;
3+
import com.study.bookcafe.domain.member.Level;
44
import lombok.*;
55

66
@Builder

‎src/main/java/com/study/bookcafe/mapper/MemberMapper.java renamed to ‎src/main/java/com/study/bookcafe/interfaces/member/MemberMapper.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package com.study.bookcafe.mapper;
1+
package com.study.bookcafe.interfaces.member;
22

3-
import com.study.bookcafe.domain.Member;
4-
import com.study.bookcafe.dto.MemberDto;
5-
import com.study.bookcafe.entity.MemberEntity;
3+
import com.study.bookcafe.domain.member.Member;
4+
import com.study.bookcafe.domain.member.MemberEntity;
65
import org.mapstruct.Mapper;
76
import org.mapstruct.Mapping;
87
import org.mapstruct.Named;

‎src/main/java/com/study/bookcafe/repository/MemberRepository.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/test/java/com/study/bookcafe/book/CanBorrowTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.study.bookcafe.book;
22

3-
import com.study.bookcafe.domain.Book;
4-
import com.study.bookcafe.domain.Inventory;
3+
import com.study.bookcafe.domain.book.Book;
4+
import com.study.bookcafe.domain.book.Inventory;
55
import org.junit.jupiter.api.DisplayName;
66
import org.junit.jupiter.api.Test;
77

0 commit comments

Comments
 (0)