diff --git a/src/lib/server/api/common/config.ts b/src/lib/server/api/common/config.ts index cd60258..df45a0b 100644 --- a/src/lib/server/api/common/config.ts +++ b/src/lib/server/api/common/config.ts @@ -1,5 +1,5 @@ import * as envs from '$env/static/private'; -import type { Config } from './types/config.type'; +import type { Config } from './types/config'; export const config: Config = { isProduction: envs.NODE_ENV === 'production', diff --git a/src/lib/server/api/common/types/config.type.ts b/src/lib/server/api/common/types/config.ts similarity index 100% rename from src/lib/server/api/common/types/config.type.ts rename to src/lib/server/api/common/types/config.ts diff --git a/src/lib/server/api/index.ts b/src/lib/server/api/index.ts index 6260fb4..4260474 100644 --- a/src/lib/server/api/index.ts +++ b/src/lib/server/api/index.ts @@ -3,7 +3,7 @@ import { Hono } from 'hono'; import { hc } from 'hono/client'; import { container } from 'tsyringe'; import { IamController } from './controllers/iam.controller'; -import { config, env } from './common/config'; +import { config } from './common/config'; import { validateAuthSession, verifyOrigin } from './middlewares/auth.middleware'; import { AuthCleanupJobs } from './jobs/auth-cleanup.job'; diff --git a/src/lib/server/api/repositories/email-verifications.repository.ts b/src/lib/server/api/repositories/email-verifications.repository.ts index 597ba3f..c599b9e 100644 --- a/src/lib/server/api/repositories/email-verifications.repository.ts +++ b/src/lib/server/api/repositories/email-verifications.repository.ts @@ -4,14 +4,14 @@ import { emailVerificationsTable } from "../databases/postgres/tables"; import { takeFirst, takeFirstOrThrow } from "../common/utils/repository"; import { DrizzleService } from "../services/drizzle.service"; -export type CreateEmailVerification = Pick, 'requestedEmail' | 'hashedToken' | 'userId' | 'expiresAt'>; +type Create = Pick, 'requestedEmail' | 'hashedToken' | 'userId' | 'expiresAt'>; @injectable() export class EmailVerificationsRepository { constructor(@inject(DrizzleService) private readonly drizzle: DrizzleService) { } // creates a new email verification record or updates an existing one - async create(data: CreateEmailVerification) { + async create(data: Create) { return this.drizzle.db.insert(emailVerificationsTable).values(data).onConflictDoUpdate({ target: emailVerificationsTable.userId, set: data diff --git a/src/lib/server/api/repositories/login-requests.repository.ts b/src/lib/server/api/repositories/login-requests.repository.ts index 141566c..5702474 100644 --- a/src/lib/server/api/repositories/login-requests.repository.ts +++ b/src/lib/server/api/repositories/login-requests.repository.ts @@ -4,8 +4,7 @@ import { loginRequestsTable } from "../databases/postgres/tables"; import { takeFirst, takeFirstOrThrow } from "../common/utils/repository"; import { DrizzleService } from "../services/drizzle.service"; - -export type CreateLoginRequest = Pick, 'email' | 'expiresAt' | 'hashedToken'>; +type Create = Pick, 'email' | 'expiresAt' | 'hashedToken'>; @injectable() export class LoginRequestsRepository { @@ -13,7 +12,7 @@ export class LoginRequestsRepository { @inject(DrizzleService) private readonly drizzle: DrizzleService, ) { } - async create(data: CreateLoginRequest, db = this.drizzle.db) { + async create(data: Create, db = this.drizzle.db) { return db.insert(loginRequestsTable).values(data).onConflictDoUpdate({ target: loginRequestsTable.email, set: data diff --git a/src/lib/server/api/repositories/users.repository.ts b/src/lib/server/api/repositories/users.repository.ts index aafe9dd..93df2cd 100644 --- a/src/lib/server/api/repositories/users.repository.ts +++ b/src/lib/server/api/repositories/users.repository.ts @@ -2,11 +2,10 @@ import { inject, injectable } from 'tsyringe'; import { usersTable } from '../databases/postgres/tables'; import { eq, type InferInsertModel } from 'drizzle-orm'; import { takeFirstOrThrow } from '../common/utils/repository'; -import type { Repository } from '../common/inferfaces/repository.interface'; import { DrizzleService } from '../services/drizzle.service'; -export type CreateUser = InferInsertModel; -export type UpdateUser = Partial; +export type Create = InferInsertModel; +export type Update = Partial; @injectable() export class UsersRepository { @@ -30,11 +29,11 @@ export class UsersRepository { }); } - async create(data: CreateUser, db = this.drizzle.db) { + async create(data: Create, db = this.drizzle.db) { return db.insert(usersTable).values(data).returning().then(takeFirstOrThrow); } - async update(id: string, data: UpdateUser, db = this.drizzle.db) { + async update(id: string, data: Update, db = this.drizzle.db) { return db .update(usersTable) .set(data) diff --git a/src/lib/server/api/services/mailer.service.ts b/src/lib/server/api/services/mailer.service.ts index d805fca..209fbb2 100644 --- a/src/lib/server/api/services/mailer.service.ts +++ b/src/lib/server/api/services/mailer.service.ts @@ -1,6 +1,6 @@ import { injectable } from 'tsyringe'; -import type { Email } from '../common/inferfaces/email.interface'; import { config } from '../common/config'; +import type { Email } from '../common/types/email'; type SendProps = { to: string | string[]; diff --git a/src/lib/server/api/services/redis.service.ts b/src/lib/server/api/services/redis.service.ts index 9d6fb02..3bc4765 100644 --- a/src/lib/server/api/services/redis.service.ts +++ b/src/lib/server/api/services/redis.service.ts @@ -1,7 +1,7 @@ import { createClient, type RedisClientType } from "redis"; import { injectable, type Disposable } from "tsyringe"; import { config } from "../common/config"; -import type { AsyncService } from "../common/inferfaces/async-service.interface"; +import type { AsyncService } from "../common/types/async-service"; @injectable() export class RedisService implements Disposable, AsyncService {