From 48de08b85f70c8094a41b43be1cdbe6222a6608d Mon Sep 17 00:00:00 2001 From: Raphael Rivas Date: Wed, 24 Jan 2024 20:07:11 -0300 Subject: [PATCH] fix: query to ticket-revenues - test: ticket-revenues should return results --- .../ticket-revenues.service.ts | 5 +- .../ticket-revenues.e2e-spec.ts | 47 +++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 test/ticket-revenues/ticket-revenues.e2e-spec.ts diff --git a/src/ticket-revenues/ticket-revenues.service.ts b/src/ticket-revenues/ticket-revenues.service.ts index 8f06d311..d0839211 100644 --- a/src/ticket-revenues/ticket-revenues.service.ts +++ b/src/ticket-revenues/ticket-revenues.service.ts @@ -337,8 +337,9 @@ export class TicketRevenuesService { t.stop_lon AS stopLon, t.valor_transacao AS transactionValue, t.versao AS bqDataVersion - FROM \`rj-smtr.br_rj_riodejaneiro_bilhetagem.transacao\` t` + - `\nLEFT JOIN \`rj-smtr.cadastro.operadoras\` o ON o.id_operadora = t.operadora ` + + FROM \`rj-smtr.br_rj_riodejaneiro_bilhetagem.transacao\` t + LEFT JOIN \`rj-smtr.cadastro.operadoras\` o ON o.id_operadora = t.id_operadora` + + ' ' + (queryBuilderStr.length ? `\nWHERE ${queryBuilderStr}` : '') + `\nORDER BY data DESC, hora DESC` + (args?.limit !== undefined ? `\nLIMIT ${args.limit}` : '') + diff --git a/test/ticket-revenues/ticket-revenues.e2e-spec.ts b/test/ticket-revenues/ticket-revenues.e2e-spec.ts new file mode 100644 index 00000000..9a3111bb --- /dev/null +++ b/test/ticket-revenues/ticket-revenues.e2e-spec.ts @@ -0,0 +1,47 @@ +import { subDays } from 'date-fns'; +import * as request from 'supertest'; +import { getDateYMDString } from '../../src/utils/date-utils'; +import { + APP_URL, + LICENSEE_PASSWORD, + LICENSEE_PERMIT_CODE, +} from '../utils/constants'; + +describe('Ticket revenues (e2e)', () => { + const app = APP_URL; + let apiToken: any; + + beforeAll(async () => { + await request(app) + .post('/api/v1/auth/licensee/login') + .send({ permitCode: LICENSEE_PERMIT_CODE, password: LICENSEE_PASSWORD }) + .expect(200) + .then(({ body }) => { + apiToken = body.token; + }); + }); + + it('should return some user result in /ticket-revenues/me', async () => { + // Arrange + const startDate = subDays(new Date(), 366); + + // Act + let ticketRevenuesMe: any; + await request(app) + .get('/api/v1/ticket-revenues/me') + .auth(apiToken, { + type: 'bearer', + }) + .query({ + startDate: getDateYMDString(startDate), + endDate: getDateYMDString(new Date()), + }) + .expect(200) + .then(({ body }) => { + ticketRevenuesMe = body; + }); + + // Assert + expect(ticketRevenuesMe.data.length).toBeGreaterThan(0); + }, 60000); +});