From 6ecf9c6c861c7a3be33b71b89ac4b7d178b59d97 Mon Sep 17 00:00:00 2001
From: Prakhar Dev Singh <prakhardevsingh4@gmail.com>
Date: Tue, 30 Jan 2024 19:00:37 +0530
Subject: [PATCH] fix: :bug: datatable recipient (#120)

* refactor: :recycle: added contributor as a recipient

* fix: :bug: incorrect text for uploader and contributor

* refactor: :recycle: changed userId to authorId

* feat: :recycle: added uploader as a follower

* refactor: :recycle: fixed sonar issues

* refactor: :recycle: check duplication issue directly on staging

* refactor: :recycle: removed redundant code
---
 .../activity/service/impl/ActivityServiceImpl.java     | 10 +++++++---
 .../activity/service/impl/MailServiceImpl.java         |  4 ++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/strandls/activity/service/impl/ActivityServiceImpl.java b/src/main/java/com/strandls/activity/service/impl/ActivityServiceImpl.java
index e7a1591..5dd5a62 100644
--- a/src/main/java/com/strandls/activity/service/impl/ActivityServiceImpl.java
+++ b/src/main/java/com/strandls/activity/service/impl/ActivityServiceImpl.java
@@ -1072,9 +1072,9 @@ public Activity logDatatableActivities(HttpServletRequest request, Long userId,
 
 			if (dataTableNullActivityList.contains(loggingData.getActivityType())) {
 				activity = new Activity(null, loggingData.getActivityDescription(), null, null,
-						loggingData.getActivityType(), userId, new Date(), new Date(), loggingData.getRootObjectId(),
-						ActivityEnums.DATATABLE.getValue(), loggingData.getSubRootObjectId(),
-						ActivityEnums.DATATABLE.getValue(), true);
+						loggingData.getActivityType(), loggingData.getMailData().getDataTableMailData().getAuthorId(),
+						new Date(), new Date(), loggingData.getRootObjectId(), ActivityEnums.DATATABLE.getValue(),
+						loggingData.getSubRootObjectId(), ActivityEnums.DATATABLE.getValue(), true);
 			} else if (dataTableUserGroupActivityList.contains(loggingData.getActivityType())) {
 				activity = new Activity(null, loggingData.getActivityDescription(), loggingData.getActivityId(),
 						ActivityEnums.USERGROUP.getValue(), loggingData.getActivityType(), userId, new Date(),
@@ -1096,6 +1096,10 @@ public Activity logDatatableActivities(HttpServletRequest request, Long userId,
 				activity = activityDao.save(activity);
 
 			if (activity != null && loggingData.getMailData() != null) {
+
+				userService = headers.addUserHeader(userService, request.getHeader(HttpHeaders.AUTHORIZATION));
+				userService.updateFollow("content.eml.Datatable", loggingData.getRootObjectId().toString());
+
 				String mailType = dataTableUserGroupActivityList.contains(loggingData.getActivityType())
 						? activity.getActivityType() + " Datatable"
 						: activity.getActivityType();
diff --git a/src/main/java/com/strandls/activity/service/impl/MailServiceImpl.java b/src/main/java/com/strandls/activity/service/impl/MailServiceImpl.java
index 424b677..7954ec2 100644
--- a/src/main/java/com/strandls/activity/service/impl/MailServiceImpl.java
+++ b/src/main/java/com/strandls/activity/service/impl/MailServiceImpl.java
@@ -67,6 +67,9 @@ public class MailServiceImpl implements MailService {
 	List<String> userGroupActivityList = new ArrayList<String>(
 			Arrays.asList("Posted resource", "Removed resoruce", "Featured", "UnFeatured"));
 
+	List<String> dataTableUserGroupActivityList = new ArrayList<>(
+			Arrays.asList("Posted resource", "Removed resoruce", "Featured", "UnFeatured"));
+
 	public MailServiceImpl() {
 		Properties props = PropertyFileUtil.fetchProperty("config.properties");
 		siteName = props.getProperty("siteName");
@@ -158,6 +161,7 @@ public void sendMail(MAIL_TYPE type, String objectType, Long objectId, Long user
 				}
 				if (userGroupActivityList.contains(activity.getActivityType())) {
 					userGroup = mapper.readValue(activity.getActivityDescription(), UserGroupActivity.class);
+
 				}
 
 				Map<String, Object> data = null;