Fixup silly errors (#4721)

* Fixup silly errors * Add "legacy: true" to legacy report routes
beyondessential · Jul 11, 2023 · 6088642 · 6088642
1 parent 1163926
commit 6088642
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/packages/tupaia-web-server/src/app/createApp.ts b/packages/tupaia-web-server/src/app/createApp.ts
@@ -69,7 +69,7 @@ export function createApp() {
       'requestCountryAccess',
       handleWith(RequestCountryAccessRoute),
     )
-    .get<EntitiesRequest>('entities/:hierarchyName/:rootEntityCode', handleWith(EntitiesRoute))
+    .get<EntitiesRequest>('entities/:projectCode/:rootEntityCode', handleWith(EntitiesRoute))
     .get<EntitySearchRequest>('entitySearch/:projectCode', handleWith(EntitySearchRoute))
     .get<EntitiesRequest>('entities/:projectCode/:rootEntityCode', handleWith(EntitiesRoute))
     .get<EntityAncestorsRequest>(

diff --git a/packages/tupaia-web-server/src/routes/LegacyDashboardReportRoute.ts b/packages/tupaia-web-server/src/routes/LegacyDashboardReportRoute.ts
@@ -7,18 +7,13 @@
 import { Request } from 'express';
 import { Route } from '@tupaia/server-boilerplate';
 
-export type LegacyDashboardReportRequest = Request<
-  { reportCode: string },
-  any,
-  any,
-  any
->;
+export type LegacyDashboardReportRequest = Request<{ reportCode: string }, any, any, any>;
 
 export class LegacyDashboardReportRoute extends Route<LegacyDashboardReportRequest> {
   public async buildResponse() {
     const { query, ctx } = this.req;
     const { reportCode } = this.req.params;
 
-    return ctx.services.webConfig.fetchReport(reportCode, query);
+    return ctx.services.webConfig.fetchReport(reportCode, { legacy: true, ...query });
   }
 }
diff --git a/packages/tupaia-web-server/src/routes/LegacyMapOverlayReportRoute.ts b/packages/tupaia-web-server/src/routes/LegacyMapOverlayReportRoute.ts
@@ -13,6 +13,6 @@ export class LegacyMapOverlayReportRoute extends Route<LegacyMapOverlayReportReq
     const { query, ctx } = this.req;
     const { mapOverlayCode } = this.req.params;
 
-    return ctx.services.webConfig.fetchMeasureData(mapOverlayCode, query);
+    return ctx.services.webConfig.fetchMeasureData(mapOverlayCode, { legacy: true, ...query });
   }
 }
diff --git a/packages/tupaia-web-server/src/routes/ReportRoute.ts b/packages/tupaia-web-server/src/routes/ReportRoute.ts
@@ -22,7 +22,7 @@ export class ReportRoute extends Route<ReportRequest> {
     // the params for the non-legacy reports are different
     const params = {
       organisationUnitCodes: organisationUnitCode,
-      hierarchyName: projectCode,
+      hierarchy: projectCode,
       startDate,
       endDate,
     };