feat(): build & deploy #1

MartinMeer · MartinMeer · commit d5c8077587c2 · 2025-02-19T01:28:23.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,4 @@ out/
 .vscode/
 /old.martinmeer/
 /src/main/resources/misc/testSQLQueries
+/src/main/java/org/martinmeer/otkassistant/.env
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     id("org.asciidoctor.jvm.convert") version "3.3.2"
     //checkstyle
     id("com.github.ben-manes.versions") version "0.51.0"
+    //id("nu.studer.dotenv") version "3.0.0"
 }
 
 group = "org.martinmeer"
@@ -17,16 +18,13 @@ java {
     }
 }
 
-tasks.war {
-    archiveFileName.set("otkassist.war") // Название WAR-файла
-}
-
 configurations {
     compileOnly {
         extendsFrom(configurations.annotationProcessor.get())
     }
 }
 
+
 repositories {
     mavenCentral()
 }
@@ -43,7 +41,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-actuator")
     implementation("org.springframework.boot:spring-boot-starter-data-rest")
     implementation("org.springframework.boot:spring-boot-starter-freemarker")
-    implementation("org.springframework.boot:spring-boot-starter-security")
+    //implementation("org.springframework.boot:spring-boot-starter-security")
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-web-services")
     implementation("org.springframework.boot:spring-boot-starter-jdbc")
@@ -53,21 +51,21 @@ dependencies {
     //developmentOnly("org.springframework.boot:spring-boot-docker-compose")
     runtimeOnly("org.postgresql:postgresql")
 
-    //providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
-
     // Thymeleaf
     implementation("org.thymeleaf.extras:thymeleaf-extras-springsecurity6")
 
     //Spring-core
     //Spring-web
     //Jackson
     //JDBC
-    providedRuntime("org.apache.tomcat.embed:tomcat-embed-core") // Удаляем встроенный Tomcat
+    providedRuntime("org.springframework.boot:spring-boot-starter-tomcat") // Удаляем встроенный Tomcat
     providedCompile("javax.servlet:javax.servlet-api:4.0.1") // Добавляем сервлет API
     //JPA
 
     //Test
-    testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation("org.springframework.boot:spring-boot-starter-test") {
+        exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
+    }
     //testImplementation("org.springframework.boot:spring-boot-testcontainers")
     testImplementation("org.springframework.restdocs:spring-restdocs-mockmvc")
     testImplementation("org.springframework.security:spring-security-test")
@@ -86,14 +84,28 @@ dependencies {
             exclude(group = "org.springframework.boot", module = "spring-boot-starter-logging")
         }
     }
+    implementation("io.github.cdimascio:dotenv-java:3.1.0")
 
 }
 
