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:
@@ -25,6 +25,10 @@ import { CompaniesService } from './companies.service';
|
||||
import { PeopleService } from './people.service';
|
||||
import { normalizeEmail, normalizePhone } from './normalize';
|
||||
import { normalizePersonImportSource } from './person-source';
|
||||
import {
|
||||
CustomerGroupsService,
|
||||
splitGroupNames,
|
||||
} from '../customer-groups/customer-groups.service';
|
||||
|
||||
type ImportChunkOpts = {
|
||||
sessionId?: string;
|
||||
@@ -39,6 +43,16 @@ function parseMood(raw?: string): PersonMood | undefined {
|
||||
return PERSON_MOODS.find((mood) => PERSON_MOOD_LABELS[mood] === value);
|
||||
}
|
||||
|
||||
/** ستونهای گروه اکسل → نام گروهها (برچسبهای وضعیت مشتری گروه حساب نمیشوند) */
|
||||
function groupNamesFrom(...raws: Array<string | undefined>): string[] {
|
||||
const names = raws.flatMap((raw) => splitGroupNames(raw));
|
||||
return [...new Set(names.filter((name) => !parseMood(name)))];
|
||||
}
|
||||
|
||||
function groupNamesText(groups: Array<{ name: string }> | undefined, fallback?: string) {
|
||||
return groups?.length ? groups.map((g) => g.name).join('، ') : (fallback ?? '');
|
||||
}
|
||||
|
||||
function splitDidarName(firstName: string, lastName: string, title?: string) {
|
||||
const first = firstName.trim();
|
||||
const last = lastName.trim();
|
||||
@@ -369,6 +383,7 @@ export class ContactsExcelService {
|
||||
private readonly prisma: PrismaService,
|
||||
private readonly people: PeopleService,
|
||||
private readonly companies: CompaniesService,
|
||||
private readonly groups: CustomerGroupsService,
|
||||
) {}
|
||||
|
||||
async exportPeople(actor: Actor, q?: string): Promise<Buffer> {
|
||||
@@ -378,6 +393,7 @@ export class ContactsExcelService {
|
||||
CONTACT_COLUMNS,
|
||||
items.map((p) => {
|
||||
const extra = (p.customFields ?? {}) as Record<string, string>;
|
||||
const groupText = groupNamesText(p.groups, extra.group);
|
||||
return {
|
||||
_type: 'Contact',
|
||||
didarId: extra.didarId ?? p.id,
|
||||
@@ -402,7 +418,7 @@ export class ContactsExcelService {
|
||||
nationalId: extra.nationalId ?? '',
|
||||
registeredAt: formatJalaliDate(p.createdAt),
|
||||
birthDate: p.birthDate ? formatJalaliDate(p.birthDate) : (extra.birthDate ?? ''),
|
||||
mood: extra.group || PERSON_MOOD_LABELS[p.mood || 'newcomer'],
|
||||
mood: PERSON_MOOD_LABELS[p.mood || 'newcomer'],
|
||||
otherPhones: extra.otherPhones ?? '',
|
||||
address: p.addresses[0] ?? extra.address ?? '',
|
||||
website: p.website ?? extra.website ?? '',
|
||||
@@ -410,7 +426,7 @@ export class ContactsExcelService {
|
||||
position2: p.position ?? extra.position ?? '',
|
||||
city2: extra.city ?? '',
|
||||
code2: extra.customerCode ?? '',
|
||||
group2: extra.group ?? '',
|
||||
group2: groupText,
|
||||
address2: p.addresses[1] ?? extra.address ?? '',
|
||||
phone2: extra.phone2 ?? p.phone ?? '',
|
||||
postalCode2: extra.postalCode ?? '',
|
||||
@@ -418,7 +434,7 @@ export class ContactsExcelService {
|
||||
homeAddress: p.addresses[2] ?? extra.homeAddress ?? '',
|
||||
birthDate2: p.birthDate ? formatJalaliDate(p.birthDate) : (extra.birthDate ?? ''),
|
||||
instagram: p.instagram ?? extra.instagram ?? '',
|
||||
group: extra.group ?? '',
|
||||
group: groupText,
|
||||
colleagueContact: extra.colleagueContact ?? '',
|
||||
previousCompany: extra.previousCompany ?? '',
|
||||
customerType: extra.customerType ?? '',
|
||||
@@ -456,7 +472,7 @@ export class ContactsExcelService {
|
||||
registeredAt: formatJalaliDate(
|
||||
c.registeredAt ? new Date(c.registeredAt) : new Date(c.createdAt),
|
||||
),
|
||||
groupName: c.groupName ?? '',
|
||||
groupName: groupNamesText(c.groups, c.groupName ?? ''),
|
||||
otherPhones: c.otherPhones ?? '',
|
||||
address: c.address ?? '',
|
||||
website: c.website ?? '',
|
||||
@@ -551,6 +567,8 @@ export class ContactsExcelService {
|
||||
const value = row[key]?.trim();
|
||||
if (value) customFields[key] = value;
|
||||
}
|
||||
const groupNames = groupNamesFrom(row.group, parseMood(row.mood) ? undefined : row.mood);
|
||||
if (groupNames.length) delete customFields.group;
|
||||
|
||||
const addresses = collectAddresses(
|
||||
row.address,
|
||||
@@ -576,6 +594,7 @@ export class ContactsExcelService {
|
||||
? normalizePersonImportSource(sourceCol)
|
||||
: 'excel';
|
||||
const sourceRef = didarId || customerCode || null;
|
||||
const groupIds = await this.groups.idsForNames(actor.organizationId, groupNames);
|
||||
|
||||
await this.people.create(actor, {
|
||||
firstName: names.firstName,
|
||||
@@ -596,6 +615,7 @@ export class ContactsExcelService {
|
||||
importSource,
|
||||
sourceRef,
|
||||
registeredAt: registeredAt?.toISOString() ?? null,
|
||||
groupIds,
|
||||
});
|
||||
result.created += 1;
|
||||
if (ownerMissing) {
|
||||
@@ -701,8 +721,13 @@ export class ContactsExcelService {
|
||||
};
|
||||
|
||||
try {
|
||||
const groupIds = await this.groups.idsForNames(
|
||||
actor.organizationId,
|
||||
groupNamesFrom(row.groupName),
|
||||
);
|
||||
const existing = await this.findImportedCompany(actor, didarId, name);
|
||||
if (existing) {
|
||||
if (groupIds.length) await this.groups.addCompanyGroups(existing.id, groupIds);
|
||||
const merged: Record<string, unknown> = {};
|
||||
for (const [k, v] of Object.entries(payload)) {
|
||||
if (k === 'customFields') continue;
|
||||
@@ -719,6 +744,7 @@ export class ContactsExcelService {
|
||||
await this.companies.create(actor, {
|
||||
...payload,
|
||||
ownerId: resolveOwnerId(actor, ownerId ?? null),
|
||||
groupIds,
|
||||
});
|
||||
result.created += 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user