Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 80 additions & 1 deletion apps/discord_bot/src/five08/discord_bot/cogs/crm.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@

import asyncio
import io
import json
import logging
import re
from typing import Any
Expand DownExpand Up@@ -1174,6 +1175,79 @@ def _check_member_role(self, interaction: discord.Interaction) -> bool:
return False
return check_user_roles_with_hierarchy(interaction.user.roles, ["Member"])

def _parse_contact_skill_attrs(self, value: Any) -> dict[str, int]:
"""Parse skill attributes from a contact record into normalized strengths."""
if value is None:
return {}

candidate = value
if isinstance(candidate, str):
raw_value = candidate.strip()
if not raw_value:
return {}
try:
candidate = json.loads(raw_value)
except (TypeError, ValueError) as exc:
logger.warning("Failed to parse cSkillAttrs JSON payload: %s", exc)
return {}

if not isinstance(candidate, dict):
return {}

parsed: dict[str, int] = {}
for raw_skill, payload in candidate.items():
normalized_skill = self._normalize_skill(str(raw_skill))
if not normalized_skill:
continue

if not isinstance(payload, dict):
continue

raw_strength = payload.get("strength")
if raw_strength is None:
continue
try:
strength = int(float(raw_strength))
except (TypeError, ValueError):
continue

if not 1 <= strength <= 5:
continue

parsed[normalized_skill.casefold()] = strength

return parsed

def _normalize_skill(self, value: str) -> str:
"""Normalize one skill name from source data."""
normalized = normalize_skill_list([value])
return normalized[0] if normalized else ""

def _format_requested_skills(
self, requested_skills: list[str], contact: dict[str, Any]
) -> str:
"""Format requested skills with strength values from contact attributes."""
if not requested_skills:
return ""

skill_attrs = self._parse_contact_skill_attrs(contact.get("cSkillAttrs"))
if not skill_attrs:
return ", ".join(requested_skills)

rendered: list[str] = []
for skill in requested_skills:
normalized_skill = self._normalize_skill(skill)
if not normalized_skill:
continue

strength = skill_attrs.get(normalized_skill.casefold())
if strength is None:
rendered.append(skill)
else:
rendered.append(f"{skill} ({strength})")

return ", ".join(rendered)

