Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
STS
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Coscine
backend
apis
STS
Commits
fd9055cf
Commit
fd9055cf
authored
2 years ago
by
Benedikt Heinrichs
Committed by
Petar Hristov
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix: Correct roles merging
parent
9d126363
No related branches found
No related tags found
1 merge request
!139
Fix: Correct roles merging
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/STS/Utils/MergeUtil.cs
+13
-2
13 additions, 2 deletions
src/STS/Utils/MergeUtil.cs
with
13 additions
and
2 deletions
src/STS/Utils/MergeUtil.cs
+
13
−
2
View file @
fd9055cf
...
@@ -4,6 +4,8 @@ using Coscine.ActiveDirectory;
...
@@ -4,6 +4,8 @@ using Coscine.ActiveDirectory;
using
Coscine.Configuration
;
using
Coscine.Configuration
;
using
Coscine.Database.DataModel
;
using
Coscine.Database.DataModel
;
using
Coscine.Database.Models
;
using
Coscine.Database.Models
;
using
Coscine.Database.Util
;
using
LinqKit
;
using
System.Linq
;
using
System.Linq
;
namespace
Coscine.Api.STS.Utils
namespace
Coscine.Api.STS.Utils
...
@@ -77,7 +79,7 @@ namespace Coscine.Api.STS.Utils
...
@@ -77,7 +79,7 @@ namespace Coscine.Api.STS.Utils
private
void
MergeProjectRole
(
User
mergeIntoUser
,
User
mergeFromUser
)
private
void
MergeProjectRole
(
User
mergeIntoUser
,
User
mergeFromUser
)
{
{
foreach
(
var
projectRole
in
_projectRoleModel
.
GetAllWhere
((
entry
)
=>
entry
.
UserId
==
mergeFromUser
.
Id
&&
entry
.
Project
.
Deleted
==
false
))
foreach
(
var
projectRole
in
_projectRoleModel
.
GetAllWhere
((
entry
)
=>
entry
.
UserId
==
mergeFromUser
.
Id
))
{
{
var
project
=
_projectModel
.
GetById
(
projectRole
.
ProjectId
);
var
project
=
_projectModel
.
GetById
(
projectRole
.
ProjectId
);
var
role
=
_roleModel
.
GetById
(
projectRole
.
RoleId
);
var
role
=
_roleModel
.
GetById
(
projectRole
.
RoleId
);
...
@@ -144,7 +146,16 @@ namespace Coscine.Api.STS.Utils
...
@@ -144,7 +146,16 @@ namespace Coscine.Api.STS.Utils
private
void
MergeResourceOwner
(
User
mergeIntoUser
,
User
mergeFromUser
)
private
void
MergeResourceOwner
(
User
mergeIntoUser
,
User
mergeFromUser
)
{
{
foreach
(
var
resource
in
_resourceModel
.
GetAllWhere
((
entry
)
=>
entry
.
Creator
==
mergeFromUser
.
Id
))
// Get every resource, also get the deleted ones
foreach
(
var
resource
in
DatabaseConnection
.
ConnectToDatabase
((
db
)
=>
{
return
(
from
tableEntry
in
db
.
Resources
.
AsExpandable
()
where
tableEntry
.
Creator
==
mergeFromUser
.
Id
select
tableEntry
).
ToList
();
})
)
{
{
resource
.
Creator
=
mergeIntoUser
.
Id
;
resource
.
Creator
=
mergeIntoUser
.
Id
;
_resourceModel
.
Update
(
resource
);
_resourceModel
.
Update
(
resource
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment