task: rewrite AddCatalogPriceForm to HTMX

Closes #1487

Part of #1671

Author: php-coder

src/main/frontend/src/components/AddCatalogPriceForm.js

@@ -8,7 +8,6 @@ module.exports = {
         'utils/CatalogUtils':               './src/utils/CatalogUtils.js',
         'utils/DateUtils':                  './src/utils/DateUtils.js',
 
-        'components/AddCatalogPriceForm':   './src/components/AddCatalogPriceForm.js',
         'components/AddReleaseYearForm':    './src/components/AddReleaseYearForm.js',
         'components/HideImageForm':         './src/components/HideImageForm.js',
         'components/SeriesSaleImportForm':  './src/components/SeriesSaleImportForm.js',

src/main/frontend/webpack.config.js

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2009-2025 Slava Semushin <slava.semushin@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package ru.mystamps.web.feature.series;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+public class AddCatalogPriceForm {
+	@NotNull
+	private StampsCatalog catalogName;
+	
+	// @todo #1340 Update series: add validation for a price
+	@NotNull
+	private BigDecimal price;
+}

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

@@ -132,5 +132,49 @@ public String addCatalogNumbers(
 
 		return null;
 	}
+
+	@PatchMapping(
+		path = SeriesUrl.INFO_SERIES_PAGE,
+		headers = "HX-Trigger=add-catalog-price-form"
+	)
+	public String addCatalogPrice(
+		@PathVariable("id") Integer seriesId,
+		@Valid AddCatalogPriceForm form,
+		BindingResult result,
+		@AuthenticationPrincipal CustomUserDetails currentUser,
+		Model model,
+		HttpServletResponse response
+	) throws IOException {
+		
+		if (seriesId == null) {
+			response.sendError(HttpServletResponse.SC_NOT_FOUND);
+			return null;
+		}
+		
+		if (!seriesService.isSeriesExist(seriesId)) {
+			response.sendError(HttpServletResponse.SC_NOT_FOUND);
+			return null;
+		}
+		
+		if (result.hasErrors()) {
+			response.setStatus(HttpStatus.UNPROCESSABLE_ENTITY.value());
+			model.addAttribute("isHtmx", true);
+			model.addAttribute("seriesId", seriesId);
+			return "series/info :: AddCatalogPriceForm";
+		}
+		
+		Integer currentUserId = currentUser.getUserId();
+		seriesService.addCatalogPrice(
+			form.getCatalogName(),
+			seriesId,
+			form.getPrice(),
+			currentUserId
+		);
+		
+		// @todo #1671 AddCatalogPriceForm: update a page without full reload
+		response.addHeader("HX-Refresh", "true");
+		
+		return null;
+	}
 
 }

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

@@ -18,7 +18,6 @@
 package ru.mystamps.web.feature.series;
 
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.validation.annotation.Validated;
@@ -36,7 +35,6 @@
 import javax.validation.constraints.NotEmpty;
 import java.io.IOException;
 import java.util.List;
-import java.util.Locale;
 
 @Validated
 @RestController
