From 2f9dc77241a4200a533b4251a9bdfc4d230e371a Mon Sep 17 00:00:00 2001 From: stgctkm Date: Tue, 22 Aug 2023 19:33:22 +0900 Subject: [PATCH 1/3] rename PriceType to MovieType --- src/main/java/video/domain/Movie.java | 18 +++++++++--------- .../domain/{PriceType.java => MovieType.java} | 4 ++-- src/test/java/video/domain/CustomerTest.java | 6 +++--- .../video/domain/price/ChildrenPriceTest.java | 4 ++-- .../domain/price/NewReleasePriceTest.java | 4 ++-- .../video/domain/price/RegularPriceTest.java | 4 ++-- .../java/video/domain/rental/RentalTest.java | 8 ++++---- .../java/video/domain/rental/RentalsTest.java | 8 ++++---- 8 files changed, 28 insertions(+), 28 deletions(-) rename src/main/java/video/domain/{PriceType.java => MovieType.java} (92%) diff --git a/src/main/java/video/domain/Movie.java b/src/main/java/video/domain/Movie.java index 0e12096..8adb1bb 100644 --- a/src/main/java/video/domain/Movie.java +++ b/src/main/java/video/domain/Movie.java @@ -3,20 +3,20 @@ public class Movie { private String title; - PriceType priceType; + MovieType movieType; - public Movie(String title, PriceType priceType) { + public Movie(String title, MovieType movieType) { this.title = title; - this.priceType = priceType; + this.movieType = movieType; } - public PriceType getPriceType() { - return priceType; + public MovieType getPriceType() { + return movieType; } - public void setPriceType(PriceType priceType) { - this.priceType = priceType; + public void setPriceType(MovieType movieType) { + this.movieType = movieType; } public String getTitle() { @@ -24,10 +24,10 @@ public String getTitle() { } public int amount(int daysRented) { - return priceType.amount(daysRented); + return movieType.amount(daysRented); } public int frequentRenterPoints(int daysRented) { - return priceType.frequentRenterPoints(daysRented); + return movieType.frequentRenterPoints(daysRented); } } \ No newline at end of file diff --git a/src/main/java/video/domain/PriceType.java b/src/main/java/video/domain/MovieType.java similarity index 92% rename from src/main/java/video/domain/PriceType.java rename to src/main/java/video/domain/MovieType.java index 038725b..20d5b82 100644 --- a/src/main/java/video/domain/PriceType.java +++ b/src/main/java/video/domain/MovieType.java @@ -9,7 +9,7 @@ import video.domain.price.Price; import video.domain.price.RegularPrice; -public enum PriceType { +public enum MovieType { CHILDREN(new ChildrenPrice(), new ChildrenPoint()), REGULAR(new RegularPrice(), new RegularPoint()), NEW_RELEASE(new NewReleasePrice(), new NewReleasePoint()); @@ -17,7 +17,7 @@ public enum PriceType { Price price; Point point; - PriceType(Price price, Point point) { + MovieType(Price price, Point point) { this.price = price; this.point = point; } diff --git a/src/test/java/video/domain/CustomerTest.java b/src/test/java/video/domain/CustomerTest.java index 823e3e4..2e77527 100644 --- a/src/test/java/video/domain/CustomerTest.java +++ b/src/test/java/video/domain/CustomerTest.java @@ -8,9 +8,9 @@ class CustomerTest { - Movie 子供用作品_となりのトトロ = new Movie("となりのトトロ", PriceType.CHILDREN); - Movie 旧作_トップガン = new Movie("トップガン", PriceType.REGULAR); - Movie 新作_君たちはどう生きるか = new Movie("君たちはどう生きるか", PriceType.NEW_RELEASE); + Movie 子供用作品_となりのトトロ = new Movie("となりのトトロ", MovieType.CHILDREN); + Movie 旧作_トップガン = new Movie("トップガン", MovieType.REGULAR); + Movie 新作_君たちはどう生きるか = new Movie("君たちはどう生きるか", MovieType.NEW_RELEASE); @Test void 新作と旧作と子供用作品のレンタル() { diff --git a/src/test/java/video/domain/price/ChildrenPriceTest.java b/src/test/java/video/domain/price/ChildrenPriceTest.java index 717f757..f7e9543 100644 --- a/src/test/java/video/domain/price/ChildrenPriceTest.java +++ b/src/test/java/video/domain/price/ChildrenPriceTest.java @@ -2,14 +2,14 @@ import org.junit.jupiter.api.Test; import video.domain.Movie; -import video.domain.PriceType; +import video.domain.MovieType; import video.domain.rental.Rental; import static org.junit.jupiter.api.Assertions.assertEquals; class ChildrenPriceTest { - Movie 子供用作品_となりのトトロ = new Movie("となりのトトロ", PriceType.CHILDREN); + Movie 子供用作品_となりのトトロ = new Movie("となりのトトロ", MovieType.CHILDREN); @Test void 子供用作品を4日のレンタル料金() { Rental sut = new Rental(子供用作品_となりのトトロ, 4); diff --git a/src/test/java/video/domain/price/NewReleasePriceTest.java b/src/test/java/video/domain/price/NewReleasePriceTest.java index b37bd46..867a4ff 100644 --- a/src/test/java/video/domain/price/NewReleasePriceTest.java +++ b/src/test/java/video/domain/price/NewReleasePriceTest.java @@ -2,14 +2,14 @@ import org.junit.jupiter.api.Test; import video.domain.Movie; -import video.domain.PriceType; +import video.domain.MovieType; import video.domain.rental.Rental; import static org.junit.jupiter.api.Assertions.assertEquals; class NewReleasePriceTest { - Movie 新作_君たちはどう生きるか = new Movie("君たちはどう生きるか", PriceType.NEW_RELEASE); + Movie 新作_君たちはどう生きるか = new Movie("君たちはどう生きるか", MovieType.NEW_RELEASE); @Test void 新作を4日のレンタル料金() { diff --git a/src/test/java/video/domain/price/RegularPriceTest.java b/src/test/java/video/domain/price/RegularPriceTest.java index 4ddcb77..904bde1 100644 --- a/src/test/java/video/domain/price/RegularPriceTest.java +++ b/src/test/java/video/domain/price/RegularPriceTest.java @@ -2,14 +2,14 @@ import org.junit.jupiter.api.Test; import video.domain.Movie; -import video.domain.PriceType; +import video.domain.MovieType; import video.domain.rental.Rental; import static org.junit.jupiter.api.Assertions.assertEquals; class RegularPriceTest { - Movie 旧作_トップガン = new Movie("トップガン", PriceType.REGULAR); + Movie 旧作_トップガン = new Movie("トップガン", MovieType.REGULAR); @Test void 旧作を2日のレンタル料金() { diff --git a/src/test/java/video/domain/rental/RentalTest.java b/src/test/java/video/domain/rental/RentalTest.java index 4fed6f1..e498530 100644 --- a/src/test/java/video/domain/rental/RentalTest.java +++ b/src/test/java/video/domain/rental/RentalTest.java @@ -3,15 +3,15 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import video.domain.Movie; -import video.domain.PriceType; +import video.domain.MovieType; import static org.junit.jupiter.api.Assertions.assertEquals; class RentalTest { - Movie 子供用作品_となりのトトロ = new Movie("となりのトトロ", PriceType.CHILDREN); - Movie 旧作_トップガン = new Movie("トップガン", PriceType.REGULAR); - Movie 新作_君たちはどう生きるか = new Movie("君たちはどう生きるか", PriceType.NEW_RELEASE); + Movie 子供用作品_となりのトトロ = new Movie("となりのトトロ", MovieType.CHILDREN); + Movie 旧作_トップガン = new Movie("トップガン", MovieType.REGULAR); + Movie 新作_君たちはどう生きるか = new Movie("君たちはどう生きるか", MovieType.NEW_RELEASE); @Nested class レンタル料金テスト { diff --git a/src/test/java/video/domain/rental/RentalsTest.java b/src/test/java/video/domain/rental/RentalsTest.java index 7ab3236..90b2151 100644 --- a/src/test/java/video/domain/rental/RentalsTest.java +++ b/src/test/java/video/domain/rental/RentalsTest.java @@ -2,14 +2,14 @@ import org.junit.jupiter.api.Test; import video.domain.Movie; -import video.domain.PriceType; +import video.domain.MovieType; import static org.junit.jupiter.api.Assertions.assertEquals; class RentalsTest { - Movie 子供用作品_となりのトトロ = new Movie("となりのトトロ", PriceType.CHILDREN); - Movie 旧作_トップガン = new Movie("トップガン", PriceType.REGULAR); - Movie 新作_君たちはどう生きるか = new Movie("君たちはどう生きるか", PriceType.NEW_RELEASE); + Movie 子供用作品_となりのトトロ = new Movie("となりのトトロ", MovieType.CHILDREN); + Movie 旧作_トップガン = new Movie("トップガン", MovieType.REGULAR); + Movie 新作_君たちはどう生きるか = new Movie("君たちはどう生きるか", MovieType.NEW_RELEASE); @Test void 合計金額の算出() { From 113f5800567b9cb8b2619d7a7f31013f2f85c25c Mon Sep 17 00:00:00 2001 From: stgctkm Date: Tue, 22 Aug 2023 19:38:02 +0900 Subject: [PATCH 2/3] =?UTF-8?q?package=E7=A7=BB=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/video/domain/{ => movie}/Movie.java | 2 +- src/main/java/video/domain/{ => movie}/MovieType.java | 2 +- src/main/java/video/domain/rental/Rental.java | 2 +- .../java/video/infrastructure/datasource/data/RentalItem.java | 2 +- src/test/java/video/domain/CustomerTest.java | 2 ++ src/test/java/video/domain/price/ChildrenPriceTest.java | 4 ++-- src/test/java/video/domain/price/NewReleasePriceTest.java | 4 ++-- src/test/java/video/domain/price/RegularPriceTest.java | 4 ++-- src/test/java/video/domain/rental/RentalTest.java | 4 ++-- src/test/java/video/domain/rental/RentalsTest.java | 4 ++-- 10 files changed, 16 insertions(+), 14 deletions(-) rename src/main/java/video/domain/{ => movie}/Movie.java (95%) rename src/main/java/video/domain/{ => movie}/MovieType.java (96%) diff --git a/src/main/java/video/domain/Movie.java b/src/main/java/video/domain/movie/Movie.java similarity index 95% rename from src/main/java/video/domain/Movie.java rename to src/main/java/video/domain/movie/Movie.java index 8adb1bb..18dc943 100644 --- a/src/main/java/video/domain/Movie.java +++ b/src/main/java/video/domain/movie/Movie.java @@ -1,4 +1,4 @@ -package video.domain; +package video.domain.movie; public class Movie { diff --git a/src/main/java/video/domain/MovieType.java b/src/main/java/video/domain/movie/MovieType.java similarity index 96% rename from src/main/java/video/domain/MovieType.java rename to src/main/java/video/domain/movie/MovieType.java index 20d5b82..8053ca7 100644 --- a/src/main/java/video/domain/MovieType.java +++ b/src/main/java/video/domain/movie/MovieType.java @@ -1,4 +1,4 @@ -package video.domain; +package video.domain.movie; import video.domain.point.ChildrenPoint; import video.domain.point.NewReleasePoint; diff --git a/src/main/java/video/domain/rental/Rental.java b/src/main/java/video/domain/rental/Rental.java index 87a0e17..53fa2ea 100644 --- a/src/main/java/video/domain/rental/Rental.java +++ b/src/main/java/video/domain/rental/Rental.java @@ -1,6 +1,6 @@ package video.domain.rental; -import video.domain.Movie; +import video.domain.movie.Movie; public class Rental { diff --git a/src/main/java/video/infrastructure/datasource/data/RentalItem.java b/src/main/java/video/infrastructure/datasource/data/RentalItem.java index 434dd93..c68b095 100644 --- a/src/main/java/video/infrastructure/datasource/data/RentalItem.java +++ b/src/main/java/video/infrastructure/datasource/data/RentalItem.java @@ -1,6 +1,6 @@ package video.infrastructure.datasource.data; -import video.domain.Movie; +import video.domain.movie.Movie; public record RentalItem(Movie movie, int days) { } diff --git a/src/test/java/video/domain/CustomerTest.java b/src/test/java/video/domain/CustomerTest.java index 2e77527..21634d0 100644 --- a/src/test/java/video/domain/CustomerTest.java +++ b/src/test/java/video/domain/CustomerTest.java @@ -1,6 +1,8 @@ package video.domain; import org.junit.jupiter.api.Test; +import video.domain.movie.Movie; +import video.domain.movie.MovieType; import video.domain.rental.Rental; import static org.junit.jupiter.api.Assertions.assertAll; diff --git a/src/test/java/video/domain/price/ChildrenPriceTest.java b/src/test/java/video/domain/price/ChildrenPriceTest.java index f7e9543..f0b8c88 100644 --- a/src/test/java/video/domain/price/ChildrenPriceTest.java +++ b/src/test/java/video/domain/price/ChildrenPriceTest.java @@ -1,8 +1,8 @@ package video.domain.price; import org.junit.jupiter.api.Test; -import video.domain.Movie; -import video.domain.MovieType; +import video.domain.movie.Movie; +import video.domain.movie.MovieType; import video.domain.rental.Rental; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/video/domain/price/NewReleasePriceTest.java b/src/test/java/video/domain/price/NewReleasePriceTest.java index 867a4ff..4bee825 100644 --- a/src/test/java/video/domain/price/NewReleasePriceTest.java +++ b/src/test/java/video/domain/price/NewReleasePriceTest.java @@ -1,8 +1,8 @@ package video.domain.price; import org.junit.jupiter.api.Test; -import video.domain.Movie; -import video.domain.MovieType; +import video.domain.movie.Movie; +import video.domain.movie.MovieType; import video.domain.rental.Rental; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/video/domain/price/RegularPriceTest.java b/src/test/java/video/domain/price/RegularPriceTest.java index 904bde1..19c1f9f 100644 --- a/src/test/java/video/domain/price/RegularPriceTest.java +++ b/src/test/java/video/domain/price/RegularPriceTest.java @@ -1,8 +1,8 @@ package video.domain.price; import org.junit.jupiter.api.Test; -import video.domain.Movie; -import video.domain.MovieType; +import video.domain.movie.Movie; +import video.domain.movie.MovieType; import video.domain.rental.Rental; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/video/domain/rental/RentalTest.java b/src/test/java/video/domain/rental/RentalTest.java index e498530..f7d8d77 100644 --- a/src/test/java/video/domain/rental/RentalTest.java +++ b/src/test/java/video/domain/rental/RentalTest.java @@ -2,8 +2,8 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import video.domain.Movie; -import video.domain.MovieType; +import video.domain.movie.Movie; +import video.domain.movie.MovieType; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/video/domain/rental/RentalsTest.java b/src/test/java/video/domain/rental/RentalsTest.java index 90b2151..ddb8acd 100644 --- a/src/test/java/video/domain/rental/RentalsTest.java +++ b/src/test/java/video/domain/rental/RentalsTest.java @@ -1,8 +1,8 @@ package video.domain.rental; import org.junit.jupiter.api.Test; -import video.domain.Movie; -import video.domain.MovieType; +import video.domain.movie.Movie; +import video.domain.movie.MovieType; import static org.junit.jupiter.api.Assertions.assertEquals; From 2ee82eda59726d38502eb43f31960ae443fd73ae Mon Sep 17 00:00:00 2001 From: stgctkm Date: Tue, 22 Aug 2023 19:39:13 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=83=A1?= =?UTF-8?q?=E3=82=BD=E3=83=83=E3=83=89=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/video/domain/movie/Movie.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/java/video/domain/movie/Movie.java b/src/main/java/video/domain/movie/Movie.java index 18dc943..187b75c 100644 --- a/src/main/java/video/domain/movie/Movie.java +++ b/src/main/java/video/domain/movie/Movie.java @@ -11,14 +11,6 @@ public Movie(String title, MovieType movieType) { this.movieType = movieType; } - public MovieType getPriceType() { - return movieType; - } - - public void setPriceType(MovieType movieType) { - this.movieType = movieType; - } - public String getTitle() { return title; }