Merge pull request #105 from topcoder-platform/PM-5073_talent-search

PM-5073 - Allow search by preferred roles, remove restriction about skills

Author: vas3a

src/reports/member/dto/member-search.dto.ts

@@ -83,6 +83,17 @@ export class MemberSearchBodyDto {
   @IsBoolean()
   profileComplete?: boolean;
 
+  @ApiPropertyOptional({
+    description:
+      "Filter by multiple preferred role values from the member's open-to-work personalization trait.",
+    type: [String],
+    example: ["AI_ML_ENGINEER", "FULL_STACK_DEVELOPER"],
+  })
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  preferredRoles?: string[];
+
   @ApiPropertyOptional({
     description:
       "Filter by multiple country names or country codes (case-insensitive).",

src/reports/member/member-search.service.ts

@@ -422,6 +422,7 @@ ORDER BY
       verifiedProfile,
       profileComplete,
       countries,
+      preferredRoles,
       sortBy = "matchIndex",
       sortOrder = "desc",
       page = 1,
@@ -593,6 +594,14 @@ member_address AS (
         ]
       : [];
 
+    const normalizedPreferredRoles = Array.isArray(preferredRoles)
+      ? [
+          ...new Set(
+            preferredRoles.map((value) => String(value).trim()).filter(Boolean),
+          ),
+        ]
+      : [];
+
     if (normalizedCountries.length > 0) {
       const pCountries = p(normalizedCountries);
       where.push(
@@ -604,6 +613,30 @@ member_address AS (
       );
     }
 
+    if (normalizedPreferredRoles.length > 0) {
+      const pPreferredRoles = p(
+        normalizedPreferredRoles.map((value) => value.toUpperCase()),
+      );
+      where.push(
+        `EXISTS (
+          SELECT 1
+          FROM members."memberTraits" mtpr
+          INNER JOIN members."memberTraitPersonalization" mtpp
+            ON mtpp."memberTraitId" = mtpr.id
+          WHERE mtpr."userId" = m."userId"
+            AND mtpp.key = 'openToWork'
+            AND mtpp.value IS NOT NULL
+            AND mtpp.value::jsonb ? 'preferredRoles'
+            AND jsonb_typeof(mtpp.value::jsonb -> 'preferredRoles') = 'array'
+            AND EXISTS (
+              SELECT 1
+              FROM jsonb_array_elements_text(mtpp.value::jsonb -> 'preferredRoles') pr
+              WHERE UPPER(pr) = ANY(${pPreferredRoles}::text[])
+            )
+        )`,
+      );
+    }
+
     const whereClause = where.join(" AND ");
     const skillJoin =
       deduped.length > 0
@@ -684,10 +717,20 @@ member_address AS (
     // ---------------------------------------------------------------- queries
     const ctesBlock = ctes.join(",\n");
     const direction = sortOrder === "asc" ? "ASC" : "DESC";
-    const orderByClause =
-      sortBy === "handle"
-        ? `m.handle ${direction}, "matchIndex" DESC NULLS LAST`
-        : `"matchIndex" ${direction} NULLS LAST, m.handle ASC`;
+    const fallbackPreferredRoleOrder =
+      deduped.length === 0 && normalizedPreferredRoles.length > 0;
+    let orderByClause = "";
+
+    if (sortBy === "handle") {
+      orderByClause = `m.handle ${direction}, "matchIndex" DESC NULLS LAST`;
+    } else if (fallbackPreferredRoleOrder) {
+      orderByClause =
+        `EXISTS (SELECT 1 FROM recently_active ra WHERE ra.user_id = m."userId") DESC, ` +
+        `COALESCE(m."availableForGigs", false) DESC, m.handle ASC`;
+    } else {
+      orderByClause = `"matchIndex" ${direction} NULLS LAST, m.handle ASC`;
+    }
+
     const profileCompleteJoin =
       profileComplete === true
         ? `INNER JOIN profile_complete_filtered pcf ON pcf.user_id = m."userId"`
@@ -712,7 +755,7 @@ SELECT
 FROM members.member m
 INNER JOIN filtered_members fm ON fm.user_id = m."userId"
 ${profileCompleteJoin}
-LEFT JOIN user_match_data umd ON umd.user_id = m."userId"
+${deduped.length > 0 ? 'LEFT JOIN user_match_data umd ON umd.user_id = m."userId"' : ""}
 LEFT JOIN verified_via_trolley vt ON vt.user_id = m."userId"
 LEFT JOIN member_address    maddr ON maddr."userId" = m."userId"
 ORDER BY ${orderByClause}