Upload users info

client/src/main/scala/App.scala

@@ -26,7 +26,7 @@ object App extends JSApp {
 
   override def main() {
     val module = Angular.module("app", Seq("ngAnimate", "ngAria", "ngMaterial", "mm.foundation", "ngRoute", "ngMap",
-      "ngCookies", "angularTranslateApp", "ngSanitize", "themingAngularMaterial", "satellizer"))
+      "ngCookies", "angularTranslateApp", "ngSanitize", "themingAngularMaterial", "satellizer", "idCardUploader"))
 
     module.config(RoutingConfig)
     module.config(AuthConfig)

client/src/main/scala/idCards/idCardUploader.html

@@ -0,0 +1,7 @@
+<span class="md-primary md-fab md-button zIndex1">
+    <i class="fa fa-download"></i>
+    <input type="file"
+           app-filereader="newCard"
+           ng-model="newCard"
+           class="absolute left0 height100p" style="opacity: 0"/>
+</span>

server/app/application/Application.scala

@@ -9,6 +9,7 @@ import play.api.Logger
 import play.api.i18n.MessagesApi
 import play.api.libs.ws._
 import play.api.mvc.Action
+import userDomain.{UserMethods, Administrator, GuestUser, User}
 
 import scala.concurrent.Future
 import scala.concurrent.ExecutionContext.Implicits.global

server/app/application/CredentialsAuthController.scala

@@ -12,6 +12,7 @@ import com.mohiva.play.silhouette.impl.authenticators.CookieAuthenticator
 import com.mohiva.play.silhouette.impl.providers._
 import play.api.Configuration
 import play.api.i18n.MessagesApi
+import userDomain.User
 
 import scala.language.postfixOps
 

server/app/application/SignUpController.scala

@@ -16,6 +16,7 @@ import com.mohiva.play.silhouette.impl.providers._
 import play.api.i18n.MessagesApi
 import play.api.libs.concurrent.Execution.Implicits._
 import play.api.mvc.Action
+import userDomain.User
 
 import scala.concurrent.Future
 

server/app/application/SocialAuthController.scala

@@ -11,6 +11,7 @@ import com.mohiva.play.silhouette.impl.providers._
 import play.api.i18n.{Messages, MessagesApi}
 import play.api.libs.concurrent.Execution.Implicits._
 import play.api.mvc.Action
+import userDomain.User
 
 import scala.concurrent.Future
 import scala.util.Try

server/app/artistsDomain/ArtistController.scala

@@ -2,7 +2,7 @@ package artistsDomain
 
 import javax.inject.Inject
 
-import application.{Administrator, ThereIsNoArtistForThisFacebookIdException, User}
+import application.ThereIsNoArtistForThisFacebookIdException
 import com.mohiva.play.silhouette.api.{Environment, Silhouette}
 import com.mohiva.play.silhouette.impl.authenticators.CookieAuthenticator
 import com.mohiva.play.silhouette.impl.providers.SocialProviderRegistry
@@ -19,6 +19,7 @@ import play.api.mvc._
 import services.{LoggerHelper, Utilities}
 import trackingDomain.UserSession
 import tracksDomain.TrackMethods
+import userDomain.{Administrator, User}
 
 import scala.concurrent.Future
 import scala.language.postfixOps

server/app/database/MyDBTableDefinitions.scala

@@ -4,7 +4,6 @@ import java.sql.{JDBCType, Timestamp}
 import java.util.UUID
 
 import addresses.Address
-import application.GuestUser
 import artistsDomain.Artist
 import attendees.{FacebookAttendee, FacebookAttendeeEventRelation}
 import com.vividsolutions.jts.geom.Geometry
@@ -25,6 +24,7 @@ import tracksDomain.{Track, TrackRating}
 import tariffsDomain.Tariff
 import ticketsDomain._
 import tracksDomain.{TrackRating, Track}
+import userDomain.{IdCard, Rib, GuestUser}
 
 
 case class UserArtistRelation(userId: UUID, artistId: Long)
@@ -510,6 +510,34 @@ trait MyDBTableDefinitions extends DBTableDefinitions {
   }
   lazy val userActions = TableQuery[UserActions]
 
+  class Ribs(tag: Tag) extends Table[Rib](tag, "ribs") {
+    def id = column[Long]("id", O.PrimaryKey, O.AutoInc)
+    def bankCode = column[String]("bankcode")
+    def deskCode = column[String]("deskcode")
+    def accountNumber = column[String]("accountnumber")
+    def ribKey = column[String]("ribkey")
+    def userId = column[UUID]("userid")
+    def creationTime = column[Timestamp]("creationtime")
+
+    def * = (id.?, bankCode, deskCode, accountNumber, ribKey, userId) <>
+      ((Rib.apply _).tupled, Rib.unapply)
+
+    def aFK = foreignKey("userid", userId, slickUsers)(_.id)
+  }
+  lazy val ribs = TableQuery[Ribs]
+
+
+  class IdCards(tag: Tag) extends Table[IdCard](tag, "idcards") {
+    def uuid = column[UUID]("uuid", O.PrimaryKey)
+    def userId = column[UUID]("userid")
+    def creationTime = column[Timestamp]("creationtime")
+
+    def * = (uuid, userId) <> ((IdCard.apply _).tupled, IdCard.unapply)
+
+    def aFK = foreignKey("userid", userId, slickUsers)(_.id)
+  }
+  lazy val idCards = TableQuery[IdCards]
+
 
   lazy val artistsFollowed = TableQuery[ArtistsFollowed]
   lazy val genres = TableQuery[Genres]

