Remove shareName

NDLANO · Jan 24, 2025 · 0dec966 · 0dec966
1 parent bcc5be2
commit 0dec966
Show file tree

Hide file tree

Showing 16 changed files with 8 additions and 52 deletions.
diff --git a/common/src/main/scala/no/ndla/common/model/api/myndla/MyNDLAUserDTO.scala b/common/src/main/scala/no/ndla/common/model/api/myndla/MyNDLAUserDTO.scala
@@ -36,7 +36,6 @@ case class MyNDLAUserDTO(
     @description("User groups") groups: Seq[MyNDLAGroupDTO],
     @description("Whether arena is explicitly enabled for the user") arenaEnabled: Boolean,
     @description("Whether the user has accepted the use of arena") arenaAccepted: Boolean,
-    @description("Whether users name is shared with folders or not") shareName: Boolean,
     @description("Arena user groups") arenaGroups: List[ArenaGroup]
 )
 
@@ -50,8 +49,6 @@ case class UpdatedMyNDLAUserDTO(
     favoriteSubjects: Option[Seq[String]],
     @description("Whether arena should explicitly be enabled for the user")
     arenaEnabled: Option[Boolean],
-    @description("Whether users name should be shared with folder or not")
-    shareName: Option[Boolean],
     @description("Which arena groups the user should be in, only modifiable by admins")
     arenaGroups: Option[List[ArenaGroup]],
     @description("Whether the user has accepted the use of arena")

diff --git a/common/src/main/scala/no/ndla/common/model/domain/myndla/MyNDLAUser.scala b/common/src/main/scala/no/ndla/common/model/domain/myndla/MyNDLAUser.scala
@@ -24,8 +24,7 @@ case class MyNDLAUser(
     email: String,
     arenaEnabled: Boolean,
     arenaAccepted: Boolean,
-    arenaGroups: List[ArenaGroup],
-    shareName: Boolean
+    arenaGroups: List[ArenaGroup]
 ) {
   // Keeping FEIDE and our data in sync
   def wasUpdatedLast24h: Boolean = NDLADate.now().isBefore(lastUpdated.minusSeconds(10))

diff --git a/common/src/main/scala/no/ndla/common/model/domain/myndla/MyNDLAUserDocument.scala b/common/src/main/scala/no/ndla/common/model/domain/myndla/MyNDLAUserDocument.scala
@@ -23,8 +23,7 @@ case class MyNDLAUserDocument(
     email: String,
     arenaEnabled: Boolean,
     arenaAccepted: Boolean,
-    arenaGroups: List[ArenaGroup],
-    shareName: Boolean
+    arenaGroups: List[ArenaGroup]
 ) {
   def toFullUser(id: Long, feideId: String): MyNDLAUser = {
     MyNDLAUser(
@@ -40,7 +39,6 @@ case class MyNDLAUserDocument(
       email = email,
       arenaEnabled = arenaEnabled,
       arenaAccepted = arenaAccepted,
-      shareName = shareName,
       arenaGroups = arenaGroups
     )
   }

diff --git a/myndla-api/src/main/resources/no/ndla/myndlaapi/db/migration/V16__remove_shareName.sql b/myndla-api/src/main/resources/no/ndla/myndlaapi/db/migration/V16__remove_shareName.sql
@@ -0,0 +1,2 @@
+ALTER table my_ndla_users
+DROP COLUMN shareName;
diff --git a/myndla-api/src/main/scala/no/ndla/myndlaapi/service/FolderConverterService.scala b/myndla-api/src/main/scala/no/ndla/myndlaapi/service/FolderConverterService.scala
@@ -69,7 +69,7 @@ trait FolderConverterService {
                 updated = folder.updated,
                 shared = folder.shared,
                 description = folder.description,
-                owner = feideUser.flatMap(user => if (user.shareName) Some(OwnerDTO(user.displayName)) else None)
+                owner = feideUser.flatMap(user => Some(OwnerDTO(user.displayName)))
               )
             })
         )
@@ -192,7 +192,6 @@ trait FolderConverterService {
         groups = domainUserData.groups.map(toApiGroup),
         arenaEnabled = arenaEnabled,
         arenaAccepted = domainUserData.arenaAccepted,
-        shareName = domainUserData.shareName,
         arenaGroups = domainUserData.arenaGroups
       )
     }
