Skip to content

Commit

Permalink
fix: remove bs/me/day endponit
Browse files Browse the repository at this point in the history
  • Loading branch information
yxuo committed Feb 7, 2024
1 parent 2f9dabe commit 17daadd
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 81 deletions.
15 changes: 0 additions & 15 deletions src/bank-statements/bank-statements-repository.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { IBankStatement } from './interfaces/bank-statement.interface';
import { IBSCounts } from './interfaces/bs-counts.interface';
import { IBSGetMePreviousDaysValidArgs } from './interfaces/bs-get-me-previous-days-args.interface';
import { IBSGetMePreviousDaysResponse } from './interfaces/bs-get-me-previous-days-response.interface';
import { IBSGetMeDayValidArgs } from './interfaces/bs-get-me-day-args.interface';
import { TicketRevenuesService } from 'src/ticket-revenues/ticket-revenues.service';

/**
Expand Down Expand Up @@ -127,18 +126,4 @@ export class BankStatementsRepositoryService {
}
return statusCounts;
}

async getMeDay(validArgs: IBSGetMeDayValidArgs): Promise<number> {
const revenues = await this.ticketRevenuesService.getMe(
{
startDate: validArgs.endDate,
endDate: validArgs.endDate,
userId: validArgs.user.id,
groupBy: 'day',
},
{ limit: 9999, page: 1 },
'ticket-revenues',
);
return revenues.amountSum;
}
}
28 changes: 2 additions & 26 deletions src/bank-statements/bank-statements.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,27 @@ import {
Get,
HttpCode,
HttpStatus,
Param,
Query,
Request,
SerializeOptions,
UseGuards,
} from '@nestjs/common';
import { AuthGuard } from '@nestjs/passport';
import { ApiBearerAuth, ApiParam, ApiQuery, ApiTags } from '@nestjs/swagger';
import { ApiBearerAuth, ApiQuery, ApiTags } from '@nestjs/swagger';
import { User } from 'src/users/entities/user.entity';
import { CommonApiParams } from 'src/utils/api-param/common-api-params';
import { DateApiParams } from 'src/utils/api-param/date-api-param';
import { PaginationApiParams } from 'src/utils/api-param/pagination.api-param';
import { TimeIntervalEnum } from 'src/utils/enums/time-interval.enum';
import { IRequest } from 'src/utils/interfaces/request.interface';
import { getPagination } from 'src/utils/get-pagination';
import { IRequest } from 'src/utils/interfaces/request.interface';
import { ParseNumberPipe } from 'src/utils/pipes/parse-number.pipe';
import { DateQueryParams } from 'src/utils/query-param/date.query-param';
import { PaginationQueryParams } from 'src/utils/query-param/pagination.query-param';
import { Pagination } from 'src/utils/types/pagination.type';
import { BankStatementsService } from './bank-statements.service';
import { BSMePrevDaysTimeIntervalEnum } from './enums/bs-me-prev-days-time-interval.enum';
import { BSMeTimeIntervalEnum } from './enums/bs-me-time-interval.enum';
import { IBSGetMeDayResponse } from './interfaces/bs-get-me-day-response.interface';
import { IBSGetMePreviousDaysResponse } from './interfaces/bs-get-me-previous-days-response.interface';
import { IBSGetMeResponse } from './interfaces/bs-get-me-response.interface';

Expand Down Expand Up @@ -68,28 +66,6 @@ export class BankStatementsController {
});
}

@SerializeOptions({
groups: ['me'],
})
@ApiBearerAuth()
@UseGuards(AuthGuard('jwt'))
@Get('me/day/:date')
@ApiParam({ name: 'date', example: '2023-01-12' })
@ApiQuery(CommonApiParams.userId)
@HttpCode(HttpStatus.OK)
async getMeDayDate(
@Request() request: IRequest,
@Param('date') date: string,
@Query('userId', new ParseNumberPipe({ min: 1, required: false }))
userId?: number | null,
): Promise<IBSGetMeDayResponse> {
const isUserIdParam = userId !== null && !isNaN(Number(userId));
return this.bankStatementsService.getMeDay({
endDate: date,
userId: isUserIdParam ? userId : (request.user as User).id,
});
}

@SerializeOptions({
groups: ['me'],
})
Expand Down
26 changes: 0 additions & 26 deletions src/bank-statements/bank-statements.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ import { Pagination } from 'src/utils/types/pagination.type';
import { BankStatementsRepositoryService } from './bank-statements-repository.service';
import { IBankStatement } from './interfaces/bank-statement.interface';
import { IBSGetMeArgs } from './interfaces/bs-get-me-args.interface';
import {
IBSGetMeDayArgs,
IBSGetMeDayValidArgs,
} from './interfaces/bs-get-me-day-args.interface';
import { IBSGetMeDayResponse } from './interfaces/bs-get-me-day-response.interface';
import {
IBSGetMePreviousDaysArgs,
IBSGetMePreviousDaysValidArgs,
Expand Down Expand Up @@ -194,27 +189,6 @@ export class BankStatementsService {
return { todaySum, allSum, countSum, statements: newStatements };
}

public async getMeDay(args: IBSGetMeDayArgs): Promise<IBSGetMeDayResponse> {
const validArgs = await this.validateGetMeDay(args);
const amount = await this.bankStatementsRepository.getMeDay(validArgs);
return {
valueToReceive: amount,
};
}

private async validateGetMeDay(
args: IBSGetMeDayArgs,
): Promise<IBSGetMeDayValidArgs> {
if (isNaN(args?.userId as number)) {
throw CommonHttpException.argNotType('userId', 'number', args?.userId);
}
const user = await this.usersService.getOne({ id: args?.userId });
return {
endDate: args?.endDate,
user: user,
};
}

public async getMePreviousDays(
args: IBSGetMePreviousDaysArgs,
paginationOptions: PaginationOptions,
Expand Down
11 changes: 0 additions & 11 deletions src/bank-statements/interfaces/bs-get-me-day-args.interface.ts

This file was deleted.

This file was deleted.

0 comments on commit 17daadd

Please sign in to comment.