Removed authentication and core module separation

* done for simplification. Previous approach could be confusing for newcomers

README.md

@@ -34,7 +34,7 @@ Compile time dependency injection is used.
 # Security
 
 Pack4j is used to simplify JWT authentication implementation. Generally authentication is implemented as external module implementing
-core's API's (`core.authentication.api`). The idea behind it was to allow replacing module's implementation without touching core's code.
+core's API's (`authentication.api`). The idea behind it was to allow replacing module's implementation without touching core's code.
 
 # Database
 

app/core/articles/ArticleComponents.scala → app/articles/ArticleComponents.scala

@@ -1,15 +1,15 @@
-package core.articles
+package articles
 
 import com.softwaremill.macwire.wire
-import commons.CommonsComponents
 import commons.config.{WithControllerComponents, WithExecutionContextComponents}
 import commons.models._
-import core.articles.controllers.{ArticleController, CommentController, TagController}
-import core.articles.models.{ArticleMetaModel, CommentId, MainFeedPageRequest, UserFeedPageRequest}
-import core.articles.repositories._
-import core.articles.services._
-import core.authentication.api.AuthenticatedActionBuilder
-import core.users.UserComponents
+import articles.controllers.{ArticleController, CommentController, TagController}
+import articles.models.{ArticleMetaModel, CommentId, MainFeedPageRequest, UserFeedPageRequest}
+import articles.repositories._
+import articles.services._
+import authentication.api.AuthenticatedActionBuilder
+import commons.CommonsComponents
+import users.UserComponents
 import play.api.routing.Router
 import play.api.routing.sird._
 

app/core/articles/controllers/ArticleController.scala → app/articles/controllers/ArticleController.scala

@@ -1,12 +1,12 @@
-package core.articles.controllers
+package articles.controllers
 
 import commons.exceptions.MissingModelException
 import commons.services.ActionRunner
-import core.articles.exceptions.AuthorMismatchException
-import core.articles.models._
-import core.articles.services.{ArticleReadService, ArticleWriteService}
-import core.authentication.api.{AuthenticatedActionBuilder, OptionallyAuthenticatedActionBuilder}
-import core.commons.controllers.RealWorldAbstractController
+import articles.exceptions.AuthorMismatchException
+import articles.models._
+import articles.services.{ArticleReadService, ArticleWriteService}
+import authentication.api.{AuthenticatedActionBuilder, OptionallyAuthenticatedActionBuilder}
+import commons.controllers.RealWorldAbstractController
 import org.apache.commons.lang3.StringUtils
 import play.api.libs.json._
 import play.api.mvc.{Action, AnyContent, ControllerComponents}

app/core/articles/controllers/CommentController.scala → app/articles/controllers/CommentController.scala

@@ -1,12 +1,12 @@
-package core.articles.controllers
+package articles.controllers
 
 import commons.exceptions.MissingModelException
 import commons.services.ActionRunner
-import core.articles.exceptions.AuthorMismatchException
-import core.articles.models._
-import core.articles.services.CommentService
-import core.authentication.api.{AuthenticatedActionBuilder, OptionallyAuthenticatedActionBuilder}
-import core.commons.controllers.RealWorldAbstractController
+import articles.exceptions.AuthorMismatchException
+import articles.models._
+import articles.services.CommentService
+import authentication.api.{AuthenticatedActionBuilder, OptionallyAuthenticatedActionBuilder}
+import commons.controllers.RealWorldAbstractController
 import org.apache.commons.lang3.StringUtils
 import play.api.libs.json._
 import play.api.mvc.{Action, AnyContent, ControllerComponents}

app/core/articles/controllers/TagController.scala → app/articles/controllers/TagController.scala

@@ -1,9 +1,9 @@
-package core.articles.controllers
+package articles.controllers
 
 import commons.services.ActionRunner
-import core.articles.models._
-import core.articles.services.TagService
-import core.commons.controllers.RealWorldAbstractController
+import articles.models._
+import articles.services.TagService
+import commons.controllers.RealWorldAbstractController
 import play.api.libs.json._
 import play.api.mvc.{Action, AnyContent, ControllerComponents}
 

app/core/articles/exceptions/AuthorMismatchException.scala → app/articles/exceptions/AuthorMismatchException.scala

@@ -1,7 +1,7 @@
-package core.articles.exceptions
+package articles.exceptions
 
 import commons.models.BaseId
