elections-types 1.0.62 → 1.0.64

package/dist/src/types/Candidate.d.ts

@@ -1,6 +1,6 @@
 import { CommitteeAux } from "./Committee.js";
 import { ElectionID, OfficeID } from "./Election.js";
-import { FECReport } from "./FECReport.js";
+import { FECF3File } from "./FECF3File.js";
 import { StateID } from "./State.js";
 export declare class ActivityIndex {
     readonly news_index: number;
@@ -31,7 +31,7 @@ export declare class Candidate {
 }
 export declare class CandidateAux extends Candidate {
     readonly committees: CommitteeAux[];
-    readonly fec_reports: FECReport[];
+    readonly fec_f3_files: FECF3File[];
     constructor(candidate: any);
     static is(candidate: any): candidate is CandidateAux;
 }

package/dist/src/types/Candidate.js

@@ -1,6 +1,6 @@
 import { CommitteeAux } from "./Committee.js";
 import { is_election_id, is_office_id } from "./Election.js";
-import { FECReport } from "./FECReport.js";
+import { FECF3File } from "./FECF3File.js";
 import { is_state_id } from "./State.js";
 export class ActivityIndex {
     news_index;
@@ -78,21 +78,20 @@ export class Candidate {
 }
 export class CandidateAux extends Candidate {
     committees;
-    fec_reports;
-    // readonly fec_f3_files : FEC
+    fec_f3_files;
     constructor(candidate) {
         if (!CandidateAux.is(candidate)) {
             throw Error("Invalid input.");
         }
         super(candidate);
         this.committees = candidate.committees;
-        this.fec_reports = candidate.fec_reports;
+        this.fec_f3_files = candidate.fec_f3_files.map(fec_f3_file => new FECF3File(fec_f3_file));
     }
     static is(candidate) {
         return (Candidate.is(candidate) &&
             Array.isArray(candidate.committees) &&
             candidate.committees.every(CommitteeAux.is) &&
-            Array.isArray(candidate.fec_reports) &&
-            candidate.fec_reports.every(FECReport.is));
+            Array.isArray(candidate.fec_f3_files) &&
+            candidate.fec_f3_files.every(FECF3File.is));
     }
 }

package/dist/src/types/ElectionsConfig.d.ts

@@ -20,6 +20,7 @@ export interface ElectionsConfig extends ElectionsUtilsConfig {
     dynamodb_elections: string;
     dynamodb_candidates: string;
     dynamodb_committees: string;
+    dynamodb_expenditures: string;
     dynamodb_users: string;
     dynamodb_user_elections: string;
     dynamodb_articles: string;

package/dist/src/types/FECF24File.d.ts

@@ -1,6 +1,7 @@
 import { ElectionID } from "./Election.js";
 import { FECFile } from "./FECFile.js";
 export declare class Expenditure {
+    readonly fec_file_id: number;
     readonly expenditure_id: string;
     readonly date: string;
     readonly payee: string;

package/dist/src/types/FECF24File.js

@@ -1,6 +1,7 @@
 import { is_election_id } from "./Election.js";
 import { FECFile } from "./FECFile.js";
 export class Expenditure {
+    fec_file_id;
     expenditure_id;
     date;
     payee;
@@ -15,6 +16,7 @@ export class Expenditure {
         if (!Expenditure.is(expenditure)) {
             throw Error("Invalid input.");
         }
+        this.fec_file_id = expenditure.fec_file_id;
         this.expenditure_id = expenditure.expenditure_id;
         this.date = expenditure.date;
         this.payee = expenditure.payee;
@@ -28,6 +30,7 @@ export class Expenditure {
     }
     static is(expenditure) {
         return (expenditure !== undefined &&
+            typeof expenditure.fec_file_id === "number" &&
             typeof expenditure.expenditure_id === "string" &&
             typeof expenditure.date === "string" &&
             typeof expenditure.payee === "string" &&

package/package.json

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

package/src/types/Candidate.ts

@@ -1,5 +1,7 @@
 import { Committee, CommitteeAux } from "./Committee"
 import { ElectionID, is_election_id, is_office_id, OfficeID } from "./Election"
+import { FECF24File } from "./FECF24File"
+import { FECF3File } from "./FECF3File"
 import { FECReport } from "./FECReport"
 import { is_state_id, StateID } from "./State"
 
@@ -93,8 +95,7 @@ export class Candidate {
 
 export class CandidateAux extends Candidate {
     readonly committees : CommitteeAux[]
-    readonly fec_reports : FECReport[]
-    // readonly fec_f3_files : FEC
+    readonly fec_f3_files : FECF3File[]
 
     constructor(candidate : any) {
         if (!CandidateAux.is(candidate)) {
@@ -102,7 +103,7 @@ export class CandidateAux extends Candidate {
         }
         super(candidate)
         this.committees = candidate.committees
-        this.fec_reports = candidate.fec_reports
+        this.fec_f3_files = candidate.fec_f3_files.map(fec_f3_file => new FECF3File(fec_f3_file))
     }
 
     static is(candidate : any) : candidate is CandidateAux {
@@ -110,8 +111,8 @@ export class CandidateAux extends Candidate {
             Candidate.is(candidate) &&
             Array.isArray(candidate.committees) &&
             candidate.committees.every(CommitteeAux.is) &&
-            Array.isArray(candidate.fec_reports) &&
-            candidate.fec_reports.every(FECReport.is)
+            Array.isArray(candidate.fec_f3_files) &&
+            candidate.fec_f3_files.every(FECF3File.is)
         )
     }
 }

package/src/types/ElectionsConfig.ts

@@ -22,6 +22,7 @@ export interface ElectionsConfig extends ElectionsUtilsConfig {
     dynamodb_elections : string,
     dynamodb_candidates : string,
     dynamodb_committees : string,
+    dynamodb_expenditures : string,
     dynamodb_users : string,
     dynamodb_user_elections : string,
     dynamodb_articles : string,

package/src/types/FECF24File.ts

@@ -2,6 +2,7 @@ import { ElectionID, is_election_id } from "./Election"
 import { FECFile } from "./FECFile"
 
 export class Expenditure {
+    readonly fec_file_id : number
     readonly expenditure_id : string
     readonly date : string
     readonly payee : string
@@ -17,6 +18,7 @@ export class Expenditure {
         if (!Expenditure.is(expenditure)) {
             throw Error("Invalid input.")
         }
+        this.fec_file_id = expenditure.fec_file_id
         this.expenditure_id = expenditure.expenditure_id
         this.date = expenditure.date
         this.payee = expenditure.payee
@@ -32,6 +34,7 @@ export class Expenditure {
     static is(expenditure : any) : expenditure is Expenditure {
         return (
             expenditure !== undefined &&
+            typeof expenditure.fec_file_id === "number" &&
             typeof expenditure.expenditure_id === "string" &&
             typeof expenditure.date === "string" &&
             typeof expenditure.payee === "string" &&