Notification Testing

.github/workflows/repo-checks.yml

@@ -60,3 +60,4 @@ jobs:
           tests/integration/auth.test.ts
           tests/integration/moderation.test.ts
           tests/integration/profile.test.ts
+          tests/integration/notifications.test.ts

components/db/bills.ts

@@ -1,11 +1,4 @@
-import {
-  collection,
-  getDocs,
-  limit,
-  orderBy,
-  Timestamp,
-  where
-} from "firebase/firestore"
+import { collection, getDocs, limit, orderBy, where } from "firebase/firestore"
 import { useAsync } from "react-async-hook"
 import type {
   BillHistory,
@@ -14,6 +7,7 @@ import type {
 import { firestore } from "../firebase"
 import { loadDoc, midnight, nullableQuery } from "./common"
 import { currentGeneralCourt } from "functions/src/shared"
+import { Timestamp } from "functions/src/firebase"
 export type { BillHistory } from "../../functions/src/bills/types"
 
 export type MemberReference = {
@@ -26,14 +20,14 @@ export type MemberReference = {
 
 export type BillContent = {
   Title: string
+  Pinslip: string | null
   BillNumber: string
   DocketNumber: string
   GeneralCourtNumber: number
-  PrimarySponsor?: MemberReference
+  PrimarySponsor: MemberReference | null
   Cosponsors: MemberReference[]
   LegislationTypeName: string
-  Pinslip: string
-  DocumentText: string
+  DocumentText?: string | null
 }
 
 export type BillTopic = {
@@ -51,10 +45,12 @@ export type Bill = {
   opposeCount: number
   neutralCount: number
   nextHearingAt?: Timestamp
+  nextHearingId?: string
   latestTestimonyAt?: Timestamp
   latestTestimonyId?: string
   fetchedAt: Timestamp
   history: BillHistory
+  similar: string[]
   currentCommittee?: CurrentCommittee
   city?: string
   topics?: BillTopic[]

components/shared/FollowingQueries.tsx

@@ -5,6 +5,7 @@ import {
   getDocs,
   query,
   setDoc,
+  Timestamp,
   where
 } from "firebase/firestore"
 import { Bill } from "../db"
@@ -89,15 +90,17 @@ export async function setFollow(
           billId: billId,
           court: courtId
         },
-        type: "bill"
+        type: "bill",
+        nextDigestAt: Timestamp.fromDate(new Date())
       })
     : await setDoc(doc(subscriptionRef, topicName), {
         topicName: topicName,
         uid: uid,
         userLookup: {
           profileId: profileId
         },
-        type: "testimony"
+        type: "testimony",
+        nextDigestAt: Timestamp.fromDate(new Date())
       })
 }
 

functions/src/bills/types.ts

@@ -40,13 +40,24 @@ export const CommitteeMember = Record({
     senateChair: Maybe(CommitteeMember)
   })
 
+export type MemberReference = Static<typeof MemberReference>
+export const MemberReference = Record({
+  Id: String,
+  Name: String,
+  Type: Number
+})
+
 export type BillContent = Static<typeof BillContent>
 export const BillContent = Record({
-  Pinslip: Nullable(String),
   Title: String,
-  PrimarySponsor: Nullable(Record({ Name: String })),
-  DocumentText: Maybe(String),
-  Cosponsors: Array(Record({ Name: Maybe(String) }))
+  Pinslip: Nullable(String),
+  BillNumber: String,
+  DocketNumber: String,
+  GeneralCourtNumber: Number,
+  PrimarySponsor: Nullable(MemberReference),
+  Cosponsors: Array(MemberReference),
+  LegislationTypeName: String,
+  DocumentText: Maybe(String)
 })
 
 export type BillTopic = Static<typeof BillTopic>

scripts/firebase-admin/generateBill.ts

@@ -22,7 +22,11 @@ export const script: Script = async ({ db, args }) => {
       Title: "",
       PrimarySponsor: null,
       DocumentText: "",
-      Cosponsors: []
+      Cosponsors: [],
+      BillNumber: "",
+      DocketNumber: "",
+      GeneralCourtNumber: 0,
+      LegislationTypeName: ""
     }
 
     const newBill: Bill = {

stories/organisms/SubmitTestimonyForm.stories.tsx

@@ -67,7 +67,7 @@ export const FormStory = {
             BillNumber: "",
             DocketNumber: "",
             GeneralCourtNumber: 0,
-            PrimarySponsor: undefined,
+            PrimarySponsor: null,
             Cosponsors: [],
             LegislationTypeName: "",
             Pinslip: "",
@@ -84,7 +84,8 @@ export const FormStory = {
           fetchedAt: Timestamp.fromDate(new Date()),
           history: [],
           currentCommittee: undefined,
-          city: undefined
+          city: undefined,
+          similar: []
         }}
         synced={false}
       />

stories/organisms/billDetail/BillSponsorCard.stories.tsx

@@ -98,7 +98,8 @@ const bill: Bill = {
       email: "[email protected]"
     }
   },
-  city: "Boston"
+  city: "Boston",
+  similar: []
 }
 
 Primary.args = {

stories/organisms/billDetail/BillTestimonyListCard.stories.tsx

@@ -47,7 +47,8 @@ export const Primary: Story = {
           Branch: "1",
           Action: "1"
         }
-      ]
+      ],
+      similar: []
     }
   },
   name: "BillTestimonyListCard",

stories/organisms/billDetail/MockBillData.tsx

@@ -88,5 +88,6 @@ export const bill: Bill = {
   },
   city: "Boston",
   topics: newBillTopics,
-  summary: "This is the summary"
+  summary: "This is the summary",
+  similar: []
 }

tests/integration/common.ts

@@ -35,7 +35,11 @@ export async function createNewBill(props?: Partial<Bill>) {
     Pinslip: null,
     Title: "fake",
     PrimarySponsor: null,
-    Cosponsors: []
+    Cosponsors: [],
+    BillNumber: "",
+    DocketNumber: "",
+    GeneralCourtNumber: 0,
+    LegislationTypeName: ""
   }
   const bill: Bill = {
     id: billId,
@@ -160,7 +164,11 @@ export const setNewProfile = (user: {
  * Returns functions to get, remove, and check where the testimony is.
  */
 
-export const createNewTestimony = async (uid: string, billId: string) => {
+export const createNewTestimony = async (
+  uid: string,
+  billId: string,
+  court: number = 193
+) => {
   const tid = nanoid(6)
 
   const currentUserEmail = auth.currentUser?.email
@@ -178,7 +186,7 @@ export const createNewTestimony = async (uid: string, billId: string) => {
     billId,
     publishedAt: testTimestamp.now(),
     updatedAt: testTimestamp.now(),
-    court: 192,
+    court: court,
     position: "oppose",
     content: "testimony content",
     public: true
@@ -332,8 +340,11 @@ export const testCreatePendingOrgWithEmailAndPassword = async (
   return userCreds
 }
 
-export const deleteUser = async (user: { uid: string }) => {
-  await testAuth.deleteUser(user.uid)
+export const deleteUser = async (uid: string) => {
+  const userDoc = await testDb.doc(`/users/${uid}`).get()
+  const userData = userDoc.data()
+  await testAuth.deleteUser(uid)
+  await testDb.doc(`/users/${uid}`).delete()
 }
 
 export const expectUser = async (