elections-types 1.0.84 → 1.0.86

package/dist/src/types/Video.js

@@ -9,7 +9,7 @@ export class Video {
     tags;
     duration;
     fetch_time;
-    s3_filename;
+    s3_id;
     constructor(video) {
         if (!Video.is(video)) {
             throw Error("Invalid input.");
@@ -24,7 +24,7 @@ export class Video {
         this.tags = video.tags;
         this.duration = video.duration;
         this.fetch_time = video.fetch_time;
-        this.s3_filename = video.s3_filename;
+        this.s3_id = video.s3_id;
     }
     static is(video) {
         return (video !== undefined &&
@@ -38,6 +38,6 @@ export class Video {
             (video.tags === undefined || Array.isArray(video.tags) && video.tags.map((tag) => typeof tag === "string")) &&
             (video.duration === undefined || typeof video.duration === "number" && !isNaN(video.duration)) &&
             typeof video.fetch_time === "string" &&
-            (video.s3_filename === undefined || typeof video.s3_filename === "string"));
+            (video.s3_id === undefined || typeof video.s3_id === "string"));
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "elections-types",
-    "version": "1.0.84",
+    "version": "1.0.86",
     "main": "dist/src/index.js",
     "types": "dist/src/index.d.ts",
     "directories": {

package/src/index.ts

@@ -10,11 +10,11 @@ export * from "./types/Election"
 export * from "./types/ElectionsConfig"
 export * from "./types/Expenditure"
 export * from "./types/FederalDonation"
-export * from "./types/FECFile"
-export * from "./types/FECF1File"
-export * from "./types/FECF2File"
-export * from "./types/FECF3File"
-export * from "./types/FECF24File"
+export * from "./types/FederalElectionFile"
+export * from "./types/FederalElectionF1File"
+export * from "./types/FederalElectionF2File"
+export * from "./types/FederalElectionF3File"
+export * from "./types/FederalElectionF24File"
 export * from "./types/FormTypeID"
 export * from "./types/State"
 export * from "./types/Tweet"

package/src/types/Candidate.ts

@@ -1,7 +1,7 @@
 import { Committee, CommitteeAux } from "./Committee"
 import { ElectionID, is_election_id, is_office_id, OfficeID } from "./Election"
 import { Expenditure, ExpenditureAux } from "./Expenditure"
-import { FECF3File } from "./FECF3File"
+import { FederalElectionF3File } from "./FederalElectionF3File"
 import { is_state_id, StateID } from "./State"
 
 export class ActivityIndex {
@@ -38,7 +38,7 @@ export class Candidate {
     readonly party_id? : string
     readonly active? : boolean
     readonly status? : string
-    readonly fec_file_id? : number
+    readonly federal_election_file_id? : number
     readonly ballotpedia_name? : string
     readonly ballotpedia_url? : string
     readonly ballotpedia_data? : Record<string, any>
@@ -61,7 +61,7 @@ export class Candidate {
         this.party_id = candidate.party_id
         this.active = candidate.active
         this.status = candidate.status
-        this.fec_file_id = candidate.fec_file_id
+        this.federal_election_file_id = candidate.federal_election_file_id
         this.ballotpedia_name = candidate.ballotpedia_name
         this.ballotpedia_url = candidate.ballotpedia_url
         this.ballotpedia_data = candidate.ballotpedia_data
@@ -80,7 +80,7 @@ export class Candidate {
             (candidate.party_id === undefined || typeof candidate.party_id === "string") &&
             (candidate.active === undefined || typeof candidate.active === "boolean") &&
             (candidate.status === undefined || typeof candidate.status === "string") &&
-            (candidate.fec_file_id === undefined || typeof candidate.fec_file_id === "number" && !isNaN(candidate.fec_file_id)) &&
+            (candidate.federal_election_file_id === undefined || typeof candidate.federal_election_file_id === "number" && !isNaN(candidate.federal_election_file_id)) &&
             (candidate.ballotpedia_name === undefined || typeof candidate.ballotpedia_name === "string") &&
             (candidate.ballotpedia_url === undefined || typeof candidate.ballotpedia_url === "string") &&
             (candidate.ballotpedia_data === undefined || typeof candidate.ballotpedia_data === "object" && Object.keys(candidate.ballotpedia_data).map((key : any) => typeof key === "string")) &&
@@ -91,7 +91,7 @@ export class Candidate {
 
 export class CandidateAux extends Candidate {
     readonly committees : CommitteeAux[]
-    readonly fec_f3_files : FECF3File[]
+    readonly fec_f3_files : FederalElectionF3File[]
     readonly expenditures : ExpenditureAux[]
 
     constructor(candidate : any) {
@@ -100,7 +100,7 @@ export class CandidateAux extends Candidate {
         }
         super(candidate)
         this.committees = candidate.committees
-        this.fec_f3_files = candidate.fec_f3_files.map(fec_f3_file => new FECF3File(fec_f3_file))
+        this.fec_f3_files = candidate.fec_f3_files.map(fec_f3_file => new FederalElectionF3File(fec_f3_file))
         this.expenditures = candidate.expenditures.map(expenditure => new ExpenditureAux(expenditure))
     }
 
@@ -110,7 +110,7 @@ export class CandidateAux extends Candidate {
             Array.isArray(candidate.committees) &&
             candidate.committees.every(CommitteeAux.is) &&
             Array.isArray(candidate.fec_f3_files) &&
-            candidate.fec_f3_files.every(FECF3File.is) &&
+            candidate.fec_f3_files.every(FederalElectionF3File.is) &&
             Array.isArray(candidate.expenditures) &&
             candidate.expenditures.every(ExpenditureAux.is)
         )

package/src/types/Committee.ts

@@ -1,6 +1,6 @@
 import { Candidate } from "./Candidate"
 import { CandidateCommittee } from "./CandidateCommittee"
-import { FECF3File } from "./FECF3File"
+import { FederalElectionF3File } from "./FederalElectionF3File"
 
 export const designations = ["P", "A", "U", "J", "D", "B"] as const
 
@@ -15,7 +15,7 @@ export class Committee {
     readonly name : string
     readonly url? : string
     readonly designation? : CommitteeDesignation
-    readonly fec_file_id? : number
+    readonly federal_election_file_id? : number
     readonly jfp_committee_ids? : string[]
     readonly jfr_committee_ids : string[]
     readonly aff_committee_ids : string[]
@@ -29,7 +29,7 @@ export class Committee {
         this.name = committee.name
         this.url = committee.url
         this.designation = committee.designation
-        this.fec_file_id = committee.fec_file_id
+        this.federal_election_file_id = committee.federal_election_file_id
         this.jfp_committee_ids = committee.jfp_committee_ids
         this.jfr_committee_ids = committee.jfr_committee_ids
         this.aff_committee_ids = committee.aff_committee_ids
@@ -42,7 +42,7 @@ export class Committee {
             typeof committee.name === "string" &&
             (committee.url === undefined || typeof committee.url === "string") &&
             (committee.designation === undefined || is_committee_designation(committee.designation)) &&
-            (committee.fec_file_id === undefined || typeof committee.fec_file_id === "number" && !isNaN(committee.fec_file_id)) &&
+            (committee.federal_election_file_id === undefined || typeof committee.federal_election_file_id === "number" && !isNaN(committee.federal_election_file_id)) &&
             (committee.jfp_committee_ids === undefined || Array.isArray(committee.jfp_committee_ids) && committee.jfp_committee_ids.every((committee_id : any) => typeof committee_id === "string")) &&
             (Array.isArray(committee.jfr_committee_ids) && committee.jfr_committee_ids.every((committee_id : any) => typeof committee_id === "string")) &&
             (Array.isArray(committee.aff_committee_ids) && committee.aff_committee_ids.every((committee_id : any) => typeof committee_id === "string"))
@@ -52,7 +52,7 @@ export class Committee {
 
 export class CommitteeAux extends Committee {
     readonly candidates : Candidate[]
-    readonly fec_f3_files : FECF3File[]
+    readonly fec_f3_files : FederalElectionF3File[]
     readonly jfp_committees? : Committee[]
     readonly jfr_committees : Committee[]
     readonly aff_committees : Committee[]
@@ -63,7 +63,7 @@ export class CommitteeAux extends Committee {
         }
         super(committee)
         this.candidates = committee.candidates
-        this.fec_f3_files = committee.fec_f3_files.map(fec_f3_file => new FECF3File(fec_f3_file))
+        this.fec_f3_files = committee.fec_f3_files.map(fec_f3_file => new FederalElectionF3File(fec_f3_file))
         this.jfp_committees = committee.jfp_committees !== undefined ? committee.jfp_committees.map(committee => new Committee(committee)) : undefined
         this.jfr_committees = committee.jfr_committees.map(committee => new Committee(committee))
         this.aff_committees = committee.aff_committees.map(committee => new Committee(committee))
@@ -75,7 +75,7 @@ export class CommitteeAux extends Committee {
             Array.isArray(committee.candidates) &&
             committee.candidates.every(Candidate.is) &&
             Array.isArray(committee.fec_f3_files) &&
-            committee.fec_f3_files.every(FECF3File.is) &&
+            committee.fec_f3_files.every(FederalElectionF3File.is) &&
             (committee.jfp_committees === undefined || Array.isArray(committee.jfp_committees) && committee.jfp_committees.every(Committee.is)) &&
             (Array.isArray(committee.jfr_committees) && committee.jfr_committees.every(Committee.is)) &&
             (Array.isArray(committee.aff_committees) && committee.aff_committees.every(Committee.is))

package/src/types/ElectionsConfig.ts

@@ -33,7 +33,7 @@ export interface ElectionsConfig extends ElectionsUtilsConfig {
     dynamodb_candidate_tweets : string,
     dynamodb_videos : string,
     dynamodb_candidate_videos : string,
-    dynamodb_fec_files : string,
+    dynamodb_federal_election_files : string,
     dynamodb_federal_donations : string,
     dynamodb_fetch_history : string,
     s3_bucket : string

package/src/types/Expenditure.ts

@@ -1,10 +1,10 @@
 import { Candidate } from "./Candidate"
 import { Committee } from "./Committee"
 import { ElectionID, is_election_id } from "./Election"
-import { FECF24File } from "./FECF24File"
+import { FederalElectionF24File } from "./FederalElectionF24File"
 
 export class Expenditure {
-    readonly fec_file_id : number
+    readonly federal_election_file_id : number
     readonly expenditure_id : string
     readonly committee_id : string
     readonly date : string
@@ -22,7 +22,7 @@ export class Expenditure {
         if (!Expenditure.is(expenditure)) {
             throw Error("Invalid input.")
         }
-        this.fec_file_id = expenditure.fec_file_id
+        this.federal_election_file_id = expenditure.federal_election_file_id
         this.expenditure_id = expenditure.expenditure_id
         this.committee_id = expenditure.committee_id
         this.date = expenditure.date
@@ -39,7 +39,7 @@ export class Expenditure {
     static is(expenditure : any) : expenditure is Expenditure {
         return (
             expenditure !== undefined &&
-            typeof expenditure.fec_file_id === "number" &&
+            typeof expenditure.federal_election_file_id === "number" &&
             typeof expenditure.expenditure_id === "string" &&
             typeof expenditure.committee_id === "string" &&
             typeof expenditure.date === "string" &&
@@ -59,7 +59,7 @@ export class Expenditure {
 export class ExpenditureAux extends Expenditure {
     readonly candidate : Candidate
     readonly committee : Committee
-    readonly fec_f24_file : FECF24File
+    readonly fec_f24_file : FederalElectionF24File
 
     constructor(expenditure : any) {
         if (!ExpenditureAux.is(expenditure)) {
@@ -68,7 +68,7 @@ export class ExpenditureAux extends Expenditure {
         super(expenditure)
         this.candidate = new Candidate(expenditure.candidate)
         this.committee = new Committee(expenditure.committee)
-        this.fec_f24_file = new FECF24File(expenditure.fec_f24_file)
+        this.fec_f24_file = new FederalElectionF24File(expenditure.fec_f24_file)
     }
 
     static is(expenditure : any) : expenditure is ExpenditureAux {
@@ -76,7 +76,7 @@ export class ExpenditureAux extends Expenditure {
             Expenditure.is(expenditure) &&
             Candidate.is(expenditure.candidate) &&
             Committee.is(expenditure.committee) &&
-            FECF24File.is(expenditure.fec_f24_file)
+            FederalElectionF24File.is(expenditure.fec_f24_file)
         )
     }
 }

package/src/types/FederalDonation.ts

@@ -6,7 +6,7 @@ export class FederalDonation {
     readonly sub_id : string
     readonly committee_id : string
     readonly target_committee_id? : string
-    readonly fec_file_id : number
+    readonly federal_election_file_id : number
     readonly image_number : string
     readonly amount : number
     readonly donor_is_individual : boolean
@@ -36,7 +36,7 @@ export class FederalDonation {
         this.sub_id = federal_donation.sub_id
         this.committee_id = federal_donation.committee_id
         this.target_committee_id = federal_donation.target_committee_id
-        this.fec_file_id = federal_donation.fec_file_id
+        this.federal_election_file_id = federal_donation.federal_election_file_id
         this.image_number = federal_donation.image_number
         this.amount = federal_donation.amount
         this.donor_is_individual = federal_donation.donor_is_individual
@@ -66,7 +66,7 @@ export class FederalDonation {
             typeof federal_donation.sub_id === "string" &&
             typeof federal_donation.committee_id === "string" &&
             (federal_donation.target_committee_id === undefined || typeof federal_donation.target_committee_id === "string") &&
-            typeof federal_donation.fec_file_id === "number" && !isNaN(federal_donation.fec_file_id) &&
+            typeof federal_donation.federal_election_file_id === "number" && !isNaN(federal_donation.federal_election_file_id) &&
             typeof federal_donation.image_number === "string" &&
             typeof federal_donation.amount === "number" && !isNaN(federal_donation.amount) &&
             typeof federal_donation.donor_is_individual === "boolean" &&

package/src/types/FederalElectionF1File.ts

@@ -0,0 +1,53 @@
+import { CommitteeDesignation, is_committee_designation } from "./Committee"
+import { ElectionID, is_election_id } from "./Election"
+import { FederalElectionFile } from "./FederalElectionFile"
+
+export class FederalElectionF1File extends FederalElectionFile {
+    readonly committee_id : string
+    readonly name : string
+    readonly url? : string
+    readonly report_date : string
+    readonly designation : CommitteeDesignation
+    readonly election_id? : ElectionID
+    readonly candidate_id? : string
+    readonly jfp_committee_ids? : string[]
+    readonly jfr_committee_ids : string[]
+    readonly aff_committee_ids : string[]
+    readonly sponsor_candidate_ids? : string[]
+        
+    constructor(federal_election_file : any) {
+        if (!FederalElectionF1File.is(federal_election_file)) {
+            throw Error("Invalid input.")
+        }
+        super(federal_election_file)
+        this.committee_id = federal_election_file.committee_id
+        this.name = federal_election_file.name
+        this.url = federal_election_file.url
+        this.report_date = federal_election_file.report_date
+        this.designation = federal_election_file.designation
+        this.election_id = federal_election_file.election_id
+        this.candidate_id = federal_election_file.candidate_id
+        this.jfp_committee_ids = federal_election_file.jfp_committee_ids
+        this.jfr_committee_ids = federal_election_file.jfr_committee_ids
+        this.aff_committee_ids = federal_election_file.aff_committee_ids
+        this.sponsor_candidate_ids = federal_election_file.sponsor_candidate_ids
+    }
+
+    static is(federal_election_file : any) : federal_election_file is FederalElectionF1File {
+        return (
+            FederalElectionFile.is(federal_election_file) &&
+            federal_election_file.form_type_id === "F1" &&
+            typeof federal_election_file.committee_id === "string" &&
+            typeof federal_election_file.name === "string" &&
+            (federal_election_file.url === undefined || typeof federal_election_file.url === "string") &&
+            typeof federal_election_file.report_date === "string" &&
+            is_committee_designation(federal_election_file.designation) &&
+            (federal_election_file.election_id === undefined || is_election_id(federal_election_file.election_id)) &&
+            (federal_election_file.candidate_id === undefined || typeof federal_election_file.candidate_id === "string") &&
+            (federal_election_file.jfp_committee_ids === undefined || Array.isArray(federal_election_file.jfp_committee_ids) && federal_election_file.jfp_committee_ids.every((committee_id : any) => typeof committee_id === "string")) &&
+            (Array.isArray(federal_election_file.jfr_committee_ids) && federal_election_file.jfr_committee_ids.every((committee_id : any) => typeof committee_id === "string")) &&
+            (Array.isArray(federal_election_file.aff_committee_ids) && federal_election_file.aff_committee_ids.every((committee_id : any) => typeof committee_id === "string")) &&
+            (federal_election_file.sponsor_candidate_ids === undefined || Array.isArray(federal_election_file.sponsor_candidate_ids) && federal_election_file.sponsor_candidate_ids.every((committee_id : any) => typeof committee_id === "string"))
+        )
+    }
+}

package/src/types/FederalElectionF24File.ts

@@ -0,0 +1,37 @@
+import { Expenditure } from "./Expenditure"
+import { FederalElectionFile } from "./FederalElectionFile"
+
+export class FederalElectionF24File extends FederalElectionFile {
+    readonly committee_id : string
+    readonly first_federal_election_file_id : number
+    readonly report_type : string
+    readonly first_report_date : string
+    readonly report_date : string
+    readonly expenditures : Expenditure[]
+        
+    constructor(federal_election_file : any) {
+        if (!FederalElectionF24File.is(federal_election_file)) {
+            throw Error("Invalid input.")
+        }
+        super(federal_election_file)
+        this.committee_id = federal_election_file.committee_id
+        this.first_federal_election_file_id = federal_election_file.first_federal_election_file_id
+        this.report_type = federal_election_file.report_type
+        this.first_report_date = federal_election_file.first_report_date
+        this.report_date = federal_election_file.report_date
+        this.expenditures = federal_election_file.expenditures
+    }
+
+    static is(federal_election_file : any) : federal_election_file is FederalElectionF24File {
+        return (
+            FederalElectionFile.is(federal_election_file) &&
+            federal_election_file.form_type_id === "F24" &&
+            typeof federal_election_file.committee_id === "string" &&
+            typeof federal_election_file.first_federal_election_file_id === "number" &&
+            typeof federal_election_file.report_type === "string" &&
+            typeof federal_election_file.first_report_date === "string" &&
+            typeof federal_election_file.report_date === "string" &&
+            Array.isArray(federal_election_file.expenditures) && federal_election_file.expenditures.every(Expenditure.is)
+        )
+    }
+}

package/src/types/FederalElectionF2File.ts

@@ -0,0 +1,44 @@
+import { ElectionID, is_election_id, is_office_id, OfficeID } from "./Election"
+import { FederalElectionFile } from "./FederalElectionFile"
+import { is_state_id, StateID } from "./State"
+
+export class FederalElectionF2File extends FederalElectionFile {
+    readonly candidate_id : string
+    readonly fec_name : string
+    readonly office_id : OfficeID
+    readonly state_id : StateID
+    readonly district? : number
+    readonly election_id : ElectionID
+    readonly party_id? : string
+    readonly report_date : string
+        
+    constructor(federal_election_file : any) {
+        if (!FederalElectionF2File.is(federal_election_file)) {
+            throw Error("Invalid input.")
+        }
+        super(federal_election_file)
+        this.candidate_id = federal_election_file.candidate_id
+        this.fec_name = federal_election_file.fec_name
+        this.office_id = federal_election_file.office_id
+        this.state_id = federal_election_file.state_id
+        this.district = federal_election_file.district
+        this.election_id = federal_election_file.election_id
+        this.party_id = federal_election_file.party_id
+        this.report_date = federal_election_file.report_date
+    }
+
+    static is(federal_election_file : any) : federal_election_file is FederalElectionF2File {
+        return (
+            FederalElectionFile.is(federal_election_file) &&
+            federal_election_file.form_type_id === "F2" &&
+            typeof federal_election_file.candidate_id === "string" &&
+            typeof federal_election_file.fec_name === "string" &&
+            is_office_id(federal_election_file.office_id) &&
+            is_state_id(federal_election_file.state_id) &&
+            (federal_election_file.district === undefined || typeof federal_election_file.district === "number") &&
+            is_election_id(federal_election_file.election_id) &&
+            (federal_election_file.party_id === undefined || typeof federal_election_file.party_id === "string") &&
+            typeof federal_election_file.report_date === "string"
+        )
+    }
+}

package/src/types/FederalElectionF3File.ts

@@ -0,0 +1,42 @@
+import { FederalElectionFile } from "./FederalElectionFile"
+
+export class FederalElectionF3File extends FederalElectionFile {
+    readonly committee_id : string
+    readonly period_id : string
+    readonly period_start_date : string
+    readonly period_end_date : string
+    readonly report_date : string
+    readonly cash_on_hand : number
+    readonly cumulative_receipts : number
+    readonly new_receipts : number
+        
+    constructor(federal_election_file : any) {
+        if (!FederalElectionF3File.is(federal_election_file)) {
+            throw Error("Invalid input.")
+        }
+        super(federal_election_file)
+        this.committee_id = federal_election_file.committee_id
+        this.period_id = federal_election_file.period_id
+        this.period_start_date = federal_election_file.period_start_date
+        this.period_end_date = federal_election_file.period_end_date
+        this.report_date = federal_election_file.report_date
+        this.cash_on_hand = federal_election_file.cash_on_hand
+        this.cumulative_receipts = federal_election_file.cumulative_receipts
+        this.new_receipts = federal_election_file.new_receipts
+    }
+
+    static is(federal_election_file : any) : federal_election_file is FederalElectionF3File {
+        return (
+            FederalElectionFile.is(federal_election_file) &&
+            federal_election_file.form_type_id === "F3" &&
+            typeof federal_election_file.committee_id === "string" &&
+            typeof federal_election_file.period_id === "string" &&
+            typeof federal_election_file.period_start_date === "string" &&
+            typeof federal_election_file.period_end_date === "string" &&
+            typeof federal_election_file.report_date === "string" &&
+            typeof federal_election_file.cash_on_hand === "number" &&
+            typeof federal_election_file.cumulative_receipts === "number" &&
+            typeof federal_election_file.new_receipts === "number"
+        )
+    }
+}

package/src/types/FederalElectionFile.ts

@@ -0,0 +1,43 @@
+import { AmendmentTypeID, FormTypeID, is_amendment_type_id, is_form_type_id, is_long_form_type_id, LongFormTypeID } from "./FormTypeID"
+
+export const form_version_ids = ["8.1", "8.2", "8.3", "8.4", "8.5"] as const
+
+export type FormVersionID = typeof form_version_ids[number]
+
+export function is_form_version_id(form_version_id : any) : form_version_id is FormVersionID {
+    return form_version_ids.includes(form_version_id)
+}
+
+export class FederalElectionFile {
+    readonly federal_election_file_id : number
+    readonly form_version_id : FormVersionID
+    readonly form_type_id : FormTypeID
+    readonly amendment_type_id : AmendmentTypeID
+    readonly long_form_type_id : LongFormTypeID
+    readonly s3_id : string
+    [x : string] : any
+    
+    constructor(federal_election_file : any) {
+        if (!FederalElectionFile.is(federal_election_file)) {
+            throw Error("Invalid input.")
+        }
+        this.federal_election_file_id = federal_election_file.federal_election_file_id
+        this.form_version_id = federal_election_file.form_version_id
+        this.form_type_id = federal_election_file.form_type_id
+        this.amendment_type_id = federal_election_file.amendment_type_id
+        this.long_form_type_id = federal_election_file.long_form_type_id
+        this.s3_id = federal_election_file.s3_id
+    }
+
+    static is(federal_election_file : any) : federal_election_file is FederalElectionFile {
+        return (
+            federal_election_file !== undefined &&
+            typeof federal_election_file.federal_election_file_id === "number" &&
+            is_form_version_id(federal_election_file.form_version_id) &&
+            is_form_type_id(federal_election_file.form_type_id) &&
+            is_amendment_type_id(federal_election_file.amendment_type_id) &&
+            is_long_form_type_id(federal_election_file.long_form_type_id) &&
+            (federal_election_file.s3_id === undefined || typeof federal_election_file.s3_id === "string")
+        )
+    }
+}

package/src/types/Video.ts

@@ -9,7 +9,7 @@ export class Video {
     readonly tags? : string[]
     readonly duration? : number
     readonly fetch_time : string
-    readonly s3_filename? : string
+    readonly s3_id? : string
 
     constructor(video : Video) {
         if (!Video.is(video)) {
@@ -25,7 +25,7 @@ export class Video {
         this.tags = video.tags
         this.duration = video.duration
         this.fetch_time = video.fetch_time
-        this.s3_filename = video.s3_filename
+        this.s3_id = video.s3_id
     }
 
     static is(video : any) : video is Video {
@@ -41,7 +41,7 @@ export class Video {
             (video.tags === undefined || Array.isArray(video.tags) && video.tags.map((tag : any) => typeof tag === "string")) &&
             (video.duration === undefined || typeof video.duration === "number" && !isNaN(video.duration)) &&
             typeof video.fetch_time === "string" &&
-            (video.s3_filename === undefined || typeof video.s3_filename === "string")
+            (video.s3_id === undefined || typeof video.s3_id === "string")
         )
     }
 }

package/src/types/FECF1File.ts

@@ -1,53 +0,0 @@
-import { CommitteeDesignation, is_committee_designation } from "./Committee"
-import { ElectionID, is_election_id } from "./Election"
-import { FECFile } from "./FECFile"
-
-export class FECF1File extends FECFile {
-    readonly committee_id : string
-    readonly name : string
-    readonly url? : string
-    readonly report_date : string
-    readonly designation : CommitteeDesignation
-    readonly election_id? : ElectionID
-    readonly candidate_id? : string
-    readonly jfp_committee_ids? : string[]
-    readonly jfr_committee_ids : string[]
-    readonly aff_committee_ids : string[]
-    readonly sponsor_candidate_ids? : string[]
-        
-    constructor(fec_file : any) {
-        if (!FECF1File.is(fec_file)) {
-            throw Error("Invalid input.")
-        }
-        super(fec_file)
-        this.committee_id = fec_file.committee_id
-        this.name = fec_file.name
-        this.url = fec_file.url
-        this.report_date = fec_file.report_date
-        this.designation = fec_file.designation
-        this.election_id = fec_file.election_id
-        this.candidate_id = fec_file.candidate_id
-        this.jfp_committee_ids = fec_file.jfp_committee_ids
-        this.jfr_committee_ids = fec_file.jfr_committee_ids
-        this.aff_committee_ids = fec_file.aff_committee_ids
-        this.sponsor_candidate_ids = fec_file.sponsor_candidate_ids
-    }
-
-    static is(fec_file : any) : fec_file is FECF1File {
-        return (
-            FECFile.is(fec_file) &&
-            fec_file.form_type_id === "F1" &&
-            typeof fec_file.committee_id === "string" &&
-            typeof fec_file.name === "string" &&
-            (fec_file.url === undefined || typeof fec_file.url === "string") &&
-            typeof fec_file.report_date === "string" &&
-            is_committee_designation(fec_file.designation) &&
-            (fec_file.election_id === undefined || is_election_id(fec_file.election_id)) &&
-            (fec_file.candidate_id === undefined || typeof fec_file.candidate_id === "string") &&
-            (fec_file.jfp_committee_ids === undefined || Array.isArray(fec_file.jfp_committee_ids) && fec_file.jfp_committee_ids.every((committee_id : any) => typeof committee_id === "string")) &&
-            (Array.isArray(fec_file.jfr_committee_ids) && fec_file.jfr_committee_ids.every((committee_id : any) => typeof committee_id === "string")) &&
-            (Array.isArray(fec_file.aff_committee_ids) && fec_file.aff_committee_ids.every((committee_id : any) => typeof committee_id === "string")) &&
-            (fec_file.sponsor_candidate_ids === undefined || Array.isArray(fec_file.sponsor_candidate_ids) && fec_file.sponsor_candidate_ids.every((committee_id : any) => typeof committee_id === "string"))
-        )
-    }
-}

package/src/types/FECF24File.ts

@@ -1,37 +0,0 @@
-import { Expenditure } from "./Expenditure"
-import { FECFile } from "./FECFile"
-
-export class FECF24File extends FECFile {
-    readonly committee_id : string
-    readonly first_fec_file_id : number
-    readonly report_type : string
-    readonly first_report_date : string
-    readonly report_date : string
-    readonly expenditures : Expenditure[]
-        
-    constructor(fec_file : any) {
-        if (!FECF24File.is(fec_file)) {
-            throw Error("Invalid input.")
-        }
-        super(fec_file)
-        this.committee_id = fec_file.committee_id
-        this.first_fec_file_id = fec_file.first_fec_file_id
-        this.report_type = fec_file.report_type
-        this.first_report_date = fec_file.first_report_date
-        this.report_date = fec_file.report_date
-        this.expenditures = fec_file.expenditures
-    }
-
-    static is(fec_file : any) : fec_file is FECF24File {
-        return (
-            FECFile.is(fec_file) &&
-            fec_file.form_type_id === "F24" &&
-            typeof fec_file.committee_id === "string" &&
-            typeof fec_file.first_fec_file_id === "number" &&
-            typeof fec_file.report_type === "string" &&
-            typeof fec_file.first_report_date === "string" &&
-            typeof fec_file.report_date === "string" &&
-            Array.isArray(fec_file.expenditures) && fec_file.expenditures.every(Expenditure.is)
-        )
-    }
-}