zias/stats
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

chore(root): rename organizationSlug to organizationId (#91)

Browse Source
This commit is contained in:
Carl-Gerhard Lindesvärd
2024-11-20 14:04:55 +01:00
committed by GitHub
parent 0221948aab
commit cd16ac878d
52 changed files with 176 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
packages/db/prisma/schema.prisma
View File

@@ -74,13 +74,12 @@ model Member {
}
model Project {
id String @id @default(dbgenerated("gen_random_uuid()"))
name String
organizationSlug String
organization Organization? @relation(fields: [organizationId], references: [id])
organizationId String?
eventsCount Int @default(0)
types ProjectType[] @default([])
id String @id @default(dbgenerated("gen_random_uuid()"))
name String
organization Organization @relation(fields: [organizationId], references: [id])
organizationId String
eventsCount Int @default(0)
types ProjectType[] @default([])
events Event[]
profiles Profile[]
@@ -108,17 +107,16 @@ enum AccessLevel {
}
model ProjectAccess {
id String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
projectId String
project Project @relation(fields: [projectId], references: [id])
organizationSlug String
organization Organization? @relation(fields: [organizationId], references: [id])
organizationId String?
userId String
user User @relation(fields: [userId], references: [id])
level AccessLevel
createdAt DateTime @default(now())
updatedAt DateTime @default(now()) @updatedAt
id String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
projectId String
project Project @relation(fields: [projectId], references: [id])
organization Organization @relation(fields: [organizationId], references: [id])
organizationId String
userId String
user User @relation(fields: [userId], references: [id])
level AccessLevel
createdAt DateTime @default(now())
updatedAt DateTime @default(now()) @updatedAt
@@map("project_access")
}
@@ -169,17 +167,16 @@ enum ClientType {
}
model Client {
id String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
name String
secret String?
type ClientType @default(write)
projectId String?
project Project? @relation(fields: [projectId], references: [id])
organizationSlug String
organization Organization? @relation(fields: [organizationId], references: [id])
organizationId String?
cors String?
crossDomain Boolean @default(false)
id String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
name String
secret String?
type ClientType @default(write)
projectId String?
project Project? @relation(fields: [projectId], references: [id])
organization Organization @relation(fields: [organizationId], references: [id])
organizationId String
cors String?
crossDomain Boolean @default(false)
createdAt DateTime @default(now())
updatedAt DateTime @default(now()) @updatedAt
@@ -208,14 +205,13 @@ enum ChartType {
}
model Dashboard {
id String @id @default(dbgenerated("gen_random_uuid()"))
name String
organizationSlug String
organization Organization? @relation(fields: [organizationId], references: [id])
organizationId String?
projectId String
project Project @relation(fields: [projectId], references: [id])
reports Report[]
id String @id @default(dbgenerated("gen_random_uuid()"))
name String
organization Organization @relation(fields: [organizationId], references: [id])
organizationId String
projectId String
project Project @relation(fields: [projectId], references: [id])
reports Report[]
createdAt DateTime @default(now())
updatedAt DateTime @default(now()) @updatedAt
@@ -269,16 +265,15 @@ model Waitlist {
}
model ShareOverview {
id String @unique
projectId String @unique
project Project @relation(fields: [projectId], references: [id])
organizationSlug String
organization Organization? @relation(fields: [organizationId], references: [id])
organizationId String?
public Boolean @default(false)
password String?
createdAt DateTime @default(now())
updatedAt DateTime @default(now()) @updatedAt
id String @unique
projectId String @unique
project Project @relation(fields: [projectId], references: [id])
organization Organization @relation(fields: [organizationId], references: [id])
organizationId String
public Boolean @default(false)
password String?
createdAt DateTime @default(now())
updatedAt DateTime @default(now()) @updatedAt
@@map("shares")
}

4
packages/db/src/services/clients.service.ts
View File

@@ -8,10 +8,10 @@ export type IServiceClientWithProject = Prisma.ClientGetPayload<{
};
}>;
export async function getClientsByOrganizationSlug(organizationSlug: string) {
export async function getClientsByOrganizationId(organizationId: string) {
return db.client.findMany({
where: {
organizationSlug,
organizationId,
},
include: {
project: true,

14
packages/db/src/services/organization.service.ts
View File

@@ -66,10 +66,10 @@ export async function getOrganizationByProjectId(projectId: string) {
return transformOrganization(project.organization);
}
export async function getInvites(organizationSlug: string) {
export async function getInvites(organizationId: string) {
return db.member.findMany({
where: {
organizationId: organizationSlug,
organizationId,
userId: null,
},
include: {
@@ -78,11 +78,11 @@ export async function getInvites(organizationSlug: string) {
});
}
export async function getMembers(organizationSlug: string) {
export async function getMembers(organizationId: string) {
const [members, access] = await Promise.all([
db.member.findMany({
where: {
organizationId: organizationSlug,
organizationId,
userId: {
not: null,
},
@@ -93,7 +93,7 @@ export async function getMembers(organizationSlug: string) {
}),
db.projectAccess.findMany({
where: {
organizationSlug,
organizationId,
},
}),
]);
@@ -104,10 +104,10 @@ export async function getMembers(organizationSlug: string) {
}));
}
export async function getMember(organizationSlug: string, userId: string) {
export async function getMember(organizationId: string, userId: string) {
return db.member.findFirst({
where: {
organizationId: organizationSlug,
organizationId,
userId,
},
});

12
packages/db/src/services/project.service.ts
View File

@@ -44,10 +44,10 @@ export async function getProjectWithClients(id: string) {
return res;
}
export async function getProjectsByOrganizationSlug(organizationSlug: string) {
export async function getProjectsByOrganizationId(organizationId: string) {
return db.project.findMany({
where: {
organizationSlug,
organizationId,
},
orderBy: {
createdAt: 'desc',
@@ -55,7 +55,7 @@ export async function getProjectsByOrganizationSlug(organizationSlug: string) {
});
}
export async function getCurrentProjects(organizationSlug: string) {
export async function getCurrentProjects(organizationId: string) {
const session = auth();
if (!session.userId) {
return [];
@@ -64,7 +64,7 @@ export async function getCurrentProjects(organizationSlug: string) {
const [projects, members, access] = await Promise.all([
db.project.findMany({
where: {
organizationSlug,
organizationId,
},
orderBy: {
eventsCount: 'desc',
@@ -73,13 +73,13 @@ export async function getCurrentProjects(organizationSlug: string) {
db.member.findMany({
where: {
userId: session.userId,
organizationId: organizationSlug,
organizationId,
},
}),
db.projectAccess.findMany({
where: {
userId: session.userId,
organizationId: organizationSlug,
organizationId,
},
}),
]);