Merge pull request #423 from GSA/lc1314-reorder-columns

1314 - Reorder Columns

Author: luke-at-flexion

apps/cli/src/scan.controller.ts

@@ -45,6 +45,7 @@ export class ScanController {
       results,
       this.logger,
       website.filter,
+      website.url,
     );
 
     this.logger.log({ msg: 'Got results', results }, `Results compiled for '${url}'`);

apps/scan-engine/src/scan-engine.consumer.spec.ts

@@ -11,7 +11,6 @@ import { CoreScannerService } from 'libs/core-scanner/src';
 
 import { ScanEngineConsumer } from './scan-engine.consumer';
 import { QueueService } from '@app/queue';
-import { filter } from 'lodash';
 
 describe('ScanEngineConsumer', () => {
   let consumer: ScanEngineConsumer;
@@ -74,6 +73,7 @@ describe('ScanEngineConsumer', () => {
       coreResultFromPages,
       consumer['logger'],
       input.filter,
+      input.url,
     );
   });
 });

apps/scan-engine/src/scan-engine.consumer.ts

@@ -66,6 +66,7 @@ export class ScanEngineConsumer {
         coreResultPages,
         this.logger,
         job.data.filter,
+        job.data.url,
       );
       this.logger.log({
         msg: `wrote core result for ${job.data.url}`,

entities/core-result.entity.ts

@@ -69,13 +69,17 @@ export class CoreResult {
   dnsScanStatus?: string;
 
   @Column()
-  @Expose({ name: 'initial_domain' })
+  @Expose({ name: 'initial_base_domain' })
   targetUrlBaseDomain: string;
 
   @Column({ nullable: true })
   @Expose({ name: 'url' })
   finalUrl?: string;
 
+  @Column({ nullable: true })
+  @Expose({ name: 'initial_url' })
+  initialUrl?: string;
+
   @Column({ nullable: true })
   @Expose({ name: 'live' })
   finalUrlIsLive?: boolean;
@@ -85,17 +89,13 @@ export class CoreResult {
   filter?: boolean;
 
   @Column({ nullable: true })
-  @Expose({ name: 'domain' })
+  @Expose({ name: 'base_domain' })
   finalUrlBaseDomain?: string;
 
   @Column({ nullable: true })
   @Expose({ name: 'name' })
   finalSiteName?: string;
 
-  @Column({ nullable: true })
-  @Expose({ name: 'initial_base_domain' })
-  baseDomain?: string;
-
   @Column({ nullable: true })
   @Expose({ name: 'media_type' })
   finalUrlMIMEType?: string;
@@ -323,11 +323,11 @@ export class CoreResult {
   dnsHostname?: string;
 
   @Column({ nullable: true })
-  @Expose({ name: 'top_level_domain' })
+  @Expose({ name: 'domain' })
   finalUrlWebsite?: string;
 
   @Column({ nullable: true })
-  @Expose({ name: 'base_domain' })
+  @Expose({ name: 'top_level_domain' })
   finalUrlTopLevelDomain?: string;
 
   @Column({ nullable: true })

entities/website.entity.ts

@@ -30,7 +30,7 @@ export class Website {
   coreResult: CoreResult;
 
   @Column()
-  @Expose({ name: 'initial_url' })
+  @Expose({ name: 'initial_domain' })
   url: string;
 
   @Column({ nullable: true })

libs/database/src/core-results/core-result.service.spec.ts

@@ -74,6 +74,7 @@ describe('CoreResultService', () => {
   it('should create a CoreResult from CoreResultPages', async () => {
     const websiteId = 1;
     const scanStatus: ScanStatus = ScanStatus['Completed'];
+    const websiteUrl = 'https://18f.gsa.gov';
 
     // Fixme: This test is very brittle. Any changes to any scan will basically
     //        cause this mock object to type mismatch. If our test is only looking
@@ -263,7 +264,7 @@ describe('CoreResultService', () => {
     };
     const logger = mock<Logger>();
 
-    await service.createFromCoreResultPages(websiteId, pages, logger, false);
+    await service.createFromCoreResultPages(websiteId, pages, logger, false, websiteUrl);
     expect(mockRepository.insert).toHaveBeenCalled();
   });
 });

libs/database/src/core-results/core-result.service.ts

@@ -24,13 +24,15 @@ export class CoreResultService {
     pages: CoreResultPages,
     logger: Logger,
     filter: boolean,
+    websiteUrl: string,
   ) {
     const coreResult = new CoreResult();
     const website = new Website();
     website.id = websiteId;
     coreResult.website = website;
     coreResult.targetUrlBaseDomain = pages.base.targetUrlBaseDomain;
     coreResult.filter = filter;
+    coreResult.initialUrl = `https://${websiteUrl}`;
 
     this.updatePrimaryScanResults(coreResult, pages, logger);
     this.updateNotFoundScanResults(coreResult, pages, logger);
@@ -122,9 +124,6 @@ export class CoreResultService {
       // Site name - finalUrlBaseDomain with www. stripped
       coreResult.finalSiteName = coreResult.finalUrlBaseDomain ? coreResult.finalUrlBaseDomain.replace(/^www\./, '') : '';
 
-      // Base domain
-      coreResult.baseDomain = coreResult.finalUrlBaseDomain ? coreResult.finalUrlBaseDomain.split('.').slice(-2).join('.') : '';
-
       // USWDS scan
       coreResult.usaClasses = result.uswdsScan.usaClasses;
       coreResult.usaClassesUsed = result.uswdsScan.usaClassesUsed;