Fixed AD auditor is not capturing all user creation events (#659) (#697)

Author: mjabascal10

user-auditor/src/main/java/com/utmstack/userauditor/model/SourceScan.java

@@ -20,7 +20,7 @@ public class SourceScan extends Base implements Auditable {
     @Column(name = "next_execution_date")
     private LocalDateTime executionDate;
 
-    @OneToOne
+    @ManyToOne
     @JoinColumn(name = "user_sources_id")
     @JsonIgnore
     UserSource source;

user-auditor/src/main/java/com/utmstack/userauditor/model/UserSource.java

@@ -22,8 +22,8 @@ public class UserSource extends Base {
     @Column(name = "index_name")
     private String indexName;
 
-    @OneToOne(mappedBy = "source", cascade = CascadeType.ALL)
-    SourceScan source;
+    @OneToMany(mappedBy = "source", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+    List<SourceScan> sources;
 
     @OneToMany(mappedBy = "source", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     List<SourceFilter> filters;

user-auditor/src/main/java/com/utmstack/userauditor/repository/SourceScanRepository.java

@@ -2,6 +2,8 @@
 
 import com.utmstack.userauditor.model.SourceScan;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.Optional;
@@ -12,5 +14,7 @@
 
 @Repository
 public interface SourceScanRepository extends JpaRepository<SourceScan, Long> {
-    Optional<SourceScan> findBySource_Id(Long id);
+
+    @Query("SELECT ss FROM SourceScan ss WHERE ss.source.id = :sourceId ORDER BY ss.executionDate DESC")
+    Optional<SourceScan> findLatestBySourceId(@Param("sourceId") Long sourceId);
 }

user-auditor/src/main/java/com/utmstack/userauditor/service/Impl/WindowsSource.java

@@ -77,7 +77,9 @@ public SourceType getType() {
     @Override
     public Map<String, List<EventLog>> findUsers(UserSource userSource) throws Exception {
 
-        SourceScan scan = sourceScanRepository.findBySource_Id(userSource.getId())
+        this.userEvents = new HashMap<>();
+
+        SourceScan scan = sourceScanRepository.findLatestBySourceId(userSource.getId())
                 .orElse(SourceScan.builder()
                                 .source(userSource)
                                 .executionDate(LocalDateTime.of(LocalDate.of(startYear, 1, 1), LocalTime.now()))

user-auditor/src/main/resources/db/changelog/changes/003-2024-05-29-clean-source-scans.sql

@@ -0,0 +1,2 @@
+delete from utm_source_scan;
+

user-auditor/src/main/resources/db/changelog/db.changelog-master.yaml

@@ -2,4 +2,6 @@ databaseChangeLog:
   - include:
       file: classpath:/db/changelog/changes/001-initial-schema.sql
   - include:
-      file: classpath:/db/changelog/changes/002-2024-01-09-change-next-execution-date.sql
+      file: classpath:/db/changelog/changes/002-2024-01-09-change-next-execution-date.sql
+  - include:
+      file: classpath:/db/changelog/changes/003-2024-05-29-clean-source-scans.sql