From b1622e9de555c514510624c5d28e978f1f13455c Mon Sep 17 00:00:00 2001
From: Vadzim Hushchanskou <vadzim_hushchanskou@epam.com>
Date: Wed, 27 Dec 2023 14:02:38 +0300
Subject: [PATCH] Update step logging

---
 .../karate/ReportPortalPublisher.java         | 56 ++++++-------------
 1 file changed, 17 insertions(+), 39 deletions(-)

diff --git a/src/main/java/com/epam/reportportal/karate/ReportPortalPublisher.java b/src/main/java/com/epam/reportportal/karate/ReportPortalPublisher.java
index c12dcc7..e3d0835 100644
--- a/src/main/java/com/epam/reportportal/karate/ReportPortalPublisher.java
+++ b/src/main/java/com/epam/reportportal/karate/ReportPortalPublisher.java
@@ -61,6 +61,7 @@ public class ReportPortalPublisher {
 	public static final String VARIABLE_PATTERN =
 			"(?:(?<=#\\()%1$s(?=\\)))|(?:(?<=[\\s=+-/*<>(]|^)%1$s(?=[\\s=+-/*<>)]|(?:\\r?\\n)|$))";
 	public static final String MARKDOWN_DELIMITER_PATTERN = "%s\n\n---\n\n%s";
+	public static final String MARKDOWN_CODE_PATTERN = "```\n%s\n```";
 	public static final String PARAMETERS_PATTERN = "Parameters:\n\n%s";
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(ReportPortalPublisher.class);
@@ -457,43 +458,33 @@ public void finishStep(StepResult stepResult) {
 		launch.get().finishTestItem(stepId, rq);
 	}
 
-
 	/**
 	 * Send step execution results to ReportPortal
 	 *
 	 * @param stepResult step execution results
 	 */
 	public void sendStepResults(StepResult stepResult) {
-		Result result = stepResult.getResult();
-		LogLevel logLevel = getLogLevel(result.getStatus());
 		Step step = stepResult.getStep();
-
-		if (step.getDocString() != null) {
-			sendLog("\n-----------------DOC_STRING-----------------\n" + step.getDocString(), logLevel);
+		String docString = step.getDocString();
+		if (isNotBlank(docString)) {
+			sendLog(stepId, "Docstring: \n\n" + String.format(MARKDOWN_CODE_PATTERN, step.getDocString()),
+					LogLevel.INFO);
 		}
 
-		if (stepResult.getStepLog() != null
-				&& !stepResult.getStepLog().isEmpty()
-				&& !stepResult.getStepLog().equals(" ")) {
-			sendLog(stepResult.getStepLog(), logLevel);
+		Result result = stepResult.getResult();
+		String stepLog = stepResult.getStepLog();
+		if (isNotBlank(stepLog)) {
+			sendLog(stepId, stepLog, LogLevel.INFO);
 		}
-	}
+		if (result.isFailed()) {
+			String fullErrorMessage = step.getPrefix() + " " + step.getText();
+			String errorMessage = result.getErrorMessage();
+			if (isNotBlank(errorMessage)) {
+				fullErrorMessage = fullErrorMessage + "\n" + errorMessage;
 
-	/**
-	 * Send step logs and/or execution results to ReportPortal
-	 *
-	 * @param message log message to send
-	 * @param level   log level
-	 */
-	public void sendLog(final String message, LogLevel level) {
-		ReportPortal.emitLog(itemId -> {
-			SaveLogRQ rq = new SaveLogRQ();
-			rq.setMessage(message);
-			rq.setItemUuid(itemId);
-			rq.setLevel(level.name());
-			rq.setLogTime(Calendar.getInstance().getTime());
-			return rq;
-		});
+			}
+			sendLog(stepId, fullErrorMessage, LogLevel.ERROR);
+		}
 	}
 
 	/**
@@ -534,19 +525,6 @@ private ItemStatus getStepStatus(String status) {
 		}
 	}
 
-	private LogLevel getLogLevel(String status) {
-		switch (status) {
-			case "failed":
-				return LogLevel.ERROR;
-			case "stopped":
-			case "interrupted":
-			case "cancelled":
-				return LogLevel.WARN;
-			default:
-				return LogLevel.INFO;
-		}
-	}
-
 	/**
 	 * Get step start time to keep the steps order
 	 * in case previous step startTime == current step startTime or previous step startTime > current step startTime.