Merge pull request #12 from Joker666/develop

Release 1.5

README.md

@@ -36,30 +36,29 @@ pnpm install -g typescript
 pnpm install -g pino-pretty
 ```
 
-## Migration
+## Run the app
 
 Create a new file `.env` in the root folder and copy contents from the `.env.template` file.
 
 ```bash
 docker compose up -d
 ```
 
-### Generate
+### Generate db table
 
 ```bash
 pnpm run db:generate
 ```
 
-### Migrate
+### Migrate schema
 
 ```bash
 pnpm run db:migrate
 ```
 
-## Run the app
+### Open Swagger UI
 
 ```bash
-pnpm run dev
 open http://localhost:3000/doc
 ```
 

drizzle.config.ts

@@ -1,10 +1,10 @@
 import 'dotenv/config';
 import { defineConfig } from 'drizzle-kit';
-import env from './src/lib/env.js';
+import env from './src/lib/env.ts';
 
 export default defineConfig({
-  schema: '.src/schema/schema.ts',
-  out: '.src/schema/migration',
+  schema: './src/db/schema/schema.ts',
+  out: './src/db/schema/migration',
   dialect: 'mysql',
   dbCredentials: {
     host: env.DB_HOST,

src/lib/database.ts → src/db/database.ts

@@ -1,10 +1,10 @@
 import type { Logger as drizzleLogger } from 'drizzle-orm/logger';
 import { drizzle } from 'drizzle-orm/mysql2';
 import mysql from 'mysql2/promise';
-import * as schema from '../schema/schema.js';
-import type { userSchema } from '../schema/schema.js';
-import env from './env.js';
-import { logger } from './logger.js';
+import * as schema from './schema/schema.js';
+import type { userSchema } from './schema/schema.js';
+import env from '../lib/env.js';
+import { logger } from '../lib/logger.js';
 
 const DB_ERRORS = {
   DUPLICATE_KEY: 'ER_DUP_ENTRY',

src/index.ts

@@ -9,7 +9,7 @@ import { logger as httpLogger } from 'hono/logger';
 import { trimTrailingSlash } from 'hono/trailing-slash';
 
 import { NODE_ENVIRONMENTS } from './lib/constants.js';
-import { connection } from './lib/database.js';
+import { connection } from './db/database.js';
 import { logger } from './lib/logger.js';
 import { tracing } from './web/middlelayer/tracing.js';
 import { Server } from './web/server.js';

src/repository/user.ts

@@ -1,6 +1,6 @@
 import { eq } from 'drizzle-orm';
-import { userSchema } from '../schema/schema.js';
-import { db, type NewUser } from '../lib/database.js';
+import { userSchema } from '../db/schema/schema.js';
+import { db, type NewUser } from '../db/database.js';
 
 export class UserRepository {
   public async create(user: NewUser) {

src/web/controller/auth.ts

@@ -1,5 +1,5 @@
 import type { Context } from 'hono';
-import { DB_ERRORS, type DatabaseError } from '../../lib/database.js';
+import { DB_ERRORS, type DatabaseError } from '../../db/database.js';
 import { verify } from '../../lib/encryption.js';
 import { type JWTPayload, encode } from '../../lib/jwt.js';
 import type { UserService } from '../../service/user.js';

src/web/controller/serializer/user.ts

@@ -1,4 +1,4 @@
-import type { User } from '../../../lib/database.js';
+import type { User } from '../../../db/database.js';
 
 type UserResponse = {
   id: number;

tsconfig.json

@@ -3,6 +3,7 @@
     "target": "ESNext",
     "module": "nodenext",
     "moduleResolution": "nodenext",
+    "allowImportingTsExtensions": true,
     "strict": true,
     "skipLibCheck": true,
     "types": ["node"],