File tree 6 files changed +11
-11
lines changed
main/java/ru/mystamps/web/feature/series/importing
test/groovy/ru/mystamps/web/feature/series/importing
6 files changed +11
-11
lines changed Original file line number Diff line number Diff line change @@ -8,13 +8,13 @@ participant EventPublisher
8
8
note over Browser,SeriesImportController: request import series form
9
9
opt GET /series/import/request
10
10
Browser->+SeriesImportController:
11
- SeriesImportController->-Browser: RequestImportForm
11
+ SeriesImportController->-Browser: RequestSeriesImportForm
12
12
end
13
13
14
14
note over Browser,SeriesImportController: submit request for importing a series
15
15
opt POST /series/import/request
16
- Browser->+SeriesImportController: RequestImportForm
17
- SeriesImportController->+SeriesImportService: RequestImportForm
16
+ Browser->+SeriesImportController: RequestSeriesImportForm
17
+ SeriesImportController->+SeriesImportService: RequestSeriesImportForm
18
18
SeriesImportService->-SeriesImportController: requestId
19
19
note right of SeriesImportService: Unprocessed
20
20
SeriesImportController->EventPublisher: ImportRequestCreated
Original file line number Diff line number Diff line change 29
29
@ Getter
30
30
@ Setter
31
31
@ GroupSequence ({
32
- RequestImportForm .class ,
32
+ RequestSeriesImportForm .class ,
33
33
Group .Level1 .class ,
34
34
Group .Level2 .class ,
35
35
Group .Level3 .class ,
36
36
Group .Level4 .class
37
37
})
38
- public class RequestImportForm implements RequestImportDto {
38
+ public class RequestSeriesImportForm implements RequestImportDto {
39
39
40
40
// @todo #995 Series sale import: use its own interface and form
41
41
@ NotEmpty (groups = Group .Level1 .class )
Original file line number Diff line number Diff line change @@ -72,13 +72,13 @@ protected void initImportSeriesForm(WebDataBinder binder) {
72
72
73
73
@ GetMapping (SeriesImportUrl .REQUEST_IMPORT_SERIES_PAGE )
74
74
public void showRequestImportForm (Model model ) {
75
- RequestImportForm requestImportForm = new RequestImportForm ();
75
+ RequestSeriesImportForm requestImportForm = new RequestSeriesImportForm ();
76
76
model .addAttribute ("requestImportForm" , requestImportForm );
77
77
}
78
78
79
79
@ PostMapping (SeriesImportUrl .REQUEST_IMPORT_SERIES_PAGE )
80
80
public String processRequestImportForm (
81
- @ Valid RequestImportForm form ,
81
+ @ Valid RequestSeriesImportForm form ,
82
82
BindingResult result ,
83
83
@ CurrentUser Integer currentUserId ) {
84
84
Original file line number Diff line number Diff line change 25
25
import org .springframework .web .bind .annotation .PostMapping ;
26
26
import org .springframework .web .bind .annotation .RequestBody ;
27
27
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 ;
29
29
30
30
import javax .validation .Valid ;
31
31
@@ -39,7 +39,7 @@ public class SeriesSaleImportController {
39
39
40
40
@ PostMapping (SeriesSalesImportUrl .IMPORT_SERIES_SALES )
41
41
public ResponseEntity <SeriesSaleExtractedInfo > downloadAndParse (
42
- @ RequestBody @ Valid RequestImportForm form ) {
42
+ @ RequestBody @ Valid RequestSeriesImportForm form ) {
43
43
44
44
String url = form .getUrl ();
45
45
Original file line number Diff line number Diff line change @@ -58,7 +58,7 @@ class SeriesImportServiceImplTest extends Specification {
58
58
private final ApplicationEventPublisher eventPublisher = Mock ()
59
59
60
60
private SeriesImportService service
61
- private RequestImportForm form
61
+ private RequestSeriesImportForm form
62
62
63
63
def setup () {
64
64
service = new SeriesImportServiceImpl (
@@ -70,7 +70,7 @@ class SeriesImportServiceImplTest extends Specification {
70
70
participantService,
71
71
eventPublisher
72
72
)
73
- form = new RequestImportForm ()
73
+ form = new RequestSeriesImportForm ()
74
74
}
75
75
76
76
//
You can’t perform that action at this time.
0 commit comments