Skip to content

fix: convert primitive attributes to platform-specific format [CM-772] #3568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 6, 2025
Merged

fix: convert primitive attributes to platform-specific format [CM-772] #3568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
546f6a9
fix: update bot detection to set system flag, ignore custom flag
skwowet Nov 4, 2025
0cd6f98
fix: convert primitive attributes to platform-specific format
skwowet Nov 4, 2025
32c5e24
Merge branch 'main' into bugfix/bot-detection
skwowet Nov 4, 2025
df40928
fix: ensure correct value assignment for platform-specific attributes
skwowet Nov 6, 2025
a176c66
Merge branch 'main' into bugfix/bot-detection
skwowet Nov 6, 2025
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
6 changes: 4 additions & 2 deletions services/apps/data_sink_worker/src/service/member.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ export default class MemberService extends LoggerBase {
let attributes: Record<string, unknown> = {}
if (data.attributes) {
attributes = await logExecutionTimeV2(
() => memberAttributeService.validateAttributes(data.attributes),
() =>
memberAttributeService.validateAttributes(data.attributes, source as PlatformType),
this.log,
'memberService -> create -> validateAttributes',
)
Expand Down Expand Up @@ -285,7 +286,8 @@ export default class MemberService extends LoggerBase {
if (data.attributes) {
this.log.trace({ memberId: id }, 'Validating member attributes!')
data.attributes = await logExecutionTimeV2(
() => memberAttributeService.validateAttributes(data.attributes),
() =>
memberAttributeService.validateAttributes(data.attributes, source as PlatformType),
this.log,
'memberService -> update -> validateAttributes',
)
Expand Down
22 changes: 13 additions & 9 deletions services/apps/data_sink_worker/src/service/memberAttribute.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
import { dbStoreQx } from '@crowd/data-access-layer/src/queryExecutor'
import { Logger, LoggerBase } from '@crowd/logging'
import { RedisClient } from '@crowd/redis'
import { MemberAttributeType } from '@crowd/types'
import { MemberAttributeType, PlatformType } from '@crowd/types'

export default class MemberAttributeService extends LoggerBase {
constructor(
Expand All @@ -27,6 +27,7 @@ export default class MemberAttributeService extends LoggerBase {

public async validateAttributes(
attributes: Record<string, unknown>,
platform: PlatformType,
): Promise<Record<string, unknown>> {
const settings = await getMemberAttributeSettings(dbStoreQx(this.store), this.redis)
const memberAttributeSettings = settings.reduce((acc, attribute) => {
Expand All @@ -43,32 +44,35 @@ export default class MemberAttributeService extends LoggerBase {
delete attributes[attributeName]
continue
}
// Convert primitive to platform-specific format: { [platform]: value }
if (typeof attributes[attributeName] !== 'object') {
const value = attributes[attributeName]

attributes[attributeName] = {
custom: attributes[attributeName],
[platform]: value,
}
}

for (const platform of Object.keys(attributes[attributeName])) {
for (const platformKey of Object.keys(attributes[attributeName])) {
if (
attributes[attributeName][platform] !== undefined &&
attributes[attributeName][platform] !== null
attributes[attributeName][platformKey] !== undefined &&
attributes[attributeName][platformKey] !== null
) {
if (
!MemberAttributeService.isCorrectType(
attributes[attributeName][platform],
attributes[attributeName][platformKey],
memberAttributeSettings[attributeName].type,
{ options: memberAttributeSettings[attributeName].options },
)
) {
this.log.error('Failed to validate attributee', {
attributeName,
platform,
attributeValue: attributes[attributeName][platform],
platform: platformKey,
attributeValue: attributes[attributeName][platformKey],
attributeType: memberAttributeSettings[attributeName].type,
})
throw new Error(
`Failed to validate attribute '${attributeName}' with value '${attributes[attributeName][platform]}'!`,
`Failed to validate attribute '${attributeName}' with value '${attributes[attributeName][platformKey]}'!`,
)
}
}
Expand Down
Loading