Skip to content

Commit 597ee87

Browse files
izadoesdevizadoesdev
committed
cleanup imports and types
1 parent a0db7bc commit 597ee87

File tree

7 files changed

+36
-43
lines changed

7 files changed

+36
-43
lines changed

‎apps/api/src/query/builders/custom-events.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import type { Filter, SimpleQueryConfig } from '../types';
1+
import type { Filter, SimpleQueryConfig, TimeUnit } from '../types';
22

33
export const CustomEventsBuilders: Record<string, SimpleQueryConfig> = {
44
custom_events: {
55
customSql: (
66
websiteId: string,
77
startDate: string,
88
endDate: string,
9-
_filters?: Filter[],
10-
_granularity?: unknown,
9+
_filters?: Filter[],
10+
_granularity?: TimeUnit,
1111
_limit?: number,
1212
_offset?: number,
1313
_timezone?: string,
@@ -97,8 +97,8 @@ export const CustomEventsBuilders: Record<string, SimpleQueryConfig> = {
9797
websiteId: string,
9898
startDate: string,
9999
endDate: string,
100-
_filters?: Filter[],
101-
_granularity?: unknown,
100+
_filters?: Filter[],
101+
_granularity?: TimeUnit,
102102
_limit?: number,
103103
_offset?: number,
104104
_timezone?: string,

‎apps/api/src/query/builders/errors.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Analytics } from '../../types/tables';
2-
import type { SimpleQueryConfig } from '../types';
2+
import type { Filter, SimpleQueryConfig, TimeUnit } from '../types';
33

44
export const ErrorsBuilders: Record<string, SimpleQueryConfig> = {
55
recent_errors: {
@@ -109,13 +109,13 @@ export const ErrorsBuilders: Record<string, SimpleQueryConfig> = {
109109
websiteId: string,
110110
startDate: string,
111111
endDate: string,
112-
_filters?: unknown[],
113-
_granularity?: unknown,
112+
_filters?: Filter[],
113+
_granularity?: TimeUnit,
114114
_limit?: number,
115115
_offset?: number,
116116
_timezone?: string,
117117
filterConditions?: string[],
118-
filterParams?: Record<string, unknown>
118+
filterParams?: Record<string, Filter['value']>
119119
) => {
120120
const combinedWhereClause = filterConditions?.length
121121
? `AND ${filterConditions.join(' AND ')}`

‎apps/api/src/query/builders/links.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { Filter, SimpleQueryConfig } from '../types';
1+
import type { Filter, SimpleQueryConfig, TimeUnit } from '../types';
22

33
export const LinksBuilders: Record<string, SimpleQueryConfig> = {
44
outbound_links: {
@@ -61,8 +61,8 @@ export const LinksBuilders: Record<string, SimpleQueryConfig> = {
6161
websiteId: string,
6262
startDate: string,
6363
endDate: string,
64-
_filters?: Filter[],
65-
_granularity?: unknown,
64+
_filters?: Filter[],
65+
_granularity?: TimeUnit,
6666
_limit?: number,
6767
_offset?: number,
6868
_timezone?: string,
@@ -207,8 +207,8 @@ export const LinksBuilders: Record<string, SimpleQueryConfig> = {
207207
websiteId: string,
208208
startDate: string,
209209
endDate: string,
210-
_filters?: Filter[],
211-
_granularity?: unknown,
210+
_filters?: Filter[],
211+
_granularity?: TimeUnit,
212212
_limit?: number,
213213
_offset?: number,
214214
_timezone?: string,

‎apps/api/src/query/builders/pages.ts‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { Analytics } from '../../types/tables';
2-
import type { Filter, SimpleQueryConfig } from '../types';
3-
import { buildWhereClause } from '../utils';
2+
import type { Filter, SimpleQueryConfig, TimeUnit } from '../types';
43

54
export const PagesBuilders: Record<string, SimpleQueryConfig> = {
65
top_pages: {
@@ -100,8 +99,8 @@ export const PagesBuilders: Record<string, SimpleQueryConfig> = {
10099
websiteId: string,
101100
startDate: string,
102101
endDate: string,
103-
_filters?: unknown[],
104-
_granularity?: unknown,
102+
_filters?: Filter[],
103+
_granularity?: TimeUnit,
105104
limit?: number,
106105
offset?: number,
107106
_timezone?: string,
@@ -116,7 +115,6 @@ export const PagesBuilders: Record<string, SimpleQueryConfig> = {
116115
? `AND ${filterConditions.join(' AND ')}`
117116
: '';
118117

119-
// Use session attribution if helpers are provided
120118
const sessionAttributionCTE = helpers?.sessionAttributionCTE
121119
? `${helpers.sessionAttributionCTE('time')},`
122120
: '';
@@ -222,8 +220,8 @@ export const PagesBuilders: Record<string, SimpleQueryConfig> = {
222220
websiteId: string,
223221
startDate: string,
224222
endDate: string,
225-
_filters?: unknown[],
226-
_granularity?: unknown,
223+
_filters?: Filter[],
224+
_granularity?: TimeUnit,
227225
limit?: number,
228226
offset?: number,
229227
_timezone?: string,
@@ -238,7 +236,6 @@ export const PagesBuilders: Record<string, SimpleQueryConfig> = {
238236
? `AND ${filterConditions.join(' AND ')}`
239237
: '';
240238

241-
// Use session attribution if helpers are provided
242239
const sessionAttributionCTE = helpers?.sessionAttributionCTE
243240
? `${helpers.sessionAttributionCTE('time')},`
244241
: '';
@@ -371,8 +368,8 @@ export const PagesBuilders: Record<string, SimpleQueryConfig> = {
371368
websiteId: string,
372369
startDate: string,
373370
endDate: string,
374-
_filters?: unknown[],
375-
_granularity?: unknown,
371+
_filters?: Filter[],
372+
_granularity?: TimeUnit,
376373
limit?: number,
377374
offset?: number,
378375
_timezone?: string,
@@ -387,7 +384,6 @@ export const PagesBuilders: Record<string, SimpleQueryConfig> = {
387384
? `AND ${filterConditions.join(' AND ')}`
388385
: '';
389386

390-
// Use session attribution if helpers are provided
391387
const sessionAttributionCTE = helpers?.sessionAttributionCTE
392388
? `${helpers.sessionAttributionCTE('time')}`
393389
: '';

‎apps/api/src/query/builders/profiles.ts‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
import { Analytics } from '../../types/tables';
2-
import type { Filter, SimpleQueryConfig } from '../types';
3-
import { buildWhereClause } from '../utils';
2+
import type { Filter, SimpleQueryConfig, TimeUnit } from '../types';
43

54
export const ProfilesBuilders: Record<string, SimpleQueryConfig> = {
65
profile_list: {
76
customSql: (
87
websiteId: string,
98
startDate: string,
109
endDate: string,
11-
_filters?: unknown[],
12-
_granularity?: unknown,
10+
_filters?: Filter[],
11+
_granularity?: TimeUnit,
1312
limit?: number,
1413
offset?: number,
1514
_timezone?: string,
@@ -135,12 +134,12 @@ export const ProfilesBuilders: Record<string, SimpleQueryConfig> = {
135134
startDate: string,
136135
endDate: string,
137136
filters?: Filter[],
138-
_granularity?: unknown,
137+
_granularity?: TimeUnit,
139138
_limit?: number,
140139
_offset?: number,
141140
_timezone?: string,
142-
_filterConditions?: string[],
143-
_filterParams?: Record<string, Filter['value']>
141+
filterConditions?: string[],
142+
filterParams?: Record<string, Filter['value']>
144143
) => {
145144
const visitorId = filters?.find((f) => f.field === 'anonymous_id')?.value;
146145

@@ -352,8 +351,8 @@ export const ProfilesBuilders: Record<string, SimpleQueryConfig> = {
352351
websiteId: string,
353352
startDate: string,
354353
endDate: string,
355-
_filters?: unknown[],
356-
_granularity?: unknown,
354+
_filters?: Filter[],
355+
_granularity?: TimeUnit,
357356
limit?: number,
358357
offset?: number,
359358
_timezone?: string,

‎apps/api/src/query/builders/sessions.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { Analytics } from '../../types/tables';
2-
import type { Filter, SimpleQueryConfig } from '../types';
3-
import { buildWhereClause } from '../utils';
2+
import type { Filter, SimpleQueryConfig, TimeUnit } from '../types';
43

54
export const SessionsBuilders: Record<string, SimpleQueryConfig> = {
65
session_metrics: {
@@ -103,8 +102,8 @@ export const SessionsBuilders: Record<string, SimpleQueryConfig> = {
103102
websiteId: string,
104103
startDate: string,
105104
endDate: string,
106-
_filters?: unknown[],
107-
_granularity?: unknown,
105+
_filters?: Filter[],
106+
_granularity?: TimeUnit,
108107
limit = 25,
109108
offset = 0,
110109
_timezone?: string,

‎apps/api/src/query/builders/summary.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { Analytics } from '../../types/tables';
22
import type { Filter, SimpleQueryConfig, TimeUnit } from '../types';
3-
import { buildWhereClause } from '../utils';
43

54
export const SummaryBuilders: Record<string, SimpleQueryConfig> = {
65
summary_metrics: {
@@ -283,8 +282,8 @@ export const SummaryBuilders: Record<string, SimpleQueryConfig> = {
283282
websiteId: string,
284283
startDate: string,
285284
endDate: string,
286-
_filters?: unknown[],
287-
_granularity?: unknown,
285+
_filters?: Filter[],
286+
_granularity?: TimeUnit,
288287
_limit?: number,
289288
_offset?: number,
290289
timezone?: string,
@@ -533,8 +532,8 @@ export const SummaryBuilders: Record<string, SimpleQueryConfig> = {
533532
websiteId: string,
534533
_startDate: string,
535534
_endDate: string,
536-
_filters?: unknown[],
537-
_granularity?: unknown,
535+
_filters?: Filter[],
536+
_granularity?: TimeUnit,
538537
_limit?: number,
539538
_offset?: number,
540539
_timezone?: string,

0 commit comments

Comments
 (0)