diff --git a/database/schema/rfidTags.ts b/database/schema/rfidTags.ts index 1f24290..788e425 100644 --- a/database/schema/rfidTags.ts +++ b/database/schema/rfidTags.ts @@ -1,6 +1,14 @@ -import {text, pgTable, timestamp, uuid, uniqueIndex, jsonb, integer} from "drizzle-orm/pg-core"; -import {createInsertSchema, createSelectSchema} from "drizzle-zod"; -import {z} from "zod"; +import { + text, + pgTable, + timestamp, + uuid, + uniqueIndex, + jsonb, + integer, +} from "drizzle-orm/pg-core"; +import { createInsertSchema, createSelectSchema } from "drizzle-zod"; +import { z } from "zod"; export const rfidTags = pgTable( "rfidTags", @@ -23,8 +31,8 @@ export const rfidTags = pgTable( ); // Schema for inserting a user - can be used to validate API requests -export const insertRolesSchema = createInsertSchema(rfidTags, { - tagHex: z.string().min(3, {message: "Tag Should have more than 3 characters"}), -}); +// export const insertRolesSchema = createInsertSchema(rfidTags, { +// tagHex: z.string().min(3, {message: "Tag Should have more than 3 characters"}), +// }); // Schema for selecting a Expenses - can be used to validate API responses export const selectRolesSchema = createSelectSchema(rfidTags); diff --git a/database/schema/userRoles.ts b/database/schema/userRoles.ts index dbd7fdc..ef0002c 100644 --- a/database/schema/userRoles.ts +++ b/database/schema/userRoles.ts @@ -1,9 +1,18 @@ -import {text, pgTable, numeric, index, timestamp, boolean, uuid, uniqueIndex} from "drizzle-orm/pg-core"; -import {createInsertSchema, createSelectSchema} from "drizzle-zod"; -import {z} from "zod"; -import {users} from "./users.js"; -import {roles} from "./roles.js"; -import {modules} from "./modules.js"; +import { + text, + pgTable, + numeric, + index, + timestamp, + boolean, + uuid, + uniqueIndex, +} from "drizzle-orm/pg-core"; +import { createInsertSchema, createSelectSchema } from "drizzle-zod"; +import { z } from "zod"; +import { users } from "./users.js"; +import { roles } from "./roles.js"; +import { modules } from "./modules.js"; /* we will add the user @@ -17,14 +26,14 @@ export const userRoles = pgTable( "userRoles", { user_id: uuid("user_id") - .notNull() - .references(() => users.user_id), + .notNull() + .references(() => users.user_id), role_id: uuid("role_id") - .notNull() - .references(() => roles.role_id), + .notNull() + .references(() => roles.role_id), module_id: uuid("module_id") - .notNull() - .references(() => modules.module_id), + .notNull() + .references(() => modules.module_id), role: text("role").notNull(), // "view", "technician", "supervisor","manager", "admin", "systemAdmin" add_User: text("add_User").default("LST_System").notNull(), add_Date: timestamp("add_Date").defaultNow(), @@ -33,13 +42,18 @@ export const userRoles = pgTable( }, (table) => { // ensures only one user gets permissions to one role - return [uniqueIndex("user_module_unique").on(table.user_id, table.module_id)]; + return [ + uniqueIndex("user_module_unique").on( + table.user_id, + table.module_id + ), + ]; } ); // Schema for inserting a user - can be used to validate API requests -export const insertUserRolesSchema = createInsertSchema(userRoles, { - role: z.string().min(3, {message: "Role must be at least 3 characters"}), -}); +// export const insertUserRolesSchema = createInsertSchema(userRoles, { +// role: z.string().min(3, {message: "Role must be at least 3 characters"}), +// }); // Schema for selecting a Expenses - can be used to validate API responses export const selectUserRolesSchema = createSelectSchema(userRoles); diff --git a/database/schema/users.ts b/database/schema/users.ts index 94dc665..580475f 100644 --- a/database/schema/users.ts +++ b/database/schema/users.ts @@ -1,6 +1,15 @@ -import {text, pgTable, numeric, index, timestamp, boolean, uuid, uniqueIndex} from "drizzle-orm/pg-core"; -import {createInsertSchema, createSelectSchema} from "drizzle-zod"; -import {z} from "zod"; +import { + text, + pgTable, + numeric, + index, + timestamp, + boolean, + uuid, + uniqueIndex, +} from "drizzle-orm/pg-core"; +import { createInsertSchema, createSelectSchema } from "drizzle-zod"; +import { z } from "zod"; export const users = pgTable( "users", @@ -27,10 +36,10 @@ export const users = pgTable( ); // Schema for inserting a user - can be used to validate API requests -export const insertUsersSchema = createInsertSchema(users, { - username: z.string().min(3, {message: "Username must be at least 3 characters"}), - email: z.string().email({message: "Invalid email"}), - password: z.string().min(8, {message: "Password must be at least 8 characters"}), -}); +// export const insertUsersSchema = createInsertSchema(users, { +// username: z.string().min(3, {message: "Username must be at least 3 characters"}), +// email: z.string().email({message: "Invalid email"}), +// password: z.string().min(8, {message: "Password must be at least 8 characters"}), +// }); // Schema for selecting a Expenses - can be used to validate API responses export const selectUsersSchema = createSelectSchema(users);