refactor: extract queries for series sales import to separate properties file and use it

Correction for 5d486a3 or 59c9c83
commits.

Relate to #927

Author: php-coder

Diff for: src/main/java/ru/mystamps/web/feature/series/importing/sale/JdbcSeriesSalesImportDao.java

@@ -17,26 +17,27 @@
  */
 package ru.mystamps.web.feature.series.importing.sale;
 
-import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.Validate;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.env.Environment;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-@RequiredArgsConstructor
 public class JdbcSeriesSalesImportDao implements SeriesSalesImportDao {
 
 	private final NamedParameterJdbcTemplate jdbcTemplate;
+	private final String addParsedDataSql;
+	private final String findParsedDataSql;
 
-	@Value("${series_import_requests.add_series_sales_parsed_data}")
-	private String addParsedDataSql;
-	
-	@Value("${series_import_requests.find_series_sale_parsed_data_by_request_id}")
-	private String findParsedDataSql;
+	@SuppressWarnings("checkstyle:linelength")
+	public JdbcSeriesSalesImportDao(Environment env, NamedParameterJdbcTemplate jdbcTemplate) {
+		this.jdbcTemplate      = jdbcTemplate;
+		this.addParsedDataSql  = env.getRequiredProperty("series_sales_import.add_series_sales_parsed_data");
+		this.findParsedDataSql = env.getRequiredProperty("series_sales_import.find_series_sale_parsed_data_by_request_id");
+	}
 
 	@Override
 	public void addParsedData(Integer requestId, SeriesSalesParsedDataDbDto data) {

Diff for: src/main/java/ru/mystamps/web/feature/series/importing/sale/SeriesSalesImportConfig.java

@@ -21,6 +21,8 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import ru.mystamps.web.feature.series.DownloaderService;
 import ru.mystamps.web.feature.series.importing.SeriesInfoExtractorService;
@@ -48,8 +50,10 @@ public SeriesSaleImportController seriesSaleImportController() {
 	}
 
 	@RequiredArgsConstructor
+	@PropertySource("classpath:sql/series_sales_import_dao_queries.properties")
 	public static class Services {
 
+		private final Environment env;
 		private final NamedParameterJdbcTemplate jdbcTemplate;
 		private final SiteParserService siteParserService;
 		private final SeriesInfoExtractorService extractorService;
@@ -69,7 +73,7 @@ public SeriesSalesImportService seriesSalesImportService(
 
 		@Bean
 		public SeriesSalesImportDao seriesSalesImportDao() {
-			return new JdbcSeriesSalesImportDao(jdbcTemplate);
+			return new JdbcSeriesSalesImportDao(env, jdbcTemplate);
 		}
 
 	}

Diff for: src/main/resources/sql/series_import_request_dao_queries.properties

@@ -147,47 +147,3 @@ series_import_requests.find_all = \
     JOIN series_import_request_statuses s \
       ON r.status_id = s.id \
 ORDER BY r.updated_at DESC
-
-series_import_requests.add_series_sales_parsed_data = \
-INSERT \
-  INTO series_sales_import_parsed_data \
-     ( request_id \
-     , seller_id \
-     , seller_group_id \
-     , seller_url \
-     , seller_name \
-     , price \
-     , currency \
-     , alt_price \
-     , alt_currency \
-     , cond \
-     , created_at \
-     , updated_at \
-     ) \
-VALUES \
-     ( :request_id \
-     , :seller_id \
-     , :seller_group_id \
-     , :seller_url \
-     , :seller_name \
-     , :price \
-     , :currency \
-     , :alt_price \
-     , :alt_currency \
-     , :condition \
-     , :created_at \
-     , :updated_at \
-     )
-
-series_import_requests.find_series_sale_parsed_data_by_request_id = \
-SELECT seller_id \
-      , seller_group_id \
-      , seller_url \
-      , seller_name \
-      , price \
-      , currency \
-      , alt_price \
-      , alt_currency \
-      , cond \
- FROM series_sales_import_parsed_data \
-WHERE request_id = :request_id

Diff for: src/main/resources/sql/series_sales_import_dao_queries.properties

@@ -0,0 +1,43 @@
+series_sales_import.add_series_sales_parsed_data = \
+INSERT \
+  INTO series_sales_import_parsed_data \
+     ( request_id \
+     , seller_id \
+     , seller_group_id \
+     , seller_url \
+     , seller_name \
+     , price \
+     , currency \
+     , alt_price \
+     , alt_currency \
+     , cond \
+     , created_at \
+     , updated_at \
+     ) \
+VALUES \
+     ( :request_id \
+     , :seller_id \
+     , :seller_group_id \
+     , :seller_url \
+     , :seller_name \
+     , :price \
+     , :currency \
+     , :alt_price \
+     , :alt_currency \
+     , :condition \
+     , :created_at \
+     , :updated_at \
+     )
+
+series_sales_import.find_series_sale_parsed_data_by_request_id = \
+SELECT seller_id \
+      , seller_group_id \
+      , seller_url \
+      , seller_name \
+      , price \
+      , currency \
+      , alt_price \
+      , alt_currency \
+      , cond \
+ FROM series_sales_import_parsed_data \
+WHERE request_id = :request_id