Patrick/medassist-ng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add expiry_date, notes, and generic_name columns to medications table with corresponding migrations

Browse Source
This commit is contained in:
Daniel Volz
2025-12-20 22:06:44 +01:00
parent b96c8db3de
commit 8a03bf3f86
9 changed files with 286 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/db/client.ts
+3
View File
@@ -13,6 +13,9 @@ export const db = drizzle(client);
async function runMigrations() {
const migrations = [
{ name: "image_url", sql: "ALTER TABLE medications ADD COLUMN image_url TEXT" },
{ name: "expiry_date", sql: "ALTER TABLE medications ADD COLUMN expiry_date TEXT" },
{ name: "notes", sql: "ALTER TABLE medications ADD COLUMN notes TEXT" },
{ name: "generic_name", sql: "ALTER TABLE medications ADD COLUMN generic_name TEXT" },
];
for (const migration of migrations) {
backend/src/db/migrations/0004_add_expiry_date.sql
+2
View File
@@ -0,0 +1,2 @@
-- Migration 0004: Add expiry_date column for medication expiration tracking
ALTER TABLE medications ADD COLUMN expiry_date TEXT;
backend/src/db/migrations/0005_add_notes.sql
+2
View File
@@ -0,0 +1,2 @@
-- Add notes column for medication instructions
ALTER TABLE medications ADD COLUMN notes TEXT;
backend/src/db/migrations/0006_add_generic_name.sql
+2
View File
@@ -0,0 +1,2 @@
-- Add generic_name column for medication active ingredient
ALTER TABLE medications ADD COLUMN generic_name TEXT;
backend/src/db/migrations/meta/_journal.json
+4 -1
View File
@@ -3,6 +3,9 @@
{ "idx": 0, "version": 1, "when": 1734633120, "tag": "0000_init", "breakpoint": false },
{ "idx": 1, "version": 1, "when": 1734700000, "tag": "0001_add_strips", "breakpoint": false },
{ "idx": 2, "version": 1, "when": 1734800000, "tag": "0002_pack_inventory", "breakpoint": false },
{ "idx": 3, "version": 1, "when": 1734900000, "tag": "0003_add_image_url", "breakpoint": false }
{ "idx": 3, "version": 1, "when": 1734900000, "tag": "0003_add_image_url", "breakpoint": false },
{ "idx": 4, "version": 1, "when": 1735000000, "tag": "0004_add_expiry_date", "breakpoint": false },
{ "idx": 5, "version": 1, "when": 1735100000, "tag": "0005_add_notes", "breakpoint": false },
{ "idx": 6, "version": 1, "when": 1735200000, "tag": "0006_add_generic_name", "breakpoint": false }
]
}
backend/src/db/schema.ts
+3
View File
@@ -13,6 +13,7 @@ export const users = sqliteTable("users", {
export const medications = sqliteTable("medications", {
id: integer("id").primaryKey({ autoIncrement: true }),
name: text("name", { length: 100 }).notNull().unique(),
genericName: text("generic_name", { length: 100 }),
count: integer("count").notNull().default(0),
strips: integer("strips").notNull().default(0),
packCount: integer("pack_count").notNull().default(1),
@@ -24,6 +25,8 @@ export const medications = sqliteTable("medications", {
startJson: text("start_json").notNull().default("[]"),
stripSize: integer("strip_size").notNull().default(1),
imageUrl: text("image_url"),
expiryDate: text("expiry_date"),
notes: text("notes"),
updatedAt: integer("updated_at", { mode: "timestamp" }).notNull().default(sql`CURRENT_TIMESTAMP`),
});
backend/src/routes/medications.ts
+20 -2
View File
@@ -17,10 +17,13 @@ const sliceSchema = z.object({
const medicationSchema = z.object({
name: z.string().trim().min(1).max(100),
genericName: z.string().trim().max(100).nullable().optional(),
packCount: z.number().int().min(0).default(1),
stripsPerPack: z.number().int().min(1).default(1),
tabsPerStrip: z.number().int().min(1).default(1),
looseTablets: z.number().int().min(0).default(0),
expiryDate: z.string().nullable().optional(),
notes: z.string().max(500).nullable().optional(),
// count will be derived on the backend
slices: z.array(sliceSchema).min(1).max(12),
});
@@ -51,6 +54,7 @@ export async function medicationRoutes(app: FastifyInstance) {
return rows.map((row) => ({
id: row.id,
name: row.name,
genericName: row.genericName,
count: row.count,
strips: row.strips,
stripSize: row.stripSize,
@@ -60,6 +64,8 @@ export async function medicationRoutes(app: FastifyInstance) {
looseTablets: row.looseTablets ?? 0,
slices: parseSlices(row),
imageUrl: row.imageUrl,
expiryDate: row.expiryDate,
notes: row.notes,
updatedAt: row.updatedAt,
}));
});
@@ -68,7 +74,7 @@ export async function medicationRoutes(app: FastifyInstance) {
const parsed = medicationSchema.safeParse(req.body);
if (!parsed.success) return reply.status(400).send(parsed.error.format());
const { name, packCount, stripsPerPack, tabsPerStrip, looseTablets, slices } = parsed.data;
const { name, genericName, packCount, stripsPerPack, tabsPerStrip, looseTablets, expiryDate, notes, slices } = parsed.data;
const usageJson = JSON.stringify(slices.map((s) => s.usage));
const everyJson = JSON.stringify(slices.map((s) => s.every));
const startJson = JSON.stringify(slices.map((s) => s.start));
@@ -79,6 +85,7 @@ export async function medicationRoutes(app: FastifyInstance) {
.insert(medications)
.values({
name,
genericName: genericName || null,
count: derivedCount,
strips: stripsPerPack,
stripSize: tabsPerStrip,
@@ -86,6 +93,8 @@ export async function medicationRoutes(app: FastifyInstance) {
stripsPerPack,
tabsPerStrip,
looseTablets,
expiryDate: expiryDate || null,
notes: notes || null,
usageJson,
everyJson,
startJson,
@@ -95,6 +104,7 @@ export async function medicationRoutes(app: FastifyInstance) {
return {
id: inserted.id,
name: inserted.name,
genericName: inserted.genericName,
count: inserted.count,
strips: inserted.strips,
stripSize: inserted.stripSize,
@@ -104,6 +114,8 @@ export async function medicationRoutes(app: FastifyInstance) {
looseTablets: inserted.looseTablets,
slices,
imageUrl: inserted.imageUrl,
expiryDate: inserted.expiryDate,
notes: inserted.notes,
updatedAt: inserted.updatedAt,
};
});
@@ -114,7 +126,7 @@ export async function medicationRoutes(app: FastifyInstance) {
const idNum = Number(req.params.id);
if (Number.isNaN(idNum)) return reply.badRequest("Invalid id");
const { name, packCount, stripsPerPack, tabsPerStrip, looseTablets, slices } = parsed.data;
const { name, genericName, packCount, stripsPerPack, tabsPerStrip, looseTablets, expiryDate, notes, slices } = parsed.data;
const usageJson = JSON.stringify(slices.map((s) => s.usage));
const everyJson = JSON.stringify(slices.map((s) => s.every));
const startJson = JSON.stringify(slices.map((s) => s.start));
@@ -125,6 +137,7 @@ export async function medicationRoutes(app: FastifyInstance) {
.update(medications)
.set({
name,
genericName: genericName || null,
count: derivedCount,
strips: stripsPerPack,
stripSize: tabsPerStrip,
@@ -132,6 +145,8 @@ export async function medicationRoutes(app: FastifyInstance) {
stripsPerPack,
tabsPerStrip,
looseTablets,
expiryDate: expiryDate || null,
notes: notes || null,
usageJson,
everyJson,
startJson,
@@ -145,6 +160,7 @@ export async function medicationRoutes(app: FastifyInstance) {
return {
id: result[0].id,
name: result[0].name,
genericName: result[0].genericName,
count: result[0].count,
strips: result[0].strips,
stripSize: result[0].stripSize,
@@ -154,6 +170,8 @@ export async function medicationRoutes(app: FastifyInstance) {
looseTablets: result[0].looseTablets,
slices,
imageUrl: result[0].imageUrl,
expiryDate: result[0].expiryDate,
notes: result[0].notes,
updatedAt: result[0].updatedAt,
};
});