Merge pull request #220 from 18F/semantic-routing-update-v2

Semantic routing update v2

Author: scottqueen-bixal

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "analytics-report-api",
-  "version": "1.2.0",
+  "version": "2.0.0",
   "description": "An API for service data generated by Analytics Reporter",
   "main": "index.js",
   "scripts": {

package.json

@@ -75,14 +75,6 @@ app.get('/', (req, res) => {
   });
 });
 
-// we need to support legacy route
-// app.get('/v1.1/domain/:domain/reports/:reportName/data', checkDomainFilter);
-// app.get('/v1.1/agencies/:reportAgency/reports/:reportName/data', fetchData);
-// app.get('/v1.1/reports/:reportName/data', fetchData);
-
-// We need a way to set versions without breaking the request
-// Right now if we update '/v1/reports/:reportName/data' to '/v2/reports/:reportName/data' anyone requesting from '/v1/reports/:reportName/data' will have a broken application
-
 // middleware
 router.use('/v:version/', function(req, res, next) {
     console.log('req', req.params.version)
@@ -94,19 +86,19 @@ router.use('/v:version/', function(req, res, next) {
 router.get('/v:version/reports/:reportName/data',
 routesVersioning({
    "1.1.0": respondV1, // legacy
-   "~1.2.0": fetchData,
+   "~2.0.0": fetchData,
 }, NoMatchFoundCallback));
 
 router.get('/v:version/domain/:domain/reports/:reportName/data',
 routesVersioning({
    "1.1.0": respondDomainV1, // legacy
-   "~1.2.0": checkDomainFilter,
+   "~2.0.0": checkDomainFilter,
 }, NoMatchFoundCallback));
 
 router.get('/v:version/agencies/:reportAgency/reports/:reportName/data',
 routesVersioning({
    "1.1.0": respondV1, // legacy
-   "~1.2.0": fetchData,
+   "~2.0.0": fetchData,
 }, NoMatchFoundCallback));
 
 function NoMatchFoundCallback(req, res) {
@@ -128,5 +120,4 @@ function respondDomainV1(req, res) {
   return checkDomainFilter(req, res)
 }
 
-
 module.exports = app;

src/app.js

@@ -69,6 +69,7 @@ const query = ({ reportName,
   version
  }) => {
   // we have different tables for new ga4
+  // TODO: once UA has sunset we can remove this
   const dbTable = version === '1.1' ? "analytics_data" : "analytics_data_ga4"
   const limitParam = parseLimitParam(limit);
   const pageParam = parsePageParam(page);