@@ -236,7 +235,6 @@ trait FolderConverterService {
         arenaEnabledUsers: List[String]
     ): DomainMyNDLAUser = {
       val favoriteSubjects = updatedUser.favoriteSubjects.getOrElse(domainUserData.favoriteSubjects)
-      val shareName        = updatedUser.shareName.getOrElse(domainUserData.shareName)
       val arenaEnabled = {
         if (updaterToken.hasPermission(LEARNINGPATH_API_ADMIN) || updaterUser.exists(_.isAdmin))
           updatedUser.arenaEnabled.getOrElse(domainUserData.arenaEnabled)
@@ -265,7 +263,6 @@ trait FolderConverterService {
         username = domainUserData.username,
         email = domainUserData.email,
         arenaEnabled = arenaEnabled,
-        shareName = shareName,
         displayName = domainUserData.displayName,
         arenaGroups = arenaGroups,
         arenaAccepted = arenaAccepted

diff --git a/myndla-api/src/main/scala/no/ndla/myndlaapi/service/ImportService.scala b/myndla-api/src/main/scala/no/ndla/myndlaapi/service/ImportService.scala
@@ -66,7 +66,6 @@ trait ImportService {
             email = "[email protected]",
             arenaEnabled = true,
             arenaGroups = List(ArenaGroup.ADMIN),
-            shareName = true,
             arenaAccepted = true
           )
           userRepository.insertUser("ndla_admin", toInsert)(session)

diff --git a/myndla-api/src/main/scala/no/ndla/myndlaapi/service/UserService.scala b/myndla-api/src/main/scala/no/ndla/myndlaapi/service/UserService.scala
@@ -119,11 +119,9 @@ trait UserService {
       for {
         existingUser <- userService.getOrCreateMyNDLAUserIfNotExist(feideId, feideAccessToken, List.empty)(session)
         newFavorites = (existingUser.favoriteSubjects ++ userData.favoriteSubjects).distinct
-        shareName    = existingUser.shareName || userData.shareName
         updatedFeideUser = UpdatedMyNDLAUserDTO(
           favoriteSubjects = Some(newFavorites),
           arenaEnabled = None,
-          shareName = Some(shareName),
           arenaGroups = None,
           arenaAccepted = None
         )
@@ -240,7 +238,6 @@ trait UserService {
           email = feideExtendedUserData.email,
           arenaEnabled = arenaEnabledUsers.map(_.toLowerCase).contains(feideExtendedUserData.email.toLowerCase),
           arenaGroups = getInitialIsArenaGroups(feideId),
-          shareName = false,
           displayName = feideExtendedUserData.displayName,
           arenaAccepted = false
         )
@@ -271,7 +268,6 @@ trait UserService {
         email = feideUser.email,
         arenaEnabled =
           userData.arenaEnabled || arenaEnabledUsers.map(_.toLowerCase).contains(feideUser.email.toLowerCase),
-        shareName = userData.shareName,
         displayName = feideUser.displayName,
         arenaGroups = userData.arenaGroups,
         arenaAccepted = userData.arenaAccepted

diff --git a/myndla-api/src/test/scala/no/ndla/myndlaapi/TestData.scala b/myndla-api/src/test/scala/no/ndla/myndlaapi/TestData.scala
@@ -99,7 +99,6 @@ object TestData {
     email = "",
     arenaEnabled = false,
     displayName = "",
-    shareName = false,
     arenaGroups = List.empty,
     arenaAccepted = false
   )

diff --git a/myndla-api/src/test/scala/no/ndla/myndlaapi/controller/ArenaControllerTest.scala b/myndla-api/src/test/scala/no/ndla/myndlaapi/controller/ArenaControllerTest.scala
@@ -43,7 +43,6 @@ class ArenaControllerTest extends UnitTestSuite with TestEnvironment with TapirC
     email = "[email protected]",
     arenaEnabled = true,
     arenaGroups = List.empty,
-    shareName = false,
     arenaAccepted = true
   )
 

diff --git a/myndla-api/src/test/scala/no/ndla/myndlaapi/controller/FolderControllerTest.scala b/myndla-api/src/test/scala/no/ndla/myndlaapi/controller/FolderControllerTest.scala
@@ -43,7 +43,6 @@ class FolderControllerTest extends UnitTestSuite with TestEnvironment with Tapir
     email = "[email protected]",
     arenaEnabled = true,
     arenaGroups = List.empty,
-    shareName = false,
     arenaAccepted = true
   )
 

diff --git a/myndla-api/src/test/scala/no/ndla/myndlaapi/e2e/ArenaTest.scala b/myndla-api/src/test/scala/no/ndla/myndlaapi/e2e/ArenaTest.scala
@@ -125,7 +125,6 @@ class ArenaTest
     email = "[email protected]",
     arenaEnabled = true,
     arenaGroups = List.empty,
-    shareName = false,
     arenaAccepted = true
   )
 
@@ -142,7 +141,6 @@ class ArenaTest
     email = "[email protected]",
     arenaEnabled = true,
     arenaGroups = List(ArenaGroup.ADMIN),
-    shareName = false,
     arenaAccepted = true
   )
 

diff --git a/myndla-api/src/test/scala/no/ndla/myndlaapi/repository/ArenaRepositoryTest.scala b/myndla-api/src/test/scala/no/ndla/myndlaapi/repository/ArenaRepositoryTest.scala
@@ -60,7 +60,6 @@ class ArenaRepositoryTest
       email = "[email protected]",
       arenaEnabled = true,
       arenaGroups = List(),
-      shareName = true,
       arenaAccepted = true
     )
     val feideId = "feideId1"
@@ -113,7 +112,6 @@ class ArenaRepositoryTest
       email = "[email protected]",
       arenaEnabled = true,
       arenaGroups = List(),
-      shareName = true,
       arenaAccepted = true
     )
     val feideId = "feideId1"
