Main service

.github/workflows/maven.yml

@@ -21,15 +21,18 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven
-      run: mvn -B package --file pom.xml
+      working-directory: MainService
+      run: mvn -B package -DskipTests
 
     # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
-    - name: Update dependency graph
-      uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
+    #- name: Update dependency graph
+    #  uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
+    #  with:
+    #    working-directory: MainService

MainService/src/main/java/ru/espada/ep/iptip/audit/AuditAspect.java

@@ -0,0 +1,57 @@
+package ru.espada.ep.iptip.audit;
+
+import jakarta.persistence.Table;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.After;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.stereotype.Component;
+
+import org.aspectj.lang.annotation.Pointcut;
+
+import java.lang.reflect.Field;
+
+@Aspect
+@Component
+public class AuditAspect {
+
+    private AuditService auditService;
+
+    // Определяем точку соединения для всех методов save и delete в репозиториях
+    @Pointcut("execution(* org.springframework.data.repository.CrudRepository+.save(..)) || execution(* org.springframework.data.repository.CrudRepository+.delete(..))")
+    public void repositoryMethods() {}
+
+    @Before("repositoryMethods()")
+    public void logBeforeRepositoryMethod(JoinPoint joinPoint) {
+        Object entity = joinPoint.getArgs()[0];
+        if (entity instanceof Auditable auditableEntity) {
+            String methodName = joinPoint.getSignature().getName();
+            if (methodName.equals("delete")) {
+                UserDetails userDetails = (UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+                String username = userDetails.getUsername();
+                auditService.logDelete(auditableEntity, username);
+            }
+        }
+    }
+
+    @After("repositoryMethods()")
+    public void logAfterRepositoryMethod(JoinPoint joinPoint) {
+        Object entity = joinPoint.getArgs()[0];
+        if (entity instanceof Auditable auditableEntity) {
+            String methodName = joinPoint.getSignature().getName();
+            if (methodName.equals("save")) {
+                auditService.logSave(auditableEntity);
+            }
+        }
+    }
+
+    @Autowired
+    public void setAuditService(AuditService auditService) {
+        this.auditService = auditService;
+    }
+}
+
+

MainService/src/main/java/ru/espada/ep/iptip/audit/AuditController.java

@@ -0,0 +1,33 @@
+package ru.espada.ep.iptip.audit;
+
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import ru.espada.ep.iptip.audit.entity.AuditEntity;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/audit")
+@SecurityRequirement(name = "JWT")
+public class AuditController {
+
+
+    private AuditService auditService;
+
+    @GetMapping("/{page}")
+    @PreAuthorize("hasPermission(null, 'audit.view')")
+    public List<AuditEntity> getAudits(@PathVariable int page) {
+        return auditService.getAudits(page);
+    }
+
+    @Autowired
+    public void setAuditServiceImpl(AuditService auditService) {
+        this.auditService = auditService;
+    }
+}
+

MainService/src/main/java/ru/espada/ep/iptip/audit/AuditService.java

@@ -0,0 +1,13 @@
+package ru.espada.ep.iptip.audit;
+
+import ru.espada.ep.iptip.audit.entity.AuditEntity;
+
+import java.util.List;
+
+public interface AuditService {
+    void logSave(Auditable entity);
+
+    void logDelete(Auditable auditableEntity, String username);
+
+    List<AuditEntity> getAudits(int page);
+}

MainService/src/main/java/ru/espada/ep/iptip/audit/AuditServiceImpl.java

@@ -0,0 +1,97 @@
+package ru.espada.ep.iptip.audit;
+
+import jakarta.persistence.Table;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import ru.espada.ep.iptip.audit.entity.AuditEntity;
+import ru.espada.ep.iptip.audit.entity.AuditRepository;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
+@Service
+public class AuditServiceImpl implements AuditService {
+
+    private AuditRepository auditRepository;
+    @Value("${audit.page-size:10}")
+    private int pageSize;
+
+    @Override
+    @Async
+    public void logSave(Auditable auditableEntity) {
+        Table table = auditableEntity.getClass().getAnnotation(Table.class);
+
+        try {
+            Field idField = auditableEntity.getClass().getDeclaredField("id");
+            idField.setAccessible(true);
+            Object id = null;
+            try {
+                id = idField.get(auditableEntity);
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }
+
+            String operation = "UPDATE";
+            if (!auditRepository.existsByEntityId((Long) id)) {
+                operation = "CREATE";
+            }
+
+            AuditEntity auditEntity = AuditEntity.builder()
+                    .entityId((Long) id)
+                    .inTable(table.name())
+                    .event(operation)
+                    .who(auditableEntity.getModifiedBy())
+                    .time(auditableEntity.getModifiedAt())
+                    .build();
+
+            auditRepository.save(auditEntity);
+        } catch (NoSuchFieldException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    @Async
+    public void logDelete(Auditable auditableEntity, String username) {
+        Table table = auditableEntity.getClass().getAnnotation(Table.class);
+        try {
+            Field idField = auditableEntity.getClass().getDeclaredField("id");
+            idField.setAccessible(true);
+            Object id = null;
+            try {
+                id = idField.get(auditableEntity);
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }
+
+            String operation = "DELETE";
+
+            AuditEntity auditEntity = AuditEntity.builder()
+                    .entityId((Long) id)
+                    .inTable(table.name())
+                    .event(operation)
+                    .who(auditableEntity.getModifiedBy())
+                    .time(auditableEntity.getModifiedAt())
+                    .build();
+
+            auditRepository.save(auditEntity);
+        } catch (NoSuchFieldException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public List<AuditEntity> getAudits(int page) {
+        Pageable pageable = PageRequest.of(page, pageSize);
+        return auditRepository.findAll(pageable).toList();
+    }
+
+    @Autowired
+    public void setAuditRepository(AuditRepository auditRepository) {
+        this.auditRepository = auditRepository;
+    }
+}

MainService/src/main/java/ru/espada/ep/iptip/audit/entity/AuditEntity.java

@@ -0,0 +1,31 @@
+package ru.espada.ep.iptip.audit.entity;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import ru.espada.ep.iptip.user.permission.annotation.Permission;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Entity
+@Table(name = "t_audit")
+@Permission(children = {}, value = "audit", isStart = true)
+public class AuditEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private String inTable;
+    private Long entityId;
+    private String event;
+    private String who;
+    private Date time;
+
+}

MainService/src/main/java/ru/espada/ep/iptip/audit/entity/AuditRepository.java

@@ -0,0 +1,9 @@
+package ru.espada.ep.iptip.audit.entity;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface AuditRepository extends JpaRepository<AuditEntity, Long> {
+    boolean existsByEntityId(Long id);
+}

MainService/src/main/java/ru/espada/ep/iptip/s3/S3Config.java → MainService/src/main/java/ru/espada/ep/iptip/config/S3Config.java

@@ -1,4 +1,4 @@
-package ru.espada.ep.iptip.s3;
+package ru.espada.ep.iptip.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;