DATA-8394 Fix handling issue type and project

Алексеев Павел Леонидович · Алексеев Павел Леонидович · commit 433174e53ad7 · 2025-08-23T18:12:10.000+03:00
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ receivers:
         eva__field__severity: High
         value: '{{$value}}'
       annotations:
-        eva__field__project: data-alerts
+        eva__project: data-alerts
         eva__field__issue_type_name: Task
         eva__field__cf_env: PROD
         summary: DataTest0 summary
diff --git a/_DEV.scripts/alert-sample.json5 b/_DEV.scripts/alert-sample.json5
@@ -18,7 +18,7 @@
         "description": "Some description QAZ2\nof DataTest0 alert\nVALUE: 3\n",
         "eva__field__assignee": "plalexeev",
         "eva__field__issue_type_name": "Alert",
-        "eva__field__project_key": "DATA",
+        "eva__project": "DATA",
         "qaz1_annotation": "qaz1_annotation_value",
         "summary": "DataTest0 summary",
         "value": "3"
diff --git a/_DEV.scripts/alert-sample.small.json5 b/_DEV.scripts/alert-sample.small.json5
@@ -18,7 +18,7 @@
         "description": "Some description QAZ2\nof DataTest0 alert\nVALUE: 3\n",
         "eva__field__assignee": "plalexeev",
         "eva__field__issue_type_name": "Alert",
-        "eva__field__project_key": "DATA",
+        "eva__project": "DATA",
         "qaz1_annotation": "qaz1_annotation_value",
         "summary": "DataTest0 summary",
         "value": "3"
diff --git a/_DEV.scripts/eva.connekt.kts b/_DEV.scripts/eva.connekt.kts
@@ -67,6 +67,51 @@ POST(api) {
     )
 }
 
