From 4879fcad355f416e246e2e3600509919461f9c8d Mon Sep 17 00:00:00 2001
From: Richard Rodgers <rrodgers@mit.edu>
Date: Mon, 30 Mar 2015 16:51:59 -0400
Subject: [PATCH] Allows SWORD Url to be optional Also reverts change in
 ContentProfile (insert -> update) method, which should only be used for Long
 DB keys, according to Play documentation. Fixes #137

---
 app/models/ContentProfile.scala | 2 +-
 app/models/ResourceMap.scala    | 4 ++--
 test/unit/ResourceMapSpec.scala | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/ContentProfile.scala b/app/models/ContentProfile.scala
index 82424d3..8edeb24 100644
--- 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
index a909aff..20e3593 100644
--- 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
index 0250726..d31ed47 100644
--- 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())) {