refactor: nitpicks after self pr review

Signed-off-by: Yeganathan S <63534555+skwowet@users.noreply.github.com>

Author: skwowet

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

@@ -10,7 +10,7 @@ import {
   fetchMemberSegmentAffiliationsForProject,
   findMaintainerRoles,
   findMemberById,
-  insertMemberSegmentAffiliations,
+  insertVerifiedMemberSegmentAffiliations,
 } from '@crowd/data-access-layer'
 import type { ISegmentAffiliationWithOrg } from '@crowd/data-access-layer'
 import { deleteMemberSegmentAffiliations } from '@crowd/data-access-layer/src/member_segment_affiliations'
@@ -83,7 +83,7 @@ export async function patchProjectAffiliation(req: Request, res: Response): Prom
         await deleteMemberSegmentAffiliations(tx, { memberId, segmentId: projectId })
 
         if (affiliations.length > 0) {
-          await insertMemberSegmentAffiliations(
+          await insertVerifiedMemberSegmentAffiliations(
             tx,
             memberId,
             projectId,

services/libs/data-access-layer/src/member-organization-affiliation/index.ts

@@ -539,17 +539,7 @@ export async function changeMemberOrganizationAffiliationOverrides(
     return returnRows ? [] : undefined
   }
 
-  type OverrideWriteRow = {
-    id: string
-    memberId: string
-    memberOrganizationId: string
-    allowAffiliation: boolean | null
-    isPrimaryWorkExperience: boolean | null
-    setAllowAffiliation: boolean
-    setIsPrimaryWorkExperience: boolean
-  }
-
-  const rows: OverrideWriteRow[] = []
+  const rows: IMemberOrganizationAffiliationOverride[] = []
 
   for (const d of data) {
     if (
@@ -564,11 +554,8 @@ export async function changeMemberOrganizationAffiliationOverrides(
       id: d.id ?? uuid(),
       memberId: d.memberId,
       memberOrganizationId: d.memberOrganizationId,
-      // undefined → null on insert; explicit null stays null
-      allowAffiliation: d.allowAffiliation ?? null,
-      isPrimaryWorkExperience: d.isPrimaryWorkExperience ?? null,
-      setAllowAffiliation: d.allowAffiliation !== undefined,
-      setIsPrimaryWorkExperience: d.isPrimaryWorkExperience !== undefined,
+      allowAffiliation: d.allowAffiliation,
+      isPrimaryWorkExperience: d.isPrimaryWorkExperience,
     })
   }
 
@@ -580,13 +567,11 @@ export async function changeMemberOrganizationAffiliationOverrides(
     .map(
       (_, i) => `
         (
-          $(id_${i})::uuid,
-          $(memberId_${i})::uuid,
-          $(memberOrganizationId_${i})::uuid,
-          $(allowAffiliation_${i})::boolean,
-          $(isPrimaryWorkExperience_${i})::boolean,
-          $(setAllowAffiliation_${i})::boolean,
-          $(setIsPrimaryWorkExperience_${i})::boolean
+          $(id_${i}),
+          $(memberId_${i}),
+          $(memberOrganizationId_${i}),
+          $(allowAffiliation_${i}),
+          $(isPrimaryWorkExperience_${i})
         )
       `,
     )
@@ -599,61 +584,24 @@ export async function changeMemberOrganizationAffiliationOverrides(
       acc[`memberOrganizationId_${i}`] = row.memberOrganizationId
       acc[`allowAffiliation_${i}`] = row.allowAffiliation
       acc[`isPrimaryWorkExperience_${i}`] = row.isPrimaryWorkExperience
-      acc[`setAllowAffiliation_${i}`] = row.setAllowAffiliation
-      acc[`setIsPrimaryWorkExperience_${i}`] = row.setIsPrimaryWorkExperience
       return acc
     },
     {} as Record<string, unknown>,
   )
 
-  // CTE carries per-row "was this field provided?" flags so ON CONFLICT can
-  // distinguish omit (keep existing) from explicit null (clear).
   const query = `
-      WITH input (
-        id,
-        "memberId",
-        "memberOrganizationId",
-        "allowAffiliation",
-        "isPrimaryWorkExperience",
-        "setAllowAffiliation",
-        "setIsPrimaryWorkExperience"
-      ) AS (
-        VALUES ${valuesSql}
-      )
       INSERT INTO "memberOrganizationAffiliationOverrides" (
         id,
         "memberId",
         "memberOrganizationId",
         "allowAffiliation",
         "isPrimaryWorkExperience"
       )
-      SELECT
-        id,
-        "memberId",
-        "memberOrganizationId",
-        "allowAffiliation",
-        "isPrimaryWorkExperience"
-      FROM input
+      VALUES ${valuesSql}
       ON CONFLICT ("memberId", "memberOrganizationId")
       DO UPDATE SET
-        "allowAffiliation" = CASE
-          WHEN (
-            SELECT i."setAllowAffiliation"
-            FROM input i
-            WHERE i."memberId" = EXCLUDED."memberId"
-              AND i."memberOrganizationId" = EXCLUDED."memberOrganizationId"
-          ) THEN EXCLUDED."allowAffiliation"
-          ELSE "memberOrganizationAffiliationOverrides"."allowAffiliation"
-        END,
-        "isPrimaryWorkExperience" = CASE
-          WHEN (
-            SELECT i."setIsPrimaryWorkExperience"
-            FROM input i
-            WHERE i."memberId" = EXCLUDED."memberId"
-              AND i."memberOrganizationId" = EXCLUDED."memberOrganizationId"
-          ) THEN EXCLUDED."isPrimaryWorkExperience"
-          ELSE "memberOrganizationAffiliationOverrides"."isPrimaryWorkExperience"
-        END
+        "allowAffiliation" = COALESCE(EXCLUDED."allowAffiliation", "memberOrganizationAffiliationOverrides"."allowAffiliation"),
+        "isPrimaryWorkExperience" = COALESCE(EXCLUDED."isPrimaryWorkExperience", "memberOrganizationAffiliationOverrides"."isPrimaryWorkExperience")
       ${returnRows ? 'RETURNING *' : ''}
     `
 

services/libs/data-access-layer/src/member_segment_affiliations/index.ts

@@ -81,19 +81,19 @@ export async function findMemberAffiliations(
   )
 }
 
-export async function insertMemberSegmentAffiliationRows(
+export async function insertMemberSegmentAffiliations(
   qx: QueryExecutor,
   affiliations: MemberSegmentAffiliationDbInsert[],
   failOnConflict: boolean,
   returnRows: true,
 ): Promise<MemberSegmentAffiliationDbRow[]>
-export async function insertMemberSegmentAffiliationRows(
+export async function insertMemberSegmentAffiliations(
   qx: QueryExecutor,
   affiliations: MemberSegmentAffiliationDbInsert[],
   failOnConflict?: boolean,
   returnRows?: false,
 ): Promise<number>
-export async function insertMemberSegmentAffiliationRows(
+export async function insertMemberSegmentAffiliations(
   qx: QueryExecutor,
   affiliations: MemberSegmentAffiliationDbInsert[],
   failOnConflict = false,
@@ -116,14 +116,10 @@ export async function insertMemberSegmentAffiliationRows(
       'verifiedBy',
     ],
     affiliations.map((a) => ({
+      ...a,
       id: a.id ?? generateUUIDv1(),
-      memberId: a.memberId,
-      segmentId: a.segmentId,
-      organizationId: a.organizationId ?? null,
-      dateStart: a.dateStart ?? null,
-      dateEnd: a.dateEnd ?? null,
+      // NOT NULL column — must set explicitly while listed in INSERT, else undefined → NULL
       verified: a.verified ?? false,
-      verifiedBy: a.verifiedBy ?? null,
     })),
     failOnConflict ? undefined : 'DO NOTHING',
     returnRows,
@@ -136,10 +132,10 @@ export async function insertMemberSegmentAffiliationRows(
   return qx.result(query)
 }
 
-/** @deprecated Prefer `insertMemberSegmentAffiliationRows` with full insert payloads. */
+/** @deprecated Prefer `insertMemberSegmentAffiliations` with full insert payloads. */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export async function insertMemberAffiliations(qx: QueryExecutor, memberId: string, data: any[]) {
-  return insertMemberSegmentAffiliationRows(
+  return insertMemberSegmentAffiliations(
     qx,
     data.map((item) => ({
       memberId,

services/libs/data-access-layer/src/members/base.ts

@@ -758,18 +758,6 @@ export async function createMember(qx: QueryExecutor, data: MemberDbInsert): Pro
   const ts = new Date()
   const dbInstance = getDbInstance()
 
-  // Omit `score` when unset so Postgres keeps DEFAULT -1 (undefined would insert NULL).
-  let columns = MEMBER_INSERT_COLUMNS
-  if (data.score === undefined) {
-    columns = MEMBER_INSERT_COLUMNS.filter((column) => column !== 'score')
-  }
-
-  const columnSet = new dbInstance.helpers.ColumnSet(columns, {
-    table: {
-      table: 'members',
-    },
-  })
-
   const dbData: Record<string, unknown> = {
     ...data,
     id,
@@ -779,6 +767,16 @@ export async function createMember(qx: QueryExecutor, data: MemberDbInsert): Pro
     updatedAt: ts,
   }
 
+  // Omit unset columns so Postgres DEFAULT applies (listing a column with
+  // undefined/null bypasses DEFAULT and inserts NULL instead).
+  const columns = MEMBER_INSERT_COLUMNS.filter((column) => dbData[column] !== undefined)
+
+  const columnSet = new dbInstance.helpers.ColumnSet(columns, {
+    table: {
+      table: 'members',
+    },
+  })
+
   if (Array.isArray(dbData.contributions)) {
     dbData.contributions = JSON.stringify(dbData.contributions)
   }

services/libs/data-access-layer/src/members/projectAffiliations.ts

@@ -129,10 +129,9 @@ export interface ISegmentAffiliationInsert {
 }
 
 /**
- * Insert multiple segment affiliations for a member + project (segment) combination.
- * All inserted affiliations are marked as verified.
+ * Insert multiple verified segment affiliations for a member + project (segment) combination.
  */
-export async function insertMemberSegmentAffiliations(
+export async function insertVerifiedMemberSegmentAffiliations(
   qx: QueryExecutor,
   memberId: string,
   segmentId: string,

services/libs/test-kit/src/factories/member-organization-affiliation-override.ts

@@ -5,7 +5,7 @@ import type {
   MemberOrganizationAffiliationOverrideDbRow,
 } from '@crowd/types'
 
-export async function createMemberOrganizationAffiliationOverrides(
+export async function upsertMemberOrganizationAffiliationOverrides(
   qx: QueryExecutor,
   data: MemberOrganizationAffiliationOverrideDbInsert[],
 ): Promise<MemberOrganizationAffiliationOverrideDbRow[]> {
@@ -19,8 +19,8 @@ export async function createMemberOrganizationAffiliationOverrides(
       id: row.id,
       memberId: row.memberId,
       memberOrganizationId: row.memberOrganizationId,
-      allowAffiliation: row.allowAffiliation,
-      isPrimaryWorkExperience: row.isPrimaryWorkExperience,
+      allowAffiliation: row.allowAffiliation ?? undefined,
+      isPrimaryWorkExperience: row.isPrimaryWorkExperience ?? undefined,
     })),
     true,
   )

services/libs/test-kit/src/factories/member-segment-affiliation.ts

@@ -1,4 +1,4 @@
-import { insertMemberSegmentAffiliationRows } from '@crowd/data-access-layer'
+import { insertMemberSegmentAffiliations } from '@crowd/data-access-layer'
 import type { QueryExecutor } from '@crowd/database'
 import type { MemberSegmentAffiliationDbInsert, MemberSegmentAffiliationDbRow } from '@crowd/types'
 
@@ -10,5 +10,5 @@ export async function createMemberSegmentAffiliations(
     return []
   }
 
-  return insertMemberSegmentAffiliationRows(qx, data, true, true)
+  return insertMemberSegmentAffiliations(qx, data, true, true)
 }

services/libs/types/src/members.ts

@@ -228,8 +228,8 @@ export interface IMemberOpensearch {
 
 export interface IChangeAffiliationOverrideData {
   id?: string
-  allowAffiliation?: boolean | null
-  isPrimaryWorkExperience?: boolean | null
+  allowAffiliation?: boolean
+  isPrimaryWorkExperience?: boolean
   memberOrganizationId: string
   memberId: string
 }