{"action":"created","comment":{"url":"https://api.github.com/repos/broadinstitute/rawls/pulls/comments/52489780","id":52489780,"diff_hunk":"@@ -57,12 +62,128 @@ trait WorkspaceComponent {\n     def workspace = foreignKey(\"FK_WS_ACCESS_WORKSPACE\", workspaceId, workspaceQuery)(_.id)\n     def group = foreignKey(\"FK_WS_ACCESS_GROUP\", groupName, rawlsGroupQuery)(_.groupName)\n \n-    def x = primaryKey(\"PK_WORKSPACE_ACCESS\", (workspaceId, accessLevel))\n+    def accessPrimaryKey = primaryKey(\"PK_WORKSPACE_ACCESS\", (workspaceId, accessLevel))\n \n     def * = (workspaceId, groupName, accessLevel) <> (WorkspaceAccessRecord.tupled, WorkspaceAccessRecord.unapply)\n   }\n \n-  protected val workspaceQuery = TableQuery[WorkspaceTable]\n   protected val workspaceAttributeQuery = TableQuery[WorkspaceAttributeTable]\n   protected val workspaceAccessQuery = TableQuery[WorkspaceAccessTable]\n+\n+  object workspaceQuery extends TableQuery(new WorkspaceTable(_)) {\n+    def workspaceAccessGroups(workspaceId: UUID) = for {\n+      workspaceRec <- workspaceQuery if workspaceRec.id === workspaceId\n+      workspaceAccessRec <- workspaceAccessQuery if workspaceRec.id === workspaceAccessRec.workspaceId\n+    } yield (workspaceAccessRec)\n+\n+    def save(workspace: Workspace): DBIOAction[Workspace, NoStream, Effect.Read with Effect.Write] = {\n+      val workspaceRecord = marshalWorkspace(workspace)\n+\n+      workspaceQuery insertOrUpdate workspaceRecord andThen {\n+        DBIO.seq(workspace.accessLevels.map { case (accessLevel, group) =>\n+          workspaceAccessQuery insertOrUpdate WorkspaceAccessRecord(workspaceRecord.id, group.groupName.value, accessLevel.toString)\n+        }.toSeq: _*)\n+\n+      } andThen {\n+        workspaceAttributes(workspaceRecord.id).result.flatMap { attributeRecords =>\n+          // clear existing attributes, any concurrency locking should be handled at the workspace level\n+          val deleteActions = deleteWorkspaceAttributes(attributeRecords)\n+\n+          // insert attributes\n+          val insertActions = workspace.attributes.flatMap { case (name, attribute) =>\n+            attributeQuery.insertAttributeRecords(name, attribute, workspaceRecord.id).map(_.flatMap{ attrId =>\n+              insertWorkspaceAttributeMapping(workspaceRecord, attrId)\n+            })\n+          }\n+\n+          DBIO.seq(deleteActions ++ insertActions:_*)\n+        }\n+      } map(_ => workspace)\n+    }\n+\n+    def findByName(workspaceName: WorkspaceName): DBIOAction[Option[Workspace], NoStream, Effect.Read] = {\n+      loadWorkspace(findByNameQuery(workspaceName))\n+    }\n+\n+    def findById(workspaceId: String): DBIOAction[Option[Workspace], NoStream, Effect.Read] = {\n+      loadWorkspace(findByIdQuery(UUID.fromString(workspaceId)))\n+    }\n+\n+    def delete(workspaceName: WorkspaceName): DBIOAction[Boolean, NoStream, Effect.Read with Effect.Write] = {\n+      findByNameQuery(workspaceName).result.flatMap {\n+        case Seq() => DBIO.successful(false)\n+        case Seq(workspaceRecord) =>\n+          workspaceAttributes(workspaceRecord.id).result.flatMap(recs => DBIO.seq(deleteWorkspaceAttributes(recs):_*)) flatMap { _ =>","path":"src/main/scala/org/broadinstitute/dsde/rawls/dataaccess/slick/WorkspaceComponent.scala","position":79,"original_position":79,"commit_id":"0f230139174bdeb2146b9b033fe70ceef463263c","original_commit_id":"0f230139174bdeb2146b9b033fe70ceef463263c","user":{"login":"jmthibault79","id":2701406,"avatar_url":"https://avatars.githubusercontent.com/u/2701406?v=3","gravatar_id":"","url":"https://api.github.com/users/jmthibault79","html_url":"https://github.com/jmthibault79","followers_url":"https://api.github.com/users/jmthibault79/followers","following_url":"https://api.github.com/users/jmthibault79/following{/other_user}","gists_url":"https://api.github.com/users/jmthibault79/gists{/gist_id}","starred_url":"https://api.github.com/users/jmthibault79/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jmthibault79/subscriptions","organizations_url":"https://api.github.com/users/jmthibault79/orgs","repos_url":"https://api.github.com/users/jmthibault79/repos","events_url":"https://api.github.com/users/jmthibault79/events{/privacy}","received_events_url":"https://api.github.com/users/jmthibault79/received_events","type":"User","site_admin":false},"body":"Could you discuss the use of `andThen` in save vs. `flatMap` here?  I'm not understanding the difference.","created_at":"2016-02-10T17:11:21Z","updated_at":"2016-02-10T17:11:21Z","html_url":"https://github.com/broadinstitute/rawls/pull/299#discussion_r52489780","pull_request_url":"https://api.github.com/repos/broadinstitute/rawls/pulls/299","_links":{"self":{"href":"https://api.github.com/repos/broadinstitute/rawls/pulls/comments/52489780"},"html":{"href":"https://github.com/broadinstitute/rawls/pull/299#discussion_r52489780"},"pull_request":{"href":"https://api.github.com/repos/broadinstitute/rawls/pulls/299"}}},"pull_request":{"url":"https://api.github.com/repos/broadinstitute/rawls/pulls/299","id":58907609,"html_url":"https://github.com/broadinstitute/rawls/pull/299","diff_url":"https://github.com/broadinstitute/rawls/pull/299.diff","patch_url":"https://github.com/broadinstitute/rawls/pull/299.patch","issue_url":"https://api.github.com/repos/broadinstitute/rawls/issues/299","number":299,"state":"open","locked":false,"title":"Workspace entity tables","user":{"login":"dvoet","id":1521333,"avatar_url":"https://avatars.githubusercontent.com/u/1521333?v=3","gravatar_id":"","url":"https://api.github.com/users/dvoet","html_url":"https://github.com/dvoet","followers_url":"https://api.github.com/users/dvoet/followers","following_url":"https://api.github.com/users/dvoet/following{/other_user}","gists_url":"https://api.github.com/users/dvoet/gists{/gist_id}","starred_url":"https://api.github.com/users/dvoet/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dvoet/subscriptions","organizations_url":"https://api.github.com/users/dvoet/orgs","repos_url":"https://api.github.com/users/dvoet/repos","events_url":"https://api.github.com/users/dvoet/events{/privacy}","received_events_url":"https://api.github.com/users/dvoet/received_events","type":"User","site_admin":false},"body":"- [x] **Submitter**: Rebase to develop. DO NOT SQUASH\r\n- [x] **Submitter**: Make sure Swagger is updated if API changes\r\n- [x] **Submitter**: Make sure documentation for code is complete\r\n- [x] **Submitter**: Review code comments; remove done TODOs, create stories for remaining TODOs\r\n- [x] **Submitter**: Include the JIRA issue number in the PR description\r\n- [x] **Submitter**: Add description or comments on the PR explaining the hows/whys (if not obvious)\r\n- [x] Tell ![](http://i.imgur.com/9dLzbPd.png) that the PR exists if he wants to look at it\r\n- [x] Anoint a lead reviewer (LR). **Assign PR to LR**\r\n- [ ] **LR**: Initial review by LR and others.\r\n- [ ] Comment / review / update cycle:\r\n  * Rest of team may comments on PR at will\r\n  * **LR assigns to submitter** for feedback fixes\r\n  * Submitter updates documentation as needed\r\n  * Submitter rebases to develop again if necessary\r\n  * Submitter makes further commits. DO NOT SQUASH. **Reassign to LR** for further feedback\r\n- [x] ![](http://i.imgur.com/9dLzbPd.png) sign off\r\n- [ ] **LR** sign off\r\n- [ ] **Assign to submitter** to finalize\r\n- [ ] **Submitter**: Squash commits, rebase if necessary\r\n- [ ] **Submitter**: Verify all tests go green, including CI tests\r\n- [ ] **Submitter**: Merge to develop \r\n- [ ] **Submitter**: Delete branch after merge\r\n- [ ] **Submitter**: Check configuration files in Jenkins in case they need changes\r\n- [ ] **Submitter**: Verify swagger UI on dev server still works after deployment\r\n- [ ] **Submitter**: Inform other teams of any API changes via hipchat and/or email\r\n- [ ] **Submitter**: Mark JIRA issue as resolved once this checklist is completed\r\n","created_at":"2016-02-10T15:39:10Z","updated_at":"2016-02-10T17:11:21Z","closed_at":null,"merged_at":null,"merge_commit_sha":"5d6ae3b90bfd012beaf95e0b76c00e2837a7a80b","assignee":{"login":"jmthibault79","id":2701406,"avatar_url":"https://avatars.githubusercontent.com/u/2701406?v=3","gravatar_id":"","url":"https://api.github.com/users/jmthibault79","html_url":"https://github.com/jmthibault79","followers_url":"https://api.github.com/users/jmthibault79/followers","following_url":"https://api.github.com/users/jmthibault79/following{/other_user}","gists_url":"https://api.github.com/users/jmthibault79/gists{/gist_id}","starred_url":"https://api.github.com/users/jmthibault79/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jmthibault79/subscriptions","organizations_url":"https://api.github.com/users/jmthibault79/orgs","repos_url":"https://api.github.com/users/jmthibault79/repos","events_url":"https://api.github.com/users/jmthibault79/events{/privacy}","received_events_url":"https://api.github.com/users/jmthibault79/received_events","type":"User","site_admin":false},"milestone":null,"commits_url":"https://api.github.com/repos/broadinstitute/rawls/pulls/299/commits","review_comments_url":"https://api.github.com/repos/broadinstitute/rawls/pulls/299/comments","review_comment_url":"https://api.github.com/repos/broadinstitute/rawls/pulls/comments{/number}","comments_url":"https://api.github.com/repos/broadinstitute/rawls/issues/299/comments","statuses_url":"https://api.github.com/repos/broadinstitute/rawls/statuses/0f230139174bdeb2146b9b033fe70ceef463263c","head":{"label":"broadinstitute:workspace_entity_tables","ref":"workspace_entity_tables","sha":"0f230139174bdeb2146b9b033fe70ceef463263c","user":{"login":"broadinstitute","id":393552,"avatar_url":"https://avatars.githubusercontent.com/u/393552?v=3","gravatar_id":"","url":"https://api.github.com/users/broadinstitute","html_url":"https://github.com/broadinstitute","followers_url":"https://api.github.com/users/broadinstitute/followers","following_url":"https://api.github.com/users/broadinstitute/following{/other_user}","gists_url":"https://api.github.com/users/broadinstitute/gists{/gist_id}","starred_url":"https://api.github.com/users/broadinstitute/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/broadinstitute/subscriptions","organizations_url":"https://api.github.com/users/broadinstitute/orgs","repos_url":"https://api.github.com/users/broadinstitute/repos","events_url":"https://api.github.com/users/broadinstitute/events{/privacy}","received_events_url":"https://api.github.com/users/broadinstitute/received_events","type":"Organization","site_admin":false},"repo":{"id":34129770,"name":"rawls","full_name":"broadinstitute/rawls","owner":{"login":"broadinstitute","id":393552,"avatar_url":"https://avatars.githubusercontent.com/u/393552?v=3","gravatar_id":"","url":"https://api.github.com/users/broadinstitute","html_url":"https://github.com/broadinstitute","followers_url":"https://api.github.com/users/broadinstitute/followers","following_url":"https://api.github.com/users/broadinstitute/following{/other_user}","gists_url":"https://api.github.com/users/broadinstitute/gists{/gist_id}","starred_url":"https://api.github.com/users/broadinstitute/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/broadinstitute/subscriptions","organizations_url":"https://api.github.com/users/broadinstitute/orgs","repos_url":"https://api.github.com/users/broadinstitute/repos","events_url":"https://api.github.com/users/broadinstitute/events{/privacy}","received_events_url":"https://api.github.com/users/broadinstitute/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/broadinstitute/rawls","description":"Rawls service for DSDE","fork":false,"url":"https://api.github.com/repos/broadinstitute/rawls","forks_url":"https://api.github.com/repos/broadinstitute/rawls/forks","keys_url":"https://api.github.com/repos/broadinstitute/rawls/keys{/key_id}","collaborators_url":"https://api.github.com/repos/broadinstitute/rawls/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/broadinstitute/rawls/teams","hooks_url":"https://api.github.com/repos/broadinstitute/rawls/hooks","issue_events_url":"https://api.github.com/repos/broadinstitute/rawls/issues/events{/number}","events_url":"https://api.github.com/repos/broadinstitute/rawls/events","assignees_url":"https://api.github.com/repos/broadinstitute/rawls/assignees{/user}","branches_url":"https://api.github.com/repos/broadinstitute/rawls/branches{/branch}","tags_url":"https://api.github.com/repos/broadinstitute/rawls/tags","blobs_url":"https://api.github.com/repos/broadinstitute/rawls/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/broadinstitute/rawls/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/broadinstitute/rawls/git/refs{/sha}","trees_url":"https://api.github.com/repos/broadinstitute/rawls/git/trees{/sha}","statuses_url":"https://api.github.com/repos/broadinstitute/rawls/statuses/{sha}","languages_url":"https://api.github.com/repos/broadinstitute/rawls/languages","stargazers_url":"https://api.github.com/repos/broadinstitute/rawls/stargazers","contributors_url":"https://api.github.com/repos/broadinstitute/rawls/contributors","subscribers_url":"https://api.github.com/repos/broadinstitute/rawls/subscribers","subscription_url":"https://api.github.com/repos/broadinstitute/rawls/subscription","commits_url":"https://api.github.com/repos/broadinstitute/rawls/commits{/sha}","git_commits_url":"https://api.github.com/repos/broadinstitute/rawls/git/commits{/sha}","comments_url":"https://api.github.com/repos/broadinstitute/rawls/comments{/number}","issue_comment_url":"https://api.github.com/repos/broadinstitute/rawls/issues/comments{/number}","contents_url":"https://api.github.com/repos/broadinstitute/rawls/contents/{+path}","compare_url":"https://api.github.com/repos/broadinstitute/rawls/compare/{base}...{head}","merges_url":"https://api.github.com/repos/broadinstitute/rawls/merges","archive_url":"https://api.github.com/repos/broadinstitute/rawls/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/broadinstitute/rawls/downloads","issues_url":"https://api.github.com/repos/broadinstitute/rawls/issues{/number}","pulls_url":"https://api.github.com/repos/broadinstitute/rawls/pulls{/number}","milestones_url":"https://api.github.com/repos/broadinstitute/rawls/milestones{/number}","notifications_url":"https://api.github.com/repos/broadinstitute/rawls/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/broadinstitute/rawls/labels{/name}","releases_url":"https://api.github.com/repos/broadinstitute/rawls/releases{/id}","deployments_url":"https://api.github.com/repos/broadinstitute/rawls/deployments","created_at":"2015-04-17T17:16:07Z","updated_at":"2016-01-11T17:54:05Z","pushed_at":"2016-02-10T15:39:11Z","git_url":"git://github.com/broadinstitute/rawls.git","ssh_url":"git@github.com:broadinstitute/rawls.git","clone_url":"https://github.com/broadinstitute/rawls.git","svn_url":"https://github.com/broadinstitute/rawls","homepage":null,"size":2618,"stargazers_count":4,"watchers_count":4,"language":"Scala","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"open_issues_count":2,"forks":1,"open_issues":2,"watchers":4,"default_branch":"develop"}},"base":{"label":"broadinstitute:rdbms_migration","ref":"rdbms_migration","sha":"c3ecde6b8a4162f179a8fd897c0c7082779241b8","user":{"login":"broadinstitute","id":393552,"avatar_url":"https://avatars.githubusercontent.com/u/393552?v=3","gravatar_id":"","url":"https://api.github.com/users/broadinstitute","html_url":"https://github.com/broadinstitute","followers_url":"https://api.github.com/users/broadinstitute/followers","following_url":"https://api.github.com/users/broadinstitute/following{/other_user}","gists_url":"https://api.github.com/users/broadinstitute/gists{/gist_id}","starred_url":"https://api.github.com/users/broadinstitute/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/broadinstitute/subscriptions","organizations_url":"https://api.github.com/users/broadinstitute/orgs","repos_url":"https://api.github.com/users/broadinstitute/repos","events_url":"https://api.github.com/users/broadinstitute/events{/privacy}","received_events_url":"https://api.github.com/users/broadinstitute/received_events","type":"Organization","site_admin":false},"repo":{"id":34129770,"name":"rawls","full_name":"broadinstitute/rawls","owner":{"login":"broadinstitute","id":393552,"avatar_url":"https://avatars.githubusercontent.com/u/393552?v=3","gravatar_id":"","url":"https://api.github.com/users/broadinstitute","html_url":"https://github.com/broadinstitute","followers_url":"https://api.github.com/users/broadinstitute/followers","following_url":"https://api.github.com/users/broadinstitute/following{/other_user}","gists_url":"https://api.github.com/users/broadinstitute/gists{/gist_id}","starred_url":"https://api.github.com/users/broadinstitute/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/broadinstitute/subscriptions","organizations_url":"https://api.github.com/users/broadinstitute/orgs","repos_url":"https://api.github.com/users/broadinstitute/repos","events_url":"https://api.github.com/users/broadinstitute/events{/privacy}","received_events_url":"https://api.github.com/users/broadinstitute/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/broadinstitute/rawls","description":"Rawls service for DSDE","fork":false,"url":"https://api.github.com/repos/broadinstitute/rawls","forks_url":"https://api.github.com/repos/broadinstitute/rawls/forks","keys_url":"https://api.github.com/repos/broadinstitute/rawls/keys{/key_id}","collaborators_url":"https://api.github.com/repos/broadinstitute/rawls/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/broadinstitute/rawls/teams","hooks_url":"https://api.github.com/repos/broadinstitute/rawls/hooks","issue_events_url":"https://api.github.com/repos/broadinstitute/rawls/issues/events{/number}","events_url":"https://api.github.com/repos/broadinstitute/rawls/events","assignees_url":"https://api.github.com/repos/broadinstitute/rawls/assignees{/user}","branches_url":"https://api.github.com/repos/broadinstitute/rawls/branches{/branch}","tags_url":"https://api.github.com/repos/broadinstitute/rawls/tags","blobs_url":"https://api.github.com/repos/broadinstitute/rawls/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/broadinstitute/rawls/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/broadinstitute/rawls/git/refs{/sha}","trees_url":"https://api.github.com/repos/broadinstitute/rawls/git/trees{/sha}","statuses_url":"https://api.github.com/repos/broadinstitute/rawls/statuses/{sha}","languages_url":"https://api.github.com/repos/broadinstitute/rawls/languages","stargazers_url":"https://api.github.com/repos/broadinstitute/rawls/stargazers","contributors_url":"https://api.github.com/repos/broadinstitute/rawls/contributors","subscribers_url":"https://api.github.com/repos/broadinstitute/rawls/subscribers","subscription_url":"https://api.github.com/repos/broadinstitute/rawls/subscription","commits_url":"https://api.github.com/repos/broadinstitute/rawls/commits{/sha}","git_commits_url":"https://api.github.com/repos/broadinstitute/rawls/git/commits{/sha}","comments_url":"https://api.github.com/repos/broadinstitute/rawls/comments{/number}","issue_comment_url":"https://api.github.com/repos/broadinstitute/rawls/issues/comments{/number}","contents_url":"https://api.github.com/repos/broadinstitute/rawls/contents/{+path}","compare_url":"https://api.github.com/repos/broadinstitute/rawls/compare/{base}...{head}","merges_url":"https://api.github.com/repos/broadinstitute/rawls/merges","archive_url":"https://api.github.com/repos/broadinstitute/rawls/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/broadinstitute/rawls/downloads","issues_url":"https://api.github.com/repos/broadinstitute/rawls/issues{/number}","pulls_url":"https://api.github.com/repos/broadinstitute/rawls/pulls{/number}","milestones_url":"https://api.github.com/repos/broadinstitute/rawls/milestones{/number}","notifications_url":"https://api.github.com/repos/broadinstitute/rawls/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/broadinstitute/rawls/labels{/name}","releases_url":"https://api.github.com/repos/broadinstitute/rawls/releases{/id}","deployments_url":"https://api.github.com/repos/broadinstitute/rawls/deployments","created_at":"2015-04-17T17:16:07Z","updated_at":"2016-01-11T17:54:05Z","pushed_at":"2016-02-10T15:39:11Z","git_url":"git://github.com/broadinstitute/rawls.git","ssh_url":"git@github.com:broadinstitute/rawls.git","clone_url":"https://github.com/broadinstitute/rawls.git","svn_url":"https://github.com/broadinstitute/rawls","homepage":null,"size":2618,"stargazers_count":4,"watchers_count":4,"language":"Scala","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"open_issues_count":2,"forks":1,"open_issues":2,"watchers":4,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/broadinstitute/rawls/pulls/299"},"html":{"href":"https://github.com/broadinstitute/rawls/pull/299"},"issue":{"href":"https://api.github.com/repos/broadinstitute/rawls/issues/299"},"comments":{"href":"https://api.github.com/repos/broadinstitute/rawls/issues/299/comments"},"review_comments":{"href":"https://api.github.com/repos/broadinstitute/rawls/pulls/299/comments"},"review_comment":{"href":"https://api.github.com/repos/broadinstitute/rawls/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/broadinstitute/rawls/pulls/299/commits"},"statuses":{"href":"https://api.github.com/repos/broadinstitute/rawls/statuses/0f230139174bdeb2146b9b033fe70ceef463263c"}}}}