Skip to content
Open
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
1 change: 1 addition & 0 deletions packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"@nestjs/graphql": "^10.2.0",
"@nestjs/platform-express": "^9.0.0",
"@prisma/client": "^4.10.1",
"@summerluna/auth-guard": "^0.0.0",
"apollo-server-express": "^3.11.1",
"axios": "^1.4.0",
"class-transformer": "^0.5.1",
Expand Down
16 changes: 14 additions & 2 deletions packages/server/src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ import { InvoiceModule } from './invoice/invoice.module';
import { CommentsModule } from './comments/comments.module';
import { ConfigModule } from '@nestjs/config';
import { ClickUpTaskModule } from './click-up-task/click-up-task.module';
import { AuthGuard } from '@summerluna/auth-guard';
import { JwtModule } from '@summerluna/auth-guard';
import { APP_GUARD } from '@nestjs/core';
import { UserModule } from './user/user.module';

@Module({
imports: [
Expand All @@ -34,9 +38,17 @@ import { ClickUpTaskModule } from './click-up-task/click-up-task.module';
RecordModule,
InvoiceModule,
CommentsModule,
ClickUpTaskModule
ClickUpTaskModule,
JwtModule,
UserModule
],
controllers: [AppController],
providers: [AppService]
providers: [
AppService,
{
provide: APP_GUARD,
useClass: AuthGuard
}
]
})
export class AppModule {}
3 changes: 2 additions & 1 deletion packages/server/src/employees/employees.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import { PrismaModule } from 'nestjs-prisma';
import { EmployeesResolver } from './employees.resolver';
import { HttpModule } from '@nestjs/axios';
import { ConfigModule } from '@nestjs/config';
import { UserModule } from '../user/user.module';

@Module({
imports: [PrismaModule.forRoot(), HttpModule, ConfigModule],
imports: [PrismaModule.forRoot(), HttpModule, ConfigModule, UserModule],
providers: [EmployeesService, EmployeesResolver],
exports: [EmployeesService]
})
Expand Down
6 changes: 6 additions & 0 deletions packages/server/src/employees/employees.resolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { BatchSendSlackMessageInput, EmployeeCreateInput, EmployeeUpdateInput, S
import { ProjectModel } from '../project/model/project.model';
import { GroupedRecordWithFavoriteProjectModel } from '../record/model/record.model';
import { BatchPayload } from '../favorite-project/model/favorite-project.model';
import { TokenID } from './token.decorator';

@Resolver(() => EmployeeModel)
export class EmployeesResolver {
Expand Down Expand Up @@ -73,4 +74,9 @@ export class EmployeesResolver {
async batchSendingMessages(@Args('input') input: BatchSendSlackMessageInput): Promise<BatchResponseModel> {
return this.employeesService.batchSendingMessages(input);
}

@Query(() => String)
async me(@TokenID() token: string): Promise<string> {
return this.employeesService.getEmployeeId(token);
}
}
31 changes: 30 additions & 1 deletion packages/server/src/employees/employees.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ import { BatchPayload } from '../favorite-project/model/favorite-project.model';
import { firstValueFrom } from 'rxjs';
import { HttpService } from '@nestjs/axios';
import { ConfigService } from '@nestjs/config';
import { UserService } from '../user/user.service';

@Injectable()
export class EmployeesService {
constructor(private prisma: PrismaService, private readonly httpService: HttpService, private configService: ConfigService) {}
constructor(private prisma: PrismaService, private readonly httpService: HttpService, private configService: ConfigService, private readonly userService: UserService) {}

/**
* Get all employees
Expand Down Expand Up @@ -61,6 +62,27 @@ export class EmployeesService {
});
}

/**
* Get an employee by Email
*
* @return a matched employee
*/
async getEmployeeByEmail(email: string): Promise<Employee> {
const employeeExist = await this.prisma.employee.count({
where: {
email: email
}
});

if (!(employeeExist > 0)) throw new Error('Employee not found');

return this.prisma.employee.findUnique({
where: {
email: email
}
});
}

/**
* Add new Employee
*
Expand Down Expand Up @@ -461,4 +483,11 @@ export class EmployeesService {
return { success: false, message: e.message, count: 0 };
}
}

async getEmployeeId(token: string): Promise<string> {
const { email } = await this.userService.getUser(token);
const employee = await this.getEmployeeByEmail(email);

return employee.id;
}
}
8 changes: 8 additions & 0 deletions packages/server/src/employees/token.decorator.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { createParamDecorator, ExecutionContext } from '@nestjs/common';
import { GqlExecutionContext } from '@nestjs/graphql';

export const TokenID = createParamDecorator((data: unknown, ctx: ExecutionContext) => {
const context = GqlExecutionContext.create(ctx);
const { headers } = context.getContext().req;
return headers.authorization.split(' ')[1] || '';
});
1 change: 1 addition & 0 deletions packages/server/src/schema.gql
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ type Query {
employee(id: String!): EmployeeModel!
getEmployeesWithRecord(startDate: DateTime!, endDate: DateTime!): [EmployeeWithRecord!]!
getProjectWithEmployeeRecords(startDate: DateTime!, endDate: DateTime!): [ProjectWithEmployeeRecords!]!
me: String!
projects: [ProjectWithContractType!]!
project(id: String!): ProjectWithContractType!
invoices: [InvoiceModelWithProject!]!
Expand Down
11 changes: 11 additions & 0 deletions packages/server/src/user/user.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { Module } from '@nestjs/common';
import { UserService } from './user.service';
import { ConfigModule } from '@nestjs/config';
import { HttpModule } from '@nestjs/axios';

@Module({
imports: [ConfigModule, HttpModule],
providers: [UserService],
exports: [UserService]
})
export class UserModule {}
18 changes: 18 additions & 0 deletions packages/server/src/user/user.service.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { Test, TestingModule } from '@nestjs/testing';
import { UserService } from './user.service';

describe('UserService', () => {
let service: UserService;

beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
providers: [UserService]
}).compile();

service = module.get<UserService>(UserService);
});

it('should be defined', () => {
expect(service).toBeDefined();
});
});
28 changes: 28 additions & 0 deletions packages/server/src/user/user.service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { Injectable } from '@nestjs/common';
import { ConfigService } from '@nestjs/config';
import { HttpService } from '@nestjs/axios';
import { firstValueFrom } from 'rxjs';

@Injectable()
export class UserService {
constructor(private readonly configService: ConfigService, private httpService: HttpService) {}

async getUser(token: string) {
const graphqlQuery = `query { me { email } }`;

const serverBUrl = this.configService.get('AUTH_URI');
const { data } = await firstValueFrom(
this.httpService.get(serverBUrl, {
params: {
query: graphqlQuery
},
headers: {
'Content-Type': 'application/json',
Authorization: `Bearer ${token}`
}
})
);

return data.data.me;
}
}