-import core.users.models.UserId
+import users.models.UserId
 
 class AuthorMismatchException(notAuthorId: UserId, modelId: BaseId[_])
   extends RuntimeException(s"user $notAuthorId is not author of $modelId")

app/core/articles/models/Article.scala → app/articles/models/Article.scala

@@ -1,9 +1,9 @@
-package core.articles.models
+package articles.models
 
 import java.time.Instant
 
 import commons.models.{BaseId, IdMetaModel, Property, WithId}
-import core.users.models.UserId
+import users.models.UserId
 import play.api.libs.json._
 import slick.jdbc.H2Profile.api.{DBIO => _, MappedTo => _, Rep => _, TableQuery => _, _}
 

app/core/articles/models/ArticlePage.scala → app/articles/models/ArticlePage.scala

@@ -1,4 +1,4 @@
-package core.articles.models
+package articles.models
 
 import play.api.libs.json.{Format, Json}
 

app/core/articles/models/ArticleTagAssociation.scala → app/articles/models/ArticleTagAssociation.scala

@@ -1,5 +1,5 @@
 
-package core.articles.models
+package articles.models
 
 import commons.models.{BaseId, IdMetaModel, Property, WithId}
 import play.api.libs.json._

app/core/articles/models/ArticleUpdate.scala → app/articles/models/ArticleUpdate.scala

@@ -1,4 +1,4 @@
-package core.articles.models
+package articles.models
 
 import play.api.libs.json.{Format, Json}
 

app/core/articles/models/ArticleUpdateWrapper.scala → app/articles/models/ArticleUpdateWrapper.scala

@@ -1,4 +1,4 @@
-package core.articles.models
+package articles.models
 
 import play.api.libs.json.{Format, Json}
 

app/core/articles/models/ArticleWithTags.scala → app/articles/models/ArticleWithTags.scala

@@ -1,8 +1,8 @@
-package core.articles.models
+package articles.models
 
 import java.time.Instant
 
