#3

Author: spelkey-ucd

services/client/controllers/api/routes/picklist.js

@@ -6,8 +6,18 @@ import logger from '../../../../lib/logger.js';
 
 const router = Router();
 
-router.get('/', async (req, res) => {
-  res.json({ message: 'Picklist API Root' });
+router.get('/', validate(schema.picklistQuery, {reqParts: ['query']}), async (req, res) => {
+  try {
+    logger.info('Picklist query validated', {corkTraceId: req.corkTraceId});
+    const r = await models.picklist.query(req.payload);
+    if (r.error) {
+      throw r.error;
+    }
+    logger.info('Picklist query successful', {corkTraceId: req.corkTraceId, resultCount: r.res.total_count});
+    res.status(200).json(r.res);
+  } catch (e) {
+    return handleError(res, req, e);
+  }
 });
 
 // create picklist

services/client/controllers/api/utils/validation/index.js

@@ -1,5 +1,5 @@
 import handleError from "../handleError.js";
-import { picklistCreateSchema } from './schemas/picklist.js';
+import { picklistCreateSchema, picklistQuerySchema } from './schemas/picklist.js';
 
 /**
  * @description Middleware to validate request data against a Zod schema.
@@ -45,6 +45,7 @@ function formatErrorResponse(zodError) {
 
 const schema = {
   picklistCreate: picklistCreateSchema,
+  picklistQuery: picklistQuerySchema
 };
 
 export { validate, schema };

services/client/controllers/api/utils/validation/schemas/picklist.js

@@ -1,5 +1,5 @@
 import * as z from "zod";
-import { requiredString, urlFriendlyString } from "./utils.js";
+import { requiredString, urlFriendlyString, pageParam, perPageParam, booleanParam } from "./utils.js";
 import models from '../../../../../../lib/models/index.js';
 
 const picklistBaseSchema = z.object({
@@ -19,12 +19,27 @@ const picklistCreateSchema = picklistBaseSchema.extend({
       if (existing.res) {
         ctx.addIssue({
           code: z.ZodIssueCode.custom,
-          message: 'Picklist with this name already exists',
+          message: 'A picklist with this name already exists',
           path: [] 
         });
       }
     }),
   label: requiredString().pipe(z.string().max(250))
 });
 
-export { picklistBaseSchema, picklistCreateSchema };
+const picklistQuerySchema = z.object({
+  page: pageParam,
+  per_page: perPageParam(15),
+  active: z.preprocess(
+    v => {
+      if (v === 'true') return true;
+      if (v === 'false') return false;
+      return v;
+    },
+    z.union([z.literal(true), z.literal(false)]).optional()
+  ),
+  archived_only: booleanParam,
+  active_only: booleanParam
+});
+
+export { picklistBaseSchema, picklistCreateSchema, picklistQuerySchema };

services/client/controllers/api/utils/validation/schemas/utils.js

@@ -40,4 +40,35 @@ const urlFriendlyString = z.string().regex(/^[a-z0-9_-]+$/, {
   message: "Must be URL-friendly: lowercase letters, numbers, hyphens, and underscores only."
 });
 
-export { requiredString, requiredNumber, urlFriendlyString };
+const pageParam = z.preprocess(
+  v => {
+    if (v == null || v === '') return 1;
+    const n = Number(v);
+    return Number.isFinite(n) ? n : v;
+  },
+  z.number().int().positive("Page must be a positive integer")
+);
+
+const perPageParam = (defaultValue = 15, maxValue = 50) =>
+  z.preprocess(
+    v => {
+      if (v == null || v === '') return defaultValue;
+      const n = Number(v);
+      return Number.isFinite(n) ? n : v;
+    },
+    z.number()
+      .int()
+      .positive("per_page must be a positive integer")
+      .max(maxValue, `per_page must be ≤ ${maxValue}`)
+  );
+
+const booleanParam = z.preprocess(
+  v => {
+    if (v === 'true') return true;
+    if (v === 'false') return false;
+    return v;
+  },
+  z.boolean().optional()
+);
+
+export { requiredString, requiredNumber, urlFriendlyString, pageParam, perPageParam, booleanParam };