Skip to content

Commit

Permalink
fix: tr individual with repository
Browse files Browse the repository at this point in the history
  • Loading branch information
yxuo committed Feb 7, 2024
1 parent 98ba242 commit 5e31132
Show file tree
Hide file tree
Showing 7 changed files with 572 additions and 286 deletions.
8 changes: 5 additions & 3 deletions src/bank-statements/bank-statements-repository.service.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Injectable } from '@nestjs/common';
import { nextFriday } from 'date-fns';
import { TicketRevenuesService } from 'src/ticket-revenues/ticket-revenues.service';
import { TicketRevenuesRepositoryService } from 'src/ticket-revenues/ticket-revenues-repository.service';
import { User } from 'src/users/entities/user.entity';
import { getDateYMDString, isPaymentWeekComplete } from 'src/utils/date-utils';
import { TimeIntervalEnum } from 'src/utils/enums/time-interval.enum';
Expand All @@ -17,7 +17,9 @@ import { IBSGetMePreviousDaysResponse } from './interfaces/bs-get-me-previous-da
*/
@Injectable()
export class BankStatementsRepositoryService {
constructor(private readonly ticketRevenuesService: TicketRevenuesService) {}
constructor(
private readonly ticketRevenuesRepository: TicketRevenuesRepositoryService,
) {}

public async getPreviousDays(
validArgs: IBSGetMePreviousDaysValidArgs,
Expand Down Expand Up @@ -53,7 +55,7 @@ export class BankStatementsRepositoryService {
const pagination = validArgs.paginationArgs
? validArgs.paginationArgs
: { limit: 9999, page: 1 };
const revenues = await this.ticketRevenuesService.fetchTicketRevenues({
const revenues = await this.ticketRevenuesRepository.fetchTicketRevenues({
startDate: new Date(validArgs.endDate),
endDate: new Date(validArgs.endDate),
cpfCnpj: validArgs.user.getCpfCnpj(),
Expand Down
16 changes: 16 additions & 0 deletions src/bank-statements/bank-statements.service.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { Provider } from '@nestjs/common';
import { Test, TestingModule } from '@nestjs/testing';
import { BigqueryService } from 'src/bigquery/bigquery.service';
import { ITicketRevenuesGroup } from 'src/ticket-revenues/interfaces/ticket-revenues-group.interface';
import { TicketRevenuesRepositoryService } from 'src/ticket-revenues/ticket-revenues-repository.service';
import { TicketRevenuesService } from 'src/ticket-revenues/ticket-revenues.service';
import { User } from 'src/users/entities/user.entity';
import { UsersService } from 'src/users/users.service';
Expand All @@ -27,6 +29,12 @@ describe('BankStatementsService', () => {
let ticketRevenuesService: TicketRevenuesService;

beforeEach(async () => {
// class TicketRevenuesRepositoryMock {
// async fetchTicketRevenues(): any[] {
// return [];
// }
// }

const usersServiceMock = {
provide: UsersService,
useValue: {
Expand All @@ -37,6 +45,12 @@ describe('BankStatementsService', () => {
softDelete: jest.fn(),
},
} as Provider;
const bigqueryServiceMock = {
provide: BigqueryService,
useValue: {
runQuery: jest.fn(),
},
} as Provider;
const ticketRevenuesServiceMock = {
provide: TicketRevenuesService,
useValue: {
Expand All @@ -49,6 +63,8 @@ describe('BankStatementsService', () => {
providers: [
BankStatementsService,
BankStatementsRepositoryService,
TicketRevenuesRepositoryService,
bigqueryServiceMock,
usersServiceMock,
ticketRevenuesServiceMock,
],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
import { TRTimeIntervalEnum as TRTimeIntervalEnum } from '../enums/tr-time-interval.enum';
import { User } from 'src/users/entities/user.entity';
import { TimeIntervalEnum } from 'src/utils/enums/time-interval.enum';
import { TRTimeIntervalEnum } from '../enums/tr-time-interval.enum';

export interface ITRGetMeIndividualArgs {
startDate?: string;
endDate?: string;
timeInterval?: TRTimeIntervalEnum;
userId?: number;
}

export interface ITRGetMeIndividualValidArgs {
user: User;
startDate?: string;
endDate?: string;
timeInterval?: TimeIntervalEnum;
}
Loading

0 comments on commit 5e31132

Please sign in to comment.