Skip to content

refactor(api): organize code by feature #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rd-code-23 merged 1 commit into from
Aug 25, 2026
Merged

refactor(api): organize code by feature #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 apps/api/src/auth/csrf/csrf.middleware.ts → ...src/features/auth/csrf/csrf.middleware.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...rc/auth/google/google-oidc.routes.test.ts → ...es/auth/google/google-oidc.routes.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
validateReturnTo,
} from './google-oidc.routes.js';
import { createSessionMiddleware } from '../session/session.middleware.js';
import { testSessionConfiguration } from '../../test/fixtures/session-configuration.fixture.js';
import { testSessionConfiguration } from '../../../test/fixtures/session-configuration.fixture.js';

const redirectUri = 'http://localhost:3000/auth/google/callback';
type TestContextOptions = {
Expand Down
2 changes: 1 addition & 1 deletion ...api/src/auth/google/google-oidc.routes.ts → ...eatures/auth/google/google-oidc.routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
} from 'openid-client';
import { z } from 'zod';

import type { Env } from '../../config/env-schema.js';
import type { Env } from '../../../config/env-schema.js';
import type { GoogleUserProfile } from './google-user.service.js';

const GOOGLE_ISSUER = new URL('https://accounts.google.com');
Expand Down
0 ...c/auth/google/google-user.service.test.ts → ...s/auth/google/google-user.service.test.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...pi/src/auth/google/google-user.service.ts → ...atures/auth/google/google-user.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** Atomically provisions or updates a user identified by Google's stable subject. */
import type { NodePgDatabase } from 'drizzle-orm/node-postgres';

import { users } from '../../db/schema/index.js';
import { users } from '../../../db/schema/index.js';

