diff --git a/src/main/scala/model/IssueComment.scala b/src/main/scala/model/IssueComment.scala index 1084a33..f9fd983 100644 --- a/src/main/scala/model/IssueComment.scala +++ b/src/main/scala/model/IssueComment.scala @@ -9,9 +9,9 @@ def content = column[String]("CONTENT") def registeredDate = column[java.util.Date]("REGISTERED_DATE") def updatedDate = column[java.util.Date]("UPDATED_DATE") - def * = userName ~ repositoryName ~ issueId ~ commentId ~ action.? ~ commentedUserName ~ content ~ registeredDate ~ updatedDate <> (IssueComment, IssueComment.unapply _) + def * = userName ~ repositoryName ~ issueId ~ commentId ~ action ~ commentedUserName ~ content ~ registeredDate ~ updatedDate <> (IssueComment, IssueComment.unapply _) - def autoInc = userName ~ repositoryName ~ issueId ~ action.? ~ commentedUserName ~ content ~ registeredDate ~ updatedDate returning commentId + def autoInc = userName ~ repositoryName ~ issueId ~ action ~ commentedUserName ~ content ~ registeredDate ~ updatedDate returning commentId def byPrimaryKey(commentId: Int) = this.commentId is commentId.bind } @@ -20,7 +20,7 @@ repositoryName: String, issueId: Int, commentId: Int, - action: Option[String], + action: String, commentedUserName: String, content: String, registeredDate: java.util.Date, diff --git a/src/main/scala/service/IssuesService.scala b/src/main/scala/service/IssuesService.scala index 17f3c69..395bcee 100644 --- a/src/main/scala/service/IssuesService.scala +++ b/src/main/scala/service/IssuesService.scala @@ -192,7 +192,7 @@ IssueLabels filter(_.byPrimaryKey(owner, repository, issueId, labelId)) delete def createComment(owner: String, repository: String, loginUser: String, - issueId: Int, content: String, action: Option[String]) = + issueId: Int, content: String, action: String) = IssueComments.autoInc insert ( owner, repository, diff --git a/src/main/scala/servlet/GitRepositoryServlet.scala b/src/main/scala/servlet/GitRepositoryServlet.scala index 55ce0e9..94c432b 100644 --- a/src/main/scala/servlet/GitRepositoryServlet.scala +++ b/src/main/scala/servlet/GitRepositoryServlet.scala @@ -85,7 +85,7 @@ "(^|\\W)#(\\d+)(\\W|$)".r.findAllIn(commit.fullMessage).matchData.foreach { matchData => val issueId = matchData.group(2) if(getAccountByUserName(commit.committer).isDefined && getIssue(owner, repository, issueId).isDefined){ - createComment(owner, repository, commit.committer, issueId.toInt, commit.fullMessage, Some("commit")) + createComment(owner, repository, commit.committer, issueId.toInt, commit.fullMessage, "commit") } } Some(commit)