[Syncing] Small PR to lay foundations for Testing filtering and to sync with upstream

.github/workflows/cd-api.yml

@@ -1,7 +1,7 @@
 name: API Release
 on:
   push:
-    branches: [ main, master ]
+    branches: [main, master]
     paths:
       - 'backend/api/package.json'
       - '.github/workflows/cd-api.yml'

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   lint:

backend/email/emails/new-endorsement.tsx

@@ -1,16 +1,7 @@
-import {
-  Body,
-  Button,
-  Container,
-  Head,
-  Html,
-  Preview,
-  Section,
-  Text,
-} from '@react-email/components'
+import {Body, Button, Container, Head, Html, Preview, Section, Text} from '@react-email/components'
 import {DOMAIN} from 'common/envs/constants'
 import {type User} from 'common/user'
-import { container, content, Footer, main} from 'email/utils'
+import {container, content, Footer, main} from 'email/utils'
 import React from 'react'
 import {createT} from 'shared/locale'
 

backend/email/emails/new-message.tsx

@@ -13,7 +13,7 @@ import {ANDROID_APP_URL} from 'common/constants'
 import {DOMAIN} from 'common/envs/constants'
 import {type ProfileRow} from 'common/profiles/profile'
 import {type User} from 'common/user'
-import { container, content, Footer, main} from 'email/utils'
+import {container, content, Footer, main} from 'email/utils'
 import React from 'react'
 import {createT} from 'shared/locale'
 

common/src/choices.ts

