Skip to content

Commit

Permalink
Datatable mail recipient (#24)
Browse files Browse the repository at this point in the history
* refactor: ♻️ added datatable contributor

* refactor: ♻️ add contributor as author and follower

* refactor: ♻️ changed userId to contributorid

* refactor: ♻️ preserve original flow of mail generating function

* refactor: ♻️ removed unused variables
  • Loading branch information
prakhar-s authored Jan 30, 2024
1 parent b0a403b commit 9812de8
Showing 1 changed file with 18 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.strandls.dataTable.pojo.DataTableWkt;
import com.strandls.dataTable.service.DataTableService;
import com.strandls.dataTable.util.LogActivities;
import com.strandls.dataTable.util.TokenGenerator;
import com.strandls.user.controller.UserServiceApi;
import com.strandls.user.pojo.UserIbp;
import com.strandls.userGroup.controller.UserGroupSerivceApi;
Expand Down Expand Up @@ -189,14 +190,25 @@ public DataTableWkt createDataTable(HttpServletRequest request, BulkDTO bulkDto)
if (bulkDto == null) {
return null;
}
CommonProfile profile = AuthUtil.getProfileFromRequest(request);
Long userId = Long.parseLong(profile.getId());
DataTable dataTable = dataTableHelper.createDataTable(bulkDto, userId);
Long contributor = bulkDto.getContributors();
DataTable dataTable = dataTableHelper.createDataTable(bulkDto, contributor);
dataTable = dataTableDao.save(dataTable);
List<UserGroupIbp> userGroup = userGroupService.getDataTableUserGroup(dataTable.getId().toString());

TokenGenerator tokenGenerator = new TokenGenerator();

String jwtString = tokenGenerator
.generate(userService.getUser(dataTable.getPartyContributorId().toString()));

userService = headers.addUserHeaders(userService, jwtString);
userService.updateFollow("content.eml.Datatable", dataTable.getId().toString());

MailData mailData = generateMailData(request, dataTable.getId());
DataTableMailData datatableMailData = mailData.getDataTableMailData();
datatableMailData.setAuthorId(contributor);

logActivities.LogActivity(request.getHeader(HttpHeaders.AUTHORIZATION), null, dataTable.getId(),
dataTable.getId(), "datatable", null, "Datatable created",
generateMailData(request, dataTable.getId()));
dataTable.getId(), "datatable", null, "Datatable created", mailData);
return showDataTableMapper(dataTable, userGroup);
} catch (Exception e) {
logger.error(e.getMessage());
Expand Down Expand Up @@ -339,6 +351,7 @@ public List<UserGroupIbp> updateUserGroupDatatableMapping(HttpServletRequest req
userGroups.setTitle(dataTable.getTitle());
userGroups.setCreatedOn(dataTable.getCreatedOn());
userGroups.setLocation(dataTable.getGeographicalCoveragePlaceName());
userGroups.setContributor(dataTable.getPartyContributorId().toString());
userGroupService = headers.addUserGroupHeaders(userGroupService,
request.getHeader(HttpHeaders.AUTHORIZATION));
List<UserGroupIbp> result = userGroupService.updateDatatableUserGroupMapping(datatableId.toString(),
Expand Down

0 comments on commit 9812de8

Please sign in to comment.