diff --git a/apps/backend/src/drizzle/schema/permissions.ts b/apps/backend/src/drizzle/schema/permissions.ts index f4a2461..90b13ba 100644 --- a/apps/backend/src/drizzle/schema/permissions.ts +++ b/apps/backend/src/drizzle/schema/permissions.ts @@ -5,13 +5,13 @@ import { permissionsToUsers } from "./permissionsToUsers"; import { permissionsToRoles } from "./permissionsToRoles"; export const permissionsSchema = pgTable("permissions", { - id: text("id") + id: varchar("id", { length: 50 }) .primaryKey() .$defaultFn(() => createId()), code: varchar("code", { length: 50 }).notNull().unique(), description: varchar("description", { length: 255 }), - createdAt: timestamp("created_at").defaultNow(), - updatedAt: timestamp("updated_at").defaultNow(), + createdAt: timestamp("createdAt").defaultNow(), + updatedAt: timestamp("updatedAt").defaultNow(), }); export const permissionsRelations = relations( diff --git a/apps/backend/src/drizzle/schema/permissionsToRoles.ts b/apps/backend/src/drizzle/schema/permissionsToRoles.ts index ddce625..72ead8c 100644 --- a/apps/backend/src/drizzle/schema/permissionsToRoles.ts +++ b/apps/backend/src/drizzle/schema/permissionsToRoles.ts @@ -1,4 +1,4 @@ -import { pgTable, primaryKey, text } from "drizzle-orm/pg-core"; +import { pgTable, primaryKey, varchar } from "drizzle-orm/pg-core"; import { permissionsSchema } from "./permissions"; import { relations } from "drizzle-orm"; import { rolesSchema } from "./roles"; @@ -6,10 +6,10 @@ import { rolesSchema } from "./roles"; export const permissionsToRoles = pgTable( "permissions_to_roles", { - roleId: text("roleId") + roleId: varchar("roleId", { length: 50 }) .notNull() .references(() => rolesSchema.id), - permissionId: text("permissionId") + permissionId: varchar("permissionId", { length: 50 }) .notNull() .references(() => permissionsSchema.id), }, diff --git a/apps/backend/src/drizzle/schema/permissionsToUsers.ts b/apps/backend/src/drizzle/schema/permissionsToUsers.ts index 110b433..117c030 100644 --- a/apps/backend/src/drizzle/schema/permissionsToUsers.ts +++ b/apps/backend/src/drizzle/schema/permissionsToUsers.ts @@ -1,4 +1,4 @@ -import { pgTable, primaryKey, text } from "drizzle-orm/pg-core"; +import { pgTable, primaryKey, varchar } from "drizzle-orm/pg-core"; import { users } from "./users"; import { permissionsSchema } from "./permissions"; import { relations } from "drizzle-orm"; @@ -6,10 +6,10 @@ import { relations } from "drizzle-orm"; export const permissionsToUsers = pgTable( "permissions_to_users", { - userId: text("userId") + userId: varchar("userId", { length: 50 }) .notNull() .references(() => users.id), - permissionId: text("permissionId") + permissionId: varchar("permissionId", { length: 50 }) .notNull() .references(() => permissionsSchema.id), }, diff --git a/apps/backend/src/drizzle/schema/roles.ts b/apps/backend/src/drizzle/schema/roles.ts index 6b8bfe5..61e585d 100644 --- a/apps/backend/src/drizzle/schema/roles.ts +++ b/apps/backend/src/drizzle/schema/roles.ts @@ -4,14 +4,14 @@ import { pgTable, text, timestamp, varchar } from "drizzle-orm/pg-core"; import { permissionsToRoles } from "./permissionsToRoles"; export const rolesSchema = pgTable("roles", { - id: text("id") + id: varchar("id", { length: 50 }) .primaryKey() .$defaultFn(() => createId()), code: varchar("code", { length: 50 }).notNull().unique(), name: varchar("name", { length: 255 }).notNull(), description: varchar("description", { length: 255 }), - createdAt: timestamp("created_at").defaultNow(), - updatedAt: timestamp("updated_at").defaultNow(), + createdAt: timestamp("createdAt").defaultNow(), + updatedAt: timestamp("updatedAt").defaultNow(), }); export const rolesRelations = relations(rolesSchema, ({ many }) => ({ diff --git a/apps/backend/src/drizzle/schema/rolesToUsers.ts b/apps/backend/src/drizzle/schema/rolesToUsers.ts index dcf422c..396cda4 100644 --- a/apps/backend/src/drizzle/schema/rolesToUsers.ts +++ b/apps/backend/src/drizzle/schema/rolesToUsers.ts @@ -1,4 +1,4 @@ -import { pgTable, primaryKey, text } from "drizzle-orm/pg-core"; +import { pgTable, primaryKey, varchar } from "drizzle-orm/pg-core"; import { users } from "./users"; import { relations } from "drizzle-orm"; import { rolesSchema } from "./roles"; @@ -6,10 +6,10 @@ import { rolesSchema } from "./roles"; export const rolesToUsers = pgTable( "roles_to_users", { - userId: text("userId") + userId: varchar("userId", { length: 50 }) .notNull() .references(() => users.id), - roleId: text("roleId") + roleId: varchar("roleId", { length: 50 }) .notNull() .references(() => rolesSchema.id), }, diff --git a/apps/backend/src/drizzle/schema/users.ts b/apps/backend/src/drizzle/schema/users.ts index af91337..0574af0 100644 --- a/apps/backend/src/drizzle/schema/users.ts +++ b/apps/backend/src/drizzle/schema/users.ts @@ -9,22 +9,27 @@ import { } from "drizzle-orm/pg-core"; import { permissionsToUsers } from "./permissionsToUsers"; import { rolesToUsers } from "./rolesToUsers"; +import { respondents } from "./respondents"; export const users = pgTable("users", { - id: text("id") + id: varchar("id", { length: 50 }) .primaryKey() .$defaultFn(() => createId()), name: varchar("name", { length: 255 }).notNull(), username: varchar("username").notNull().unique(), email: varchar("email"), password: text("password").notNull(), - isEnabled: boolean("is_enable").default(true), - createdAt: timestamp("created_at", { mode: "date" }).defaultNow(), - updatedAt: timestamp("updated_at", { mode: "date" }).defaultNow(), - deletedAt: timestamp("deleted_at", { mode: "date" }), + isEnabled: boolean("isEnabled").default(true), + createdAt: timestamp("createdAt", { mode: "date" }).defaultNow(), + updatedAt: timestamp("updatedAt", { mode: "date" }).defaultNow(), + deletedAt: timestamp("deletedAt", { mode: "date" }), }); -export const usersRelations = relations(users, ({ many }) => ({ +export const usersRelations = relations(users, ({ many, one}) => ({ permissionsToUsers: many(permissionsToUsers), rolesToUsers: many(rolesToUsers), + respondent: one(respondents, { + fields: [users.id], + references: [respondents.userId], + }), }));