Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Fix type errors in admin queries

Francis Caof9f67264a54c
diff --git a/src/queries/admin/report.ts b/src/queries/admin/report.ts
index fee0b4425..d6b28cc4e 100644
--- a/src/queries/admin/report.ts
+++ b/src/queries/admin/report.ts
@@ -1,10 +1,9 @@
import { Prisma, Report } from '@prisma/client';
import prisma from 'lib/prisma';
import { FilterResult, ReportSearchFilter } from 'lib/types';
-import ReportFindUniqueArgs = Prisma.ReportFindUniqueArgs;
import ReportFindManyArgs = Prisma.ReportFindManyArgs;
-async function findReport(criteria: ReportFindUniqueArgs) {
+async function findReport(criteria: Prisma.ReportFindUniqueArgs): Promise<Report> {
return prisma.client.report.findUnique(criteria);
}
diff --git a/src/queries/admin/team.ts b/src/queries/admin/team.ts
index e381d5ce8..225d57c4c 100644
--- a/src/queries/admin/team.ts
+++ b/src/queries/admin/team.ts
@@ -5,8 +5,8 @@ import prisma from 'lib/prisma';
import { FilterResult, TeamSearchFilter } from 'lib/types';
import TeamFindManyArgs = Prisma.TeamFindManyArgs;
-export async function findTeam(criteria: Prisma.TeamFindFirstArgs): Promise<Team> {
- return prisma.client.team.findFirst(criteria);
+export async function findTeam(criteria: Prisma.TeamFindUniqueArgs): Promise<Team> {
+ return prisma.client.team.findUnique(criteria);
}
export async function getTeam(teamId: string, options: { includeMembers?: boolean } = {}) {
diff --git a/src/queries/admin/teamUser.ts b/src/queries/admin/teamUser.ts
index 83f788de6..43785b787 100644
--- a/src/queries/admin/teamUser.ts
+++ b/src/queries/admin/teamUser.ts
@@ -4,6 +4,10 @@ import prisma from 'lib/prisma';
import { FilterResult, TeamUserSearchFilter } from 'lib/types';
import TeamUserFindManyArgs = Prisma.TeamUserFindManyArgs;
+export async function findTeamUser(criteria: Prisma.TeamUserFindUniqueArgs): Promise<TeamUser> {
+ return prisma.client.teamUser.findUnique(criteria);
+}
+
export async function getTeamUser(teamId: string, userId: string): Promise<TeamUser> {
return prisma.client.teamUser.findFirst({
where: {
@@ -49,21 +53,20 @@ export async function createTeamUser(
});
}
-export async function updateTeamUser(teamUserId: string, data: any): Promise<TeamUser> {
- return prisma.client.teamUser.update(
- {
- where: {
- id: teamUserId,
- },
+export async function updateTeamUser(
+ teamUserId: string,
+ data: Prisma.TeamUserUpdateInput,
+): Promise<TeamUser> {
+ return prisma.client.teamUser.update({
+ where: {
+ id: teamUserId,
},
data,
- );
+ });
}
-export async function deleteTeamUser(teamId: string, userId: string): Promise<TeamUser> {
- const { client } = prisma;
-
- return client.teamUser.deleteMany({
+export async function deleteTeamUser(teamId: string, userId: string): Promise<Prisma.BatchPayload> {
+ return prisma.client.teamUser.deleteMany({
where: {
teamId,
userId,
diff --git a/src/queries/admin/user.ts b/src/queries/admin/user.ts
index 0b5fe349e..274bb43da 100644
--- a/src/queries/admin/user.ts
+++ b/src/queries/admin/user.ts
@@ -221,7 +221,7 @@ export async function deleteUser(
id: userId,
},
}),
- ]).then(async (data: any) => {
+ ]).then(async data => {
if (cache.enabled) {
const ids = websites.map(a => a.id);
diff --git a/src/queries/admin/website.ts b/src/queries/admin/website.ts
index 53627f227..01d520198 100644
--- a/src/queries/admin/website.ts
+++ b/src/queries/admin/website.ts
@@ -4,7 +4,7 @@ import prisma from 'lib/prisma';
import { FilterResult, WebsiteSearchFilter } from 'lib/types';
import WebsiteFindManyArgs = Prisma.WebsiteFindManyArgs;
-async function findWebsite(criteria: Prisma.WebsiteFindManyArgs): Promise<Website> {
+async function findWebsite(criteria: Prisma.WebsiteFindUniqueArgs): Promise<Website> {
return prisma.client.website.findUnique(criteria);
}
@@ -106,7 +106,7 @@ export async function createWebsite(
.create({
data,
})
- .then(async (data: { id: any }) => {
+ .then(async data => {
if (cache.enabled) {
await cache.storeWebsite(data);
}