Renamed dates from on to at, move shared columns to base schema

IharKrasnik · IharKrasnik · commit 80d3de715fce · 2026-03-25T17:49:48.000+01:00
diff --git a/template/apps/api/drizzle.config.ts b/template/apps/api/drizzle.config.ts
@@ -3,7 +3,7 @@ import process from 'node:process';
 
 export default defineConfig({
   dialect: 'postgresql',
-  schema: './src/schema.ts',
+  schema: './src/resources/*/*.schema.ts',
   out: './drizzle',
   dbCredentials: {
     url: process.env.DATABASE_URL!,
diff --git a/template/apps/api/src/admin-set.ts b/template/apps/api/src/admin-set.ts
@@ -2,7 +2,7 @@ import process from 'node:process';
 
 import db from '@/db';
 import logger from '@/logger';
-import { emailSchema } from '@/resources/users/drizzle.schema';
+import { emailSchema } from '@/resources/users/users.schema';
 
 const usage = 'Usage: pnpm admin:set -- <email>';
 
diff --git a/template/apps/api/src/db.service.ts b/template/apps/api/src/db.service.ts
@@ -54,7 +54,7 @@ type OrderBy<T extends PgTable> = Partial<Record<keyof Select<T>, 'asc' | 'desc'
 // eslint-disable-next-line ts/no-explicit-any
 type AnyTable = any;
 
-export class Collection<T extends PgTable> {
+export class DbService<T extends PgTable> {
   readonly table: T;
   private db: PostgresJsDatabase<Record<string, unknown>>;
 
diff --git a/template/apps/api/src/db.ts b/template/apps/api/src/db.ts
@@ -2,19 +2,20 @@ import { drizzle } from 'drizzle-orm/postgres-js';
 import postgres from 'postgres';
 
 import config from '@/config';
-import { Collection } from '@/db.service';
-import * as schema from '@/schema';
+import { DbService } from '@/db.service';
+import { tokens } from '@/resources/tokens/tokens.schema';
+import { users } from '@/resources/users/users.schema';
 
 const client = postgres(config.DATABASE_URL);
 
-export const rawDb = drizzle({ client, schema });
+export const rawDb = drizzle({ client, schema: { users, tokens } });
 
 const db = {
-  users: new Collection(schema.users, rawDb),
-  tokens: new Collection(schema.tokens, rawDb),
+  users: new DbService(users, rawDb),
+  tokens: new DbService(tokens, rawDb),
 };
 
-export type User = typeof schema.users.$inferSelect;
-export type Token = typeof schema.tokens.$inferSelect;
+export type User = typeof users.$inferSelect;
+export type Token = typeof tokens.$inferSelect;
 
 export default db;
diff --git a/template/apps/api/src/resources/auth/endpoints/forgot-password.ts b/template/apps/api/src/resources/auth/endpoints/forgot-password.ts
@@ -6,7 +6,7 @@ import config from '@/config';
 import db from '@/db';
 import { isPublic } from '@/procedures';
 import createToken from '@/resources/tokens/methods/create-token';
-import { emailSchema } from '@/resources/users/drizzle.schema';
+import { emailSchema } from '@/resources/users/users.schema';
 import { emailService } from '@/services';
 import { Template } from '@/types';
 
diff --git a/template/apps/api/src/resources/auth/endpoints/google-mobile.ts b/template/apps/api/src/resources/auth/endpoints/google-mobile.ts
@@ -2,7 +2,7 @@ import { z } from 'zod';
 
 import { isPublic } from '@/procedures';
 import setAccessToken from '@/resources/tokens/methods/set-access-token';
-import { publicSchema } from '@/resources/users/drizzle.schema';
+import { publicSchema } from '@/resources/users/users.schema';
 import { googleService } from '@/services';
 import { ClientError } from '@/types';
 
diff --git a/template/apps/api/src/resources/auth/endpoints/resend-email.ts b/template/apps/api/src/resources/auth/endpoints/resend-email.ts
@@ -6,7 +6,7 @@ import config from '@/config';
 import db from '@/db';
 import { isPublic } from '@/procedures';
 import createToken from '@/resources/tokens/methods/create-token';
-import { emailSchema } from '@/resources/users/drizzle.schema';
+import { emailSchema } from '@/resources/users/users.schema';
 import { emailService } from '@/services';
 import { Template } from '@/types';
 
diff --git a/template/apps/api/src/resources/auth/endpoints/reset-password.ts b/template/apps/api/src/resources/auth/endpoints/reset-password.ts
@@ -3,7 +3,7 @@ import { z } from 'zod';
 import db from '@/db';
 import { isPublic } from '@/procedures';
 import validateToken from '@/resources/tokens/methods/validate-token';
-import { passwordSchema } from '@/resources/users/drizzle.schema';
+import { passwordSchema } from '@/resources/users/users.schema';
 import { securityUtil } from '@/utils';
 
 export default isPublic
diff --git a/template/apps/api/src/resources/auth/endpoints/sign-in.ts b/template/apps/api/src/resources/auth/endpoints/sign-in.ts
@@ -3,7 +3,7 @@ import { z } from 'zod';
 import db from '@/db';
 import { isPublic } from '@/procedures';
 import setAccessToken from '@/resources/tokens/methods/set-access-token';
-import { emailSchema, passwordSchema, publicSchema } from '@/resources/users/drizzle.schema';
+import { emailSchema, passwordSchema, publicSchema } from '@/resources/users/users.schema';
 import { ClientError } from '@/types';
 import { clientUtil, securityUtil } from '@/utils';
 
@@ -43,7 +43,7 @@ export default isPublic
         where: { userId: user.id, type: 'email-verification' },
       });
 
-      if (!token || token.expiresOn.getTime() <= Date.now()) {
+      if (!token || token.expiresAt.getTime() <= Date.now()) {
         if (token) {
           await db.tokens.deleteOne({ id: token.id });
         }
diff --git a/template/apps/api/src/resources/auth/endpoints/sign-up.ts b/template/apps/api/src/resources/auth/endpoints/sign-up.ts
@@ -7,7 +7,7 @@ import db from '@/db';
 import { eventBus } from '@/event-bus';
 import { isPublic } from '@/procedures';
 import createToken from '@/resources/tokens/methods/create-token';
-import usersSchema, { emailSchema, passwordSchema, publicSchema } from '@/resources/users/drizzle.schema';
+import usersSchema, { emailSchema, passwordSchema, publicSchema } from '@/resources/users/users.schema';
 import { emailService } from '@/services';
 import { ClientError, Template } from '@/types';
 import { clientUtil, securityUtil } from '@/utils';
diff --git a/template/apps/api/src/resources/auth/endpoints/verify-email-token.ts b/template/apps/api/src/resources/auth/endpoints/verify-email-token.ts
@@ -5,7 +5,7 @@ import db from '@/db';
 import { isPublic } from '@/procedures';
 import setAccessToken from '@/resources/tokens/methods/set-access-token';
 import validateToken from '@/resources/tokens/methods/validate-token';
-import { publicSchema } from '@/resources/users/drizzle.schema';
+import { publicSchema } from '@/resources/users/users.schema';
 import { emailService } from '@/services';
 import { ClientError, Template } from '@/types';
 
diff --git a/template/apps/api/src/resources/base.schema.ts b/template/apps/api/src/resources/base.schema.ts
@@ -1,12 +1,12 @@
+import { timestamp, uuid } from 'drizzle-orm/pg-core';
 import { z } from 'zod';
 
-export const dbSchema = z.object({
-  id: z.string().uuid(),
-
-  createdOn: z.date().nullable(),
-  updatedOn: z.date().nullable(),
-  deletedOn: z.date().nullable(),
-});
+export const baseColumns = {
+  id: uuid('id').defaultRandom().primaryKey(),
+  createdAt: timestamp('created_at', { withTimezone: true }).defaultNow(),
+  updatedAt: timestamp('updated_at', { withTimezone: true }).$onUpdate(() => new Date()),
+  deletedAt: timestamp('deleted_at', { withTimezone: true }),
+};
 
 export const paginationSchema = z.object({
   page: z.coerce.number().default(1),
@@ -16,9 +16,9 @@ export const paginationSchema = z.object({
 
   sort: z
     .object({
-      createdOn: z.enum(['asc', 'desc']).default('asc'),
+      createdAt: z.enum(['asc', 'desc']).default('asc'),
     })
-    .default({ createdOn: 'asc' }),
+    .default({ createdAt: 'asc' }),
 });
 
 export const listResultSchema = <T extends z.ZodType>(itemSchema: T) =>
diff --git a/template/apps/api/src/resources/tokens/methods/create-token.ts b/template/apps/api/src/resources/tokens/methods/create-token.ts
@@ -14,8 +14,8 @@ export default async function createToken({ userId, type, expiresIn }: CreateTok
   const value = await securityUtil.hashToken(secureToken);
 
   const now = new Date();
-  const expiresOn = new Date(now.getTime() + expiresIn * 1000);
-  const token = await db.tokens.insertOne({ type, value, userId, expiresOn });
+  const expiresAt = new Date(now.getTime() + expiresIn * 1000);
+  const token = await db.tokens.insertOne({ type, value, userId, expiresAt });
 
   return `${token.id}.${secureToken}`;
 }
diff --git a/template/apps/api/src/resources/tokens/methods/validate-access-token.ts b/template/apps/api/src/resources/tokens/methods/validate-access-token.ts
@@ -14,14 +14,14 @@ export default async function validateAccessToken(value?: string | null): Promis
   const now = new Date();
 
   if (
-    token.expiresOn.getTime() - now.getTime() <=
+    token.expiresAt.getTime() - now.getTime() <=
     ACCESS_TOKEN.INACTIVITY_TIMEOUT_SECONDS * 1000 - ACCESS_TOKEN.ACTIVITY_CHECK_INTERVAL_SECONDS * 1000
   ) {
     const newExpiresOn = new Date(now.getTime() + ACCESS_TOKEN.INACTIVITY_TIMEOUT_SECONDS * 1000);
 
-    await db.tokens.updateOne({ id: token.id, type: 'access' }, { expiresOn: newExpiresOn });
+    await db.tokens.updateOne({ id: token.id, type: 'access' }, { expiresAt: newExpiresOn });
 
-    token.expiresOn = newExpiresOn;
+    token.expiresAt = newExpiresOn;
   }
 
   return token;
diff --git a/template/apps/api/src/resources/tokens/methods/validate-token.ts b/template/apps/api/src/resources/tokens/methods/validate-token.ts
@@ -17,7 +17,7 @@ const getToken = async (tokenId: string | undefined | null, type: TokenType): Pr
 
   const now = new Date();
 
-  if (token.expiresOn.getTime() <= now.getTime()) {
+  if (token.expiresAt.getTime() <= now.getTime()) {
     await db.tokens.deleteMany({ id: tokenId, type });
     return null;
   }
@@ -54,7 +54,7 @@ export default async function validateToken({
 
   const now = new Date();
 
-  if (foundToken.expiresOn.getTime() <= now.getTime()) {
+  if (foundToken.expiresAt.getTime() <= now.getTime()) {
     await db.tokens.deleteMany({ id: tokenId, type });
     return null;
   }
diff --git a/template/apps/api/src/resources/tokens/tokens.schema.ts b/template/apps/api/src/resources/tokens/tokens.schema.ts
@@ -1,20 +1,17 @@
 import { pgEnum, pgTable, text, timestamp, uuid } from 'drizzle-orm/pg-core';
 
-import { users } from '../users/drizzle.schema';
+import { baseColumns } from '../base.schema';
+import { users } from '../users/users.schema';
 
 export const tokenTypeEnum = pgEnum('token_type', ['access', 'email-verification', 'reset-password']);
 
 export const tokens = pgTable('tokens', {
-  id: uuid('id').defaultRandom().primaryKey(),
+  ...baseColumns,
 
   value: text('value').notNull(),
   userId: uuid('user_id')
     .notNull()
     .references(() => users.id),
   type: tokenTypeEnum('type').notNull(),
-  expiresOn: timestamp('expires_on', { withTimezone: true }).notNull(),
-
-  createdOn: timestamp('created_on', { withTimezone: true }).defaultNow(),
-  updatedOn: timestamp('updated_on', { withTimezone: true }),
-  deletedOn: timestamp('deleted_on', { withTimezone: true }),
+  expiresAt: timestamp('expires_at', { withTimezone: true }).notNull(),
 });
diff --git a/template/apps/api/src/resources/users/endpoints/get-current.ts b/template/apps/api/src/resources/users/endpoints/get-current.ts
@@ -1,5 +1,5 @@
 import { isAuthorized } from '@/procedures';
-import { publicSchema } from '@/resources/users/drizzle.schema';
+import { publicSchema } from '@/resources/users/users.schema';
 
 export default isAuthorized.output(publicSchema).handler(async ({ context }) => {
   return context.user;
diff --git a/template/apps/api/src/resources/users/endpoints/list.ts b/template/apps/api/src/resources/users/endpoints/list.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod';
 
-import { publicSchema } from '../drizzle.schema';
+import { publicSchema } from '../users.schema';
 
 import db from '@/db';
 import { isAdmin } from '@/procedures';
@@ -11,7 +11,7 @@ export default isAdmin
     paginationSchema.extend({
       filter: z
         .object({
-          createdOn: z
+          createdAt: z
             .object({
               startDate: z.coerce.date().optional(),
               endDate: z.coerce.date().optional(),
@@ -23,33 +23,33 @@ export default isAdmin
         .object({
           firstName: z.enum(['asc', 'desc']).optional(),
           lastName: z.enum(['asc', 'desc']).optional(),
-          createdOn: z.enum(['asc', 'desc']).default('asc'),
+          createdAt: z.enum(['asc', 'desc']).default('asc'),
         })
-        .default({ createdOn: 'asc' }),
+        .default({ createdAt: 'asc' }),
     }),
   )
   .output(listResultSchema(publicSchema))
   .handler(async ({ input }) => {
     const { perPage, page, sort, searchValue, filter } = input;
 
-    const createdOnFilter: Record<string, Date> = {};
-    if (filter?.createdOn?.startDate) {
-      createdOnFilter.gte = filter.createdOn.startDate;
+    const createdAtFilter: Record<string, Date> = {};
+    if (filter?.createdAt?.startDate) {
+      createdAtFilter.gte = filter.createdAt.startDate;
     }
-    if (filter?.createdOn?.endDate) {
-      createdOnFilter.lt = filter.createdOn.endDate;
+    if (filter?.createdAt?.endDate) {
+      createdAtFilter.lt = filter.createdAt.endDate;
     }
 
     const where = {
-      deletedOn: null,
+      deletedAt: null,
       ...(searchValue && {
         OR: [
           { firstName: { ilike: `%${searchValue}%` } },
           { lastName: { ilike: `%${searchValue}%` } },
           { email: { ilike: `%${searchValue}%` } },
         ],
       }),
-      ...(Object.keys(createdOnFilter).length && { createdOn: createdOnFilter }),
+      ...(Object.keys(createdAtFilter).length && { createdAt: createdAtFilter }),
     };
 
     return db.users.findPage({ where, orderBy: sort, page, perPage });
diff --git a/template/apps/api/src/resources/users/endpoints/remove.ts b/template/apps/api/src/resources/users/endpoints/remove.ts
@@ -13,7 +13,7 @@ export default isAdmin
   )
   .output(z.object({}))
   .handler(async ({ input }) => {
-    await db.users.updateOne({ id: input.id }, { deletedOn: new Date() });
+    await db.users.updateOne({ id: input.id }, { deletedAt: new Date() });
 
     return {};
   });
diff --git a/template/apps/api/src/resources/users/endpoints/update-current.ts b/template/apps/api/src/resources/users/endpoints/update-current.ts
@@ -4,7 +4,7 @@ import db from '@/db';
 import { isAuthorized } from '@/procedures';
 import removeAvatar from '@/resources/auth/methods/remove-avatar';
 import uploadAvatar from '@/resources/auth/methods/upload-avatar';
-import usersSchema, { passwordSchema, publicSchema } from '@/resources/users/drizzle.schema';
+import usersSchema, { passwordSchema, publicSchema } from '@/resources/users/users.schema';
 import { securityUtil } from '@/utils';
 
 export default isAuthorized
diff --git a/template/apps/api/src/resources/users/endpoints/update.ts b/template/apps/api/src/resources/users/endpoints/update.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod';
 
-import usersSchema, { publicSchema } from '../drizzle.schema';
+import usersSchema, { publicSchema } from '../users.schema';
 
 import db from '@/db';
 import { isAdmin, shouldExist } from '@/procedures';
diff --git a/template/apps/api/src/resources/users/users.schema.ts b/template/apps/api/src/resources/users/users.schema.ts
@@ -1,9 +1,11 @@
-import { boolean, pgTable, text, timestamp, uuid } from 'drizzle-orm/pg-core';
+import { boolean, pgTable, text, timestamp } from 'drizzle-orm/pg-core';
 import { createSelectSchema } from 'drizzle-orm/zod';
 import { z } from 'zod';
 
+import { baseColumns } from '../base.schema';
+
 export const users = pgTable('users', {
-  id: uuid('id').defaultRandom().primaryKey(),
+  ...baseColumns,
 
   firstName: text('first_name').notNull(),
   lastName: text('last_name').notNull(),
@@ -16,13 +18,9 @@ export const users = pgTable('users', {
   avatarUrl: text('avatar_url'),
 
   googleUserId: text('google_user_id'),
-  googleConnectedOn: timestamp('google_connected_on', { withTimezone: true }),
+  googleConnectedAt: timestamp('google_connected_at', { withTimezone: true }),
 
   lastRequest: timestamp('last_request', { withTimezone: true }),
-
-  createdOn: timestamp('created_on', { withTimezone: true }).defaultNow(),
-  updatedOn: timestamp('updated_on', { withTimezone: true }),
-  deletedOn: timestamp('deleted_on', { withTimezone: true }),
 });
 
 export const emailSchema = z
diff --git a/template/apps/api/src/schema.ts b/template/apps/api/src/schema.ts
diff --git a/template/apps/api/src/server.ts b/template/apps/api/src/server.ts
@@ -69,7 +69,7 @@ app.use(async (c, next) => {
 
     const token = await validateAccessToken(accessToken);
     if (token) {
-      const user = await db.users.findFirst({ where: { id: token.userId, deletedOn: null } });
+      const user = await db.users.findFirst({ where: { id: token.userId, deletedAt: null } });
       if (user) {
         await updateLastRequest(token.userId);
         ctx.user = user;
diff --git a/template/apps/api/src/services/google/google.service.ts b/template/apps/api/src/services/google/google.service.ts
@@ -69,7 +69,7 @@ const handleExistingUserByEmail = async (email: string, googleUserId: string): P
       { id: existingUserByEmail.id },
       {
         googleUserId,
-        googleConnectedOn: new Date(),
+        googleConnectedAt: new Date(),
       },
     );
 
@@ -91,7 +91,7 @@ const createNewUser = async (userData: GoogleUserData): Promise<User | null> =>
     isEmailVerified,
     avatarUrl,
     googleUserId,
-    googleConnectedOn: new Date(),
+    googleConnectedAt: new Date(),
   });
 
   return newUser as User;
