Doble/ShiftSync
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Add region #32

Open
mattdimegs wants to merge 4 commits from refactor/update-med-calls into main
pull from: refactor/update-med-calls
merge into: Doble:main
Conversation 0 Commits 4 Files changed 4 +19 -11
4 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
api/services/medications/index.js
View file

@ -1,6 +1,6 @@
import express from 'express'; import express from 'express';
import { databaseServices } from '../index.js'; import { databaseServices } from '../index.js';
import { fullMedicationInformationSchema } from '../validations/medications.js'; import { baseMedicationInformationSchema, fullMedicationInformationSchema } from '../validations/medications.js';
export const medicationRouter = express.Router(); export const medicationRouter = express.Router();
@ -17,10 +17,13 @@ medicationRouter.get('/', async (req, res) => {
} }
}); });
medicationRouter.get('/base/', async (req, res) => { medicationRouter.post('/base/', async (req, res) => {
let data; let data;
const body = req?.body;
try { try {
data = await databaseServices.getBaseMedications(); await baseMedicationInformationSchema.validate(body);
data = await databaseServices.getBaseMedications(body);
res.status(200); res.status(200);
} catch (err) { } catch (err) {
data = { Error: err?.message }; data = { Error: err?.message };

6
api/services/operations/helpers/medications.js
View file

@ -1,10 +1,10 @@
import { paramyxRunQuery } from '../../paramyxConnection.js'; import { paramyxRunQuery } from '../../paramyxConnection.js';
export const medicationHelpers = { export const medicationHelpers = {
getBaseMedications: async () => { getBaseMedications: async (region) => {
const [medList, medRoutes] = await Promise.all([ const [medList, medRoutes] = await Promise.all([
paramyxRunQuery('SELECT * FROM medications'), paramyxRunQuery('SELECT * FROM medications WHERE $1 = ANY(region)', [region]),
paramyxRunQuery('SELECT * FROM medication_routes') paramyxRunQuery('SELECT * FROM medication_routes WHERE region = $1', [region])
]); ]);
const medMap = {}; const medMap = {};

9
api/services/operations/medications.js
View file

@ -11,9 +11,10 @@ const getMedications = async () => {
} }
}; };
const getBaseMedications = async () => { const getBaseMedications = async (body) => {
const { region } = body;
try { try {
const dataResp = medicationHelpers.getBaseMedications(); const dataResp = medicationHelpers.getBaseMedications(region);
return dataResp; return dataResp;
} catch (err) { } catch (err) {
console.log('GET BASE MEDICATIONS ERROR: ', err); console.log('GET BASE MEDICATIONS ERROR: ', err);
@ -21,8 +22,8 @@ const getBaseMedications = async () => {
} }
} }
const getFullMedicationInformation = async (drug) => { const getFullMedicationInformation = async (body) => {
const { drugId } = drug; const { drugId } = body;
try { try {
const dataResp = medicationHelpers.getFullMedicationInformation(drugId); const dataResp = medicationHelpers.getFullMedicationInformation(drugId);
return dataResp; return dataResp;

8
api/services/validations/medications.js
View file

@ -1,5 +1,9 @@
import * as Yup from 'yup'; import * as Yup from 'yup';
export const fullMedicationInformationSchema = Yup.object().shape({ export const baseMedicationInformationSchema = Yup.object().shape({
drugId: Yup.string().required("drugId is required"), region: Yup.string().required("region is required")
});
export const fullMedicationInformationSchema = Yup.object().shape({
drugId: Yup.string().required("drugId is required")
}); });