gCubeSystem
/
gcat
16
0
Fork 0
Code Issues Pull Requests Releases 13 Wiki Activity

Fixing addressee

This commit is contained in:
Luca Frosini 2022-10-20 14:41:35 +02:00
parent 0bf5d10ccd
commit f00dc325df
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java
View File

@ -1163,21 +1163,20 @@ public class CKANPackage extends CKAN implements Moderated {
return cmItemStatus; return cmItemStatus;
} }
protected void setItemAuthorToModerationThread() {
String itemAuthorCkanUsername = "";
JsonNode jsonNode = getExtraField(result, Moderated.SYSTEM_CM_ITEM_AUTHOR);
if(jsonNode!=null) {
itemAuthorCkanUsername = jsonNode.asText();
moderationThread.setItemAuthorCkanUsername(itemAuthorCkanUsername);
}
}
protected boolean isModerationEnabled() { protected boolean isModerationEnabled() {
boolean moderationEnabled = configuration.isModerationEnabled(); boolean moderationEnabled = configuration.isModerationEnabled();
if(moderationEnabled && moderationThread==null) { if(moderationEnabled && moderationThread==null) {
moderationThread = ModerationThread.getDefaultInstance(); moderationThread = ModerationThread.getDefaultInstance();
moderationThread.setCKANUser(ckanUser); moderationThread.setCKANUser(ckanUser);
if(result!=null) {
String itemAuthorCkanUsername = "";
JsonNode jsonNode = getExtraField(result, Moderated.SYSTEM_CM_ITEM_AUTHOR);
if(jsonNode!=null) {
itemAuthorCkanUsername = jsonNode.asText();
moderationThread.setItemAuthorCkanUsername(itemAuthorCkanUsername);
}
}
} }
return moderationEnabled; return moderationEnabled;
} }
@ -1487,6 +1486,7 @@ public class CKANPackage extends CKAN implements Moderated {
result = mapper.readTree(ret); result = mapper.readTree(ret);
parseResult(); parseResult();
setItemAuthorToModerationThread();
moderationThread.setItemCoordinates(itemID, name, itemTitle, itemURL); moderationThread.setItemCoordinates(itemID, name, itemTitle, itemURL);
moderationThread.postItemApproved(moderatorMessage); moderationThread.postItemApproved(moderatorMessage);
@ -1539,6 +1539,7 @@ public class CKANPackage extends CKAN implements Moderated {
result = mapper.readTree(ret); result = mapper.readTree(ret);
parseResult(); parseResult();
setItemAuthorToModerationThread();
moderationThread.setItemCoordinates(itemID, name, itemTitle, itemURL); moderationThread.setItemCoordinates(itemID, name, itemTitle, itemURL);
moderationThread.postItemRejected(moderatorMessage); moderationThread.postItemRejected(moderatorMessage);
break; break;
@ -1566,6 +1567,8 @@ public class CKANPackage extends CKAN implements Moderated {
readItem(); readItem();
isModerationEnabled();
// Catalogue Moderators are allowed to post message to the dedicated Stream // Catalogue Moderators are allowed to post message to the dedicated Stream
if(!ckanUser.isCatalogueModerator()) { if(!ckanUser.isCatalogueModerator()) {
// Users that are not // Users that are not
@ -1577,6 +1580,7 @@ public class CKANPackage extends CKAN implements Moderated {
} }
CMItemStatus cmItemStatus = getCMItemStatus(); CMItemStatus cmItemStatus = getCMItemStatus();
setItemAuthorToModerationThread();
moderationThread.setItemCoordinates(itemID, name, itemTitle, itemURL); moderationThread.setItemCoordinates(itemID, name, itemTitle, itemURL);
moderationThread.postUserMessage(cmItemStatus, message); moderationThread.postUserMessage(cmItemStatus, message);
return; return;