Skip to content

Commit f70f98f

Browse files
mikecaomikecao
committed
Updated replica handling. Fixed types.
1 parent b36cd48 commit f70f98f

File tree

9 files changed

+83
-168
lines changed

9 files changed

+83
-168
lines changed

‎src/lib/prisma.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,7 @@ async function rawQuery(sql: string, data: Record<string, any>, name?: string):
187187
return `$${params.length}${type ?? ''}`;
188188
});
189189

190-
return process.env.DATABASE_REPLICA_URL
191-
? await client.$replica().$queryRawUnsafe(query, ...params)
192-
: await client.$queryRawUnsafe(query, ...params);
190+
return client.$queryRawUnsafe(query, ...params);
193191
}
194192

195193
async function pagedQuery<T>(model: string, criteria: T, filters?: QueryFilters) {
@@ -283,6 +281,7 @@ function getClient() {
283281
url: process.env.DATABASE_URL,
284282
prismaClient: PrismaClient,
285283
logQuery: !!process.env.LOG_QUERY,
284+
replicaUrl: process.env.DATABASE_REPLICA_URL,
286285
});
287286

288287
if (process.env.NODE_ENV !== 'production') {
@@ -292,7 +291,7 @@ function getClient() {
292291
return prisma.client;
293292
}
294293

295-
const client = globalThis[PRISMA] || getClient();
294+
const client: PrismaClient = globalThis[PRISMA] || getClient();
296295

297296
export default {
298297
client,

‎src/queries/prisma/link.ts‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
1-
import { Prisma, Link } from '@/generated/prisma/client';
1+
import { Prisma } from '@/generated/prisma/client';
22
import prisma from '@/lib/prisma';
3-
import { PageResult, QueryFilters } from '@/lib/types';
3+
import { QueryFilters } from '@/lib/types';
44

5-
export async function findLink(criteria: Prisma.LinkFindUniqueArgs): Promise<Link> {
5+
export async function findLink(criteria: Prisma.LinkFindUniqueArgs) {
66
return prisma.client.link.findUnique(criteria);
77
}
88

9-
export async function getLink(linkId: string): Promise<Link> {
9+
export async function getLink(linkId: string) {
1010
return findLink({
1111
where: {
1212
id: linkId,
1313
},
1414
});
1515
}
1616

17-
export async function getLinks(
18-
criteria: Prisma.LinkFindManyArgs,
19-
filters: QueryFilters = {},
20-
): Promise<PageResult<Link[]>> {
17+
export async function getLinks(criteria: Prisma.LinkFindManyArgs, filters: QueryFilters = {}) {
2118
const { search } = filters;
2219
const { getSearchParameters, pagedQuery } = prisma;
2320

@@ -33,10 +30,7 @@ export async function getLinks(
3330
return pagedQuery('link', { ...criteria, where }, filters);
3431
}
3532

36-
export async function getUserLinks(
37-
userId: string,
38-
filters?: QueryFilters,
39-
): Promise<PageResult<Link[]>> {
33+
export async function getUserLinks(userId: string, filters?: QueryFilters) {
4034
return getLinks(
4135
{
4236
where: {
@@ -48,10 +42,7 @@ export async function getUserLinks(
4842
);
4943
}
5044

51-
export async function getTeamLinks(
52-
teamId: string,
53-
filters?: QueryFilters,
54-
): Promise<PageResult<Link[]>> {
45+
export async function getTeamLinks(teamId: string, filters?: QueryFilters) {
5546
return getLinks(
5647
{
5748
where: {
@@ -62,14 +53,14 @@ export async function getTeamLinks(
6253
);
6354
}
6455

65-
export async function createLink(data: Prisma.LinkUncheckedCreateInput): Promise<Link> {
56+
export async function createLink(data: Prisma.LinkUncheckedCreateInput) {
6657
return prisma.client.link.create({ data });
6758
}
6859

69-
export async function updateLink(linkId: string, data: any): Promise<Link> {
60+
export async function updateLink(linkId: string, data: any) {
7061
return prisma.client.link.update({ where: { id: linkId }, data });
7162
}
7263

73-
export async function deleteLink(linkId: string): Promise<Link> {
64+
export async function deleteLink(linkId: string) {
7465
return prisma.client.link.delete({ where: { id: linkId } });
7566
}

‎src/queries/prisma/pixel.ts‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
1-
import { Prisma, Pixel } from '@/generated/prisma/client';
1+
import { Prisma } from '@/generated/prisma/client';
22
import prisma from '@/lib/prisma';
3-
import { PageResult, QueryFilters } from '@/lib/types';
3+
import { QueryFilters } from '@/lib/types';
44

5-
export async function findPixel(criteria: Prisma.PixelFindUniqueArgs): Promise<Pixel> {
5+
export async function findPixel(criteria: Prisma.PixelFindUniqueArgs) {
66
return prisma.client.pixel.findUnique(criteria);
77
}
88

9-
export async function getPixel(pixelId: string): Promise<Pixel> {
9+
export async function getPixel(pixelId: string) {
1010
return findPixel({
1111
where: {
1212
id: pixelId,
1313
},
1414
});
1515
}
1616

17-
export async function getPixels(
18-
criteria: Prisma.PixelFindManyArgs,
19-
filters: QueryFilters = {},
20-
): Promise<PageResult<Pixel[]>> {
17+
export async function getPixels(criteria: Prisma.PixelFindManyArgs, filters: QueryFilters = {}) {
2118
const { search } = filters;
2219

2320
const where: Prisma.PixelWhereInput = {
@@ -28,10 +25,7 @@ export async function getPixels(
2825
return prisma.pagedQuery('pixel', { ...criteria, where }, filters);
2926
}
3027

31-
export async function getUserPixels(
32-
userId: string,
33-
filters?: QueryFilters,
34-
): Promise<PageResult<Pixel[]>> {
28+
export async function getUserPixels(userId: string, filters?: QueryFilters) {
3529
return getPixels(
3630
{
3731
where: {
@@ -42,10 +36,7 @@ export async function getUserPixels(
4236
);
4337
}
4438

45-
export async function getTeamPixels(
46-
teamId: string,
47-
filters?: QueryFilters,
48-
): Promise<PageResult<Pixel[]>> {
39+
export async function getTeamPixels(teamId: string, filters?: QueryFilters) {
4940
return getPixels(
5041
{
5142
where: {
@@ -56,14 +47,14 @@ export async function getTeamPixels(
5647
);
5748
}
5849

59-
export async function createPixel(data: Prisma.PixelUncheckedCreateInput): Promise<Pixel> {
50+
export async function createPixel(data: Prisma.PixelUncheckedCreateInput) {
6051
return prisma.client.pixel.create({ data });
6152
}
6253

63-
export async function updatePixel(pixelId: string, data: any): Promise<Pixel> {
54+
export async function updatePixel(pixelId: string, data: any) {
6455
return prisma.client.pixel.update({ where: { id: pixelId }, data });
6556
}
6657

67-
export async function deletePixel(pixelId: string): Promise<Pixel> {
58+
export async function deletePixel(pixelId: string) {
6859
return prisma.client.pixel.delete({ where: { id: pixelId } });
6960
}

‎src/queries/prisma/report.ts‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
1-
import { Prisma, Report } from '@/generated/prisma/client';
1+
import { Prisma } from '@/generated/prisma/client';
22
import prisma from '@/lib/prisma';
3-
import { PageResult, QueryFilters } from '@/lib/types';
3+
import { QueryFilters } from '@/lib/types';
44
import ReportFindManyArgs = Prisma.ReportFindManyArgs;
55

6-
async function findReport(criteria: Prisma.ReportFindUniqueArgs): Promise<Report> {
6+
async function findReport(criteria: Prisma.ReportFindUniqueArgs) {
77
return prisma.client.report.findUnique(criteria);
88
}
99

10-
export async function getReport(reportId: string): Promise<Report> {
10+
export async function getReport(reportId: string) {
1111
return findReport({
1212
where: {
1313
id: reportId,
1414
},
1515
});
1616
}
1717

18-
export async function getReports(
19-
criteria: ReportFindManyArgs,
20-
filters: QueryFilters = {},
21-
): Promise<PageResult<Report[]>> {
18+
export async function getReports(criteria: ReportFindManyArgs, filters: QueryFilters = {}) {
2219
const { search } = filters;
2320

2421
const where: Prisma.ReportWhereInput = {
@@ -48,10 +45,7 @@ export async function getReports(
4845
return prisma.pagedQuery('report', { ...criteria, where }, filters);
4946
}
5047

51-
export async function getUserReports(
52-
userId: string,
53-
filters?: QueryFilters,
54-
): Promise<PageResult<Report[]>> {
48+
export async function getUserReports(userId: string, filters?: QueryFilters) {
5549
return getReports(
5650
{
5751
where: {
@@ -70,10 +64,7 @@ export async function getUserReports(
7064
);
7165
}
7266

73-
export async function getWebsiteReports(
74-
websiteId: string,
75-
filters: QueryFilters = {},
76-
): Promise<PageResult<Report[]>> {
67+
export async function getWebsiteReports(websiteId: string, filters: QueryFilters = {}) {
7768
return getReports(
7869
{
7970
where: {
@@ -84,14 +75,14 @@ export async function getWebsiteReports(
8475
);
8576
}
8677

87-
export async function createReport(data: Prisma.ReportUncheckedCreateInput): Promise<Report> {
78+
export async function createReport(data: Prisma.ReportUncheckedCreateInput) {
8879
return prisma.client.report.create({ data });
8980
}
9081

91-
export async function updateReport(reportId: string, data: any): Promise<Report> {
82+
export async function updateReport(reportId: string, data: any) {
9283
return prisma.client.report.update({ where: { id: reportId }, data });
9384
}
9485

95-
export async function deleteReport(reportId: string): Promise<Report> {
86+
export async function deleteReport(reportId: string) {
9687
return prisma.client.report.delete({ where: { id: reportId } });
9788
}

‎src/queries/prisma/segment.ts‎

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
import prisma from '@/lib/prisma';
2-
import { Prisma, Segment } from '@/generated/prisma/client';
3-
import { PageResult, QueryFilters } from '@/lib/types';
2+
import { Prisma } from '@/generated/prisma/client';
3+
import { QueryFilters } from '@/lib/types';
44

5-
async function findSegment(criteria: Prisma.SegmentFindUniqueArgs): Promise<Segment> {
6-
return prisma.client.Segment.findUnique(criteria);
5+
async function findSegment(criteria: Prisma.SegmentFindUniqueArgs) {
6+
return prisma.client.segment.findUnique(criteria);
77
}
88

9-
export async function getSegment(segmentId: string): Promise<Segment> {
9+
export async function getSegment(segmentId: string) {
1010
return findSegment({
1111
where: {
1212
id: segmentId,
1313
},
1414
});
1515
}
1616

17-
export async function getSegments(
18-
criteria: Prisma.SegmentFindManyArgs,
19-
filters: QueryFilters,
20-
): Promise<PageResult<Segment[]>> {
17+
export async function getSegments(criteria: Prisma.SegmentFindManyArgs, filters: QueryFilters) {
2118
const { search } = filters;
2219
const { getSearchParameters, pagedQuery } = prisma;
2320

@@ -33,17 +30,13 @@ export async function getSegments(
3330
return pagedQuery('segment', { ...criteria, where }, filters);
3431
}
3532

36-
export async function getWebsiteSegment(websiteId: string, segmentId: string): Promise<Segment> {
37-
return prisma.client.Segment.findFirst({
33+
export async function getWebsiteSegment(websiteId: string, segmentId: string) {
34+
return prisma.client.segment.findFirst({
3835
where: { id: segmentId, websiteId },
3936
});
4037
}
4138

42-
export async function getWebsiteSegments(
43-
websiteId: string,
44-
type: string,
45-
filters?: QueryFilters,
46-
): Promise<PageResult<Segment[]>> {
39+
export async function getWebsiteSegments(websiteId: string, type: string, filters?: QueryFilters) {
4740
return getSegments(
4841
{
4942
where: {
@@ -55,17 +48,14 @@ export async function getWebsiteSegments(
5548
);
5649
}
5750

58-
export async function createSegment(data: Prisma.SegmentUncheckedCreateInput): Promise<Segment> {
59-
return prisma.client.Segment.create({ data });
51+
export async function createSegment(data: Prisma.SegmentUncheckedCreateInput) {
52+
return prisma.client.segment.create({ data });
6053
}
6154

62-
export async function updateSegment(
63-
SegmentId: string,
64-
data: Prisma.SegmentUpdateInput,
65-
): Promise<Segment> {
66-
return prisma.client.Segment.update({ where: { id: SegmentId }, data });
55+
export async function updateSegment(SegmentId: string, data: Prisma.SegmentUpdateInput) {
56+
return prisma.client.segment.update({ where: { id: SegmentId }, data });
6757
}
6858

69-
export async function deleteSegment(SegmentId: string): Promise<Segment> {
70-
return prisma.client.Segment.delete({ where: { id: SegmentId } });
59+
export async function deleteSegment(SegmentId: string) {
60+
return prisma.client.segment.delete({ where: { id: SegmentId } });
7161
}

‎src/queries/prisma/team.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ export async function findTeam(criteria: Prisma.TeamFindUniqueArgs): Promise<Tea
99
return prisma.client.team.findUnique(criteria);
1010
}
1111

12-
export async function getTeam(teamId: string, options: { includeMembers?: boolean } = {}) {
12+
export async function getTeam(
13+
teamId: string,
14+
options: { includeMembers?: boolean } = {},
15+
): Promise<Team> {
1316
const { includeMembers } = options;
1417

1518
return findTeam({
@@ -129,11 +132,9 @@ export async function updateTeam(teamId: string, data: Prisma.TeamUpdateInput):
129132
});
130133
}
131134

132-
export async function deleteTeam(
133-
teamId: string,
134-
): Promise<Promise<[Prisma.BatchPayload, Prisma.BatchPayload, Team]>> {
135+
export async function deleteTeam(teamId: string) {
135136
const { client, transaction } = prisma;
136-
const cloudMode = !!process.env.CLOUD_URL;
137+
const cloudMode = !!process.env.CLOUD_MODE;
137138

138139
if (cloudMode) {
139140
return transaction([

0 commit comments

Comments
 (0)