Merge pull request #285 from Tria-plc/freight/fix/type-errors

Freight/fix/type errors

apps/edr-freight-api/src/modules/companies/companies.service.ts

@@ -139,10 +139,12 @@ export class CompaniesService {
       }
     }
 
-    const existingProfile = await this.profilesRepo.findByEmail(identity.email);
+    const existingProfile = await this.profilesRepo.findByUserId(
+      identity.userId,
+    );
     if (existingProfile) {
       throw new ConflictException(
-        `Profile with email ${identity.email} already exists`,
+        `Profile for user ${identity.userId} already exists`,
       );
     }
 
@@ -176,8 +178,6 @@ export class CompaniesService {
       companyId: company.id,
       firstName: identity.firstName,
       lastName: identity.lastName,
-      email: identity.email,
-      phone: normalizeE164(identity.phone) ?? identity.phone,
       jobTitle: dto.jobTitle ?? null,
       isPrimaryContact: dto.isPrimaryContact ?? true,
       activeProfileType,
@@ -251,15 +251,6 @@ export class CompaniesService {
       return this.getCompanyInfoByUserId(identity.userId);
     }
 
-    // A profile may exist for the same email under a different IAM id — block
-    // duplicates as the final create does.
-    const byEmail = await this.profilesRepo.findByEmail(identity.email);
-    if (byEmail) {
-      throw new ConflictException(
-        `Profile with email ${identity.email} already exists`,
-      );
-    }
-
     const allowedTypes = this.getProfileTypeForCompanyType(companyType);
     const chosenTypes = roles.filter((t) => allowedTypes.includes(t));
     const activeProfileType =
@@ -284,8 +275,6 @@ export class CompaniesService {
       companyId: company.id,
       firstName: identity.firstName,
       lastName: identity.lastName,
-      email: identity.email,
-      phone: normalizeE164(identity.phone) ?? identity.phone,
       isPrimaryContact: true,
       activeProfileType,
       onboardingStep: "company",
@@ -637,10 +626,10 @@ export class CompaniesService {
   async createProfile(dto: CreateExternalProfileDto): Promise<ExternalProfile> {
     await this.findCompanyById(dto.companyId);
 
-    const existing = await this.profilesRepo.findByEmail(dto.email);
+    const existing = await this.profilesRepo.findByUserId(dto.userId);
     if (existing) {
       throw new ConflictException(
-        `Profile with email ${dto.email} already exists`,
+        `Profile for user ${dto.userId} already exists`,
       );
     }
 

apps/edr-freight-api/src/modules/companies/dto/create-external-profile.dto.ts

@@ -1,5 +1,4 @@
-import { IsString, IsNotEmpty, IsOptional, IsEmail, MaxLength, IsBoolean, IsUUID } from 'class-validator';
-import { IsValidPhone } from '../../../common/validators/is-phone-number.validator';
+import { IsString, IsNotEmpty, IsOptional, MaxLength, IsBoolean, IsUUID } from 'class-validator';
 
 export class CreateExternalProfileDto {
   @IsUUID()
@@ -20,16 +19,6 @@ export class CreateExternalProfileDto {
   @MaxLength(100)
   lastName!: string;
 
-  @IsEmail()
-  @IsNotEmpty()
-  email!: string;
-
-  @IsOptional()
-  @IsString()
-  @MaxLength(20)
-  @IsValidPhone()
-  phone?: string;
-
   @IsOptional()
   @IsString()
   @MaxLength(50)

apps/edr-freight-api/src/modules/companies/dto/response-external-profile.dto.ts

@@ -10,8 +10,6 @@ export class ResponseExternalProfileDto {
   companyId: string;
   firstName: string;
   lastName: string;
-  email: string;
-  phone?: string | null;
   nationalId?: string | null;
   jobTitle?: string | null;
   isPrimaryContact: boolean;
@@ -34,8 +32,6 @@ export class ResponseExternalProfileDto {
     this.companyId = profile.companyId;
     this.firstName = profile.firstName;
     this.lastName = profile.lastName;
-    this.email = profile.email;
-    this.phone = profile.phone;
     this.nationalId = profile.nationalId;
     this.jobTitle = profile.jobTitle;
     this.isPrimaryContact = profile.isPrimaryContact;

apps/edr-freight-api/src/modules/companies/entities/external-profile.entity.ts

@@ -23,12 +23,6 @@ export class ExternalProfile extends BaseEntity {
   @Column({ name: 'last_name', type: 'varchar', length: 100 })
   lastName!: string;
 
-  @Column({ name: 'email', type: 'varchar', length: 150, unique: true })
-  email!: string;
-
-  @Column({ name: 'phone', type: 'varchar', length: 20, nullable: true })
-  phone?: string | null;
-
   @Column({ name: 'national_id', type: 'varchar', length: 50, nullable: true })
   nationalId?: string | null;
 

apps/edr-freight-api/src/modules/companies/external-profile.repository.ts

@@ -23,8 +23,4 @@ export class ExternalProfileRepository extends BaseRepository<ExternalProfile> {
   async findByCompanyId(companyId: string): Promise<ExternalProfile[]> {
     return this.repository.find({ where: { companyId } as any });
   }
-
-  async findByEmail(email: string): Promise<ExternalProfile | null> {
-    return this.repository.findOne({ where: { email } as any });
-  }
 }