Add active indicator column to tags table (#1154)

* add active indicator column to tags table
maproulette · Oct 23, 2024 · 03d0b13 · 03d0b13
1 parent 6ab3acd
commit 03d0b13
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/app/org/maproulette/framework/model/Tag.scala b/app/org/maproulette/framework/model/Tag.scala
@@ -24,7 +24,8 @@ case class Tag(
     description: Option[String] = None,
     created: DateTime = DateTime.now(),
     modified: DateTime = DateTime.now(),
-    tagType: String = "challenges"
+    tagType: String = "challenges",
+    active: Boolean = true
 ) extends CacheObject[Long]
 
 /**

diff --git a/app/org/maproulette/framework/repository/TagRepository.scala b/app/org/maproulette/framework/repository/TagRepository.scala
@@ -198,9 +198,10 @@ object TagRepository {
     get[Long]("tags.id") ~
       get[String]("tags.name") ~
       get[Option[String]]("tags.description") ~
-      get[String]("tags.tag_type") map {
-      case id ~ name ~ description ~ tagType =>
-        new Tag(id, name.toLowerCase, description, tagType = tagType)
+      get[String]("tags.tag_type") ~
+      get[Boolean]("tags.active") map {
+      case id ~ name ~ description ~ tagType ~ active =>
+        new Tag(id, name.toLowerCase, description, tagType = tagType, active = active)
     }
   }
 
@@ -209,9 +210,13 @@ object TagRepository {
       get[Long]("tags.id") ~
       get[String]("tags.name") ~
       get[Option[String]]("tags.description") ~
-      get[String]("tags.tag_type") map {
-      case taskId ~ id ~ name ~ description ~ tagType => {
-        new TaskTag(taskId, new Tag(id, name.toLowerCase, description, tagType = tagType))
+      get[String]("tags.tag_type") ~
+      get[Boolean]("tags.active") map {
+      case taskId ~ id ~ name ~ description ~ tagType ~ active => {
+        new TaskTag(
+          taskId,
+          new Tag(id, name.toLowerCase, description, tagType = tagType, active = active)
+        )
       }
     }
   }

diff --git a/conf/evolutions/default/96.sql b/conf/evolutions/default/96.sql
@@ -0,0 +1,7 @@
+# --- !Ups
+ALTER TABLE IF EXISTS tags
+ADD COLUMN active Boolean DEFAULT true;;
+
+# --- !Downs
+ALTER TABLE IF EXISTS tags
+DROP COLUMN active;;