Skip to content

Improved Featured item efficiency during publication #11658

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

Merged
ofahimIQSS merged 5 commits into from
Sep 4, 2025
Merged

Improved Featured item efficiency during publication #11658

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf1e8fc
make more efficient
qqmyers Jul 18, 2025
610ff07
removed unnecessary continue
qqmyers Jul 18, 2025
bcb2845
Merge remote-tracking branch 'IQSS/develop' into FeaturedItem_efficiency
qqmyers Jul 18, 2025
d0a670b
Merge remote-tracking branch 'IQSS/develop' into FeaturedItem_efficiency
qqmyers Aug 27, 2025
86ae20d
missing ! - also check file in dataset as in existing code
qqmyers Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions ...in/java/edu/harvard/iq/dataverse/dataverse/featured/DataverseFeaturedItemServiceBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Logger;

Expand Down Expand Up @@ -70,16 +69,15 @@ public void deleteAllByDvObjectId(Long id) {
public void deleteInvalidatedFeaturedItemsByDataset(Dataset dataset) {
// Delete any Featured Items that contain Datafiles that were removed or restricted in the latest published version
List<DataverseFeaturedItem> featuredItems = findAllByDataverseOrdered(dataset.getOwner());
DatasetVersion latestVersion = dataset.getLatestVersion();

for (DataverseFeaturedItem featuredItem : featuredItems) {
if (featuredItem.getDvObject() != null && featuredItem.getType().equalsIgnoreCase(DataverseFeaturedItem.TYPES.DATAFILE.name())) {
DataFile df = (DataFile) featuredItem.getDvObject();
List<Long> latestVersionFileIds = new ArrayList<>();
dataset.getLatestVersion().getFileMetadatas().stream()
.map(FileMetadata::getId)
.forEachOrdered(latestVersionFileIds::add);
// If the datafile is restricted or part of this dataset but not in the latest version we need to delete the featured item
if (df.isRestricted() || (dataset.getFiles().contains(df) && !latestVersionFileIds.contains(df.getId()))) {
logger.fine("Deleting invalidated Featured Item for " + (df.isRestricted() ? "Restricted" : "Deleted") + "Datafile ID: " + df.getId());

// Check if the file is restricted or deleted
if (df.isRestricted() || (dataset.equals(df.getOwner()) && !df.isInDatasetVersion(latestVersion))) {
logger.fine("Deleting invalidated Featured Item for " + (df.isRestricted() ? "Restricted" : "Deleted") + " Datafile ID: " + df.getId());
deleteAllByDvObjectId(df.getId());
}
}
Expand Down