Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { AtLeastOne } from "@metriport/shared";
import { Op } from "sequelize";
import NotFoundError from "../../errors/not-found";
import { NotFoundError } from "@metriport/shared/error/not-found";
import { ConnectedUser } from "../../models/connected-user";
import { ProviderOptions } from "../../shared/constants";

Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/command/cx-user/get-user-token.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { DocumentClient } from "aws-sdk/clients/dynamodb";
import { UserToken } from "../../domain/user-token";
import NotFoundError from "../../errors/not-found";
import { NotFoundError } from "@metriport/shared/error/not-found";
import { docTableNames, getDB } from "../../models/db";
import { capture } from "../../shared/notifications";

Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/command/medical/admin/hie-overview.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { GenderAtBirth, Patient, PatientData } from "@metriport/core/domain/patient";
import { mapMetriportGenderToFhirGender } from "@metriport/core/external/fhir/patient/conversion";
import NotFoundError from "@metriport/core/util/error/not-found";
import { NotFoundError } from "@metriport/shared/error/not-found";
import {
OutboundPatientDiscoveryResp,
OutboundPatientDiscoveryRespSuccessfulSchema,
Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/command/medical/admin/populate-fhir.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { toFHIR as patientToFHIR } from "@metriport/core/external/fhir/patient/c
import { out } from "@metriport/core/util/log";
import { sleepRandom } from "@metriport/shared";
import { chunk } from "lodash";
import BadRequestError from "../../../errors/bad-request";
import { BadRequestError } from "@metriport/shared/error/bad-request";
import { tenantExists } from "../../../external/fhir/admin";
import { makeFhirAdminApi, makeFhirApi } from "../../../external/fhir/api/api-factory";
import { queryDocumentsAcrossHIEs } from "../document/document-query";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import {
} from "@metriport/core/domain/conversion/cda-to-html-pdf";
import { getLambdaResultPayload } from "@metriport/core/external/aws/lambda";
import dayjs from "dayjs";
import BadRequestError from "../../../errors/bad-request";
import NotFoundError from "../../../errors/not-found";
import { BadRequestError } from "@metriport/shared/error/bad-request";
import { NotFoundError } from "@metriport/shared/error/not-found";
import { makeLambdaClient } from "../../../external/aws/lambda";
import { makeS3Client } from "../../../external/aws/s3";
import { Config } from "../../../shared/config";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { uuidv7 } from "@metriport/core/util/uuid-v7";
import { BadRequestError, emptyFunction } from "@metriport/shared";
import { calculateConversionProgress } from "../../../domain/medical/conversion-progress";
import { validateOptionalFacilityId } from "../../../domain/medical/patient-facility";
import { processAsyncError } from "../../../errors";
import { processAsyncError } from "@metriport/core/util/error/shared";
import { isCarequalityEnabled, isCommonwellEnabled } from "../../../external/aws/app-config";
import { getDocumentsFromCQ } from "../../../external/carequality/document/query-documents";
import { queryAndProcessDocuments as getDocumentsFromCW } from "../../../external/commonwell/document/document-query";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import NotFoundError from "@metriport/core/util/error/not-found";
import { NotFoundError } from "@metriport/shared/error/not-found";
import { BadRequestError } from "@metriport/shared";
import { mocked, MockedObject } from "jest-mock";
import { makeFacility, makeFacilityModel } from "../../../../domain/medical/__tests__/facility";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/no-empty-function */
import { faker } from "@faker-js/faker";
import { OrganizationBizType } from "@metriport/core/domain/organization";
import NotFoundError from "@metriport/core/util/error/not-found";
import { NotFoundError } from "@metriport/shared/error/not-found";
import { makeOrganization } from "../../../../domain/medical/__tests__/organization";
import * as getOrganizationOrFail from "../../organization/get-organization";
import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import BadRequestError from "@metriport/core/util/error/bad-request";
import { BadRequestError } from "@metriport/shared/error/bad-request";
import { uuidv7 } from "@metriport/core/util/uuid-v7";
import { FacilityCreate, FacilityType, isOboFacility } from "../../../domain/medical/facility";
import { FacilityModel } from "../../../models/medical/facility";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { BadRequestError } from "@metriport/shared";
import { Facility } from "../../../domain/medical/facility";
import NotFoundError from "../../../errors/not-found";
import { NotFoundError } from "@metriport/shared/error/not-found";
import { FacilityModel } from "../../../models/medical/facility";

type GetFacilitiesQuery = Pick<FacilityModel, "cxId"> & Partial<{ ids: FacilityModel["id"][] }>;
Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/command/medical/mapi-access.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import NotFoundError from "../../errors/not-found";
import { NotFoundError } from "@metriport/shared/error/not-found";
import { MAPIAccess } from "../../models/medical/mapi-access";

export async function allowMapiAccess(cxId: string): Promise<"new" | "existing"> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { capture } from "@metriport/core/util/notifications";
import { uuidv7 } from "@metriport/core/util/uuid-v7";
import { sleep } from "@metriport/shared";
import { UniqueConstraintError } from "sequelize";
import BadRequestError from "../../../errors/bad-request";
import { BadRequestError } from "@metriport/shared/error/bad-request";
import { createTenantIfNotExists } from "../../../external/fhir/admin";
import { upsertOrgToFHIRServer } from "../../../external/fhir/organization/upsert-organization";
import { OrganizationModel } from "../../../models/medical/organization";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import NotFoundError from "../../../errors/not-found";
import { NotFoundError } from "@metriport/shared/error/not-found";
import { OrganizationModel } from "../../../models/medical/organization";

type Filter = Pick<OrganizationModel, "cxId"> & Partial<Pick<OrganizationModel, "id">>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { SearchSetBundle } from "@metriport/shared/medical";
import dayjs from "dayjs";
import duration from "dayjs/plugin/duration";
import { intersection } from "lodash";
import { processAsyncError } from "../../../errors";
import { processAsyncError } from "@metriport/core/util/error/shared";
import { Config } from "../../../shared/config";
import { capture } from "../../../shared/notifications";
import { Util } from "../../../shared/util";
Expand Down Expand Up @@ -456,5 +456,5 @@ export async function getConsolidatedPatientDataAsync({
const connector = buildConsolidatedSnapshotConnector();
connector
.execute(payload)
.catch(processAsyncError("Failed to get consolidated patient data async", true));
.catch(processAsyncError("Failed to get consolidated patient data async"));
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Bundle } from "@medplum/fhirtypes";
import { Patient } from "@metriport/core/domain/patient";
import BadRequestError from "../../../../errors/bad-request";
import { BadRequestError } from "@metriport/shared/error/bad-request";
import { countResources } from "../../../../external/fhir/patient/count-resources";
import { Bundle as ValidBundle } from "../../../../routes/medical/schemas/fhir";
import { Config } from "../../../../shared/config";
Expand Down
12 changes: 8 additions & 4 deletions packages/api/src/command/medical/patient/delete-patient.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { capture } from "@metriport/core/util/notifications";
import { getFacilityIdOrFail } from "../../../domain/medical/patient-facility";
import { processAsyncError } from "../../../errors";
import { processAsyncError } from "@metriport/core/util/error/shared";
import cqCommands from "../../../external/carequality";
import cwCommands from "../../../external/commonwell";
import { makeFhirApi } from "../../../external/fhir/api/api-factory";
Expand Down Expand Up @@ -37,10 +37,14 @@ export const deletePatient = async (patientDelete: PatientDeleteCmd): Promise<vo
console.log(`Patient not found @ CW when deleting ${patient.id} , continuing...`);
return;
}
processAsyncError(deleteContext)(err);
processAsyncError("Failed deleting patient from CW - " + deleteContext)(err);
}),
fhirApi.deleteResource("Patient", patient.id).catch(processAsyncError(deleteContext)),
cqCommands.patient.remove(patient).catch(processAsyncError(deleteContext)),
fhirApi
.deleteResource("Patient", patient.id)
.catch(processAsyncError("Failed deleting patient from FHIR Server - " + deleteContext)),
cqCommands.patient
.remove(patient)
.catch(processAsyncError("Failed deleting patient from CQ - " + deleteContext)),
deleteAllPatientMappings({ cxId, patientId: id }),
deletePatientSettings({ cxId, patientId: id }),
]);
Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/command/settings/getSettings.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import NotFoundError from "../../errors/not-found";
import { NotFoundError } from "@metriport/shared/error/not-found";
import { Settings } from "../../models/settings";

