Fixed filtering in /api/documents/*

src/main/java/kz/project/printedFormsService/config/SecurityContextUtils.java

@@ -36,6 +36,7 @@ public class SecurityContextUtils {
                 .map(GrantedAuthority::getAuthority)
                 .map(role -> role.replace("ROLE_", ""))
                 .filter(role -> role.contains(PROJECT_ROLE_SPLITTER))
+                .filter(role -> !role.contains("gitlab_"))
                 .collect(Collectors.toMap(
                         role -> role.split(PROJECT_ROLE_SPLITTER)[0],
                         role -> new ArrayList<>(List.of(role.split(PROJECT_ROLE_SPLITTER)[1])),

src/main/java/kz/project/printedFormsService/converter/JwtAuthConverter.java

@@ -5,8 +5,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jayway.jsonpath.JsonPath;
 import com.nimbusds.jwt.JWT;
 import com.nimbusds.jwt.JWTParser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
@@ -17,7 +15,6 @@ import org.springframework.stereotype.Component;
 
 import java.text.ParseException;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Component
 public class JwtAuthConverter implements Converter<Jwt, AbstractAuthenticationToken> {
@@ -53,6 +50,7 @@ public class JwtAuthConverter implements Converter<Jwt, AbstractAuthenticationTo
                     if (role.contains("gitlab")) {
                         authorities.add(new SimpleGrantedAuthority("ROLE_" + role));
                     } else {
+                        authorities.add(new SimpleGrantedAuthority("ROLE_" + role));
                         authorities.add(new SimpleGrantedAuthority("ROLE_" + role.substring(role.lastIndexOf('_') + 1)));
                     }
                 }

src/main/java/kz/project/printedFormsService/data/repository/DocumentJdbcRepository.java

@@ -33,7 +33,7 @@ public class DocumentJdbcRepository {
                                 WHERE
                                     DATE_TRUNC('day',created_at) >= :startDate
                                     AND  DATE_TRUNC('day',created_at) <= :endDate
-                                    --AND project in(:projects)
+                                    AND project in(:projects)
                                 GROUP BY
                                     date
                                 ORDER BY
@@ -61,11 +61,11 @@ public class DocumentJdbcRepository {
                             COUNT(1) as count
                         FROM
                             template_schema.document d
-                        inner join template_schema.template t on t.template_id = d.template_id
+                        inner join template_schema.template t on t.id = d.template_id
                         WHERE
                             DATE_TRUNC('day',created_at) >= :startDate
                           AND DATE_TRUNC('day',created_at) <= :endDate
-                          --AND d.project in(:projects)
+                          AND d.project in(:projects)
                         GROUP BY
                             d.template_id, t.name
                         ORDER BY