+POST(api) {
+    contentType("application/json")
+    header("Authorization", "Bearer $token")
+    body(
+        """{
+            "jsonrpc": "2.2",
+            "method": "CmfTask.create",
+            "kwargs": {
+                "logic_type" : "Alert",
+                "name" : "[] Завершился ошибкой DAG reindex - 2025-08-23",
+                "text" : "test description - empty",
+                "tags" : [ "DQ", "DQ:issue", "alert:airflow" ],
+                "Component/s" : "DQ-issues+alerts, DevOps+infrastructure",
+                "priority" : "1",
+                "project" : "data-alerts",
+                "cf_alert_id" : "alert[2f559d99774e36e8]"
+            },
+            "callid": "необязательный параметр",
+            "jshash": "??",
+            "fields": "***",
+            "no_meta": true
+        }"""
+    )
+}
+
+
+.then {
+    val id = jsonPath().readString("\$.result")
+    POST(api) {
+        contentType("application/json")
+        header("Authorization", "Bearer $token")
+        body(
+            """{
+            "jsonrpc": "2.2",
+            "method": "CmfTask.get",
+            "kwargs": {"filter": ["id", "==", "$id"]},
+            "callid": "необязательный параметр",
+            "jshash": "??",
+            "fields": "***",
+            "no_meta": true
+        }"""
+        )
+    }
+}
+
 POST(api) {
     contentType("application/json")
     header("Authorization", "Bearer $token")
diff --git a/src/main/groovy/info/hubbitus/alertmanager/DTO/AlertContext.groovy b/src/main/groovy/info/hubbitus/alertmanager/DTO/AlertContext.groovy
@@ -34,12 +34,13 @@ class AlertContext {
     CmfTask toCmfTask() {
         return new CmfTask(
             project: field(EVA__PROJECT),
-            type: field(EVA__ISSUE_TYPE_NAME),
+            parent: field(EVA__PROJECT),
+            logic_type: field(EVA__ISSUE_TYPE_NAME),
             name: field('summary'),
             text: field('description')
         ).tap {CmfTask task ->
             task.properties.findAll {
-                !(it.key as String in ['class', 'other_fields', 'project', 'type', 'name', 'text'])
+                !(it.key as String in ['class', 'other_fields', 'project', 'parent', 'logic_type', 'name', 'text']) // Set before
             }.each {
                 task.setProperty(it.key as String, evaFields[it.key]?.value)
             }
diff --git a/src/main/groovy/info/hubbitus/alertmanager/DTO/CmfTask.groovy b/src/main/groovy/info/hubbitus/alertmanager/DTO/CmfTask.groovy
@@ -3,7 +3,6 @@ package info.hubbitus.alertmanager.DTO
 import groovy.transform.Canonical
 import groovy.transform.CompileStatic
 import groovy.transform.ToString
-import info.hubbitus.alertmanager.service.GlobalConfig
 import io.vertx.core.json.JsonObject
 import org.eclipse.microprofile.config.ConfigProvider
 
@@ -36,7 +35,7 @@ class CmfTask {
     String id
     String parent
     String project
-    String type = 'Task'
+    String logic_type
     String name
     String code
     String text
diff --git a/src/main/groovy/info/hubbitus/alertmanager/service/GlobalConfig.groovy b/src/main/groovy/info/hubbitus/alertmanager/service/GlobalConfig.groovy
@@ -19,7 +19,7 @@ class GlobalConfig {
     String getBaseURL(RoutingContext context) {
         return (
             "auto" == baseURL
-                ? "${context.request().isSSL() ? "https" : "http"}://${context.request().getHeader("host")}"
+                ? "${context?.request()?.isSSL() ? "https" : "http"}://${context?.request()?.getHeader("host")}"
                 : baseURL
         )
     }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -47,8 +47,9 @@ quarkus:
 app:
   # Special value "auto" means to use Host HTTP header automatically.
   # Value without trailing /
-  baseURL: auto
+#  baseURL: auto
 #  baseURL: https://eva-alert.k8s-dev.gid.team
+  baseURL: http://localhost:8080
 eva:
   api:
     base: https://eva-lab.gid.team/
diff --git a/src/test/groovy/info/hubbitus/alertmanager/EvaServiceTest.groovy b/src/test/groovy/info/hubbitus/alertmanager/EvaServiceTest.groovy
@@ -7,6 +7,7 @@ import info.hubbitus.alertmanager.DTO.AlertContext
 import info.hubbitus.alertmanager.DTO.AlertRequest
 import info.hubbitus.alertmanager.DTO.CmfTask
 import info.hubbitus.alertmanager.service.EvateamService
+import info.hubbitus.alertmanager.service.GlobalConfig
 import io.quarkus.test.junit.QuarkusTest
 import io.smallrye.mutiny.Uni
 import io.vertx.core.json.JsonObject
@@ -36,6 +37,9 @@ class EvaServiceTest {
     @Inject
     Logger log
 
+    @Inject
+    GlobalConfig config
+
 	@BeforeEach
 	void setupTest() {
 		objectMapper.configure(JsonParser.Feature.ALLOW_COMMENTS, true)
@@ -48,7 +52,7 @@ class EvaServiceTest {
                 project: 'data-alerts',
                 name: 'Test alertmanager-evateam',
                 text: 'Test text creating issue from java',
-                type: 'Task',
+                logic_type: 'Alert',
                 other_fields: [
                     cf_alert_id: 'autotest',
                     workflow: 'Data-Alert'
@@ -57,18 +61,18 @@ class EvaServiceTest {
         )
 
         CmfTask task = uni.await().indefinitely()
-        log.debugf('Created task id [%s]', task.getId())
+        log.debugf('Created task [%s]', task.taskURI(config.getBaseURL(null)))
         assertThat(task.id, notNullValue())
         assertThat(task.name, nullValue())
         assertThat(task.text, nullValue())
-        assertThat(task.type, is('Task'))
+        assertThat(task.logic_type, nullValue())
         assertThat(task.other_fields, is([:]))
 
         task = eva.getTaskById(task.id).await().indefinitely()
-        log.debugf('Created task %s, full: %s', task.taskURI(), task)
+        log.debugf('Created task %s, full: %s', task.taskURI(config.getBaseURL(null)), task)
         assertThat(task.name, is('Test alertmanager-evateam'))
         assertThat(task.code, startsWith('ALERT-'))
-        assertThat(task.type, is('Task'))
+        assertThat(task.logic_type, nullValue()) // Does not returned in the result
         assertThat(task.text, nullValue()) // Does not returned by default
         assertThat(task.parent, nullValue())
         assertThat(task.project, is('CmfProject:07796e28-2054-11f0-a901-3e9b82c78085'))
@@ -178,11 +182,11 @@ class EvaServiceTest {
         CmfTask task = issuesToCreate.first()
         // Values may be filled only n saved issues:
         assertThat(task.id, nullValue())
-        assertThat(task.parent, nullValue())
+        assertThat(task.parent, is('data-alerts'))
         assertThat(task.code, nullValue())
         // Parsed values
         assertThat(task.project, is('data-alerts'))
-        assertThat(task.type, is('Task'))
+        assertThat(task.logic_type, is('Alert'))
         assertThat(task.name, startsWith("DataTest0 summary ${LocalDate.now()}"))
         assertThat(task.text, is("Some description QAZ2\nof DataTest0 alert\nVALUE: 3\nText should be as is: \$some, \$200"))
         assertThat(task.other_fields, is([priority: "1", assignee: 'plalexeev', 'composite field name': 'composite field value', 'cf_alert_id': alertContext.alert.hashCode().toString()]))
diff --git a/src/test/resources/alert-sample.DATA-8310.json5 b/src/test/resources/alert-sample.DATA-8310.json5
@@ -34,7 +34,7 @@
                 "eva__field__value__1": "DQ-issues+alerts, DevOps+infrastructure",
                 "eva__issue_type_name": "Alert",
                 "eva__bql_to_find_issue_for_update": "[[\"cf_alert_id\",\"=\",\"${context.alert.fingerprint}\"],[\"cache_status_type\",\"!=\",\"CLOSED\"]]",
-                "eva__field__project": "data-alerts"
+                "eva__project": "data-alerts"
             },
             "startsAt": "2025-05-27T09:11:00Z",
             "endsAt": "0001-01-01T00:00:00Z",
@@ -78,7 +78,7 @@
         "eva__field__value__1": "DQ-issues+alerts, DevOps+infrastructure",
         "eva__issue_type_name": "Alert",
         "eva__bql_to_find_issue_for_update": "[\"cf_alert_id\",\"=\",\"${context.alert.fingerprint}\"],[\"cache_status_type\",\"!=\",\"CLOSED\"]]",
-        "eva__field__project": "data-alerts"
+        "eva__project": "data-alerts"
     },
     "externalURL": "https://alert-private.gid.team",
     "version": "4",
diff --git a/src/test/resources/alert-sample.small.json5 b/src/test/resources/alert-sample.small.json5
@@ -10,14 +10,14 @@
         "global_label_1": "2",
         "instance": "localhost:9090",
         "eva__field__priority": "1",
-        "eva__issue_type_name": "Task",
+        "eva__issue_type_name": "Alert",
         "eva__project": "data-alerts",
         "job": "prometheus",
         "severity": "warning"
       },
       "annotations": {
         "description": "Some description QAZ2\nof DataTest0 alert\nVALUE: 3\nText should be as is: $some, $200",
-        "eva__issue_type_name": "Task",
+        "eva__issue_type_name": "Alert",
         "eva__project": "data-alerts",
         "eva__field__tags": "[\"label_one\", \"labelTwo\", \"label:three\", \"label:four\", \"severity:${context.field('severity')}\"]",
 		"eva__field__name__1": "composite field name",

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class GlobalConfig {`
`19`	`19`	`String getBaseURL(RoutingContext context) {`
`20`	`20`	`return (`
`21`	`21`	`"auto" == baseURL`
`22`		`- ? "${context.request().isSSL() ? "https" : "http"}://${context.request().getHeader("host")}"`
	`22`	`+ ? "${context?.request()?.isSSL() ? "https" : "http"}://${context?.request()?.getHeader("host")}"`
`23`	`23`	`: baseURL`
`24`	`24`	`)`
`25`	`25`	`}`