Refactor database schema.

src/main/scala/model/Account.scala

@@ -3,8 +3,7 @@ package model
 import scala.slick.driver.H2Driver.simple._
 
 object Accounts extends Table[Account]("ACCOUNT") {
-  def userId = column[Long]("USER_ID", O AutoInc)
-  def userName = column[String]("USER_NAME")
+  def userName = column[String]("USER_NAME", O PrimaryKey)
   def mailAddress = column[String]("MAIL_ADDRESS")
   def password = column[String]("PASSWORD")
   def userType = column[Int]("USER_TYPE")
@@ -12,12 +11,11 @@ object Accounts extends Table[Account]("ACCOUNT") {
   def registeredDate = column[java.sql.Date]("REGISTERED_DATE")	// TODO convert java.util.Date later
   def updatedDate = column[java.sql.Date]("UPDATED_DATE")
   def lastLoginDate = column[java.sql.Date]("LAST_LOGIN_DATE")
-  def * = userId.? ~ userName ~ mailAddress ~ password ~ userType ~ url.? ~ registeredDate ~ updatedDate ~ lastLoginDate.? <> (Account, Account.unapply _)
-  def ins = userName ~ mailAddress ~ password ~ userType ~ url.? ~ registeredDate ~ updatedDate ~ lastLoginDate.? <> ({ t => Account(None, t._1, t._2, t._3, t._4, t._5, t._6, t._7, t._8)}, { (o: Account) => Some((o.userName, o.mailAddress, o.password, o.userType, o.url, o.registeredDate, o.updatedDate, o.lastLoginDate))})
+  def * = userName ~ mailAddress ~ password ~ userType ~ url.? ~ registeredDate ~ updatedDate ~ lastLoginDate.? <> (Account, Account.unapply _)
+//  def ins = userName ~ mailAddress ~ password ~ userType ~ url.? ~ registeredDate ~ updatedDate ~ lastLoginDate.? <> ({ t => Account(None, t._1, t._2, t._3, t._4, t._5, t._6, t._7, t._8)}, { (o: Account) => Some((o.userName, o.mailAddress, o.password, o.userType, o.url, o.registeredDate, o.updatedDate, o.lastLoginDate))})
 }
 
 case class Account(
-    userId: Option[Long],
     userName: String,
     mailAddress: String,
     password: String,
@@ -32,8 +30,8 @@ class AccountDao {
   import Database.threadLocalSession
 
 //  def insert(o: Account): Account = Accounts.ins returning Accounts.* insert o
-  def insert(o: Account): Long = Accounts.ins returning Accounts.userId insert o
+  def insert(o: Account): Long = Accounts.* insert o
 
-  def select(key: Long): Option[Account] = Query(Accounts) filter(_.userId is key.bind) firstOption
+  def select(key: String): Option[Account] = Query(Accounts) filter(_.userName is key.bind) firstOption
 
 }

src/main/scala/model/Project.scala

@@ -1,29 +0,0 @@
-package model
-
-import scala.slick.driver.H2Driver.simple._
-
-object Projects extends Table[Project]("PROJECT") {
-  def projectId = column[Long]("PROJECT_ID", O AutoInc)
-  def projectName= column[String]("PROJECT_NAME")
-  def userId = column[Long]("USER_ID")
-  def projectType = column[Int]("PROJECT_TYPE") // TODO should be sealed?
-  def description = column[String]("DESCRIPTION")
-  def defaultBranch = column[String]("DEFAULT_BRANCH")
-  def registeredDate = column[java.sql.Date]("REGISTERED_DATE")	// TODO convert java.util.Date later
-  def updatedDate = column[java.sql.Date]("UPDATED_DATE")
-  def lastActivityDate = column[java.sql.Date]("LAST_ACTIVITY_DATE")
-  def * = projectId.? ~ projectName ~ userId ~ projectType ~ description.? ~ defaultBranch ~ registeredDate ~ updatedDate ~ lastActivityDate <> (Project, Project.unapply _)
-  def ins = projectName ~ userId ~ projectType ~ description.? ~ defaultBranch ~ registeredDate ~ updatedDate ~ lastActivityDate <> ({ t => Project(None, t._1, t._2, t._3, t._4, t._5, t._6, t._7, t._8)}, { (o: Project) => Some((o.projectName, o.userId, o.projectType, o.description, o.defaultBranch, o.registeredDate, o.updatedDate, o.lastActivityDate))})
-}
-
-case class Project(
-  projectId: Option[Long],
-  projectName: String,
-  userId: Long,
-  projectType: Int,
-  description: Option[String],
-  defaultBranch: String,
-  registeredDate: java.sql.Date,
-  updatedDate: java.sql.Date,
-  lastActivityDate: java.sql.Date
-)

src/main/scala/model/Repository.scala

@@ -0,0 +1,27 @@
+package model
+
+import scala.slick.driver.H2Driver.simple._
+
+object Repositories extends Table[Repository]("REPOSITORY") {
+  def repositoryName= column[String]("REPOSITORY_NAME", O PrimaryKey)
+  def userName = column[String]("USER_NAME", O PrimaryKey)
+  def repositoryType = column[Int]("REPOSITORY_TYPE") // TODO should be sealed?
+  def description = column[String]("DESCRIPTION")
+  def defaultBranch = column[String]("DEFAULT_BRANCH")
+  def registeredDate = column[java.sql.Date]("REGISTERED_DATE")	// TODO convert java.util.Date later
+  def updatedDate = column[java.sql.Date]("UPDATED_DATE")
+  def lastActivityDate = column[java.sql.Date]("LAST_ACTIVITY_DATE")
+  def * = repositoryName ~ userName ~ repositoryType ~ description.? ~ defaultBranch ~ registeredDate ~ updatedDate ~ lastActivityDate <> (Repository, Repository.unapply _)
+//  def ins = repositoryName ~ userName ~ repositoryType ~ description.? ~ defaultBranch ~ registeredDate ~ updatedDate ~ lastActivityDate <> ({ t => Project(None, t._1, t._2, t._3, t._4, t._5, t._6, t._7, t._8)}, { (o: Project) => Some((o.projectName, o.userId, o.projectType, o.description, o.defaultBranch, o.registeredDate, o.updatedDate, o.lastActivityDate))})
+}
+
+case class Repository(
+  repositoryName: String,
+  userName: String,
+  repositoryType: Int,
+  description: Option[String],
+  defaultBranch: String,
+  registeredDate: java.sql.Date,
+  updatedDate: java.sql.Date,
+  lastActivityDate: java.sql.Date
+)

src/main/scala/service/AccountService.scala

@@ -6,10 +6,6 @@ import Database.threadLocalSession
 
 trait AccountService {
 
-  def getAccountByUserId(userId: Long): Option[Account] =
-    Query(Accounts) filter(_.userId is userId.bind) firstOption
-
-
   def getAccountByUserName(userName: String): Option[Account] =
     Query(Accounts) filter(_.userName is userName.bind) firstOption
 

src/main/scala/service/ProjectService.scala

@@ -15,22 +15,21 @@ trait ProjectService { self: AccountService =>
    * The project is created as public repository at first. Users can modify the project type at the repository settings
    * page after the project creation to configure the project as the private repository.
    *
-   * @param projectName the project name
+   * @param repositoryName the repository name
    * @param userName the user name of the project owner
    * @param description the project description
    * @return the created project id
    */
-  def createProject(projectName: String, userName: String, description: Option[String]): Long = {
+  def createProject(repositoryName: String, userName: String, description: Option[String]): Long = {
     // TODO create a git repository also here?
 
     val currentDate = new java.sql.Date(System.currentTimeMillis)
 
-    Projects.ins returning Projects.projectId insert
-      Project(
-        projectId        = None,
-        projectName      = projectName,
-        userId           = getUserId(userName),
-        projectType      = Public,
+    Repositories.* insert
+      Repository(
+        repositoryName   = repositoryName,
+        userName         = userName,
+        repositoryType   = Public,
         description      = description,
         defaultBranch    = "master",
         registeredDate   = currentDate,
@@ -39,49 +38,72 @@ trait ProjectService { self: AccountService =>
   }
 
   /**
-   * Returns the specified user's project list.
+   * Returns the specified user's repository informations.
    *
    * @param userName the user name
-   * @return the project list which is sorted in descending order of lastActivityDate.
+   * @param servletContext the servlet context
+   * @return the repository informations which is sorted in descending order of lastActivityDate.
    */
   def getRepositoriesOfUser(userName: String, servletContext: ServletContext): List[RepositoryInfo] = {
-    (Query(Projects) filter(_.userId is getUserId(userName).bind) sortBy(_.lastActivityDate desc) list) map { project =>
-      val repositoryInfo = JGitUtil.getRepositoryInfo(userName, project.projectName, servletContext)
-      RepositoryInfo(repositoryInfo.owner, repositoryInfo.name, repositoryInfo.url, project, repositoryInfo.branchList, repositoryInfo.tags)
+    (Query(Repositories) filter(_.userName is userName.bind) sortBy(_.lastActivityDate desc) list) map { repository =>
+      val repositoryInfo = JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, servletContext)
+      RepositoryInfo(repositoryInfo.owner, repositoryInfo.name, repositoryInfo.url, repository, repositoryInfo.branchList, repositoryInfo.tags)
     }
   }
 
-  def getRepository(userName: String, projectName: String, servletContext: ServletContext): Option[RepositoryInfo] = {
-    (Query(Projects) filter { project =>
-      (project.userId is getUserId(userName).bind) && (project.projectName is projectName.bind)
-    } firstOption) map { project =>
-      val repositoryInfo = JGitUtil.getRepositoryInfo(userName, project.projectName, servletContext)
-      RepositoryInfo(repositoryInfo.owner, repositoryInfo.name, repositoryInfo.url, project, repositoryInfo.branchList, repositoryInfo.tags)
+  /**
+   * Returns the specified repository information.
+   * 
+   * @param userName the user name
+   * @param repositoryName the repository name
+   * @param servletContext the servlet context
+   * @return the repository information
+   */
+  def getRepository(userName: String, repositoryName: String, servletContext: ServletContext): Option[RepositoryInfo] = {
+    (Query(Repositories) filter { repository =>
+      (repository.userName is userName.bind) && (repository.repositoryName is repositoryName.bind)
+    } firstOption) map { repository =>
+      val repositoryInfo = JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, servletContext)
+      RepositoryInfo(repositoryInfo.owner, repositoryInfo.name, repositoryInfo.url, repository, repositoryInfo.branchList, repositoryInfo.tags)
     }
   }
 
+  /**
+   * Returns the accessible repository informations for the specified account user.
+   * 
+   * @param account the account
+   * @param servletContext the servlet context
+   * @return the repository informations which is sorted in descending order of lastActivityDate.
+   */
   def getAccessibleRepositories(account: Option[Account], servletContext: ServletContext): List[RepositoryInfo] = {
     account match {
       case Some(x) => {
-        (Query(Projects) sortBy(_.lastActivityDate desc) list) map { project =>
+        (Query(Repositories) sortBy(_.lastActivityDate desc) list) map { repository =>
           // TODO ユーザ名はジョインして取得する？
-          val repositoryInfo = JGitUtil.getRepositoryInfo(getUserName(project.userId), project.projectName, servletContext)
-          RepositoryInfo(repositoryInfo.owner, repositoryInfo.name, repositoryInfo.url, project, repositoryInfo.branchList, repositoryInfo.tags)
+          val repositoryInfo = JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, servletContext)
+          RepositoryInfo(repositoryInfo.owner, repositoryInfo.name, repositoryInfo.url, repository, repositoryInfo.branchList, repositoryInfo.tags)
         }
       }
       case None => {
-        (Query(Projects) filter(_.projectType is Public.bind) sortBy(_.lastActivityDate desc) list) map { project =>
+        (Query(Repositories) filter(_.repositoryType is Public.bind) sortBy(_.lastActivityDate desc) list) map { repository =>
           // TODO ユーザ名はジョインして取得する？
-          val repositoryInfo = JGitUtil.getRepositoryInfo(getUserName(project.userId), project.projectName, servletContext)
-          RepositoryInfo(repositoryInfo.owner, repositoryInfo.name, repositoryInfo.url, project, repositoryInfo.branchList, repositoryInfo.tags)
+          val repositoryInfo = JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, servletContext)
+          RepositoryInfo(repositoryInfo.owner, repositoryInfo.name, repositoryInfo.url, repository, repositoryInfo.branchList, repositoryInfo.tags)
         }
       }
     }
   }
+  
+  /**
+   * Updates the last activity date of the project.
+   */
+  def updateLastActivityDate(userName: String, projectName: String): Unit = {
+    
+  }
 
-  private def getUserName(userId: Long): String = getAccountByUserId(userId).get.userName
-
-  private def getUserId(userName: String): Long = getAccountByUserName(userName).get.userId.get
+//  private def getUserName(userId: Long): String = getAccountByUserId(userId).get.userName
+//
+//  private def getUserId(userName: String): Long = getAccountByUserName(userName).get.userId.get
 
 }
 
@@ -90,5 +112,5 @@ object ProjectService {
   val Public = 0
   val Private = 1
 
-  case class RepositoryInfo(owner: String, name: String, url: String, project: Project, branchList: List[String], tags: List[util.JGitUtil.TagInfo])
+  case class RepositoryInfo(owner: String, name: String, url: String, repository: Repository, branchList: List[String], tags: List[util.JGitUtil.TagInfo])
 }