server/app/eventsDomain/EventController.scala

@@ -3,12 +3,10 @@ package eventsDomain
 import javax.inject.Inject
 
 import addresses.SearchGeographicPoint
-import application.{Administrator, User}
 import com.mohiva.play.silhouette.api.{Environment, Silhouette}
 import com.mohiva.play.silhouette.impl.authenticators.CookieAuthenticator
 import com.mohiva.play.silhouette.impl.providers.SocialProviderRegistry
 import database.UserEventRelation
-import json.JsonHelper
 import json.JsonHelper._
 import org.postgresql.util.PSQLException
 import play.api.Logger
@@ -17,6 +15,7 @@ import play.api.libs.json.{JsError, JsSuccess, Json}
 import play.api.libs.ws.WSClient
 import play.api.mvc._
 import services.LoggerHelper
+import userDomain.{Administrator, User}
 
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future

server/app/fillDatabase/InitController.scala

@@ -3,7 +3,6 @@ package fillDatabase
 import javax.inject.Inject
 
 import addresses.SearchGeographicPoint
-import application.User
 import artistsDomain.ArtistMethods
 import com.mohiva.play.silhouette.api.{Environment, Silhouette}
 import com.mohiva.play.silhouette.impl.authenticators.CookieAuthenticator
@@ -15,6 +14,7 @@ import play.api.Logger
 import play.api.db.slick.{DatabaseConfigProvider, HasDatabaseConfigProvider}
 import play.api.i18n.MessagesApi
 import play.api.mvc.Action
+import userDomain.User
 
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.io.Source

server/app/issues/IssueController.scala

@@ -1,8 +1,6 @@
 package issues
 
 import javax.inject.Inject
-
-import application.User
 import com.mohiva.play.silhouette.api.{Environment, Silhouette}
 import com.mohiva.play.silhouette.impl.authenticators.CookieAuthenticator
 import com.mohiva.play.silhouette.impl.providers.SocialProviderRegistry
@@ -12,6 +10,7 @@ import play.api.i18n.MessagesApi
 import play.api.libs.json.Json
 import play.api.libs.ws.WSClient
 import play.api.mvc._
+import userDomain.User
 
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future

server/app/json/JsonHelper.scala

@@ -17,6 +17,7 @@ import tariffsDomain.Tariff
 import ticketsDomain._
 import trackingDomain.{UserAction, UserSession}
 import tracksDomain.{Track, TrackWithGenres}
