HARMONY-1780: Behavior change if a user explicitly passes extend=false and concatenate=true, batchee and stitchee will be skipped and only l2ss-py and concise will run.

Author: chris-durbin

services/harmony/app/middleware/extend.ts

@@ -18,7 +18,7 @@ export function setExtendDimensionsDefault(req: HarmonyRequest): void {
   // concatenation is requested for a service that supports extend, we also specify extend
   if (
     (operation?.extendDimensions?.length === 1 && operation.extendDimensions[0] === 'true') ||
-    (operation.shouldConcatenate && !(operation?.extendDimensions?.length > 0))
+    (operation.shouldConcatenate && !(operation?.extendDimensions?.length > 0) && req.query?.extend !== 'false')
   ) {
     operation.extendDimensions = defaultExtendDimensions;
   }

services/harmony/app/models/services/base-service.ts

@@ -192,6 +192,19 @@ function stepRequired(step: ServiceStep, operation: DataOperation): boolean {
       }
     }
   }
+
+  if (
+    required &&
+    step.conditional?.exists?.includes('extend') &&
+    (!operation.extendDimensions || operation.extendDimensions.length === 0) &&
+    step.conditional?.exists.includes('concatenate')
+  ) {
+    // Special temporary case which can occur if extend=false is specified and the step is
+    // configured to run if either extend or concatenate is provided. Once EDSC is updated to be
+    // able to provide the extend parameter and not use concatenate as a proxy we can remove
+    // this case.
+    required = false;
+  }
   return required;
 }
 

services/harmony/test/middleware/extend.ts

@@ -4,7 +4,7 @@ import HarmonyRequest from '../../app/models/harmony-request';
 import DataOperation from '../../app/models/data-operation';
 import { setExtendDimensionsDefault } from '../../app/middleware/extend';
 
-describe('extend serivce default value', function () {
+describe('extend service default value', function () {
   beforeEach(function () {
     const collectionId = 'C123-TEST';
     const shortName = 'harmony_example';
@@ -56,6 +56,17 @@ describe('extend serivce default value', function () {
     });
   });
 
+  describe('and the request specifies concatenation to be true, but specifies extend to be false', function () {
+    beforeEach(function () {
+      this.req.operation.shouldConcatenate = true;
+      this.req.query = { extend: 'false' };
+    });
+    it('does not set extendDimensions', function () {
+      setExtendDimensionsDefault(this.req);
+      expect(this.req.operation.extendDimensions).to.equal(undefined);
+    });
+  });
+
   describe('and the request provides dimension extension', function () {
     beforeEach(function () {
       this.req.operation.extendDimensions = ['lat', 'lon'];
@@ -79,7 +90,7 @@ describe('extend serivce default value', function () {
   });
 });
 
-describe('extend serivce misconfigured without default value', function () {
+describe('extend service misconfigured without default value', function () {
   beforeEach(function () {
     const collectionId = 'C123-TEST';
     const shortName = 'harmony_example';