watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

api and lib fixes (#1643)

Browse source
This commit is contained in:
Brian Cao 2022-11-08 11:55:02 -08:00 • committed by GitHub
parent 168283bf11
commit 13fd3ccd16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 30 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

14
queries/admin/user/deleteUser.js
View file

@ -8,19 +8,25 @@ export async function deleteUser(userId) {
where: { userId },
});
let websiteIds = [];
if (websites.length > 0) {
websiteIds = websites.map(a => a.id);
}
return client
.$transaction([
client.pageview.deleteMany({
where: { session: { website: { userId } } },
where: { websiteId: { in: websiteIds } },
}),
client.eventData.deleteMany({
where: { event: { session: { website: { userId } } } },
where: { event: { websiteId: { in: websiteIds } } },
}),
client.event.deleteMany({
where: { session: { website: { userId } } },
where: { websiteId: { in: websiteIds } },
}),
client.session.deleteMany({
where: { website: { userId } },
where: { websiteId: { in: websiteIds } },
}),
client.website.deleteMany({
where: { userId },

8
queries/admin/website/deleteWebsite.js
View file

@ -6,16 +6,16 @@ export async function deleteWebsite(id) {
return transaction([
client.pageview.deleteMany({
where: { session: { website: { id } } },
where: { websiteId: id },
}),
client.eventData.deleteMany({
where: { event: { session: { website: { id } } } },
where: { event: { websiteId: id } },
}),
client.event.deleteMany({
where: { session: { website: { id } } },
where: { websiteId: id },
}),
client.session.deleteMany({
where: { website: { id } },
where: { websiteId: id },
}),
client.website.delete({
where: { id },

8
queries/admin/website/resetWebsite.js
View file

@ -5,16 +5,16 @@ export async function resetWebsite(id) {
return transaction([
client.pageview.deleteMany({
where: { session: { website: { id } } },
where: { websiteId: id },
}),
client.eventData.deleteMany({
where: { event: { session: { website: { id } } } },
where: { event: { websiteId: id } },
}),
client.event.deleteMany({
where: { session: { website: { id } } },
where: { websiteId: id },
}),
client.session.deleteMany({
where: { website: { id } },
where: { websiteId: id },
}),
]);
}

6
queries/analytics/event/getEvents.js
View file

@ -12,10 +12,8 @@ export function getEvents(...args) {
function relationalQuery(websites, start_at) {
return prisma.client.event.findMany({
where: {
website: {
id: {
in: websites,
},
websiteId: {
in: websites,
},
createdAt: {
gte: start_at,

6
queries/analytics/pageview/getPageviews.js
View file

@ -12,10 +12,8 @@ export async function getPageviews(...args) {
async function relationalQuery(websites, start_at) {
return prisma.client.pageview.findMany({
where: {
website: {
id: {
in: websites,
},
websiteId: {
in: websites,
},
createdAt: {
gte: start_at,

6
queries/analytics/session/getSessions.js
View file

@ -14,10 +14,8 @@ async function relationalQuery(websites, start_at) {
where: {
...(websites && websites.length > 0
? {
website: {
id: {
in: websites,
},
websiteId: {
in: websites,
},
}
: {}),