Merge pull request #13049 from SORMAS-Foundation/#13034-Add_view_arch…

…ived_userrights #13034 -Add TASK_VIEW_ARCHIVED user rights and the necessary changes
SORMAS-Foundation · May 27, 2024 · c6694ce · c6694ce
2 parents 86e6370 + c0d3186
commit c6694ce
Show file tree

Hide file tree

Showing 75 changed files with 1,640 additions and 269 deletions.
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/campaign/CampaignFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/campaign/CampaignFacade.java
@@ -14,6 +14,8 @@ public interface CampaignFacade extends CoreFacade<CampaignDto, CampaignIndexDto
 
 	CampaignReferenceDto getLastStartedCampaign();
 
+	CampaignDto getCampaignByUuid(String uuid);
+
 	List<CampaignDashboardElement> getCampaignDashboardElements(String campaignUuid);
 
 	List<String> getAllActiveUuids();

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactFacade.java
@@ -55,6 +55,8 @@ public interface ContactFacade extends CoreFacade<ContactDto, ContactIndexDto, C
 
 	List<String> getAllActiveUuids();
 
+	ContactDto getContactByUuid(String uuid);
+
 	void generateContactFollowUpTasks();
 
 	Long countContactsForMap(RegionReferenceDto regionRef, DistrictReferenceDto districtRef, Disease disease, Date from, Date to);

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/environment/EnvironmentFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/environment/EnvironmentFacade.java
@@ -11,4 +11,6 @@ public interface EnvironmentFacade extends CoreFacade<EnvironmentDto, Environmen
 
 	List<String> getAllActiveUuids();
 
+	EnvironmentDto getEnvironmentByUuid(String uuid);
+
 }
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/event/EventGroupFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/event/EventGroupFacade.java
@@ -67,7 +67,9 @@ Page<EventGroupIndexDto> getIndexPage(
 
 	void deleteEventGroup(String uuid);
 
-	void archiveOrDearchiveEventGroup(String uuid, boolean archive);
+	void archiveEventGroup(String uuid);
+
+	void dearchiveEventGroup(String uuid);
 
 	List<RegionReferenceDto> getEventGroupRelatedRegions(String uuid);
 

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/immunization/ImmunizationFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/immunization/ImmunizationFacade.java
@@ -31,6 +31,8 @@ public interface ImmunizationFacade extends CoreFacade<ImmunizationDto, Immuniza
 
 	List<String> getDeletedUuidsSince(Date since);
 
+	ImmunizationDto getImmunizationByUuid(String uuid);
+
 	List<ImmunizationDto> getSimilarImmunizations(ImmunizationSimilarityCriteria criteria);
 
 	void updateImmunizationStatuses();

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/task/TaskFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/task/TaskFacade.java
@@ -62,7 +62,7 @@ public interface TaskFacade extends PermanentlyDeletableFacade, ArchivableFacade
 
 	Map<String, Long> getPendingTaskCountPerUser(List<String> userUuids);
 
-	TaskDto getByUuid(String uuid);
+	TaskDto getTaskByUuid(String uuid);
 
 	List<String> getAllActiveUuids();
 

diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/travelentry/TravelEntryFacade.java b/sormas-api/src/main/java/de/symeda/sormas/api/travelentry/TravelEntryFacade.java
@@ -15,6 +15,8 @@ public interface TravelEntryFacade extends CoreFacade<TravelEntryDto, TravelEntr
 
 	List<DeaContentEntry> getDeaContentOfLastTravelEntry();
 
+	TravelEntryDto getTravelEntryByUuid(String uuid);
+
 	List<TravelEntryListEntryDto> getEntriesList(TravelEntryListCriteria criteria, Integer first, Integer max);
 
 	Page<TravelEntryIndexDto> getIndexPage(TravelEntryCriteria criteria, Integer first, Integer max, List<SortProperty> sortProperties);