feat: admin can add numbers in stamps catalogs.

Fix #1339

Author: php-coder

NEWS.txt

@@ -5,6 +5,7 @@
 - (feature)     admin can add a comment to a series
 - (feature)     admin can add a release year to a series
 - (feature)     admin can add a price in Michel, Scott, Yvert, Gibbons, Solovyov, and Zagorski catalogs
+- (feature)     admin can add numbers in Michel, Scott, Yvert, Gibbons, Solovyov, and Zagorski catalogs
 - (improvement) on a country info page show the series with an image
 - (feature)     add a condition (MNH/MNHOG/MVLH/CTO/cancelled) to a series sale
 

src/main/frontend/src/components/AddCatalogNumbersForm.js

@@ -47,7 +47,7 @@ class AddCatalogNumbersForm extends React.PureComponent {
 					{
 						op: 'add',
 						path: `/${this.state.catalog}_numbers`,
-						value: this.state.numbers.split(',')
+						value: this.state.numbers
 					}
 				],
 				{
@@ -64,8 +64,8 @@ class AddCatalogNumbersForm extends React.PureComponent {
 				const data = response.data;
 				if (data.hasOwnProperty('fieldErrors')) {
 					const fieldErrors = [];
-					if (data.fieldErrors.numbers) {
-						fieldErrors.push(...data.fieldErrors.numbers);
+					if (data.fieldErrors.value) {
+						fieldErrors.push(...data.fieldErrors.value);
 					}
 
 					this.setState({
@@ -143,6 +143,7 @@ class AddCatalogNumbersFormView extends React.PureComponent {
 									className="form-control"
 									size="5"
 									required="required"
+									placeholder={ `${l10n['t_example'] || 'Example'}: 90-92,117` }
 									onChange={ handleChangeNumbers } />
 							</div>
 						</div>

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

@@ -50,6 +50,7 @@ class RestSeriesController {
 
 	// @todo #785 Update series: add integration test
 	// @todo #785 Update series: add validation for a comment
+	// @todo #1339 Update series: add validation for catalog numbers
 	// @todo #1340 Update series: add validation for a price
 	// @todo #1343 Update series: add validation for a release year
 	@PatchMapping(SeriesUrl.INFO_SERIES_PAGE)
@@ -75,7 +76,7 @@ public ResponseEntity<Void> updateSeries(
 				continue;
 			}
 
-			// CheckStyle: ignore LineLength for next 24 lines
+			// CheckStyle: ignore LineLength for next 42 lines
 			switch (patch.getPath()) {
 				case "/comment":
 					seriesService.addComment(seriesId, patch.getValue());
@@ -101,6 +102,24 @@ public ResponseEntity<Void> updateSeries(
 				case "/zagorski_price":
 					seriesService.addPrice(ZAGORSKI, seriesId, patch.bigDecimalValue(), currentUserId);
 					break;
+				case "/michel_numbers":
+					seriesService.addCatalogNumbers(MICHEL, seriesId, patch.getValue(), currentUserId);
+					break;
+				case "/scott_numbers":
+					seriesService.addCatalogNumbers(SCOTT, seriesId, patch.getValue(), currentUserId);
+					break;
+				case "/yvert_numbers":
+					seriesService.addCatalogNumbers(YVERT, seriesId, patch.getValue(), currentUserId);
+					break;
+				case "/gibbons_numbers":
+					seriesService.addCatalogNumbers(GIBBONS, seriesId, patch.getValue(), currentUserId);
+					break;
+				case "/solovyov_numbers":
+					seriesService.addCatalogNumbers(SOLOVYOV, seriesId, patch.getValue(), currentUserId);
+					break;
+				case "/zagorski_numbers":
+					seriesService.addCatalogNumbers(ZAGORSKI, seriesId, patch.getValue(), currentUserId);
+					break;
 				default:
 					// @todo #785 Update series: properly fail on invalid path
 					break;

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

@@ -28,6 +28,7 @@ public interface SeriesService {
 	void addComment(Integer seriesId, String comment);
 	void addReleaseYear(Integer seriesId, Integer year, Integer userId);
 	void addPrice(StampsCatalog catalog, Integer seriesId, BigDecimal price, Integer userId);
+	void addCatalogNumbers(StampsCatalog catalog, Integer seriesId, String numbers, Integer userId);
 	void addImageToSeries(AddImageDto dto, Integer seriesId, Integer userId);
 	void replaceImage(ReplaceImageDto dto, Integer seriesId, Integer userId);
 	long countAll();

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

@@ -197,6 +197,31 @@ public void addPrice(StampsCatalog catalog, Integer seriesId, BigDecimal price,
 		);
 	}
 
+	// @todo #1339 SeriesServiceImpl.addCatalogNumbers(): add unit tests
+	@Override
+	@Transactional
+	@PreAuthorize(HasAuthority.CREATE_SERIES)
+	// CheckStyle: ignore LineLength for next 1 line
+	public void addCatalogNumbers(StampsCatalog catalog, Integer seriesId, String numbers, Integer userId) {
+		Validate.isTrue(seriesId != null, "Series id must be non null");
+		Validate.isTrue(numbers != null, "Numbers must be non null");
+		Validate.isTrue(userId != null, "User id must be non null");
+		
+		seriesDao.markAsModified(seriesId, new Date(), userId);
+		
+		// CheckStyle: ignore LineLength for next 7 lines
+		switch (catalog) {
+			case MICHEL:   createCatalogNumbersAndAddToSeries(seriesId, michelCatalogService,   numbers); break;
+			case SCOTT:    createCatalogNumbersAndAddToSeries(seriesId, scottCatalogService,    numbers); break;
+			case YVERT:    createCatalogNumbersAndAddToSeries(seriesId, yvertCatalogService,    numbers); break;
+			case GIBBONS:  createCatalogNumbersAndAddToSeries(seriesId, gibbonsCatalogService,  numbers); break;
+			case SOLOVYOV: createCatalogNumbersAndAddToSeries(seriesId, solovyovCatalogService, numbers); break;
+			case ZAGORSKI: createCatalogNumbersAndAddToSeries(seriesId, zagorskiCatalogService, numbers); break;
+			default:
+				throw new IllegalStateException("Unknown stamps catalog: " + catalog);
+		}
+	}
+	
 	@Override
 	@Transactional
 	@PreAuthorize("isAuthenticated()")

src/main/resources/ru/mystamps/i18n/Messages.properties

@@ -229,3 +229,6 @@ t_seller_group = Seller group
 # series/import/list.html
 t_no_import_requests = No import requests
 t_import_requests = import requests
+
+# AddCatalogNumbersForm.js
+t_numbers = Numbers

src/main/resources/ru/mystamps/i18n/Messages_ru.properties

@@ -228,3 +228,6 @@ t_seller_group = Группа продавца
 # series/import/list.html
 t_no_import_requests = Нет запросов на импорт
 t_import_requests = запросы на импорт
+
+# AddCatalogNumbersForm.js
+t_numbers = Номера

src/main/webapp/WEB-INF/views/series/info.html

@@ -1031,9 +1031,21 @@ <h5 th:text="#{t_add_info_who_selling_series}">Add info about selling/buying thi
 				}
 			};
 			var addCatalogNumbersProps = {
+				'url': [[ '__@{${INFO_SERIES_PAGE}(id=${series.id})}__' ]],
 				'csrfHeaderName': [[ ${_csrf.headerName} ]],
 				'csrfTokenValue': [[ ${_csrf.token} ]],
 				'l10n': {
+					't_server_error': [[ #{t_server_error} ]],
+					't_catalog':      [[ #{t_catalog} ]],
+					't_michel':       [[ #{t_michel} ]],
+					't_scott':        [[ #{t_scott} ]],
+					't_yvert':        [[ #{t_yvert} ]],
+					't_sg':           [[ #{t_sg} ]],
+					't_solovyov':     [[ #{t_solovyov} ]],
+					't_zagorski':     [[ #{t_zagorski} ]],
+					't_numbers':      [[ #{t_numbers} ]],
+					't_example':      [[ #{t_example} ]],
+					't_add':          [[ #{t_add} ]]
 				}
 			};
 			+]*/