@app_commands.command(
name="search-members", description="Search for candidates / members in the CRM"
)
Expand DownExpand Up@@ -1262,7 +1336,7 @@ async def search_members(
search_params = {
"where": where_filters,
"maxSize": 10,
"select": "id,name,emailAddress,c508Email,cDiscordUsername,cDiscordUserID,phoneNumber,type,resumeIds,resumeNames,resumeTypes",
"select": "id,name,emailAddress,c508Email,cDiscordUsername,cDiscordUserID,phoneNumber,type,resumeIds,resumeNames,resumeTypes,skills,cSkillAttrs",
}

response = self.espo_api.request("GET", "Contact", search_params)
Expand DownExpand Up@@ -1336,6 +1410,11 @@ async def search_members(
f"\n🏢 508 Email: {email_508}\n💬 Discord: {discord_display}"
)

if skills_list:
contact_skills = self._format_requested_skills(skills_list, contact)
if contact_skills:
contact_info += f"\n🧠 Skills: {contact_skills}"

# Add clickable CRM link at the top of contact info
if contact_id:
profile_url = f"{self.base_url}/#Contact/view/{contact_id}"
Expand Down
64 changes: 64 additions & 0 deletions tests/unit/test_crm.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -195,11 +195,14 @@ async def test_search_contacts_skills_only(
call_args = crm_cog.espo_api.request.call_args
search_params = call_args[0][2]
where_filters = search_params["where"]
select_fields = search_params["select"].split(",")

assert len(where_filters) == 1
assert where_filters[0]["type"] == "arrayAllOf"
assert where_filters[0]["attribute"] == "skills"
assert where_filters[0]["value"] == ["python", "sql"]
assert "skills" in select_fields
assert "cSkillAttrs" in select_fields

@pytest.mark.asyncio
async def test_search_contacts_query_and_skills(
Expand All@@ -223,6 +226,67 @@ async def test_search_contacts_query_and_skills(
assert where_filters[1]["attribute"] == "skills"
assert where_filters[1]["value"] == ["python", "sql"]

@pytest.mark.asyncio
async def test_search_contacts_shows_skill_strengths(
self, crm_cog, mock_interaction, mock_member_role
):
"""Test contact search displays requested skills with strengths."""
mock_interaction.user.roles = [mock_member_role]
crm_cog.espo_api.request.return_value = {
"list": [
{
"id": "contact123",
"name": "John Doe",
"emailAddress": "john@example.com",
"type": "Member",
"c508Email": "john@508.dev",
"cDiscordUsername": "johndoe",
"cSkillAttrs": {
"python": {"strength": 5},
"sql": {"strength": "4"},
"aws": {"strength": "6"},
"gcp": "1",
},
}
]
}

await crm_cog.search_members.callback(
crm_cog, mock_interaction, None, "python,sql,aws"
)

mock_interaction.followup.send.assert_called_once()
embed = mock_interaction.followup.send.call_args.kwargs["embed"]
field_value = embed.fields[0].value
assert "🧠 Skills: python (5), sql (4), amazon web services" in field_value

@pytest.mark.asyncio
async def test_search_contacts_ignores_broken_skill_attrs(
self, crm_cog, mock_interaction, mock_member_role
):
"""Test contact search ignores malformed cSkillAttrs payloads."""
mock_interaction.user.roles = [mock_member_role]
crm_cog.espo_api.request.return_value = {
"list": [
{
"id": "contact123",
"name": "John Doe",
"emailAddress": "john@example.com",
"type": "Member",
"cSkillAttrs": "not-json",
}
]
}

await crm_cog.search_members.callback(
crm_cog, mock_interaction, None, "python,sql"
)

mock_interaction.followup.send.assert_called_once()
embed = mock_interaction.followup.send.call_args.kwargs["embed"]
field_value = embed.fields[0].value
assert "🧠 Skills: python, sql" in field_value

@pytest.mark.asyncio
async def test_search_contacts_no_results(
self, crm_cog, mock_interaction, mock_member_role
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat: show requested skill strengths in search by michaelmwu · Pull Request #55 · 508-dev/508-workflows · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 80 additions & 1 deletion apps/discord_bot/src/five08/discord_bot/cogs/crm.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@

import asyncio
import io
import json
import logging
import re
from typing import Any
Expand DownExpand Up@@ -1174,6 +1175,79 @@ def _check_member_role(self, interaction: discord.Interaction) -> bool:
return False
return check_user_roles_with_hierarchy(interaction.user.roles, ["Member"])

def _parse_contact_skill_attrs(self, value: Any) -> dict[str, int]:
"""Parse skill attributes from a contact record into normalized strengths."""
if value is None:
return {}

candidate = value
if isinstance(candidate, str):
raw_value = candidate.strip()
if not raw_value:
return {}
try:
candidate = json.loads(raw_value)
except (TypeError, ValueError) as exc:
logger.warning("Failed to parse cSkillAttrs JSON payload: %s", exc)
return {}

if not isinstance(candidate, dict):
return {}

parsed: dict[str, int] = {}
for raw_skill, payload in candidate.items():
normalized_skill = self._normalize_skill(str(raw_skill))
if not normalized_skill:
continue

if not isinstance(payload, dict):
continue

raw_strength = payload.get("strength")
if raw_strength is None:
continue
try:
strength = int(float(raw_strength))
except (TypeError, ValueError):
continue

if not 1 <= strength <= 5:
continue

parsed[normalized_skill.casefold()] = strength

return parsed

def _normalize_skill(self, value: str) -> str:
"""Normalize one skill name from source data."""
normalized = normalize_skill_list([value])
return normalized[0] if normalized else ""

def _format_requested_skills(
self, requested_skills: list[str], contact: dict[str, Any]
) -> str:
"""Format requested skills with strength values from contact attributes."""
if not requested_skills:
return ""

skill_attrs = self._parse_contact_skill_attrs(contact.get("cSkillAttrs"))
if not skill_attrs:
return ", ".join(requested_skills)

rendered: list[str] = []
for skill in requested_skills:
normalized_skill = self._normalize_skill(skill)
if not normalized_skill:
continue

strength = skill_attrs.get(normalized_skill.casefold())
if strength is None:
rendered.append(skill)
else:
rendered.append(f"{skill} ({strength})")

return ", ".join(rendered)

@app_commands.command(
name="search-members", description="Search for candidates / members in the CRM"
)
Expand DownExpand Up@@ -1262,7 +1336,7 @@ async def search_members(
search_params = {
"where": where_filters,
"maxSize": 10,
"select": "id,name,emailAddress,c508Email,cDiscordUsername,cDiscordUserID,phoneNumber,type,resumeIds,resumeNames,resumeTypes",
"select": "id,name,emailAddress,c508Email,cDiscordUsername,cDiscordUserID,phoneNumber,type,resumeIds,resumeNames,resumeTypes,skills,cSkillAttrs",
}

response = self.espo_api.request("GET", "Contact", search_params)
Expand DownExpand Up@@ -1336,6 +1410,11 @@ async def search_members(
f"\n🏢 508 Email: {email_508}\n💬 Discord: {discord_display}"
)

if skills_list:
contact_skills = self._format_requested_skills(skills_list, contact)
if contact_skills:
contact_info += f"\n🧠 Skills: {contact_skills}"

# Add clickable CRM link at the top of contact info
if contact_id:
profile_url = f"{self.base_url}/#Contact/view/{contact_id}"
Expand Down
64 changes: 64 additions & 0 deletions tests/unit/test_crm.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -195,11 +195,14 @@ async def test_search_contacts_skills_only(
call_args = crm_cog.espo_api.request.call_args
search_params = call_args[0][2]
where_filters = search_params["where"]
select_fields = search_params["select"].split(",")

assert len(where_filters) == 1
assert where_filters[0]["type"] == "arrayAllOf"
assert where_filters[0]["attribute"] == "skills"
assert where_filters[0]["value"] == ["python", "sql"]
assert "skills" in select_fields
assert "cSkillAttrs" in select_fields

@pytest.mark.asyncio
async def test_search_contacts_query_and_skills(
Expand All@@ -223,6 +226,67 @@ async def test_search_contacts_query_and_skills(
assert where_filters[1]["attribute"] == "skills"
assert where_filters[1]["value"] == ["python", "sql"]

@pytest.mark.asyncio
async def test_search_contacts_shows_skill_strengths(
self, crm_cog, mock_interaction, mock_member_role
):
"""Test contact search displays requested skills with strengths."""
mock_interaction.user.roles = [mock_member_role]
crm_cog.espo_api.request.return_value = {
"list": [
{
"id": "contact123",
"name": "John Doe",
"emailAddress": "john@example.com",
"type": "Member",
"c508Email": "john@508.dev",
"cDiscordUsername": "johndoe",
"cSkillAttrs": {
"python": {"strength": 5},
"sql": {"strength": "4"},
"aws": {"strength": "6"},
"gcp": "1",
},
}
]
}

await crm_cog.search_members.callback(
crm_cog, mock_interaction, None, "python,sql,aws"
)

mock_interaction.followup.send.assert_called_once()
embed = mock_interaction.followup.send.call_args.kwargs["embed"]
field_value = embed.fields[0].value
assert "🧠 Skills: python (5), sql (4), amazon web services" in field_value

@pytest.mark.asyncio
async def test_search_contacts_ignores_broken_skill_attrs(
self, crm_cog, mock_interaction, mock_member_role
):
"""Test contact search ignores malformed cSkillAttrs payloads."""
mock_interaction.user.roles = [mock_member_role]
crm_cog.espo_api.request.return_value = {
"list": [
{
"id": "contact123",
"name": "John Doe",
"emailAddress": "john@example.com",
"type": "Member",
"cSkillAttrs": "not-json",
}
]
}

await crm_cog.search_members.callback(
crm_cog, mock_interaction, None, "python,sql"
)

mock_interaction.followup.send.assert_called_once()
embed = mock_interaction.followup.send.call_args.kwargs["embed"]
field_value = embed.fields[0].value
assert "🧠 Skills: python, sql" in field_value

@pytest.mark.asyncio
async def test_search_contacts_no_results(
self, crm_cog, mock_interaction, mock_member_role
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: show requested skill strengths in search by michaelmwu · Pull Request #55 · 508-dev/508-workflows · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 80 additions & 1 deletion apps/discord_bot/src/five08/discord_bot/cogs/crm.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@

import asyncio
import io
import json
import logging
import re
from typing import Any
Expand DownExpand Up@@ -1174,6 +1175,79 @@ def _check_member_role(self, interaction: discord.Interaction) -> bool:
return False
return check_user_roles_with_hierarchy(interaction.user.roles, ["Member"])

def _parse_contact_skill_attrs(self, value: Any) -> dict[str, int]:
"""Parse skill attributes from a contact record into normalized strengths."""
if value is None:
return {}

candidate = value
if isinstance(candidate, str):
raw_value = candidate.strip()
if not raw_value:
return {}
try:
candidate = json.loads(raw_value)
except (TypeError, ValueError) as exc:
logger.warning("Failed to parse cSkillAttrs JSON payload: %s", exc)
return {}

if not isinstance(candidate, dict):
return {}

parsed: dict[str, int] = {}
for raw_skill, payload in candidate.items():
normalized_skill = self._normalize_skill(str(raw_skill))
if not normalized_skill:
continue

if not isinstance(payload, dict):
continue

raw_strength = payload.get("strength")
if raw_strength is None:
continue
try:
strength = int(float(raw_strength))
except (TypeError, ValueError):
continue

if not 1 <= strength <= 5:
continue

parsed[normalized_skill.casefold()] = strength

return parsed

def _normalize_skill(self, value: str) -> str:
"""Normalize one skill name from source data."""
normalized = normalize_skill_list([value])
return normalized[0] if normalized else ""

def _format_requested_skills(
self, requested_skills: list[str], contact: dict[str, Any]
) -> str:
"""Format requested skills with strength values from contact attributes."""
if not requested_skills:
return ""

skill_attrs = self._parse_contact_skill_attrs(contact.get("cSkillAttrs"))
if not skill_attrs:
return ", ".join(requested_skills)

rendered: list[str] = []
for skill in requested_skills:
normalized_skill = self._normalize_skill(skill)
if not normalized_skill:
continue

strength = skill_attrs.get(normalized_skill.casefold())
if strength is None:
rendered.append(skill)
else:
rendered.append(f"{skill} ({strength})")

return ", ".join(rendered)

@app_commands.command(
name="search-members", description="Search for candidates / members in the CRM"
)
Expand DownExpand Up@@ -1262,7 +1336,7 @@ async def search_members(
search_params = {
"where": where_filters,
"maxSize": 10,
"select": "id,name,emailAddress,c508Email,cDiscordUsername,cDiscordUserID,phoneNumber,type,resumeIds,resumeNames,resumeTypes",
"select": "id,name,emailAddress,c508Email,cDiscordUsername,cDiscordUserID,phoneNumber,type,resumeIds,resumeNames,resumeTypes,skills,cSkillAttrs",
}

response = self.espo_api.request("GET", "Contact", search_params)
Expand DownExpand Up@@ -1336,6 +1410,11 @@ async def search_members(
f"\n🏢 508 Email: {email_508}\n💬 Discord: {discord_display}"
)

if skills_list:
contact_skills = self._format_requested_skills(skills_list, contact)
if contact_skills:
contact_info += f"\n🧠 Skills: {contact_skills}"

# Add clickable CRM link at the top of contact info
if contact_id:
profile_url = f"{self.base_url}/#Contact/view/{contact_id}"
Expand Down
64 changes: 64 additions & 0 deletions tests/unit/test_crm.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -195,11 +195,14 @@ async def test_search_contacts_skills_only(
call_args = crm_cog.espo_api.request.call_args
search_params = call_args[0][2]
where_filters = search_params["where"]
select_fields = search_params["select"].split(",")

assert len(where_filters) == 1
assert where_filters[0]["type"] == "arrayAllOf"
assert where_filters[0]["attribute"] == "skills"
assert where_filters[0]["value"] == ["python", "sql"]
assert "skills" in select_fields
assert "cSkillAttrs" in select_fields

@pytest.mark.asyncio
async def test_search_contacts_query_and_skills(
Expand All@@ -223,6 +226,67 @@ async def test_search_contacts_query_and_skills(
assert where_filters[1]["attribute"] == "skills"
assert where_filters[1]["value"] == ["python", "sql"]

@pytest.mark.asyncio
async def test_search_contacts_shows_skill_strengths(
self, crm_cog, mock_interaction, mock_member_role
):
"""Test contact search displays requested skills with strengths."""
mock_interaction.user.roles = [mock_member_role]
crm_cog.espo_api.request.return_value = {
"list": [
{
"id": "contact123",
"name": "John Doe",
"emailAddress": "john@example.com",
"type": "Member",
"c508Email": "john@508.dev",
"cDiscordUsername": "johndoe",
"cSkillAttrs": {
"python": {"strength": 5},
"sql": {"strength": "4"},
"aws": {"strength": "6"},
"gcp": "1",
},
}
]
}

await crm_cog.search_members.callback(
crm_cog, mock_interaction, None, "python,sql,aws"
)

mock_interaction.followup.send.assert_called_once()
embed = mock_interaction.followup.send.call_args.kwargs["embed"]
field_value = embed.fields[0].value
assert "🧠 Skills: python (5), sql (4), amazon web services" in field_value

@pytest.mark.asyncio
async def test_search_contacts_ignores_broken_skill_attrs(
self, crm_cog, mock_interaction, mock_member_role
):
"""Test contact search ignores malformed cSkillAttrs payloads."""
mock_interaction.user.roles = [mock_member_role]
crm_cog.espo_api.request.return_value = {
"list": [
{
"id": "contact123",
"name": "John Doe",
"emailAddress": "john@example.com",
"type": "Member",
"cSkillAttrs": "not-json",
}
]
}

await crm_cog.search_members.callback(
crm_cog, mock_interaction, None, "python,sql"
)

mock_interaction.followup.send.assert_called_once()
embed = mock_interaction.followup.send.call_args.kwargs["embed"]
field_value = embed.fields[0].value
assert "🧠 Skills: python, sql" in field_value

@pytest.mark.asyncio
async def test_search_contacts_no_results(
self, crm_cog, mock_interaction, mock_member_role
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: show requested skill strengths in search by michaelmwu · Pull Request #55 · 508-dev/508-workflows · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 80 additions & 1 deletion apps/discord_bot/src/five08/discord_bot/cogs/crm.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@

import asyncio
import io
import json
import logging
import re
from typing import Any
Expand DownExpand Up@@ -1174,6 +1175,79 @@ def _check_member_role(self, interaction: discord.Interaction) -> bool:
return False
return check_user_roles_with_hierarchy(interaction.user.roles, ["Member"])

def _parse_contact_skill_attrs(self, value: Any) -> dict[str, int]:
"""Parse skill attributes from a contact record into normalized strengths."""
if value is None:
return {}

candidate = value
if isinstance(candidate, str):
raw_value = candidate.strip()
if not raw_value:
return {}
try:
candidate = json.loads(raw_value)
except (TypeError, ValueError) as exc:
logger.warning("Failed to parse cSkillAttrs JSON payload: %s", exc)
return {}

if not isinstance(candidate, dict):
return {}

parsed: dict[str, int] = {}
for raw_skill, payload in candidate.items():
normalized_skill = self._normalize_skill(str(raw_skill))
if not normalized_skill:
continue

if not isinstance(payload, dict):
continue

raw_strength = payload.get("strength")
if raw_strength is None:
continue
try:
strength = int(float(raw_strength))
except (TypeError, ValueError):
continue

if not 1 <= strength <= 5:
continue

parsed[normalized_skill.casefold()] = strength

return parsed

def _normalize_skill(self, value: str) -> str:
"""Normalize one skill name from source data."""
normalized = normalize_skill_list([value])
return normalized[0] if normalized else ""

def _format_requested_skills(
self, requested_skills: list[str], contact: dict[str, Any]
) -> str:
"""Format requested skills with strength values from contact attributes."""
if not requested_skills:
return ""

skill_attrs = self._parse_contact_skill_attrs(contact.get("cSkillAttrs"))
if not skill_attrs:
return ", ".join(requested_skills)

rendered: list[str] = []
for skill in requested_skills:
normalized_skill = self._normalize_skill(skill)
if not normalized_skill:
continue

strength = skill_attrs.get(normalized_skill.casefold())
if strength is None:
rendered.append(skill)
else:
rendered.append(f"{skill} ({strength})")

return ", ".join(rendered)

@app_commands.command(
name="search-members", description="Search for candidates / members in the CRM"
)
Expand DownExpand Up@@ -1262,7 +1336,7 @@ async def search_members(
search_params = {
"where": where_filters,
"maxSize": 10,
"select": "id,name,emailAddress,c508Email,cDiscordUsername,cDiscordUserID,phoneNumber,type,resumeIds,resumeNames,resumeTypes",
"select": "id,name,emailAddress,c508Email,cDiscordUsername,cDiscordUserID,phoneNumber,type,resumeIds,resumeNames,resumeTypes,skills,cSkillAttrs",
}

response = self.espo_api.request("GET", "Contact", search_params)
Expand DownExpand Up@@ -1336,6 +1410,11 @@ async def search_members(
f"\n🏢 508 Email: {email_508}\n💬 Discord: {discord_display}"
)

if skills_list:
contact_skills = self._format_requested_skills(skills_list, contact)
if contact_skills:
contact_info += f"\n🧠 Skills: {contact_skills}"

# Add clickable CRM link at the top of contact info
if contact_id:
profile_url = f"{self.base_url}/#Contact/view/{contact_id}"
Expand Down
64 changes: 64 additions & 0 deletions tests/unit/test_crm.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -195,11 +195,14 @@ async def test_search_contacts_skills_only(
call_args = crm_cog.espo_api.request.call_args
search_params = call_args[0][2]
where_filters = search_params["where"]
select_fields = search_params["select"].split(",")

assert len(where_filters) == 1
assert where_filters[0]["type"] == "arrayAllOf"
assert where_filters[0]["attribute"] == "skills"
assert where_filters[0]["value"] == ["python", "sql"]
assert "skills" in select_fields
assert "cSkillAttrs" in select_fields

@pytest.mark.asyncio
async def test_search_contacts_query_and_skills(
Expand All@@ -223,6 +226,67 @@ async def test_search_contacts_query_and_skills(
assert where_filters[1]["attribute"] == "skills"
assert where_filters[1]["value"] == ["python", "sql"]

@pytest.mark.asyncio
async def test_search_contacts_shows_skill_strengths(
self, crm_cog, mock_interaction, mock_member_role
):
"""Test contact search displays requested skills with strengths."""
mock_interaction.user.roles = [mock_member_role]
crm_cog.espo_api.request.return_value = {
"list": [
{
"id": "contact123",
"name": "John Doe",
"emailAddress": "john@example.com",
"type": "Member",
"c508Email": "john@508.dev",
"cDiscordUsername": "johndoe",
"cSkillAttrs": {
"python": {"strength": 5},
"sql": {"strength": "4"},
"aws": {"strength": "6"},
"gcp": "1",
},
}
]
}

await crm_cog.search_members.callback(
crm_cog, mock_interaction, None, "python,sql,aws"
)

mock_interaction.followup.send.assert_called_once()
embed = mock_interaction.followup.send.call_args.kwargs["embed"]
field_value = embed.fields[0].value
assert "🧠 Skills: python (5), sql (4), amazon web services" in field_value

@pytest.mark.asyncio
async def test_search_contacts_ignores_broken_skill_attrs(
self, crm_cog, mock_interaction, mock_member_role
):
"""Test contact search ignores malformed cSkillAttrs payloads."""
mock_interaction.user.roles = [mock_member_role]
crm_cog.espo_api.request.return_value = {
"list": [
{
"id": "contact123",
"name": "John Doe",
"emailAddress": "john@example.com",
"type": "Member",
"cSkillAttrs": "not-json",
}
]
}

await crm_cog.search_members.callback(
crm_cog, mock_interaction, None, "python,sql"
)

mock_interaction.followup.send.assert_called_once()
embed = mock_interaction.followup.send.call_args.kwargs["embed"]
field_value = embed.fields[0].value
assert "🧠 Skills: python, sql" in field_value

@pytest.mark.asyncio
async def test_search_contacts_no_results(
self, crm_cog, mock_interaction, mock_member_role
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' feat: show requested skill strengths in search by michaelmwu · Pull Request #55 · 508-dev/508-workflows · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 80 additions & 1 deletion apps/discord_bot/src/five08/discord_bot/cogs/crm.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@

import asyncio
import io
import json
import logging
import re
from typing import Any
Expand DownExpand Up@@ -1174,6 +1175,79 @@ def _check_member_role(self, interaction: discord.Interaction) -> bool:
return False
return check_user_roles_with_hierarchy(interaction.user.roles, ["Member"])

def _parse_contact_skill_attrs(self, value: Any) -> dict[str, int]:
"""Parse skill attributes from a contact record into normalized strengths."""
if value is None:
return {}

candidate = value
if isinstance(candidate, str):
raw_value = candidate.strip()
if not raw_value:
return {}
try:
candidate = json.loads(raw_value)
except (TypeError, ValueError) as exc:
logger.warning("Failed to parse cSkillAttrs JSON payload: %s", exc)
return {}

if not isinstance(candidate, dict):
return {}

parsed: dict[str, int] = {}
for raw_skill, payload in candidate.items():
normalized_skill = self._normalize_skill(str(raw_skill))
if not normalized_skill:
continue

if not isinstance(payload, dict):
continue

raw_strength = payload.get("strength")
if raw_strength is None:
continue
try:
strength = int(float(raw_strength))
except (TypeError, ValueError):
continue

if not 1 <= strength <= 5:
continue

parsed[normalized_skill.casefold()] = strength

return parsed

def _normalize_skill(self, value: str) -> str:
"""Normalize one skill name from source data."""
normalized = normalize_skill_list([value])
return normalized[0] if normalized else ""

def _format_requested_skills(
self, requested_skills: list[str], contact: dict[str, Any]
) -> str:
"""Format requested skills with strength values from contact attributes."""
if not requested_skills:
return ""

skill_attrs = self._parse_contact_skill_attrs(contact.get("cSkillAttrs"))
if not skill_attrs:
return ", ".join(requested_skills)

rendered: list[str] = []
for skill in requested_skills:
normalized_skill = self._normalize_skill(skill)
if not normalized_skill:
continue

strength = skill_attrs.get(normalized_skill.casefold())
if strength is None:
rendered.append(skill)
else:
rendered.append(f"{skill} ({strength})")

return ", ".join(rendered)

@app_commands.command(
name="search-members", description="Search for candidates / members in the CRM"
)
Expand DownExpand Up@@ -1262,7 +1336,7 @@ async def search_members(
search_params = {
"where": where_filters,
"maxSize": 10,
"select": "id,name,emailAddress,c508Email,cDiscordUsername,cDiscordUserID,phoneNumber,type,resumeIds,resumeNames,resumeTypes",
"select": "id,name,emailAddress,c508Email,cDiscordUsername,cDiscordUserID,phoneNumber,type,resumeIds,resumeNames,resumeTypes,skills,cSkillAttrs",
}

response = self.espo_api.request("GET", "Contact", search_params)
Expand DownExpand Up@@ -1336,6 +1410,11 @@ async def search_members(
f"\n🏢 508 Email: {email_508}\n💬 Discord: {discord_display}"
)

if skills_list:
contact_skills = self._format_requested_skills(skills_list, contact)
if contact_skills:
contact_info += f"\n🧠 Skills: {contact_skills}"

# Add clickable CRM link at the top of contact info
if contact_id:
profile_url = f"{self.base_url}/#Contact/view/{contact_id}"
Expand Down
64 changes: 64 additions & 0 deletions tests/unit/test_crm.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -195,11 +195,14 @@ async def test_search_contacts_skills_only(
call_args = crm_cog.espo_api.request.call_args
search_params = call_args[0][2]
where_filters = search_params["where"]
select_fields = search_params["select"].split(",")

assert len(where_filters) == 1
assert where_filters[0]["type"] == "arrayAllOf"
assert where_filters[0]["attribute"] == "skills"
assert where_filters[0]["value"] == ["python", "sql"]
assert "skills" in select_fields
assert "cSkillAttrs" in select_fields

@pytest.mark.asyncio
async def test_search_contacts_query_and_skills(
Expand All@@ -223,6 +226,67 @@ async def test_search_contacts_query_and_skills(
assert where_filters[1]["attribute"] == "skills"
assert where_filters[1]["value"] == ["python", "sql"]

@pytest.mark.asyncio
async def test_search_contacts_shows_skill_strengths(
self, crm_cog, mock_interaction, mock_member_role
):
"""Test contact search displays requested skills with strengths."""
mock_interaction.user.roles = [mock_member_role]
crm_cog.espo_api.request.return_value = {
"list": [
{
"id": "contact123",
"name": "John Doe",
"emailAddress": "john@example.com",
"type": "Member",
"c508Email": "john@508.dev",
"cDiscordUsername": "johndoe",
"cSkillAttrs": {
"python": {"strength": 5},
"sql": {"strength": "4"},
"aws": {"strength": "6"},
"gcp": "1",
},
}
]
}

await crm_cog.search_members.callback(
crm_cog, mock_interaction, None, "python,sql,aws"
)

mock_interaction.followup.send.assert_called_once()
embed = mock_interaction.followup.send.call_args.kwargs["embed"]
field_value = embed.fields[0].value
assert "🧠 Skills: python (5), sql (4), amazon web services" in field_value

@pytest.mark.asyncio
async def test_search_contacts_ignores_broken_skill_attrs(
self, crm_cog, mock_interaction, mock_member_role
):
"""Test contact search ignores malformed cSkillAttrs payloads."""
mock_interaction.user.roles = [mock_member_role]
crm_cog.espo_api.request.return_value = {
"list": [
{
"id": "contact123",
"name": "John Doe",
"emailAddress": "john@example.com",
"type": "Member",
"cSkillAttrs": "not-json",
}
]
}

await crm_cog.search_members.callback(
crm_cog, mock_interaction, None, "python,sql"
)

mock_interaction.followup.send.assert_called_once()
embed = mock_interaction.followup.send.call_args.kwargs["embed"]
field_value = embed.fields[0].value
assert "🧠 Skills: python, sql" in field_value

@pytest.mark.asyncio
async def test_search_contacts_no_results(
self, crm_cog, mock_interaction, mock_member_role
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: show requested skill strengths in search by michaelmwu · Pull Request #55 · 508-dev/508-workflows · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 80 additions & 1 deletion apps/discord_bot/src/five08/discord_bot/cogs/crm.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@

import asyncio
import io
import json
import logging
import re
from typing import Any
Expand DownExpand Up@@ -1174,6 +1175,79 @@ def _check_member_role(self, interaction: discord.Interaction) -> bool:
return False
return check_user_roles_with_hierarchy(interaction.user.roles, ["Member"])

def _parse_contact_skill_attrs(self, value: Any) -> dict[str, int]:
"""Parse skill attributes from a contact record into normalized strengths."""
if value is None:
return {}

candidate = value
if isinstance(candidate, str):
raw_value = candidate.strip()
if not raw_value:
return {}
try:
candidate = json.loads(raw_value)
except (TypeError, ValueError) as exc:
logger.warning("Failed to parse cSkillAttrs JSON payload: %s", exc)
return {}

if not isinstance(candidate, dict):
return {}

parsed: dict[str, int] = {}
for raw_skill, payload in candidate.items():
normalized_skill = self._normalize_skill(str(raw_skill))
if not normalized_skill:
continue

if not isinstance(payload, dict):
continue

raw_strength = payload.get("strength")
if raw_strength is None:
continue
try:
strength = int(float(raw_strength))
except (TypeError, ValueError):
continue

if not 1 <= strength <= 5:
continue

parsed[normalized_skill.casefold()] = strength

return parsed

def _normalize_skill(self, value: str) -> str:
"""Normalize one skill name from source data."""
normalized = normalize_skill_list([value])
return normalized[0] if normalized else ""

def _format_requested_skills(
self, requested_skills: list[str], contact: dict[str, Any]
) -> str:
"""Format requested skills with strength values from contact attributes."""
if not requested_skills:
return ""

skill_attrs = self._parse_contact_skill_attrs(contact.get("cSkillAttrs"))
if not skill_attrs:
return ", ".join(requested_skills)

rendered: list[str] = []
for skill in requested_skills:
normalized_skill = self._normalize_skill(skill)
if not normalized_skill:
continue

strength = skill_attrs.get(normalized_skill.casefold())
if strength is None:
rendered.append(skill)
else:
rendered.append(f"{skill} ({strength})")

return ", ".join(rendered)

@app_commands.command(
name="search-members", description="Search for candidates / members in the CRM"
)
Expand DownExpand Up@@ -1262,7 +1336,7 @@ async def search_members(
search_params = {
"where": where_filters,
"maxSize": 10,
"select": "id,name,emailAddress,c508Email,cDiscordUsername,cDiscordUserID,phoneNumber,type,resumeIds,resumeNames,resumeTypes",
"select": "id,name,emailAddress,c508Email,cDiscordUsername,cDiscordUserID,phoneNumber,type,resumeIds,resumeNames,resumeTypes,skills,cSkillAttrs",
}

response = self.espo_api.request("GET", "Contact", search_params)
Expand DownExpand Up@@ -1336,6 +1410,11 @@ async def search_members(
f"\n🏢 508 Email: {email_508}\n💬 Discord: {discord_display}"
)

if skills_list:
contact_skills = self._format_requested_skills(skills_list, contact)
if contact_skills:
contact_info += f"\n🧠 Skills: {contact_skills}"

# Add clickable CRM link at the top of contact info
if contact_id:
profile_url = f"{self.base_url}/#Contact/view/{contact_id}"
Expand Down
64 changes: 64 additions & 0 deletions tests/unit/test_crm.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -195,11 +195,14 @@ async def test_search_contacts_skills_only(
call_args = crm_cog.espo_api.request.call_args
search_params = call_args[0][2]
where_filters = search_params["where"]
select_fields = search_params["select"].split(",")

assert len(where_filters) == 1
assert where_filters[0]["type"] == "arrayAllOf"
assert where_filters[0]["attribute"] == "skills"
assert where_filters[0]["value"] == ["python", "sql"]
assert "skills" in select_fields
assert "cSkillAttrs" in select_fields

@pytest.mark.asyncio
async def test_search_contacts_query_and_skills(
Expand All@@ -223,6 +226,67 @@ async def test_search_contacts_query_and_skills(
assert where_filters[1]["attribute"] == "skills"
assert where_filters[1]["value"] == ["python", "sql"]

@pytest.mark.asyncio
async def test_search_contacts_shows_skill_strengths(
self, crm_cog, mock_interaction, mock_member_role
):
"""Test contact search displays requested skills with strengths."""
mock_interaction.user.roles = [mock_member_role]
crm_cog.espo_api.request.return_value = {
"list": [
{
"id": "contact123",
"name": "John Doe",
"emailAddress": "john@example.com",
"type": "Member",
"c508Email": "john@508.dev",
"cDiscordUsername": "johndoe",
"cSkillAttrs": {
"python": {"strength": 5},
"sql": {"strength": "4"},
"aws": {"strength": "6"},
"gcp": "1",
},
}
]
}

await crm_cog.search_members.callback(
crm_cog, mock_interaction, None, "python,sql,aws"
)

mock_interaction.followup.send.assert_called_once()
embed = mock_interaction.followup.send.call_args.kwargs["embed"]
field_value = embed.fields[0].value
assert "🧠 Skills: python (5), sql (4), amazon web services" in field_value

@pytest.mark.asyncio
async def test_search_contacts_ignores_broken_skill_attrs(
self, crm_cog, mock_interaction, mock_member_role
):
"""Test contact search ignores malformed cSkillAttrs payloads."""
mock_interaction.user.roles = [mock_member_role]
crm_cog.espo_api.request.return_value = {
"list": [
{
"id": "contact123",
"name": "John Doe",
"emailAddress": "john@example.com",
"type": "Member",
"cSkillAttrs": "not-json",
}
]
}

await crm_cog.search_members.callback(
crm_cog, mock_interaction, None, "python,sql"
)

mock_interaction.followup.send.assert_called_once()
embed = mock_interaction.followup.send.call_args.kwargs["embed"]
field_value = embed.fields[0].value
assert "🧠 Skills: python, sql" in field_value

@pytest.mark.asyncio
async def test_search_contacts_no_results(
self, crm_cog, mock_interaction, mock_member_role
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: show requested skill strengths in search by michaelmwu · Pull Request #55 · 508-dev/508-workflows · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 80 additions & 1 deletion apps/discord_bot/src/five08/discord_bot/cogs/crm.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@

import asyncio
import io
import json
import logging
import re
from typing import Any
Expand DownExpand Up@@ -1174,6 +1175,79 @@ def _check_member_role(self, interaction: discord.Interaction) -> bool:
return False
return check_user_roles_with_hierarchy(interaction.user.roles, ["Member"])

def _parse_contact_skill_attrs(self, value: Any) -> dict[str, int]:
"""Parse skill attributes from a contact record into normalized strengths."""
if value is None:
return {}

candidate = value
if isinstance(candidate, str):
raw_value = candidate.strip()
if not raw_value:
return {}
try:
candidate = json.loads(raw_value)
except (TypeError, ValueError) as exc:
logger.warning("Failed to parse cSkillAttrs JSON payload: %s", exc)
return {}

if not isinstance(candidate, dict):
return {}

parsed: dict[str, int] = {}
for raw_skill, payload in candidate.items():
normalized_skill = self._normalize_skill(str(raw_skill))
if not normalized_skill:
continue

if not isinstance(payload, dict):
continue

raw_strength = payload.get("strength")
if raw_strength is None:
continue
try:
strength = int(float(raw_strength))
except (TypeError, ValueError):
continue

if not 1 <= strength <= 5:
continue

parsed[normalized_skill.casefold()] = strength

return parsed

def _normalize_skill(self, value: str) -> str:
"""Normalize one skill name from source data."""
normalized = normalize_skill_list([value])
return normalized[0] if normalized else ""

def _format_requested_skills(
self, requested_skills: list[str], contact: dict[str, Any]
) -> str:
"""Format requested skills with strength values from contact attributes."""
if not requested_skills:
return ""

skill_attrs = self._parse_contact_skill_attrs(contact.get("cSkillAttrs"))
if not skill_attrs:
return ", ".join(requested_skills)

rendered: list[str] = []
for skill in requested_skills:
normalized_skill = self._normalize_skill(skill)
if not normalized_skill:
continue

strength = skill_attrs.get(normalized_skill.casefold())
if strength is None:
rendered.append(skill)
else:
rendered.append(f"{skill} ({strength})")

return ", ".join(rendered)

@app_commands.command(
name="search-members", description="Search for candidates / members in the CRM"
)
Expand DownExpand Up@@ -1262,7 +1336,7 @@ async def search_members(
search_params = {
"where": where_filters,
"maxSize": 10,
"select": "id,name,emailAddress,c508Email,cDiscordUsername,cDiscordUserID,phoneNumber,type,resumeIds,resumeNames,resumeTypes",
"select": "id,name,emailAddress,c508Email,cDiscordUsername,cDiscordUserID,phoneNumber,type,resumeIds,resumeNames,resumeTypes,skills,cSkillAttrs",
}

response = self.espo_api.request("GET", "Contact", search_params)
Expand DownExpand Up@@ -1336,6 +1410,11 @@ async def search_members(
f"\n🏢 508 Email: {email_508}\n💬 Discord: {discord_display}"
)

if skills_list:
contact_skills = self._format_requested_skills(skills_list, contact)
if contact_skills:
contact_info += f"\n🧠 Skills: {contact_skills}"

# Add clickable CRM link at the top of contact info
if contact_id:
profile_url = f"{self.base_url}/#Contact/view/{contact_id}"
Expand Down
64 changes: 64 additions & 0 deletions tests/unit/test_crm.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -195,11 +195,14 @@ async def test_search_contacts_skills_only(
call_args = crm_cog.espo_api.request.call_args
search_params = call_args[0][2]
where_filters = search_params["where"]
select_fields = search_params["select"].split(",")

assert len(where_filters) == 1
assert where_filters[0]["type"] == "arrayAllOf"
assert where_filters[0]["attribute"] == "skills"
assert where_filters[0]["value"] == ["python", "sql"]
assert "skills" in select_fields
assert "cSkillAttrs" in select_fields

@pytest.mark.asyncio
async def test_search_contacts_query_and_skills(
Expand All@@ -223,6 +226,67 @@ async def test_search_contacts_query_and_skills(
assert where_filters[1]["attribute"] == "skills"
assert where_filters[1]["value"] == ["python", "sql"]

@pytest.mark.asyncio
async def test_search_contacts_shows_skill_strengths(
self, crm_cog, mock_interaction, mock_member_role
):
"""Test contact search displays requested skills with strengths."""
mock_interaction.user.roles = [mock_member_role]
crm_cog.espo_api.request.return_value = {
"list": [
{
"id": "contact123",
"name": "John Doe",
"emailAddress": "john@example.com",
"type": "Member",
"c508Email": "john@508.dev",
"cDiscordUsername": "johndoe",
"cSkillAttrs": {
"python": {"strength": 5},
"sql": {"strength": "4"},
"aws": {"strength": "6"},
"gcp": "1",
},
}
]
}

await crm_cog.search_members.callback(
crm_cog, mock_interaction, None, "python,sql,aws"
)

mock_interaction.followup.send.assert_called_once()
embed = mock_interaction.followup.send.call_args.kwargs["embed"]
field_value = embed.fields[0].value
assert "🧠 Skills: python (5), sql (4), amazon web services" in field_value

@pytest.mark.asyncio
async def test_search_contacts_ignores_broken_skill_attrs(
self, crm_cog, mock_interaction, mock_member_role
):
"""Test contact search ignores malformed cSkillAttrs payloads."""
mock_interaction.user.roles = [mock_member_role]
crm_cog.espo_api.request.return_value = {
"list": [
{
"id": "contact123",
"name": "John Doe",
"emailAddress": "john@example.com",
"type": "Member",
"cSkillAttrs": "not-json",
}
]
}

await crm_cog.search_members.callback(
crm_cog, mock_interaction, None, "python,sql"
)

mock_interaction.followup.send.assert_called_once()
embed = mock_interaction.followup.send.call_args.kwargs["embed"]
field_value = embed.fields[0].value
assert "🧠 Skills: python, sql" in field_value

@pytest.mark.asyncio
async def test_search_contacts_no_results(
self, crm_cog, mock_interaction, mock_member_role
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); feat: show requested skill strengths in search by michaelmwu · Pull Request #55 · 508-dev/508-workflows · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 80 additions & 1 deletion apps/discord_bot/src/five08/discord_bot/cogs/crm.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@

import asyncio
import io
import json
import logging
import re
from typing import Any
Expand DownExpand Up@@ -1174,6 +1175,79 @@ def _check_member_role(self, interaction: discord.Interaction) -> bool:
return False
return check_user_roles_with_hierarchy(interaction.user.roles, ["Member"])

def _parse_contact_skill_attrs(self, value: Any) -> dict[str, int]:
"""Parse skill attributes from a contact record into normalized strengths."""
if value is None:
return {}

candidate = value
if isinstance(candidate, str):
raw_value = candidate.strip()
if not raw_value:
return {}
try:
candidate = json.loads(raw_value)
except (TypeError, ValueError) as exc:
logger.warning("Failed to parse cSkillAttrs JSON payload: %s", exc)
return {}

if not isinstance(candidate, dict):
return {}

parsed: dict[str, int] = {}
for raw_skill, payload in candidate.items():
normalized_skill = self._normalize_skill(str(raw_skill))
if not normalized_skill:
continue

if not isinstance(payload, dict):
continue

raw_strength = payload.get("strength")
if raw_strength is None:
continue
try:
strength = int(float(raw_strength))
except (TypeError, ValueError):
continue

if not 1 <= strength <= 5:
continue

parsed[normalized_skill.casefold()] = strength

return parsed

def _normalize_skill(self, value: str) -> str:
"""Normalize one skill name from source data."""
normalized = normalize_skill_list([value])
return normalized[0] if normalized else ""

def _format_requested_skills(
self, requested_skills: list[str], contact: dict[str, Any]
) -> str:
"""Format requested skills with strength values from contact attributes."""
if not requested_skills:
return ""

skill_attrs = self._parse_contact_skill_attrs(contact.get("cSkillAttrs"))
if not skill_attrs:
return ", ".join(requested_skills)

rendered: list[str] = []
for skill in requested_skills:
normalized_skill = self._normalize_skill(skill)
if not normalized_skill:
continue

strength = skill_attrs.get(normalized_skill.casefold())
if strength is None:
rendered.append(skill)
else:
rendered.append(f"{skill} ({strength})")

return ", ".join(rendered)

@app_commands.command(
name="search-members", description="Search for candidates / members in the CRM"
)
Expand DownExpand Up@@ -1262,7 +1336,7 @@ async def search_members(
search_params = {
"where": where_filters,
"maxSize": 10,
"select": "id,name,emailAddress,c508Email,cDiscordUsername,cDiscordUserID,phoneNumber,type,resumeIds,resumeNames,resumeTypes",
"select": "id,name,emailAddress,c508Email,cDiscordUsername,cDiscordUserID,phoneNumber,type,resumeIds,resumeNames,resumeTypes,skills,cSkillAttrs",
}

response = self.espo_api.request("GET", "Contact", search_params)
Expand DownExpand Up@@ -1336,6 +1410,11 @@ async def search_members(
f"\n🏢 508 Email: {email_508}\n💬 Discord: {discord_display}"
)

if skills_list:
contact_skills = self._format_requested_skills(skills_list, contact)
if contact_skills:
contact_info += f"\n🧠 Skills: {contact_skills}"

# Add clickable CRM link at the top of contact info
if contact_id:
profile_url = f"{self.base_url}/#Contact/view/{contact_id}"
Expand Down
64 changes: 64 additions & 0 deletions tests/unit/test_crm.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -195,11 +195,14 @@ async def test_search_contacts_skills_only(
call_args = crm_cog.espo_api.request.call_args
search_params = call_args[0][2]
where_filters = search_params["where"]
select_fields = search_params["select"].split(",")

assert len(where_filters) == 1
assert where_filters[0]["type"] == "arrayAllOf"
assert where_filters[0]["attribute"] == "skills"
assert where_filters[0]["value"] == ["python", "sql"]
assert "skills" in select_fields
assert "cSkillAttrs" in select_fields

@pytest.mark.asyncio
async def test_search_contacts_query_and_skills(
Expand All@@ -223,6 +226,67 @@ async def test_search_contacts_query_and_skills(
assert where_filters[1]["attribute"] == "skills"
assert where_filters[1]["value"] == ["python", "sql"]

@pytest.mark.asyncio
async def test_search_contacts_shows_skill_strengths(
self, crm_cog, mock_interaction, mock_member_role
):
"""Test contact search displays requested skills with strengths."""
mock_interaction.user.roles = [mock_member_role]
crm_cog.espo_api.request.return_value = {
"list": [
{
"id": "contact123",
"name": "John Doe",
"emailAddress": "john@example.com",
"type": "Member",
"c508Email": "john@508.dev",
"cDiscordUsername": "johndoe",
"cSkillAttrs": {
"python": {"strength": 5},
"sql": {"strength": "4"},
"aws": {"strength": "6"},
"gcp": "1",
},
}
]
}

await crm_cog.search_members.callback(
crm_cog, mock_interaction, None, "python,sql,aws"
)

mock_interaction.followup.send.assert_called_once()
embed = mock_interaction.followup.send.call_args.kwargs["embed"]
field_value = embed.fields[0].value
assert "🧠 Skills: python (5), sql (4), amazon web services" in field_value

@pytest.mark.asyncio
async def test_search_contacts_ignores_broken_skill_attrs(
self, crm_cog, mock_interaction, mock_member_role
):
"""Test contact search ignores malformed cSkillAttrs payloads."""
mock_interaction.user.roles = [mock_member_role]
crm_cog.espo_api.request.return_value = {
"list": [
{
"id": "contact123",
"name": "John Doe",
"emailAddress": "john@example.com",
"type": "Member",
"cSkillAttrs": "not-json",
}
]
}

await crm_cog.search_members.callback(
crm_cog, mock_interaction, None, "python,sql"
)

mock_interaction.followup.send.assert_called_once()
embed = mock_interaction.followup.send.call_args.kwargs["embed"]
field_value = embed.fields[0].value
assert "🧠 Skills: python, sql" in field_value

@pytest.mark.asyncio
async def test_search_contacts_no_results(
self, crm_cog, mock_interaction, mock_member_role
Expand Down