export type GoogleUserProfile = {
avatarUrl?: string;
Expand Down
0 .../auth/guards/authentication.middleware.ts → .../auth/guards/authentication.middleware.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...h/guards/authorization.middleware.test.ts → ...h/guards/authorization.middleware.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import { createSessionMiddleware } from '../session/session.middleware.js';
import {
establishAuthenticatedTestSession,
withAuthenticatedTestUser,
} from '../../test/authenticated-session.test-helper.js';
import { testSessionConfiguration } from '../../test/fixtures/session-configuration.fixture.js';
} from '../../../test/authenticated-session.test-helper.js';
import { testSessionConfiguration } from '../../../test/fixtures/session-configuration.fixture.js';
import {
getAuthenticatedUserId,
requireAuthentication,
Expand Down
0 ...c/auth/guards/authorization.middleware.ts → ...s/auth/guards/authorization.middleware.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...c/auth/session/session.middleware.test.ts → ...s/auth/session/session.middleware.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import session from 'express-session';
import request from 'supertest';
import { describe, expect, it } from 'vitest';

import { testSessionConfiguration } from '../../test/fixtures/session-configuration.fixture.js';
import { testSessionConfiguration } from '../../../test/fixtures/session-configuration.fixture.js';
import { createSessionMiddleware } from './session.middleware.js';

function createSessionTestApp(store: session.MemoryStore) {
Expand Down
2 changes: 1 addition & 1 deletion ...pi/src/auth/session/session.middleware.ts → ...atures/auth/session/session.middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import connectPgSimple from 'connect-pg-simple';
import session, { type Store } from 'express-session';
import type { Pool } from 'pg';

import type { Env } from '../../config/env-schema.js';
import type { Env } from '../../../config/env-schema.js';

declare module 'express-session' {
interface SessionData {
Expand Down
4 changes: 2 additions & 2 deletions ...i/src/auth/session/session.routes.test.ts → ...tures/auth/session/session.routes.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import request from 'supertest';
import { describe, expect, it, vi } from 'vitest';
import { z } from 'zod';

import { createPublicUser } from '../../test/fixtures/public-user.fixture.js';
import { testSessionConfiguration } from '../../test/fixtures/session-configuration.fixture.js';
import { createPublicUser } from '../../../test/fixtures/public-user.fixture.js';
import { testSessionConfiguration } from '../../../test/fixtures/session-configuration.fixture.js';
import { csrfErrorHandler, csrfProtection } from '../csrf/csrf.middleware.js';
import { createSessionMiddleware } from './session.middleware.js';
import { createSessionRouter } from './session.routes.js';
Expand Down
0 apps/api/src/auth/session/session.routes.ts → ...c/features/auth/session/session.routes.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...rc/auth/user/current-user.service.test.ts → ...es/auth/user/current-user.service.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import type { NodePgDatabase } from 'drizzle-orm/node-postgres';
import { describe, expect, it, vi } from 'vitest';

import { users } from '../../db/schema/index.js';
import { createPublicUser } from '../../test/fixtures/public-user.fixture.js';
import { users } from '../../../db/schema/index.js';
import { createPublicUser } from '../../../test/fixtures/public-user.fixture.js';
import { findPublicUserById } from './current-user.service.js';

describe('findPublicUserById', () => {
Expand Down
2 changes: 1 addition & 1 deletion ...api/src/auth/user/current-user.service.ts → ...eatures/auth/user/current-user.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { PublicUser } from '@goforlift/contracts';
import { eq } from 'drizzle-orm';
import type { NodePgDatabase } from 'drizzle-orm/node-postgres';

import { users } from '../../db/schema/index.js';
import { users } from '../../../db/schema/index.js';

export async function findPublicUserById(
database: NodePgDatabase,
Expand Down
4 changes: 2 additions & 2 deletions ...api/src/exercises/exercise.routes.test.ts → ...eatures/exercises/exercise.routes.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import request from 'supertest';
import { describe, expect, it, vi } from 'vitest';

import { createSessionMiddleware } from '../auth/session/session.middleware.js';
import { establishAuthenticatedTestSession } from '../test/authenticated-session.test-helper.js';
import { testSessionConfiguration } from '../test/fixtures/session-configuration.fixture.js';
import { establishAuthenticatedTestSession } from '../../test/authenticated-session.test-helper.js';
import { testSessionConfiguration } from '../../test/fixtures/session-configuration.fixture.js';
import { createExerciseRouter } from './exercise.routes.js';

const userId = '26d34dc0-8e4c-4bd0-9e3b-7b839b44e486';
Expand Down
0 apps/api/src/exercises/exercise.routes.ts → ...src/features/exercises/exercise.routes.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...pi/src/exercises/exercise.service.test.ts → ...atures/exercises/exercise.service.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import type { NodePgDatabase } from 'drizzle-orm/node-postgres';
import { describe, expect, it, vi } from 'vitest';

import { exercises } from '../db/schema/index.js';
import { exercises } from '../../db/schema/index.js';
import { listExercisesForUser } from './exercise.service.js';

describe('listExercisesForUser', () => {
Expand Down
2 changes: 1 addition & 1 deletion apps/api/src/exercises/exercise.service.ts → ...rc/features/exercises/exercise.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { ExerciseSummary } from '@goforlift/contracts';
import { asc, eq, isNull, or } from 'drizzle-orm';
import type { NodePgDatabase } from 'drizzle-orm/node-postgres';

import { exercises } from '../db/schema/index.js';
import { exercises } from '../../db/schema/index.js';

export async function listExercisesForUser(
database: NodePgDatabase,
Expand Down
16 changes: 8 additions & 8 deletions apps/api/src/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ import { createApp } from './app.js';
import {
csrfErrorHandler,
csrfProtection,
} from './auth/csrf/csrf.middleware.js';
} from './features/auth/csrf/csrf.middleware.js';
import {
createGoogleOidcRouter,
discoverGoogleOidc,
} from './auth/google/google-oidc.routes.js';
import { provisionGoogleUser } from './auth/google/google-user.service.js';
import { createPostgresSession } from './auth/session/session.middleware.js';
import { createSessionRouter } from './auth/session/session.routes.js';
import { findPublicUserById } from './auth/user/current-user.service.js';
} from './features/auth/google/google-oidc.routes.js';
import { provisionGoogleUser } from './features/auth/google/google-user.service.js';
import { createPostgresSession } from './features/auth/session/session.middleware.js';
import { createSessionRouter } from './features/auth/session/session.routes.js';
import { findPublicUserById } from './features/auth/user/current-user.service.js';
import { env } from './config/env.js';
import { createDatabase } from './db/client.js';
import { createExerciseRouter } from './exercises/exercise.routes.js';
import { listExercisesForUser } from './exercises/exercise.service.js';
import { createExerciseRouter } from './features/exercises/exercise.routes.js';
import { listExercisesForUser } from './features/exercises/exercise.service.js';

const { db, pool } = createDatabase(env.DATABASE_URL);
const { middleware: sessionMiddleware, store: sessionStore } =
Expand Down