diff --git a/backend/src/main/java/com/nttdata/calender/api/RequestInterceptor.java b/backend/src/main/java/com/nttdata/calender/api/RequestInterceptor.java index f40c922..476cdac 100644 --- a/backend/src/main/java/com/nttdata/calender/api/RequestInterceptor.java +++ b/backend/src/main/java/com/nttdata/calender/api/RequestInterceptor.java @@ -8,10 +8,8 @@ import org.springframework.web.servlet.HandlerInterceptor; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.Calendar; @Component public class RequestInterceptor implements HandlerInterceptor { @@ -20,29 +18,32 @@ public class RequestInterceptor implements HandlerInterceptor { private static final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); @Override - public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) - throws Exception { + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { // Print current datetime before handling the request String currentDateTime = LocalDateTime.now().format(dateTimeFormatter); - String out = currentDateTime + " - handling request: " + request.getRequestURI(); + long transactionId = System.currentTimeMillis(); + String out = "Transaction ID = " + transactionId + " " + currentDateTime + " - handling request: " + request.getRequestURI(); logger.info(out); - // System.out.println(out); return true; // Continue with the request } @Override - public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) - throws Exception { + public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { + // Only react for POST requests + if ("POST".equalsIgnoreCase(request.getMethod())) { + // Print current datetime after handling the request + String currentDateTime = LocalDateTime.now().format(dateTimeFormatter); + long transactionId = System.currentTimeMillis(); - String currentDateTime = LocalDateTime.now().format(dateTimeFormatter); - long transactionId = System.currentTimeMillis(); - - if (ex == null) - System.out.println( - "Transaction ID: " + transactionId + "\n" + currentDateTime + " [SUCCESS] handling request: " - + request.getRequestURI() + "\n"); - else - System.err.println(currentDateTime + " [ERROR] handling request: " + request.getRequestURI() + "\n" - + ex.getMessage() + "\n"); + if (ex == null) { + String out = "Transaction ID = " + transactionId + " " + currentDateTime + " [SUCCESS] handling request: " + request.getRequestURI() + "\n"; + logger.info(out); + System.out.println(out); + } else { + String out = "Transaction ID = " + transactionId + " " + currentDateTime + " [ERROR] handling request: " + request.getRequestURI() + "\n" + ex.getMessage() + "\n"; + logger.error(out); + System.err.println(out); + } + } } }