@@ -178,7 +176,6 @@ class ArenaRepositoryTest
       email = "[email protected]",
       arenaEnabled = true,
       arenaGroups = List(),
-      shareName = true,
       arenaAccepted = true
     )
     val feideId  = "feideId1"

diff --git a/myndla-api/src/test/scala/no/ndla/myndlaapi/service/FolderConverterServiceTest.scala b/myndla-api/src/test/scala/no/ndla/myndlaapi/service/FolderConverterServiceTest.scala
@@ -429,7 +429,6 @@ class FolderConverterServiceTest extends UnitTestSuite with TestEnvironment {
         email = "[email protected]",
         arenaEnabled = false,
         displayName = "Feide",
-        shareName = false,
         arenaGroups = List.empty,
         arenaAccepted = true
       )
@@ -446,7 +445,6 @@ class FolderConverterServiceTest extends UnitTestSuite with TestEnvironment {
         groups = Seq(MyNDLAGroupDTO(id = "id", displayName = "oslo", isPrimarySchool = true, parentId = None)),
         arenaEnabled = false,
         arenaAccepted = true,
-        shareName = false,
         arenaGroups = List.empty
       )
 
@@ -473,31 +471,27 @@ class FolderConverterServiceTest extends UnitTestSuite with TestEnvironment {
       email = "[email protected]",
       arenaEnabled = false,
       displayName = "Feide",
-      shareName = false,
       arenaGroups = List.empty,
       arenaAccepted = true
     )
     val updatedUserData1 =
       UpdatedMyNDLAUserDTO(
         favoriteSubjects = None,
         arenaEnabled = None,
-        shareName = None,
         arenaGroups = None,
         arenaAccepted = None
       )
     val updatedUserData2 =
       UpdatedMyNDLAUserDTO(
         favoriteSubjects = Some(Seq.empty),
         arenaEnabled = None,
-        shareName = None,
         arenaGroups = None,
         arenaAccepted = None
       )
     val updatedUserData3 =
       UpdatedMyNDLAUserDTO(
         favoriteSubjects = Some(Seq("x", "y", "z")),
         arenaEnabled = None,
-        shareName = None,
         arenaGroups = None,
         arenaAccepted = None
       )
@@ -521,7 +515,6 @@ class FolderConverterServiceTest extends UnitTestSuite with TestEnvironment {
       email = "[email protected]",
       arenaEnabled = false,
       displayName = "Feide",
-      shareName = false,
       arenaGroups = List.empty,
       arenaAccepted = true
     )
@@ -544,7 +537,6 @@ class FolderConverterServiceTest extends UnitTestSuite with TestEnvironment {
       email = "[email protected]",
       arenaEnabled = false,
       displayName = "Feide",
-      shareName = false,
       arenaGroups = List.empty,
       arenaAccepted = true
     )
@@ -567,7 +559,6 @@ class FolderConverterServiceTest extends UnitTestSuite with TestEnvironment {
       email = "[email protected]",
       arenaEnabled = false,
       displayName = "Feide",
-      shareName = false,
       arenaGroups = List.empty,
       arenaAccepted = true
     )

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
@@ -255,7 +255,7 @@ class FolderReadServiceTest extends UnitTestSuite with TestEnvironment {
         breadcrumbs = List(api.BreadcrumbDTO(id = favoriteUUID.toString, name = "favorite"))
       )
 
-    val user               = emptyMyNDLAUser.copy(id = 1996, shareName = true, displayName = "hallois")
+    val user               = emptyMyNDLAUser.copy(id = 1996, displayName = "hallois")
     val folderId           = UUID.randomUUID()
     val sharedFolderDomain = emptyDomainFolder.copy(id = folderId, name = "SharedFolder", status = FolderStatus.SHARED)
     val savedFolderDomain =
@@ -365,7 +365,6 @@ class FolderReadServiceTest extends UnitTestSuite with TestEnvironment {
       email = "[email protected]",
       arenaEnabled = false,
       displayName = "Feide",
-      shareName = true,
       arenaGroups = List.empty,
       arenaAccepted = true
     )