@@ -339,3 +339,7 @@ export type SubstanceIntentionTuple = {
 export type SubstancePreferenceTuple = {
   [K in keyof typeof SUBSTANCE_PREFERENCE_CHOICES]: [K, (typeof SUBSTANCE_PREFERENCE_CHOICES)[K]]
 }[keyof typeof SUBSTANCE_PREFERENCE_CHOICES]
+
+export type LastActiveTuple = {
+  [K in keyof typeof LAST_ONLINE_CHOICES]: [K, (typeof LAST_ONLINE_CHOICES)[K]]
+}[keyof typeof LAST_ONLINE_CHOICES]

tests/e2e/backend/utils/userInformation.ts

@@ -7,9 +7,13 @@ import {
   PSYCHEDELICS_CHOICES,
   RACE_CHOICES,
   RELATIONSHIP_CHOICES,
+  RELATIONSHIP_STATUS_CHOICES,
+  ROMANTIC_CHOICES,
   RELIGION_CHOICES,
+  LANGUAGE_CHOICES,
   SUBSTANCE_INTENTION_CHOICES,
   SUBSTANCE_PREFERENCE_CHOICES,
+  MBTI_CHOICES,
 } from 'common/choices'
 
 class UserAccountInformationForSeeding {
@@ -30,8 +34,13 @@ class UserAccountInformationForSeeding {
     min: faker.number.int({min: 18, max: 27}),
     max: faker.number.int({min: 36, max: 68}),
   }
-
+  has_kids = faker.number.int({min: 0, max: 5})
+  wants_kids_strength = faker.number.int({min: 0, max: 4})
+  is_smoker = faker.datatype.boolean()
+  relationship_status = Object.values(RELATIONSHIP_STATUS_CHOICES)
   pref_relation_styles = Object.values(RELATIONSHIP_CHOICES)
+  pref_romantic_styles = Object.values(ROMANTIC_CHOICES)
+  languages = Object.values(LANGUAGE_CHOICES)
   political_beliefs = Object.values(POLITICAL_CHOICES)
   religion = Object.values(RELIGION_CHOICES)
   diet = Object.values(DIET_CHOICES)
@@ -42,13 +51,20 @@ class UserAccountInformationForSeeding {
   company = faker.company.name()
   occupation_title = faker.person.jobTitle()
   university = faker.company.name()
+  keywords = faker.lorem.word()
 
   cannabis = Object.values(CANNABIS_CHOICES)
   psychedelics = Object.values(PSYCHEDELICS_CHOICES)
   cannabis_intention = Object.values(SUBSTANCE_INTENTION_CHOICES)
   cannabis_pref = Object.values(SUBSTANCE_PREFERENCE_CHOICES)
   psychedelics_intention = Object.values(SUBSTANCE_INTENTION_CHOICES)
   psychedelics_pref = Object.values(SUBSTANCE_PREFERENCE_CHOICES)
+  mbti = Object.values(MBTI_CHOICES)
+  big5_openness = faker.number.int({min: 0, max: 100})
+  big5_conscientiousness = faker.number.int({min: 0, max: 100})
+  big5_extraversion = faker.number.int({min: 0, max: 100})
+  big5_agreeableness = faker.number.int({min: 0, max: 100})
+  big5_neuroticism = faker.number.int({min: 0, max: 100})
 
   randomElement(array: Array<string>) {
     return array[Math.floor(Math.random() * array.length)].toLowerCase()

tests/e2e/utils/firebaseUtils.ts

@@ -78,7 +78,10 @@ export async function deleteAccount(idToken: any) {
  * Check if a Firebase user exists by email
  * Returns userId if exists, undefined if not found
  */
-export async function firebaseUserExists(email: string, password: string): Promise<string | undefined> {
+export async function firebaseUserExists(
+  email: string,
+  password: string,
+): Promise<string | undefined> {
   try {
     const login = await firebaseLoginEmailPassword(email, password)
     return login.data.localId

tests/e2e/utils/seedDatabase.ts

@@ -1,3 +1,4 @@
+import {faker} from '@faker-js/faker'
 import {debug} from 'common/logger'
 import {PrivateUser} from 'common/user'
 import {getDefaultNotificationPreferences} from 'common/user-notification-preferences'
@@ -37,40 +38,72 @@ export async function seedDbUser(
       },
     ],
   }
+  const relationshipStyle = userInfo.randomElement(userInfo.pref_relation_styles)
+  let romanticStyle: string | null = null
+  if (relationshipStyle === 'relationship') {
+    romanticStyle = userInfo.randomElement(userInfo.pref_romantic_styles)
+  }
+
+  const numberOfLanguages = faker.number.int({min: 1, max: 3})
+  let languagesKnown = []
+
+  for (let i = 0; i < numberOfLanguages; i++) {
+    languagesKnown.push(userInfo.randomElement(userInfo.languages))
+  }
+
+  const keywords = faker.number.int({min: 1, max: 4})
+  let profileKeywords = []
+  for (let i = 0; i < keywords; i++) {
+    profileKeywords.push(userInfo.keywords)
+  }
+
   const basicProfile = {
     user_id: userId,
     bio_length: userInfo.bio.length,
     bio: bio,
     age: userInfo.age,
+    gender: userInfo.randomElement(userInfo.gender),
+    ethnicity: [userInfo.randomElement(userInfo.ethnicity)],
+    height_in_inches: userInfo.height_in_inches,
+    pref_gender: [userInfo.randomElement(userInfo.pref_gender)],
+    pref_relation_styles: [relationshipStyle],
+    relationship_status: [userInfo.randomElement(userInfo.relationship_status)],
+    pref_romantic_styles: romanticStyle ? [romanticStyle] : [],
+    pref_age_min: userInfo.pref_age.min,
+    pref_age_max: userInfo.pref_age.max,
     born_in_location: userInfo.born_in_location,
     company: userInfo.company,
+    occupation_title: userInfo.occupation_title,
+    religion: [userInfo.randomElement(userInfo.religion)],
+    has_kids: userInfo.has_kids,
+    wants_kids_strength: userInfo.wants_kids_strength,
+    is_smoker: userInfo.is_smoker,
   }
 
   const mediumProfile = {
     ...basicProfile,
     drinks_per_month: userInfo.drinks_per_month,
     diet: [userInfo.randomElement(userInfo.diet)],
     education_level: userInfo.randomElement(userInfo.education_level),
-    ethnicity: [userInfo.randomElement(userInfo.ethnicity)],
-    gender: userInfo.randomElement(userInfo.gender),
-    height_in_inches: userInfo.height_in_inches,
-    pref_gender: [userInfo.randomElement(userInfo.pref_gender)],
-    pref_age_min: userInfo.pref_age.min,
-    pref_age_max: userInfo.pref_age.max,
+    languages: languagesKnown,
+    keywords: profileKeywords,
   }
 
   const fullProfile = {
     ...mediumProfile,
-    occupation_title: userInfo.occupation_title,
     cannabis: userInfo.randomElement(userInfo.cannabis),
     psychedelics: userInfo.randomElement(userInfo.psychedelics),
     cannabis_intention: [userInfo.randomElement(userInfo.cannabis_intention)],
     psychedelics_intention: [userInfo.randomElement(userInfo.psychedelics_intention)],
     cannabis_pref: [userInfo.randomElement(userInfo.cannabis_pref)],
     psychedelics_pref: [userInfo.randomElement(userInfo.psychedelics_pref)],
     political_beliefs: [userInfo.randomElement(userInfo.political_beliefs)],
-    pref_relation_styles: [userInfo.randomElement(userInfo.pref_relation_styles)],
-    religion: [userInfo.randomElement(userInfo.religion)],
+    mbti: userInfo.randomElement(userInfo.mbti),
+    big5_openness: userInfo.big5_openness,
+    big5_conscientiousness: userInfo.big5_conscientiousness,
+    big5_extraversion: userInfo.big5_extraversion,
+    big5_agreeableness: userInfo.big5_agreeableness,
+    big5_neuroticism: userInfo.big5_neuroticism,
   }
 
   const profileData =

tests/e2e/web/pages/app.ts

@@ -10,6 +10,8 @@ import {ProfilePage} from './profilePage'
 import {SettingsPage} from './settingsPage'
 import {SignUpPage} from './signUpPage'
 import {SocialPage} from './socialPage'
+import {PeoplePage} from './peoplePage'
+import {NotificationPage} from './notificationsPage'
 
 export class App {
   readonly auth: AuthPage
@@ -21,6 +23,8 @@ export class App {
   readonly settings: SettingsPage
   readonly signUp: SignUpPage
   readonly social: SocialPage
+  readonly people: PeoplePage
+  readonly notifs: NotificationPage
 
   constructor(public readonly page: Page) {
     this.auth = new AuthPage(page)
@@ -32,6 +36,8 @@ export class App {
     this.settings = new SettingsPage(page)
     this.signUp = new SignUpPage(page)
     this.social = new SocialPage(page)
+    this.people = new PeoplePage(page)
+    this.notifs = new NotificationPage(page)
   }
 
   async deleteProfileFromSettings() {

tests/e2e/web/pages/authPage.ts

@@ -55,8 +55,10 @@ export class AuthPage {
     await popup.getByLabel('Email').fill(email)
     if (display_name) await popup.getByLabel('Display name').fill(display_name)
     if (username) await popup.getByLabel('Screen name', {exact: true}).fill(username)
-    await popup.getByText('Sign in with Google.com', {exact: true}).click()
-    await popup.waitForEvent('close')
+    await Promise.all([
+      popup.waitForEvent('close'),
+      popup.getByText('Sign in with Google.com', {exact: true}).click(),
+    ])
   }
 
   async clickSignUpWithEmailButton() {

tests/e2e/web/pages/notificationsPage.ts

@@ -0,0 +1,11 @@
+import {expect, Locator, Page} from '@playwright/test'
+
+export class NotificationPage {
+  private readonly notificationTab: Locator
+  private readonly settingsTab: Locator
+
+  constructor(public readonly page: Page) {
+    this.notificationTab = page.getByTestId('notifications-tab')
+    this.settingsTab = page.getByTestId('settings-tab')
+  }
+}