Only push broadcasts to subscribers.

Author: adrianfish

kernel/api/src/main/java/org/sakaiproject/messaging/api/UserNotificationTransferBean.java

@@ -19,10 +19,6 @@
 
 import java.time.Instant;
 
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
-import lombok.Data;
-
 public class UserNotificationTransferBean {
 
     public String from;

kernel/kernel-impl/src/main/java/org/sakaiproject/messaging/impl/UserMessagingServiceImpl.java

@@ -16,20 +16,25 @@
 package org.sakaiproject.messaging.impl;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
+
 import nl.martijndwars.webpush.Notification;
 import nl.martijndwars.webpush.PushService;
 import nl.martijndwars.webpush.Subscription;
 import nl.martijndwars.webpush.Utils;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringEscapeUtils;
 import org.apache.http.HttpResponse;
+
 import org.bouncycastle.jce.ECNamedCurveTable;
 import org.bouncycastle.jce.interfaces.ECPrivateKey;
 import org.bouncycastle.jce.interfaces.ECPublicKey;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
+
 import org.sakaiproject.component.api.ServerConfigurationService;
 import org.sakaiproject.email.api.DigestService;
 import org.sakaiproject.email.api.EmailService;
@@ -66,8 +71,11 @@
 import org.sakaiproject.user.api.UserNotDefinedException;
 import org.sakaiproject.util.ResourceLoader;
 import org.sakaiproject.util.api.FormattedText;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionCallbackWithoutResult;
@@ -80,7 +88,6 @@
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 import java.security.Security;
-import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Base64;
@@ -580,31 +587,30 @@ private void pushToAllUsers(UserNotificationTransferBean bean) {
 
         executor.execute(() -> {
 
-            int pageSize = 100;
-            int first = 1;
-            int last = first + pageSize;
-            int total = userDirectoryService.countUsers();
-            int done = 0;
-
             UserNotificationTransferBean un = new UserNotificationTransferBean();
             un.from  = bean.from;
             un.event = bean.event;
             un.ref = bean.ref;
             un.title = bean.title;
 
-            while (done < total) {
+            int pageNumber = 0;
+            int pageSize = 1;
 
-                List<User> users = userDirectoryService.getUsers(first, last);
+            Map<String, String> done = new HashMap<>();
+            Page<PushSubscription> page = pushSubscriptionRepository.findAll(PageRequest.of(pageNumber, pageSize));
+            while (page.getTotalElements() > 0) {
+                page.getContent().forEach(ps -> {
 
-                users.forEach(u -> {
-
-                    un.to = u.getId();
-                    push(decorateNotification(un));
+                    String userId = ps.getUserId();
+                    if (!done.containsKey(userId)) {
+                        un.to = ps.getUserId();
+                        push(decorateNotification(un));
+                        done.put(userId, "");
+                    }
                 });
 
-                first = last + 1;
-                last = first + pageSize;
-                done += users.size();
+                pageNumber += 1;
+                page = pushSubscriptionRepository.findAll(PageRequest.of(pageNumber, pageSize));
             }
         });
     }