Merge pull request #148 from MITLibraries/141_topic_deleteb4_check

Checks for linked items in deleteUnlinkedBefore method
MITLibraries · Mar 31, 2015 · 0ace9e2 · 0ace9e2
2 parents 718de61 + 2c68d33
commit 0ace9e2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/app/models/Topic.scala b/app/models/Topic.scala
@@ -160,7 +160,15 @@ object Topic {
 
   def deleteUnlinkedBefore(date: Date) {
     DB.withConnection { implicit c =>
-      SQL("delete from topic where created < {created}").on('created -> date).executeUpdate
+      SQL(
+        """
+        delete from topic where created < {created}
+        and not exists (
+          select 1 from item_topic
+          where item_topic.topic_id = topic.id
+        )
+        """
+      ).on('created -> date).executeUpdate
     }
   }
 }
diff --git a/test/unit/TopicSpec.scala b/test/unit/TopicSpec.scala
@@ -146,7 +146,7 @@ class TopicSpec extends Specification {
 
         Topic.deleteUnlinkedBefore(new Date)
         Topic.all must haveSize(1)
-      }.pendingUntilFixed(": See https://github.com/MITLibraries/scoap3hub/issues/141")
+      }
     }
 
     "#recentItems" in {