From bc4af8e7c188881f285a1c8267912fdd0f0d9545 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Mon, 7 Mar 2016 10:05:51 +0900 Subject: [PATCH] Finished to move AccountService to quill --- .../core/service/AccountService.scala | 39 ++++++++----------- .../core/servlet/TransactionFilter.scala | 38 ++++++++++++------ 2 files changed, 43 insertions(+), 34 deletions(-) diff --git a/src/main/scala/gitbucket/core/service/AccountService.scala b/src/main/scala/gitbucket/core/service/AccountService.scala index 03e61c896..ec958af8d 100644 --- a/src/main/scala/gitbucket/core/service/AccountService.scala +++ b/src/main/scala/gitbucket/core/service/AccountService.scala @@ -9,18 +9,15 @@ import gitbucket.core.service.SystemSettingsService.SystemSettings import profile.simple._ import StringUtil._ import org.slf4j.LoggerFactory -// TODO Why is direct import required? -import gitbucket.core.model.Profile.dateColumnType +import gitbucket.core.servlet.Database._ import io.getquill._ -import io.getquill.naming.SnakeCase -import io.getquill.sources.sql.idiom.H2Dialect trait AccountService { private val logger = LoggerFactory.getLogger(classOf[AccountService]) - def authenticate(settings: SystemSettings, userName: String, password: String)(implicit s: Session): Option[Account] = + def authenticate(settings: SystemSettings, userName: String, password: String): Option[Account] = if(settings.ldapAuthentication){ ldapAuthentication(settings, userName, password) } else { @@ -39,7 +36,7 @@ trait AccountService { /** * Authenticate by LDAP. */ - private def ldapAuthentication(settings: SystemSettings, userName: String, password: String)(implicit s: Session): Option[Account] = { + private def ldapAuthentication(settings: SystemSettings, userName: String, password: String): Option[Account] = { LDAPUtil.authenticate(settings.ldap.get, userName, password) match { case Right(ldapUserInfo) => { // Create or update account by LDAP information @@ -104,9 +101,6 @@ trait AccountService { } } - // TODO - lazy val db = source(new JdbcSourceConfig[H2Dialect, SnakeCase]("db")) - def getAccountByMailAddress(mailAddress: String, includeRemoved: Boolean = false): Option[Account] = { db.run( quote { (mailAddress: String, includeRemoved: Boolean) => @@ -131,8 +125,7 @@ trait AccountService { ) } - def createAccount(userName: String, password: String, fullName: String, mailAddress: String, isAdmin: Boolean, url: Option[String]) - (implicit s: Session): Unit = { + def createAccount(userName: String, password: String, fullName: String, mailAddress: String, isAdmin: Boolean, url: Option[String]): Unit = { db.run(quote { query[Account].insert })(List(Account( userName = userName, password = password, @@ -206,16 +199,21 @@ trait AccountService { ))) } - def updateGroup(groupName: String, url: Option[String], removed: Boolean)(implicit s: Session): Unit = { + def updateGroup(groupName: String, url: Option[String], removed: Boolean): Unit = { db.run(quote { (groupName: String, url: Option[String], removed: Boolean) => query[Account].filter(_.userName == groupName).update(_.url -> url, _.removed -> removed) })(List((groupName, url, removed))) } - def updateGroupMembers(groupName: String, members: List[(String, Boolean)])(implicit s: Session): Unit = { - GroupMembers.filter(_.groupName === groupName.bind).delete + def updateGroupMembers(groupName: String, members: List[(String, Boolean)]): Unit = { + db.run( + quote { (groupName: String) => query[GroupMember].filter(_.groupName == groupName).delete } + )(List(groupName)) + members.foreach { case (userName, isManager) => - GroupMembers insert GroupMember (groupName, userName, isManager) + db.run( + quote { query[GroupMember].insert } + )(List(GroupMember(groupName, userName, isManager))) } } @@ -231,13 +229,10 @@ trait AccountService { })(userName) } - def removeUserRelatedData(userName: String)(implicit s: Session): Unit = { - // TODO db.transactionはコントローラでやる？ - db.transaction { - db.run(quote { (userName: String) => query[GroupMember].filter(_.userName == userName).delete })(List(userName)) - db.run(quote { (userName: String) => query[Collaborator].filter(_.collaboratorName == userName).delete })(List(userName)) - db.run(quote { (userName: String) => query[Repository].filter(_.userName == userName).delete })(List(userName)) - } + def removeUserRelatedData(userName: String): Unit = { + db.run(quote { (userName: String) => query[GroupMember].filter(_.userName == userName).delete })(List(userName)) + db.run(quote { (userName: String) => query[Collaborator].filter(_.collaboratorName == userName).delete })(List(userName)) + db.run(quote { (userName: String) => query[Repository].filter(_.userName == userName).delete })(List(userName)) } def getGroupNames(userName: String): List[String] = { diff --git a/src/main/scala/gitbucket/core/servlet/TransactionFilter.scala b/src/main/scala/gitbucket/core/servlet/TransactionFilter.scala index fc2e45743..8883c0993 100644 --- a/src/main/scala/gitbucket/core/servlet/TransactionFilter.scala +++ b/src/main/scala/gitbucket/core/servlet/TransactionFilter.scala @@ -4,10 +4,14 @@ import javax.servlet._ import javax.servlet.http.HttpServletRequest import com.mchange.v2.c3p0.ComboPooledDataSource import gitbucket.core.util.DatabaseConfig +import io.getquill._ +import io.getquill.naming.SnakeCase +import io.getquill.sources.sql.idiom.H2Dialect import org.scalatra.ScalatraBase import org.slf4j.LoggerFactory import slick.jdbc.JdbcBackend.{Database => SlickDatabase, Session} import gitbucket.core.util.Keys +import Database._ /** * Controls the transaction with the open session in view pattern. @@ -25,17 +29,20 @@ class TransactionFilter extends Filter { // assets don't need transaction chain.doFilter(req, res) } else { - Database() withTransaction { session => - // Register Scalatra error callback to rollback transaction - ScalatraBase.onFailure { _ => - logger.debug("Rolled back transaction") - session.rollback() - }(req.asInstanceOf[HttpServletRequest]) + db.transaction { + // TODO Delete after moving to quill + Database() withTransaction { session => + // Register Scalatra error callback to rollback transaction + ScalatraBase.onFailure { _ => + logger.debug("Rolled back transaction") + session.rollback() + }(req.asInstanceOf[HttpServletRequest]) - logger.debug("begin transaction") - req.setAttribute(Keys.Request.DBSession, session) - chain.doFilter(req, res) - logger.debug("end transaction") + logger.debug("begin transaction") + req.setAttribute(Keys.Request.DBSession, session) + chain.doFilter(req, res) + logger.debug("end transaction") + } } } } @@ -46,6 +53,9 @@ object Database { private val logger = LoggerFactory.getLogger(Database.getClass) + lazy val db = source(new JdbcSourceConfig[H2Dialect, SnakeCase]("db")) + + // TODO Delete after moving to quill private val dataSource: ComboPooledDataSource = { val ds = new ComboPooledDataSource ds.setDriverClass(DatabaseConfig.driver) @@ -56,15 +66,19 @@ object Database { ds } - private val db: SlickDatabase = { + // TODO Delete after moving to quill + private val slickDatabase: SlickDatabase = { SlickDatabase.forDataSource(dataSource) } - def apply(): SlickDatabase = db + // TODO Delete after moving to quill + def apply(): SlickDatabase = slickDatabase + // TODO Delete after moving to quill def getSession(req: ServletRequest): Session = req.getAttribute(Keys.Request.DBSession).asInstanceOf[Session] + // TODO Delete after moving to quill def closeDataSource(): Unit = dataSource.close }