Fix delete function

Author: amontenegro

orcid-core/src/main/java/org/orcid/core/manager/v3/impl/NotificationManagerImpl.java

@@ -850,14 +850,17 @@ public void autoDeleteNotifications() {
         calendar.add(Calendar.MONTH, - autoDeleteMonths);
         Date createdBefore = calendar.getTime();
         LOGGER.info("About to auto delete notifications created before {}", createdBefore);
-        List<NotificationEntity> notificationsToDelete = Collections.<NotificationEntity> emptyList();
         int numDeleted = 0;
         do {
-            numDeleted = notificationDao.deleteNotificationsCreatedBefore(createdBefore, autoArchiveBatchSize);
-            LOGGER.info("Deleted {} old notifications", numDeleted);
+            try {
+                numDeleted = notificationDao.deleteNotificationsCreatedBefore(createdBefore, autoDeleteBatchSize);
+                LOGGER.info("Deleted {} old notifications", numDeleted);
+            } catch (Exception e) {
+                LOGGER.error("Error deleting notifications", e);
+                // Exit the loop if we get an error
+                numDeleted = 0;
+            }
         } while (numDeleted > 0);
     }
 
-
-
 }

orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/NotificationDaoImpl.java

@@ -230,19 +230,35 @@ public List<NotificationEntity> findNotificationsToSend(Date effectiveDate, Stri
     @Override
     @Transactional
     public int archiveNotificationsCreatedBefore(Date createdBefore, int batchSize) {
-        Query archiveQuery = entityManager.createNativeQuery("update notification set archive_date=now() where id in (select id from notification where archived_date is null and date_created < :createdBefore)");
+        Query archiveQuery = entityManager.createNativeQuery("update notification set archived_date=now() where id in (select id from notification where archived_date is null and date_created < :createdBefore limit :batchSize)");
         archiveQuery.setParameter("createdBefore", createdBefore);
-        archiveQuery.setMaxResults(batchSize);
+        archiveQuery.setParameter("batchSize", batchSize);
         return archiveQuery.executeUpdate();
     }
 
     @Override
     @Transactional
     public int deleteNotificationsCreatedBefore(Date createdBefore, int batchSize) {
-        Query archiveQuery = entityManager.createNativeQuery("delete notification where id in (select id from notification where date_created < :createdBefore)");
-        archiveQuery.setParameter("createdBefore", createdBefore);
-        archiveQuery.setMaxResults(batchSize);
-        return archiveQuery.executeUpdate();
+        TypedQuery<Long> query = entityManager.createQuery("select id from NotificationEntity where dateCreated < :createdBefore", Long.class);
+        query.setParameter("createdBefore", createdBefore);
+        query.setMaxResults(batchSize);
+        List<Long> ids = query.getResultList();
+        if(ids != null && !ids.isEmpty()) {
+            // Remove notification items
+            Query deleteNotificationItems = entityManager.createNativeQuery("delete from notification_item where notification_id in (:ids)");
+            deleteNotificationItems.setParameter("ids", ids);
+            deleteNotificationItems.executeUpdate();
+
+            // Remove notification works
+            Query deleteNotificationWorks = entityManager.createNativeQuery("delete from notification_work where notification_id in (:ids)");
+            deleteNotificationWorks.setParameter("ids", ids);
+            deleteNotificationWorks.executeUpdate();
+
+            Query deleteNotification = entityManager.createNativeQuery("delete from notification where id in (:ids)");
+            deleteNotification.setParameter("ids", ids);
+            return deleteNotification.executeUpdate();
+        }
+        return 0;
     }
 
     @SuppressWarnings("unchecked")