export const getSettings = async ({ id }: { id: string }): Promise<Settings | null> => {
Expand Down
4 changes: 2 additions & 2 deletions packages/api/src/command/settings/updateSettings.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { limitStringLength } from "@metriport/shared";
import { nanoid } from "nanoid";
import { maxWebhookStatusLength } from "../../domain/settings";
import { processAsyncError } from "../../errors";
import { processAsyncError } from "@metriport/core/util/error/shared";
import WebhookError from "../../errors/webhook";
import {
Settings as SettingsModel,
Expand Down Expand Up @@ -40,7 +40,7 @@ export const updateSettings = async ({

// if there's a URL, fire a test towards it - intentionally asynchronous
updateWebhook.webhookUrl &&
testWebhook({ cxId, ...updateWebhook }).catch(processAsyncError(`testWebhook`));
testWebhook({ cxId, ...updateWebhook }).catch(processAsyncError("Failed testing cx's webhook"));

const updatedSettings = await getSettingsOrFail({ id: cxId });
return updatedSettings;
Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/command/webhook/garmin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { MetriportData } from "@metriport/api-sdk/devices/models/metriport-data"
import { out } from "@metriport/core/util/log";
import { errorToString, sleep } from "@metriport/shared";
import { chunk, groupBy } from "lodash";
import { getErrorMessage } from "../../errors";
import { getErrorMessage } from "@metriport/shared/error/shared";
import { UserData } from "../../mappings/garmin";
import { Settings } from "../../models/settings";
import { getConnectedUsers } from "../connected-user/get-connected-user";
Expand Down
4 changes: 2 additions & 2 deletions packages/api/src/command/webhook/retry-failed.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { processAsyncError } from "@metriport/core/util/error/shared";
import { capture } from "@metriport/core/util/notifications";
import { sleep } from "@metriport/shared";
import { processAsyncError } from "../../errors";
import { WebhookRequest } from "../../models/webhook-request";
import { getSettingsOrFail } from "../settings/getSettings";
import { processRequest } from "./webhook";
Expand Down Expand Up @@ -38,5 +38,5 @@ export const retryFailedRequests = async (cxId: string): Promise<void> => {
}
};
// intentionally asynchronous
_processRequest().catch(processAsyncError(`retryFailedRequests._processRequest`));
_processRequest().catch(processAsyncError("Failed retrying failed webhook requests"));
};
4 changes: 2 additions & 2 deletions packages/api/src/domain/medical/patient-facility.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { MetriportError } from "@metriport/core/util/error/metriport-error";
import BadRequestError from "../../errors/bad-request";
import { MetriportError } from "@metriport/shared/error/metriport-error";
import { BadRequestError } from "@metriport/shared/error/bad-request";
import { Patient } from "@metriport/core/domain/patient";

/**
Expand Down
19 changes: 0 additions & 19 deletions packages/api/src/errors/bad-request.ts

This file was deleted.

17 changes: 0 additions & 17 deletions packages/api/src/errors/index.ts

This file was deleted.

16 changes: 0 additions & 16 deletions packages/api/src/errors/metriport-error.ts

This file was deleted.

19 changes: 0 additions & 19 deletions packages/api/src/errors/not-found.ts

This file was deleted.

8 changes: 0 additions & 8 deletions packages/api/src/errors/not-implemented.ts

This file was deleted.

9 changes: 0 additions & 9 deletions packages/api/src/errors/unsupported-data-type.ts

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import NotFoundError from "@metriport/core/util/error/not-found";
import { NotFoundError } from "@metriport/shared/error/not-found";
import { CQDirectoryEntry } from "../../cq-directory";
import { CQDirectoryEntryModel } from "../../models/cq-directory";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import NotFoundError from "@metriport/core/util/error/not-found";
import { NotFoundError } from "@metriport/shared/error/not-found";
import { Transaction } from "sequelize";
import { CQPatientDataModel } from "../../models/cq-patient-data";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { getPersonId, getPersonIdFromUrl } from "@metriport/commonwell-sdk";
import { out } from "@metriport/core/util/log";
import { capture } from "@metriport/core/util/notifications";
import { getPatientOrFail } from "../../../command/medical/patient/get-patient";
import MetriportError from "../../../errors/metriport-error";
import { MetriportError } from "@metriport/shared/error/metriport-error";
import { autoUpgradeNetworkLinks, getPatientsNetworkLinks } from "../link/shared";
import { validateCwLinksBelongToPatient } from "../../hie/validate-patient-links";
import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import NotFoundError from "@metriport/core/util/error/not-found";
import { NotFoundError } from "@metriport/shared/error/not-found";
import { Transaction } from "sequelize";
import { CwPatientDataModel } from "../../models/cw-patient-data";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import {
StoreECAfterIncludeListCmd,
} from "@metriport/core/external/commonwell/cq-bridge/ec-updater";
import { executeAsynchronously } from "@metriport/core/util/concurrency";
import { MetriportError } from "@metriport/core/util/error/metriport-error";
import NotFoundError from "@metriport/core/util/error/not-found";
import { MetriportError } from "@metriport/shared/error/metriport-error";
import { NotFoundError } from "@metriport/shared/error/not-found";
import { CoverageEnhancementModel } from "../../../models/medical/coverage-enhancement";
import { executeOnDBTx } from "../../../models/transaction-wrapper";
import { createOrUpdateCoverageEnhancements } from "./coverage-enhancement-storage";
Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/external/commonwell/mock.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import * as sdk from "@metriport/commonwell-sdk";
import * as nanoid from "nanoid";
import * as stream from "stream";
import NotImplementedError from "../../errors/not-implemented";
import { NotImplementedError } from "@metriport/shared/error/not-implemented";
import { uuidv7 } from "@metriport/core/util/uuid-v7";
import {
createDocument,
Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/external/commonwell/organization.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { errorToString, USState } from "@metriport/shared";
import NotFoundError from "@metriport/core/util/error/not-found";
import { NotFoundError } from "@metriport/shared/error/not-found";
import { Organization as CWSdkOrganization } from "@metriport/commonwell-sdk";
import { OID_PREFIX } from "@metriport/core/domain/oid";
import { Organization, OrgType } from "@metriport/core/domain/organization";
Expand Down
2 changes: 1 addition & 1 deletion packages/api/src/external/commonwell/patient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
createAugmentedPatient,
getNewDemographics,
} from "../../domain/medical/patient-demographics";
import MetriportError from "../../errors/metriport-error";
import { MetriportError } from "@metriport/shared/error/metriport-error";
import { isDemoAugEnabledForCx, isEnhancedCoverageEnabledForCx } from "../aws/app-config";
import { checkLinkDemographicsAcrossHies } from "../hie/check-patient-link-demographics";
import { HieInitiator } from "../hie/get-hie-initiator";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import NotFoundError from "@metriport/core/util/error/not-found";
import { NotFoundError } from "@metriport/shared/error/not-found";
import Router from "express-promise-router";
import { asyncHandler } from "../../../routes/util";
import { processRequest } from "./cw-process-request";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { buildBundle } from "@metriport/core/external/fhir/shared/bundle";
import { ensureCcdExists } from "@metriport/core/shareback/ensure-ccd-exists";
import { getMetadataDocumentContents } from "@metriport/core/shareback/metadata/get-metadata-xml";
import { parseExtrinsicObjectXmlToDocumentReference } from "@metriport/core/shareback/metadata/parse-metadata-xml";
import BadRequestError from "@metriport/core/util/error/bad-request";
import { BadRequestError } from "@metriport/shared/error/bad-request";
import { out } from "@metriport/core/util/log";
import dayjs from "dayjs";
import { Request } from "express";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Organization } from "@metriport/core/domain/organization";
import NotFoundError from "../../../errors/not-found";
import { NotFoundError } from "@metriport/shared/error/not-found";
import { OrganizationModel } from "../../../models/medical/organization";

// Didn't reuse getOrganizationOrFail bc we don't have `cxId` in this context and
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { appendIdentifierOID, toFHIR } from "@metriport/core/external/fhir/organ
import { toFHIRSubject } from "@metriport/core/external/fhir/patient/conversion";
import { metriportDataSourceExtension } from "@metriport/core/external/fhir/shared/extensions/metriport";
import { IETF_URI } from "@metriport/core/external/fhir/shared/namespaces";
import BadRequestError from "@metriport/core/util/error/bad-request";
import { BadRequestError } from "@metriport/shared/error/bad-request";
import { cloneDeep } from "lodash";
import { OrganizationModel } from "../../../models/medical/organization";
import { Config } from "../../../shared/config";
Expand Down
Loading