Тест 1

src/main/java/im/rosetta/database/repository/PushTokenRepository.java

@@ -0,0 +1,59 @@
+package im.rosetta.database.repository;
+
+import java.util.List;
+
+import org.hibernate.Session;
+
+import im.rosetta.database.HibernateUtil;
+import im.rosetta.database.Repository;
+import im.rosetta.database.entity.Device;
+import im.rosetta.database.entity.PushToken;
+
+public class PushTokenRepository extends Repository<PushToken> {
+
+    public PushTokenRepository() {
+        super(PushToken.class);
+    }
+
+    /**
+     * Найти все токены для заданного публичного ключа
+     * @param publicKey публичный ключ пользователя
+     * @return список токенов для заданного публичного ключа
+     */
+    public List<PushToken> findTokens(String publicKey) {
+        try (Session session = HibernateUtil.getSessionFactory().openSession()) {
+            return session.createQuery("SELECT pt FROM PushToken pt JOIN pt.device d WHERE d.publicKey = :publicKey", PushToken.class)
+                    .setParameter("publicKey", publicKey)
+                    .getResultList();
+        }
+    }
+
+    /**
+     * Найти все токены для заданного списка публичных ключей
+     * @param publicKeys список публичных ключей пользователей
+     * @return список токенов для заданного списка публичных ключей
+     */
+    public List<PushToken> findTokens(List<String> publicKeys) {
+        try (Session session = HibernateUtil.getSessionFactory().openSession()) {
+            return session.createQuery("SELECT pt FROM PushToken pt JOIN pt.device d WHERE d.publicKey IN :publicKeys", PushToken.class)
+                    .setParameter("publicKeys", publicKeys)
+                    .getResultList();
+        }
+    }
+
+    /**
+     * Найти токен для заданного устройства и токена
+     * @param device устройство, которому принадлежит токен
+     * @param token токен, который нужно найти
+     * @return токен для заданного устройства и токена, или null, если такой токен не найден
+     */
+    public PushToken findToken(Device device, String token){
+        try (Session session = HibernateUtil.getSessionFactory().openSession()) {
+            return session.createQuery("SELECT pt FROM PushToken pt WHERE pt.device = :device AND pt.token = :token", PushToken.class)
+                    .setParameter("device", device)
+                    .setParameter("token", token)
+                    .uniqueResult();
+        }
+    }
+
+}

src/main/java/im/rosetta/executors/Executor16PushNotification.java

@@ -7,6 +7,7 @@ import im.rosetta.client.tags.ECIAuthentificate;
 import im.rosetta.database.entity.Device;
 import im.rosetta.database.entity.PushToken;
 import im.rosetta.database.repository.DeviceRepository;
+import im.rosetta.database.repository.PushTokenRepository;
 import im.rosetta.packet.Packet16PushNotification;
 import im.rosetta.packet.runtime.NetworkNotificationAction;
 import im.rosetta.service.services.DeviceService;
@@ -19,6 +20,7 @@ public class Executor16PushNotification extends PacketExecutor<Packet16PushNotif
 
     private final DeviceRepository deviceRepository = new DeviceRepository();
     private final DeviceService deviceService = new DeviceService(deviceRepository);
+    private final PushTokenRepository pushTokenRepository = new PushTokenRepository();
 
     @Override
     public void onPacketReceived(Packet16PushNotification packet, Client client) throws Exception, ProtocolException {
@@ -46,7 +48,7 @@ public class Executor16PushNotification extends PacketExecutor<Packet16PushNotif
             client.disconnect();
             return;
         }
-        PushToken pushToken = this.findToken(device, notificationToken);
+        PushToken pushToken = this.pushTokenRepository.findToken(device, notificationToken);
 
         if(packet.getAction() == NetworkNotificationAction.SUBSCRIBE && pushToken == null){
             /**
@@ -56,28 +58,16 @@ public class Executor16PushNotification extends PacketExecutor<Packet16PushNotif
             token.setToken(notificationToken);
             token.setDevice(device);
             token.setType(packet.getTokenType());
-            device.addToken(token);
+            this.pushTokenRepository.save(token);
-            this.deviceRepository.save(device);
         }
         if(packet.getAction() == NetworkNotificationAction.UNSUBSCRIBE && pushToken != null){
             /**
              * Отписка от токена только если токен уже подписан
              */
-            device.removeToken(pushToken);
+            this.pushTokenRepository.delete(pushToken);
-            this.deviceRepository.save(device);
         }
     }
 