@@ -493,7 +492,8 @@ class FolderReadServiceTest extends UnitTestSuite with TestEnvironment {
       name = "",
       status = "shared",
       breadcrumbs = List(api.BreadcrumbDTO(id = folderUUID.toString, name = "")),
-      resources = List(apiResource)
+      resources = List(apiResource),
+      owner = Some(OwnerDTO(name = "User Name"))
     )
 
     when(feideApiClient.getFeideID(Some(ownerId))).thenReturn(Success(ownerId))
@@ -531,7 +531,6 @@ class FolderReadServiceTest extends UnitTestSuite with TestEnvironment {
             email = "[email protected]",
             arenaEnabled = true,
             arenaGroups = List.empty,
-            shareName = false,
             arenaAccepted = true
           )
         )
@@ -554,7 +553,6 @@ class FolderReadServiceTest extends UnitTestSuite with TestEnvironment {
             email = "[email protected]",
             arenaEnabled = true,
             arenaGroups = List.empty,
-            shareName = false,
             arenaAccepted = true
           )
         )

diff --git a/myndla-api/src/test/scala/no/ndla/myndlaapi/service/UserServiceTest.scala b/myndla-api/src/test/scala/no/ndla/myndlaapi/service/UserServiceTest.scala
@@ -54,15 +54,13 @@ class UserServiceTest extends UnitTestSuite with TestEnvironment {
       email = "[email protected]",
       arenaEnabled = false,
       displayName = "Feide",
-      shareName = false,
       arenaGroups = List.empty,
       arenaAccepted = true
     )
     val updatedUserData =
       UpdatedMyNDLAUserDTO(
         favoriteSubjects = Some(Seq("r", "e")),
         arenaEnabled = None,
-        shareName = Some(true),
         arenaGroups = None,
         arenaAccepted = None
       )
@@ -85,7 +83,6 @@ class UserServiceTest extends UnitTestSuite with TestEnvironment {
       email = "[email protected]",
       arenaEnabled = false,
       displayName = "Feide",
-      shareName = true,
       arenaGroups = List.empty,
       arenaAccepted = true
     )
@@ -101,7 +98,6 @@ class UserServiceTest extends UnitTestSuite with TestEnvironment {
       groups = Seq(MyNDLAGroupDTO(id = "id", displayName = "oslo", isPrimarySchool = false, parentId = None)),
       arenaEnabled = false,
       arenaAccepted = true,
-      shareName = true,
       arenaGroups = List.empty
     )
 
@@ -127,7 +123,6 @@ class UserServiceTest extends UnitTestSuite with TestEnvironment {
       UpdatedMyNDLAUserDTO(
         favoriteSubjects = Some(Seq("r", "e")),
         arenaEnabled = None,
-        shareName = None,
         arenaGroups = None,
         arenaAccepted = None
       )
@@ -185,7 +180,6 @@ class UserServiceTest extends UnitTestSuite with TestEnvironment {
       email = "[email protected]",
       arenaEnabled = false,
       displayName = "Feide",
-      shareName = false,
       arenaGroups = List.empty,
       arenaAccepted = true
     )
@@ -201,7 +195,6 @@ class UserServiceTest extends UnitTestSuite with TestEnvironment {
       groups = Seq(MyNDLAGroupDTO(id = "id", displayName = "oslo", isPrimarySchool = true, parentId = None)),
       arenaEnabled = false,
       arenaAccepted = true,
-      shareName = false,
       arenaGroups = List.empty
     )
     val feideUserInfo = FeideExtendedUserInfo(
@@ -261,7 +254,6 @@ class UserServiceTest extends UnitTestSuite with TestEnvironment {
       email = "[email protected]",
       arenaEnabled = false,
       displayName = "Feide",
-      shareName = false,
       arenaGroups = List.empty,
       arenaAccepted = true
     )
@@ -277,7 +269,6 @@ class UserServiceTest extends UnitTestSuite with TestEnvironment {
       groups = Seq(MyNDLAGroupDTO(id = "id", displayName = "oslo", isPrimarySchool = true, parentId = None)),
       arenaEnabled = false,
       arenaAccepted = true,
-      shareName = false,
       arenaGroups = List.empty
     )
 
@@ -333,7 +324,6 @@ class UserServiceTest extends UnitTestSuite with TestEnvironment {
       email = "[email protected]",
       arenaEnabled = false,
       displayName = "Feide",
-      shareName = false,
       arenaGroups = List.empty,
       arenaAccepted = true
     )
@@ -356,7 +346,6 @@ class UserServiceTest extends UnitTestSuite with TestEnvironment {
       groups = Seq(MyNDLAGroupDTO(id = "id", displayName = "oslo", isPrimarySchool = true, parentId = None)),
       arenaEnabled = false,
       arenaAccepted = true,
-      shareName = false,
       arenaGroups = List.empty
     )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER table my_ndla_users
		DROP COLUMN shareName;