Merge branch 'grad-release'

# Conflicts:
#	api/pom.xml

Author: cditcher

.github/workflows/on.pr.yml

@@ -25,7 +25,7 @@ jobs:
         with:
           distribution: 'corretto'
           java-version: 18
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-5Jun-${{ hashFiles('**/pom.xml') }}

api/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>ca.bc.gov.educ</groupId>
 	<artifactId>educ-grad-data-conversion-api</artifactId>
-	<version>1.8.62</version>
+	<version>1.8.63</version>
 	<name>educ-grad-data-conversion-api</name>
 	<description>Ministry of Education GRAD DATA CONVERSION API</description>
 

api/src/main/java/ca/bc/gov/educ/api/dataconversion/config/RequestInterceptor.java

@@ -17,6 +17,7 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.time.Instant;
+import java.util.UUID;
 
 @Component
 public class RequestInterceptor implements AsyncHandlerInterceptor {
@@ -33,21 +34,30 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 		}
 		// correlationID
 		val correlationID = request.getHeader(EducGradDataConversionApiConstants.CORRELATION_ID);
-		if (correlationID != null) {
-			ThreadLocalStateUtil.setCorrelationID(correlationID);
+		ThreadLocalStateUtil.setCorrelationID(correlationID != null ? correlationID : UUID.randomUUID().toString());
+
+		//Request Source
+		val requestSource = request.getHeader(EducGradDataConversionApiConstants.REQUEST_SOURCE);
+		if(requestSource != null) {
+			ThreadLocalStateUtil.setRequestSource(requestSource);
 		}
 
-		// username
-		Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-		if (auth instanceof JwtAuthenticationToken) {
-			JwtAuthenticationToken authenticationToken = (JwtAuthenticationToken) auth;
-			Jwt jwt = (Jwt) authenticationToken.getCredentials();
-			String username = JwtUtil.getName(jwt);
-			if (username != null) {
-				ThreadLocalStateUtil.setCurrentUser(username);
+		// Header userName
+		val userName = request.getHeader(EducGradDataConversionApiConstants.USER_NAME);
+		if (userName != null) {
+			ThreadLocalStateUtil.setCurrentUser(userName);
+		}
+		else {
+			Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+			if (auth instanceof JwtAuthenticationToken) {
+				JwtAuthenticationToken authenticationToken = (JwtAuthenticationToken) auth;
+				Jwt jwt = (Jwt) authenticationToken.getCredentials();
+				String username = JwtUtil.getName(jwt);
+				if (username != null) {
+					ThreadLocalStateUtil.setCurrentUser(username);
+				}
 			}
 		}
-
 		return true;
 	}
 
@@ -62,10 +72,6 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 	@Override
 	public void afterCompletion(@NonNull final HttpServletRequest request, final HttpServletResponse response, @NonNull final Object handler, final Exception ex) {
 		LogHelper.logServerHttpReqResponseDetails(request, response, constants.isSplunkLogHelperEnabled());
-		val correlationID = request.getHeader(EducGradDataConversionApiConstants.CORRELATION_ID);
-		if (correlationID != null) {
-			response.setHeader(EducGradDataConversionApiConstants.CORRELATION_ID, request.getHeader(EducGradDataConversionApiConstants.CORRELATION_ID));
-		}
 		// clear
 		ThreadLocalStateUtil.clear();
 	}

api/src/main/java/ca/bc/gov/educ/api/dataconversion/config/RestWebClient.java

@@ -2,14 +2,17 @@
 
 import ca.bc.gov.educ.api.dataconversion.util.EducGradDataConversionApiConstants;
 import ca.bc.gov.educ.api.dataconversion.util.LogHelper;
+import ca.bc.gov.educ.api.dataconversion.util.ThreadLocalStateUtil;
 import io.netty.handler.logging.LogLevel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.web.reactive.function.client.ClientRequest;
 import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
 import org.springframework.web.reactive.function.client.ExchangeStrategies;
 import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
 import reactor.netty.http.client.HttpClient;
 
 import java.time.Duration;
@@ -31,7 +34,9 @@ public RestWebClient() {
 
     @Bean
     public WebClient webClient() {
-        return WebClient.builder().exchangeStrategies(ExchangeStrategies.builder()
+        return WebClient.builder()
+                .filter(setRequestHeaders())
+                .exchangeStrategies(ExchangeStrategies.builder()
                 .codecs(configurer -> configurer
                         .defaultCodecs()
                         .maxInMemorySize(40 * 1024 * 1024))  // 40 MB
@@ -49,7 +54,18 @@ private ExchangeFilterFunction log() {
                     //Grad2-1929 replacing rawStatusCode() with statusCOde() as it was deprecated.
                     clientResponse.statusCode().value(),
                     clientRequest.headers().get(EducGradDataConversionApiConstants.CORRELATION_ID),
+                    clientRequest.headers().get(EducGradDataConversionApiConstants.REQUEST_SOURCE),
                     constants.isSplunkLogHelperEnabled())
                 ));
     }
+    private ExchangeFilterFunction setRequestHeaders() {
+        return (clientRequest, next) -> {
+            ClientRequest modifiedRequest = ClientRequest.from(clientRequest)
+                    .header(EducGradDataConversionApiConstants.CORRELATION_ID, ThreadLocalStateUtil.getCorrelationID())
+                    .header(EducGradDataConversionApiConstants.USER_NAME, ThreadLocalStateUtil.getCurrentUser())
+                    .header(EducGradDataConversionApiConstants.REQUEST_SOURCE, EducGradDataConversionApiConstants.API_NAME)
+                    .build();
+            return next.exchange(modifiedRequest);
+        };
+    }
 }

api/src/main/java/ca/bc/gov/educ/api/dataconversion/util/EducGradDataConversionApiConstants.java

@@ -13,6 +13,8 @@ public class EducGradDataConversionApiConstants {
     public static final String API_NAME = "GRAD-DATA-CONVERSION-API";
     public static final String TRAX_STREAM_NAME="TRAX_STATUS_EVENT_STREAM";
     public static final String CORRELATION_ID = "correlationID";
+    public static final String USER_NAME = "User-Name";
+    public static final String REQUEST_SOURCE = "Request-Source";
     public static final String API_ROOT_MAPPING = "";
     public static final String API_VERSION = "v1";
     public static final String GRAD_DATA_CONVERSION_API_ROOT_MAPPING = "/api/" + API_VERSION + "/data-conversion";

api/src/main/java/ca/bc/gov/educ/api/dataconversion/util/LogHelper.java

@@ -36,6 +36,10 @@ public static void logServerHttpReqResponseDetails(@NonNull final HttpServletReq
       if (correlationID != null) {
         httpMap.put("correlation_id", correlationID);
       }
+      val requestSource = request.getHeader(EducGradDataConversionApiConstants.REQUEST_SOURCE);
+      if (requestSource != null) {
+        httpMap.put("request_source", requestSource);
+      }
       httpMap.put("server_http_request_url", String.valueOf(request.getRequestURL()));
       httpMap.put("server_http_request_processing_time_ms", totalTime);
       httpMap.put("server_http_request_payload", String.valueOf(request.getAttribute("payload")));
@@ -48,7 +52,7 @@ public static void logServerHttpReqResponseDetails(@NonNull final HttpServletReq
     }
   }
 
-  public static void logClientHttpReqResponseDetails(@NonNull final HttpMethod method, final String url, final int responseCode, final List<String> correlationID, final boolean logging) {
+  public static void logClientHttpReqResponseDetails(@NonNull final HttpMethod method, final String url, final int responseCode, final List<String> correlationID, final List<String> requestSource, final boolean logging) {
     if (!logging) return;
     try {
       final Map<String, Object> httpMap = new HashMap<>();
@@ -58,6 +62,9 @@ public static void logClientHttpReqResponseDetails(@NonNull final HttpMethod met
       if (correlationID != null) {
         httpMap.put("correlation_id", String.join(",", correlationID));
       }
+      if (requestSource != null) {
+        httpMap.put("request_source", String.join(",", requestSource));
+      }
       MDC.putCloseable("httpEvent", mapper.writeValueAsString(httpMap));
       log.info("");
       MDC.clear();