improve log for search

find queryString from request and added to log

Author: PouyaPouryaie

src/main/java/ir/bigz/springbootreal/commons/generallog/AppLogAspect.java

@@ -1,15 +1,21 @@
 package ir.bigz.springbootreal.commons.generallog;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import ir.bigz.springbootreal.commons.util.Utils;
 import ir.bigz.springbootreal.exception.AppException;
 import ir.bigz.springbootreal.exception.HttpExceptionModel;
 import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.Signature;
 import org.aspectj.lang.annotation.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 
 @Aspect
@@ -18,13 +24,23 @@ public class AppLogAspect {
 
     private final Logger LOG = LoggerFactory.getLogger(AppLogAspect.class);
 
+    private final HttpServletRequest request;
+
+    public AppLogAspect(HttpServletRequest request) {
+        this.request = request;
+    }
+
     @Before("ir.bigz.springbootreal.commons.generallog.CommonJoinPoint.controllerExecution()")
     public void beforeCallControllerMethod(JoinPoint joinPoint){
         String methodName = joinPoint.getSignature().getName();
         Object[] args = joinPoint.getArgs();
+        String queryString = "";
+        if(Utils.isNotNull(request.getQueryString())){
+            queryString = request.getQueryString();
+        }
         String reduce = Arrays.stream(args).reduce("", (s, s2) -> s + " " + s2).toString();
-        LOG.info("before method: {} | argument: {}",
-                methodName, reduce);
+        LOG.info("before method: {} | argument: {} | queryString: {}",
+                methodName, reduce, queryString);
     }
 
     @AfterReturning(value = "ir.bigz.springbootreal.commons.generallog.CommonJoinPoint.controllerExecution()",

src/main/java/ir/bigz/springbootreal/dto/PageResult.java

@@ -1,10 +1,12 @@
 package ir.bigz.springbootreal.dto;
 
 import lombok.Getter;
+import lombok.ToString;
 
 import java.util.List;
 
 @Getter
+@ToString
 public class PageResult<T> {
 
     private final List<T> result;