From ebea1537630eba03338c8c908d666ed9bbb86476 Mon Sep 17 00:00:00 2001 From: Katrine Wist Date: Fri, 24 Jan 2025 12:45:15 +0100 Subject: [PATCH] Remove shareName --- .../model/api/myndla/MyNDLAUserDTO.scala | 3 --- .../model/domain/myndla/MyNDLAUser.scala | 3 +-- .../domain/myndla/MyNDLAUserDocument.scala | 4 +--- .../db/migration/V18__remove_shareName.sql | 1 + .../service/FolderConverterService.scala | 5 +---- .../myndlaapi/service/ImportService.scala | 1 - .../ndla/myndlaapi/service/UserService.scala | 4 ---- .../scala/no/ndla/myndlaapi/TestData.scala | 1 - .../controller/ArenaControllerTest.scala | 1 - .../controller/FolderControllerTest.scala | 1 - .../no/ndla/myndlaapi/e2e/ArenaTest.scala | 2 -- .../ndla/myndlaapi/e2e/CloneFolderTest.scala | 20 +++++++++---------- .../repository/ArenaRepositoryTest.scala | 3 --- .../service/FolderConverterServiceTest.scala | 9 --------- .../service/FolderReadServiceTest.scala | 8 +++----- .../myndlaapi/service/UserServiceTest.scala | 11 ---------- typescript/types-backend/myndla-api.ts | 2 -- 17 files changed, 17 insertions(+), 62 deletions(-) create mode 100644 myndla-api/src/main/resources/no/ndla/myndlaapi/db/migration/V18__remove_shareName.sql 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 index 49009aa117..c486eb6c44 100644 --- 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 index f6c39a9717..f052077786 100644 --- 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 index 7744bd08b8..64436f90a4 100644 --- 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/V18__remove_shareName.sql b/myndla-api/src/main/resources/no/ndla/myndlaapi/db/migration/V18__remove_shareName.sql new file mode 100644 index 0000000000..b1f79d0a36 --- /dev/null +++ b/myndla-api/src/main/resources/no/ndla/myndlaapi/db/migration/V18__remove_shareName.sql @@ -0,0 +1 @@ +update my_ndla_users set document = document - 'shareName' \ No newline at end of file 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 index 491b3129e4..2403145c2d 100644 --- a/myndla-api/src/main/scala/no/ndla/myndlaapi/service/FolderConverterService.scala +++ b/myndla-api/src/main/scala/no/ndla/myndlaapi/service/FolderConverterService.scala @@ -73,7 +73,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.map(user => OwnerDTO(user.displayName)) ) }) ) @@ -196,7 +196,6 @@ trait FolderConverterService { groups = domainUserData.groups.map(toApiGroup), arenaEnabled = arenaEnabled, arenaAccepted = domainUserData.arenaAccepted, - shareName = domainUserData.shareName, arenaGroups = domainUserData.arenaGroups ) } @@ -280,7 +279,6 @@ trait FolderConverterService { feideToken: Option[FeideAccessToken] ): Try[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) @@ -306,7 +304,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 index 6c99437ddf..87b6558f2e 100644 --- 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 = "ndla@knowit.no", 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 index 4f6f9d3d07..9b861fdeb6 100644 --- 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 ) @@ -225,7 +223,6 @@ trait UserService { email = feideExtendedUserData.email, arenaEnabled = arenaEnabledUsers.map(_.toLowerCase).contains(feideExtendedUserData.email.toLowerCase), arenaGroups = getInitialIsArenaGroups(feideId), - shareName = false, displayName = feideExtendedUserData.displayName, arenaAccepted = false ) @@ -256,7 +253,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 index 1ea80f4351..591f59d61b 100644 --- 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 index 9b934a615e..a0ed95d9a8 100644 --- 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 = "some@example.com", 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 index 46d1b159fd..78c2816c77 100644 --- 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 = "some@example.com", 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 index 18a51fa958..c648e971fd 100644 --- 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 = "some@example.com", arenaEnabled = true, arenaGroups = List.empty, - shareName = false, arenaAccepted = true ) @@ -142,7 +141,6 @@ class ArenaTest email = "some@example.com", arenaEnabled = true, arenaGroups = List(ArenaGroup.ADMIN), - shareName = false, arenaAccepted = true ) diff --git a/myndla-api/src/test/scala/no/ndla/myndlaapi/e2e/CloneFolderTest.scala b/myndla-api/src/test/scala/no/ndla/myndlaapi/e2e/CloneFolderTest.scala index 115d20b651..fdfdeca2e5 100644 --- a/myndla-api/src/test/scala/no/ndla/myndlaapi/e2e/CloneFolderTest.scala +++ b/myndla-api/src/test/scala/no/ndla/myndlaapi/e2e/CloneFolderTest.scala @@ -15,7 +15,7 @@ import no.ndla.common.model.domain.ResourceType import no.ndla.common.model.domain.myndla.FolderStatus import no.ndla.myndlaapi.model.api import no.ndla.myndlaapi.model.domain -import no.ndla.myndlaapi.model.api.{BreadcrumbDTO, FolderDTO} +import no.ndla.myndlaapi.model.api.{BreadcrumbDTO, FolderDTO, OwnerDTO} import no.ndla.myndlaapi.model.domain.{NewFolderData, ResourceDocument} import no.ndla.myndlaapi.{ComponentRegistry, MainClass, MyNdlaApiProperties, UnitSuite} import no.ndla.network.clients.FeideExtendedUserInfo @@ -185,7 +185,7 @@ class CloneFolderTest updated = testClock.now(), shared = None, description = Some("samling 1"), - owner = None + owner = Some(OwnerDTO("")) ) val parentChild2 = api.FolderDTO( @@ -202,7 +202,7 @@ class CloneFolderTest updated = testClock.now(), shared = None, description = Some("samling 2"), - owner = None + owner = Some(OwnerDTO("")) ) val parentChild3 = api.ResourceDTO( @@ -228,7 +228,7 @@ class CloneFolderTest updated = testClock.now(), shared = None, description = Some("samling 0"), - owner = None + owner = Some(OwnerDTO("")) ) val destinationFoldersBefore = folderRepository.foldersWithFeideAndParentID(None, destinationFeideId) @@ -297,7 +297,7 @@ class CloneFolderTest updated = testClock.now(), shared = None, description = Some("samling 1"), - owner = None + owner = Some(OwnerDTO("")) ) val parentChild2 = api.FolderDTO( @@ -314,7 +314,7 @@ class CloneFolderTest updated = testClock.now(), shared = None, description = Some("samling 2"), - owner = None + owner = Some(OwnerDTO("")) ) val parentChild3 = api.ResourceDTO( @@ -340,7 +340,7 @@ class CloneFolderTest updated = testClock.now(), shared = None, description = Some("samling 0"), - owner = None + owner = Some(OwnerDTO("")) ) val destinationFoldersBefore = folderRepository.foldersWithFeideAndParentID(None, destinationFeideId) @@ -397,7 +397,7 @@ class CloneFolderTest updated = testClock.now(), shared = None, description = Some("samling 1"), - owner = None + owner = Some(OwnerDTO("")) ) val parentChild2 = api.FolderDTO( @@ -417,7 +417,7 @@ class CloneFolderTest updated = testClock.now(), shared = None, description = Some("samling 2"), - owner = None + owner = Some(OwnerDTO("")) ) val parentChild3 = api.ResourceDTO( @@ -446,7 +446,7 @@ class CloneFolderTest updated = testClock.now(), shared = None, description = Some("samling 0"), - owner = None + owner = Some(OwnerDTO("")) ) val response = simpleHttpClient.send( 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 index dd49e2d2b8..5ae49e0e53 100644 --- 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 = "example@example.com", arenaEnabled = true, arenaGroups = List(), - shareName = true, arenaAccepted = true ) val feideId = "feideId1" @@ -113,7 +112,6 @@ class ArenaRepositoryTest email = "example@example.com", arenaEnabled = true, arenaGroups = List(), - shareName = true, arenaAccepted = true ) val feideId = "feideId1" @@ -178,7 +176,6 @@ class ArenaRepositoryTest email = "example@example.com", 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 index d47eec2ea7..08b82c5496 100644 --- 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 = "example@email.com", 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,7 +471,6 @@ class FolderConverterServiceTest extends UnitTestSuite with TestEnvironment { email = "example@email.com", arenaEnabled = false, displayName = "Feide", - shareName = false, arenaGroups = List.empty, arenaAccepted = true ) @@ -481,7 +478,6 @@ class FolderConverterServiceTest extends UnitTestSuite with TestEnvironment { UpdatedMyNDLAUserDTO( favoriteSubjects = None, arenaEnabled = None, - shareName = None, arenaGroups = None, arenaAccepted = None ) @@ -489,7 +485,6 @@ class FolderConverterServiceTest extends UnitTestSuite with TestEnvironment { UpdatedMyNDLAUserDTO( favoriteSubjects = Some(Seq.empty), arenaEnabled = None, - shareName = None, arenaGroups = None, arenaAccepted = None ) @@ -497,7 +492,6 @@ class FolderConverterServiceTest extends UnitTestSuite with TestEnvironment { 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 = "example@email.com", arenaEnabled = false, displayName = "Feide", - shareName = false, arenaGroups = List.empty, arenaAccepted = true ) @@ -544,7 +537,6 @@ class FolderConverterServiceTest extends UnitTestSuite with TestEnvironment { email = "example@email.com", arenaEnabled = false, displayName = "Feide", - shareName = false, arenaGroups = List.empty, arenaAccepted = true ) @@ -567,7 +559,6 @@ class FolderConverterServiceTest extends UnitTestSuite with TestEnvironment { email = "example@email.com", 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 index 6967399739..cfbc283ad3 100644 --- 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 = "example@email.com", 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 = "user_name@example.com", arenaEnabled = true, arenaGroups = List.empty, - shareName = false, arenaAccepted = true ) ) @@ -554,7 +553,6 @@ class FolderReadServiceTest extends UnitTestSuite with TestEnvironment { email = "user_name@example.com", 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 index 2f8d8d5f73..f632f20671 100644 --- 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,7 +54,6 @@ class UserServiceTest extends UnitTestSuite with TestEnvironment { email = "example@email.com", arenaEnabled = false, displayName = "Feide", - shareName = false, arenaGroups = List.empty, arenaAccepted = true ) @@ -62,7 +61,6 @@ class UserServiceTest extends UnitTestSuite with TestEnvironment { 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 = "example@email.com", 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 = "example@email.com", 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 = "example@email.com", 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 = "example@email.com", 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 ) diff --git a/typescript/types-backend/myndla-api.ts b/typescript/types-backend/myndla-api.ts index d644f2b043..a7f31a1066 100644 --- a/typescript/types-backend/myndla-api.ts +++ b/typescript/types-backend/myndla-api.ts @@ -111,7 +111,6 @@ export interface IMyNDLAUserDTO { groups: IMyNDLAGroupDTO[] arenaEnabled: boolean arenaAccepted: boolean - shareName: boolean arenaGroups: ArenaGroup[] } @@ -275,7 +274,6 @@ export interface IUpdatedFolderDTO { export interface IUpdatedMyNDLAUserDTO { favoriteSubjects?: string[] arenaEnabled?: boolean - shareName?: boolean arenaGroups?: ArenaGroup[] arenaAccepted?: boolean }