Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update transfer ownership to handle when the metadata workflow is enabled the approved version of the metadata with a working copy #6144

Merged
merged 1 commit into from
Feb 2, 2022
Merged

Update transfer ownership to handle when the metadata workflow is enabled the approved version of the metadata with a working copy #6144

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
132 changes: 73 additions & 59 deletions services/src/main/java/org/fao/geonet/api/records/MetadataSharingApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import org.fao.geonet.kernel.setting.SettingManager;
import org.fao.geonet.kernel.setting.Settings;
import org.fao.geonet.repository.*;
import org.fao.geonet.repository.specification.MetadataSpecs;
import org.fao.geonet.repository.specification.MetadataValidationSpecs;
import org.fao.geonet.repository.specification.UserGroupSpecs;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -743,8 +744,8 @@ MetadataProcessingReport setGroupAndOwner(
List<String> listOfUpdatedRecords = new ArrayList<>();
for (String uuid : records) {
updateOwnership(groupIdentifier, userIdentifier,
report, dataManager, accessManager, metadataRepository,
serviceContext, listOfUpdatedRecords, uuid, session, approved);
report, dataManager, accessManager,
serviceContext, listOfUpdatedRecords, uuid, session);
}
dataManager.flush();
dataManager.indexMetadata(listOfUpdatedRecords);
Expand Down Expand Up @@ -808,13 +809,11 @@ MetadataProcessingReport setRecordOwnership(
try {
report.setTotalRecords(1);

final ApplicationContext context = ApplicationContextHolder.get();

ServiceContext serviceContext = ApiUtils.createServiceContext(request);
List<String> listOfUpdatedRecords = new ArrayList<>();
updateOwnership(groupIdentifier, userIdentifier,
report, dataManager, accessManager, metadataRepository,
serviceContext, listOfUpdatedRecords, metadataUuid, session, approved);
report, dataManager, accessManager,
serviceContext, listOfUpdatedRecords, metadataUuid, session);
dataManager.flush();
dataManager.indexMetadata(String.valueOf(metadata.getId()), true);

Expand All @@ -831,74 +830,89 @@ private void updateOwnership(Integer groupIdentifier,
MetadataProcessingReport report,
DataManager dataManager,
AccessManager accessMan,
MetadataRepository metadataRepository,
ServiceContext serviceContext,
List<String> listOfUpdatedRecords, String uuid,
HttpSession session, Boolean approved) throws Exception {
HttpSession session) throws Exception {
AbstractMetadata metadata = metadataUtils.findOneByUuid(uuid);
if (metadata == null) {
report.incrementNullRecords();
} else if (!accessMan.canEdit(
serviceContext, String.valueOf(metadata.getId()))) {
report.addNotEditableMetadataId(metadata.getId());
} else {
//-- Get existing owner and privileges for that owner - note that
//-- owners don't actually have explicit permissions - only their
//-- group does which is why we have an ownerGroup (parameter groupid)
Integer sourceUsr = metadata.getSourceInfo().getOwner();
Integer sourceGrp = metadata.getSourceInfo().getGroupOwner();
Vector<OperationAllowedId> sourcePriv =
retrievePrivileges(serviceContext, String.valueOf(metadata.getId()), sourceUsr, sourceGrp);

// -- Set new privileges for new owner from privileges of the old
// -- owner, if none then set defaults
if (sourcePriv.size() == 0) {
dataManager.copyDefaultPrivForGroup(
serviceContext,
String.valueOf(metadata.getId()),
String.valueOf(groupIdentifier),
false);
report.addMetadataInfos(metadata, String.format(
"No privileges for user '%s' on metadata '%s', so setting default privileges",
sourceUsr, metadata.getUuid()
));
} else {
for (OperationAllowedId priv : sourcePriv) {
if (sourceGrp != null) {
dataManager.unsetOperation(serviceContext,
// Retrieve the identifiers associated with the metadata uuid.
// When the workflow is enabled, the metadata can have an approved and a working copy version.
List<Integer> idList = metadataUtils.findAllIdsBy(MetadataSpecs.hasMetadataUuid(uuid));

// Increase the total records counter when processing a metadata with approved and working copies
// as the initial counter doesn't take in account this case
if (idList.size() > 1) {
report.setTotalRecords(report.getNumberOfRecords() + 1);
}

for(Integer mdId : idList) {
if (mdId != metadata.getId()) {
metadata = metadataUtils.findOne(mdId);
}

//-- Get existing owner and privileges for that owner - note that
//-- owners don't actually have explicit permissions - only their
//-- group does which is why we have an ownerGroup (parameter groupid)
Integer sourceUsr = metadata.getSourceInfo().getOwner();
Integer sourceGrp = metadata.getSourceInfo().getGroupOwner();
Vector<OperationAllowedId> sourcePriv =
retrievePrivileges(serviceContext, String.valueOf(metadata.getId()), sourceUsr, sourceGrp);

// -- Set new privileges for new owner from privileges of the old
// -- owner, if none then set defaults
if (sourcePriv.size() == 0) {
dataManager.copyDefaultPrivForGroup(
serviceContext,
String.valueOf(metadata.getId()),
String.valueOf(groupIdentifier),
false);
report.addMetadataInfos(metadata, String.format(
"No privileges for user '%s' on metadata '%s', so setting default privileges",
sourceUsr, metadata.getUuid()
));
} else {
for (OperationAllowedId priv : sourcePriv) {
if (sourceGrp != null) {
dataManager.unsetOperation(serviceContext,
metadata.getId(),
sourceGrp,
priv.getOperationId());
}
dataManager.setOperation(serviceContext,
metadata.getId(),
sourceGrp,
groupIdentifier,
priv.getOperationId());
}
dataManager.setOperation(serviceContext,
metadata.getId(),
groupIdentifier,
priv.getOperationId());
}
}

Long metadataId = Long.parseLong(ApiUtils.getInternalId(uuid, approved));
ApplicationContext context = ApplicationContextHolder.get();
if (!Objects.equals(groupIdentifier, sourceGrp)) {
Group newGroup = groupRepository.findById(groupIdentifier).get();
Group oldGroup = sourceGrp == null ? null : groupRepository.findById(sourceGrp).get();
new RecordGroupOwnerChangeEvent(metadataId,
ApiUtils.getUserSession(session).getUserIdAsInt(),
sourceGrp == null ? null : ObjectJSONUtils.convertObjectInJsonObject(oldGroup, RecordGroupOwnerChangeEvent.FIELD),
ObjectJSONUtils.convertObjectInJsonObject(newGroup, RecordGroupOwnerChangeEvent.FIELD)).publish(context);
}
if (!Objects.equals(userIdentifier, sourceUsr)) {
User newOwner = userRepository.findById(userIdentifier).get();
User oldOwner = userRepository.findById(sourceUsr).get();
new RecordOwnerChangeEvent(metadataId, ApiUtils.getUserSession(session).getUserIdAsInt(), ObjectJSONUtils.convertObjectInJsonObject(oldOwner, RecordOwnerChangeEvent.FIELD), ObjectJSONUtils.convertObjectInJsonObject(newOwner, RecordOwnerChangeEvent.FIELD)).publish(context);
Long metadataId = Long.valueOf(metadata.getId());
ApplicationContext context = ApplicationContextHolder.get();
if (!Objects.equals(groupIdentifier, sourceGrp)) {
Group newGroup = groupRepository.findById(groupIdentifier).get();
Group oldGroup = sourceGrp == null ? null : groupRepository.findById(sourceGrp).get();
new RecordGroupOwnerChangeEvent(metadataId,
ApiUtils.getUserSession(session).getUserIdAsInt(),
sourceGrp == null ? null : ObjectJSONUtils.convertObjectInJsonObject(oldGroup, RecordGroupOwnerChangeEvent.FIELD),
ObjectJSONUtils.convertObjectInJsonObject(newGroup, RecordGroupOwnerChangeEvent.FIELD)).publish(context);
}
if (!Objects.equals(userIdentifier, sourceUsr)) {
User newOwner = userRepository.findById(userIdentifier).get();
User oldOwner = userRepository.findById(sourceUsr).get();
new RecordOwnerChangeEvent(metadataId, ApiUtils.getUserSession(session).getUserIdAsInt(), ObjectJSONUtils.convertObjectInJsonObject(oldOwner, RecordOwnerChangeEvent.FIELD), ObjectJSONUtils.convertObjectInJsonObject(newOwner, RecordOwnerChangeEvent.FIELD)).publish(context);
}
// -- set the new owner into the metadata record
dataManager.updateMetadataOwner(metadata.getId(),
String.valueOf(userIdentifier),
String.valueOf(groupIdentifier));
report.addMetadataId(metadata.getId());
report.incrementProcessedRecords();
listOfUpdatedRecords.add(metadata.getId() + "");
}
// -- set the new owner into the metadata record
dataManager.updateMetadataOwner(metadata.getId(),
String.valueOf(userIdentifier),
String.valueOf(groupIdentifier));
report.addMetadataId(metadata.getId());
report.incrementProcessedRecords();
listOfUpdatedRecords.add(metadata.getId() + "");
}
}

Expand Down