update code to publish event

Signed-off-by: Ritik Jain (IN74108) <[email protected]>

authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/idevent/IdChangeEventHandlerServiceImpl.java

@@ -1,16 +1,20 @@
 package io.mosip.authentication.common.service.impl.idevent;
 
+import static io.mosip.authentication.core.constant.IdAuthConfigKeyConstants.REMOVE_ID_STATUS_TOPIC;
+
 import java.time.LocalDateTime;
 import java.util.Map;
 import java.util.Optional;
 
 import javax.transaction.Transactional;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import io.mosip.authentication.common.service.entity.IdentityEntity;
 import io.mosip.authentication.common.service.helper.AuditHelper;
+import io.mosip.authentication.common.service.helper.WebSubHelper;
 import io.mosip.authentication.common.service.repository.IdentityCacheRepository;
 import io.mosip.authentication.common.service.spi.idevent.CredentialStoreService;
 import io.mosip.authentication.core.constant.AuditEvents;
@@ -75,6 +79,14 @@ static interface ConsumerWithBusinessException<T,R> {
 
 	@Autowired
 	private CredentialStoreService credStorService;
+
+	/** The web sub event publish helper. */
+	@Autowired
+	private WebSubHelper webSubHelper;
+
+	/** The remove id status topic. */
+	@Value("${" + REMOVE_ID_STATUS_TOPIC + "}")
+	private String removeIdStatusTopic;
 
 	/* (non-Javadoc)
 	 * @see io.mosip.authentication.core.spi.idevent.service.IdChangeEventHandlerService#handleIdEvent(java.util.List)
@@ -183,11 +195,19 @@ private void handleRemoveId(EventModel eventModel) throws IdAuthenticationBusine
 		Event event = eventModel.getEvent();
 		Map<String, Object> additionalData = event.getData();
 		String idHash = (String) additionalData.get(ID_HASH);
-		Optional<IdentityEntity> identityEntityOpt = identityCacheRepo.findById(idHash);
-		if(identityEntityOpt.isPresent()) {
-			identityCacheRepo.delete(identityEntityOpt.get());
+		if (idHash != null && !idHash.isEmpty()) {
+			identityCacheRepo.deleteById(idHash);
+			publishRemoveIdStatusEvent(idHash);
 		}
 	}
+
+	public void publishRemoveIdStatusEvent(String idHash) {
+		RemoveIdStatusEvent removeIdStatusEvent = new RemoveIdStatusEvent();
+		removeIdStatusEvent.setData(Map.of(ID_HASH, idHash));
+		removeIdStatusEvent.setTimestamp(DateUtils.formatToISOString(DateUtils.getUTCCurrentDateTime()));
+		webSubHelper.publishEvent(removeIdStatusTopic,
+				webSubHelper.createEventModel(removeIdStatusTopic, removeIdStatusEvent));
+	}
 
 	private void handleDeactivateId(EventModel eventModel) throws IdAuthenticationBusinessException {
 		updateIdentityMetadata(eventModel);

authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/idevent/RemoveIdStatusEvent.java

@@ -0,0 +1,25 @@
+package io.mosip.authentication.common.service.impl.idevent;
+
+import java.util.Map;
+
+import io.mosip.authentication.common.service.websub.dto.EventInterface;
+import lombok.Data;
+
+/**
+ * Instantiates a new remove id status event.
+ * 
+ * @author Ritik Jain
+ */
+@Data
+public class RemoveIdStatusEvent implements EventInterface {
+
+	/** The id. */
+	private String id;
+
+	/** The timestamp. */
+	private String timestamp;
+
+	/** The data. */
+	private Map<String, Object> data;
+
+}

authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/IdAuthConfigKeyConstants.java

@@ -135,6 +135,7 @@ private IdAuthConfigKeyConstants() {
 	public static final String AUTH_ANONYMOUS_PROFILE_TOPIC = "ida-topic-auth-anonymous-profile";
 	public static final String AUTH_FRAUD_ANALYSIS_TOPIC = "ida-topic-fraud-analysis";
 	public static final String AUTHENTICATION_ERROR_EVENTING_TOPIC = "ida-topic-authentication-error-eventing";
+	public static final String REMOVE_ID_STATUS_TOPIC = "ida-topic-remove-id-status";
 
 
 	public static final String IDA_MAX_CREDENTIAL_PULL_WINDOW_DAYS = "ida-max-credential-pull-window-days";