-import core.users.models.Profile
+import users.models.Profile
 import play.api.libs.json.{Format, Json}
 
 case class ArticleWithTags(id: ArticleId,

app/core/articles/models/ArticleWrapper.scala → app/articles/models/ArticleWrapper.scala

@@ -1,4 +1,4 @@
-package core.articles.models
+package articles.models
 
 import play.api.libs.json.{Format, Json}
 

app/core/articles/models/Comment.scala → app/articles/models/Comment.scala

@@ -1,10 +1,10 @@
 
-package core.articles.models
+package articles.models
 
 import java.time.Instant
 
 import commons.models.{BaseId, IdMetaModel, Property, WithId}
-import core.users.models.UserId
+import users.models.UserId
 import play.api.libs.json._
 import slick.jdbc.H2Profile.api.{DBIO => _, MappedTo => _, Rep => _, TableQuery => _, _}
 

app/core/articles/models/CommentList.scala → app/articles/models/CommentList.scala

@@ -1,4 +1,4 @@
-package core.articles.models
+package articles.models
 
 import play.api.libs.json.{Format, Json}
 

app/core/articles/models/CommentWithAuthor.scala → app/articles/models/CommentWithAuthor.scala

@@ -1,9 +1,9 @@
 
-package core.articles.models
+package articles.models
 
 import java.time.Instant
 
-import core.users.models.Profile
+import users.models.Profile
 import play.api.libs.json._
 
 case class CommentWithAuthor(id: CommentId,

app/core/articles/models/CommentWrapper.scala → app/articles/models/CommentWrapper.scala

@@ -1,5 +1,5 @@
 
-package core.articles.models
+package articles.models
 
 import play.api.libs.json.{Format, Json}
 

app/core/articles/models/FavoriteAssociation.scala → app/articles/models/FavoriteAssociation.scala

@@ -1,8 +1,8 @@
 
-package core.articles.models
+package articles.models
 
 import commons.models.{BaseId, IdMetaModel, Property, WithId}
-import core.users.models.UserId
+import users.models.UserId
 import slick.jdbc.MySQLProfile.api.{DBIO => _, MappedTo => _, Rep => _, TableQuery => _, _}
 
 case class FavoriteAssociation(id: FavoriteAssociationId, userId: UserId, favoritedId: ArticleId)

app/core/articles/models/MainFeedPageRequest.scala → app/articles/models/MainFeedPageRequest.scala

@@ -1,4 +1,4 @@
-package core.articles.models
+package articles.models
 
 import commons.models.{Ordering, Username}
 

app/core/articles/models/NewArticle.scala → app/articles/models/NewArticle.scala

@@ -1,7 +1,7 @@
-package core.articles.models
+package articles.models
 
 import commons.repositories.DateTimeProvider
-import core.users.models.UserId
+import users.models.UserId
 import play.api.libs.json.{Format, Json}
 
 case class NewArticle(title: String, description: String, body: String, tagList: Seq[String]) {

app/core/articles/models/NewArticleWrapper.scala → app/articles/models/NewArticleWrapper.scala

@@ -1,4 +1,4 @@
-package core.articles.models
+package articles.models
 
 import play.api.libs.json.{Format, Json}
 

app/core/articles/models/NewComment.scala → app/articles/models/NewComment.scala

@@ -1,5 +1,5 @@
 
-package core.articles.models
+package articles.models
 
 import play.api.libs.json._
 

app/core/articles/models/NewCommentWrapper.scala → app/articles/models/NewCommentWrapper.scala

@@ -1,5 +1,5 @@
 
-package core.articles.models
+package articles.models
 
 import play.api.libs.json._
 

app/core/articles/models/NewTag.scala → app/articles/models/NewTag.scala

@@ -1,4 +1,4 @@
-package core.articles.models
+package articles.models
 
 case class NewTag(name: String) {
   def toTag: Tag = {

app/core/articles/models/Tag.scala → app/articles/models/Tag.scala

@@ -1,4 +1,4 @@
-package core.articles.models
+package articles.models
 
 import commons.models.{BaseId, IdMetaModel, Property, WithId}
 import slick.jdbc.H2Profile.api.{DBIO => _, MappedTo => _, Rep => _, TableQuery => _, _}

app/core/articles/models/TagListWrapper.scala → app/articles/models/TagListWrapper.scala

@@ -1,4 +1,4 @@
-package core.articles.models
+package articles.models
 
 import play.api.libs.json.{Format, Json}
 

app/core/articles/models/UserFeedPageRequest.scala → app/articles/models/UserFeedPageRequest.scala

@@ -1,4 +1,4 @@
-package core.articles.models
+package articles.models
 
 import commons.models.Ordering
 

app/core/articles/repositories/ArticleRepo.scala → app/articles/repositories/ArticleRepo.scala

@@ -1,4 +1,4 @@
-package core.articles.repositories
+package articles.repositories
 
 import java.time.Instant
 
@@ -7,9 +7,9 @@ import commons.models._
 import commons.repositories._
 import commons.repositories.mappings.JavaTimeDbMappings
 import commons.utils.DbioUtils
-import core.articles.models.{Tag => _, _}
-import core.users.models.{User, UserId}
-import core.users.repositories.{FollowAssociationRepo, UserRepo, UserTable}
+import articles.models.{Tag => _, _}
+import users.models.{User, UserId}
+import users.repositories.{FollowAssociationRepo, UserRepo, UserTable}
 import org.apache.commons.lang3.StringUtils
 import slick.dbio.DBIO
 import slick.jdbc.H2Profile.api.{DBIO => _, MappedTo => _, Rep => _, TableQuery => _, _}

app/core/articles/repositories/ArticleTagAssociationRepo.scala → app/articles/repositories/ArticleTagAssociationRepo.scala

@@ -1,10 +1,10 @@
 
-package core.articles.repositories
+package articles.repositories
 
 import commons.models.{IdMetaModel, Property}
 import commons.repositories._
-import core.articles.models
-import core.articles.models.{Tag => _, _}
+import articles.models
+import articles.models.{Tag => _, _}
 import slick.dbio.DBIO
 import slick.jdbc.H2Profile.api.{DBIO => _, MappedTo => _, Rep => _, TableQuery => _, _}
 import slick.lifted.{ProvenShape, _}

app/core/articles/repositories/ArticleWithTagsRepo.scala → app/articles/repositories/ArticleWithTagsRepo.scala

@@ -1,9 +1,9 @@
-package core.articles.repositories
+package articles.repositories
 
 import commons.models.{Email, Page}
-import core.articles.models._
-import core.users.models.{Profile, User, UserId}
-import core.users.repositories.{ProfileRepo, UserRepo}
+import articles.models._
+import users.models.{Profile, User, UserId}
+import users.repositories.{ProfileRepo, UserRepo}
 import slick.dbio.DBIO
 
 import scala.concurrent.ExecutionContext

app/core/articles/repositories/CommentRepo.scala → app/articles/repositories/CommentRepo.scala

@@ -1,14 +1,14 @@
 
-package core.articles.repositories
+package articles.repositories
 
 import java.time.Instant
 
 import commons.models._
 import commons.repositories._
 import commons.repositories.mappings.JavaTimeDbMappings
-import core.articles.models.{Tag => _, _}
-import core.users.models.{User, UserId}
-import core.users.repositories.UserRepo
+import articles.models.{Tag => _, _}
+import users.models.{User, UserId}
+import users.repositories.UserRepo
 import slick.dbio.DBIO
 import slick.jdbc.H2Profile.api.{DBIO => _, MappedTo => _, Rep => _, TableQuery => _, _}
 import slick.lifted.{ProvenShape, _}

app/core/articles/repositories/CommentWithAuthorRepo.scala → app/articles/repositories/CommentWithAuthorRepo.scala

@@ -1,10 +1,10 @@
 
-package core.articles.repositories
+package articles.repositories
 
 import commons.models._
-import core.articles.models._
-import core.users.models.{Profile, UserId}
-import core.users.repositories.ProfileRepo
+import articles.models._
+import users.models.{Profile, UserId}
+import users.repositories.ProfileRepo
 import slick.dbio.DBIO
 
 import scala.concurrent.ExecutionContext

app/core/articles/repositories/FavoriteAssociationRepo.scala → app/articles/repositories/FavoriteAssociationRepo.scala

@@ -1,10 +1,10 @@
 
-package core.articles.repositories
+package articles.repositories
 
 import commons.models.{IdMetaModel, Property}
 import commons.repositories._
-import core.articles.models.{ArticleId, FavoriteAssociation, FavoriteAssociationId, FavoriteAssociationMetaModel}
-import core.users.models.UserId
+import articles.models.{ArticleId, FavoriteAssociation, FavoriteAssociationId, FavoriteAssociationMetaModel}
+import users.models.UserId
 import slick.dbio.DBIO
 import slick.jdbc.MySQLProfile.api.{DBIO => _, MappedTo => _, Rep => _, TableQuery => _, _}
 import slick.lifted.{ProvenShape, _}

app/core/articles/repositories/TagRepo.scala → app/articles/repositories/TagRepo.scala

@@ -1,9 +1,9 @@
-package core.articles.repositories
+package articles.repositories
 
 import commons.models.{IdMetaModel, Property}
 import commons.repositories._
 import commons.repositories.mappings.JavaTimeDbMappings
-import core.articles.models.{Tag, TagId, TagMetaModel}
+import articles.models.{Tag, TagId, TagMetaModel}
 import slick.dbio.{DBIO, Effect}
 import slick.jdbc.H2Profile.api.{DBIO => _, MappedTo => _, Rep => _, TableQuery => _, _}
 import slick.lifted.{ProvenShape, _}

app/core/articles/services/ArticleCreateUpdateService.scala → app/articles/services/ArticleCreateUpdateService.scala

@@ -1,12 +1,12 @@
-package core.articles.services
+package articles.services
 
 import commons.exceptions.ValidationException
 import commons.models.Email
 import commons.repositories.DateTimeProvider
 import commons.utils.DbioUtils
-import core.articles.models._
-import core.articles.repositories.{ArticleRepo, ArticleTagAssociationRepo, ArticleWithTagsRepo, TagRepo}
-import core.users.repositories.UserRepo
+import articles.models._
+import articles.repositories.{ArticleRepo, ArticleTagAssociationRepo, ArticleWithTagsRepo, TagRepo}
+import users.repositories.UserRepo
 import slick.dbio.DBIO
 
 import scala.concurrent.ExecutionContext

app/core/articles/services/ArticleDeleteService.scala → app/articles/services/ArticleDeleteService.scala

@@ -1,10 +1,10 @@
-package core.articles.services
+package articles.services
 
 import commons.models.Email
-import core.articles.exceptions.AuthorMismatchException
-import core.articles.models.Article
-import core.articles.repositories._
-import core.users.repositories.UserRepo
+import articles.exceptions.AuthorMismatchException
+import articles.models.Article
+import articles.repositories._
+import users.repositories.UserRepo
 import slick.dbio.DBIO
 
 import scala.concurrent.ExecutionContext