Skip to content

Commit ab45d0a

Browse files
committed
refactor: rename RequestImportForm to RequestSeriesImportForm.
Addressed to #1026
1 parent ef4abbb commit ab45d0a

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed
805 Bytes
Loading

docs/diagrams/create-import-request.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ participant EventPublisher
88
note over Browser,SeriesImportController: request import series form
99
opt GET /series/import/request
1010
Browser->+SeriesImportController:
11-
SeriesImportController->-Browser: RequestImportForm
11+
SeriesImportController->-Browser: RequestSeriesImportForm
1212
end
1313

1414
note over Browser,SeriesImportController: submit request for importing a series
1515
opt POST /series/import/request
16-
Browser->+SeriesImportController: RequestImportForm
17-
SeriesImportController->+SeriesImportService: RequestImportForm
16+
Browser->+SeriesImportController: RequestSeriesImportForm
17+
SeriesImportController->+SeriesImportService: RequestSeriesImportForm
1818
SeriesImportService->-SeriesImportController: requestId
1919
note right of SeriesImportService: Unprocessed
2020
SeriesImportController->EventPublisher: ImportRequestCreated

src/main/java/ru/mystamps/web/feature/series/importing/RequestImportForm.java renamed to src/main/java/ru/mystamps/web/feature/series/importing/RequestSeriesImportForm.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
@Getter
3030
@Setter
3131
@GroupSequence({
32-
RequestImportForm.class,
32+
RequestSeriesImportForm.class,
3333
Group.Level1.class,
3434
Group.Level2.class,
3535
Group.Level3.class,
3636
Group.Level4.class
3737
})
38-
public class RequestImportForm implements RequestImportDto {
38+
public class RequestSeriesImportForm implements RequestImportDto {
3939

4040
// @todo #995 Series sale import: use its own interface and form
4141
@NotEmpty(groups = Group.Level1.class)

src/main/java/ru/mystamps/web/feature/series/importing/SeriesImportController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ protected void initImportSeriesForm(WebDataBinder binder) {
7272

7373
@GetMapping(SeriesImportUrl.REQUEST_IMPORT_SERIES_PAGE)
7474
public void showRequestImportForm(Model model) {
75-
RequestImportForm requestImportForm = new RequestImportForm();
75+
RequestSeriesImportForm requestImportForm = new RequestSeriesImportForm();
7676
model.addAttribute("requestImportForm", requestImportForm);
7777
}
7878

7979
@PostMapping(SeriesImportUrl.REQUEST_IMPORT_SERIES_PAGE)
8080
public String processRequestImportForm(
81-
@Valid RequestImportForm form,
81+
@Valid RequestSeriesImportForm form,
8282
BindingResult result,
8383
@CurrentUser Integer currentUserId) {
8484

src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSaleImportController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.springframework.web.bind.annotation.PostMapping;
2626
import org.springframework.web.bind.annotation.RequestBody;
2727
import org.springframework.web.bind.annotation.RestController;
28-
import ru.mystamps.web.feature.series.importing.RequestImportForm;
28+
import ru.mystamps.web.feature.series.importing.RequestSeriesImportForm;
2929

3030
import javax.validation.Valid;
3131

@@ -39,7 +39,7 @@ public class SeriesSaleImportController {
3939

4040
@PostMapping(SeriesSalesImportUrl.IMPORT_SERIES_SALES)
4141
public ResponseEntity<SeriesSaleExtractedInfo> downloadAndParse(
42-
@RequestBody @Valid RequestImportForm form) {
42+
@RequestBody @Valid RequestSeriesImportForm form) {
4343

4444
String url = form.getUrl();
4545

src/test/groovy/ru/mystamps/web/feature/series/importing/SeriesImportServiceImplTest.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class SeriesImportServiceImplTest extends Specification {
5858
private final ApplicationEventPublisher eventPublisher = Mock()
5959

6060
private SeriesImportService service
61-
private RequestImportForm form
61+
private RequestSeriesImportForm form
6262

6363
def setup() {
6464
service = new SeriesImportServiceImpl(
@@ -70,7 +70,7 @@ class SeriesImportServiceImplTest extends Specification {
7070
participantService,
7171
eventPublisher
7272
)
73-
form = new RequestImportForm()
73+
form = new RequestSeriesImportForm()
7474
}
7575

7676
//

0 commit comments

Comments
 (0)