Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
server
Manage
Activity
Members
Labels
Plan
Issues
25
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cokoapps
server
Commits
09adbe2a
Commit
09adbe2a
authored
1 year ago
by
Vukile Langa
Committed by
Yannis Barlas
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
feat(models): add optional status on updateMembershipByTeamId
parent
cf05409c
No related branches found
No related tags found
1 merge request
!66
fix(models): added optional status for new team members
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
config/default.js
+4
-0
4 additions, 0 deletions
config/default.js
src/models/__tests__/team.model.test.js
+30
-0
30 additions, 0 deletions
src/models/__tests__/team.model.test.js
src/models/team/team.model.js
+6
-1
6 additions, 1 deletion
src/models/team/team.model.js
with
40 additions
and
1 deletion
config/default.js
+
4
−
0
View file @
09adbe2a
...
...
@@ -46,6 +46,10 @@ module.exports = {
displayName
:
'
Author
'
,
role
:
'
author
'
,
},
reviewer
:
{
displayName
:
'
Reviewer
'
,
role
:
'
reviewer
'
,
},
},
},
fileStorage
:
{
...
...
This diff is collapsed.
Click to expand it.
src/models/__tests__/team.model.test.js
+
30
−
0
View file @
09adbe2a
...
...
@@ -376,4 +376,34 @@ describe('Team Model', () => {
expect
(
members
.
result
).
toEqual
([])
})
it
(
'
adds team member status on update membership
'
,
async
()
=>
{
const
team
=
await
Team
.
insert
({
role
:
'
reviewer
'
,
displayName
:
'
Reviewer
'
,
global
:
false
,
objectId
:
uuid
(),
objectType
:
'
someObjectType
'
,
})
const
user1
=
await
User
.
insert
({})
const
user2
=
await
User
.
insert
({})
await
Team
.
updateMembershipByTeamId
(
team
.
id
,
[
user1
.
id
,
user2
.
id
])
const
{
result
:
teamMembers1
}
=
await
TeamMember
.
find
({
teamId
:
team
.
id
})
teamMembers1
.
forEach
(
member
=>
expect
(
member
.
status
).
toBe
(
null
))
const
NOT_INVITED
=
'
notInvited
'
await
Team
.
updateMembershipByTeamId
(
team
.
id
,
[])
await
Team
.
updateMembershipByTeamId
(
team
.
id
,
[
user1
.
id
,
user2
.
id
],
{
status
:
NOT_INVITED
,
})
const
{
result
:
teamMembers2
}
=
await
TeamMember
.
find
({
teamId
:
team
.
id
})
teamMembers2
.
forEach
(
member
=>
expect
(
member
.
status
).
toBe
(
NOT_INVITED
))
})
})
This diff is collapsed.
Click to expand it.
src/models/team/team.model.js
+
6
−
1
View file @
09adbe2a
...
...
@@ -184,7 +184,12 @@ class Team extends BaseModel {
// add members that exist in the incoming array, but not in the db
const
toAdd
=
members
.
filter
(
id
=>
!
existingMemberUserIds
.
includes
(
id
))
await
Promise
.
all
(
toAdd
.
map
(
userId
=>
Team
.
addMember
(
teamId
,
userId
,
{
trx
})),
toAdd
.
map
(
userId
=>
Team
.
addMember
(
teamId
,
userId
,
{
trx
,
...(
options
.
status
&&
{
status
:
options
.
status
}),
}),
),
)
// delete members that exist in the db, but not in the incoming array
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
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