-tasks.withType<Test> {
-    useJUnitPlatform()
+//tasks
+
+tasks.war {
+    archiveFileName.set("otkassist.war") // Название WAR-файла
 }
 
+
+//tasks.withType<Test> {}
+
 tasks.test {
+    useJUnitPlatform{
+        excludeTags("excludeFromBuild") // Exclude tests with this tag
+    }
+    systemProperty("spring.profiles.active", "test")
+
+
+    //environment("DB_USERNAME", ("DB_USERNAME"))
+    //environment("DB_PASSWORD", System.getenv("DB_PASSWORD"))
     outputs.dir(project.extra["snippetsDir"]!!)
 
     jvmArgs("-javaagent:${mockitoAgent.asPath}")
@@ -104,3 +116,4 @@ tasks.asciidoctor {
     inputs.dir(project.extra["snippetsDir"]!!)
     dependsOn(tasks.test)
 }
+
diff --git a/src/main/java/org/martinmeer/otkassistant/core/service/SchemaAwareNamedParameterJdbcTemplate.java b/src/main/java/org/martinmeer/otkassistant/core/service/SchemaAwareNamedParameterJdbcTemplate.java
@@ -3,15 +3,13 @@
 import lombok.Setter;
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import javax.sql.DataSource;
 import java.util.Map;
 
-@Service
+@Component
 public class SchemaAwareNamedParameterJdbcTemplate {
 
     @Setter
@@ -26,16 +24,21 @@ public SchemaAwareNamedParameterJdbcTemplate(
         this.namedParameterJdbcTemplate = namedParameterJdbcTemplate;
     }
 
+    @Transactional
     public <T> T queryWithSchema(String sql, Map<String, Object> params, Class<T> clazz) {
+        String sanitaizedSchemaName = sanitizeSchemaName(schemaName);
         try {
-            jdbcTemplate.execute("SET LOCAL search_path TO " + sanitizeSchemaName(schemaName));
+            jdbcTemplate.execute("SET LOCAL search_path TO " + sanitaizedSchemaName);
             return namedParameterJdbcTemplate.queryForObject(sql, params, clazz);
         } catch (DataAccessException e) {
             throw new RuntimeException("Error setting schema or executing query", e);
+        } finally {
+            // Reset schema to default or previous state if needed
+            jdbcTemplate.execute("RESET search_path");
         }
     }
 
-    public String sanitizeSchemaName(String schemaName) {
+    private String sanitizeSchemaName(String schemaName) {
         if (!schemaName.matches("^[a-zA-Z0-9_]+$")) {
             throw new IllegalArgumentException("Invalid schema name: " + schemaName);
         }
diff --git a/src/main/java/org/martinmeer/otkassistant/core/web/WebConfig.java b/src/main/java/org/martinmeer/otkassistant/core/web/WebConfig.java
@@ -9,11 +9,10 @@ public class WebConfig implements WebMvcConfigurer {
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/api/**")
-                .allowedOrigins("http://localhost:40155/")
-                .allowedOrigins("http://localhost:8080")
-                .allowedOrigins("http://otk-help.martinmeer.com")
-                .allowedMethods("POST", "GET")
+                .allowedOrigins("https://otk-help.martinmeer.com")
+                .allowedMethods("POST", "GET", "OPTIONS")
                 .allowedHeaders("*")
+                .maxAge(3600)
                 .allowCredentials(true);
     }
 }
diff --git a/src/main/java/org/martinmeer/otkassistant/ost22/service/OstMainService.java b/src/main/java/org/martinmeer/otkassistant/ost22/service/OstMainService.java
@@ -152,12 +152,11 @@ BigDecimal calculateMeasuringValues(BigDecimal dimension, BigDecimal deviance) {
 
     Map<String, String> outputMapper() {
         Map<String, String> output = new HashMap<>();
-        maxMeasuringValue = calculateMeasuringValues(nominalDimension, maxMeasuringValue);
-        minMeasuringValue = calculateMeasuringValues(nominalDimension, minMeasuringValue);
-        String devianceValues = lowerDeviance.toString()
-                + ", "
-                + upperDeviance.toString();
-        output.put("deviance_values", devianceValues);
+        maxMeasuringValue = calculateMeasuringValues(nominalDimension, upperDeviance);
+        minMeasuringValue = calculateMeasuringValues(nominalDimension, lowerDeviance);
+
+        output.put("upper_deviance", upperDeviance.toString());
+        output.put("lower_deviance", lowerDeviance.toString());
         output.put("max_mes_value", maxMeasuringValue.toString());
         output.put("min_mes_value", minMeasuringValue.toString());
         return output;
diff --git a/src/main/resources/misc/front_names.txt b/src/main/resources/misc/front_names.txt
@@ -1,4 +1,8 @@
 /*
+
+const response = await postData('/api/process', requestData);
+
+
 padeId=ost22
 const page = 'ost22';
     const inputString = `${type}:${size}`;
@@ -7,9 +11,10 @@ const page = 'ost22';
 const type = document.getElementById('detail_type').value.trim(); // Значение из выпадающего списка
 const size = document.getElementById('nominal_dimension').value.trim();
 
-document.getElementById('deviance_values').value = response.deviation_values || '';
-document.getElementById('min_mes_value').value = response.min_mes_value  || '';
-document.getElementById('max_mes_value').value = response.max_mes_value  || '';
+    document.getElementById('upper_deviance').value = response.deviation_values || '';
+    document.getElementById('lower_deviance').value = response.deviation_values || '';
+    document.getElementById('min_mes_value').value = response.min_mes_value  || '';
+    document.getElementById('max_mes_value').value = response.max_mes_value  || '';
 
 
 
diff --git a/src/main/resources/misc/note.txt b/src/main/resources/misc/note.txt
@@ -1,3 +1,6 @@
 BasicDimension
 BasicUpperDeviance
 BasicLowerDeviance
+
+scp otkassist.war olegmm@192.144.12.110:/opt/tomcat11/webapps
+
diff --git a/src/test/java/org/martinmeer/otkassistant/core/service/SchemaAwareNamedParameterJdbcTemplateRealDbTest.java b/src/test/java/org/martinmeer/otkassistant/core/service/SchemaAwareNamedParameterJdbcTemplateRealDbTest.java
@@ -1,12 +1,13 @@
 package org.martinmeer.otkassistant.core.service;
 
 
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
+import org.martinmeer.otkassistant.MainApp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.JndiDataSourceAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -15,11 +16,10 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-@SpringBootTest//(webEnvironment = SpringBootTest.WebEnvironment.NONE)
+@SpringBootTest(classes = {MainApp.class, SchemaAwareNamedParameterJdbcTemplateRealDbTest.class})
 @ActiveProfiles("test")
 @EnableAutoConfiguration(exclude = JndiDataSourceAutoConfiguration.class)
-//@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
-//@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@Tag("excludeFromBuild")
 public class SchemaAwareNamedParameterJdbcTemplateRealDbTest {
 
     @Autowired
@@ -43,6 +43,21 @@ void testReadDataFromRealDb() {
         assertNotNull(result);
         BigDecimal expected = new BigDecimal("0.20");
         assertEquals(0, result.compareTo(expected));
+    }
+    @Test
+    @Transactional
+    void testInvalidSchemaName() {
+        // Arrange
+        schemaAwareJdbc.setSchemaName("invalid@schema!");;
+        String sql = "SELECT deviance FROM undef_deviances WHERE dim_range @> :id";
+
+        // Act & Assert
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
+            schemaAwareJdbc.queryWithSchema(sql,
+                    Map.of("id", new BigDecimal("20.0")),
+                    BigDecimal.class);
+        }, "Invalid schema name should throw IllegalArgumentException");
 
+        assertTrue(exception.getMessage().contains("Invalid schema name"), "Exception message should indicate invalid schema name");
     }
 }
diff --git a/src/test/java/org/martinmeer/otkassistant/core/web/ApiControllerTest.java b/src/test/java/org/martinmeer/otkassistant/core/web/ApiControllerTest.java
@@ -38,7 +38,6 @@ void setUp() {
         mockMvc = MockMvcBuilders.standaloneSetup(apiController)
                 .setControllerAdvice(new GlobalExceptionHandler())
                 .build();
-
     }
 
     @Test
diff --git a/src/test/java/org/martinmeer/otkassistant/ost22/service/OstMainServiceTest.java b/src/test/java/org/martinmeer/otkassistant/ost22/service/OstMainServiceTest.java
@@ -13,11 +13,11 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
+import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
 class OstMainServiceTest {
@@ -52,7 +52,8 @@ void setUp() throws NoSuchMethodException, NoSuchFieldException {
         upperDevianceField = getField(OstMainService.class, "upperDeviance");
         lowerDevianceField = getField(OstMainService.class, "lowerDeviance");
         String inputDimension = "20.0";
-        when(inputData.getInputDimension()).thenReturn(inputDimension);
+        lenient().when(inputData.getInputDimension()).thenReturn(inputDimension);
+
     }
 
     @Test
@@ -133,5 +134,22 @@ private static Field getField(Class<?> clazz, String fieldName) throws NoSuchFie
         return field;
     }
 
+    @Test
+    void outputMapper_ReturnsCorrectValues() throws IllegalAccessException {
+        // Arrange: Set required fields using reflection
+        nominalDimensionField.set(ostMainService, new BigDecimal("20.0"));
+        upperDevianceField.set(ostMainService, new BigDecimal("0.05"));
+        lowerDevianceField.set(ostMainService, new BigDecimal("-0.05"));
+
+// Act
+        Map<String, String> result = ostMainService.outputMapper();
 
+        // Assert
+        assertAll(
+                () -> assertEquals("0.05", result.get("upper_deviance")),
+                () -> assertEquals("-0.05", result.get("lower_deviance")),
+                () -> assertEquals("20.05", result.get("max_mes_value")),
+                () -> assertEquals("19.95", result.get("min_mes_value"))
+        );
+    }
 }
diff --git a/src/test/resources/application-test.yml b/src/test/resources/application-test.yml
@@ -4,6 +4,8 @@ spring:
     username: ${DB_USERNAME}
     password: ${DB_PASSWORD}
     driver-class-name: org.postgresql.Driver
+  autoconfigure:
+    exclude: org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration
 
   # Для безопасности чтения
   jpa:

-Original file line number
+Diff line change
@@ @@ -1,3 +1,6 @@ @@
 BasicDimension
 BasicUpperDeviance
 BasicLowerDeviance
++
 +scp otkassist.war [email protected]:/opt/tomcat11/webapps
++
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ void setUp() {`
`38`	`38`	`mockMvc = MockMvcBuilders.standaloneSetup(apiController)`
`39`	`39`	`.setControllerAdvice(new GlobalExceptionHandler())`
`40`	`40`	`.build();`
`41`		`-`
`42`	`41`	`}`
`43`	`42`
`44`	`43`	`@Test`