add constraint back on challenges

maproulette · Nov 14, 2023 · 9d6f5cd · 9d6f5cd
1 parent 5ea2a59
commit 9d6f5cd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/org/maproulette/models/dal/ChallengeDAL.scala b/app/org/maproulette/models/dal/ChallengeDAL.scala
@@ -15,7 +15,7 @@ import org.joda.time.DateTime
 import org.maproulette.Config
 import org.maproulette.cache.CacheManager
 import org.maproulette.data.{Actions, ChallengeType, ProjectType}
-import org.maproulette.exception.{InvalidException, NotFoundException}
+import org.maproulette.exception.{InvalidException, NotFoundException, UniqueViolationException}
 import org.maproulette.framework.model._
 import org.maproulette.framework.repository.{
   ChallengeListingRepository,
@@ -497,7 +497,7 @@ class ChallengeDAL @Inject() (
                       ${challenge.extra.limitReviewTags}, ${challenge.extra.taskStyles}, ${challenge.general.requiresLocal}, ${challenge.extra.isArchived},
                       ${challenge.extra.reviewSetting},
                       ${asJson(challenge.extra.taskWidgetLayout.getOrElse(Json.parse("{}")))}
-                      ) RETURNING #${this.retrieveColumns}"""
+                      ) ON CONFLICT(parent_id, LOWER(name)) DO NOTHING RETURNING #${this.retrieveColumns}"""
             .as(this.parser.*)
             .headOption
         }
@@ -513,6 +513,10 @@ class ChallengeDAL @Inject() (
       }
     } match {
       case Some(value) => value
+      case None =>
+        throw new UniqueViolationException(
+          s"Challenge with name ${challenge.name} already exists in the database"
+        )
     }
   }
 

diff --git a/conf/evolutions/default/94.sql b/conf/evolutions/default/94.sql
@@ -1,7 +1,6 @@
 # --- !Ups
 -- Remove the constraint for a distinct virtual challenge (id,name) tuple, and allow users to create virtual challenges with the same name.
 ALTER TABLE virtual_challenges DROP CONSTRAINT IF EXISTS CON_VIRTUAL_CHALLENGES_USER_ID_NAME;
-DROP INDEX IF EXISTS idx_challenges_parent_id_name;
 
 # -- !Downs
 ALTER TABLE virtual_challenges ADD CONSTRAINT CON_VIRTUAL_CHALLENGES_USER_ID_NAME