feat: customer groups for people and companies with tahesab group sync and bulk register
Multiple groups per contact, legacy group text migrated, excel import/export, contacts filter and column, richer create-in-tahesab, match-first bulk export
This commit is contained in:
@@ -51,6 +51,10 @@ import {
|
||||
personImportSourceLabel,
|
||||
} from './person-source';
|
||||
import { BehaviorAccessService } from '../behavior/behavior-access.service';
|
||||
import {
|
||||
CustomerGroupsService,
|
||||
groupSummarySelect,
|
||||
} from '../customer-groups/customer-groups.service';
|
||||
|
||||
const personInclude = {
|
||||
company: { select: { id: true, name: true, province: true, city: true } },
|
||||
@@ -58,6 +62,10 @@ const personInclude = {
|
||||
loyaltyTier: {
|
||||
select: { id: true, name: true, minPoints: true, color: true },
|
||||
},
|
||||
groupLinks: {
|
||||
select: { source: true, group: { select: groupSummarySelect } },
|
||||
orderBy: [{ group: { position: 'asc' } }, { group: { name: 'asc' } }],
|
||||
},
|
||||
} satisfies Prisma.PersonInclude;
|
||||
|
||||
type PersonRow = {
|
||||
@@ -102,6 +110,7 @@ type PersonRow = {
|
||||
discLabel: string | null;
|
||||
discReliable: boolean;
|
||||
discAssessedAt: Date | null;
|
||||
groupLinks: Array<{ source: string; group: { id: string; name: string; color: string } }>;
|
||||
};
|
||||
|
||||
function discFilter(raw: string | undefined): Prisma.PersonWhereInput | null {
|
||||
@@ -134,6 +143,7 @@ export class PeopleService implements OnModuleInit {
|
||||
private readonly sms: SmsGatewayService,
|
||||
private readonly outboundSms: OutboundSmsLogService,
|
||||
private readonly behaviorAccess: BehaviorAccessService,
|
||||
private readonly groups: CustomerGroupsService,
|
||||
) {}
|
||||
|
||||
private personListWhere(
|
||||
@@ -146,6 +156,7 @@ export class PeopleService implements OnModuleInit {
|
||||
city?: string;
|
||||
hasMobile?: boolean;
|
||||
disc?: string;
|
||||
groupId?: string;
|
||||
},
|
||||
): Prisma.PersonWhereInput {
|
||||
const sourceFilter = opts?.importSource?.trim()
|
||||
@@ -190,6 +201,8 @@ export class PeopleService implements OnModuleInit {
|
||||
}
|
||||
const disc = discFilter(opts?.disc);
|
||||
if (disc) and.push(disc);
|
||||
const groupId = opts?.groupId?.trim();
|
||||
if (groupId) and.push({ groupLinks: { some: { groupId } } });
|
||||
return {
|
||||
organizationId: actor.organizationId,
|
||||
...ownerWhere(actor),
|
||||
@@ -212,6 +225,7 @@ export class PeopleService implements OnModuleInit {
|
||||
city?: string;
|
||||
hasMobile?: boolean;
|
||||
disc?: string;
|
||||
groupId?: string;
|
||||
},
|
||||
): Promise<PaginatedResponse<PersonDto>> {
|
||||
const seeDisc = await this.behaviorAccess.canView(actor);
|
||||
@@ -249,6 +263,7 @@ export class PeopleService implements OnModuleInit {
|
||||
city?: string;
|
||||
hasMobile?: boolean;
|
||||
disc?: string;
|
||||
groupId?: string;
|
||||
},
|
||||
max = FILTERED_IDS_MAX,
|
||||
): Promise<FilteredIdsResponse> {
|
||||
@@ -396,11 +411,13 @@ export class PeopleService implements OnModuleInit {
|
||||
: {}),
|
||||
};
|
||||
await this.assertNoDuplicate(actor.organizationId, data);
|
||||
const groupIds = await this.groups.validIds(actor.organizationId, dto.groupIds);
|
||||
|
||||
const row = await this.prisma.person.create({
|
||||
data,
|
||||
include: personInclude,
|
||||
});
|
||||
if (groupIds.length) await this.groups.addPersonGroups(row.id, groupIds);
|
||||
await this.loyalty.applyWelcomePoints(actor.organizationId, row.id);
|
||||
const createdCtx = {
|
||||
organizationId: actor.organizationId,
|
||||
@@ -489,6 +506,10 @@ export class PeopleService implements OnModuleInit {
|
||||
}
|
||||
|
||||
await this.assertNoDuplicate(actor.organizationId, data, id);
|
||||
if (dto.groupIds !== undefined) {
|
||||
const groupIds = await this.groups.validIds(actor.organizationId, dto.groupIds);
|
||||
await this.groups.setPersonGroups(id, groupIds);
|
||||
}
|
||||
const row = await this.prisma.person.update({
|
||||
where: { id },
|
||||
data,
|
||||
@@ -776,6 +797,10 @@ export class PeopleService implements OnModuleInit {
|
||||
mood: row.mood,
|
||||
tags: row.tags ?? [],
|
||||
customFields: asCustomFields(row.customFields),
|
||||
groups: (row.groupLinks ?? []).map((l) => ({
|
||||
...l.group,
|
||||
source: l.source === 'tahesab' ? ('tahesab' as const) : ('manual' as const),
|
||||
})),
|
||||
loyaltyPoints: row.loyaltyPoints ?? 0,
|
||||
loyaltyTier: row.loyaltyTier,
|
||||
discLabel: includeDisc && row.discReliable ? row.discLabel : null,
|
||||
|
||||
Reference in New Issue
Block a user