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

fix: auto-repair default icons when there is a orphan file resource [DHIS2-18606] #19424

Merged
merged 1 commit into from
Dec 10, 2024
Merged

fix: auto-repair default icons when there is a orphan file resource [DHIS2-18606] #19424

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .../dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/icon/DefaultIconService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import java.util.EnumMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Matcher;
Expand Down Expand Up @@ -114,11 +115,13 @@ public String addDefaultIconImage(@Nonnull String key, @Nonnull DefaultIcon orig
try {
FileResource fr = FileResource.ofKey(ICON, key, MEDIA_TYPE_SVG);
fr.setUid(fileResourceId);
Optional<FileResource> existing = fileResourceService.findByStorageKey(fr.getStorageKey());
if (existing.isPresent()) fr = existing.get();
fr.setAssigned(true);
try (InputStream image = resource.getInputStream()) {
fileResourceService.syncSaveFileResource(fr, image);
}
return fileResourceId;
return fr.getUid();
} catch (IOException ex) {
ignoredAfterFailure.add(origin);
throw new ConflictException("Failed to create default icon resource: " + ex.getMessage());
Expand Down
Loading