+import userDomain.{IdCard, Rib, FromClientRib}
 
 object JsonHelper {
 
@@ -69,6 +70,9 @@ object JsonHelper {
   //  implicit val account4686Format: Format[Account4686] = Json.format[Account4686]
 
   implicit val genreFormat = Json.format[Genre]
+  implicit val fromClientRibFormat = Json.format[FromClientRib]
+  implicit val ribFormat = Json.format[Rib]
+  implicit val idCardFormat = Json.format[IdCard]
   implicit val trackFormat: Format[Track] = Json.format[Track]
   implicit val trackWithGenresFormat: Format[TrackWithGenres] = Json.format[TrackWithGenres]
   implicit val trackWithPlaylistRankFormat = Json.format[TrackWithPlaylistRank]
@@ -109,4 +113,6 @@ object JsonHelper {
   val readTicketBillReads: Reads[Seq[TicketBill]] = Reads.seq(__.read[TicketBill])
   val readMaybeSalableEventReads: Reads[Seq[MaybeSalableEvent]] = Reads.seq(__.read[MaybeSalableEvent])
   val readTariffReads: Reads[Seq[Tariff]] = Reads.seq(__.read[Tariff])
+  val readRibReads: Reads[Seq[Rib]] = Reads.seq(__.read[Rib])
+  val readIdCardReads: Reads[Seq[IdCard]] = Reads.seq(__.read[IdCard])
 }

server/app/organizersDomain/OrganizerController.scala

@@ -3,7 +3,6 @@ package organizersDomain
 import javax.inject.Inject
 
 import addresses.SearchGeographicPoint
-import application.{Administrator, User}
 import com.mohiva.play.silhouette.api.{Environment, Silhouette}
 import com.mohiva.play.silhouette.impl.authenticators.CookieAuthenticator
 import com.mohiva.play.silhouette.impl.providers.SocialProviderRegistry
@@ -16,6 +15,7 @@ import play.api.libs.json.Json
 import play.api.libs.ws.WSClient
 import play.api.mvc._
 import services.Utilities
+import userDomain.{Administrator, User}
 
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future

server/app/others/MailController.scala

@@ -1,6 +1,5 @@
 package others
 
-import application.User
 import play.api.Logger
 import play.api.data.Form
 import play.api.data.Forms._
@@ -15,6 +14,7 @@ import com.mohiva.play.silhouette.api.{ Environment, LogoutEvent, Silhouette }
 import com.mohiva.play.silhouette.impl.authenticators.CookieAuthenticator
 import com.mohiva.play.silhouette.impl.providers.SocialProviderRegistry
 import play.api.i18n.MessagesApi
+import userDomain.User
 
 class MailController @Inject()(ws: WSClient,
                                val messagesApi: MessagesApi,

server/app/placesDomain/PlaceController.scala

@@ -2,8 +2,7 @@ package placesDomain
 
 import javax.inject.Inject
 
-import addresses.{SearchGeographicPoint, AddressFormsTrait}
-import application.{Administrator, User}
+import addresses.{AddressFormsTrait, SearchGeographicPoint}
 import com.mohiva.play.silhouette.api.{Environment, Silhouette}
 import com.mohiva.play.silhouette.impl.authenticators.CookieAuthenticator
 import com.mohiva.play.silhouette.impl.providers.SocialProviderRegistry
@@ -17,6 +16,7 @@ import play.api.libs.json.Json
 import play.api.libs.ws.WSClient
 import play.api.mvc._
 import services.Utilities
+import userDomain.{Administrator, User}
 
 import scala.concurrent.Future
 import scala.util.{Failure, Success}

server/app/playlistsDomain/PlaylistController.scala

@@ -1,8 +1,6 @@
 package playlistsDomain
 
 import javax.inject.Inject
-
-import application.User
 import com.mohiva.play.silhouette.api.{Environment, Silhouette}
 import com.mohiva.play.silhouette.impl.authenticators.CookieAuthenticator
 import com.mohiva.play.silhouette.impl.providers.SocialProviderRegistry
@@ -11,6 +9,7 @@ import play.api.Logger
 import play.api.i18n.MessagesApi
 import play.api.libs.json.Json
 import play.api.libs.ws.WSClient
+import userDomain.User
 
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future

server/app/services/UserService.scala

@@ -1,8 +1,8 @@
 package services
 
-import application.User
 import com.mohiva.play.silhouette.api.services.IdentityService
 import com.mohiva.play.silhouette.impl.providers.CommonSocialProfile
+import userDomain.User
 
 import scala.concurrent.Future
 

server/app/services/UserServiceImplementation.scala

@@ -2,12 +2,11 @@ package services
 
 import java.util.UUID
 import javax.inject.Inject
-
-import application.User
 import com.mohiva.play.silhouette.api.LoginInfo
 import com.mohiva.play.silhouette.impl.providers.CommonSocialProfile
 import play.api.libs.concurrent.Execution.Implicits._
 import silhouette.UserDAO
+import userDomain.User
 
 import scala.concurrent.Future
 

server/app/silhouette/SilhouetteModule.scala

@@ -1,7 +1,6 @@
 package silhouette
 
 import _root_.services.{UserService, UserServiceImplementation}
-import application.User
 import com.google.inject.{AbstractModule, Provides}
 import com.mohiva.play.silhouette.api.repositories.AuthInfoRepository
 import com.mohiva.play.silhouette.api.services._
@@ -27,6 +26,7 @@ import play.api.Configuration
 import play.api.libs.concurrent.Execution.Implicits._
 import play.api.libs.openid.OpenIdClient
 import play.api.libs.ws.WSClient
+import userDomain.User
 
 /**
  * The Guice module which wires all Silhouette dependencies.

server/app/silhouette/UserDAO.scala

@@ -1,9 +1,8 @@
 package silhouette
 
 import java.util.UUID
-
-import application.User
 import com.mohiva.play.silhouette.api.LoginInfo
+import userDomain.User
 
 import scala.concurrent.Future
 

server/app/silhouette/UserDAOImpl.scala

@@ -1,13 +1,13 @@
 package silhouette
 
 import java.util.UUID
-import application.User
 import com.mohiva.play.silhouette.api.LoginInfo
 import database.MyPostgresDriver
 import play.api.libs.concurrent.Execution.Implicits.defaultContext
 import slick.dbio.DBIOAction
 import javax.inject.Inject
 import play.api.db.slick.DatabaseConfigProvider
+import userDomain.User
 import scala.concurrent.Future
 import MyPostgresDriver.api._
 

server/app/tariffsDomain/TariffController.scala

@@ -2,7 +2,6 @@ package tariffsDomain
 
 import javax.inject.Inject
 
-import application.{Administrator, User}
 import com.mohiva.play.silhouette.api.{Environment, Silhouette}
 import com.mohiva.play.silhouette.impl.authenticators.CookieAuthenticator
 import json.JsonHelper._
@@ -11,6 +10,7 @@ import play.api.Logger
 import play.api.i18n.MessagesApi
 import play.api.libs.json.Json
 import play.api.mvc._
+import userDomain.{Administrator, User}
 
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.language.postfixOps