Skip to content

Commit 58f4acf

Browse files
return table based on version
1 parent ad86701 commit 58f4acf

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

src/db.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ const buildTimeQuery = (before, after) => {
3333
return [true];
3434
};
3535

36-
const queryDomain = (domain, reportName, limitParam, pageParam, before, after) => {
36+
const queryDomain = (domain, reportName, limitParam, pageParam, before, after, dbTable) => {
3737
const timeQuery = buildTimeQuery(before, after);
38-
return db('analytics_data')
38+
39+
return db(dbTable)
3940
.where({ report_name: reportName })
4041
.whereRaw('data->> \'domain\' = ?', [domain])
4142
.whereRaw(...timeQuery)
@@ -64,17 +65,20 @@ const query = ({ reportName,
6465
page = 1,
6566
domain = null,
6667
after = null,
67-
before = null
68+
before = null,
69+
version
6870
}) => {
71+
// we have different tables for new ga4
72+
const dbTable = version === '1.1' ? "analytics_data" : "analytics_data_ga4"
6973
const limitParam = parseLimitParam(limit);
7074
const pageParam = parsePageParam(page);
7175
if (domain && reportName !== 'download') {
72-
return queryDomain(domain, reportName, limitParam, pageParam, before, after);
76+
return queryDomain(domain, reportName, limitParam, pageParam, before, after, version);
7377
}
7478
const recordQuery = Object.assign({ report_name: reportName, report_agency: reportAgency });
7579
const timeQuery = buildTimeQuery(before, after);
7680

77-
return db('analytics_data')
81+
return db(dbTable)
7882
.where(recordQuery)
7983
.whereRaw(...timeQuery)
8084
// Using `orderByRaw` in order to specifcy NULLS LAST, see:

0 commit comments

Comments
 (0)