-    private PushToken findToken(Device device, String token) {
-        List<PushToken> tokens = device.getTokens();
-        for(PushToken pushToken : tokens){
-            if(pushToken.getToken().equals(token)){
-                return pushToken;
-            }
-        }
-        return null;
-    }
-
     private Device findDevice(String publicKey, String deviceId) {
         List<Device> devices = this.deviceService.getDevicesByPK(publicKey);
         if(devices.size() == 0){

src/main/java/im/rosetta/service/dispatch/push/PushNotifyDispatcher.java

@@ -5,19 +5,16 @@ import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import im.rosetta.database.entity.Device;
 import im.rosetta.database.entity.PushToken;
-import im.rosetta.database.repository.DeviceRepository;
+import im.rosetta.database.repository.PushTokenRepository;
 import im.rosetta.packet.runtime.TokenType;
 import im.rosetta.service.dispatch.push.dispatchers.FCM;
 import im.rosetta.service.dispatch.push.dispatchers.VoIPApns;
-import im.rosetta.service.services.DeviceService;
 
 public class PushNotifyDispatcher {
 
-    private DeviceRepository deviceRepository = new DeviceRepository();
-    private DeviceService deviceService = new DeviceService(deviceRepository);
     private final ExecutorService executor = Executors.newFixedThreadPool(10);
+    private final PushTokenRepository pushTokenRepository = new PushTokenRepository();
 
     private final HashMap<TokenType, Pusher> pushers = new HashMap<>() {{
         put(TokenType.FCM, new FCM());
@@ -29,23 +26,14 @@ public class PushNotifyDispatcher {
         return this.pushers.get(tokenType);
     }
     
-    private List<PushToken> findPushTokens(String publicKey) {
-        List<Device> devices = this.deviceService.getDevicesByPK(publicKey);
-        List<PushToken> pushTokens = new java.util.ArrayList<>();
-        for(Device device : devices){
-            pushTokens.addAll(device.getTokens());
-        }
-        return pushTokens;
-    }
-
     /**
      * Отправить уведомление пользователю с publicKey, используя все его токены для отправки уведомления, если таковые имеются
      * @param publicKey публичный ключ пользователя, которому нужно отправить уведомление
      * @param data данные уведомления
      */
     public void sendPush(String publicKey, HashMap<String, String> data) {
+        List<PushToken> pushTokens = this.pushTokenRepository.findTokens(publicKey);
         executor.execute(() -> {
-            List<PushToken> pushTokens = this.findPushTokens(publicKey);
             for(PushToken pushToken : pushTokens){
                 Pusher pusher = this.findPusher(pushToken.getType());
                 if(pusher != null){
@@ -61,17 +49,16 @@ public class PushNotifyDispatcher {
      * @param data данные уведомления
      */
     public void sendPush(List<String> publicKeys, HashMap<String, String> data) {
+        List<PushToken> pushTokens = this.pushTokenRepository.findTokens(publicKeys);
         executor.execute(() -> {
-            for(String publicKey : publicKeys){
+            for(PushToken pushToken : pushTokens){
-                List<PushToken> pushTokens = this.findPushTokens(publicKey);
+                Pusher pusher = this.findPusher(pushToken.getType());
-                for(PushToken pushToken : pushTokens){
-                    Pusher pusher = this.findPusher(pushToken.getType());
                     if(pusher != null){
                         pusher.sendPush(pushToken.getToken(), data);
                     }
                 }
             }
-        });
+        );
     }
 
 

src/main/java/io/orprotocol/Server.java

@@ -150,6 +150,7 @@ public class Server extends WebSocketServer {
             }
         } catch (Exception e) {
             client.disconnect(ServerFailures.BAD_PACKET);
+            e.printStackTrace();
         }
     }