artin/OBP-API
1
0
Fork 0
mirror of https://github.com/OpenBankProject/OBP-API.git synced 2026-02-06 16:56:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

feature/Add the Field ResourceUser.Deleted

Browse Source
This commit is contained in:
Marko Milić 2021-07-14 14:55:06 +02:00
parent 7a8f2247cd
commit 192ecbd674
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
View File

@ -1386,15 +1386,14 @@ def restoreSomeSessions(): Unit = {
def scrambleAuthUser(userPrimaryKey: UserPrimaryKey): Box[Boolean] = tryo {
AuthUser.find(By(AuthUser.user, userPrimaryKey.value)) match {
case Full(user) =>
val newUser = user.firstName(Helpers.randomString(user.firstName.get.length))
val scrambledUser = user.firstName(Helpers.randomString(16))
.email(Helpers.randomString(10) + "@example.com")
.username(Helpers.randomString(user.username.get.length))
.firstName(Helpers.randomString(user.firstName.get.length))
.lastName(Helpers.randomString(user.lastName.get.length))
.password(Helpers.randomString(40))
.username("DELETED-" + Helpers.randomString(16))
.firstName(Helpers.randomString(16))
.lastName(Helpers.randomString(16))
.password(Helpers.randomString(40))
.validated(false)
newUser.save()
scrambledUser.save()
case _ => false
}
}

4
obp-api/src/main/scala/code/model/dataAccess/ResourceUser.scala
View File

@ -78,6 +78,9 @@ class ResourceUser extends LongKeyedMapper[ResourceUser] with User with ManyToMa
object Company extends MappedString(this, 50)
object CreatedByConsentId extends MappedString(this, 100)
object CreatedByUserInvitationId extends MappedString(this, 100)
object Deleted extends MappedBoolean(this) {
override def defaultValue = false
}
def emailAddress = {
val e = email.get
@ -105,6 +108,7 @@ class ResourceUser extends LongKeyedMapper[ResourceUser] with User with ManyToMa
override def createdByConsentId = if(CreatedByConsentId.get == null) None else if (CreatedByConsentId.get.isEmpty) None else Some(CreatedByConsentId.get) //null --> None
override def createdByUserInvitationId = if(CreatedByUserInvitationId.get == null) None else if (CreatedByUserInvitationId.get.isEmpty) None else Some(CreatedByUserInvitationId.get) //null --> None
def deleted: Boolean = if(Deleted.get == null) false else Deleted.get // null --> false
}
object ResourceUser extends ResourceUser with LongKeyedMetaMapper[ResourceUser]{

5
obp-api/src/main/scala/code/users/LiftUsers.scala
View File

@ -260,9 +260,8 @@ object LiftUsers extends Users with MdcLoggable{
u <- ResourceUser.find(By(ResourceUser.id, userPrimaryKey.value))
} yield {
u
.name_(Helpers.randomString(u.name.length))
.Company(Helpers.randomString(u.company.length))
.email(Helpers.randomString(10) + "@example.com")
.Company(Helpers.randomString(16))
.Deleted(true)
.save()
}
}