Skip to content

プロセス外依存をドメインから除去 #1

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.

Sign up for GitHub

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

Draft
stgctkm wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

プロセス外依存をドメインから除去 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c239c97
プロセス外依存をドメインから除去
stgctkm Aug 21, 2023
ef7f8bb
Merge branch 'main' into remove-dependencies-from-domain
stgctkm Aug 21, 2023
a3b9e45
テスト修正
stgctkm Aug 21, 2023
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
28 changes: 28 additions & 0 deletions src/main/java/video/application/CustomerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package video.application;

import video.domain.Customer;
import video.domain.RentalResult;
import video.infrastructure.datasource.CustomerDataSource;
import video.infrastructure.datasource.RentalDataSource;
import video.infrastructure.transfer.RentalNotificationTransfer;

public class CustomerService {
RentalDataSource rentalDataSource = new RentalDataSource();
CustomerDataSource customerDataSource = new CustomerDataSource();
RentalNotificationTransfer rentalNotificationTransfer = new RentalNotificationTransfer();
public int rentalMovies(Customer customer) {

RentalResult result = customer.rentalMovies();

// レンタルの記録
int rentalId = rentalDataSource.registerRental(customer.getName(), customer.getRentals(), result.totalAmount());

// レンタルポイントの記録
customerDataSource.registerRentalPoint(customer.getName(), result.frequentRenterPoints());

// レンタルの通知
rentalNotificationTransfer.notice(customer.getName(), customer.getRentals());

return rentalId;
}
}
25 changes: 6 additions & 19 deletions src/main/java/video/domain/Customer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
package video.domain;

import video.infrastructure.datasource.CustomerDataSource;
import video.infrastructure.datasource.RentalDataSource;
import video.infrastructure.transfer.RentalNotificationTransfer;

import java.util.ArrayList;
import java.util.List;

