Store option IDs instead of EN labels in profiles and make keyword search match selected options

Author: MartinBraquet

android/app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.compassconnections.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 24
-        versionName "1.2.0"
+        versionCode 25
+        versionName "1.3.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

android/app/capacitor.build.gradle

@@ -2,8 +2,8 @@
 
 android {
   compileOptions {
-      sourceCompatibility JavaVersion.VERSION_21
-      targetCompatibility JavaVersion.VERSION_21
+      sourceCompatibility JavaVersion.VERSION_17
+      targetCompatibility JavaVersion.VERSION_17
   }
 }
 

backend/api/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@compass/api",
   "description": "Backend API endpoints",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "private": true,
   "scripts": {
     "watch:serve": "tsx watch src/serve.ts",

backend/api/src/get-profiles.ts

@@ -38,6 +38,7 @@ export type profileQueryType = {
   skipId?: string | undefined,
   orderBy?: string | undefined,
   lastModificationWithin?: string | undefined,
+  locale?: string | undefined,
 } & {
   [K in OptionTableKey]?: string[] | undefined
 }
@@ -82,6 +83,7 @@ export const loadProfiles = async (props: profileQueryType) => {
     orderBy: orderByParam = 'created_time',
     lastModificationWithin,
     skipId,
+    locale = 'en',
   } = props
 
   const filterLocation = lat && lon && radius
@@ -102,6 +104,10 @@ export const loadProfiles = async (props: profileQueryType) => {
 
   const userActivityJoin = 'user_activity on user_activity.user_id = profiles.user_id'
 
+  const joinInterests = !!interests?.length
+  const joinCauses = !!causes?.length
+  const joinWork = !!work?.length
+
   // Pre-aggregated interests per profile
   function getManyToManyJoin(label: OptionTableKey) {
     return `(
@@ -122,9 +128,9 @@ export const loadProfiles = async (props: profileQueryType) => {
   const joins = [
     orderByParam === 'last_online_time' && leftJoin(userActivityJoin),
     orderByParam === 'compatibility_score' && compatibleWithUserId && join(compatibilityScoreJoin),
-    interests && leftJoin(interestsJoin),
-    causes && leftJoin(causesJoin),
-    work && leftJoin(workJoin),
+    joinInterests && leftJoin(interestsJoin),
+    joinCauses && leftJoin(causesJoin),
+    joinWork && leftJoin(workJoin),
   ]
 
   const _orderBy = orderByParam === 'compatibility_score' ? 'cs.score' : `${tablePrefix}.${orderByParam}`
@@ -146,10 +152,23 @@ export const loadProfiles = async (props: profileQueryType) => {
       SELECT 1 FROM profile_${label}
       JOIN ${label} ON ${label}.id = profile_${label}.option_id
       WHERE profile_${label}.profile_id = profiles.id
-        AND ${label}.name = ANY (ARRAY[$(values)])
+        AND ${label}.id = ANY (ARRAY[$(values)])
       )`
   }
 
+  function getOptionClauseKeyword(label: OptionTableKey) {
+    return `EXISTS (
+      SELECT 1 FROM profile_${label}
+      JOIN ${label} ON ${label}.id = profile_${label}.option_id
+      LEFT JOIN ${label}_translations
+        ON ${label}_translations.option_id = profile_${label}.option_id
+          AND ${label}_translations.locale = $(locale)
+      WHERE profile_${label}.profile_id = profiles.id
+        AND lower(COALESCE(${label}_translations.name, ${label}.name)) ILIKE '%' || lower($(word)) || '%'
+    )`
+  }
+
+
   const filters = [
     where('looking_for_matches = true'),
     where(`profiles.disabled != true`),
@@ -160,8 +179,14 @@ export const loadProfiles = async (props: profileQueryType) => {
     where(`data->>'userDeleted' != 'true' or data->>'userDeleted' is null`),
 
     ...keywords.map(word => where(
-      `lower(users.name) ilike '%' || lower($(word)) || '%' or lower(bio::text) ilike '%' || lower($(word)) || '%' or bio_tsv @@ phraseto_tsquery('english', $(word))`,
-      {word}
+      `lower(users.name) ilike '%' || lower($(word)) || '%'
+       or lower(search_text) ilike '%' || lower($(word)) || '%'
+       or search_tsv @@ phraseto_tsquery('english', $(word))
+       OR ${getOptionClauseKeyword('interests')}
+       OR ${getOptionClauseKeyword('causes')}
+       OR ${getOptionClauseKeyword('work')}
+       `,
+      {word, locale}
     )),
 
     genders?.length && where(`gender = ANY($(genders))`, {genders}),
@@ -227,7 +252,7 @@ export const loadProfiles = async (props: profileQueryType) => {
       {religion}
     ),
 
-    interests?.length && where(getManyToManyClause('interests'), {values: interests}),
+    interests?.length && where(getManyToManyClause('interests'), {values: interests.map(Number)}),
 
     causes?.length && where(getManyToManyClause('causes'), {values: causes}),
 
@@ -278,9 +303,9 @@ export const loadProfiles = async (props: profileQueryType) => {
   } else if (orderByParam === 'last_online_time') {
     selectCols += ', user_activity.last_online_time'
   }
-  if (interests) selectCols += `, COALESCE(profile_interests.interests, '{}') AS interests`
-  if (causes) selectCols += `, COALESCE(profile_causes.causes, '{}') AS causes`
-  if (work) selectCols += `, COALESCE(profile_work.work, '{}') AS work`
+  if (joinInterests) selectCols += `, COALESCE(profile_interests.interests, '{}') AS interests`
+  if (joinCauses) selectCols += `, COALESCE(profile_causes.causes, '{}') AS causes`
+  if (joinWork) selectCols += `, COALESCE(profile_work.work, '{}') AS work`
 
   const query = renderSql(
     select(selectCols),

backend/api/src/update-options.ts

@@ -5,15 +5,22 @@ import {tryCatch} from 'common/util/try-catch'
 import {OPTION_TABLES} from "common/profiles/constants";
 
 export const updateOptions: APIHandler<'update-options'> = async (
-  {table, names},
+  {table, values},
   auth
 ) => {
   if (!OPTION_TABLES.includes(table)) throw new APIError(400, 'Invalid table')
-  if (!names || !Array.isArray(names) || names.length === 0) {
-    throw new APIError(400, 'No names provided')
+  if (!values || !Array.isArray(values)) {
+    throw new APIError(400, 'No ids provided')
   }
 
-  log('Updating profile options', {table, names})
+  const idsWithNumbers = values.map(id => {
+    const numberId = Number(id)
+    return isNaN(numberId) ? {isNumber: false, v: id} : {isNumber: true, v: numberId}
+  })
+  const names: string[] = idsWithNumbers.filter(item => !item.isNumber).map(item => item.v) as string[]
+  const ids: number[] = idsWithNumbers.filter(item => item.isNumber).map(item => item.v) as number[]
+
+  log('Updating profile options', {table, ids, names})
 
   const pg = createSupabaseDirectClient()
 
@@ -25,8 +32,20 @@ export const updateOptions: APIHandler<'update-options'> = async (
   const profileId = profileIdResult.id
 
   const result = await tryCatch(pg.tx(async (t) => {
-    const ids: number[] = []
-    for (const name of names) {
+    const currentOptionsResult = await t.manyOrNone<{ id: string }>(
+      `SELECT option_id as id
+       FROM profile_${table}
+       WHERE profile_id = $1`,
+      [profileId]
+    )
+    const currentOptions = currentOptionsResult.map(row => row.id)
+    if (currentOptions.sort().join(',') === ids.sort().join(',') && !names?.length) {
+      log(`Skipping /update-${table} because they are already the same`)
+      return undefined
+    }
+
+    // Add new options
+    for (const name of (names || [])) {
       const row = await t.one<{ id: number }>(
         `INSERT INTO ${table} (name, creator_id)
          VALUES ($1, $2)

backend/email/emails/functions/mock.ts

@@ -110,6 +110,8 @@ export const sinclairProfile: ProfileRow = {
   },
   bio_text: 'the futa in futarchy',
   bio_tsv: 'the futa in futarchy',
+  search_text: 'the futa in futarchy',
+  search_tsv: 'the futa in futarchy',
   age: 25,
 }
 
@@ -221,5 +223,7 @@ export const jamesProfile: ProfileRow = {
   },
   bio_text: 'the futa in futarchy',
   bio_tsv: 'the futa in futarchy',
+  search_text: 'the futa in futarchy',
+  search_tsv: 'the futa in futarchy',
   age: 32,
 }

backend/supabase/causes_translations.sql

@@ -0,0 +1,25 @@
+CREATE TABLE IF NOT EXISTS causes_translations
+(
+    option_id BIGINT NOT NULL REFERENCES causes (id) ON DELETE CASCADE,
+    locale    TEXT   NOT NULL, -- 'en', 'fr', 'de', etc.
+    name      TEXT   NOT NULL,
+    PRIMARY KEY (option_id, locale)
+);
+
+-- Row Level Security
+ALTER TABLE causes_translations
+    ENABLE ROW LEVEL SECURITY;
+
+DROP POLICY IF EXISTS "public read" ON causes_translations;
+CREATE POLICY "public read" ON causes_translations
+    FOR SELECT USING (true);
+
+CREATE INDEX idx_causes_translations_option_locale
+    ON causes_translations (option_id, locale);
+
+CREATE EXTENSION IF NOT EXISTS pg_trgm;
+
+CREATE INDEX idx_causes_translations_name_trgm
+    ON causes_translations
+        USING GIN (name gin_trgm_ops);
+

backend/supabase/interests_translations.sql

@@ -0,0 +1,27 @@
+CREATE TABLE IF NOT EXISTS interests_translations
+(
+    option_id BIGINT NOT NULL REFERENCES interests (id) ON DELETE CASCADE,
+    locale    TEXT   NOT NULL, -- 'en', 'fr', 'de', etc.
+    name      TEXT   NOT NULL,
+    PRIMARY KEY (option_id, locale)
+);
+
+-- Row Level Security
+ALTER TABLE interests_translations
+    ENABLE ROW LEVEL SECURITY;
+
+DROP POLICY IF EXISTS "public read" ON interests_translations;
+CREATE POLICY "public read" ON interests_translations
+    FOR SELECT USING (true);
+
+DROP INDEX IF EXISTS idx_interests_translations_option_locale;
+CREATE INDEX idx_interests_translations_option_locale
+    ON interests_translations (option_id, locale);
+
+CREATE EXTENSION IF NOT EXISTS pg_trgm;
+
+DROP INDEX IF EXISTS idx_interests_translations_name_trgm;
+CREATE INDEX idx_interests_translations_name_trgm
+    ON interests_translations
+        USING GIN (name gin_trgm_ops);
+

backend/supabase/migration.sql

@@ -1,4 +1,5 @@
 BEGIN;
+\i backend/supabase/rebuild_profile_search.sql
 \i backend/supabase/functions.sql
 \i backend/supabase/firebase.sql
 \i backend/supabase/profiles.sql

backend/supabase/profile_causes.sql

@@ -21,3 +21,27 @@ CREATE INDEX idx_profile_causes_profile
 
 CREATE INDEX idx_profile_causes_interest
     ON profile_causes (option_id);
+
+-- Trigger to update /get-profiles search
+CREATE OR REPLACE FUNCTION trg_profile_causes_rebuild_search()
+    RETURNS trigger AS
+$$
+BEGIN
+    PERFORM rebuild_profile_search(
+            COALESCE(NEW.profile_id, OLD.profile_id)
+            );
+    RETURN NULL;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER trg_profile_causes_search_ins
+    AFTER INSERT
+    ON profile_causes
+    FOR EACH ROW
+EXECUTE FUNCTION trg_profile_causes_rebuild_search();
+
+CREATE TRIGGER trg_profile_causes_search_del
+    AFTER DELETE
+    ON profile_causes
+    FOR EACH ROW
+EXECUTE FUNCTION trg_profile_causes_rebuild_search();