Microsoft: Càrrega inicial des de les sincronitzacions existents (#26)

asicudl · Aug 30, 2024 · e5d281f · e5d281f
1 parent 3329d4c
commit e5d281f
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/...pl/src/main/java/org/sakaiproject/microsoft/impl/MicrosoftSynchronizationServiceImpl.java b/...pl/src/main/java/org/sakaiproject/microsoft/impl/MicrosoftSynchronizationServiceImpl.java
@@ -224,9 +224,21 @@ public List<SiteSynchronization> getLinkedSiteSynchronizations(boolean fillSite)
 
 	@Override
 	public List<SiteSynchronization> getFilteredSiteSynchronizations(boolean fillSite, SakaiSiteFilter filter, ZonedDateTime fromDate, ZonedDateTime toDate) {
+		List<SiteSynchronization> result = microsoftSiteSynchronizationRepository.findByDate(fromDate, toDate);
+
+		if(filter.getSiteProperty().isEmpty()){
+			return result.stream().map(ss -> {
+						if (fillSite) {
+							ss.setSite(sakaiProxy.getSite(ss.getSiteId()));
+						}
+						return ss;
+					})
+					.collect(Collectors.toList());
+		}
+
 		final List<Site> sites = sakaiProxy.getSakaiSites(filter);
 
-		List<SiteSynchronization> result = microsoftSiteSynchronizationRepository.findByDate(fromDate, toDate).stream().map(ss -> {
+		return result.stream().map(ss -> {
 					Site site = null;
 					if (fillSite) {
 						site = sites.stream().filter(s -> s.getId().equals(ss.getSiteId())).findFirst().orElse(null);
@@ -237,7 +249,6 @@ public List<SiteSynchronization> getFilteredSiteSynchronizations(boolean fillSit
 				})
 				.filter(Objects::nonNull)
 				.collect(Collectors.toList());
-		return result;
 	}
 
 	@Override