Skip to content

Commit

Permalink
feat: remove CoreBank mock in auth, cronjobs
Browse files Browse the repository at this point in the history
  • Loading branch information
yxuo committed Jan 16, 2024
1 parent a5c6145 commit 60520cc
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 51 deletions.
22 changes: 11 additions & 11 deletions src/auth/auth.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export class AuthController {
private logger: Logger = new Logger('AuthController', { timestamp: true });

constructor(
private readonly service: AuthService,
private readonly authService: AuthService,
private readonly mailHistoryService: MailHistoryService,
) {}

Expand All @@ -51,7 +51,7 @@ export class AuthController {
public login(
@Body() loginDto: AuthEmailLoginDto,
): Promise<LoginResponseType> {
return this.service.validateLogin(loginDto, false);
return this.authService.validateLogin(loginDto, false);
}

@SerializeOptions({
Expand All @@ -62,23 +62,23 @@ export class AuthController {
public adminLogin(
@Body() loginDTO: AuthEmailLoginDto,
): Promise<LoginResponseType> {
return this.service.validateLogin(loginDTO, true);
return this.authService.validateLogin(loginDTO, true);
}

@Post('email/register')
@HttpCode(HttpStatus.OK)
async register(
@Body() createUserDto: AuthRegisterLoginDto,
): Promise<void | object> {
return await this.service.register(createUserDto);
return await this.authService.register(createUserDto);
}

@Post('email/confirm')
@HttpCode(HttpStatus.NO_CONTENT)
async confirmEmail(
@Body() confirmEmailDto: AuthConfirmEmailDto,
): Promise<void> {
return this.service.confirmEmail(confirmEmailDto.hash);
return this.authService.confirmEmail(confirmEmailDto.hash);
}

@ApiBearerAuth()
Expand All @@ -92,21 +92,21 @@ export class AuthController {
async resendRegisterMail(
@Body() resendEmailDto: AuthResendEmailDto,
): Promise<void> {
return this.service.resendRegisterMail(resendEmailDto);
return this.authService.resendRegisterMail(resendEmailDto);
}

@Post('forgot/password')
@HttpCode(HttpStatus.ACCEPTED)
async forgotPassword(
@Body() forgotPasswordDto: AuthForgotPasswordDto,
): Promise<void | object> {
return this.service.forgotPassword(forgotPasswordDto.email);
return this.authService.forgotPassword(forgotPasswordDto.email);
}

@Post('reset/password')
@HttpCode(HttpStatus.NO_CONTENT)
resetPassword(@Body() resetPasswordDto: AuthResetPasswordDto): Promise<void> {
return this.service.resetPassword(
return this.authService.resetPassword(
resetPasswordDto.hash,
resetPasswordDto.password,
);
Expand All @@ -120,7 +120,7 @@ export class AuthController {
@UseGuards(AuthGuard('jwt'))
@HttpCode(HttpStatus.OK)
public me(@Request() request): Promise<NullableType<User>> {
return this.service.me(request.user);
return this.authService.me(request.user);
}

@ApiBearerAuth()
Expand All @@ -134,14 +134,14 @@ export class AuthController {
@Request() request,
@Body() userDto: AuthUpdateDto,
): Promise<NullableType<User>> {
return this.service.update(request.user, userDto);
return this.authService.update(request.user, userDto);
}

@ApiBearerAuth()
@Delete('me')
@UseGuards(AuthGuard('jwt'))
@HttpCode(HttpStatus.NO_CONTENT)
public async delete(@Request() request): Promise<void> {
return this.service.softDelete(request.user);
return this.authService.softDelete(request.user);
}
}
4 changes: 0 additions & 4 deletions src/auth/auth.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ import { ForgotModule } from 'src/forgot/forgot.module';
import { MailModule } from 'src/mail/mail.module';
import { IsExist } from 'src/utils/validators/is-exists.validator';
import { IsNotExist } from 'src/utils/validators/is-not-exists.validator';
import { CoreBankService } from 'src/core-bank/core-bank.service';
import { IsValidBankCodeConstraint } from 'src/banks/validators/is-valid-bank-code.validator';
import { CoreBankModule } from 'src/core-bank/core-bank.module';
import { MailHistoryModule } from 'src/mail-history/mail-history.module';

@Module({
Expand All @@ -22,7 +20,6 @@ import { MailHistoryModule } from 'src/mail-history/mail-history.module';
ForgotModule,
PassportModule,
MailModule,
CoreBankModule,
MailHistoryModule,
JwtModule.registerAsync({
imports: [ConfigModule],
Expand All @@ -42,7 +39,6 @@ import { MailHistoryModule } from 'src/mail-history/mail-history.module';
AuthService,
JwtStrategy,
AnonymousStrategy,
CoreBankService,
IsValidBankCodeConstraint,
],
exports: [AuthService],
Expand Down
8 changes: 0 additions & 8 deletions src/auth/auth.service.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Provider } from '@nestjs/common';
import { JwtService } from '@nestjs/jwt';
import { Test, TestingModule } from '@nestjs/testing';
import { CoreBankService } from 'src/core-bank/core-bank.service';
import { ForgotService } from 'src/forgot/forgot.service';
import { InviteStatusEnum } from 'src/mail-history-statuses/mail-history-status.enum';
import { MailHistory } from 'src/mail-history/entities/mail-history.entity';
Expand Down Expand Up @@ -54,12 +53,6 @@ describe('AuthService', () => {
sendForgotPassword: jest.fn(),
},
} as Provider;
const coreBankServiceMock = {
provide: CoreBankService,
useValue: {
updateDataIfNeeded: jest.fn(),
},
} as Provider;
const mailHistoryServiceMock = {
provide: MailHistoryService,
useValue: {
Expand All @@ -83,7 +76,6 @@ describe('AuthService', () => {
usersServiceMock,
forgotServiceMock,
mailServiceMock,
coreBankServiceMock,
mailHistoryServiceMock,
],
}).compile();
Expand Down
11 changes: 0 additions & 11 deletions src/auth/auth.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import { JwtService } from '@nestjs/jwt';
import * as bcrypt from 'bcryptjs';
import { plainToClass } from 'class-transformer';
import * as crypto from 'crypto';
import { CoreBankService } from 'src/core-bank/core-bank.service';
import { UpdateCoreBankInterface } from 'src/core-bank/interfaces/update-core-bank.interface';
import { ForgotService } from 'src/forgot/forgot.service';
import { InviteStatusEnum } from 'src/mail-history-statuses/mail-history-status.enum';
import { MailHistory } from 'src/mail-history/entities/mail-history.entity';
Expand Down Expand Up @@ -38,7 +36,6 @@ export class AuthService {
private usersService: UsersService,
private forgotService: ForgotService,
private mailService: MailService,
private coreBankService: CoreBankService,
private mailHistoryService: MailHistoryService,
) {}

Expand Down Expand Up @@ -491,14 +488,6 @@ export class AuthService {
'AuthService.update()',
);

const coreBankProfile: UpdateCoreBankInterface = {
bankAccountCode: userProfile.bankAccount,
bankAccountDigit: userProfile.bankAccountDigit,
bankAgencyCode: userProfile.bankAgency,
bankCode: userProfile.bankCode,
};
this.coreBankService.update(userProfile.cpfCnpj, coreBankProfile);

return userProfile;
}

Expand Down
17 changes: 0 additions & 17 deletions src/cron-jobs/cron-jobs.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { HttpStatus, Injectable, Logger, OnModuleInit } from '@nestjs/common';
import { ConfigService } from '@nestjs/config';
import { CronExpression, SchedulerRegistry } from '@nestjs/schedule';
import { CronJob, CronJobParameters } from 'cron';
import { CoreBankService } from 'src/core-bank/core-bank.service';
import { JaeService } from 'src/jae/jae.service';
import { InviteStatusEnum } from 'src/mail-history-statuses/mail-history-status.enum';
import { MailHistory } from 'src/mail-history/entities/mail-history.entity';
Expand All @@ -25,7 +24,6 @@ import { validateEmail } from 'validations-br';
export enum CrobJobsEnum {
bulkSendInvites = 'bulkSendInvites',
updateJaeMockedData = 'updateJaeMockedData',
updateCoreBankMockedData = 'updateCoreBankMockedData',
sendStatusReport = 'sendStatusReport',
pollDb = 'pollDb',
}
Expand Down Expand Up @@ -54,7 +52,6 @@ export class CronJobsService implements OnModuleInit {
private mailService: MailService,
private mailHistoryService: MailHistoryService,
private jaeService: JaeService,
private coreBankService: CoreBankService,
private usersService: UsersService,
) {}

Expand All @@ -69,13 +66,6 @@ export class CronJobsService implements OnModuleInit {
onTick: async () => this.updateJaeMockedData(),
},
},
{
name: CrobJobsEnum.updateCoreBankMockedData,
cronJobParameters: {
cronTime: CronExpression.EVERY_HOUR,
onTick: () => this.coreBankService.updateDataIfNeeded(),
},
},
{
name: CrobJobsEnum.bulkSendInvites,
cronJobParameters: {
Expand Down Expand Up @@ -143,13 +133,6 @@ export class CronJobsService implements OnModuleInit {
await this.jaeService.updateDataIfNeeded();
}

updateCoreBankMockedData() {
this.logger.log(
`updateCoreBankMockedData(): Atualizando dados se necessário`,
);
this.coreBankService.updateDataIfNeeded();
}

async bulkSendInvites() {
const THIS_METHOD = `${this.bulkSendInvites.name}()`;
const THIS_CLASS_AND_METHOD = `${CronJobsService}.${this.bulkSendInvites.name}()`;
Expand Down

0 comments on commit 60520cc

Please sign in to comment.