Merge pull request #1455 from flexion/937-docket-sequence-ui

937: fix order of initial docket record

shared/src/business/entities/Case.js

@@ -127,23 +127,6 @@ function Case(rawCase) {
   this.orderForOds = this.orderForOds || false;
   this.orderForRatification = this.orderForRatification || false;
   this.orderToShowCause = this.orderToShowCause || false;
-
-  const trialRecord = this.docketRecord.find(
-    record => record.description.indexOf('Request for Place of Trial') !== -1,
-  );
-
-  if (this.preferredTrialCity) {
-    if (!trialRecord) {
-      this.addDocketRecord(
-        new DocketRecord({
-          description: `Request for Place of Trial at ${
-            this.preferredTrialCity
-          }`,
-          filingDate: this.receivedAt || this.createdAt,
-        }),
-      );
-    }
-  }
 }
 
 Case.name = 'Case';
@@ -592,6 +575,35 @@ Case.prototype.markAsPaidByPayGov = function(payGovDate) {
   return this;
 };
 
+/**
+ *
+ * @param {string} preferredTrialCity
+ * @returns {Case}
+ */
+Case.prototype.setRequestForTrialDocketRecord = function(preferredTrialCity) {
+  this.preferredTrialCity = preferredTrialCity;
+
+  let found;
+  let docketRecordIndex;
+
+  this.docketRecord.forEach((docketRecord, index) => {
+    found =
+      found ||
+      docketRecord.description.indexOf('Request for Place of Trial') !== -1;
+    docketRecordIndex = found ? index : docketRecordIndex;
+  });
+
+  if (preferredTrialCity && !found) {
+    this.addDocketRecord(
+      new DocketRecord({
+        description: `Request for Place of Trial at ${this.preferredTrialCity}`,
+        filingDate: this.receivedAt || this.createdAt,
+      }),
+    );
+  }
+  return this;
+};
+
 /**
  *
  * @param docketRecordEntity

shared/src/business/entities/Case.test.js

@@ -6,17 +6,6 @@ const { PARTY_TYPES } = require('./contacts/PetitionContact');
 const { WorkItem } = require('./WorkItem');
 
 describe('Case entity', () => {
-  it('creates a trial city docket record if preferredTrialCity is updated and a docket record does not exist', () => {
-    const myCase = new Case(MOCK_CASE);
-    expect(myCase).toMatchObject({
-      docketRecord: [
-        {
-          description: 'Request for Place of Trial at Washington, D.C.',
-        },
-      ],
-    });
-  });
-
   it('defaults the orders to false', () => {
     const myCase = new Case(MOCK_CASE);
     expect(myCase).toMatchObject({
@@ -561,6 +550,28 @@ describe('Case entity', () => {
     });
   });
 
+  describe('setRequestForTrialDocketRecord', () => {
+    it('sets request for trial docket record when it does not already exist', () => {
+      const caseRecord = new Case(MOCK_CASE);
+      const preferredTrialCity = 'Mobile, Alabama';
+      const initialDocketLength =
+        (caseRecord.docketRecord && caseRecord.docketRecord.length) || 0;
+      caseRecord.setRequestForTrialDocketRecord(preferredTrialCity);
+      const docketLength = caseRecord.docketRecord.length;
+      expect(docketLength).toEqual(initialDocketLength + 1);
+    });
+
+    it('should only set docket record once for request for trial', () => {
+      const caseRecord = new Case(MOCK_CASE);
+      const preferredTrialCity = 'Mobile, Alabama';
+      caseRecord.setRequestForTrialDocketRecord(preferredTrialCity);
+      const docketLength = caseRecord.docketRecord.length;
+      caseRecord.setRequestForTrialDocketRecord('Birmingham, Alabama');
+      caseRecord.setRequestForTrialDocketRecord('Somecity, USA');
+      expect(docketLength).toEqual(caseRecord.docketRecord.length);
+    });
+  });
+
   describe('addDocketRecord', () => {
     it('adds a new docketrecord', () => {
       const caseRecord = new Case(MOCK_CASE);
@@ -570,8 +581,8 @@ describe('Case entity', () => {
           filingDate: new Date().toISOString(),
         }),
       );
-      expect(caseRecord.docketRecord).toHaveLength(2);
-      expect(caseRecord.docketRecord[1].description).toEqual('test');
+      expect(caseRecord.docketRecord).toHaveLength(1);
+      expect(caseRecord.docketRecord[0].description).toEqual('test');
     });
     it('validates the docketrecord', () => {
       const caseRecord = new Case(MOCK_CASE);

shared/src/business/test/createCaseInteractor.e2e.test.js

@@ -70,14 +70,14 @@ describe('createCase integration test', () => {
       docketNumber: '101-19',
       docketNumberSuffix: 'S',
       docketRecord: [
-        {
-          description: 'Request for Place of Trial at Aberdeen, South Dakota',
-        },
         {
           description: 'Petition',
           filedBy: 'Rick Petitioner',
           status: undefined,
         },
+        {
+          description: 'Request for Place of Trial at Aberdeen, South Dakota',
+        },
       ],
       documents: [
         {

shared/src/business/test/fileExternalDocumentInteractor.e2e.test.js

@@ -132,14 +132,14 @@ describe('fileExternalDocument integration test', () => {
       docketNumber: '101-19',
       docketNumberSuffix: 'S',
       docketRecord: [
-        {
-          description: 'Request for Place of Trial at Aberdeen, South Dakota',
-        },
         {
           description: 'Petition',
           documentId: '92eac064-9ca5-4c56-80a0-c5852c752277',
           filedBy: 'Rick Petitioner',
         },
+        {
+          description: 'Request for Place of Trial at Aberdeen, South Dakota',
+        },
         {
           description: 'Motion for Leave to File Brief in Support of Petition',
           documentId: '12de0fac-f63c-464f-ac71-0f54fd248484',

shared/src/business/useCases/createCaseInteractor.js

@@ -4,6 +4,7 @@ const {
 } = require('../../authorization/authorizationClientService');
 const { capitalize } = require('lodash');
 const { Case } = require('../entities/Case');
+const { DocketRecord } = require('../entities/DocketRecord');
 const { Document } = require('../entities/Document');
 const { Message } = require('../entities/Message');
 const { PETITIONS_SECTION } = require('../entities/WorkQueue');
@@ -117,6 +118,15 @@ exports.createCase = async ({
     petitionDocumentEntity,
   );
 
+  caseToAdd.addDocketRecord(
+    new DocketRecord({
+      description: `Request for Place of Trial at ${
+        caseToAdd.preferredTrialCity
+      }`,
+      filingDate: caseToAdd.receivedAt || caseToAdd.createdAt,
+    }),
+  );
+
   const stinDocumentEntity = new Document({
     documentId: stinFileId,
     documentType: Case.documentTypes.stin,

shared/src/business/useCases/updateCaseInteractor.js

@@ -51,6 +51,7 @@ exports.updateCase = async ({ caseToUpdate, caseId, applicationContext }) => {
 
   const paidCase = new Case(caseToUpdate)
     .markAsPaidByPayGov(caseToUpdate.payGovDate)
+    .setRequestForTrialDocketRecord(caseToUpdate.preferredTrialCity)
     .updateCaseTitleDocketRecord()
     .validate()
     .toRawObject();

web-client/src/presenter/computeds/formattedCaseDetail.js

@@ -160,7 +160,7 @@ const formatDocketRecordWithDocument = (
   });
 };
 
-const formatCase = (caseDetail, caseDetailErrors, documentTypesMap) => {
+const formatCase = (caseDetail, caseDetailErrors) => {
   const result = _.cloneDeep(caseDetail);
   result.docketRecordWithDocument = [];
 
@@ -174,21 +174,8 @@ const formatCase = (caseDetail, caseDetailErrors, documentTypesMap) => {
     );
   }
 
-  // sort to make petition first and everything else in cronological order
-  const getScore = entry => {
-    const documentType = (entry.document || {}).documentType;
-    if (documentType === documentTypesMap.petitionFile) return 1;
-    else return 2;
-  };
-
   result.docketRecordWithDocument.sort((a, b) => {
-    const aScore = getScore(a);
-    const bScore = getScore(b);
-    if (aScore === bScore) {
-      return;
-    } else {
-      return aScore - bScore;
-    }
+    return a.index - b.index;
   });
 
   if (result.respondent)

web-client/src/views/DocketRecord.jsx

@@ -81,7 +81,7 @@ export const DocketRecord = connect(
             </thead>
             <tbody>
               {caseDetail.docketRecordWithDocument.map(
-                ({ record, document }, index) => (
+                ({ record, document, index }) => (
                   <tr key={index}>
                     <td className="responsive-title center-column">
                       {index + 1}