Merge remote-tracking branch 'origin/main' into chore/add-intercom

Signed-off-by: Joana Maia <jmaia@contractor.linuxfoundation.org>

Author: joanagmaia

backend/src/api/public/v1/members/project-affiliations/patchProjectAffiliation.ts

@@ -26,9 +26,9 @@ const paramsSchema = z.object({
   projectId: z.uuid(),
 })
 
-const bodySchema = z.object({
-  affiliations: z
-    .array(
+const bodySchema = z
+  .object({
+    affiliations: z.array(
       z
         .object({
           organizationId: z.uuid(),
@@ -38,10 +38,13 @@ const bodySchema = z.object({
         .refine((a) => a.dateEnd == null || a.dateEnd >= a.dateStart, {
           message: 'dateEnd must be greater than or equal to dateStart',
         }),
-    )
-    .min(1),
-  verifiedBy: z.string().max(255),
-})
+    ),
+    verifiedBy: z.string().max(255).optional(),
+  })
+  .refine((b) => b.affiliations.length === 0 || b.verifiedBy != null, {
+    message: 'verifiedBy is required when affiliations is non-empty',
+    path: ['verifiedBy'],
+  })
 
 export async function patchProjectAffiliation(req: Request, res: Response): Promise<void> {
   const { memberId, projectId } = validateOrThrow(paramsSchema, req.params)
@@ -75,17 +78,19 @@ export async function patchProjectAffiliation(req: Request, res: Response): Prom
       await qx.tx(async (tx) => {
         await deleteAllMemberSegmentAffiliationsForProject(tx, memberId, projectId)
 
-        await insertMemberSegmentAffiliations(
-          tx,
-          memberId,
-          projectId,
-          affiliations.map((a) => ({
-            organizationId: a.organizationId,
-            dateStart: a.dateStart.toISOString(),
-            dateEnd: a.dateEnd?.toISOString() ?? null,
-            verifiedBy,
-          })),
-        )
+        if (affiliations.length > 0) {
+          await insertMemberSegmentAffiliations(
+            tx,
+            memberId,
+            projectId,
+            affiliations.map((a) => ({
+              organizationId: a.organizationId,
+              dateStart: a.dateStart.toISOString(),
+              dateEnd: a.dateEnd?.toISOString() ?? null,
+              verifiedBy: verifiedBy!,
+            })),
+          )
+        }
 
         const oldOrgIds = existingAffiliations.map((a) => a.organizationId)
         const newOrgIds = affiliations.map((a) => a.organizationId)

backend/src/database/migrations/U1774363114__add-btree-index-for-member-identities-email-lookup.sql

@@ -0,0 +1 @@
+DROP INDEX CONCURRENTLY IF EXISTS "idx_memberIdentities_verified_email_lower_value";

backend/src/database/migrations/V1772556158__addTncActivityTypes.sql

@@ -0,0 +1,6 @@
+INSERT INTO "activityTypes" ("activityType", platform, "isCodeContribution", "isCollaboration", description, "label") VALUES
+('enrolled-certification', 'tnc', false, false, 'Successful payment purchase of certification enrollment', 'Enrolled in certification'),
+('enrolled-training', 'tnc', false, false, 'Successful payment purchase of training enrollment', 'Enrolled in training'),
+('issued-certification', 'tnc', false, false, 'User is granted a certification', 'Issued certification'),
+('attempted-course', 'tnc', false, false, 'Certification course is completed', 'Attempted course'),
+('attempted-exam', 'tnc', false, false, 'Certification exam is completed', 'Attempted exam');

backend/src/database/migrations/V1774363114__add-btree-index-for-member-identities-email-lookup.sql

@@ -0,0 +1,20 @@
+-- The existing idx_memberIdentities_email_verified_trgm covers the right partial
+-- conditions (verified = true, type = 'email', deletedAt IS NULL) but is a GIN
+-- trigram index -- PostgreSQL will not use it for equality joins on
+-- lower(mi.value) against input emails, for example:
+--
+--   JOIN ON lower(mi.value) = input_email
+--   WHERE mi.verified = true AND mi.type = 'email' AND mi."deletedAt" IS NULL
+--
+-- The only usable B-tree index (idx_memberIdentities_lower_value) only carries
+-- the partial condition deletedAt IS NULL, so PG must heap-fetch every matched
+-- row to re-check verified and type, which degrades as the table grows.
+--
+-- This B-tree partial index lets the planner do a direct nested-loop index scan
+-- (one lookup per input email) with no extra heap fetches for verified/type.
+
+CREATE INDEX CONCURRENTLY IF NOT EXISTS "idx_memberIdentities_verified_email_lower_value"
+    ON "memberIdentities" (lower(value))
+    WHERE verified = true
+      AND type = 'email'
+      AND "deletedAt" IS NULL;