HARMONY-1995: Refactored code.

Author: ygliuvt

services/harmony/app/frontends/stac.ts

@@ -1,6 +1,5 @@
 import { ILengthAwarePagination } from 'knex-paginate';
 import { Job, JobForDisplay, JobStatus } from '../models/job';
-import { allWorkItemsNoData } from '../models/work-item';
 import { keysToLowerCase } from '../util/object';
 import isUUID from '../util/uuid';
 import { getRequestRoot } from '../util/url';
@@ -50,7 +49,7 @@ async function handleStacRequest(
   });
 
   if ([JobStatus.SUCCESSFUL, JobStatus.COMPLETE_WITH_ERRORS].includes(job.status)) {
-    if (stacDataLinks.length) {
+    if (stacDataLinks.length > 0) {
       job.links = stacDataLinks;
       const urlRoot = getRequestRoot(req);
       // default to s3 links
@@ -70,18 +69,13 @@ async function handleStacRequest(
           throw new RequestValidationError('The requested paging parameters were out of bounds');
         }
       } else if (job.status === JobStatus.SUCCESSFUL) {
-        let allItemsAreNoData = false;
-        await db.transaction(async (tx) => {
-          allItemsAreNoData = await allWorkItemsNoData(tx, jobId);
-        });
-
-        if (allItemsAreNoData) {
+        if (req.params.itemIndex) {
+          throw new NotFoundError(`Service did not provide STAC items for job ${jobId}`);
+        } else {
           const urlRoot = getRequestRoot(req);
           const lType = linkType || 's3';
           const serializedJob = job.serialize(urlRoot, lType);
           res.json(callback(serializedJob, pagination));
-        } else {
-          throw new NotFoundError(`Service did not provide STAC items for job ${jobId}`);
         }
       } else {
         throw new NotFoundError(`Service did not provide STAC items for job ${jobId}`);

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

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import { Logger } from 'winston';
 import { v4 as uuid } from 'uuid';
-import WorkItem, { allWorkItemsNoData } from '../work-item';
+import WorkItem from '../work-item';
 import WorkflowStep from '../workflow-steps';
 import InvocationResult from './invocation-result';
 import { Job, JobStatus, statesToDefaultMessages } from '../job';
@@ -335,16 +335,10 @@ export default abstract class BaseService<ServiceParamType> {
         const links = job.getRelatedLinks('data');
         if (links.length === 1) {
           result = { redirect: links[0].href };
+        } else if (links.length === 0) {
+          result = { redirect: `/jobs/${jobID}`, headers: {} };
         } else {
-          let allItemsAreNoData = false;
-          await db.transaction(async (tx) => {
-            allItemsAreNoData = await allWorkItemsNoData(tx, jobID);
-          });
-          if (allItemsAreNoData) {
-            result = { redirect: `/jobs/${jobID}`, headers: {} };
-          } else {
-            result = { error: `The backend service provided ${links.length} outputs when 1 was required`, statusCode: 500 };
-          }
+          result = { error: `The backend service provided ${links.length} outputs when 1 was required`, statusCode: 500 };
         }
       }
     } catch (e) {

services/harmony/app/models/work-item.ts

@@ -749,33 +749,6 @@ export async function getScrollIdForJob(
   return null;
 }
 
-/**
- * Return true if all work items of the given job have NoData warning
- *
- * @param tx - transaction to use for the query
- * @param jobID - the job ID
- * @returns true or false
- */
-export async function allWorkItemsNoData(
-  tx: Transaction,
-  jobID: string,
-): Promise < boolean > {
-  const workflowStepIndexResults = await tx(WorkItem.table)
-    .max('workflowStepIndex as maxIndex')
-    .where({ jobID });
-
-  const workflowStepIndex = workflowStepIndexResults[0].maxIndex;
-
-  const data = await tx(WorkItem.table)
-    .where({
-      jobID,
-      workflowStepIndex,
-    })
-    .whereNot('message_category', 'nodata');
-
-  return data.length === 0;
-}
-
 /**
  * Returns the sum of the work item sizes for all work items for the provided jobID.
  * @param tx - the transaction to use for querying

services/harmony/test/backend-callbacks.ts

@@ -3,7 +3,6 @@ import { expect } from 'chai';
 import request from 'supertest';
 import { HTTPError } from 'superagent';
 import { Job, JobStatus } from '../app/models/job';
-import { hookAllWorkItemsNoData } from './helpers/work-items';
 import JobLink from '../app/models/job-link';
 import { truncateAll } from './helpers/db';
 import hookServersStartStop from './helpers/servers';
@@ -20,7 +19,6 @@ describe('Backend Callbacks', function () {
   const href = 'https://example.com/foo';
 
   hookServersStartStop();
-  hookAllWorkItemsNoData();
 
   beforeEach(truncateAll);
   after(truncateAll);
@@ -34,8 +32,8 @@ describe('Backend Callbacks', function () {
       hookCallbackEach((r) => r.query({ status: 'successful', httpBackend: 'true' }), true);
 
       it('sends a synchronous failure explaining that there were no results', async function () {
-        expect(this.userResp.statusCode).to.equal(500);
-        expect(this.userResp.text).to.include('The backend service provided 0 outputs when 1 was required');
+        expect(this.userResp.statusCode).to.eql(303);
+        expect(this.userResp.headers.location).to.include('/jobs/');
       });
     });
 

services/harmony/test/helpers/work-items.ts

@@ -1,9 +1,8 @@
 import { Application } from 'express';
 import { afterEach, beforeEach } from 'mocha';
-import { stub, SinonStub } from 'sinon';
 import request, { Test } from 'supertest';
 import _ from 'lodash';
-import WorkItem,  * as wi from '../../app/models/work-item';
+import WorkItem from '../../app/models/work-item';
 import db, { Transaction } from '../../app/util/db';
 import { truncateAll } from './db';
 import { hookBackendRequest } from './hooks';
@@ -294,15 +293,3 @@ export async function fakeServiceStacOutput(
 
   }
 }
-
-/**
- * This function stubs the allWorkItemsNoData function for testing purposes
- **/
-export function hookAllWorkItemsNoData(): void {
-  before(function () {
-    stub(wi, 'allWorkItemsNoData').callsFake(async () => false);
-  });
-  after(function () {
-    (wi.allWorkItemsNoData as SinonStub).restore();
-  });
-}

services/harmony/test/stac/stac-item.ts

@@ -2,7 +2,6 @@ import { expect } from 'chai';
 import { describe, it, before } from 'mocha';
 import { v4 as uuid } from 'uuid';
 import itReturnsTheExpectedStacResponse from '../helpers/stac-item';
-import { hookAllWorkItemsNoData } from '../helpers/work-items';
 import { buildJob } from '../helpers/jobs';
 import hookServersStartStop from '../helpers/servers';
 import { hookTransaction } from '../helpers/db';
@@ -93,17 +92,12 @@ const completedNonStacJob = buildJob({
   message: 'it is done',
   progress: 100,
   numInputGranules: 12,
-  links: [{
-    href: 'http://example.com',
-    type: 'application/octet-stream',
-    rel: 'data',
-  }],
+  links: [],
   request: 'http://example.com/harmony?job=completedJob',
 });
 
 describe('STAC item route', function () {
   hookServersStartStop({ USE_EDL_CLIENT_APP: true });
-  hookAllWorkItemsNoData();
   hookTransaction();
   before(async function () {
     await runningJob.save(this.trx);