Merge pull request #147 from MITLibraries/137_resmap_swordUrl_nullable

Allows SWORD Url to be optional
MITLibraries · Mar 31, 2015 · 718de61 · 718de61
2 parents 7f6d2c6 + 4879fca
commit 718de61
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/models/ContentProfile.scala b/app/models/ContentProfile.scala
@@ -31,7 +31,7 @@ case class ContentProfile(id: Int, tag: String, label: String, description: Stri
     if (! schemes.contains(scheme)) {
       DB.withConnection { implicit c =>
         SQL("insert into content_profile_scheme (content_profile_id, scheme_id) values ({cprof_id}, {scheme_id})")
-        .on('cprof_id -> id, 'scheme_id -> scheme.id).executeInsert()
+        .on('cprof_id -> id, 'scheme_id -> scheme.id).executeUpdate()
       }
     }
   }

diff --git a/app/models/ResourceMap.scala b/app/models/ResourceMap.scala
@@ -53,8 +53,8 @@ case class ResourceMap(id: Int, tag: String, description: String, swordUrl: Opti
 object ResourceMap {
 
   val resmap = {
-    get[Int]("id") ~ get[String]("tag") ~ get[String]("description") ~ get[String]("sword_url") map {
-      case id ~ tag ~ description ~ swordUrl => ResourceMap(id, tag, description, Some(swordUrl))
+    get[Int]("id") ~ get[String]("tag") ~ get[String]("description") ~ get[Option[String]]("sword_url") map {
+      case id ~ tag ~ description ~ swordUrl => ResourceMap(id, tag, description, swordUrl)
     }
   }
 

diff --git a/test/unit/ResourceMapSpec.scala b/test/unit/ResourceMapSpec.scala
@@ -25,7 +25,7 @@ class ResourceMapSpec extends Specification {
         ResourceMap.create("tag", "desc", None)
         ResourceMap.all.size must equalTo(1)
       }
-    }.pendingUntilFixed("See https://github.com/MITLibraries/scoap3hub/issues/137")
+    }
 
     "#make" in {
       running(FakeApplication(additionalConfiguration = inMemoryDatabase())) {