Skip to content
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

Jump to bottom

feat(medication): EPI-1083: Extend drugs reference data #7047

Merged
merged 11 commits into from
Jan 20, 2025
Merged

feat(medication): EPI-1083: Extend drugs reference data #7047

merged 11 commits into from
Jan 20, 2025

Conversation

khoi-bes
Copy link
Contributor

Changes

  • Add a new table called reference_drugs that includes additional information from referenceData of the type "drug".
  • Update the import and export of referenceData to incorporate extra information about drugs.

Deploys

  • Deploy to Tamanu Internal

Remember to...

  • ...write or update tests
  • ...add UI screenshots and testing notes to the Linear issue
  • ...add any manual upgrade steps to the Linear issue
  • ...update the config reference, settings reference, or any relevant runbook(s)
  • ...call out additions or changes to config files for the deployment team to take note of

@linear Linear
Copy link

linear bot commented Jan 13, 2025

EPI-1083 Extend drugs reference data

Brief Description

This card tracks updates required for reference data type drug.

Requirements:

  • New reference_drugs table as an extension to the existing reference_data of type drug
    • Add columns default_route and default_units
  • Make importer and exporter include the defaultRoute and defaultUnits
    • Even if defaultRoute and defaultUnits are not supplied, an entry in reference_drugs should always be added for each row in the drug sheet
  • Add column default_notes
    • This column should support freetext notes (no character limit) that will automatically populate the 'Notes' field on the new prescription form when a user prescribes the specific medication
  • Also add a blank entry for each item in reference_data of type drug

Testing note:

  • Megan to supply reference data for testing.

Refinement points (DD/MM/YY):

Questions:

Complexities/Unknowns:

Easy wins:

Testing:

edmofro
edmofro requested changes Jan 16, 2025
View reviewed changes
Copy link
Member

@edmofro edmofro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice on @khoi-bes, pretty clean - just a couple of small things

packages/database/src/models/ReferenceDrug.ts Outdated
{
id: primaryKey,
referenceDataId: {
type: DataTypes.INTEGER,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be TEXT or UUID?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed it should be STRING https://github.com/beyondessential/tamanu/pull/7047/files#diff-a5864e7cf1bb9027ba890bdc4f21c72f0c4c90b51988592acfabaf90be890caeR16

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah right, my mistake

packages/central-server/app/admin/referenceDataImporter/loaders.js
@@ -421,3 +421,29 @@ export async function taskTemplateLoader(item, { models, pushError }) {

return rows;
}

export async function drugLoader(item, { models }) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you tested this works for a drug that isn't already in reference_data? It doesn't seem like it will be added to the parent table, but I might be missing something.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes I tested this, we did the same thing on "Tasking" before

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh cool, thanks

khoi-bes and others added 3 commits January 16, 2025 16:25
@khoi-bes @edmofro
Update packages/database/src/migrations/1736614067055-addReferenceDru…
8b4696f 
…gsTable.js

Co-authored-by: Edwin Monk-Fromont <edwin.monkfromont@gmail.com>
@khoi-bes
address feedbacks
9cc6a25
@khoi-bes
Merge branch 'feature/epi-1083-extend-drugs-reference-data' of bes:be…
71fe1e3 
…yondessential/tamanu into feature/epi-1083-extend-drugs-reference-data
@khoi-bes khoi-bes requested a review from edmofro January 17, 2025 02:29
edmofro
edmofro reviewed Jan 17, 2025
View reviewed changes
packages/database/src/models/ReferenceDrug.ts Outdated
@@ -15,7 +15,7 @@ export class ReferenceDrug extends Model {
{
id: primaryKey,
referenceDataId: {
type: DataTypes.INTEGER,
type: DataTypes.TEXT,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We actually use DataTypes.STRING in the migration. Is there a reason the two are different?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm sorry, that was clearly my mistake, I was confused myself when reading the feedback

@khoi-bes khoi-bes merged commit 1a3ec9d into epic-medication-enhancements-and-mar Jan 20, 2025
64 checks passed
@khoi-bes khoi-bes deleted the feature/epi-1083-extend-drugs-reference-data branch January 20, 2025 08:18
khoi-bes added a commit that referenced this pull request Feb 19, 2025
@khoi-bes @edmofro
feat(medication): EPI-1083: Extend drugs reference data (#7047)
e5abf8b 
* feat(medication): EPI-1083: Extend drugs reference data

* refactor(migrations): Remove unused drug reference data insertion logic

* feat(migrations): Add bulk insert for reference drugs from reference data

* feat(migrations): Add conditional check for bulk insert of reference drugs

* fix(migrations): Update conditional check for bulk insert of reference drugs

* add docs for models

* Update packages/database/src/migrations/1736614067055-addReferenceDrugsTable.js

Co-authored-by: Edwin Monk-Fromont <edwin.monkfromont@gmail.com>

* address feedbacks

* address feedback

* fix dbt models

---------

Co-authored-by: Edwin Monk-Fromont <edwin.monkfromont@gmail.com>
khoi-bes added a commit that referenced this pull request Feb 19, 2025
@khoi-bes @edmofro
feat(medication): EPI-1083: Extend drugs reference data (#7047)
8a63566 
* feat(medication): EPI-1083: Extend drugs reference data

* refactor(migrations): Remove unused drug reference data insertion logic

* feat(migrations): Add bulk insert for reference drugs from reference data

* feat(migrations): Add conditional check for bulk insert of reference drugs

* fix(migrations): Update conditional check for bulk insert of reference drugs

* add docs for models

* Update packages/database/src/migrations/1736614067055-addReferenceDrugsTable.js

Co-authored-by: Edwin Monk-Fromont <edwin.monkfromont@gmail.com>

* address feedbacks

* address feedback

* fix dbt models

---------

Co-authored-by: Edwin Monk-Fromont <edwin.monkfromont@gmail.com>
khoi-bes added a commit that referenced this pull request Feb 20, 2025
@khoi-bes @edmofro
feat(medication): EPI-1083: Extend drugs reference data (#7047)
f8ae53e 
* feat(medication): EPI-1083: Extend drugs reference data

* refactor(migrations): Remove unused drug reference data insertion logic

* feat(migrations): Add bulk insert for reference drugs from reference data

* feat(migrations): Add conditional check for bulk insert of reference drugs

* fix(migrations): Update conditional check for bulk insert of reference drugs

* add docs for models

* Update packages/database/src/migrations/1736614067055-addReferenceDrugsTable.js

Co-authored-by: Edwin Monk-Fromont <edwin.monkfromont@gmail.com>

* address feedbacks

* address feedback

* fix dbt models

---------

Co-authored-by: Edwin Monk-Fromont <edwin.monkfromont@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edmofro edmofro edmofro approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@khoi-bes @edmofro