getSavedSharedFolder -> getSavedSharedFolders

NDLANO · Oct 3, 2024 · 497289b · 497289b
1 parent 4ea0fdf
commit 497289b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/myndla-api/src/main/scala/no/ndla/myndlaapi/repository/FolderRepository.scala b/myndla-api/src/main/scala/no/ndla/myndlaapi/repository/FolderRepository.scala
@@ -944,7 +944,7 @@ trait FolderRepository {
       }
     }
 
-    def getSavedSharedFolder(
+    def getSavedSharedFolders(
         feideId: FeideID
     )(implicit session: DBSession = AutoSession): Try[List[Folder]] = Try {
       val f   = Folder.syntax("f")

diff --git a/myndla-api/src/main/scala/no/ndla/myndlaapi/service/FolderReadService.scala b/myndla-api/src/main/scala/no/ndla/myndlaapi/service/FolderReadService.scala
@@ -98,7 +98,7 @@ trait FolderReadService {
       folderRepository.rollbackOnFailure(session => {
         for {
           myFolders          <- folderRepository.foldersWithFeideAndParentID(None, feideId)
-          savedSharedFolders <- folderRepository.getSavedSharedFolder(feideId)
+          savedSharedFolders <- folderRepository.getSavedSharedFolders(feideId)
           folders       <- getSubFoldersAndResources(myFolders, includeSubfolders, includeResources, feideId)(session)
           sharedFolders <- getSharedSubFoldersAndResources(savedSharedFolders)(session)
 

diff --git a/myndla-api/src/main/scala/no/ndla/myndlaapi/service/FolderWriteService.scala b/myndla-api/src/main/scala/no/ndla/myndlaapi/service/FolderWriteService.scala
@@ -424,7 +424,7 @@ trait FolderWriteService {
     private def sortSavedSharedFolders(sortRequest: api.FolderSortRequest, feideId: FeideID): Try[Unit] = {
       val session = folderRepository.getSession(true)
       folderRepository
-        .getSavedSharedFolder(feideId)(session)
+        .getSavedSharedFolders(feideId)(session)
         .flatMap(savedFolders => performSort(savedFolders, sortRequest, feideId, sharedFolderSort = true))
     }
 
@@ -721,7 +721,7 @@ trait FolderWriteService {
     ): Try[SavedSharedFolder] = {
       for {
         folder       <- folderRepository.folderWithId(folderId).filter(f => f.isShared)
-        savedFolders <- folderRepository.getSavedSharedFolder(feideId)
+        savedFolders <- folderRepository.getSavedSharedFolders(feideId)
         newRank = savedFolders.length + 1
         folderUser <- folderRepository.createFolderUserConnection(folder.id, feideId, newRank)
       } yield folderUser

diff --git a/myndla-api/src/test/scala/no/ndla/myndlaapi/repository/FolderRepositoryTest.scala b/myndla-api/src/test/scala/no/ndla/myndlaapi/repository/FolderRepositoryTest.scala
@@ -644,7 +644,7 @@ class FolderRepositoryTest
 
     repository.createFolderUserConnection(folder1.id, feideId, 1).failIfFailure
 
-    val res = repository.getSavedSharedFolder(feideId)
+    val res = repository.getSavedSharedFolders(feideId)
 
     res.get should have.length(1)
     res.get should contain(folder1)
@@ -663,7 +663,7 @@ class FolderRepositoryTest
     val userFolder = repository.createFolderUserConnection(folder1.id, feideId, 1)
     val numRows    = repository.deleteFolderUserConnection(folder1.id.some, feideId.some)
 
-    val res = repository.getSavedSharedFolder(feideId).failIfFailure
+    val res = repository.getSavedSharedFolders(feideId).failIfFailure
 
     numRows.get should be(1)
     res should have.length(0)
@@ -695,15 +695,15 @@ class FolderRepositoryTest
     repository.createFolderUserConnection(folder3.id, feideId2, 1).failIfFailure
     repository.createFolderUserConnection(folder4.id, feideId2, 2).failIfFailure
 
-    val user1Shared = repository.getSavedSharedFolder(feideId1).failIfFailure
+    val user1Shared = repository.getSavedSharedFolders(feideId1).failIfFailure
     user1Shared should be(List.empty)
 
     val user1Folders = repository.foldersWithFeideAndParentID(None, feideId1).failIfFailure
     user1Folders.map { f => (f.id, f.rank) } should be(
       List((folder1.id, 1), (folder2.id, 2), (folder3.id, 3), (folder4.id, 4))
     )
 
-    val user2Shared = repository.getSavedSharedFolder(feideId2).failIfFailure
+    val user2Shared = repository.getSavedSharedFolders(feideId2).failIfFailure
     user2Shared.map { f => (f.id, f.rank) } should be(List((folder3.id, 1), (folder4.id, 2)))
 
     val user2Folders = repository.foldersWithFeideAndParentID(None, feideId2).failIfFailure

diff --git a/myndla-api/src/test/scala/no/ndla/myndlaapi/service/FolderReadServiceTest.scala b/myndla-api/src/test/scala/no/ndla/myndlaapi/service/FolderReadServiceTest.scala
@@ -231,7 +231,7 @@ class FolderReadServiceTest extends UnitTestSuite with TestEnvironment {
     when(folderRepository.insertFolder(any, any)(any)).thenReturn(Success(favoriteDomainFolder))
     when(folderRepository.foldersWithFeideAndParentID(eqTo(None), eqTo(feideId))(any)).thenReturn(Success(List.empty))
     when(folderRepository.folderWithId(eqTo(favoriteUUID))(any)).thenReturn(Success(favoriteDomainFolder))
-    when(folderRepository.getSavedSharedFolder(any)(any[DBSession])).thenReturn(Success(List.empty))
+    when(folderRepository.getSavedSharedFolders(any)(any[DBSession])).thenReturn(Success(List.empty))
     when(userRepository.userWithFeideId(any)(any[DBSession])).thenReturn(Success(None))
 
     val result = service.getFolders(includeSubfolders = false, includeResources = false, Some("token")).get.folders
@@ -271,7 +271,7 @@ class FolderReadServiceTest extends UnitTestSuite with TestEnvironment {
     when(folderRepository.insertFolder(any, any)(any)).thenReturn(Success(favoriteDomainFolder))
     when(folderRepository.foldersWithFeideAndParentID(eqTo(None), eqTo(feideId))(any)).thenReturn(Success(List.empty))
     when(folderRepository.folderWithId(eqTo(favoriteUUID))(any)).thenReturn(Success(favoriteDomainFolder))
-    when(folderRepository.getSavedSharedFolder(any)(any[DBSession])).thenReturn(Success(List(sharedFolderDomain)))
+    when(folderRepository.getSavedSharedFolders(any)(any[DBSession])).thenReturn(Success(List(sharedFolderDomain)))
     when(folderRepository.getFolderAndChildrenSubfoldersWithResources(any, any, any)(any[DBSession]))
       .thenReturn(Success(Option(sharedFolderDomain)))
     when(folderRepository.getSharedFolderAndChildrenSubfoldersWithResources(any)(any[DBSession]))
@@ -287,7 +287,7 @@ class FolderReadServiceTest extends UnitTestSuite with TestEnvironment {
 
     verify(folderRepository, times(1)).foldersWithFeideAndParentID(eqTo(None), eqTo(feideId))(any)
     verify(folderRepository, times(1)).insertFolder(any, any)(any)
-    verify(folderRepository, times(1)).getSavedSharedFolder(any)(any)
+    verify(folderRepository, times(1)).getSavedSharedFolders(any)(any)
   }
 
   test("That getFolders includes resources for the top folders when includeResources flag is set to true") {
@@ -310,7 +310,7 @@ class FolderReadServiceTest extends UnitTestSuite with TestEnvironment {
     when(folderRepository.folderWithId(eqTo(folderWithId.id))(any)).thenReturn(Success(folderWithId))
     when(folderRepository.getFolderResources(any)(any))
       .thenReturn(folderResourcesResponse1, folderResourcesResponse2, folderResourcesResponse3)
-    when(folderRepository.getSavedSharedFolder(any)(any)).thenReturn(Success(List.empty))
+    when(folderRepository.getSavedSharedFolders(any)(any)).thenReturn(Success(List.empty))
     when(userRepository.userWithFeideId(any)(any[DBSession])).thenReturn(Success(None))
 
     val result = service.getFolders(includeSubfolders = false, includeResources = true, Some("token")).get.folders

diff --git a/myndla-api/src/test/scala/no/ndla/myndlaapi/service/FolderWriteServiceTest.scala b/myndla-api/src/test/scala/no/ndla/myndlaapi/service/FolderWriteServiceTest.scala
@@ -1028,7 +1028,7 @@ class FolderWriteServiceTest extends UnitTestSuite with TestEnvironment {
     when(folderRepository.createFolderUserConnection(any, any, any)(any))
       .thenReturn(Success(SavedSharedFolder(folderId, feideId, 1)))
     when(folderRepository.folderWithId(any)(any)).thenReturn(Success(folder))
-    when(folderRepository.getSavedSharedFolder(any)(any)).thenReturn(Success(List.empty))
+    when(folderRepository.getSavedSharedFolders(any)(any)).thenReturn(Success(List.empty))
 
     val result = service.newSaveSharedFolder(folderId, Some(feideId))