Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix : mediator add to alias should not store duplicated alias #19

Merged
merged 2 commits into from
Jun 27, 2023
Merged

fix : mediator add to alias should not store duplicated alias #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ab9d18
add to alias is a set, and not duplicates fixed ussing mongo addtoset
mineme0110 Jun 26, 2023
7527f0e
Added tests and Updated the reposne to nochnage in case of the noupda…
mineme0110 Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions mediator/src/main/scala/io/iohk/atala/mediator/db/UserAccountRepo.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ class UserAccountRepo(reactiveMongoApi: ReactiveMongoApi)(using ec: ExecutionCon

}

def addAlias(owner: DIDSubject, newAlias: DIDSubject): ZIO[Any, StorageError, Either[String, Unit]] = {
def addAlias(owner: DIDSubject, newAlias: DIDSubject): ZIO[Any, StorageError, Either[String, Int]] = {
def selector: BSONDocument = BSONDocument("did" -> owner)

def update: BSONDocument = BSONDocument(
"$push" -> BSONDocument(
"$addToSet" -> BSONDocument(
"alias" -> newAlias
)
)
Expand All @@ -85,11 +85,11 @@ class UserAccountRepo(reactiveMongoApi: ReactiveMongoApi)(using ec: ExecutionCon
)
.tapError(err => ZIO.logError(s"addAlias : ${err.getMessage}"))
.mapError(ex => StorageThrowable(ex))
} yield Right(())
} yield Right(result.nModified)

}

def removeAlias(owner: DIDSubject, newAlias: DIDSubject): ZIO[Any, StorageError, Either[String, Unit]] = {
def removeAlias(owner: DIDSubject, newAlias: DIDSubject): ZIO[Any, StorageError, Either[String, Int]] = {
def selector: BSONDocument = BSONDocument("did" -> owner)
def update: BSONDocument = BSONDocument(
"$pull" -> BSONDocument(
Expand All @@ -107,7 +107,7 @@ class UserAccountRepo(reactiveMongoApi: ReactiveMongoApi)(using ec: ExecutionCon
)
.tapError(err => ZIO.logError(s"removeAlias : ${err.getMessage}"))
.mapError(ex => StorageThrowable(ex))
} yield Right(())
} yield Right(result.nModified)

}

Expand Down
2 changes: 2 additions & 0 deletions mediator/src/main/scala/io/iohk/atala/mediator/protocols/MediatorCoordinationExecuter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,13 @@ object MediatorCoordinationExecuter extends ProtocolExecuterWithServices[Protoco
case (fromto, KeylistAction.add) =>
repo.addAlias(m.from.toDID, fromto.toDID).map {
case Left(value) => (fromto, KeylistAction.add, KeylistResult.server_error)
case Right(0) => (fromto, KeylistAction.add, KeylistResult.no_change)
case Right(newState) => (fromto, KeylistAction.add, KeylistResult.success)
}
case (fromto, KeylistAction.remove) =>
repo.removeAlias(m.from.toDID, fromto.toDID).map {
case Left(value) => (fromto, KeylistAction.remove, KeylistResult.server_error)
case Right(0) => (fromto, KeylistAction.remove, KeylistResult.no_change)
case Right(newState) => (fromto, KeylistAction.remove, KeylistResult.success)
}
}
Expand Down
36 changes: 31 additions & 5 deletions mediator/src/test/scala/io/iohk/atala/mediator/db/UserAccountRepoSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,27 +61,53 @@ object UserAccountRepoSpec extends ZIOSpecDefault with AccountStubSetup {
assertTrue(result.isEmpty)
}
},
test("Add alias to existing Did Account return right") {
test("Add alias to existing Did Account return right nModified value 1") {
for {
userAccount <- ZIO.service[UserAccountRepo]
result <- userAccount.addAlias(DIDSubject(alice), DIDSubject(bob))
didAccount <- userAccount.getDidAccount(DIDSubject(alice))
} yield {
assertTrue(result.isRight)
assertTrue(result == Right(()))
assertTrue(result == Right((1)))
assertTrue(didAccount.isDefined)
val alias: Seq[String] = didAccount.map(_.alias.map(_.did)).getOrElse(Seq.empty)
assertTrue(alias == Seq(alice, bob))
}
},
test("Remove alias to existing Did Account should return right") {
test("Add same alias to existing Did Account return right with nModified value 0") {
for {
userAccount <- ZIO.service[UserAccountRepo]
result <- userAccount.addAlias(DIDSubject(alice), DIDSubject(alice))
didAccount <- userAccount.getDidAccount(DIDSubject(alice))
} yield {
assertTrue(result.isRight)
assertTrue(result == Right(0))
assertTrue(didAccount.isDefined)
val alias: Seq[String] = didAccount.map(_.alias.map(_.did)).getOrElse(Seq.empty)
assertTrue(alias == Seq(alice, bob))
}
},
test("Remove alias to existing Did Account should return right with nModified value 1 ") {
for {
userAccount <- ZIO.service[UserAccountRepo]
result <- userAccount.removeAlias(DIDSubject(alice), DIDSubject(bob))
didAccount <- userAccount.getDidAccount(DIDSubject(alice))
} yield {
assertTrue(result.isRight)
assertTrue(result == Right(1))
assertTrue(didAccount.isDefined)
val alias: Seq[String] = didAccount.map(_.alias.map(_.did)).getOrElse(Seq.empty)
assertTrue(alias == Seq(alice))
}
},
test("Remove alias to unknown or unregister alias Did should return right with noModified value 0") {
for {
userAccount <- ZIO.service[UserAccountRepo]
result <- userAccount.removeAlias(DIDSubject(alice), DIDSubject(bob))
didAccount <- userAccount.getDidAccount(DIDSubject(alice))
} yield {
assertTrue(result.isRight)
assertTrue(result == Right(()))
assertTrue(result == Right(0))
assertTrue(didAccount.isDefined)
val alias: Seq[String] = didAccount.map(_.alias.map(_.did)).getOrElse(Seq.empty)
assertTrue(alias == Seq(alice))
Expand All @@ -98,7 +124,7 @@ object UserAccountRepoSpec extends ZIOSpecDefault with AccountStubSetup {
didAccount <- userAccount.getDidAccount(DIDSubject(alice))
} yield {
assertTrue(result.isRight)
assertTrue(result == Right(()))
assertTrue(result == Right(1))
assertTrue(msgAdded.writeErrors == Nil)
assertTrue(msgAdded.n == 1)
assertTrue(addedToInbox == 1)
Expand Down
Loading