Remove agency and bureau codes from Website entity

GSA · Jun 13, 2024 · 65a8371 · 65a8371
1 parent d4341ea
commit 65a8371
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 52 deletions.
diff --git a/entities/website.entity.ts b/entities/website.entity.ts
@@ -45,18 +45,10 @@ export class Website {
   @Expose({ name: 'target_url_agency_owner' })
   agency: string;
 
-  @Column({ nullable: true })
-  @Exclude()
-  agencyCode?: number;
-
   @Column()
   @Expose({ name: 'target_url_bureau_owner' })
   bureau: string;
 
-  @Column({ nullable: true })
-  @Exclude()
-  bureauCode?: number;
-
   @Column({ nullable: true })
   @Expose({ name: 'source_list' })
   @Transform((value: string) => {

diff --git a/libs/database/src/analysis/analysis.service.integration.spec.ts b/libs/database/src/analysis/analysis.service.integration.spec.ts
@@ -43,8 +43,6 @@ describe('AnalysisService', () => {
     website.branch = 'Federal Agency - Executive';
     website.agency = 'General Services Administration';
     website.bureau = 'GSA,FAS,Technology Transformation Service';
-    website.agencyCode = 10;
-    website.bureauCode = 10;
     website.sourceList = 'gov';
     website.ombIdeaPublic = false;
 
@@ -79,8 +77,6 @@ describe('AnalysisService', () => {
     firstWebsite.branch = 'Federal Agency - Executive';
     firstWebsite.agency = 'General Services Administration';
     firstWebsite.bureau = 'GSA,FAS,Technology Transformation Service';
-    firstWebsite.agencyCode = 10;
-    firstWebsite.bureauCode = 10;
     firstWebsite.sourceList = 'gov';
     firstWebsite.ombIdeaPublic = false;
 
@@ -90,8 +86,6 @@ describe('AnalysisService', () => {
     secondWebsite.branch = 'Federal Agency - Executive';
     secondWebsite.agency = 'Fake Agency';
     secondWebsite.bureau = 'GSA,FAS,Technology Transformation Service';
-    secondWebsite.agencyCode = 10;
-    secondWebsite.bureauCode = 10;
     secondWebsite.sourceList = 'gov';
     secondWebsite.ombIdeaPublic = false;
 
@@ -130,8 +124,6 @@ describe('AnalysisService', () => {
     firstWebsite.branch = 'Federal Agency - Executive';
     firstWebsite.agency = 'General Services Administration';
     firstWebsite.bureau = 'GSA,FAS,Technology Transformation Service';
-    firstWebsite.agencyCode = 10;
-    firstWebsite.bureauCode = 10;
     firstWebsite.sourceList = 'gov';
     firstWebsite.ombIdeaPublic = false;
 
@@ -141,8 +133,6 @@ describe('AnalysisService', () => {
     secondWebsite.branch = 'Federal Agency - Executive';
     secondWebsite.agency = 'Fake Agency';
     secondWebsite.bureau = 'GSA,FAS,Technology Transformation Service';
-    secondWebsite.agencyCode = 10;
-    secondWebsite.bureauCode = 10;
     secondWebsite.sourceList = 'gov';
     secondWebsite.ombIdeaPublic = false;
 
@@ -181,8 +171,6 @@ describe('AnalysisService', () => {
     firstWebsite.branch = 'Federal Agency - Executive';
     firstWebsite.agency = 'General Services Administration';
     firstWebsite.bureau = 'GSA,FAS,Technology Transformation Service';
-    firstWebsite.agencyCode = 10;
-    firstWebsite.bureauCode = 10;
     firstWebsite.sourceList = 'gov';
     firstWebsite.ombIdeaPublic = false;
 
@@ -192,8 +180,6 @@ describe('AnalysisService', () => {
     secondWebsite.branch = 'Federal Agency - Executive';
     secondWebsite.agency = 'General Services Administration';
     secondWebsite.bureau = 'GSA,FAS,Technology Transformation Service';
-    secondWebsite.agencyCode = 10;
-    secondWebsite.bureauCode = 10;
     secondWebsite.sourceList = 'gov';
     secondWebsite.ombIdeaPublic = false;
 

diff --git a/libs/database/src/websites/dto/create-website.dto.ts b/libs/database/src/websites/dto/create-website.dto.ts
@@ -6,9 +6,7 @@ export class CreateWebsiteDto {
   topLevelDomain: string;
   branch: string;
   agency: string;
-  agencyCode?: number;
   bureau: string;
-  bureauCode?: number;
   sourceList: string;
   ombIdeaPublic: boolean;
 }
diff --git a/libs/database/src/websites/websites.service.integration.spec.ts b/libs/database/src/websites/websites.service.integration.spec.ts
@@ -42,8 +42,6 @@ describe('AnalysisService', () => {
     firstWebsite.branch = 'Federal Agency - Executive';
     firstWebsite.agency = 'General Services Administration';
     firstWebsite.bureau = 'GSA,FAS,Technology Transformation Service';
-    firstWebsite.agencyCode = 10;
-    firstWebsite.bureauCode = 10;
     firstWebsite.sourceList = 'gov';
     firstWebsite.ombIdeaPublic = false;
 
@@ -53,8 +51,6 @@ describe('AnalysisService', () => {
     secondWebsite.branch = 'Federal Agency - Executive';
     secondWebsite.agency = 'Fake Agency';
     secondWebsite.bureau = 'GSA,FAS,Technology Transformation Service';
-    secondWebsite.agencyCode = 10;
-    secondWebsite.bureauCode = 10;
     secondWebsite.sourceList = 'gov';
     secondWebsite.ombIdeaPublic = false;
 
@@ -64,8 +60,6 @@ describe('AnalysisService', () => {
     thirdWebsite.branch = 'Federal Agency - Executive';
     thirdWebsite.agency = 'Fake Agency';
     thirdWebsite.bureau = 'GSA,FAS,Technology Transformation Service';
-    thirdWebsite.agencyCode = 10;
-    thirdWebsite.bureauCode = 10;
     thirdWebsite.sourceList = 'gov';
     thirdWebsite.ombIdeaPublic = false;
 
@@ -75,8 +69,6 @@ describe('AnalysisService', () => {
     fourthWebsite.agency = 'Fake Agency';
     fourthWebsite.branch = 'fake';
     fourthWebsite.bureau = 'fake';
-    fourthWebsite.agencyCode = 10;
-    fourthWebsite.bureauCode = 10;
     fourthWebsite.sourceList = 'mil';
     fourthWebsite.ombIdeaPublic = false;
 
@@ -141,8 +133,6 @@ describe('AnalysisService', () => {
     firstWebsite.branch = 'Federal Agency - Executive';
     firstWebsite.agency = 'General Services Administration';
     firstWebsite.bureau = 'GSA,FAS,Technology Transformation Service';
-    firstWebsite.agencyCode = 10;
-    firstWebsite.bureauCode = 10;
     firstWebsite.sourceList = 'gov';
     firstWebsite.ombIdeaPublic = false;
 
@@ -152,8 +142,6 @@ describe('AnalysisService', () => {
     secondWebsite.branch = 'Federal Agency - Executive';
     secondWebsite.agency = 'Fake Agency';
     secondWebsite.bureau = 'GSA,FAS,Technology Transformation Service';
-    secondWebsite.agencyCode = 10;
-    secondWebsite.bureauCode = 10;
     secondWebsite.sourceList = 'gov';
     secondWebsite.ombIdeaPublic = false;
 
@@ -163,8 +151,6 @@ describe('AnalysisService', () => {
     thirdWebsite.branch = 'Federal Agency - Executive';
     thirdWebsite.agency = 'Fake Agency';
     thirdWebsite.bureau = 'GSA,FAS,Technology Transformation Service';
-    thirdWebsite.agencyCode = 10;
-    thirdWebsite.bureauCode = 10;
     thirdWebsite.sourceList = 'gov';
     thirdWebsite.ombIdeaPublic = false;
 

diff --git a/libs/database/src/websites/websites.service.spec.ts b/libs/database/src/websites/websites.service.spec.ts
@@ -71,8 +71,6 @@ describe('WebsiteService', () => {
       branch: 'Federal Agency - Executive',
       agency: 'General Services Administration',
       bureau: 'GSA,FAS,Technology Transformation Service',
-      agencyCode: 10,
-      bureauCode: 10,
       sourceList: 'gov',
       ombIdeaPublic: false,
     };
@@ -83,8 +81,6 @@ describe('WebsiteService', () => {
     website.branch = createWebsiteDto.branch;
     website.agency = createWebsiteDto.agency;
     website.bureau = createWebsiteDto.bureau;
-    website.agencyCode = 10;
-    website.bureauCode = 10;
     website.sourceList = 'gov';
     (website.ombIdeaPublic = false), await service.upsert(createWebsiteDto);
     expect(mockRepository.insert).toHaveBeenCalledWith(website);

diff --git a/libs/database/src/websites/websites.service.ts b/libs/database/src/websites/websites.service.ts
@@ -171,8 +171,6 @@ export class WebsiteService {
     website.agency = createWebsiteDto.agency;
     website.bureau = createWebsiteDto.bureau;
     website.branch = createWebsiteDto.branch;
-    website.agencyCode = createWebsiteDto.agencyCode;
-    website.bureauCode = createWebsiteDto.bureauCode;
     website.sourceList = createWebsiteDto.sourceList;
     website.ombIdeaPublic = createWebsiteDto.ombIdeaPublic;
     const exists = await this.website.findOneBy({

diff --git a/libs/ingest/src/ingest.service.spec.ts b/libs/ingest/src/ingest.service.spec.ts
@@ -84,8 +84,6 @@ describe('IngestService', () => {
     website.branch = 'Executive';
     website.agency = 'General Services Administration';
     website.bureau = 'GSA, TTS';
-    website.agencyCode = 10;
-    website.bureauCode = 10;
     website.sourceList = 'gov';
 
     jest

diff --git a/libs/ingest/src/ingest.service.ts b/libs/ingest/src/ingest.service.ts
@@ -34,9 +34,7 @@ export class IngestService {
         'topLevelDomain',
         'branch',
         'agency',
-        'agencyCode',
         'bureau',
-        'bureauCode',
         'sourceListFederalDomains',
         'sourceListDap',
         'sourceListPulse',
@@ -66,8 +64,6 @@ export class IngestService {
         return {
           ...data,
           website: data.targetUrl.toLowerCase(),
-          agencyCode: data.agencyCode ? parseInt(data.agencyCode) : null,
-          bureauCode: data.bureauCode ? parseInt(data.bureauCode) : null,
           sourceList: this.getSourceList(data),
           ombIdeaPublic,
         };

diff --git a/libs/ingest/src/subdomain-row.interface.ts b/libs/ingest/src/subdomain-row.interface.ts
@@ -4,9 +4,7 @@ export interface SubdomainRow {
   topLevelDomain: string;
   branch: string;
   agency: string;
-  agencyCode: string;
   bureau: string;
-  bureauCode: string;
   sourceListFederalDomains: string;
   sourceListDap: string;
   sourceListPulse: string;