diff --git a/federation-controller-backend/src/main/scala/acab/devcon0/domain/adapters/federation/IpfsCidDeltaQueryHandlerImpl.scala b/federation-controller-backend/src/main/scala/acab/devcon0/domain/adapters/federation/IpfsCidDeltaQueryHandlerImpl.scala index e113f93d25c1bfe0f124eaa523b10765476f1e98..6ffb8a09c067ffabcbf7873bf3ccf86d212cbcc8 100644 --- a/federation-controller-backend/src/main/scala/acab/devcon0/domain/adapters/federation/IpfsCidDeltaQueryHandlerImpl.scala +++ b/federation-controller-backend/src/main/scala/acab/devcon0/domain/adapters/federation/IpfsCidDeltaQueryHandlerImpl.scala @@ -5,8 +5,8 @@ import acab.devcon0.domain.ports.input._ import acab.devcon0.domain.ports.input.federation.IpfsCidDeltaQuery import acab.devcon0.domain.ports.input.federation.IpfsCidDeltaQueryHandler import acab.devcon0.domain.service._ -import acab.devcon0.domain.service.federationmember.ChangelogService import acab.devcon0.domain.service.federationmember.CidsService +import acab.devcon0.domain.service.federationmember.InformationService import acab.devcon0.trile.domain.dtos.aliases.FederationMemberId import acab.devcon0.trile.domain.dtos.aliases.IpfsCid import cats.effect.IO @@ -16,7 +16,7 @@ import org.typelevel.log4cats.slf4j.Slf4jLogger class IpfsCidDeltaQueryHandlerImpl( federationMemberCidsService: CidsService[IO], - federationMemberChangelogService: ChangelogService[IO] + federationMemberInformationService: InformationService[IO] ) extends IpfsCidDeltaQueryHandler { implicit val logger: Logger[IO] = Slf4jLogger.getLogger[IO] @@ -34,7 +34,7 @@ class IpfsCidDeltaQueryHandlerImpl( } private def getExistsInOtherMembers(ipfsCids: List[IpfsCid], id: FederationMemberId): IO[List[IpfsCid]] = { - getOtherMembersRootCid(id) + getOtherMembersSharedFolderCid(id) .flatMap(getExistingInOtherMembers(ipfsCids, _)) } @@ -42,15 +42,14 @@ class IpfsCidDeltaQueryHandlerImpl( ipfsCids: List[IpfsCid], membersRootIpfsCid: List[(FederationMemberId, IpfsCid)] ): IO[List[IpfsCid]] = { - for - existsResult: List[(IpfsCid, Boolean)] <- membersRootIpfsCid + for existsResult: List[(IpfsCid, Boolean)] <- membersRootIpfsCid .flatTraverse(tuple => federationMemberCidsService.exists(tuple._1, tuple._2, ipfsCids)) yield existsResult.filter(_._2).map(_._1) } - private def getOtherMembersRootCid(id: FederationMemberId): IO[List[(FederationMemberId, IpfsCid)]] = { - federationMemberChangelogService.getNewest - .map(_.filterNot(_._1 == id).map(tuple => (tuple._1, tuple._2.ipfsCid))) + private def getOtherMembersSharedFolderCid(id: FederationMemberId): IO[List[(FederationMemberId, IpfsCid)]] = { + federationMemberInformationService.getAll + .map(_.filter(_.id.equals(id)).map(information => (information.id, information.sharedFolderCid))) } }