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
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
CommonMemberService,
IAffiliationRequest,
SearchSyncWorkerEmitter,
getEarliestMemberJoinedAt,
} from '@crowd/common_services'
import {
IFindOrCreateOrganizationResult,
Expand Down Expand Up @@ -67,7 +68,7 @@ import {

import { IActivityUpdateData, ISentimentActivityInput } from './activity.data'
import { ActivityTimestampsByEmailDomain, IMemberUpdateData } from './member.data'
import MemberService, { getEarliestMemberJoinedAt, mergeIfAllowed } from './member.service'
import MemberService, { mergeIfAllowed } from './member.service'
import MemberAttributeService, { isEmptyAttributeValue } from './memberAttribute.service'
import { applyNewestOrgPayloads, registerOrgPayloadActivities } from './organizationLinking'
import { IProcessActivityResult } from './types'
Expand Down
21 changes: 1 addition & 20 deletions services/apps/data_sink_worker/src/service/member.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
CommonMemberService,
MEMBER_ORG_STINT_CHANGES_DATES_PREFIX,
MEMBER_ORG_STINT_CHANGES_QUEUE,
getEarliestMemberJoinedAt,
} from '@crowd/common_services'
import { QueryExecutor, createMember, dbStoreQx, updateMember } from '@crowd/data-access-layer'
import {
Expand Down Expand Up @@ -68,26 +69,6 @@ import {
} from './organizationLinking'
import { createOrgLookupCache } from './orgLookupCache'

// Integrations stamp activities without a date at 1970-01-01 (e.g. Slack channel members), which is
// never a real join date, so a date this close to the epoch never wins
const JOINED_AT_PLACEHOLDER_UNTIL = Date.UTC(1970, 0, 6)

export function getEarliestMemberJoinedAt(current: Date, incoming: Date): Date {
const isPlaceholder = (date: Date) =>
Number.isNaN(date.getTime()) || date.getTime() < JOINED_AT_PLACEHOLDER_UNTIL

if (Number.isNaN(incoming.getTime())) {
return current
}
if (isPlaceholder(current)) {
return incoming
}
if (isPlaceholder(incoming)) {
return current
}
return incoming.getTime() < current.getTime() ? incoming : current
}

/**
* Checks the memberNoMerge table and, if allowed, merges secondaryId into primaryId
* using CommonMemberService. Returns true if the merge was performed, false if a noMerge
Expand Down
19 changes: 0 additions & 19 deletions services/libs/common/src/timing.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import moment from 'moment-timezone'

import { IMemberOrganization } from '@crowd/types'

export const timeout = async (delayMilliseconds: number): Promise<void> =>
Expand All @@ -23,23 +21,6 @@ export const getSecondsTillEndOfMonth = () => {
return Math.round(diffInSeconds)
}

export function getEarliestValidDate(oldDate: Date, newDate: Date): Date {
// If either the new or the old date are earlier than 1970
// it means they come from an activity without timestamp
// and we want to keep the other one
if (moment(oldDate).subtract(5, 'days').unix() < 0) {
return newDate
}

if (moment(newDate).unix() < 0) {
return oldDate
}

return moment
.min(moment.tz(oldDate, 'Europe/London'), moment.tz(newDate, 'Europe/London'))
.toDate()
}

export const getLongestDateRange = <T extends IMemberOrganization>(orgs: T[]) => {
const orgsWithDates = orgs.filter((row) => !!row.dateStart)
if (orgsWithDates.length === 0) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import {
Error404,
Error409,
calculateReach,
getEarliestValidDate,
getLongestDateRange,
getMemberOrganizationSourceRank,
isSameMemberIdentity,
Expand Down Expand Up @@ -84,6 +83,26 @@ export interface IAffiliationRequest {
affiliationEmailDomain?: string
}

// Integrations stamp activities without a date at 1970-01-01 (e.g. Slack channel members), which is
// never a real join date, so a date this close to the epoch never wins
const JOINED_AT_PLACEHOLDER_UNTIL = Date.UTC(1970, 0, 6)

export function getEarliestMemberJoinedAt(current: Date, incoming: Date): Date {
const isPlaceholder = (date: Date) =>
Number.isNaN(date.getTime()) || date.getTime() < JOINED_AT_PLACEHOLDER_UNTIL

if (Number.isNaN(incoming.getTime())) {
return current
}
if (isPlaceholder(current)) {
return incoming
}
if (isPlaceholder(incoming)) {
return current
}
return incoming.getTime() < current.getTime() ? incoming : current
}

// the experiences from the best-ranked source; more than one is a tie
function highestPrioritySourceTier(experiences: IWorkExperienceData[]): IWorkExperienceData[] {
let bestRank = 4
Expand Down Expand Up @@ -683,7 +702,8 @@ export class CommonMemberService extends LoggerBase {
*/
public static membersMerge(originalObject, toMergeObject) {
return mergeObjects(originalObject, toMergeObject, {
joinedAt: (oldDate, newDate) => getEarliestValidDate(oldDate, newDate),
joinedAt: (oldDate, newDate) =>
getEarliestMemberJoinedAt(new Date(oldDate), new Date(newDate)),
Comment thread
themarolt marked this conversation as resolved.
Resolved
// eslint-disable-next-line @typescript-eslint/no-unused-vars
displayName: (oldValue, _newValue) => oldValue,
reach: (oldReach, newReach) => calculateReach(oldReach, newReach),
Expand Down
Loading