Skip to content

Commit 3c69597

Browse files
committed
#795 Move type to team utils
1 parent 3e42ffa commit 3c69597

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/backend/src/utils/notifications.utils.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
import { Team, Task as Prisma_Task, WBS_Element } from '@prisma/client';
22
import { UserWithSettings } from './auth.utils';
33
import { HttpException } from './errors.utils';
4-
import { getTeamsFromUsers } from './teams.utils';
5-
6-
export type UserWithTeams = UserWithSettings & {
7-
teamAsHead: Team | null;
8-
teamsAsLead: Team[] | null;
9-
teamsAsMember: Team[] | null;
10-
};
4+
import { UserWithTeams, getTeamsFromUsers } from './teams.utils';
115

126
export type TaskWithAssignees = Prisma_Task & {
137
assignees: UserWithSettings[] | null;

src/backend/src/utils/teams.utils.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Prisma, User, Team } from '@prisma/client';
2-
import { UserWithTeams } from './notifications.utils';
2+
import { UserWithSettings } from './auth.utils';
33

44
const teamQueryArgsMembersOnly = Prisma.validator<Prisma.TeamArgs>()({
55
include: {
@@ -52,6 +52,12 @@ export const isUserPartOfTeams = (teams: Prisma.TeamGetPayload<typeof teamQueryA
5252
return teams.some((team) => isUserOnTeam(team, user));
5353
};
5454

55+
export type UserWithTeams = UserWithSettings & {
56+
teamAsHead: Team | null;
57+
teamsAsLead: Team[] | null;
58+
teamsAsMember: Team[] | null;
59+
};
60+
5561
/**
5662
* Gets the teams from a list of users
5763
* @param users the users to get the teams from

0 commit comments

Comments
 (0)