Merge pull request #2264 from metriport/develop

RELEASE - 2258, 2262, 2259, 2221, 2248 - Remove ihe gw npm and b64 from mr + misc
metriport · Jun 13, 2024 · c8d816e · c8d816e
2 parents 9a3f1ed + b9f8155
commit c8d816e
Show file tree

Hide file tree

Showing 25 changed files with 232 additions and 2,095 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/api-sdk/package.json b/packages/api-sdk/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@metriport/api-sdk",
- "version": "8.2.1",
+ "version": "9.0.1",
  "description": "Metriport helps you access and manage health and medical data, through a single open source API.",
  "author": "Metriport Inc. <[email protected]>",
  "homepage": "https://metriport.com/",
@@ -57,8 +57,8 @@
  },
  "dependencies": {
  "@medplum/fhirtypes": "^2.0.32",
- "@metriport/commonwell-sdk": "^4.15.13",
- "@metriport/shared": "^0.9.6",
+ "@metriport/commonwell-sdk": "^4.15.14",
+ "@metriport/shared": "^0.9.7",
  "axios": "^1.3.4",
  "dayjs": "^1.11.7",
  "dotenv": "^16.3.1",

diff --git a/packages/api-sdk/src/medical/models/fhir.ts b/packages/api-sdk/src/medical/models/fhir.ts
@@ -86,30 +86,25 @@ export const resourceSchema = z.array(z.enum(resourceTypeForConsolidation));
 export const consolidationConversionType = ["html", "pdf", "json"] as const;
 export type ConsolidationConversionType = (typeof consolidationConversionType)[number];
 
-export const consolidatedFilterSchema = z.object({
- resources: z.string().optional(),
- dateFrom: z.date().optional(),
- dateTo: z.date().optional(),
+export const getConsolidatedFiltersSchema = z.object({
+ resources: z.enum(resourceTypeForConsolidation).array().optional(),
+ dateFrom: z.string().optional(),
+ dateTo: z.string().optional(),
+ conversionType: z.enum(consolidationConversionType).default("json").optional(),
 });
-export type ConsolidatedFilter = z.infer<typeof consolidatedFilterSchema>;
+
+export type GetConsolidatedFilters = z.infer<typeof getConsolidatedFiltersSchema>;
 
 export const consolidatedCountSchema = z.object({
  total: z.number(),
  resources: z.record(z.number()),
- filter: consolidatedFilterSchema,
+ filter: getConsolidatedFiltersSchema.pick({ dateFrom: true, dateTo: true }).extend({
+ resources: z.string(),
+ }),
 });
 
 export type ConsolidatedCountResponse = z.infer<typeof consolidatedCountSchema>;
 
-export const getConsolidatedFiltersSchema = consolidatedFilterSchema.extend({
- resources: z.enum(resourceTypeForConsolidation).array().optional(),
- dateFrom: z.string().optional(),
- dateTo: z.string().optional(),
- conversionType: z.enum(consolidationConversionType).default("json").optional(),
-});
-
-export type GetConsolidatedFilters = z.infer<typeof getConsolidatedFiltersSchema>;
-
 export const consolidatedQuerySchema = getConsolidatedFiltersSchema.extend({
  requestId: z.string(),
  startedAt: z.date(),

diff --git a/packages/api-sdk/src/medical/models/webhook-request.ts b/packages/api-sdk/src/medical/models/webhook-request.ts
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
  "name": "api",
- "version": "1.18.3",
+ "version": "1.18.4",
  "description": "",
  "main": "app.js",
  "private": true,