Revert "MOSIP-44198"

kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/builder/AuditRequestBuilder.java

@@ -2,22 +2,19 @@
 
 import java.time.LocalDateTime;
 
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
 
 import io.mosip.kernel.auditmanager.request.AuditRequestDto;
 
 /**
  * The Audit request builder class is used to create new {@link AuditRequestDto}
  * with all required fields
- *
+ * 
  * @author Dharmesh Khandelwal
  * @since 1.0.0
  *
  */
 @Service
-@Scope(BeanDefinition.SCOPE_PROTOTYPE)
 public class AuditRequestBuilder {
 
 	/**

kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/entity/BaseAudit.java

@@ -8,7 +8,6 @@
 import jakarta.persistence.MappedSuperclass;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import org.springframework.data.domain.Persistable;
 
 /**
  * Base class for {@link Audit} with {@link #uuid} and {@link #createdAt}
@@ -20,7 +19,7 @@
 @Data
 @AllArgsConstructor
 @MappedSuperclass
-public class BaseAudit implements Persistable<String> {
+public class BaseAudit {
 
 	/**
 	 * Field for immutable universally unique identifier (UUID)
@@ -40,14 +39,4 @@ public BaseAudit() {
 		createdAt = LocalDateTime.now();
 	}
 
-	@Override
-	public String getId() {
-		return uuid;
-	}
-
-	@Override
-	public boolean isNew() {
-		return true;
-	}
-
 }

kernel/kernel-auditmanager-api/src/main/java/io/mosip/kernel/auditmanager/impl/AuditHandlerImpl.java

@@ -1,13 +1,16 @@
 package io.mosip.kernel.auditmanager.impl;
 
+import io.mosip.kernel.core.logger.spi.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
 import io.mosip.kernel.auditmanager.entity.Audit;
-import io.mosip.kernel.auditmanager.queue.AuditQueueService;
+import io.mosip.kernel.auditmanager.repository.AuditRepository;
 import io.mosip.kernel.auditmanager.request.AuditRequestDto;
 import io.mosip.kernel.auditmanager.util.AuditUtils;
 import io.mosip.kernel.core.auditmanager.spi.AuditHandler;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Implementation of {@link AuditHandler} with function to write
@@ -20,20 +23,31 @@
 @Service
 public class AuditHandlerImpl implements AuditHandler<AuditRequestDto> {
 
+	/**
+	 * Field for {@link AuditRepository} having data access operations related to
+	 * audit
+	 */
 	@Autowired
-	private AuditQueueService auditQueueService;
+	private AuditRepository auditRepository;
 
 	/*
 	 * (non-Javadoc)
-	 *
+	 * 
 	 * @see
 	 * io.mosip.kernel.core.audit.handler.AuditHandler#writeAudit(io.mosip.kernel.
 	 * core.audit.dto.AuditRequest)
 	 */
 	@Override
+	@Transactional
 	public boolean addAudit(AuditRequestDto auditRequest) {
-		AuditUtils.validateAuditRequestDto(auditRequest);
-		return auditQueueService.enqueue(auditRequest);
+		try {
+			AuditUtils.validateAuditRequestDto(auditRequest);
+			Audit event = getAuditEntity(auditRequest);
+			auditRepository.save(event);
+			return true;
+		} catch (DataAccessException ex) {
+			return false;
+		}
 	}
 
 

kernel/kernel-auditmanager-service/src/main/java/io/mosip/kernel/auditmanager/AuditManagerBootApplication.java

@@ -2,7 +2,6 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * Audit manager application
@@ -13,7 +12,6 @@
  */
 @SpringBootApplication(scanBasePackages = { "io.mosip.kernel.auditmanager.*","${mosip.auth.adapter.impl.basepackage}"
 		,"io.mosip.kernel.core.logger.config"})
-@EnableScheduling
 public class AuditManagerBootApplication {
 
 	/**

kernel/kernel-auditmanager-service/src/main/java/io/mosip/kernel/auditmanager/service/impl/AuditManagerServiceImpl.java

@@ -35,8 +35,8 @@ public class AuditManagerServiceImpl implements AuditManagerService {
 	@Override
 	public AuditResponseDto addAudit(AuditRequestDto auditRequestDto) {
 		AuditResponseDto auditResponseDto = new AuditResponseDto();
-		boolean status = auditHandler.addAudit(auditRequestDto);
-		auditResponseDto.setStatus(status);
+		auditHandler.addAudit(auditRequestDto);
+		auditResponseDto.setStatus(true);
 		return auditResponseDto;
 	}