Skip to content

Gh756_SeriesImportDao_setSeriesIdAndChangeStatus_replace_arguments_by_dto_object #1006

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

Closed
wants to merge 1 commit into from
Closed

Gh756_SeriesImportDao_setSeriesIdAndChangeStatus_replace_arguments_by_dto_object #1006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 9 additions & 14 deletions src/main/java/ru/mystamps/web/feature/series/importing/JdbcSeriesImportDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,29 +94,24 @@ public Integer add(ImportSeriesDbDto importRequest) {

return Integer.valueOf(holder.getKey().intValue());
}

// @todo #735 SeriesImportDao.setSeriesIdAndChangeStatus(): replace arguments by dto object

// Use SuppressWarnings to avoid complains about length of line with params
@SuppressWarnings("linelength")
@Override
public void setSeriesIdAndChangeStatus(
Integer requestId,
Integer seriesId,
String oldStatus,
String newStatus,
Date updatedAt) {

public void setSeriesIdAndChangeStatus(Integer seriesId, UpdateImportRequestStatusDbDto requestStatus) {
Map<String, Object> params = new HashMap<>();
params.put("id", requestId);
params.put("id", requestStatus.getRequestId());
params.put("series_id", seriesId);
params.put("old_status", oldStatus);
params.put("new_status", newStatus);
params.put("date", updatedAt);
params.put("old_status", requestStatus.getOldStatus());
params.put("new_status", requestStatus.getNewStatus());
params.put("date", requestStatus.getDate());

int affected = jdbcTemplate.update(setSeriesIdAndChangeStatusSql, params);

Validate.validState(
affected == 1,
"Unexpected number of affected rows after setting series id on request #%d: %d",
requestId,
requestStatus.getRequestId(),
affected
);
}
Expand Down
8 changes: 1 addition & 7 deletions src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,7 @@

public interface SeriesImportDao {
Integer add(ImportSeriesDbDto importRequest);
void setSeriesIdAndChangeStatus(
Integer requestId,
Integer seriesId,
String oldStatus,
String newStatus,
Date updatedAt
);
void setSeriesIdAndChangeStatus(Integer seriesId, UpdateImportRequestStatusDbDto requestStatus);
void changeStatus(UpdateImportRequestStatusDbDto requestStatus);
ImportRequestDto findById(Integer id);
void addRawContent(Integer requestId, Date createdAt, Date updatedAt, String content);
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,15 @@ public Integer addSeries(
}

Date now = new Date();

seriesImportDao.setSeriesIdAndChangeStatus(
UpdateImportRequestStatusDbDto status = new UpdateImportRequestStatusDbDto(
requestId,
seriesId,
now,
SeriesImportRequestStatus.PARSING_SUCCEEDED,
SeriesImportRequestStatus.IMPORT_SUCCEEDED,
now
SeriesImportRequestStatus.IMPORT_SUCCEEDED
);

seriesImportDao.setSeriesIdAndChangeStatus(seriesId, status);

return seriesId;
}

Expand Down
10 changes: 5 additions & 5 deletions src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesImportServiceImplTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,12 +258,12 @@ class SeriesImportServiceImplTest extends Specification {
)
then:
1 * seriesImportDao.setSeriesIdAndChangeStatus(
expectedRequestId,
expectedSeriesId,
SeriesImportRequestStatus.PARSING_SUCCEEDED,
SeriesImportRequestStatus.IMPORT_SUCCEEDED,
{ Date updatedAt ->
assert DateUtils.roughlyEqual(updatedAt, new Date())
{ UpdateImportRequestStatusDbDto status ->
assert status?.requestId == expectedRequestId
assert DateUtils.roughlyEqual(status?.date, new Date())
assert status?.oldStatus == SeriesImportRequestStatus.PARSING_SUCCEEDED
assert status?.newStatus == SeriesImportRequestStatus.IMPORT_SUCCEEDED
return true
}
)
Expand Down