@@ -46,7 +44,6 @@ class RestSeriesController {
 	private final SeriesService seriesService;
 	private final SeriesImageService seriesImageService;
 
-	// @todo #1340 Update series: add validation for a price
 	// @todo #1343 Update series: add validation for a release year
 	@PatchMapping(SeriesUrl.INFO_SERIES_PAGE)
 	public ResponseEntity<Void> updateSeries(
@@ -77,19 +74,6 @@ public ResponseEntity<Void> updateSeries(
 				case "/release_year":
 					seriesService.addReleaseYear(seriesId, patch.integerValue(), currentUserId);
 					break;
-				case "/michel_price":
-				case "/scott_price":
-				case "/yvert_price":
-				case "/gibbons_price":
-				case "/solovyov_price":
-				case "/zagorski_price":
-					seriesService.addCatalogPrice(
-						extractCatalog(path),
-						seriesId,
-						patch.bigDecimalValue(),
-						currentUserId
-					);
-					break;
 				default:
 					// @todo #785 Update series: properly fail on invalid path
 					break;
@@ -116,12 +100,5 @@ public ResponseEntity<Void> modifySeriesImage(
 		return ResponseEntity.noContent().build();
 	}
 
-	private static StampsCatalog extractCatalog(String path) {
-		// "/catalog_something" => "catalog" => "CATALOG"
-		String catalogName = StringUtils.substringBetween(path, "/", "_")
-			.toUpperCase(Locale.ENGLISH);
-		return StampsCatalog.valueOf(catalogName);
-	}
-
 }
 

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

@@ -17,11 +17,19 @@
  */
 package ru.mystamps.web.feature.series;
 
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
 public enum StampsCatalog {
-	MICHEL,
-	SCOTT,
-	YVERT,
-	GIBBONS,
-	SOLOVYOV,
-	ZAGORSKI
+	MICHEL("EUR", "\u20AC"),
+	SCOTT("USD", "$"),
+	YVERT("EUR", "\u20AC"),
+	GIBBONS("GBP", "\u00A3"),
+	SOLOVYOV("RUB", "\u20BD"),
+	ZAGORSKI("RUB", "\u20BD");
+
+	private final String currencyCode;
+	private final String currencySymbol;
 }

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

@@ -31,7 +31,7 @@ public final class ResourceUrl {
 	public static final String STATIC_RESOURCES_URL = "https://stamps.filezz.ru";
 
 	// MUST be updated when any of our resources were modified
-	public static final String RESOURCES_VERSION = "v0.4.7.0";
+	public static final String RESOURCES_VERSION = "v0.4.7.1";
 
 	private static final String CATALOG_UTILS_JS      = "/public/js/" + RESOURCES_VERSION + "/utils/CatalogUtils.min.js";
 	private static final String COLLECTION_INFO_JS     = "/public/js/" + RESOURCES_VERSION + "/collection/info.min.js";
@@ -42,7 +42,6 @@ public final class ResourceUrl {
 	private static final String SERIES_INFO_JS         = "/public/js/" + RESOURCES_VERSION + "/series/info.min.js";
 	private static final String SALE_IMPORT_FORM_JS     = "/public/js/" + RESOURCES_VERSION + "/components/SeriesSaleImportForm.min.js";
 	private static final String SIMILAR_SERIES_FORM_JS  = "/public/js/" + RESOURCES_VERSION + "/components/SimilarSeriesForm.min.js";
-	private static final String CATALOG_PRICE_FORM_JS   = "/public/js/" + RESOURCES_VERSION + "/components/AddCatalogPriceForm.min.js";
 	private static final String RELEASE_YEAR_FORM_JS    = "/public/js/" + RESOURCES_VERSION + "/components/AddReleaseYearForm.min.js";
 	private static final String HIDE_IMAGE_FORM_JS      = "/public/js/" + RESOURCES_VERSION + "/components/HideImageForm.min.js";
 	private static final String SERIES_SALES_LIST_JS    = "/public/js/" + RESOURCES_VERSION + "/components/SeriesSalesList.min.js";
@@ -81,7 +80,6 @@ public static void exposeResourcesToView(Map<String, String> resources, String h
 		put(resources, host, "SERIES_INFO_JS", SERIES_INFO_JS);
 		put(resources, host, "SALE_IMPORT_FORM_JS", SALE_IMPORT_FORM_JS);
 		put(resources, host, "SIMILAR_SERIES_FORM_JS", SIMILAR_SERIES_FORM_JS);
-		put(resources, host, "CATALOG_PRICE_FORM_JS", CATALOG_PRICE_FORM_JS);
 		put(resources, host, "RELEASE_YEAR_FORM_JS", RELEASE_YEAR_FORM_JS);
 		put(resources, host, "HIDE_IMAGE_FORM_JS", HIDE_IMAGE_FORM_JS);
 		put(resources, host, "SERIES_SALES_LIST_JS", SERIES_SALES_LIST_JS);