public class Customer {
private String name;
private List<Rental> rentals = new ArrayList<>();

RentalDataSource rentalDataSource = new RentalDataSource();
CustomerDataSource customerDataSource = new CustomerDataSource();
RentalNotificationTransfer rentalNotificationTransfer = new RentalNotificationTransfer();

public Customer(String name) {
this.name = name;
}
Expand All @@ -27,7 +19,11 @@ public String getName() {
return name;
}

public int rentalMovies() {
public List<Rental> getRentals() {
return rentals;
}

public RentalResult rentalMovies() {
int totalAmount = 0;
int frequentRenterPoints = 0;
for (Rental each : rentals) {
Expand Down Expand Up @@ -56,15 +52,6 @@ public int rentalMovies() {
totalAmount += thisAmount;
}

// レンタルの記録
int rentalId = rentalDataSource.registerRental(name, rentals, totalAmount);

// レンタルポイントの記録
customerDataSource.registerRentalPoint(name, frequentRenterPoints);

// レンタルの通知
rentalNotificationTransfer.notice(name, rentals);

return rentalId;
return new RentalResult(totalAmount, frequentRenterPoints);
}
}
6 changes: 6 additions & 0 deletions src/main/java/video/domain/RentalResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package video.domain;

public record RentalResult(
int totalAmount,
int frequentRenterPoints
) {}
117 changes: 42 additions & 75 deletions src/test/java/video/domain/CustomerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,151 +1,118 @@
package video.domain;

import org.junit.jupiter.api.Test;
import video.infrastructure.datasource.CustomerDataSource;
import video.infrastructure.datasource.RentalDataSource;
import video.infrastructure.datasource.data.RentalSummary;

import static org.junit.jupiter.api.Assertions.assertAll;
import static org.junit.jupiter.api.Assertions.assertEquals;

class CustomerTest {

CustomerDataSource customerDataSource = new CustomerDataSource();
RentalDataSource rentalDataSource = new RentalDataSource();

Movie 子供用作品_となりのトトロ = new Movie("となりのトトロ", PriceType.CHILDREN);
Movie 旧作_トップガン = new Movie("トップガン", PriceType.REGULAR);
Movie 新作_君たちはどう生きるか = new Movie("君たちはどう生きるか", PriceType.NEW_RELEASE);
@Test
void 新作を4日レンタル() {
Customer customer = new Customer("鈴木一郎");

customer.addRental(new Rental(新作_君たちはどう生きるか, 4));
Customer sut = new Customer("鈴木一郎");
sut.addRental(new Rental(新作_君たちはどう生きるか, 4));

int rentalId = customer.rentalMovies();
RentalResult result = sut.rentalMovies();

RentalSummary rentalSummary = rentalDataSource.rentalRecordOf(rentalId);
assertAll(() -> {
assertEquals(1200, rentalSummary.rentalRecord().totalAmount());

assertEquals(2, customerDataSource.pointOf(customer.getName()));
assertEquals(1200, result.totalAmount());
assertEquals(2, result.frequentRenterPoints());
});
}

@Test
void 新作を1日レンタル() {
Customer customer = new Customer("佐藤華子");
Customer sut = new Customer("佐藤華子");
sut.addRental(new Rental(新作_君たちはどう生きるか, 1));

customer.addRental(new Rental(新作_君たちはどう生きるか, 1));
RentalResult result = sut.rentalMovies();

int rentalId = customer.rentalMovies();

RentalSummary rentalSummary = rentalDataSource.rentalRecordOf(rentalId);
assertAll(() -> {
assertEquals(300, rentalSummary.rentalRecord().totalAmount());

assertEquals(1, customerDataSource.pointOf(customer.getName()));
assertEquals(300, result.totalAmount());
assertEquals(1, result.frequentRenterPoints());
});
}

@Test
void 旧作を2日レンタル() {
Customer customer = new Customer("岡山圭太");
Customer sut = new Customer("岡山圭太");
sut.addRental(new Rental(旧作_トップガン, 2));

customer.addRental(new Rental(旧作_トップガン, 2));
RentalResult result = sut.rentalMovies();

int rentalId = customer.rentalMovies();

RentalSummary rentalSummary = rentalDataSource.rentalRecordOf(rentalId);
assertAll(() -> {
assertEquals(200, rentalSummary.rentalRecord().totalAmount());

assertEquals(1, customerDataSource.pointOf(customer.getName()));
assertEquals(200, result.totalAmount());
assertEquals(1, result.frequentRenterPoints());
});
}

@Test
void 旧作を3日レンタル() {
Customer customer = new Customer("香川真司");
Customer sut = new Customer("香川真司");
sut.addRental(new Rental(旧作_トップガン, 3));

customer.addRental(new Rental(旧作_トップガン, 3));
RentalResult result = sut.rentalMovies();

int rentalId = customer.rentalMovies();

RentalSummary rentalSummary = rentalDataSource.rentalRecordOf(rentalId);
assertAll(() -> {
assertEquals(350, rentalSummary.rentalRecord().totalAmount());

assertEquals(1, customerDataSource.pointOf(customer.getName()));
assertEquals(350, result.totalAmount());
assertEquals(1, result.frequentRenterPoints());
});
}

@Test
void 子供用作品を4日レンタル() {
Customer customer = new Customer("鈴木二郎");
Customer sut = new Customer("鈴木二郎");
sut.addRental(new Rental(子供用作品_となりのトトロ, 4));

customer.addRental(new Rental(子供用作品_となりのトトロ, 4));
RentalResult result = sut.rentalMovies();

int rentalId = customer.rentalMovies();

RentalSummary rentalSummary = rentalDataSource.rentalRecordOf(rentalId);
assertAll(() -> {
assertEquals(300, rentalSummary.rentalRecord().totalAmount());

assertEquals(1, customerDataSource.pointOf(customer.getName()));
assertEquals(300, result.totalAmount());
assertEquals(1, result.frequentRenterPoints());
});
}

@Test
void 子供用作品を3日レンタル() {
Customer customer = new Customer("広川京子");

customer.addRental(new Rental(子供用作品_となりのトトロ, 3));
Customer sut = new Customer("広川京子");
sut.addRental(new Rental(子供用作品_となりのトトロ, 3));

int rentalId = customer.rentalMovies();
RentalResult result = sut.rentalMovies();

RentalSummary rentalSummary = rentalDataSource.rentalRecordOf(rentalId);
assertAll(() -> {
assertEquals(150, rentalSummary.rentalRecord().totalAmount());

assertEquals(1, customerDataSource.pointOf(customer.getName()));
assertEquals(150, result.totalAmount());
assertEquals(1, result.frequentRenterPoints());
});
}

@Test
void 新作と旧作ビデオのレンタル() {
Customer customer = new Customer("John Doe");

customer.addRental(new Rental(旧作_トップガン, 7));
customer.addRental(new Rental(新作_君たちはどう生きるか, 7));
Customer sut = new Customer("John Doe");
sut.addRental(new Rental(旧作_トップガン, 7));
sut.addRental(new Rental(新作_君たちはどう生きるか, 7));

int rentalId = customer.rentalMovies();
RentalResult result = sut.rentalMovies();

RentalSummary rentalSummary = rentalDataSource.rentalRecordOf(rentalId);
assertAll(() -> {
assertEquals(3050, rentalSummary.rentalRecord().totalAmount());
assertEquals(2, rentalSummary.rentalItems().size());

assertEquals(3, customerDataSource.pointOf(customer.getName()));
assertEquals(3050, result.totalAmount());
assertEquals(3, result.frequentRenterPoints());
});
}

@Test
void 旧作と子供用作品のレンタル() {
Customer customer = new Customer("Jane Doe");

customer.addRental(new Rental(旧作_トップガン, 7));
customer.addRental(new Rental(子供用作品_となりのトトロ, 7));
Customer sut = new Customer("Jane Doe");
sut.addRental(new Rental(旧作_トップガン, 7));
sut.addRental(new Rental(子供用作品_となりのトトロ, 7));

int rentalId = customer.rentalMovies();
RentalResult result = sut.rentalMovies();

RentalSummary rentalSummary = rentalDataSource.rentalRecordOf(rentalId);
assertAll(() -> {
assertEquals(1700, rentalSummary.rentalRecord().totalAmount());
assertEquals(2, rentalSummary.rentalItems().size());

assertEquals(2, customerDataSource.pointOf(customer.getName()));
assertEquals(1700, result.totalAmount());
assertEquals(2, result.frequentRenterPoints());
});
}

}