Merge pull request #6 from oslabs-beta/lorenc-server

refactor the users routes

Author: lorencDedaj

README.md

@@ -45,6 +45,7 @@ AutoDeploy/
 │       └── github-oauth.js      # helper functions for GitHub API
     ├── routes/
 │   │   └── auth.github.js       # all GitHub OAuth + /me routes
+		└── usersRoutes
 │   ├── server.js                # Express bootstrap & route mounting
 │   ├── db.js                    # pg Pool + query() + healthCheck()
 │

server/routes/usersRoutes.js

@@ -0,0 +1,48 @@
+import { Router } from 'express';
+import { z } from 'zod';
+import { query } from '../db.js';
+
+const router = Router();
+
+/** Users */
+const UserBody = z.object({
+  email: z.string().email(),
+  github_username: z.string().min(1).optional(),
+});
+
+// Create or upsert user by email
+router.post('/users', async (req, res) => {
+  const parse = UserBody.safeParse(req.body);
+  if (!parse.success)
+    return res.status(400).json({ error: parse.error.message });
+  const { email, github_username } = parse.data;
+
+  // upsert on email; requires a unique index on users.email
+  try {
+    const rows = await query(
+      `
+      insert into users (email, github_username)
+      values ($1, $2)
+      on conflict (email) do update set github_username = excluded.github_username
+      returning *;
+      `,
+      [email, github_username ?? null]
+    );
+    res.status(201).json({ user: rows[0] });
+  } catch (e) {
+    res.status(500).json({ error: e.message });
+  }
+});
+
+router.get('/users', async (_req, res) => {
+  try {
+    const rows = await query(
+      `select * from users order by created_at desc limit 100;`
+    );
+    res.json({ users: rows });
+  } catch (e) {
+    res.status(500).json({ error: e.message });
+  }
+});
+
+export default router;

server/server.js

@@ -3,10 +3,9 @@ import express from 'express';
 import cors from 'cors';
 import helmet from 'helmet';
 import morgan from 'morgan';
-import { healthCheck, query } from './db.js';
+import { healthCheck } from './db.js';
 import githubAuthRouter from './routes/auth.github.js';
-import { z } from 'zod';
-import mcpRoutes from './routes/mcp.js';
+import userRouter from './routes/usersRoutes.js';
 
 const app = express();
 app.use(express.json());
@@ -27,69 +26,33 @@ app.get('/db/ping', async (_req, res) => {
   }
 });
 
-/** Users */
-const UserBody = z.object({
-  email: z.string().email(),
-  github_username: z.string().min(1).optional(),
-});
-
-// Create or upsert user by email
-app.post('/users', async (req, res) => {
-  const parse = UserBody.safeParse(req.body);
-  if (!parse.success)
-    return res.status(400).json({ error: parse.error.message });
-  const { email, github_username } = parse.data;
-
-  // upsert on email; requires a unique index on users.email
-  try {
-    const rows = await query(
-      `
-      insert into users (email, github_username)
-      values ($1, $2)
-      on conflict (email) do update set github_username = excluded.github_username
-      returning *;
-      `,
-      [email, github_username ?? null]
-    );
-    res.status(201).json({ user: rows[0] });
-  } catch (e) {
-    res.status(500).json({ error: e.message });
-  }
-});
-
-app.get('/users', async (_req, res) => {
-  try {
-    const rows = await query(
-      `select * from users order by created_at desc limit 100;`
-    );
-    res.json({ users: rows });
-  } catch (e) {
-    res.status(500).json({ error: e.message });
-  }
-});
+// Mount users route at /users
+app.use('/', userRouter);
 
 // --- Request Logging Middleware ---
 app.use((req, res, next) => {
-  const user = req.headers["x-user-id"] || "anonymous";
-  console.log(`[${new Date().toISOString()}] ${req.method} ${req.originalUrl} | user=${user}`);
+  const user = req.headers['x-user-id'] || 'anonymous';
+  console.log(
+    `[${new Date().toISOString()}] ${req.method} ${
+      req.originalUrl
+    } | user=${user}`
+  );
   next();
 });
 
-// -- Agent entry point 
+// -- Agent entry point
 app.use('/mcp/v1', mcpRoutes);
 
 // --- Global Error Handler ---
 app.use((err, req, res, next) => {
-  console.error("Global Error:", err);
+  console.error('Global Error:', err);
   res.status(500).json({
     success: false,
-    error: "Internal Server Error",
+    error: 'Internal Server Error',
     message: err.message,
   });
 });
 
-
-
 // Mount GitHub OAuth routes at /auth/github
 app.use('/auth/github', githubAuthRouter);