Skip to content

Commit 8d00ca4

Browse files
committed
refactor: removed unused releaseDay/releaseMonth members.
1 parent 3bd115e commit 8d00ca4

File tree

7 files changed

+6
-39
lines changed

7 files changed

+6
-39
lines changed

src/main/java/ru/mystamps/web/feature/collection/RowMappers.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ private RowMappers() {
4545
Integer seriesId = rs.getInt("id");
4646
String category = rs.getString("category");
4747
String country = rs.getString("country");
48-
Integer releaseDay = JdbcUtils.getInteger(rs, "release_day");
49-
Integer releaseMonth = JdbcUtils.getInteger(rs, "release_month");
5048
Integer releaseYear = JdbcUtils.getInteger(rs, "release_year");
5149
Integer quantity = rs.getInt("quantity");
5250
Boolean perforated = rs.getBoolean("perforated");
@@ -56,8 +54,6 @@ private RowMappers() {
5654
seriesId,
5755
category,
5856
country,
59-
releaseDay,
60-
releaseMonth,
6157
releaseYear,
6258
perforated,
6359
quantity,

src/main/java/ru/mystamps/web/feature/collection/SeriesInCollectionDto.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ public class SeriesInCollectionDto {
2626
private final Integer id;
2727
private final String category;
2828
private final String country;
29-
private final Integer releaseDay;
30-
private final Integer releaseMonth;
3129
private final Integer releaseYear;
3230
private final Boolean perforated;
3331
private final Integer quantity;

src/main/java/ru/mystamps/web/feature/series/RowMappers.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ private RowMappers() {
6161
throws SQLException {
6262

6363
Integer seriesId = rs.getInt("id");
64-
Integer releaseDay = JdbcUtils.getInteger(rs, "release_day");
65-
Integer releaseMonth = JdbcUtils.getInteger(rs, "release_month");
6664
Integer releaseYear = JdbcUtils.getInteger(rs, "release_year");
6765
Integer quantity = rs.getInt("quantity");
6866
Boolean perforated = rs.getBoolean("perforated");
@@ -76,8 +74,6 @@ private RowMappers() {
7674
seriesId,
7775
category,
7876
country,
79-
releaseDay,
80-
releaseMonth,
8177
releaseYear,
8278
quantity,
8379
perforated

src/main/java/ru/mystamps/web/feature/series/SeriesInfoDto.java

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,16 @@
1818
package ru.mystamps.web.feature.series;
1919

2020
import lombok.Getter;
21+
import lombok.RequiredArgsConstructor;
2122
import ru.mystamps.web.common.LinkEntityDto;
2223

2324
@Getter
25+
@RequiredArgsConstructor
2426
public class SeriesInfoDto {
2527
private final Integer id;
2628
private final LinkEntityDto category;
2729
private final LinkEntityDto country;
28-
private final Integer releaseDay;
29-
private final Integer releaseMonth;
3030
private final Integer releaseYear;
3131
private final Integer quantity;
3232
private final Boolean perforated;
33-
34-
@SuppressWarnings("checkstyle:parameternumber")
35-
public SeriesInfoDto(
36-
Integer id,
37-
LinkEntityDto category,
38-
LinkEntityDto country,
39-
Integer releaseDay, Integer releaseMonth, Integer releaseYear,
40-
Integer quantity,
41-
Boolean perforated) {
42-
this.id = id;
43-
this.category = category;
44-
this.country = country;
45-
this.releaseDay = releaseDay;
46-
this.releaseMonth = releaseMonth;
47-
this.releaseYear = releaseYear;
48-
this.quantity = quantity;
49-
this.perforated = perforated;
50-
}
51-
5233
}

src/main/resources/sql/collection_dao_queries.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ collection.find_series_by_collection_id = \
1414
SELECT s.id \
1515
, CASE WHEN 'ru' = :lang THEN COALESCE(cat.name_ru, cat.name) ELSE cat.name END AS category \
1616
, CASE WHEN 'ru' = :lang THEN COALESCE(count.name_ru, count.name) ELSE count.name END AS country \
17-
, s.release_day \
18-
, s.release_month \
1917
, s.release_year \
2018
, s.quantity \
2119
, s.perforated \

src/main/resources/sql/series_dao_queries.properties

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,6 @@ series.find_by_ids = \
134134
, count.id AS country_id \
135135
, count.slug AS country_slug \
136136
, CASE WHEN 'ru' = :lang THEN COALESCE(count.name_ru, count.name) ELSE count.name END AS country_name \
137-
, s.release_day \
138-
, s.release_month \
139137
, s.release_year \
140138
, s.quantity \
141139
, s.perforated \
@@ -154,8 +152,6 @@ series.find_by_category_slug = \
154152
, count.id AS country_id \
155153
, count.slug AS country_slug \
156154
, CASE WHEN 'ru' = :lang THEN COALESCE(count.name_ru, count.name) ELSE count.name END AS country_name \
157-
, s.release_day \
158-
, s.release_month \
159155
, s.release_year \
160156
, s.quantity \
161157
, s.perforated \

src/test/java/ru/mystamps/web/service/TestObjects.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public static SeriesInfoDto createSeriesInfoDto() {
149149
Random.id(),
150150
new LinkEntityDto(Random.id(), SlugUtils.slugify(category), category),
151151
new LinkEntityDto(Random.id(), SlugUtils.slugify(country), country),
152-
15, 10, Random.issueYear(),
152+
Random.issueYear(),
153153
16,
154154
Random.perforated()
155155
);
@@ -172,7 +172,9 @@ public static SeriesFullInfoDto createSeriesFullInfoDto() {
172172
info.getId(),
173173
info.getCategory(),
174174
info.getCountry(),
175-
info.getReleaseDay(), info.getReleaseMonth(), info.getReleaseYear(),
175+
Random.dayOfMonth(),
176+
Random.monthOfYear(),
177+
info.getReleaseYear(),
176178
info.getQuantity(),
177179
info.getPerforated(),
178180
"this is a full info",

0 commit comments

Comments
 (0)