Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/mutation create team #2

Merged
merged 2 commits into from
Feb 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/schema.gql
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,18 @@ type Query {
course(id: String!): Course
teams: [Team!]
}

type Mutation {
createTeam(team: CreateTeamInput!): Team!
updateTeam(team: UpdateTeamInput!): Team!
}

input CreateTeamInput {
tgLink: String!
courseId: String!
}

input UpdateTeamInput {
id: String!
tgLink: String!
}
21 changes: 21 additions & 0 deletions src/teams/models/team.input-type.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { Field, InputType } from '@nestjs/graphql';

import { ICreateTeam, IUpdateTeam } from './team.interface';

@InputType()
export class CreateTeamInput implements ICreateTeam {
@Field()
public tgLink: string;

@Field()
public courseId: string;
}

@InputType()
export class UpdateTeamInput implements IUpdateTeam {
@Field()
public id: string;

@Field()
public tgLink: string;
}
4 changes: 4 additions & 0 deletions src/teams/models/team.interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@ export interface ITeam {
tgLink: string;
memberIds: string[];
}

export type ICreateTeam = Pick<ITeam, 'courseId' | 'tgLink'>;

export type IUpdateTeam = Pick<ITeam, 'id' | 'tgLink'>;
18 changes: 17 additions & 1 deletion src/teams/resolvers/teams.resolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ import { CoursesService } from 'src/courses/services/courses.service';
import { User } from 'src/users/models/user.object-type';
import { UsersService } from 'src/users/services/users.service';

import { Parent, Query, ResolveField, Resolver } from '@nestjs/graphql';
import { Args, Mutation, Parent, Query, ResolveField, Resolver } from '@nestjs/graphql';

import { CreateTeamInput, UpdateTeamInput } from '../models/team.input-type';
import { ICreateTeam, IUpdateTeam } from '../models/team.interface';
import { Team } from '../models/team.object-type';
import { TeamsService } from '../services/teams.service';

Expand Down Expand Up @@ -34,4 +36,18 @@ export class TeamsResolver {

return this.usersService.findByIds(memberIds);
}

@Mutation(() => Team, { name: 'createTeam' })
public async createTeam(
@Args({ name: 'team', type: () => CreateTeamInput }) team: ICreateTeam,
): Promise<Team> {
return this.teamsService.createTeam(team);
}

@Mutation(() => Team, { name: 'updateTeam' })
public async updateTeam(
@Args({ name: 'team', type: () => UpdateTeamInput }) team: IUpdateTeam,
): Promise<Team> {
return this.teamsService.updateTeam(team);
}
}
24 changes: 23 additions & 1 deletion src/teams/services/teams.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import { Injectable } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';

import { TeamEntity } from '../models/team.entity';
import { ICreateTeam, IUpdateTeam } from '../models/team.interface';
import { getNextTeamNumber } from '../utils/get-next-team-number.util';

@Injectable()
export class TeamsService {
Expand All @@ -19,6 +21,26 @@ export class TeamsService {
}

public findByIds(ids: string[]): Promise<TeamEntity[]> {
return this.teamsRepository.findByIds(ids, { loadRelationIds: true });
return this.teamsRepository.findByIds(ids, { loadRelationIds: true, order: { number: 'ASC' } });
}

public async createTeam(props: ICreateTeam): Promise<TeamEntity> {
const teams: TeamEntity[] = await this.teamsRepository.find({ courseId: props.courseId });
const nextNumber: number = getNextTeamNumber(teams);
const password: string = Math.random().toString(36).substr(2, 8);

const team: TeamEntity = this.teamsRepository.create({
...props,
password,
number: nextNumber,
});

return this.teamsRepository.save(team);
}

public async updateTeam(props: IUpdateTeam): Promise<TeamEntity> {
await this.teamsRepository.update(props.id, { tgLink: props.tgLink });

return this.teamsRepository.findOne(props.id);
}
}
24 changes: 24 additions & 0 deletions src/teams/utils/get-next-team-number.util.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { ITeam } from '../models/team.interface';

export const getNextTeamNumber: (arr: ITeam[]) => number = (arr: ITeam[]): number => {
let missedNumber: number;
let lastNumber: number;

const positiveNumbers: number[] = arr.map(item => item.number).sort();

if (!positiveNumbers.length) {
return 1;
}

positiveNumbers.some((element, index) => {
if (element !== index + 1) {
missedNumber = index + 1;
}

lastNumber = index + 1;

return missedNumber;
});

return missedNumber ?? lastNumber + 1;
};