1
0
mirror of https://github.com/bitwarden/server synced 2025-12-19 01:33:20 +00:00

[PS-2390] Updating and adding items into folder and collection on import (#2717)

* PS-2390 Adding Id to the Collection/Folder RequestModel
replacing folder/collection when they already exist instead of creating a new one
Adding items to existing collections if the id matches

* PS-2390 Improved Folder/Collection RequestModel code design

* PS-2390 Removed whitespaces from FolderRequestModel

* PS-2390 Verifying if folder/collection belongs to user/organization when updating or creating a new one

* PS-2390 - Removed unnecessary null validation for Id on Folder/CollectionRequestModel

* PS-2390 - Added bulk methods to get and update folders at import

* PS-2390 - Added bulk methods to get and update collections at import org

* PS-2390 - Corrected sqlproj path to Folder_ReadByIdsAndUserId

* PS-2390 - Improved code readibility

* PS-2390 - Added newlines to EOF

* PS-2390 Remove logic to update folders/collections at import

* PS-2390 - removed unnecessary methods and imports

* PS-2390 - Removed unnecessary formatting change

* PS-2390 - Removed unused variable
This commit is contained in:
aj-rosado
2023-04-05 19:18:14 +01:00
committed by GitHub
parent 6551d9176b
commit 49f15d8cc1
7 changed files with 58 additions and 23 deletions

View File

@@ -19,7 +19,7 @@ public class FolderRequestModel
});
}
public Folder ToFolder(Folder existingFolder)
public virtual Folder ToFolder(Folder existingFolder)
{
existingFolder.Name = Name;
return existingFolder;
@@ -28,5 +28,11 @@ public class FolderRequestModel
public class FolderWithIdRequestModel : FolderRequestModel
{
public Guid Id { get; set; }
public Guid? Id { get; set; }
public override Folder ToFolder(Folder existingFolder)
{
existingFolder.Id = Id ?? Guid.Empty;
return base.ToFolder(existingFolder);
}
}